diff --git a/PowerEditor/src/MISC/RegExt/regExtDlg.rc b/PowerEditor/src/MISC/RegExt/regExtDlg.rc
index 407493f60..92a7ee450 100644
--- a/PowerEditor/src/MISC/RegExt/regExtDlg.rc
+++ b/PowerEditor/src/MISC/RegExt/regExtDlg.rc
@@ -21,19 +21,19 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "regExtDlgRc.h"
 
 
-IDD_REGEXT_BOX DIALOGEX 0, 0, 305, 147
+IDD_REGEXT_BOX DIALOGEX 0, 0, 370, 180
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    LISTBOX         IDC_REGEXT_LANGEXT_LIST,103,17,29,122,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-    LISTBOX         IDC_REGEXT_REGISTEREDEXTS_LIST,173,16,48,123,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "->",IDC_ADDFROMLANGEXT_BUTTON,140,73,26,14
-    EDITTEXT        IDC_CUSTOMEXT_EDIT,103,73,30,14,ES_AUTOHSCROLL | NOT WS_VISIBLE
-    PUSHBUTTON      "->",IDC_REMOVEEXT_BUTTON,228,72,26,14
-    CONTROL         "",IDC_POUPELLE_STATIC,"Static",SS_OWNERDRAW,263,68,20,20
-    LTEXT           "Supported exts :",IDC_SUPPORTEDEXTS_STATIC,35,4,77,8
-    LTEXT           "Registered exts :",IDC_REGISTEREDEXTS_STATIC,174,4,72,8
-    LISTBOX         IDC_REGEXT_LANG_LIST,35,17,63,122,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+    LISTBOX         IDC_REGEXT_LANGEXT_LIST,141,31,29,122,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+    LISTBOX         IDC_REGEXT_REGISTEREDEXTS_LIST,211,30,48,123,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "->",IDC_ADDFROMLANGEXT_BUTTON,178,87,26,14
+    EDITTEXT        IDC_CUSTOMEXT_EDIT,141,87,30,14,ES_AUTOHSCROLL | NOT WS_VISIBLE
+    PUSHBUTTON      "->",IDC_REMOVEEXT_BUTTON,266,86,26,14
+    CONTROL         "",IDC_POUPELLE_STATIC,"Static",SS_OWNERDRAW,301,82,20,20
+    LTEXT           "Supported exts :",IDC_SUPPORTEDEXTS_STATIC,73,18,77,8
+    LTEXT           "Registered exts :",IDC_REGISTEREDEXTS_STATIC,212,18,72,8
+    LISTBOX         IDC_REGEXT_LANG_LIST,73,31,63,122,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
 END
 
 
diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc
index e2b6e1dbc..5cb017c3d 100644
--- a/PowerEditor/src/Notepad_plus.rc
+++ b/PowerEditor/src/Notepad_plus.rc
@@ -49,7 +49,7 @@ BEGIN
         END
     END
 END
-
+/*
 // The GCC resouce compiler has different behavior the M$ resource compiler
 #ifdef __GNUC__
 #include ".\\ScitillaComponent\\UserDefineDialog.rc"
@@ -64,6 +64,7 @@ END
 #include ".\\WinControls\\WindowsDlg\\WindowsDlg.rc"
 
 #else
+
 1 TEXTINCLUDE DISCARDABLE
 BEGIN
     "#include "".\\ScitillaComponent\\UserDefineDialog.rc""\0"
@@ -115,7 +116,7 @@ BEGIN
 END
 
 #endif //__GNUC__
-
+*/
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
@@ -318,7 +319,7 @@ BEGIN
         MENUITEM "Unmark all",                IDM_SEARCH_UNMARKALL
         MENUITEM "&Replace...",                 IDM_SEARCH_REPLACE
         MENUITEM "&Incremental Search...",        IDM_SEARCH_FINDINCREMENT
-        MENUITEM "&Go to line...",                 IDM_SEARCH_GOTOLINE
+        MENUITEM "&Go to...",                 IDM_SEARCH_GOTOLINE
         MENUITEM SEPARATOR
         MENUITEM "Go to matching brace",                IDM_SEARCH_GOTOMATCHINGBRACE
         MENUITEM SEPARATOR
@@ -509,20 +510,22 @@ BEGIN
     CONTROL         "",IDI_M30ICON,"Static",SS_OWNERDRAW,21,10,20,20
 END
 
-IDD_GOLINE DIALOGEX 26, 41, 233, 67
+IDD_GOLINE DIALOGEX 26, 41, 233, 88
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_TOOLWINDOW | WS_EX_WINDOWEDGE
-CAPTION "Go To Line #"
+CAPTION "Go To..."
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT             "You are here :", ID_URHERE_STATIC,5,8,95,8,NOT WS_GROUP
-    LTEXT             "0123456789",ID_CURRLINE,100,8,45,8,NOT WS_GROUP
-    LTEXT             "You want to go :", ID_UGO_STATIC,5,21,95,8
-    EDITTEXT        ID_GOLINE_EDIT,100,20,45,12,ES_NUMBER
-    LTEXT             "You can't go further than :", ID_NOMORETHAN_STATIC,5,49,92,8,NOT WS_GROUP
-    LTEXT             "0123456789",ID_LASTLINE,99,49,45,8,NOT WS_GROUP
-    DEFPUSHBUTTON     "&Go !",IDOK,155,21,70,14,BS_NOTIFY
-    PUSHBUTTON        "I'm going nowhere",IDCANCEL,155,43,70,14,BS_NOTIFY
+    CONTROL         "Line",IDC_RADIO_GOTOLINE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,5,9,80,10
+    CONTROL         "Offset",IDC_RADIO_GOTOOFFSET,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,102,9,80,10
+    LTEXT           "You are here :",ID_URHERE_STATIC,5,34,95,8,NOT WS_GROUP
+    LTEXT           "0123456789",ID_CURRLINE,100,34,45,8,NOT WS_GROUP
+    LTEXT           "You want to go :",ID_UGO_STATIC,5,50,95,8
+    EDITTEXT        ID_GOLINE_EDIT,100,49,45,12,ES_NUMBER
+    LTEXT           "You can't go further than :",ID_NOMORETHAN_STATIC,5,73,92,8,NOT WS_GROUP
+    LTEXT           "0123456789",ID_LASTLINE,99,73,45,8,NOT WS_GROUP
+    DEFPUSHBUTTON   "&Go !",IDOK,155,47,70,14,BS_NOTIFY
+    PUSHBUTTON      "I'm going nowhere",IDCANCEL,155,69,70,14,BS_NOTIFY
 END
 
 IDD_VALUE_DLG DIALOGEX 0, 0, 74, 17
diff --git a/PowerEditor/src/ScitillaComponent/GoToLineDlg.cpp b/PowerEditor/src/ScitillaComponent/GoToLineDlg.cpp
index a65583967..1bcd72bf8 100644
--- a/PowerEditor/src/ScitillaComponent/GoToLineDlg.cpp
+++ b/PowerEditor/src/ScitillaComponent/GoToLineDlg.cpp
@@ -24,6 +24,7 @@ BOOL CALLBACK GoToLineDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lPara
 	{
 		case WM_INITDIALOG :
 		{
+			::SendDlgItemMessage(_hSelf, IDC_RADIO_GOTOLINE, BM_SETCHECK, TRUE, 0);
 			goToCenter();
 			return TRUE;
 		}
@@ -43,11 +44,37 @@ BOOL CALLBACK GoToLineDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lPara
                     {
                         display(false);
                         cleanLineEdit();
-                        (*_ppEditView)->execute(SCI_GOTOLINE, line-1);
+						if (_mode == go2line)
+							(*_ppEditView)->execute(SCI_GOTOLINE, line-1);
+						else
+							(*_ppEditView)->execute(SCI_GOTOPOS, line);
                     }
                     (*_ppEditView)->getFocus();
                     return TRUE;
                 }
+
+				case IDC_RADIO_GOTOLINE :
+				case IDC_RADIO_GOTOOFFSET :
+				{
+				
+					bool isLine, isOffset;
+					if (wParam == IDC_RADIO_GOTOLINE)
+					{
+						isLine = true;
+						isOffset = false;
+						_mode = go2line;
+					}
+					else
+					{
+						isLine = false;
+						isOffset = true;
+						_mode = go2offsset;
+					}
+					::SendDlgItemMessage(_hSelf, IDC_RADIO_GOTOLINE, BM_SETCHECK, isLine, 0);
+					::SendDlgItemMessage(_hSelf, IDC_RADIO_GOTOOFFSET, BM_SETCHECK, isOffset, 0);
+					updateLinesNumbers();
+					return TRUE;
+				}
 				default :
 				{
 					switch (HIWORD(wParam))
diff --git a/PowerEditor/src/ScitillaComponent/GoToLineDlg.h b/PowerEditor/src/ScitillaComponent/GoToLineDlg.h
index e74e8da9e..2663213ce 100644
--- a/PowerEditor/src/ScitillaComponent/GoToLineDlg.h
+++ b/PowerEditor/src/ScitillaComponent/GoToLineDlg.h
@@ -26,7 +26,7 @@
 class GoToLineDlg : public StaticDialog
 {
 public :
-	GoToLineDlg() : StaticDialog() {};
+	GoToLineDlg() : StaticDialog(), _mode(go2line) {};
 
 	void init(HINSTANCE hInst, HWND hPere, ScintillaEditView **ppEditView) {
 		Window::init(hInst, hPere);
@@ -52,6 +52,8 @@ public :
     };
 
 protected :
+	enum mode {go2line, go2offsset};
+	mode _mode;
 	virtual BOOL CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam);
 
 private :
@@ -59,8 +61,21 @@ private :
     ScintillaEditView **_ppEditView;
 
     void updateLinesNumbers() const {
-        ::SetDlgItemInt(_hSelf, ID_CURRLINE, (unsigned int)((*_ppEditView)->getCurrentLineNumber() + 1), FALSE);
-        ::SetDlgItemInt(_hSelf, ID_LASTLINE, (unsigned int)((*_ppEditView)->execute(SCI_GETLINECOUNT)), FALSE);
+		unsigned int current = 0;
+		unsigned int limit = 0;
+		
+		if (_mode == go2line)
+		{
+			current = (unsigned int)((*_ppEditView)->getCurrentLineNumber() + 1);
+			limit = (unsigned int)((*_ppEditView)->execute(SCI_GETLINECOUNT));
+		}
+		else
+		{
+			current = (unsigned int)(*_ppEditView)->execute(SCI_GETCURRENTPOS);
+			limit = (unsigned int)((*_ppEditView)->getCurrentDocLen() - 1);
+		}
+        ::SetDlgItemInt(_hSelf, ID_CURRLINE, current, FALSE);
+        ::SetDlgItemInt(_hSelf, ID_LASTLINE, limit, FALSE);
     };
 
     void cleanLineEdit() const {
diff --git a/PowerEditor/src/WinControls/Preference/preference.rc b/PowerEditor/src/WinControls/Preference/preference.rc
index d8f1fc5f5..e5ecdeb97 100644
--- a/PowerEditor/src/WinControls/Preference/preference.rc
+++ b/PowerEditor/src/WinControls/Preference/preference.rc
@@ -23,7 +23,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #ifndef IDC_STATIC
 #define IDC_STATIC -1
 #endif
-
 IDD_PREFERENCE_BOX DIALOGEX 0, 0, 395, 231
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_TOOLWINDOW | WS_EX_WINDOWEDGE
@@ -37,204 +36,185 @@ IDD_PREFERENCE_BAR_BOX DIALOGEX 0, 0, 370, 180
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    GROUPBOX        "Tool bar",IDC_TOOLBAR_GB_STATIC,11,5,131,68,BS_CENTER
-    CONTROL         "Hide",IDC_RADIO_HIDE,"Button",BS_AUTORADIOBUTTON,18,15,94,10
-    CONTROL         "Small icons",IDC_RADIO_SMALLICON,"Button",BS_AUTORADIOBUTTON,18,29,114,10
-    CONTROL         "Big icons",IDC_RADIO_BIGICON,"Button",BS_AUTORADIOBUTTON,18,43,109,10
-    CONTROL         "Small standard icons",IDC_RADIO_STANDARD,"Button",BS_AUTORADIOBUTTON,18,57,119,10
-					
-    GROUPBOX        "Tab bar",IDC_TABBAR_GB_STATIC,177,5,176,151,BS_CENTER
-	
-	CONTROL         "Hide",IDC_CHECK_TAB_HIDE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,183,16,108,10
-    CONTROL         "Multi-Line",IDC_CHECK_TAB_MULTILINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,183,30,134,10
-    CONTROL         "Vertical",IDC_CHECK_TAB_VERTICAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,183,44,134,10
-	
-    CONTROL         "Reduce",IDC_CHECK_REDUCE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,183,59,108,10
-    CONTROL         "Lock (No Drag N Drop)",IDC_CHECK_LOCK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,183,73,134,10
-    CONTROL         "Draw the inactive tabs",IDC_CHECK_DRAWINACTIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,183,88,134,10
-    CONTROL         "Draw the orange top bar",IDC_CHECK_ORANGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,183,103,133,10
-    CONTROL         "Enable close button on each tab", IDC_CHECK_ENABLETABCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,183,118,133,10
-    CONTROL         "Double click to close document",IDC_CHECK_DBCLICK2CLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,183,133,133,10
-	
-    CONTROL         "Show Status Bar",IDC_CHECK_SHOWSTATUSBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,133,130,10
-
+    GROUPBOX        "Tool bar",IDC_TOOLBAR_GB_STATIC,17,5,131,68,BS_CENTER
+    CONTROL         "Hide",IDC_RADIO_HIDE,"Button",BS_AUTORADIOBUTTON,24,15,94,10
+    CONTROL         "Small icons",IDC_RADIO_SMALLICON,"Button",BS_AUTORADIOBUTTON,24,29,114,10
+    CONTROL         "Big icons",IDC_RADIO_BIGICON,"Button",BS_AUTORADIOBUTTON,24,43,109,10
+    CONTROL         "Small standard icons",IDC_RADIO_STANDARD,"Button",BS_AUTORADIOBUTTON,24,57,119,10
+    GROUPBOX        "Tab bar",IDC_TABBAR_GB_STATIC,183,5,176,151,BS_CENTER
+    CONTROL         "Hide",IDC_CHECK_TAB_HIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,16,108,10
+    CONTROL         "Multi-Line",IDC_CHECK_TAB_MULTILINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,30,134,10
+    CONTROL         "Vertical",IDC_CHECK_TAB_VERTICAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,44,134,10
+    CONTROL         "Reduce",IDC_CHECK_REDUCE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,59,108,10
+    CONTROL         "Lock (No Drag N Drop)",IDC_CHECK_LOCK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,73,134,10
+    CONTROL         "Draw the inactive tabs",IDC_CHECK_DRAWINACTIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,88,134,10
+    CONTROL         "Draw the orange top bar",IDC_CHECK_ORANGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,103,133,10
+    CONTROL         "Enable close button on each tab",IDC_CHECK_ENABLETABCLOSE,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,118,133,10
+    CONTROL         "Double click to close document",IDC_CHECK_DBCLICK2CLOSE,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,133,133,10
+    CONTROL         "Show Status Bar",IDC_CHECK_SHOWSTATUSBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,133,130,10
 END
 
 IDD_PREFERENCE_MARGEIN_BOX DIALOGEX 0, 0, 370, 180
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    GROUPBOX        "Folder margin style",IDC_FMS_GB_STATIC,18,21,105,77, BS_CENTER
-    CONTROL         "Simple",IDC_RADIO_SIMPLE,"Button", BS_AUTORADIOBUTTON | WS_GROUP,27,33,59,10
-    CONTROL         "Arrow",IDC_RADIO_ARROW,"Button", BS_AUTORADIOBUTTON, 27, 49, 60, 10
-    CONTROL         "Circle tree",IDC_RADIO_CIRCLE, "Button", BS_AUTORADIOBUTTON, 27, 65, 62, 10
-    CONTROL         "Box tree", IDC_RADIO_BOX, "Button", BS_AUTORADIOBUTTON, 27, 81, 61, 10
-    CONTROL         "Display line number margin", IDC_CHECK_LINENUMBERMARGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 13, 107, 141, 10
-    CONTROL         "Display bookmark margin",IDC_CHECK_BOOKMARKMARGE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,122,150,10
-    CONTROL         "Show vertical edge",IDC_CHECK_SHOWVERTICALEDGE,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,149,33,122,10
-    RTEXT           "Number of columns :",IDC_NBCOLONE_STATIC,144,81,83,8
-    LTEXT           "0",IDC_COLONENUMBER_STATIC,235,81,18,8
-    GROUPBOX        "Vertical Edge Setting",IDC_VES_GB_STATIC,138,21,148,77,
-                    BS_CENTER
-    CONTROL         "Line mode",IDC_RADIO_LNMODE,"Button",BS_AUTORADIOBUTTON,
-                    152,49,91,10
-    CONTROL         "Background mode",IDC_RADIO_BGMODE,"Button",
-                    BS_AUTORADIOBUTTON,152,64,91,10
-    CONTROL         "Active current line highlight",IDC_CHECK_CURRENTLINEHILITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,165,107,129,10
-    GROUPBOX        "",IDC_STATIC,6,6,293,136
-    COMBOBOX        IDC_COMBO_SCINTILLAVIEWCHOIX,98,3,96,40,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-	
+    GROUPBOX        "Folder margin style",IDC_FMS_GB_STATIC,53,27,105,77,BS_CENTER
+    CONTROL         "Simple",IDC_RADIO_SIMPLE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,62,39,59,10
+    CONTROL         "Arrow",IDC_RADIO_ARROW,"Button",BS_AUTORADIOBUTTON,62,55,60,10
+    CONTROL         "Circle tree",IDC_RADIO_CIRCLE,"Button",BS_AUTORADIOBUTTON,62,71,62,10
+    CONTROL         "Box tree",IDC_RADIO_BOX,"Button",BS_AUTORADIOBUTTON,62,87,61,10
+    CONTROL         "Display line number margin",IDC_CHECK_LINENUMBERMARGE,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,113,141,10
+    CONTROL         "Display bookmark margin",IDC_CHECK_BOOKMARKMARGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,128,150,10
+    CONTROL         "Show vertical edge",IDC_CHECK_SHOWVERTICALEDGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,184,39,122,10
+    RTEXT           "Number of columns :",IDC_NBCOLONE_STATIC,179,87,83,8
+    LTEXT           "0",IDC_COLONENUMBER_STATIC,270,87,18,8
+    GROUPBOX        "Vertical Edge Setting",IDC_VES_GB_STATIC,173,27,148,77,BS_CENTER
+    CONTROL         "Line mode",IDC_RADIO_LNMODE,"Button",BS_AUTORADIOBUTTON,187,55,91,10
+    CONTROL         "Background mode",IDC_RADIO_BGMODE,"Button",BS_AUTORADIOBUTTON,187,70,91,10
+    CONTROL         "Active current line highlight",IDC_CHECK_CURRENTLINEHILITE,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,200,113,129,10
+    GROUPBOX        "",IDC_STATIC,41,12,293,136
+    COMBOBOX        IDC_COMBO_SCINTILLAVIEWCHOIX,133,9,96,40,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
 IDD_PREFERENCE_SETTING_BOX DIALOGEX 0, 0, 370, 180
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    GROUPBOX        "Tab Setting",IDC_TABSETTING_GB_STATIC,11,4,143,44,BS_CENTER
-    CONTROL         "Replace by space",IDC_CHECK_REPLACEBYSPACE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,31,100,10
-    RTEXT           "Tab size : ",IDC_TABSIZE_STATIC,16,18,58,8
-    LTEXT           "0",IDC_TABSIZEVAL_STATIC,76,18,18,8
-    GROUPBOX        "History File Setting",IDC_HISTORY_GB_STATIC,188,4,150,44,BS_CENTER
+    GROUPBOX        "Tab Setting",IDC_TABSETTING_GB_STATIC,16,4,143,44,BS_CENTER
+    CONTROL         "Replace by space",IDC_CHECK_REPLACEBYSPACE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,31,100,10
+    RTEXT           "Tab size : ",IDC_TABSIZE_STATIC,21,18,58,8
+    LTEXT           "0",IDC_TABSIZEVAL_STATIC,81,18,18,8
+    GROUPBOX        "History File Setting",IDC_HISTORY_GB_STATIC,193,4,150,44,BS_CENTER
     CONTROL         "Don't check at launch time",IDC_CHECK_DONTCHECKHISTORY,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,196,31,133,10
-    RTEXT           "Max number history file :",IDC_MAXNBFILE_STATIC,191,18,112,8
-    LTEXT           "0",IDC_MAXNBFILEVAL_STATIC,310,18,15,8
-    CONTROL         "Enable",IDC_CHECK_FILEAUTODETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,65,98,10
-    CONTROL         "Minimize to sys tray",IDC_CHECK_MIN2SYSTRAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,102,130,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,31,133,10
+    RTEXT           "Max number history file :",IDC_MAXNBFILE_STATIC,196,18,112,8
+    LTEXT           "0",IDC_MAXNBFILEVAL_STATIC,315,18,15,8
+    CONTROL         "Enable",IDC_CHECK_FILEAUTODETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,65,98,10
+    CONTROL         "Minimize to sys tray",IDC_CHECK_MIN2SYSTRAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,102,130,10
     CONTROL         "Remember the current session for next launch",IDC_CHECK_REMEMBERSESSION,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,163,217,11
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,163,217,11
     CONTROL         "Enable Notepad++ auto-updater",IDC_CHECK_AUTOUPDATE,
-                    "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,11,133,150,10
-    GROUPBOX        "File Status Auto-detection",IDC_FILEAUTODETECTION_STATIC,11,54,144,39,BS_CENTER
-    CONTROL         "Update silently",IDC_CHECK_UPDATESILENTLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,78,103,10
-    CONTROL         "Enable",IDC_CHECK_CLICKABLELINK_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,196,65,98,10
-    GROUPBOX        "Clickable link setting",IDC_CLICKABLELINK_STATIC,188,54,150,39,BS_CENTER
+                    "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,16,133,150,10
+    GROUPBOX        "File Status Auto-detection",IDC_FILEAUTODETECTION_STATIC,16,54,144,39,BS_CENTER
+    CONTROL         "Update silently",IDC_CHECK_UPDATESILENTLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,78,103,10
+    CONTROL         "Enable",IDC_CHECK_CLICKABLELINK_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,65,98,10
+    GROUPBOX        "Clickable link setting",IDC_CLICKABLELINK_STATIC,193,54,150,39,BS_CENTER
     CONTROL         "Don't draw underline",IDC_CHECK_CLICKABLELINK_NOUNDERLINE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,196,78,119,10
-    EDITTEXT        IDC_EDIT_SESSIONFILEEXT,293,162,67,14,ES_AUTOHSCROLL
-    LTEXT           "Session file ext:",IDC_SESSIONFILEEXT_STATIC,295,150,66,8
-    CONTROL         "Auto-indent",IDC_CHECK_MAINTAININDENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,117,130,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,78,119,10
+    EDITTEXT        IDC_EDIT_SESSIONFILEEXT,298,162,67,14,ES_AUTOHSCROLL
+    LTEXT           "Session file ext:",IDC_SESSIONFILEEXT_STATIC,300,150,66,8
+    CONTROL         "Auto-indent",IDC_CHECK_MAINTAININDENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,117,130,10
     CONTROL         "Remember the last operation directory",IDC_CHECK_KEEPINSAMEDIR,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,148,210,10
-    CONTROL         "Enable",IDC_CHECK_ENABLEDOCSWITCHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,196,109,69,10
-    CONTROL         "Enable MRU behaviour",IDC_CHECK_STYLEMRU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,196,122,134,10
-    GROUPBOX        "Document switcher (Ctrl+TAB)",IDC_DOCUMENTSWITCHER_STATIC,188,98,150,39,BS_CENTER
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,148,210,10
+    CONTROL         "Enable",IDC_CHECK_ENABLEDOCSWITCHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,109,69,10
+    CONTROL         "Enable MRU behaviour",IDC_CHECK_STYLEMRU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,122,134,10
+    GROUPBOX        "Document switcher (Ctrl+TAB)",IDC_DOCUMENTSWITCHER_STATIC,193,98,150,39,BS_CENTER
 END
 
 IDD_PREFERENCE_NEWDOCSETTING_BOX DIALOGEX 0, 0, 370, 180
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    GROUPBOX        "Format",IDC_FORMAT_GB_STATIC,28,9,95,83,BS_CENTER
-    CONTROL         "Windows",IDC_RADIO_F_WIN,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP,35,27,63,10
-    CONTROL         "Unix",IDC_RADIO_F_UNIX,"Button",BS_AUTORADIOBUTTON,35,
-                    45,56,10
-    CONTROL         "Mac",IDC_RADIO_F_MAC,"Button",BS_AUTORADIOBUTTON,35,63,
-                    60,10
-    GROUPBOX        "Encoding",IDC_ENCODING_STATIC,146,10,140,83,BS_CENTER
-    CONTROL         "ANSI",IDC_RADIO_ANSI,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP,153,21,80,10
-    CONTROL         "UTF-8 without BOM",IDC_RADIO_UTF8SANSBOM,"Button",
-                    BS_AUTORADIOBUTTON,153,35,128,10
-    CONTROL         "UTF-8",IDC_RADIO_UTF8,"Button",BS_AUTORADIOBUTTON,153,
-                    49,62,10
-    CONTROL         "UCS2 big endian",IDC_RADIO_UCS2BIG,"Button",
-                    BS_AUTORADIOBUTTON,153,63,103,10
-    CONTROL         "UCS2 small endian",IDC_RADIO_UCS2SMALL,"Button",
-                    BS_AUTORADIOBUTTON,153,77,102,10
-    RTEXT           "Default Language :",IDC_DEFAULTLANG_STATIC,16,110,80,8
-    COMBOBOX        IDC_COMBO_DEFAULTLANG,100,108,72,140,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Format",IDC_FORMAT_GB_STATIC,62,28,95,83,BS_CENTER
+    CONTROL         "Windows",IDC_RADIO_F_WIN,"Button",BS_AUTORADIOBUTTON | WS_GROUP,69,46,63,10
+    CONTROL         "Unix",IDC_RADIO_F_UNIX,"Button",BS_AUTORADIOBUTTON,69,64,56,10
+    CONTROL         "Mac",IDC_RADIO_F_MAC,"Button",BS_AUTORADIOBUTTON,69,82,60,10
+    GROUPBOX        "Encoding",IDC_ENCODING_STATIC,180,29,140,83,BS_CENTER
+    CONTROL         "ANSI",IDC_RADIO_ANSI,"Button",BS_AUTORADIOBUTTON | WS_GROUP,187,40,80,10
+    CONTROL         "UTF-8 without BOM",IDC_RADIO_UTF8SANSBOM,"Button",BS_AUTORADIOBUTTON,187,54,128,10
+    CONTROL         "UTF-8",IDC_RADIO_UTF8,"Button",BS_AUTORADIOBUTTON,187,68,62,10
+    CONTROL         "UCS2 big endian",IDC_RADIO_UCS2BIG,"Button",BS_AUTORADIOBUTTON,187,82,103,10
+    CONTROL         "UCS2 small endian",IDC_RADIO_UCS2SMALL,"Button",BS_AUTORADIOBUTTON,187,96,102,10
+    RTEXT           "Default Language :",IDC_DEFAULTLANG_STATIC,50,129,80,8
+    COMBOBOX        IDC_COMBO_DEFAULTLANG,134,127,72,140,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
 IDD_PREFERENCE_LANG_BOX DIALOGEX 0, 0, 370, 180
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    LISTBOX         IDC_LIST_ENABLEDLANG,54,21,78,117,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
-    LISTBOX         IDC_LIST_DISABLEDLANG,200,21,78,117,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "->",IDC_BUTTON_REMOVE,141,53,50,14
-    PUSHBUTTON      "<-",IDC_BUTTON_RESTORE,142,84,50,14
-    CTEXT           "Available items",IDC_ENABLEDITEMS_STATIC,57,8,72,8
-    CTEXT           "Disabled items",IDC_DISABLEDITEMS_STATIC,203,8,72,8
+    LISTBOX         IDC_LIST_ENABLEDLANG,80,21,78,140,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+    LISTBOX         IDC_LIST_DISABLEDLANG,226,21,78,140,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "->",IDC_BUTTON_REMOVE,167,53,50,14
+    PUSHBUTTON      "<-",IDC_BUTTON_RESTORE,168,84,50,14
+    CTEXT           "Available items",IDC_ENABLEDITEMS_STATIC,83,8,72,8
+    CTEXT           "Disabled items",IDC_DISABLEDITEMS_STATIC,229,8,72,8
 END
 
 IDD_PREFERENCE_PRINT_BOX DIALOGEX 0, 0, 370, 180
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    CONTROL         "WYSIWYG",IDC_RADIO_WYSIWYG,"Button",BS_AUTORADIOBUTTON,16,52,123,10
-    CONTROL         "Invert",IDC_RADIO_INVERT,"Button",BS_AUTORADIOBUTTON,16,67,90,10
-    CONTROL         "Black on white",IDC_RADIO_BW,"Button",BS_AUTORADIOBUTTON,16,82,90,10
-    CONTROL         "No background colour",IDC_RADIO_NOBG,"Button",BS_AUTORADIOBUTTON,16,98,123,10
-    GROUPBOX        "Colour Option",IDC_COLOUROPT_STATIC,11,32,133,96,BS_CENTER
-    CONTROL         "Print Line Number",IDC_CHECK_PRINTLINENUM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,17,145,10
-    EDITTEXT        IDC_EDIT_ML,194,75,17,14,ES_NUMBER
-    EDITTEXT        IDC_EDIT_MT,215,56,17,14,ES_NUMBER
-    EDITTEXT        IDC_EDIT_MR,235,75,17,14,ES_NUMBER
-    EDITTEXT        IDC_EDIT_MB,215,96,17,14,ES_NUMBER
-    RTEXT           "Left",IDC_ML_STATIC,161,78,30,8
-    CTEXT           "Top",IDC_MT_STATIC,197,46,54,8
-    LTEXT           "Right",IDC_MR_STATIC,257,78,29,8
-    CTEXT           "Bottom",IDC_MB_STATIC,197,111,54,8
-    GROUPBOX        "Margin Setting (Unit:mm)",IDC_MARGESETTINGS_STATIC,153,32,144,96,BS_CENTER
+    CONTROL         "WYSIWYG",IDC_RADIO_WYSIWYG,"Button",BS_AUTORADIOBUTTON,50,65,123,10
+    CONTROL         "Invert",IDC_RADIO_INVERT,"Button",BS_AUTORADIOBUTTON,50,80,90,10
+    CONTROL         "Black on white",IDC_RADIO_BW,"Button",BS_AUTORADIOBUTTON,50,95,90,10
+    CONTROL         "No background colour",IDC_RADIO_NOBG,"Button",BS_AUTORADIOBUTTON,50,111,123,10
+    GROUPBOX        "Colour Option",IDC_COLOUROPT_STATIC,45,45,133,96,BS_CENTER
+    CONTROL         "Print Line Number",IDC_CHECK_PRINTLINENUM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,46,30,145,10
+    EDITTEXT        IDC_EDIT_ML,228,88,17,14,ES_NUMBER
+    EDITTEXT        IDC_EDIT_MT,249,69,17,14,ES_NUMBER
+    EDITTEXT        IDC_EDIT_MR,269,88,17,14,ES_NUMBER
+    EDITTEXT        IDC_EDIT_MB,249,109,17,14,ES_NUMBER
+    RTEXT           "Left",IDC_ML_STATIC,195,91,30,8
+    CTEXT           "Top",IDC_MT_STATIC,231,59,54,8
+    LTEXT           "Right",IDC_MR_STATIC,291,91,29,8
+    CTEXT           "Bottom",IDC_MB_STATIC,231,124,54,8
+    GROUPBOX        "Margin Setting (Unit:mm)",IDC_MARGESETTINGS_STATIC,187,45,144,96,BS_CENTER
 END
 
 IDD_PREFERENCE_PRINT2_BOX DIALOGEX 0, 0, 370, 180
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    EDITTEXT        IDC_EDIT_HLEFT,23,36,83,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_HMIDDLE,113,36,83,14,ES_CENTER | ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_HRIGHT,203,36,83,14,ES_RIGHT | ES_AUTOHSCROLL
-    COMBOBOX        IDC_COMBO_HFONTNAME,23,54,84,104,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_COMBO_HFONTSIZE,113,54,31,72,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Bold",IDC_CHECK_HBOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,153,54,46,10
-    CONTROL         "Italic",IDC_CHECK_HITALIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,213,54,43,10
-    GROUPBOX        "Header",IDC_HGB_STATIC,15,17,279,56,BS_CENTER
-    CTEXT           "Left part",IDC_HL_STATIC,25,27,79,8
-    CTEXT           "Middle part",IDC_HM_STATIC,117,27,75,8
-    CTEXT           "Right part",IDC_HR_STATIC,205,27,78,8
-    EDITTEXT        IDC_EDIT_FLEFT,23,94,83,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_FMIDDLE,114,94,83,14,ES_CENTER | ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_FRIGHT,203,94,83,14,ES_RIGHT | ES_AUTOHSCROLL
-    COMBOBOX        IDC_COMBO_FFONTNAME,23,112,84,119,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_COMBO_FFONTSIZE,115,112,31,71,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Bold",IDC_CHECK_FBOLD,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,154,114,46,10
-    CONTROL         "Italic",IDC_CHECK_FITALIC,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,213,114,47,10
-    GROUPBOX        "Footer",IDC_FGB_STATIC,15,75,279,58,BS_CENTER
-    CTEXT           "Left part",IDC_FL_STATIC,25,85,78,8
-    CTEXT           "Middle part",IDC_FM_STATIC,114,85,82,8
-    CTEXT           "Right part",IDC_FR_STATIC,205,85,79,8
-    COMBOBOX        IDC_COMBO_VARLIST,77,2,70,58,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Add",IDC_BUTTON_ADDVAR,155,2,44,12
-    RTEXT           "Variable :",IDC_VAR_STATIC,16,4,59,8
-    RTEXT           "Which part :",IDC_WHICHPART_STATIC,2,137,80,8
-    LTEXT           "",IDC_VIEWPANEL_STATIC,85,137,213,8
+    EDITTEXT        IDC_EDIT_HLEFT,59,48,83,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_HMIDDLE,149,48,83,14,ES_CENTER | ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_HRIGHT,239,48,83,14,ES_RIGHT | ES_AUTOHSCROLL
+    COMBOBOX        IDC_COMBO_HFONTNAME,59,66,84,104,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_COMBO_HFONTSIZE,149,66,31,72,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Bold",IDC_CHECK_HBOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,66,46,10
+    CONTROL         "Italic",IDC_CHECK_HITALIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,249,66,43,10
+    GROUPBOX        "Header",IDC_HGB_STATIC,51,29,279,56,BS_CENTER
+    CTEXT           "Left part",IDC_HL_STATIC,61,39,79,8
+    CTEXT           "Middle part",IDC_HM_STATIC,153,39,75,8
+    CTEXT           "Right part",IDC_HR_STATIC,241,39,78,8
+    EDITTEXT        IDC_EDIT_FLEFT,59,106,83,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_FMIDDLE,150,106,83,14,ES_CENTER | ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_FRIGHT,239,106,83,14,ES_RIGHT | ES_AUTOHSCROLL
+    COMBOBOX        IDC_COMBO_FFONTNAME,59,124,84,119,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_COMBO_FFONTSIZE,151,124,31,71,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Bold",IDC_CHECK_FBOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,190,126,46,10
+    CONTROL         "Italic",IDC_CHECK_FITALIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,249,126,47,10
+    GROUPBOX        "Footer",IDC_FGB_STATIC,51,87,279,58,BS_CENTER
+    CTEXT           "Left part",IDC_FL_STATIC,61,97,78,8
+    CTEXT           "Middle part",IDC_FM_STATIC,150,97,82,8
+    CTEXT           "Right part",IDC_FR_STATIC,241,97,79,8
+    COMBOBOX        IDC_COMBO_VARLIST,113,14,70,58,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "Add",IDC_BUTTON_ADDVAR,191,14,44,12
+    RTEXT           "Variable :",IDC_VAR_STATIC,52,16,59,8
+    RTEXT           "Which part :",IDC_WHICHPART_STATIC,38,149,80,8
+    LTEXT           "",IDC_VIEWPANEL_STATIC,121,149,213,8
 END
 
 IDD_PREFERENCE_BACKUP_BOX DIALOGEX 0, 0, 370, 180
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    GROUPBOX        "Backup",IDC_BACKUPDIR_GRP_STATIC,9,0,289,83,BS_CENTER
-    CONTROL         "None",IDC_RADIO_BKNONE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,34,10,87,10
-    CONTROL         "Simple Backup",IDC_RADIO_BKSIMPLE,"Button",BS_AUTORADIOBUTTON,158,10,111,10
-    CONTROL         "Verbose Backup",IDC_RADIO_BKVERBOSE,"Button",BS_AUTORADIOBUTTON,158,24,111,10
-    GROUPBOX        "User custom backup directory",IDC_BACKUPDIR_USERCUSTOMDIR_GRPSTATIC,25,36,260,40
-    CONTROL         "",IDC_BACKUPDIR_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,21,36,8,10
-    RTEXT           "Directory :",IDD_BACKUPDIR_STATIC,29,53,40,8
-    EDITTEXT        IDC_BACKUPDIR_EDIT,76,51,179,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "...",IDD_BACKUPDIR_BROWSE_BUTTON,262,51,16,14
-    GROUPBOX        "Auto-completion",IDD_AUTOC_GRPSTATIC,9,89,289,56,BS_CENTER
-    CONTROL         "Enable Auto-completion on each input",IDD_AUTOC_ENABLECHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,99,150,10
-    CONTROL         "Function completion",IDD_AUTOC_FUNCRADIO,"Button",BS_AUTORADIOBUTTON | WS_GROUP,41,114,145,10
-    CONTROL         "Word completion",IDD_AUTOC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,41,130,145,10
+    GROUPBOX        "Backup",IDC_BACKUPDIR_GRP_STATIC,46,14,289,83,BS_CENTER
+    CONTROL         "None",IDC_RADIO_BKNONE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,71,24,87,10
+    CONTROL         "Simple Backup",IDC_RADIO_BKSIMPLE,"Button",BS_AUTORADIOBUTTON,195,24,111,10
+    CONTROL         "Verbose Backup",IDC_RADIO_BKVERBOSE,"Button",BS_AUTORADIOBUTTON,195,38,111,10
+    GROUPBOX        "User custom backup directory",IDC_BACKUPDIR_USERCUSTOMDIR_GRPSTATIC,62,50,260,40
+    CONTROL         "",IDC_BACKUPDIR_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,58,50,8,10
+    RTEXT           "Directory :",IDD_BACKUPDIR_STATIC,66,67,40,8
+    EDITTEXT        IDC_BACKUPDIR_EDIT,113,65,179,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDD_BACKUPDIR_BROWSE_BUTTON,299,65,16,14
+    GROUPBOX        "Auto-completion",IDD_AUTOC_GRPSTATIC,46,103,289,56,BS_CENTER
+    CONTROL         "Enable Auto-completion on each input",IDD_AUTOC_ENABLECHECK,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,61,113,150,10
+    CONTROL         "Function completion",IDD_AUTOC_FUNCRADIO,"Button",BS_AUTORADIOBUTTON | WS_GROUP,78,128,145,10
+    CONTROL         "Word completion",IDD_AUTOC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,78,144,145,10
 END
-
diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h
index 36f4d69d9..3e83a0b4b 100644
--- a/PowerEditor/src/resource.h
+++ b/PowerEditor/src/resource.h
@@ -239,6 +239,8 @@
 #define	ID_URHERE_STATIC           (IDD_GOLINE + 4)
 #define	ID_UGO_STATIC                 (IDD_GOLINE + 5)
 #define	ID_NOMORETHAN_STATIC   (IDD_GOLINE + 6)
+#define	IDC_RADIO_GOTOLINE   (IDD_GOLINE + 7)
+#define	IDC_RADIO_GOTOOFFSET   (IDD_GOLINE + 8)
 
 // voir columnEditor_rc.h
 //#define	IDD_COLUMNEDIT   2020
diff --git a/PowerEditor/visual.net/notepadPlus.vcproj b/PowerEditor/visual.net/notepadPlus.vcproj
index d07b2e0cd..5b9c02119 100644
--- a/PowerEditor/visual.net/notepadPlus.vcproj
+++ b/PowerEditor/visual.net/notepadPlus.vcproj
@@ -580,6 +580,14 @@
 				RelativePath="..\src\resource.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\WinControls\Preference\resource.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\MISC\RegExt\resource.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\WinControls\StaticDialog\RunDlg\RunDlg.h"
 				>
@@ -738,6 +746,22 @@
 				RelativePath="..\src\icons\closefile.bmp"
 				>
 			</File>
+			<File
+				RelativePath="..\src\icons\closeTabButton.bmp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\icons\closeTabButton_hover.bmp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\icons\closeTabButton_inact.bmp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\icons\closeTabButton_push.bmp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\WinControls\ColourPicker\ColourPopup.rc"
 				>
@@ -746,6 +770,14 @@
 				RelativePath="..\src\ScitillaComponent\columnEditor.rc"
 				>
 			</File>
+			<File
+				RelativePath="..\src\icons\copy.bmp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\icons\cut.bmp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\icons\cut_dis.ico"
 				>
@@ -770,6 +802,10 @@
 				RelativePath="..\src\default_open.ico"
 				>
 			</File>
+			<File
+				RelativePath="..\src\icons\delete.ico"
+				>
+			</File>
 			<File
 				RelativePath="..\src\WinControls\DockingWnd\DockingGUIWidget.rc"
 				>
@@ -826,6 +862,10 @@
 				RelativePath="..\src\ScitillaComponent\FindReplaceDlg.rc"
 				>
 			</File>
+			<File
+				RelativePath="..\src\icons\findResult.ico"
+				>
+			</File>
 			<File
 				RelativePath="..\src\hot_close.ico"
 				>
@@ -878,6 +918,10 @@
 				RelativePath="..\src\icons\new_on.ico"
 				>
 			</File>
+			<File
+				RelativePath="..\src\icons\newFile.bmp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\Notepad_plus.rc"
 				>
@@ -894,6 +938,14 @@
 				RelativePath="..\src\icons\open_on.ico"
 				>
 			</File>
+			<File
+				RelativePath="..\src\icons\openFile.bmp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\icons\paste.bmp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\icons\paste_dis.ico"
 				>
@@ -906,14 +958,54 @@
 				RelativePath="..\src\icons\paste_on.ico"
 				>
 			</File>
+			<File
+				RelativePath="..\src\icons\playRecord.bmp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\icons\playrecord_dis.ico"
+				>
+			</File>
+			<File
+				RelativePath="..\src\icons\playRecord_m.bmp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\icons\playrecord_m_dis.ico"
+				>
+			</File>
+			<File
+				RelativePath="..\src\icons\playrecord_m_off.ico"
+				>
+			</File>
+			<File
+				RelativePath="..\src\icons\playrecord_m_on.ico"
+				>
+			</File>
+			<File
+				RelativePath="..\src\icons\playrecord_off.ico"
+				>
+			</File>
+			<File
+				RelativePath="..\src\icons\playrecord_on.ico"
+				>
+			</File>
 			<File
 				RelativePath="..\src\WinControls\Preference\preference.rc"
 				>
 			</File>
+			<File
+				RelativePath="..\src\icons\print.bmp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\icons\readonly.ico"
 				>
 			</File>
+			<File
+				RelativePath="..\src\icons\redo.bmp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\icons\redo_dis.ico"
 				>
@@ -974,6 +1066,26 @@
 				RelativePath="..\src\icons\saved.ico"
 				>
 			</File>
+			<File
+				RelativePath="..\src\icons\saveFile.bmp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\icons\saveRecord.bmp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\icons\saverecord_dis.ico"
+				>
+			</File>
+			<File
+				RelativePath="..\src\icons\saverecord_off.ico"
+				>
+			</File>
+			<File
+				RelativePath="..\src\icons\saverecord_on.ico"
+				>
+			</File>
 			<File
 				RelativePath="..\src\WinControls\shortcut\shortcut.rc"
 				>
@@ -986,6 +1098,38 @@
 				RelativePath="..\src\icons\showPannel.bmp"
 				>
 			</File>
+			<File
+				RelativePath="..\src\icons\startRecord.bmp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\icons\startrecord_dis.ico"
+				>
+			</File>
+			<File
+				RelativePath="..\src\icons\startrecord_off.ico"
+				>
+			</File>
+			<File
+				RelativePath="..\src\icons\startrecord_on.ico"
+				>
+			</File>
+			<File
+				RelativePath="..\src\icons\stopRecord.bmp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\icons\stoprecord_dis.ico"
+				>
+			</File>
+			<File
+				RelativePath="..\src\icons\stoprecord_off.ico"
+				>
+			</File>
+			<File
+				RelativePath="..\src\icons\stoprecord_on.ico"
+				>
+			</File>
 			<File
 				RelativePath="..\src\icons\supp_off.ico"
 				>
@@ -1002,10 +1146,46 @@
 				RelativePath="..\src\icons\suppall_on.ico"
 				>
 			</File>
+			<File
+				RelativePath="..\src\icons\syncH.bmp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\icons\syncH_dis.ico"
+				>
+			</File>
+			<File
+				RelativePath="..\src\icons\syncH_off.ico"
+				>
+			</File>
+			<File
+				RelativePath="..\src\icons\syncH_on.ico"
+				>
+			</File>
+			<File
+				RelativePath="..\src\icons\syncV.bmp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\icons\syncV_dis.ico"
+				>
+			</File>
+			<File
+				RelativePath="..\src\icons\syncV_off.ico"
+				>
+			</File>
+			<File
+				RelativePath="..\src\icons\syncV_on.ico"
+				>
+			</File>
 			<File
 				RelativePath="..\src\WinControls\TaskList\TaskListDlg.rc"
 				>
 			</File>
+			<File
+				RelativePath="..\src\icons\undo.bmp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\icons\undo_dis.ico"
 				>