diff --git a/Source/exehead/resource.rc b/Source/exehead/resource.rc
index e1ffc104..c718e800 100644
--- a/Source/exehead/resource.rc
+++ b/Source/exehead/resource.rc
@@ -28,11 +28,11 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 #if defined(APSTUDIO_INVOKED) || defined(NSIS_CONFIG_LICENSEPAGE)
 #if defined(APSTUDIO_INVOKED)
-IDD_LICENSE$(NSIS_CONFIG_LICENSEPAGE) DIALOG DISCARDABLE  0, 0, 266, 130
+IDD_LICENSE$(NSIS_CONFIG_LICENSEPAGE) DIALOGEX DISCARDABLE  0, 0, 266, 130
 #else
-IDD_LICENSE DIALOG DISCARDABLE  0, 0, 266, 130
+IDD_LICENSE DIALOGEX DISCARDABLE  0, 0, 266, 130
 #endif
-STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON            IDI_ICON2,IDC_ULICON,0,0,20,20
@@ -44,11 +44,11 @@ END
 
 #if defined(APSTUDIO_INVOKED) || defined(NSIS_CONFIG_VISIBLE_SUPPORT)
 #if defined(APSTUDIO_INVOKED)
-IDD_DIR$(NSIS_CONFIG_VISIBLE_SUPPORT) DIALOG DISCARDABLE  0, 0, 266, 130
+IDD_DIR$(NSIS_CONFIG_VISIBLE_SUPPORT) DIALOGEX DISCARDABLE  0, 0, 266, 130
 #else
-IDD_DIR DIALOG DISCARDABLE  0, 0, 266, 130
+IDD_DIR DIALOGEX DISCARDABLE  0, 0, 266, 130
 #endif
-STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD
 FONT 8, "MS Shell Dlg"
 BEGIN
     EDITTEXT        IDC_DIR,8,49,187,12,ES_AUTOHSCROLL
@@ -68,11 +68,11 @@ END
 
 #if defined(APSTUDIO_INVOKED) || defined(NSIS_CONFIG_COMPONENTPAGE)
 #if defined(APSTUDIO_INVOKED)
-IDD_SELCOM$(NSIS_CONFIG_COMPONENTPAGE) DIALOG DISCARDABLE  0, 0, 266, 130
+IDD_SELCOM$(NSIS_CONFIG_COMPONENTPAGE) DIALOGEX DISCARDABLE  0, 0, 266, 130
 #else
-IDD_SELCOM DIALOG DISCARDABLE  0, 0, 266, 130
+IDD_SELCOM DIALOGEX DISCARDABLE  0, 0, 266, 130
 #endif
-STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD
 FONT 8, "MS Shell Dlg"
 BEGIN
     COMBOBOX        IDC_COMBO1,114,25,152,102,CBS_DROPDOWNLIST | NOT 
@@ -92,12 +92,11 @@ END
 
 #if defined(APSTUDIO_INVOKED) || defined(NSIS_CONFIG_VISIBLE_SUPPORT)
 #if defined(APSTUDIO_INVOKED)
-IDD_INST$(NSIS_CONFIG_VISIBLE_SUPPORT) DIALOG DISCARDABLE  0, 0, 280, 162
+IDD_INST$(NSIS_CONFIG_VISIBLE_SUPPORT) DIALOGEX DISCARDABLE  0, 0, 280, 162
 #else
-IDD_INST DIALOG DISCARDABLE  0, 0, 280, 162
+IDD_INST DIALOGEX DISCARDABLE  0, 0, 280, 162
 #endif
-STYLE DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | 
-    WS_SYSMENU
+STYLE DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_BORDER
 FONT 8, "MS Shell Dlg"
 BEGIN
     PUSHBUTTON      "",IDC_BACK,171,142,50,14,NOT WS_VISIBLE | WS_GROUP
@@ -113,11 +112,11 @@ END
 
 #if defined(APSTUDIO_INVOKED) || defined(NSIS_CONFIG_VISIBLE_SUPPORT)
 #if defined(APSTUDIO_INVOKED)
-IDD_INSTFILES$(NSIS_CONFIG_VISIBLE_SUPPORT) DIALOG DISCARDABLE  0, 0, 266, 130
+IDD_INSTFILES$(NSIS_CONFIG_VISIBLE_SUPPORT) DIALOGEX DISCARDABLE  0, 0, 266, 130
 #else
-IDD_INSTFILES DIALOG DISCARDABLE  0, 0, 266, 130
+IDD_INSTFILES DIALOGEX DISCARDABLE  0, 0, 266, 130
 #endif
-STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,24,10,241,
@@ -134,11 +133,11 @@ END
 
 #if defined(APSTUDIO_INVOKED) || defined(_NSIS_CONFIG_UNINSTDLG)
 #if defined(APSTUDIO_INVOKED)
-IDD_UNINST$(_NSIS_CONFIG_UNINSTDLG) DIALOG DISCARDABLE  0, 0, 266, 130
+IDD_UNINST$(_NSIS_CONFIG_UNINSTDLG) DIALOGEX DISCARDABLE  0, 0, 266, 130
 #else
-IDD_UNINST DIALOG DISCARDABLE  0, 0, 266, 130
+IDD_UNINST DIALOGEX DISCARDABLE  0, 0, 266, 130
 #endif
-STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON            IDI_ICON2,IDC_ULICON,0,1,20,20
@@ -150,11 +149,11 @@ END
 
 #if defined(APSTUDIO_INVOKED) || defined(_NSIS_CONFIG_VERIFYDIALOG)
 #if defined(APSTUDIO_INVOKED)
-IDD_VERIFY$(_NSIS_CONFIG_VERIFYDIALOG) DIALOG DISCARDABLE  0, 0, 162, 22
+IDD_VERIFY$(_NSIS_CONFIG_VERIFYDIALOG) DIALOGEX DISCARDABLE  0, 0, 162, 22
 #else
-IDD_VERIFY DIALOG DISCARDABLE  0, 0, 162, 22
+IDD_VERIFY DIALOGEX DISCARDABLE  0, 0, 162, 22
 #endif
-STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE
+STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
     CTEXT           "",IDC_STR,7,7,148,8,SS_NOPREFIX