diff --git a/Contrib/Makensisw/resource.rc b/Contrib/Makensisw/resource.rc
index 02d0d839..23e345ad 100644
--- a/Contrib/Makensisw/resource.rc
+++ b/Contrib/Makensisw/resource.rc
@@ -129,7 +129,7 @@ END
 //
 
 DLG_MAIN DIALOGEX DISCARDABLE  0, 0, 361, 228
-STYLE DS_FIXEDSYS | DS_3DLOOK | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | 
+STYLE DS_SHELLFONT | DS_3DLOOK | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | 
     WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
 CAPTION "MakeNSIS"
 MENU IDM_MENU
@@ -144,8 +144,8 @@ BEGIN
     PUSHBUTTON      "&Test Installer",IDC_TEST,230,208,60,15,WS_DISABLED
 END
 
-DLG_ABOUT DIALOG DISCARDABLE  0, 0, 233, 126
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_CAPTION
+DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 233, 126
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_CAPTION
 CAPTION "About MakeNSISW"
 FONT 8, "MS Shell Dlg"
 BEGIN
diff --git a/Contrib/UIs/UI Holder/resource.rc b/Contrib/UIs/UI Holder/resource.rc
index c02b211e..27102c22 100644
--- a/Contrib/UIs/UI Holder/resource.rc	
+++ b/Contrib/UIs/UI Holder/resource.rc	
@@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // Dialog
 //
 
-IDD_LICENSE DIALOG DISCARDABLE  0, 0, 266, 130
-STYLE DS_CONTROL | WS_CHILD
+IDD_LICENSE DIALOGEX DISCARDABLE  0, 0, 266, 130
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON            103,IDC_ULICON,0,0,20,20
@@ -36,8 +36,8 @@ BEGIN
                     0x804,0,24,266,105
 END
 
-IDD_DIR DIALOG DISCARDABLE  0, 0, 266, 130
-STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+IDD_DIR DIALOGEX DISCARDABLE  0, 0, 266, 130
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD
 FONT 8, "MS Shell Dlg"
 BEGIN
     EDITTEXT        IDC_DIR,8,49,187,12,ES_AUTOHSCROLL
@@ -54,8 +54,8 @@ BEGIN
     LTEXT           "",IDC_INTROTEXT,25,0,241,34
 END
 
-IDD_SELCOM DIALOG DISCARDABLE  0, 0, 266, 130
-STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+IDD_SELCOM DIALOGEX DISCARDABLE  0, 0, 266, 130
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD
 FONT 8, "MS Shell Dlg"
 BEGIN
     COMBOBOX        IDC_COMBO1,114,25,152,102,CBS_DROPDOWNLIST | WS_VSCROLL | 
@@ -72,8 +72,8 @@ BEGIN
                     WS_BORDER | WS_TABSTOP,114,39,151,90
 END
 
-IDD_INST DIALOG DISCARDABLE  0, 0, 280, 162
-STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | 
+IDD_INST DIALOGEX DISCARDABLE  0, 0, 280, 162
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | 
     WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -86,8 +86,8 @@ BEGIN
     CTEXT           "",IDC_VERSTR,59,145,108,8,WS_DISABLED
 END
 
-IDD_INSTFILES DIALOG DISCARDABLE  0, 0, 266, 130
-STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+IDD_INSTFILES DIALOGEX DISCARDABLE  0, 0, 266, 130
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "",IDC_PROGRESS1,"msctls_progress32",NOT WS_VISIBLE | 
@@ -103,8 +103,8 @@ BEGIN
     PUSHBUTTON      "",IDC_SHOWDETAILS,0,28,60,14,NOT WS_TABSTOP
 END
 
-IDD_UNINST DIALOG DISCARDABLE  0, 0, 266, 130
-STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+IDD_UNINST DIALOGEX DISCARDABLE  0, 0, 266, 130
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON            103,IDC_ULICON,0,1,20,20
@@ -113,8 +113,8 @@ BEGIN
     LTEXT           "",IDC_INTROTEXT,25,0,241,34
 END
 
-IDD_VERIFY DIALOG DISCARDABLE  0, 0, 162, 22
-STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE
+IDD_VERIFY DIALOGEX DISCARDABLE  0, 0, 162, 22
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
     CTEXT           "",IDC_STR,7,7,148,8
diff --git a/Contrib/UIs/default.exe b/Contrib/UIs/default.exe
index 49830159..4adb3c0a 100755
Binary files a/Contrib/UIs/default.exe and b/Contrib/UIs/default.exe differ
diff --git a/Contrib/UIs/sdbarker_tiny.exe b/Contrib/UIs/sdbarker_tiny.exe
index 572af786..4661effb 100644
Binary files a/Contrib/UIs/sdbarker_tiny.exe and b/Contrib/UIs/sdbarker_tiny.exe differ
diff --git a/Source/exehead/resource.rc b/Source/exehead/resource.rc
index 81223116..bfee6a7f 100644
--- a/Source/exehead/resource.rc
+++ b/Source/exehead/resource.rc
@@ -28,9 +28,9 @@ 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_CONTROL | DS_SHELLFONT | WS_CHILD
 FONT 8, "MS Shell Dlg"
@@ -44,9 +44,9 @@ 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_CONTROL | DS_SHELLFONT | WS_CHILD
 FONT 8, "MS Shell Dlg"
@@ -68,9 +68,9 @@ 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_CONTROL | DS_SHELLFONT | WS_CHILD
 FONT 8, "MS Shell Dlg"
@@ -111,9 +111,9 @@ 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_CONTROL | DS_SHELLFONT | WS_CHILD
 FONT 8, "MS Shell Dlg"
@@ -134,9 +134,9 @@ 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_CONTROL | DS_SHELLFONT | WS_CHILD
 FONT 8, "MS Shell Dlg"
@@ -150,9 +150,9 @@ 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_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE
 FONT 8, "MS Shell Dlg"