diff --git a/src/Edit.c b/src/Edit.c
index d61d4c978..6291bc960 100644
--- a/src/Edit.c
+++ b/src/Edit.c
@@ -76,10 +76,10 @@ extern BOOL bFindReplCopySelOrClip;
 static EDITFINDREPLACE efrSave;
 static BOOL bSwitchedFindReplace = FALSE;
 
-static int xFindReplaceDlgSave;
-static int yFindReplaceDlgSave;
 extern int xFindReplaceDlg;
 extern int yFindReplaceDlg;
+static int xFindReplaceDlgSave;
+static int yFindReplaceDlgSave;
 
 extern int g_iDefaultEOLMode;
 extern int iLineEndings[3];
@@ -4811,7 +4811,6 @@ INT_PTR CALLBACK EditFindReplaceDlgProcW(HWND hwnd,UINT umsg,WPARAM wParam,LPARA
         CopyMemory(lpefr, &efrSave, sizeof(EDITFINDREPLACE));
       }
 
-
       HMENU hmenu = GetSystemMenu(hwnd, FALSE);
       GetString(IDS_SAVEPOS, tchBuf, COUNTOF(tchBuf));
       InsertMenu(hmenu, 0, MF_BYPOSITION | MF_STRING | MF_ENABLED, IDS_SAVEPOS, tchBuf);
diff --git a/src/Notepad3.c b/src/Notepad3.c
index 3b69f6c67..be5a26744 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -246,6 +246,9 @@ int     cxFavoritesDlg;
 int     cyFavoritesDlg;
 int     xFindReplaceDlg;
 int     yFindReplaceDlg;
+int     xCustomSchemesDlg;
+int     yCustomSchemesDlg;
+
 
 LPWSTR    lpFileList[32] = { NULL };
 int       cFileList = 0;
@@ -5935,6 +5938,8 @@ void LoadSettings()
   xFindReplaceDlg = IniSectionGetInt(pIniSection,L"FindReplaceDlgPosX",0);
   yFindReplaceDlg = IniSectionGetInt(pIniSection,L"FindReplaceDlgPosY",0);
 
+  xCustomSchemesDlg = IniSectionGetInt(pIniSection, L"CustomSchemesDlgPosX", 0);
+  yCustomSchemesDlg = IniSectionGetInt(pIniSection, L"CustomSchemesDlgPosY", 0);
 
   LoadIniSection(L"Settings2",pIniSection,cchIniSection);
 
@@ -6174,8 +6179,10 @@ void SaveSettings(BOOL bSaveSettingsNow) {
   IniSectionSetInt(pIniSection, L"FavoritesDlgSizeY", cyFavoritesDlg);
   IniSectionSetInt(pIniSection, L"FindReplaceDlgPosX", xFindReplaceDlg);
   IniSectionSetInt(pIniSection, L"FindReplaceDlgPosY", yFindReplaceDlg);
+  IniSectionSetInt(pIniSection, L"CustomSchemesDlgPosX", xCustomSchemesDlg);
+  IniSectionSetInt(pIniSection, L"CustomSchemesDlgPosY", yCustomSchemesDlg);
 
-    Toolbar_GetButtons(g_hwndToolbar, IDT_FILE_NEW, tchToolbarButtons, COUNTOF(tchToolbarButtons));
+  Toolbar_GetButtons(g_hwndToolbar, IDT_FILE_NEW, tchToolbarButtons, COUNTOF(tchToolbarButtons));
   if (StringCchCompareX(tchToolbarButtons, TBBUTTON_DEFAULT_IDS) == 0) { tchToolbarButtons[0] = L'\0'; }
   IniSectionSetString(pIniSection, L"ToolbarButtons", tchToolbarButtons);
 
diff --git a/src/Notepad3.rc b/src/Notepad3.rc
index ae331ccab..6d2a4b40f 100644
--- a/src/Notepad3.rc
+++ b/src/Notepad3.rc
@@ -634,7 +634,9 @@ END
 
 IDR_ACCCUSTOMSCHEMES ACCELERATORS
 BEGIN
-    VK_F12,         IDACC_VIEWSCHEMECONFIG,   VIRTKEY, CONTROL, ALT
+    "O",            IDACC_SAVEPOS,          VIRTKEY, CONTROL, NOINVERT
+    "P",            IDACC_RESETPOS,         VIRTKEY, CONTROL, NOINVERT
+    VK_F12,         IDACC_VIEWSCHEMECONFIG, VIRTKEY, CONTROL, NOINVERT 
 END
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/src/Styles.c b/src/Styles.c
index 0078bbe18..3c2f17d89 100644
--- a/src/Styles.c
+++ b/src/Styles.c
@@ -59,6 +59,10 @@ extern BOOL g_bShowSelectionMargin;
 extern int  iMarkOccurrences;
 extern BOOL bUseOldStyleBraceMatching;
 
+extern int xCustomSchemesDlg;
+extern int yCustomSchemesDlg;
+
+
 #define MULTI_STYLE(a,b,c,d) ((a)|(b<<8)|(c<<16)|(d<<24))
 
 #define INITIAL_BASE_FONT_SIZE (10)
@@ -5685,7 +5689,7 @@ void Style_AddLexerToListView(HWND hwnd,PEDITLEXER plex)
 
 //=============================================================================
 //
-//  Style_ConfigDlgProc()
+//  Style_CustomizeSchemesDlgProc()
 //
 INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam)
 {
@@ -5701,6 +5705,8 @@ INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam
 
   static WCHAR* Style_StylesBackup[NUMLEXERS * AVG_NUM_OF_STYLES_PER_LEXER];
 
+  WCHAR tchBuf[128] = { L'\0' };
+
   switch(umsg)
   {
     case WM_INITDIALOG:
@@ -5774,7 +5780,18 @@ INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam
         hFontTitle = CreateFontIndirect(&lf);
         SendDlgItemMessage(hwnd,IDC_TITLE,WM_SETFONT,(WPARAM)hFontTitle,TRUE);
 
-        CenterDlgInParent(hwnd);
+        if (xCustomSchemesDlg == 0 || yCustomSchemesDlg == 0)
+          CenterDlgInParent(hwnd);
+        else
+          SetDlgPos(hwnd, xCustomSchemesDlg, yCustomSchemesDlg);
+
+        HMENU hmenu = GetSystemMenu(hwnd, FALSE);
+        GetString(IDS_SAVEPOS, tchBuf, COUNTOF(tchBuf));
+        InsertMenu(hmenu, 0, MF_BYPOSITION | MF_STRING | MF_ENABLED, IDS_SAVEPOS, tchBuf);
+        GetString(IDS_RESETPOS, tchBuf, COUNTOF(tchBuf));
+        InsertMenu(hmenu, 1, MF_BYPOSITION | MF_STRING | MF_ENABLED, IDS_RESETPOS, tchBuf);
+        InsertMenu(hmenu, 2, MF_BYPOSITION | MF_SEPARATOR, 0, NULL);
+
       }
       return TRUE;
 
@@ -5789,17 +5806,21 @@ INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam
         for (int iLexer = 0; iLexer < COUNTOF(g_pLexArray); ++iLexer) {
           if (Style_StylesBackup[cnt]) {
             LocalFree(Style_StylesBackup[cnt]);
-            Style_StylesBackup[cnt++] = NULL;
+            Style_StylesBackup[cnt] = NULL;
           }
+          ++cnt;
           int i = 0;
           while (g_pLexArray[iLexer]->Styles[i].iStyle != -1) {
             if (Style_StylesBackup[cnt]) {
               LocalFree(Style_StylesBackup[cnt]);
-              Style_StylesBackup[cnt++] = NULL;
+              Style_StylesBackup[cnt] = NULL;
             }
+            ++cnt;
             ++i;
           }
         }
+        pCurrentLexer = NULL;
+        pCurrentStyle = NULL;
       }
       return FALSE;
 
@@ -5825,6 +5846,20 @@ INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam
       } \
     }
 
+
+    case WM_SYSCOMMAND:
+      if (wParam == IDS_SAVEPOS) {
+        PostMessage(hwnd, WM_COMMAND, MAKELONG(IDACC_SAVEPOS, 0), 0);
+        return TRUE;
+      }
+      else if (wParam == IDS_RESETPOS) {
+        PostMessage(hwnd, WM_COMMAND, MAKELONG(IDACC_RESETPOS, 0), 0);
+        return TRUE;
+      }
+      else
+        return FALSE;
+
+
     case WM_NOTIFY:
 
       if (((LPNMHDR)(lParam))->idFrom == IDC_STYLELIST)
@@ -6056,6 +6091,7 @@ INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam
           }
           break;
         
+
         case IDC_STYLEFORE:
           if (pCurrentStyle) {
             WCHAR tch[BUFSIZE_STYLE_VALUE] = { L'\0' };
@@ -6067,6 +6103,7 @@ INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam
           PostMessage(hwnd, WM_NEXTDLGCTL, (WPARAM)(GetDlgItem(hwnd, IDC_STYLEEDIT)), 1);
           break;
 
+
         case IDC_STYLEBACK:
           if (pCurrentStyle) {
             WCHAR tch[BUFSIZE_STYLE_VALUE] = { L'\0' };
@@ -6078,6 +6115,7 @@ INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam
           PostMessage(hwnd, WM_NEXTDLGCTL, (WPARAM)(GetDlgItem(hwnd, IDC_STYLEEDIT)), 1);
           break;
 
+
         case IDC_STYLEFONT:
           if (pCurrentStyle) {
             WCHAR tch[BUFSIZE_STYLE_VALUE] = { L'\0' };
@@ -6091,6 +6129,7 @@ INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam
           PostMessage(hwnd, WM_NEXTDLGCTL, (WPARAM)(GetDlgItem(hwnd, IDC_STYLEEDIT)), 1);
           break;
 
+
         case IDC_STYLEDEFAULT:
           SetDlgItemText(hwnd, IDC_STYLEEDIT, pCurrentStyle->pszDefault);
           if (!bIsStyleSelected) {
@@ -6100,6 +6139,7 @@ INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam
           PostMessage(hwnd, WM_NEXTDLGCTL, (WPARAM)(GetDlgItem(hwnd, IDC_STYLEEDIT)), 1);
           break;
 
+
         case IDC_STYLEEDIT:
           {
             if (HIWORD(wParam) == EN_CHANGE) {
@@ -6118,6 +6158,7 @@ INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam
           }
           break;
 
+
         case IDC_IMPORT:
           {
             hwndTV = GetDlgItem(hwnd, IDC_STYLELIST);
@@ -6133,6 +6174,7 @@ INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam
           }
           break;
 
+
         case IDC_EXPORT:
           {
             APPLY_DIALOG_ITEM_TEXT;
@@ -6140,12 +6182,14 @@ INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam
           }
           break;
 
+
         case IDC_PREVIEW:
           {
             APPLY_DIALOG_ITEM_TEXT;
           }
           break;
 
+
         case IDC_PREVSTYLE:
           {
             APPLY_DIALOG_ITEM_TEXT;
@@ -6159,6 +6203,7 @@ INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam
           }
           break;
 
+
         case IDC_NEXTSTYLE:
           {
             APPLY_DIALOG_ITEM_TEXT;
@@ -6172,6 +6217,7 @@ INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam
           }
           break;
 
+
         case IDOK:
           APPLY_DIALOG_ITEM_TEXT;
           g_fStylesModified = TRUE;
@@ -6183,18 +6229,22 @@ INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam
           DestroyWindow(hwnd);
           break;
 
+
         case IDCANCEL:
           if (fDragging) {
             SendMessage(hwnd, WM_CANCELMODE, 0, 0);
           }
           else {
+            APPLY_DIALOG_ITEM_TEXT;
             // Restore Styles
             int cnt = 0;
             for (int iLexer = 0; iLexer < COUNTOF(g_pLexArray); ++iLexer) {
-              StringCchCopy(g_pLexArray[iLexer]->szExtensions, COUNTOF(g_pLexArray[iLexer]->szExtensions), Style_StylesBackup[cnt++]);
+              StringCchCopy(g_pLexArray[iLexer]->szExtensions, COUNTOF(g_pLexArray[iLexer]->szExtensions), Style_StylesBackup[cnt]);
+              ++cnt;
               int i = 0;
               while (g_pLexArray[iLexer]->Styles[i].iStyle != -1) {
-                StringCchCopy(g_pLexArray[iLexer]->Styles[i].szValue, COUNTOF(g_pLexArray[iLexer]->Styles[i].szValue), Style_StylesBackup[cnt++]);
+                StringCchCopy(g_pLexArray[iLexer]->Styles[i].szValue, COUNTOF(g_pLexArray[iLexer]->Styles[i].szValue), Style_StylesBackup[cnt]);
+                ++cnt;
                 ++i;
               }
             }
@@ -6203,6 +6253,22 @@ INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam
             DestroyWindow(hwnd);
           }
           break;
+
+
+        case IDACC_SAVEPOS:
+          GetDlgPos(hwnd, &xCustomSchemesDlg, &yCustomSchemesDlg);
+          break;
+
+        case IDACC_RESETPOS:
+          CenterDlgInParent(hwnd);
+          xCustomSchemesDlg = yCustomSchemesDlg = 0;
+          break;
+
+
+        default:
+          // return FALSE???
+          break;
+
         } // switch()
       } // WM_COMMAND
       return TRUE;
@@ -6213,7 +6279,7 @@ INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam
 
 //=============================================================================
 //
-//  Style_ConfigDlg()
+//  Style_CustomizeSchemesDlg()
 //
 HWND Style_CustomizeSchemesDlg(HWND hwnd)
 {