diff --git a/src/resource.rc b/src/resource.rc
index 3ce8011f..16f98f2a 100644
--- a/src/resource.rc
+++ b/src/resource.rc
@@ -237,7 +237,7 @@ END
 // Dialog resources
 //
 IDD_MAIN DIALOGEX 0, 0, 348, 196
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | NOT WS_VISIBLE
+STYLE WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | DS_SHELLFONT | DS_MODALFRAME | NOT WS_VISIBLE
 CAPTION APP_NAME
 MENU IDM_MAIN
 FONT 8, "Ms Shell Dlg"
@@ -251,7 +251,7 @@ BEGIN
 END
 
 IDD_NOTIFICATION DIALOG 0, 0, 320, 178
-STYLE DS_SHELLFONT | WS_POPUP | WS_SYSMENU | WS_CAPTION | WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | NOT WS_VISIBLE
+STYLE WS_POPUP | WS_SYSMENU | WS_CAPTION | WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | DS_SHELLFONT | NOT WS_VISIBLE
 EXSTYLE WS_EX_APPWINDOW | WS_EX_TOPMOST
 CAPTION ""
 FONT 8, "Ms Shell Dlg"
@@ -286,7 +286,7 @@ BEGIN
 END
 
 IDD_EDITOR DIALOG 0, 0, 290, 240
-STYLE DS_SHELLFONT | WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_POPUP | WS_SYSMENU | WS_CAPTION | DS_MODALFRAME
+STYLE WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_POPUP | WS_SYSMENU | WS_CAPTION | DS_SHELLFONT | DS_MODALFRAME
 CAPTION ""
 FONT 8, "Ms Shell Dlg"
 BEGIN
@@ -323,8 +323,7 @@ BEGIN
 END
 
 IDD_SETTINGS_GENERAL DIALOGEX 0, 0, 262, 172
-STYLE DS_SHELLFONT | WS_CHILD | WS_SYSMENU | WS_TABSTOP | WS_GROUP
-EXSTYLE WS_EX_CONTROLPARENT
+STYLE WS_CHILD | WS_SYSMENU | WS_TABSTOP | WS_GROUP | DS_SHELLFONT | DS_CONTROL
 FONT 8, "Ms Shell Dlg"
 BEGIN
 	GROUPBOX		"", IDC_TITLE_GENERAL, 0, 0, 262, 90, WS_GROUP
@@ -343,8 +342,7 @@ BEGIN
 END
 
 IDD_SETTINGS_RULES DIALOGEX 0, 0, 262, 172
-STYLE DS_SHELLFONT | WS_CHILD | WS_SYSMENU | WS_TABSTOP | WS_GROUP
-EXSTYLE WS_EX_CONTROLPARENT
+STYLE WS_CHILD | WS_SYSMENU | WS_TABSTOP | WS_GROUP | DS_SHELLFONT | DS_CONTROL
 FONT 8, "Ms Shell Dlg"
 BEGIN
 	GROUPBOX		"", IDC_TITLE_CONNECTIONS, 0, 0, 262, 64, WS_GROUP
@@ -368,8 +366,7 @@ BEGIN
 END
 
 IDD_SETTINGS_BLOCKLIST DIALOGEX 0, 0, 262, 172
-STYLE DS_SHELLFONT | WS_CHILD | WS_SYSMENU | WS_TABSTOP | WS_GROUP
-EXSTYLE WS_EX_CONTROLPARENT
+STYLE WS_CHILD | WS_SYSMENU | WS_TABSTOP | WS_GROUP | DS_SHELLFONT | DS_CONTROL
 FONT 8, "Ms Shell Dlg"
 BEGIN
 	GROUPBOX		"", IDC_TITLE_BLOCKLIST_SPY, 0, 0, 262, 52, WS_GROUP
@@ -394,8 +391,7 @@ BEGIN
 END
 
 IDD_SETTINGS_INTERFACE DIALOGEX 0, 0, 262, 172
-STYLE DS_SHELLFONT | WS_CHILD | WS_SYSMENU | WS_TABSTOP | WS_GROUP
-EXSTYLE WS_EX_CONTROLPARENT
+STYLE WS_CHILD | WS_SYSMENU | WS_TABSTOP | WS_GROUP | DS_SHELLFONT | DS_CONTROL
 FONT 8, "Ms Shell Dlg"
 BEGIN
 	GROUPBOX		"", IDC_TITLE_CONFIRMATIONS, 0, 0, 262, 52, WS_GROUP
@@ -410,8 +406,7 @@ BEGIN
 END
 
 IDD_SETTINGS_NOTIFICATIONS DIALOGEX 0, 0, 262, 172
-STYLE DS_SHELLFONT | WS_CHILD | WS_SYSMENU | WS_TABSTOP | WS_GROUP
-EXSTYLE WS_EX_CONTROLPARENT
+STYLE WS_CHILD | WS_SYSMENU | WS_TABSTOP | WS_GROUP | DS_SHELLFONT | DS_CONTROL
 FONT 8, "Ms Shell Dlg"
 BEGIN
 	GROUPBOX		"", IDC_TITLE_NOTIFICATIONS, 0, 0, 262, 70, WS_GROUP
@@ -431,8 +426,7 @@ BEGIN
 END
 
 IDD_SETTINGS_LOGGING DIALOGEX 0, 0, 262, 172
-STYLE DS_SHELLFONT | WS_CHILD | WS_SYSMENU | WS_TABSTOP | WS_GROUP
-EXSTYLE WS_EX_CONTROLPARENT
+STYLE WS_CHILD | WS_SYSMENU | WS_TABSTOP | WS_GROUP | DS_SHELLFONT | DS_CONTROL
 FONT 8, "Ms Shell Dlg"
 BEGIN
 	GROUPBOX		"", IDC_TITLE_GENERAL, 0, 0, 262, 96, WS_GROUP