--- ./save_win_res.rc2	2021-03-13 15:12:14.133664216 +0000
+++ ./win_res.rc2	2021-03-15 16:58:41.477344037 +0000
@@ -20,31 +20,31 @@
 IDI_CFGICON ICON "puttycfg.ico"
 
 /* Accelerators used: clw */
-IDD_ABOUTBOX DIALOG DISCARDABLE 140, 40, 270, 136
+IDD_ABOUTBOX DIALOGEX 140, 40, 270, 88
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About PuTTY"
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Shell Dlg 2"
 BEGIN
-    DEFPUSHBUTTON "&Close", IDOK, 216, 118, 48, 14
-    PUSHBUTTON "View &Licence", IDA_LICENCE, 6, 118, 70, 14
-    PUSHBUTTON "Visit &Web Site", IDA_WEB, 140, 118, 70, 14
-    EDITTEXT IDA_TEXT, 10, 6, 250, 110, ES_READONLY | ES_MULTILINE | ES_CENTER, WS_EX_STATICEDGE
+    DEFPUSHBUTTON "&Close", IDOK, 216, 70, 48, 14
+    PUSHBUTTON "View &Licence", IDA_LICENCE, 6, 70, 70, 14
+    PUSHBUTTON "Visit &Web Site", IDA_WEB, 140, 70, 70, 14
+    EDITTEXT IDA_TEXT, 10, 6, 250, 62, ES_READONLY | ES_MULTILINE | ES_CENTER
 END
 
 /* Accelerators used: aco */
-IDD_MAINBOX DIALOG DISCARDABLE 0, 0, 300, 252
+IDD_MAINBOX DIALOGEX 0, 0, 300, 252
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "PuTTY Configuration"
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Shell Dlg 2"
 CLASS "PuTTYConfigBox"
 BEGIN
 END
 
 /* Accelerators used: co */
-IDD_LOGBOX DIALOG DISCARDABLE 100, 20, 300, 119
+IDD_LOGBOX DIALOGEX 100, 20, 300, 119
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "PuTTY Event Log"
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Shell Dlg 2"
 BEGIN
     DEFPUSHBUTTON "&Close", IDOK, 135, 102, 44, 14
     PUSHBUTTON "C&opy", IDN_COPY, 81, 102, 44, 14
@@ -52,21 +52,21 @@
 END
 
 /* No accelerators used */
-IDD_LICENCEBOX DIALOG DISCARDABLE 50, 50, 326, 239
+IDD_LICENCEBOX DIALOGEX 50, 50, 326, 239
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "PuTTY Licence"
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Shell Dlg 2"
 BEGIN
     DEFPUSHBUTTON "OK", IDOK, 148, 219, 44, 14
 
-    EDITTEXT IDA_TEXT, 10, 10, 306, 200, ES_READONLY | ES_MULTILINE | ES_LEFT, WS_EX_STATICEDGE
+    EDITTEXT IDA_TEXT, 10, 10, 306, 200, ES_READONLY | ES_MULTILINE | ES_LEFT
 END
 
 /* No accelerators used */
-IDD_HK_ABSENT DIALOG DISCARDABLE 50, 50, 340, 148
+IDD_HK_ABSENT DIALOGEX 50, 50, 340, 148
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "PuTTY Security Alert"
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Shell Dlg 2"
 BEGIN
     LTEXT "The server's host key is not cached in the registry. You have no", 100, 40, 20, 300, 8
     LTEXT "guarantee that the server is the computer you think it is.", 101, 40, 28, 300, 8
@@ -89,10 +89,10 @@
 END
 
 /* No accelerators used */
-IDD_HK_WRONG DIALOG DISCARDABLE 50, 50, 340, 188
+IDD_HK_WRONG DIALOGEX 50, 50, 340, 188
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "PuTTY Security Alert"
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Shell Dlg 2"
 BEGIN
     LTEXT "WARNING - POTENTIAL SECURITY BREACH!", IDC_HK_TITLE, 40, 20, 300, 12
 
@@ -120,10 +120,10 @@
 END
 
 /* Accelerators used: clw */
-IDD_HK_MOREINFO DIALOG DISCARDABLE 140, 40, 400, 156
+IDD_HK_MOREINFO DIALOGEX 140, 40, 400, 156
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "PuTTY: information about the server's host key"
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Shell Dlg 2"
 BEGIN
     LTEXT "SHA256 fingerprint:", 100, 12, 12, 80, 8
     EDITTEXT IDC_HKI_SHA256, 100, 10, 288, 12, ES_READONLY