diff --git a/Build/Changes.txt b/Build/Changes.txt
index 8164dc3d2..884d5d8e6 100644
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@@ -30,7 +30,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library
 
 
 ==================================================
-Current Version 5.19.529.build RC2 (29 May 2019)
+Current Version 5.19.601.build RC2 (1 Juni 2019)
 ==================================================
 
 --------------------------------------------------
@@ -40,6 +40,7 @@ NEW:
 --------------------------------------------------
 CHANGES:
 --------------------------------------------------
+- MUI - Rearranging the Language and Themes menus
 
 --------------------------------------------------
 ENHANCEMENT:
diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc
index cbebfce26..e62445e6b 100644
--- a/language/np3_af_za/menu_af_za.rc
+++ b/language/np3_af_za/menu_af_za.rc
@@ -295,11 +295,13 @@ BEGIN
     END
     POPUP "&Aansig"
     BEGIN
-        POPUP "&Skema"
+        POPUP "&Temas"
         BEGIN
+            MENUITEM "&Pas Skemas Aan...\tCtrl+F12",                         IDM_VIEW_SCHEMECONFIG
+            MENUITEM SEPARATOR
             MENUITEM "&Sintakseskema...\tF12",                               IDM_VIEW_SCHEME
             MENUITEM "&2de Verstek Skema\tShift+F12",                        IDM_VIEW_USE2NDDEFAULT
-            MENUITEM "&Pas Skemas Aan...\tCtrl+F12",                         IDM_VIEW_SCHEMECONFIG
+            MENUITEM SEPARATOR
             MENUITEM "Globale Standaard Font...\tAlt+F12",                   IDM_VIEW_FONT
             MENUITEM "Huidige Skema se Verstek Font...\tCtrl+Alt+F12",       IDM_VIEW_CURRENTSCHEME
         END
@@ -349,7 +351,7 @@ BEGIN
         END
         POPUP "Nu&tsbalk"
         BEGIN
-            MENUITEM "Wys Nuts&balk",                       IDM_VIEW_TOOLBAR
+            MENUITEM "Wys &Nutsbalk",                       IDM_VIEW_TOOLBAR
             MENUITEM "To&ggle Nutsbalk",                    IDM_VIEW_TOGGLETB
             MENUITEM "Pas&maak Nutsbalk...",                IDM_VIEW_CUSTOMIZETB
             MENUITEM "&Laai Toolbar Tema...",               IDM_VIEW_LOADTHEMETB
diff --git a/language/np3_af_za/strings_af_za.rc b/language/np3_af_za/strings_af_za.rc
index 9acb8167f..a30940ac8 100644
--- a/language/np3_af_za/strings_af_za.rc
+++ b/language/np3_af_za/strings_af_za.rc
@@ -134,7 +134,7 @@ BEGIN
     IDS_MUI_ERR_UNICODE     "Kon nie hierdie Unicode-l�er omskakel nie. \nData sal verlore wees as die l�er gestoor word!"
     IDS_MUI_ERR_BITMAP      "Kon nie bitmap ""%s"" laai nie.\nBenodig afmetings: %i x %i (width >= %i x height)."
     IDS_MUI_ERR_ELEVATED_RIGHTS
-                            "Fout tydens die verhoging van gebruikersregte!"
+                            "Fout die verhoging van gebruikersregte!"
 END
 
 STRINGTABLE
@@ -234,7 +234,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_MUI_MENU_LANGUAGE   "&Taal"
-    IDS_MUI_MENU_THEMES     "T&emas"
+    IDS_MUI_MENU_THEMES     "&Skakel Tema"
     IDM_THEMES_DEFAULT      "Fabriek Verstek"
     IDM_THEMES_FILE_ITEM    "Standaard Instellings"
 END
@@ -285,7 +285,7 @@ Notepad3 /v d:\\temp\\Test.txt\r\n\
 
 IDS_MUI_STYLEEDIT_HELP "\
 L�ernaam uitbreidings moet geskei word deur ;\r\n\
-use \\<regex>; to define a filename matching pattern:\r\n\
+gebruik \\<regex>; om 'n l�ernaampasvorm te definieer:\r\n\
    \\xyz$;   => l�ername(basisnaam+ext) met 'xyz' vir laaste karakters\r\n\r\n\
 Stylformaat:\r\n\
 font:Name; size:[+/-]nn.mm; bold; italic; underline;\r\n\
diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc
index ec5987992..2ec71480f 100644
--- a/language/np3_be_by/menu_be_by.rc
+++ b/language/np3_be_by/menu_be_by.rc
@@ -295,11 +295,13 @@ BEGIN
     END
     POPUP "&������"
     BEGIN
-        POPUP "�&����"
+        POPUP "&����"
         BEGIN
+            MENUITEM "&������ ������...\tCtrl+F12",              IDM_VIEW_SCHEMECONFIG
+            MENUITEM SEPARATOR
             MENUITEM "&C���� ��������...\tF12",                IDM_VIEW_SCHEME
             MENUITEM "&������ �������������� �����\tShift+F12",  IDM_VIEW_USE2NDDEFAULT
-            MENUITEM "&������ ������...\tCtrl+F12",              IDM_VIEW_SCHEMECONFIG
+            MENUITEM SEPARATOR
             MENUITEM "������� ������������� &�����...\tAlt+F12", IDM_VIEW_FONT
             MENUITEM "&������������� ����� ��� �������� �����...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME
         END
diff --git a/language/np3_be_by/strings_be_by.rc b/language/np3_be_by/strings_be_by.rc
index 4ef609351..40e360291 100644
--- a/language/np3_be_by/strings_be_by.rc
+++ b/language/np3_be_by/strings_be_by.rc
@@ -234,7 +234,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_MUI_MENU_LANGUAGE   "&����"
-    IDS_MUI_MENU_THEMES     "&����"
+    IDS_MUI_MENU_THEMES     "&��������� ����"
     IDM_THEMES_DEFAULT      "�������� ������"
     IDM_THEMES_FILE_ITEM    "����������� ������"
 END
@@ -285,7 +285,7 @@ Notepad3 /v d:\\temp\\Test.txt\r\n\
 
 IDS_MUI_STYLEEDIT_HELP "\
 ��������� ����� ������ ���� ��������� ������� ;\r\n\
-use \\<regex>; to define a filename matching pattern:\r\n\
+�������������� \\<regex>; ��� ��������� ������ ��� �����:\r\n\
    \\xyz$;   => ��� ����� (basename+ext) � 'xyz' �� �����.\r\n\r\n\
 ������ �����:\r\n\
 font:Name; size:[+/-]nn.mm; bold; italic; underline;\r\n\
diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc
index 3595b7aa7..925cef42c 100644
--- a/language/np3_de_de/menu_de_de.rc
+++ b/language/np3_de_de/menu_de_de.rc
@@ -295,11 +295,13 @@ BEGIN
     END
     POPUP "&Ansicht"
     BEGIN
-        POPUP "&Schema"
+        POPUP "&Themen"
         BEGIN
+            MENUITEM "&Syntax Schemata anpassen...\tCtrl+F12",  IDM_VIEW_SCHEMECONFIG
+            MENUITEM SEPARATOR
             MENUITEM "Standard Synta&x Schema...\tF12",         IDM_VIEW_SCHEME
             MENUITEM "&2tes Standard Schema\tShift+F12",        IDM_VIEW_USE2NDDEFAULT
-            MENUITEM "&Syntax Schemata anpassen...\tCtrl+F12",  IDM_VIEW_SCHEMECONFIG
+            MENUITEM SEPARATOR
             MENUITEM "Globaler &Standard Font...\tAlt+F12",     IDM_VIEW_FONT
             MENUITEM "Aktueller Schema Font...\tCtrl+Alt+F12",  IDM_VIEW_CURRENTSCHEME
         END
diff --git a/language/np3_de_de/strings_de_de.rc b/language/np3_de_de/strings_de_de.rc
index d3b7e40e2..318738a19 100644
--- a/language/np3_de_de/strings_de_de.rc
+++ b/language/np3_de_de/strings_de_de.rc
@@ -234,7 +234,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_MUI_MENU_LANGUAGE   "&Sprache"
-    IDS_MUI_MENU_THEMES     "&Farbschema"
+    IDS_MUI_MENU_THEMES     "&Thema Wechseln"
     IDM_THEMES_DEFAULT      "Fabrik-Vorgaben"
     IDM_THEMES_FILE_ITEM    "Standard Einstellungen"
 END
@@ -285,7 +285,7 @@ Notepad3 /v d:\\temp\\Test.txt\r\n\
 
 IDS_MUI_STYLEEDIT_HELP "\
 Trennung von Dateinamen-Erweiterungen mittels ';'.\r\n\
-use \\<regex>; to define a filename matching pattern:\r\n\
+nutze \\<regex>; um ein Regular Expression f�r Dateinamen zu definieren:\r\n\
    \\xyz$;   => Dateinamen(basename+ext) mit 'xyz' am Ende.\r\n\r\n\
 Stil-Format:\r\n\
 font:Name; size:[+/-]nn.mm; bold; italic; underline;\r\n\
diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc
index e8cc3caa6..f74b7c6d9 100644
--- a/language/np3_en_gb/menu_en_gb.rc
+++ b/language/np3_en_gb/menu_en_gb.rc
@@ -295,11 +295,13 @@ BEGIN
     END
     POPUP "&View"
     BEGIN
-        POPUP "&Scheme"
+        POPUP "&Themes"
         BEGIN
+            MENUITEM "&Customise Schemes...\tCtrl+F12",                 IDM_VIEW_SCHEMECONFIG
+            MENUITEM SEPARATOR
             MENUITEM "Synta&x Scheme...\tF12",                          IDM_VIEW_SCHEME
             MENUITEM "&2nd Default Scheme\tShift+F12",                  IDM_VIEW_USE2NDDEFAULT
-            MENUITEM "&Customise Schemes...\tCtrl+F12",                 IDM_VIEW_SCHEMECONFIG
+            MENUITEM SEPARATOR
             MENUITEM "Global &Default Font...\tAlt+F12",                IDM_VIEW_FONT
             MENUITEM "Current Sc&heme's Default Font...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME
         END
@@ -349,7 +351,7 @@ BEGIN
         END
         POPUP "&Toolbar"
         BEGIN
-            MENUITEM "Show Tool&bar",               IDM_VIEW_TOOLBAR
+            MENUITEM "Show &Toolbar",               IDM_VIEW_TOOLBAR
             MENUITEM "To&ggle Toolbar",             IDM_VIEW_TOGGLETB
             MENUITEM "C&ustomise Toolbar...",       IDM_VIEW_CUSTOMIZETB
             MENUITEM "&Load Toolbar Theme...",      IDM_VIEW_LOADTHEMETB
diff --git a/language/np3_en_gb/strings_en_gb.rc b/language/np3_en_gb/strings_en_gb.rc
index 5780f7237..9c8df363f 100644
--- a/language/np3_en_gb/strings_en_gb.rc
+++ b/language/np3_en_gb/strings_en_gb.rc
@@ -134,7 +134,7 @@ BEGIN
     IDS_MUI_ERR_UNICODE     "Error converting this Unicode file.\nData will be lost if the file is saved!"
     IDS_MUI_ERR_BITMAP      "Error loading bitmap ""%s"".\nNeed dimensions: %i x %i (width >= %i x height)."
     IDS_MUI_ERR_ELEVATED_RIGHTS
-                            "Error while elevating user rights!"
+                            "Error elevating user rights!"
 END
 
 STRINGTABLE
@@ -234,7 +234,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_MUI_MENU_LANGUAGE   "&Language"
-    IDS_MUI_MENU_THEMES     "&Themes"
+    IDS_MUI_MENU_THEMES     "&Switch Theme"
     IDM_THEMES_DEFAULT      "Factory Default"
     IDM_THEMES_FILE_ITEM    "Standard Settings"
 END
diff --git a/language/np3_en_us/menu_en_us.rc b/language/np3_en_us/menu_en_us.rc
index fcd358d2c..2dde4c85f 100644
--- a/language/np3_en_us/menu_en_us.rc
+++ b/language/np3_en_us/menu_en_us.rc
@@ -295,11 +295,13 @@ BEGIN
     END
     POPUP "&View"
     BEGIN
-        POPUP "&Scheme"
+        POPUP "&Themes"
         BEGIN
+            MENUITEM "&Customize Schemes...\tCtrl+F12",                 IDM_VIEW_SCHEMECONFIG
+            MENUITEM SEPARATOR
             MENUITEM "Synta&x Scheme...\tF12",                          IDM_VIEW_SCHEME
             MENUITEM "&2nd Default Scheme\tShift+F12",                  IDM_VIEW_USE2NDDEFAULT
-            MENUITEM "&Customize Schemes...\tCtrl+F12",                 IDM_VIEW_SCHEMECONFIG
+            MENUITEM SEPARATOR
             MENUITEM "Global &Default Font...\tAlt+F12",                IDM_VIEW_FONT
             MENUITEM "Current Sc&heme's Default Font...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME
         END
diff --git a/language/np3_en_us/strings_en_us.rc b/language/np3_en_us/strings_en_us.rc
index 26a76c595..13387eb18 100644
--- a/language/np3_en_us/strings_en_us.rc
+++ b/language/np3_en_us/strings_en_us.rc
@@ -234,7 +234,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_MUI_MENU_LANGUAGE   "&Language"
-    IDS_MUI_MENU_THEMES     "&Themes"
+    IDS_MUI_MENU_THEMES     "&Switch Theme"
     IDM_THEMES_DEFAULT      "Factory Default"
     IDM_THEMES_FILE_ITEM    "Standard Settings"
 END
diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc
index eadbb3405..8bdf4b9ff 100644
--- a/language/np3_es_es/menu_es_es.rc
+++ b/language/np3_es_es/menu_es_es.rc
@@ -295,11 +295,13 @@ BEGIN
     END
     POPUP "&Vista"
     BEGIN
-        POPUP "&Esquema"
+        POPUP "&Temas"
         BEGIN
+            MENUITEM "&Personalizar Esquemas...\tCtrl+F12",             IDM_VIEW_SCHEMECONFIG
+            MENUITEM SEPARATOR
             MENUITEM "&Sintaxis Esquema...\tF12",                       IDM_VIEW_SCHEME
             MENUITEM "&2� Esquema por defecto\tShift+F12",              IDM_VIEW_USE2NDDEFAULT
-            MENUITEM "&Personalizar Esquemas...\tCtrl+F12",             IDM_VIEW_SCHEMECONFIG
+            MENUITEM SEPARATOR
             MENUITEM "&Fuente global por defecto...\tAlt+F12",          IDM_VIEW_FONT
             MENUITEM "Fuente del Esquema &actual por defecto...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME
         END
diff --git a/language/np3_es_es/strings_es_es.rc b/language/np3_es_es/strings_es_es.rc
index 0230d3808..95f724f8a 100644
--- a/language/np3_es_es/strings_es_es.rc
+++ b/language/np3_es_es/strings_es_es.rc
@@ -234,7 +234,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_MUI_MENU_LANGUAGE   "&Idioma"
-    IDS_MUI_MENU_THEMES     "&Temas"
+    IDS_MUI_MENU_THEMES     "&Cambiar tema"
     IDM_THEMES_DEFAULT      "Defecto de f�brica"
     IDM_THEMES_FILE_ITEM    "Ajustes est�ndar"
 END
diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc
index 062139a0f..de7eb3c2b 100644
--- a/language/np3_fr_fr/menu_fr_fr.rc
+++ b/language/np3_fr_fr/menu_fr_fr.rc
@@ -295,11 +295,13 @@ BEGIN
     END
     POPUP "&Affichage"
     BEGIN
-        POPUP "&Sch�me"
+        POPUP "&Th�mes"
         BEGIN
+            MENUITEM "&Personnaliser les Sch�mes...\tCtrl+F12",         IDM_VIEW_SCHEMECONFIG
+            MENUITEM SEPARATOR
             MENUITEM "Sch�me Synta&xe...\tF12",                         IDM_VIEW_SCHEME
             MENUITEM "&2�me D�faut Sch�me\tShift+F12",                  IDM_VIEW_USE2NDDEFAULT
-            MENUITEM "&Personnaliser les Sch�mes...\tCtrl+F12",         IDM_VIEW_SCHEMECONFIG
+            MENUITEM SEPARATOR
             MENUITEM "Globale &D�faut Police...\tAlt+F12",              IDM_VIEW_FONT
             MENUITEM "Actuel Sc&h�me D�faut Police...\tCtrl+Alt+F12",   IDM_VIEW_CURRENTSCHEME
         END
@@ -349,7 +351,7 @@ BEGIN
         END
         POPUP "&Barre � outils"
         BEGIN
-            MENUITEM "A&fficher la barre � outils",         IDM_VIEW_TOOLBAR
+            MENUITEM "&Afficher la barre � outils",         IDM_VIEW_TOOLBAR
             MENUITEM "Al&terner la barre � outils",         IDM_VIEW_TOGGLETB
             MENUITEM "G�rer la barre � outils...",          IDM_VIEW_CUSTOMIZETB
             MENUITEM "&Charger un th�me d'outils...",       IDM_VIEW_LOADTHEMETB
diff --git a/language/np3_fr_fr/strings_fr_fr.rc b/language/np3_fr_fr/strings_fr_fr.rc
index 32d799b8b..7981e2218 100644
--- a/language/np3_fr_fr/strings_fr_fr.rc
+++ b/language/np3_fr_fr/strings_fr_fr.rc
@@ -134,7 +134,7 @@ BEGIN
     IDS_MUI_ERR_UNICODE     "Erreur lors de la conversion de ce fichier Unicode.\nLes donn�es seront perdues si le fichier est sauvegard�!"
     IDS_MUI_ERR_BITMAP      "Erreur chargement bitmap ""%s"".\nDimensions n�cessaires: %i x %i (largeur >= %i x hauteur)."
     IDS_MUI_ERR_ELEVATED_RIGHTS
-                            "Erreur lors de l'�l�vation des droits de l'utilisateur!"
+                            "Erreur d'�l�vation des droits de l'utilisateur!"
 END
 
 STRINGTABLE
@@ -234,7 +234,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_MUI_MENU_LANGUAGE   "&Langue"
-    IDS_MUI_MENU_THEMES     "&Th�mes"
+    IDS_MUI_MENU_THEMES     "&Changer de th�me"
     IDM_THEMES_DEFAULT      "D�faut de fabrication"
     IDM_THEMES_FILE_ITEM    "Param�tres standard"
 END
diff --git a/language/np3_hu_hu/menu_hu_hu.rc b/language/np3_hu_hu/menu_hu_hu.rc
index 5fc363e2b..9216675b3 100644
--- a/language/np3_hu_hu/menu_hu_hu.rc
+++ b/language/np3_hu_hu/menu_hu_hu.rc
@@ -295,11 +295,13 @@ BEGIN
     END
     POPUP "&N�zet"
     BEGIN
-        POPUP "&Sz�nkiemel�s"
+        POPUP "&T�m�k"
         BEGIN
+            MENUITEM "Sa&blonok testreszab�sa...\tCtrl+F12",               IDM_VIEW_SCHEMECONFIG
+            MENUITEM SEPARATOR
             MENUITEM "&Sz�nkiemel�si sablon...\tF12",                      IDM_VIEW_SCHEME
             MENUITEM "&2. sz�nkiem. sablon\tShift+F12",                    IDM_VIEW_USE2NDDEFAULT
-            MENUITEM "Sa&blonok testreszab�sa...\tCtrl+F12",               IDM_VIEW_SCHEMECONFIG
+            MENUITEM SEPARATOR
             MENUITEM "�ltal�nos bet�t�&pus...\tAlt+F12",                   IDM_VIEW_FONT
             MENUITEM "&Jelenlegi sablon alap bet�t�pusa...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME
         END
diff --git a/language/np3_hu_hu/strings_hu_hu.rc b/language/np3_hu_hu/strings_hu_hu.rc
index 5b7503742..96040dd05 100644
--- a/language/np3_hu_hu/strings_hu_hu.rc
+++ b/language/np3_hu_hu/strings_hu_hu.rc
@@ -234,7 +234,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_MUI_MENU_LANGUAGE   "N&yelv"
-    IDS_MUI_MENU_THEMES     "&T�m�k"
+    IDS_MUI_MENU_THEMES     "T�ma &v�lt�sa"
     IDM_THEMES_DEFAULT      "Gy�ri �rt�k"
     IDM_THEMES_FILE_ITEM    "Standard be�ll�t�sok"
 END
@@ -285,7 +285,7 @@ Notepad3 /v d:\\temp\\Test.txt\r\n\
 
 IDS_MUI_STYLEEDIT_HELP "\
 F�jln�v kiterjeszt�seket ';'-vel kell elv�lasztani\r\n\
-Haszn�lja a  \\<reg.kif.>; f�jln�v minta megad�s�hoz:\r\n\
+haszn�lja a \\<regex>; f�jln�v minta megad�s�hoz:\r\n\
    \\xyz$;   => f�jlnevek (n�vt� �s kiterjeszt�s) ahol 'xyz' a v�ge.\r\n\r\n\
 St�lus form�tum:\r\n\
 font:Name; size:[+/-]nn.mm; bold; italic; underline;\r\n\
diff --git a/language/np3_it_it/menu_it_it.rc b/language/np3_it_it/menu_it_it.rc
index 6f5d95a6f..b31ec2c22 100644
--- a/language/np3_it_it/menu_it_it.rc
+++ b/language/np3_it_it/menu_it_it.rc
@@ -295,11 +295,13 @@ BEGIN
     END
     POPUP "&Visualizza"
     BEGIN
-        POPUP "&Schema"
+        POPUP "&Temi"
         BEGIN
+            MENUITEM "&Personalizza Schemi...\tCtrl+F12",                      IDM_VIEW_SCHEMECONFIG
+            MENUITEM SEPARATOR
             MENUITEM "Schema Sintassi...\tF12",                                IDM_VIEW_SCHEME
             MENUITEM "&2� Schema di Default\tShift+F12",                       IDM_VIEW_USE2NDDEFAULT
-            MENUITEM "&Personalizza Schemi...\tCtrl+F12",                      IDM_VIEW_SCHEMECONFIG
+            MENUITEM SEPARATOR
             MENUITEM "Font Globale di &Default...\tAlt+F12",                   IDM_VIEW_FONT
             MENUITEM "Font di Default dello Schema corrente...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME
         END
@@ -349,7 +351,7 @@ BEGIN
         END
         POPUP "&Toolbar"
         BEGIN
-            MENUITEM "Mostra Tool&bar",               IDM_VIEW_TOOLBAR
+            MENUITEM "Mostra &Toolbar",               IDM_VIEW_TOOLBAR
             MENUITEM "Ca&mbia Toolbar",               IDM_VIEW_TOGGLETB
             MENUITEM "&Personalizza Toolbar...",      IDM_VIEW_CUSTOMIZETB
             MENUITEM "&Carica Tema Toolbar...",       IDM_VIEW_LOADTHEMETB
diff --git a/language/np3_it_it/strings_it_it.rc b/language/np3_it_it/strings_it_it.rc
index fae2b4cfa..889db44fe 100644
--- a/language/np3_it_it/strings_it_it.rc
+++ b/language/np3_it_it/strings_it_it.rc
@@ -134,7 +134,7 @@ BEGIN
     IDS_MUI_ERR_UNICODE     "Errore nella conversione di questo file Unicode.\nCi sar� una perdita di dati se salvi il file!"
     IDS_MUI_ERR_BITMAP      "Error loading bitmap ""%s"".\nNeed dimensions: %i x %i (width >= %i x height)."
     IDS_MUI_ERR_ELEVATED_RIGHTS
-                            "Errore durante l'aumento dei diritti utente!"
+                            "Errore di elevazione dei diritti utente!"
 END
 
 STRINGTABLE
@@ -234,7 +234,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_MUI_MENU_LANGUAGE   "&Lingua"
-    IDS_MUI_MENU_THEMES     "&Temi"
+    IDS_MUI_MENU_THEMES     "&Cambia tema"
     IDM_THEMES_DEFAULT      "Impostazioni di fabbrica"
     IDM_THEMES_FILE_ITEM    "Impostazioni standard"
 END
@@ -285,7 +285,7 @@ Notepad3 /v d:\\temp\\Test.txt\r\n\
 
 IDS_MUI_STYLEEDIT_HELP "\
 Le estensioni devono essere separate con ';'\r\n\
-use \\<regex>; to define a filename matching pattern:\r\n\
+Usa il backslash (\\) per definire un pattern di riconoscimento filename:\r\n\
    \\xyz$;   => filenames(basename+ext) with 'xyz' as last chars.\r\n\r\n\
 Formato Stile:\r\n\
 font:Name; size:[+/-]nn.mm; bold; italic; underline;\r\n\
diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc
index 46c241957..0e88b8174 100644
--- a/language/np3_ja_jp/menu_ja_jp.rc
+++ b/language/np3_ja_jp/menu_ja_jp.rc
@@ -295,11 +295,13 @@ BEGIN
     END
     POPUP "�\��(&V)"
     BEGIN
-        POPUP "�z�F(&S)"
+        POPUP "�e�[�}(&T)"
         BEGIN
+            MENUITEM "�z�F�̕ҏW(&C)...\tCtrl+F12",              IDM_VIEW_SCHEMECONFIG
+            MENUITEM SEPARATOR
             MENUITEM "�����̎�ނ�I��(&X)...\tF12",              IDM_VIEW_SCHEME
             MENUITEM "�W���z�F2�ŕ\��(&2)\tShift+F12",           IDM_VIEW_USE2NDDEFAULT
-            MENUITEM "�z�F�̕ҏW(&C)...\tCtrl+F12",              IDM_VIEW_SCHEMECONFIG
+            MENUITEM SEPARATOR
             MENUITEM "�t�H���g�ݒ�/����(&D)...\tAlt+F12",          IDM_VIEW_FONT
             MENUITEM "�t�H���g�ݒ�/�K�p��(&H)...\tCtrl+Alt+F12",   IDM_VIEW_CURRENTSCHEME
         END
@@ -349,8 +351,8 @@ BEGIN
         END
         POPUP "�c�[���o�[(&T)"
         BEGIN
-            MENUITEM "�c�[���o�[��\��(&B)",                        IDM_VIEW_TOOLBAR
-            MENUITEM "�A�C�R���召�̐؂�ւ�(&G)",                          IDM_VIEW_TOGGLETB
+            MENUITEM "�c�[���o�[��\��(&T)",                        IDM_VIEW_TOOLBAR
+            MENUITEM "�A�C�R���召�̐؂�ւ�(&G)",                    IDM_VIEW_TOGGLETB
             MENUITEM "�c�[���o�[�̕ҏW(&C)...",                     IDM_VIEW_CUSTOMIZETB
             MENUITEM "�c�[���o�[�p�Ǝ��A�C�R����ݒ�(&L)...",                   IDM_VIEW_LOADTHEMETB
             MENUITEM "�X�e�[�^�X�o�[��\��(&S)",                      IDM_VIEW_STATUSBAR
diff --git a/language/np3_ja_jp/strings_ja_jp.rc b/language/np3_ja_jp/strings_ja_jp.rc
index 18510df57..9ef47f078 100644
--- a/language/np3_ja_jp/strings_ja_jp.rc
+++ b/language/np3_ja_jp/strings_ja_jp.rc
@@ -134,7 +134,7 @@ BEGIN
     IDS_MUI_ERR_UNICODE     "Unicode�ւ̕ϊ����ɃG���[���������܂����B\n�t�@�C����ۑ�����ƃf�[�^�������邩������܂���B"
     IDS_MUI_ERR_BITMAP      "�r�b�g�}�b�v�t�@�C���̓ǂݍ��݃G���[: %s\n�K�v�Ȑ��@: %i x %i (���� >= %i x ����)."
     IDS_MUI_ERR_ELEVATED_RIGHTS
-                            "Error elevating user rights!"
+                            "���[�U�[�����̏��i�G���[�B"
 END
 
 STRINGTABLE
@@ -234,7 +234,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_MUI_MENU_LANGUAGE   "����(&L)"
-    IDS_MUI_MENU_THEMES     "�e�[�}(&T)"
+    IDS_MUI_MENU_THEMES     "�e�[�}��؂�ւ���(&S)"
     IDM_THEMES_DEFAULT      "�����ݒ�"
     IDM_THEMES_FILE_ITEM    "�W���ݒ�"
 END
diff --git a/language/np3_ko_kr/menu_ko_kr.rc b/language/np3_ko_kr/menu_ko_kr.rc
index 55cffb61a..0a6dec3e9 100644
--- a/language/np3_ko_kr/menu_ko_kr.rc
+++ b/language/np3_ko_kr/menu_ko_kr.rc
@@ -295,11 +295,13 @@ BEGIN
     END
     POPUP "����(&V)"
     BEGIN
-        POPUP "����(&S)"
+        POPUP "�׸�(&T)"
         BEGIN
+            MENUITEM "���� ����(&C)...\tCtrl+F12",                  IDM_VIEW_SCHEMECONFIG
+            MENUITEM SEPARATOR
             MENUITEM "���� ����(&X)...\tF12",                       IDM_VIEW_SCHEME
             MENUITEM "&2nd �⺻ ��Ű��\tShift+F12",                   IDM_VIEW_USE2NDDEFAULT
-            MENUITEM "���� ����(&C)...\tCtrl+F12",                  IDM_VIEW_SCHEMECONFIG
+            MENUITEM SEPARATOR
             MENUITEM "��ü �⺻ �۲�(&D)...\tAlt+F12",                IDM_VIEW_FONT
             MENUITEM "���� ��Ű�� �⺻ �۲�(&H)...\tCtrl+Alt+F12",    IDM_VIEW_CURRENTSCHEME
         END
@@ -349,7 +351,7 @@ BEGIN
         END
         POPUP "���� ����(&T)"
         BEGIN
-            MENUITEM "���� ���� ���̱�(&B)",               IDM_VIEW_TOOLBAR
+            MENUITEM "���� ���� ���̱�(&T)",               IDM_VIEW_TOOLBAR
             MENUITEM "���� ���� ��ȯ(&G)",                 IDM_VIEW_TOGGLETB
             MENUITEM "���� ���� ����� ����(&U)...",        IDM_VIEW_CUSTOMIZETB
             MENUITEM "���� ���� �׸� ����(&L)...",          IDM_VIEW_LOADTHEMETB
diff --git a/language/np3_ko_kr/strings_ko_kr.rc b/language/np3_ko_kr/strings_ko_kr.rc
index 31dbe0d9b..04f38a8bb 100644
--- a/language/np3_ko_kr/strings_ko_kr.rc
+++ b/language/np3_ko_kr/strings_ko_kr.rc
@@ -234,7 +234,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_MUI_MENU_LANGUAGE   "����(&L)"
-    IDS_MUI_MENU_THEMES     "�׸�(&T)"
+    IDS_MUI_MENU_THEMES     "�׸� ��ȯ(&S)"
     IDM_THEMES_DEFAULT      "�ʱ�ȭ"
     IDM_THEMES_FILE_ITEM    "ǥ�� ����"
 END
diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc
index c6ddea600..22777ef13 100644
--- a/language/np3_nl_nl/menu_nl_nl.rc
+++ b/language/np3_nl_nl/menu_nl_nl.rc
@@ -295,11 +295,13 @@ BEGIN
     END
     POPUP "Beel&d"
     BEGIN
-        POPUP "&Scheme"
+        POPUP "&Thema's"
         BEGIN
+            MENUITEM "&Aanpassen Schemes...\tCtrl+F12",                 IDM_VIEW_SCHEMECONFIG
+            MENUITEM SEPARATOR
             MENUITEM "Synta&xis Scheme...\tF12",                        IDM_VIEW_SCHEME
             MENUITEM "&2de Standaard Scheme\tShift+F12",                IDM_VIEW_USE2NDDEFAULT
-            MENUITEM "&Aanpassen Schemes...\tCtrl+F12",                 IDM_VIEW_SCHEMECONFIG
+            MENUITEM SEPARATOR
             MENUITEM "Globaal Stan&daard Lettertype...\tAlt+F12",       IDM_VIEW_FONT
             MENUITEM "Actueel Sc&heme Standaard Lettertype...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME
         END
@@ -349,7 +351,7 @@ BEGIN
         END
         POPUP "&Werkbalk"
         BEGIN
-            MENUITEM "Werk&balk tonen",                                 IDM_VIEW_TOOLBAR
+            MENUITEM "&Werkbalk tonen",                                 IDM_VIEW_TOOLBAR
             MENUITEM "To&ggle werkbalk",                                IDM_VIEW_TOGGLETB
             MENUITEM "Werkbal&k aanpassen...",                          IDM_VIEW_CUSTOMIZETB
             MENUITEM "&Laden een werkbalk thema...",                    IDM_VIEW_LOADTHEMETB
diff --git a/language/np3_nl_nl/strings_nl_nl.rc b/language/np3_nl_nl/strings_nl_nl.rc
index 656b52fef..56e2c459e 100644
--- a/language/np3_nl_nl/strings_nl_nl.rc
+++ b/language/np3_nl_nl/strings_nl_nl.rc
@@ -134,7 +134,7 @@ BEGIN
     IDS_MUI_ERR_UNICODE     "Fout bij het converteren van dit Unicode bestand.\nGegevens gaan verloren als het bestand wordt opgeslagen!"
     IDS_MUI_ERR_BITMAP      "Fout bij laden van bitmap ""%s"".\nDimensies nodig: %i x %i (breedte >= %i x hoogte)."
     IDS_MUI_ERR_ELEVATED_RIGHTS
-                            "Fout tijdens het verhogen van gebruikersrechten!"
+                            "Fout bij het verhogen van gebruikersrechten!"
 END
 
 STRINGTABLE
@@ -234,7 +234,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_MUI_MENU_LANGUAGE   "&Taal"
-    IDS_MUI_MENU_THEMES     "The&ma's"
+    IDS_MUI_MENU_THEMES     "&Wissel van thema"
     IDM_THEMES_DEFAULT      "Fabrieksinstelling"
     IDM_THEMES_FILE_ITEM    "Standaard instellingen"
 END
diff --git a/language/np3_pl_pl/menu_pl_pl.rc b/language/np3_pl_pl/menu_pl_pl.rc
index 0294a5497..c9ca84742 100644
--- a/language/np3_pl_pl/menu_pl_pl.rc
+++ b/language/np3_pl_pl/menu_pl_pl.rc
@@ -295,11 +295,13 @@ BEGIN
     END
     POPUP "&Widok"
     BEGIN
-        POPUP "&Schemat"
+        POPUP "&Tematy"
         BEGIN
+            MENUITEM "&Dostosuj schematy...\tCtrl+F12",                       IDM_VIEW_SCHEMECONFIG
+            MENUITEM SEPARATOR
             MENUITEM "Schemat sk�adni...\tF12",                               IDM_VIEW_SCHEME
             MENUITEM "&Alternatywny schemat sk�adni\tShift+F12",              IDM_VIEW_USE2NDDEFAULT
-            MENUITEM "&Dostosuj schematy...\tCtrl+F12",                       IDM_VIEW_SCHEMECONFIG
+            MENUITEM SEPARATOR
             MENUITEM "Domy�lna czcionka...\tAlt+F12",                         IDM_VIEW_FONT
             MENUITEM "Domy�lna czcionka bie��cego schematu...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME
         END
@@ -349,7 +351,7 @@ BEGIN
         END
         POPUP "&Pasek narz�dzi"
         BEGIN
-            MENUITEM "Poka� pasek narz�dzi",                        IDM_VIEW_TOOLBAR
+            MENUITEM "&Poka� pasek narz�dzi",                        IDM_VIEW_TOOLBAR
             MENUITEM "Prze��cz pasek narz�dzi",                     IDM_VIEW_TOGGLETB
             MENUITEM "Dostosuj pasek narz�dzi...",                  IDM_VIEW_CUSTOMIZETB
             MENUITEM "&Za�aduj motyw paska narz�dzi...",            IDM_VIEW_LOADTHEMETB
diff --git a/language/np3_pl_pl/strings_pl_pl.rc b/language/np3_pl_pl/strings_pl_pl.rc
index d84983d93..bd6d505d5 100644
--- a/language/np3_pl_pl/strings_pl_pl.rc
+++ b/language/np3_pl_pl/strings_pl_pl.rc
@@ -134,7 +134,7 @@ BEGIN
     IDS_MUI_ERR_UNICODE     "B��d podczas kodowania pliku Unicode.\nDane zostan� utracone je�li plik zapisano!"
     IDS_MUI_ERR_BITMAP      "B��d podczas �adowania mapy bitowej ""%s"".\nWymagany rozmiar: %i x %i (szer. >= %i x wys.)."
     IDS_MUI_ERR_ELEVATED_RIGHTS
-                            "Error while elevating user rights!"
+                            "Error elevating user rights!"
 END
 
 STRINGTABLE
@@ -233,8 +233,8 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_MUI_MENU_LANGUAGE   "&Language"
-    IDS_MUI_MENU_THEMES     "&Themes"
+    IDS_MUI_MENU_LANGUAGE   "&J�zyk"
+    IDS_MUI_MENU_THEMES     "&Prze��cz motyw"
     IDM_THEMES_DEFAULT      "Factory Default"
     IDM_THEMES_FILE_ITEM    "Standard Settings"
 END
diff --git a/language/np3_pt_br/menu_pt_br.rc b/language/np3_pt_br/menu_pt_br.rc
index 30d2df189..5cb1b66b0 100644
--- a/language/np3_pt_br/menu_pt_br.rc
+++ b/language/np3_pt_br/menu_pt_br.rc
@@ -295,11 +295,13 @@ BEGIN
     END
     POPUP "&View"
     BEGIN
-        POPUP "&Scheme"
+        POPUP "&Themes"
         BEGIN
+            MENUITEM "&Customise Schemes...\tCtrl+F12",                 IDM_VIEW_SCHEMECONFIG
+            MENUITEM SEPARATOR
             MENUITEM "Synta&x Scheme...\tF12",                          IDM_VIEW_SCHEME
             MENUITEM "&2nd Default Scheme\tShift+F12",                  IDM_VIEW_USE2NDDEFAULT
-            MENUITEM "&Customise Schemes...\tCtrl+F12",                 IDM_VIEW_SCHEMECONFIG
+            MENUITEM SEPARATOR
             MENUITEM "Global &Default Font...\tAlt+F12",                IDM_VIEW_FONT
             MENUITEM "Current Sc&heme's Default Font...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME
         END
@@ -349,7 +351,7 @@ BEGIN
         END
         POPUP "&Toolbar"
         BEGIN
-            MENUITEM "Show Tool&bar",               IDM_VIEW_TOOLBAR
+            MENUITEM "Show &Toolbar",               IDM_VIEW_TOOLBAR
             MENUITEM "To&ggle Toolbar",             IDM_VIEW_TOGGLETB
             MENUITEM "C&ustomise Toolbar...",       IDM_VIEW_CUSTOMIZETB
             MENUITEM "&Load Toolbar Theme...",      IDM_VIEW_LOADTHEMETB
diff --git a/language/np3_pt_br/strings_pt_br.rc b/language/np3_pt_br/strings_pt_br.rc
index db43da901..6402ba1c0 100644
--- a/language/np3_pt_br/strings_pt_br.rc
+++ b/language/np3_pt_br/strings_pt_br.rc
@@ -134,7 +134,7 @@ BEGIN
     IDS_MUI_ERR_UNICODE     "Error converting this Unicode file.\nData will be lost if the file is saved!"
     IDS_MUI_ERR_BITMAP      "Error loading bitmap ""%s"".\nNeed dimensions: %i x %i (width >= %i x height)."
     IDS_MUI_ERR_ELEVATED_RIGHTS
-                            "Error while elevating user rights!"
+                            "Error elevating user rights!"
 END
 
 STRINGTABLE
@@ -234,7 +234,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_MUI_MENU_LANGUAGE   "&Language"
-    IDS_MUI_MENU_THEMES     "&Themes"
+    IDS_MUI_MENU_THEMES     "&Switch Theme"
     IDM_THEMES_DEFAULT      "Factory Default"
     IDM_THEMES_FILE_ITEM    "Standard Settings"
 END
diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc
index 1cac6c571..86eb53d07 100644
--- a/language/np3_ru_ru/menu_ru_ru.rc
+++ b/language/np3_ru_ru/menu_ru_ru.rc
@@ -295,11 +295,13 @@ BEGIN
     END
     POPUP "&���"
     BEGIN
-        POPUP "�&����"
+        POPUP "&����"
         BEGIN
+            MENUITEM "&��������� ������...\tCtrl+F12",                          IDM_VIEW_SCHEMECONFIG
+            MENUITEM SEPARATOR
             MENUITEM "&C���� ����������...\tF12",                               IDM_VIEW_SCHEME
             MENUITEM "&������ ����� �� ���������\tShift+F12",                   IDM_VIEW_USE2NDDEFAULT
-            MENUITEM "&��������� ������...\tCtrl+F12",                          IDM_VIEW_SCHEMECONFIG
+            MENUITEM SEPARATOR
             MENUITEM "����� &����� �� ���������...\tAlt+F12",                   IDM_VIEW_FONT
             MENUITEM "����� �� ��������� ��� &������� �����...\tCtrl+Alt+F12",  IDM_VIEW_CURRENTSCHEME
         END
diff --git a/language/np3_ru_ru/strings_ru_ru.rc b/language/np3_ru_ru/strings_ru_ru.rc
index bf5b74c95..6a6ce9d63 100644
--- a/language/np3_ru_ru/strings_ru_ru.rc
+++ b/language/np3_ru_ru/strings_ru_ru.rc
@@ -234,7 +234,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_MUI_MENU_LANGUAGE   "&����"
-    IDS_MUI_MENU_THEMES     "&����"
+    IDS_MUI_MENU_THEMES     "&����������� ����"
     IDM_THEMES_DEFAULT      "��������� ���������"
     IDM_THEMES_FILE_ITEM    "����������� ���������"
 END
@@ -285,7 +285,7 @@ Notepad3 /v d:\\temp\\Test.txt\r\n\
 
 IDS_MUI_STYLEEDIT_HELP "\
 ���������� ������ ������ ���� ��������� �������� ;\r\n\
-use \\<regex>; to define a filename matching pattern:\r\n\
+����������� \\<regex>; ��� ����������� ������� ����� �����:\r\n\
    \\xyz$;   => ��� ����� (basename+ext) � 'xyz' � �����.\r\n\r\n\
 ������ �����:\r\n\
 font:Name; size:[+/-]nn.mm; bold; italic; underline;\r\n\
diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc
index d938d5822..089fbd8b5 100644
--- a/language/np3_zh_cn/menu_zh_cn.rc
+++ b/language/np3_zh_cn/menu_zh_cn.rc
@@ -295,11 +295,13 @@ BEGIN
     END
     POPUP "�鿴(&V)"
     BEGIN
-        POPUP "�﷨��������(&S)"
+        POPUP "����(&T)"
         BEGIN
+            MENUITEM "�Զ����﷨��������(&C)...\tCtrl+F12",          IDM_VIEW_SCHEMECONFIG
+            MENUITEM SEPARATOR
             MENUITEM "ѡ���﷨��������(&X)...\tF12",                 IDM_VIEW_SCHEME
             MENUITEM "ʹ�ñ�ѡ������ʽ(&2)\tShift+F12",              IDM_VIEW_USE2NDDEFAULT
-            MENUITEM "�Զ����﷨��������(&C)...\tCtrl+F12",          IDM_VIEW_SCHEMECONFIG
+            MENUITEM SEPARATOR
             MENUITEM "ȫ��Ĭ������(&D)...\tAlt+F12",                 IDM_VIEW_FONT
             MENUITEM "��ǰ����Ĭ������(&H)...\tCtrl+Alt+F12",        IDM_VIEW_CURRENTSCHEME
         END
diff --git a/language/np3_zh_cn/strings_zh_cn.rc b/language/np3_zh_cn/strings_zh_cn.rc
index ee90ea02e..bb6befd7a 100644
--- a/language/np3_zh_cn/strings_zh_cn.rc
+++ b/language/np3_zh_cn/strings_zh_cn.rc
@@ -234,7 +234,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_MUI_MENU_LANGUAGE   "����(&L)"
-    IDS_MUI_MENU_THEMES     "����(&T)"
+    IDS_MUI_MENU_THEMES     "�����(&S)"
     IDM_THEMES_DEFAULT      "����Ĭ��(&F)"
     IDM_THEMES_FILE_ITEM    "��׼����(&S)"
 END
@@ -285,7 +285,7 @@ Notepad3 /v d:\\temp\\Test.txt\r\n\
 
 IDS_MUI_STYLEEDIT_HELP "\
 �ļ���չ�������� ; ������\r\n\
-use \\<regex>; to define a filename matching pattern:\r\n\
+ʹ�� \\<regex>; �ɶ�������ƥ���ļ������������ʽ��\r\n\
    ���� \\xyz$; ��ƥ���� xyz ��β���ļ���������չ������\r\n\r\n\
 ��ʽ��ʽ��\r\n\
 font:Name; size:[+/-]nn.mm; bold; italic; underline;\r\n\
diff --git a/src/Notepad3.c b/src/Notepad3.c
index 48fa7fa0b..ece1d4354 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -709,7 +709,10 @@ static bool _InsertLanguageMenu(HMENU hMenuBar)
   int const pos = GetMenuItemCount(hMenuBar) - 1;
   if (pos >= 0) {
     GetLngString(IDS_MUI_MENU_LANGUAGE, wchMenuItemStrg, COUNTOF(wchMenuItemStrg));
-    return InsertMenu(hMenuBar, pos, MF_BYPOSITION | MF_POPUP | MF_STRING, (UINT_PTR)hmenuLanguage, wchMenuItemStrg);
+    //return InsertMenu(hMenuBar, pos, MF_BYPOSITION | MF_POPUP | MF_STRING, (UINT_PTR)hmenuLanguage, wchMenuItemStrg);
+    bool const res = InsertMenu(hMenuBar, IDM_VIEW_TABSASSPACES, MF_BYCOMMAND | MF_POPUP | MF_STRING, (UINT_PTR)hmenuLanguage, wchMenuItemStrg);
+    InsertMenu(hMenuBar, IDM_VIEW_TABSASSPACES, MF_BYCOMMAND | MF_SEPARATOR, (UINT_PTR)NULL, NULL);
+    return res;
   }
   return false;
 }
diff --git a/src/Styles.c b/src/Styles.c
index e2db64b63..9a0231037 100644
--- a/src/Styles.c
+++ b/src/Styles.c
@@ -259,7 +259,7 @@ void Style_SetIniFile(LPCWSTR szIniFile)
 bool Style_InsertThemesMenu(HMENU hMenuBar)
 {
   HMENU hmenuThemes = CreatePopupMenu();
-  int const pos = GetMenuItemCount(hMenuBar) - 1;
+  //int const pos = GetMenuItemCount(hMenuBar) - 1;
 
   GetLngString(Theme_Files[0].rid, Theme_Files[0].szName, COUNTOF(Theme_Files[0].szName));
   GetLngString(Theme_Files[1].rid, Theme_Files[1].szName, COUNTOF(Theme_Files[1].szName));
@@ -281,7 +281,8 @@ bool Style_InsertThemesMenu(HMENU hMenuBar)
   WCHAR wchMenuItemStrg[80] = { L'\0' };
   GetLngString(IDS_MUI_MENU_THEMES, wchMenuItemStrg, COUNTOF(wchMenuItemStrg));
 
-  bool const res = InsertMenu(hMenuBar, pos, MF_BYPOSITION | MF_POPUP | MF_STRING, (UINT_PTR)hmenuThemes, wchMenuItemStrg);
+  //bool const res = InsertMenu(hMenuBar, pos, MF_BYPOSITION | MF_POPUP | MF_STRING, (UINT_PTR)hmenuThemes, wchMenuItemStrg);
+  bool const res = InsertMenu(hMenuBar, IDM_VIEW_SCHEMECONFIG, MF_BYCOMMAND | MF_POPUP | MF_STRING, (UINT_PTR)hmenuThemes, wchMenuItemStrg);
 
   CheckCmd(hMenuBar, Theme_Files[s_idxSelectedTheme].rid, true);