diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml
index bf7c30168..8f4981721 100644
--- a/PowerEditor/installer/nativeLang/english.xml
+++ b/PowerEditor/installer/nativeLang/english.xml
@@ -5,7 +5,7 @@ Translation note:
 2. All the comments are for explanation, they are not for translation.
 -->
 <NotepadPlus>
-	<Native-Langue name="English" filename="english.xml" version="8.8">
+	<Native-Langue name="English" filename="english.xml" version="8.8.1">
 		<Menu>
 			<Main>
 				<!-- Main Menu Entries -->
@@ -994,6 +994,8 @@ Translation note:
 					<Item id="6120" name="Vertical"/>
 					<Item id="6121" name="Exit on close the last tab"/>
 					<Item id="6128" name="Alternate icons"/>
+					<Item id="6125" name="Behavior"/>
+					<Item id="6126" name="Look &amp;&amp; feel"/>
 				</Tabbar>
 
 				<Scintillas title="Editing 1">
diff --git a/PowerEditor/installer/nativeLang/english_customizable.xml b/PowerEditor/installer/nativeLang/english_customizable.xml
index 8adac4b04..708807135 100644
--- a/PowerEditor/installer/nativeLang/english_customizable.xml
+++ b/PowerEditor/installer/nativeLang/english_customizable.xml
@@ -5,7 +5,7 @@ Translation note:
 2. All the comments are for explanation, they are not for translation.
 -->
 <NotepadPlus>
-	<Native-Langue name="English" filename="english_customizable.xml" version="8.8">
+	<Native-Langue name="English" filename="english_customizable.xml" version="8.8.1">
 		<Menu>
 			<Main>
 				<!-- Main Menu Entries -->
@@ -994,6 +994,8 @@ Translation note:
 					<Item id="6120" name="Vertical"/>
 					<Item id="6121" name="Exit on close the last tab"/>
 					<Item id="6128" name="Alternate icons"/>
+					<Item id="6125" name="Behavior"/>
+					<Item id="6126" name="Look &amp;&amp; feel"/>
 				</Tabbar>
 
 				<Scintillas title="Editing 1">
diff --git a/PowerEditor/installer/nativeLang/french.xml b/PowerEditor/installer/nativeLang/french.xml
index c492e0809..6efd283a5 100644
--- a/PowerEditor/installer/nativeLang/french.xml
+++ b/PowerEditor/installer/nativeLang/french.xml
@@ -5,7 +5,7 @@ Translation note:
 2. All the comments are for explanation, they are not for translation.
 -->
 <NotepadPlus>
-	<Native-Langue name="Français" filename="french.xml" version="8.8">
+	<Native-Langue name="Français" filename="french.xml" version="8.8.1">
 		<Menu>
 			<Main>
 				<!-- Main Menu Entries -->
@@ -993,6 +993,8 @@ Translation note:
 					<Item id="6120" name="Verticale"/>
 					<Item id="6121" name="Quitter lors de la fermeture du dernier onglet"/>
 					<Item id="6128" name="Icônes alternatives"/>
+					<Item id="6125" name="Comportement"/>
+					<Item id="6126" name="Aspect visuel"/>
 				</Tabbar>
 
 				<Scintillas title="Zones d’édition 1">
diff --git a/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml b/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml
index cbd90cd84..920219e63 100644
--- a/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml
+++ b/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <NotepadPlus>
-	<Native-Langue name="台灣繁體" filename="taiwaneseMandarin.xml" version="8.8">
+	<Native-Langue name="台灣繁體" filename="taiwaneseMandarin.xml" version="8.8.1">
 		<Menu>
 			<Main>
 				<!-- Main Menu Entries -->
@@ -952,6 +952,8 @@
 					<Item id="6119" name="多行"/>
 					<Item id="6120" name="直式"/>
 					<Item id="6121" name="關閉最後一個文件時關閉程式"/>
+					<Item id="6125" name="功能表現"/>
+					<Item id="6126" name="外觀與體驗"/>
 				</Tabbar>
 
 				<Scintillas title="編輯一">
diff --git a/PowerEditor/src/WinControls/DockingWnd/dockingResource.h b/PowerEditor/src/WinControls/DockingWnd/dockingResource.h
index c15aedf84..5a303fe90 100644
--- a/PowerEditor/src/WinControls/DockingWnd/dockingResource.h
+++ b/PowerEditor/src/WinControls/DockingWnd/dockingResource.h
@@ -56,6 +56,4 @@
 	#define DMN_SWITCHIN                (DMN_FIRST + 4)
 	#define DMN_SWITCHOFF               (DMN_FIRST + 5)
 	#define DMN_FLOATDROPPED            (DMN_FIRST + 6)
-	//nmhdr.code = DWORD(DMN_XXX, 0);
-	//nmhdr.hwndFrom = DockingCont::_hself;
-	//nmhdr.idFrom = 0;
+
diff --git a/PowerEditor/src/WinControls/Preference/preference.rc b/PowerEditor/src/WinControls/Preference/preference.rc
index e0af64bfa..bbd8d1f00 100644
--- a/PowerEditor/src/WinControls/Preference/preference.rc
+++ b/PowerEditor/src/WinControls/Preference/preference.rc
@@ -85,14 +85,14 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     CONTROL         "Hide",IDC_CHECK_TAB_HIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,62,21,100,10
 
-    GROUPBOX        "",IDC_STATIC,50,38,181,130,BS_CENTER
+    GROUPBOX        "Behavior",IDC_GB_BEHAVIOR,50,38,181,130,BS_CENTER
     CONTROL         "Vertical",IDC_CHECK_TAB_VERTICAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,62,49,164,10
     CONTROL         "Multi-line",IDC_CHECK_TAB_MULTILINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,62,62,164,10
     CONTROL         "Lock (no drag and drop)",IDC_CHECK_LOCK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,62,126,164,10
     CONTROL         "Double click to close document",IDC_CHECK_DBCLICK2CLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,62,139,164,10
     CONTROL         "Exit on close the last tab",IDC_CHECK_TAB_LAST_EXIT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,62,152,164,10
 
-    GROUPBOX        "",IDC_STATIC,239,39,181,130,BS_CENTER
+    GROUPBOX        "Look && feel",IDC_GB_LOOKFEEL,239,38,181,130,BS_CENTER
     CONTROL         "Reduce",IDC_CHECK_REDUCE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,251,49,164,10
     CONTROL         "Alternate icons",IDC_CHECK_TAB_ALTICONS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,251,62,164,10
     CONTROL         "Change inactive tab color",IDC_CHECK_DRAWINACTIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,251,76,164,10
diff --git a/PowerEditor/src/WinControls/Preference/preference_rc.h b/PowerEditor/src/WinControls/Preference/preference_rc.h
index 00ed67327..413148906 100644
--- a/PowerEditor/src/WinControls/Preference/preference_rc.h
+++ b/PowerEditor/src/WinControls/Preference/preference_rc.h
@@ -67,6 +67,8 @@
 #define IDC_CHECK_HIDEMENUBAR                          6122
 #define IDC_LOCALIZATION_GB_STATIC                     6123
 #define IDC_COMBO_LOCALIZATION                         6124
+#define IDC_GB_BEHAVIOR                                6125
+#define IDC_GB_LOOKFEEL                                6126
 
 
 #define IDC_CHECK_TAB_ALTICONS                         6128