--- ./save_puttygen.rc	2021-04-30 16:19:08.657914557 +0100
+++ ./puttygen.rc	2021-04-30 16:16:51.575575457 +0100
@@ -12,17 +12,17 @@
 
 200 ICON "puttygen.ico"
 
-201 DIALOG DISCARDABLE 0, 0, 400, 270
+201 DIALOGEX 0, 0, 400, 270
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "PuTTY Key Generator"
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Shell Dlg 2"
 BEGIN
 END
 
-210 DIALOG DISCARDABLE 0, 0, 140, 60
+210 DIALOGEX 0, 0, 140, 60
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "PuTTYgen: Enter Passphrase"
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Shell Dlg 2"
 BEGIN
     CTEXT "Enter passphrase for key", 100, 10, 6, 120, 8
     CTEXT "", 101, 10, 16, 120, 8
@@ -32,32 +32,32 @@
 END
 
 /* Accelerators used: cl */
-213 DIALOG DISCARDABLE 140, 40, 270, 136
+213 DIALOGEX 140, 40, 270, 88
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About PuTTYgen"
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Shell Dlg 2"
 BEGIN
-    DEFPUSHBUTTON "&Close", IDOK, 216, 118, 48, 14
-    PUSHBUTTON "View &Licence", 101, 6, 118, 70, 14
-    PUSHBUTTON "Visit &Web Site", 102, 140, 118, 70, 14
-    EDITTEXT 1000, 10, 6, 250, 110, ES_READONLY | ES_MULTILINE | ES_CENTER, WS_EX_STATICEDGE
+    DEFPUSHBUTTON "&Close", IDOK, 216, 70, 48, 14
+    PUSHBUTTON "View &Licence", 101, 6, 70, 70, 14
+    PUSHBUTTON "Visit &Web Site", 102, 140, 70, 70, 14
+    EDITTEXT 1000, 10, 6, 250, 62, ES_READONLY | ES_MULTILINE | ES_CENTER
 END
 
 /* No accelerators used */
-214 DIALOG DISCARDABLE 50, 50, 326, 239
+214 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 1000, 10, 10, 306, 200, ES_READONLY | ES_MULTILINE | ES_LEFT, WS_EX_STATICEDGE
+    EDITTEXT 1000, 10, 10, 306, 200, ES_READONLY | ES_MULTILINE | ES_LEFT
 END
 
-215 DIALOG DISCARDABLE 0, 0, 259, 98
+215 DIALOGEX 0, 0, 259, 98
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "PuTTYgen: Private Key File Parameters"
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Shell Dlg 2"
 BEGIN
     LTEXT "PPK file version:", IDC_PPKVER_STATIC, 5, 6, 119, 8
     AUTORADIOBUTTON "2", IDC_PPKVER_2, 124, 5, 30, 10, WS_GROUP
@@ -85,5 +85,5 @@
 #include "version.rc2"
 
 #ifndef NO_MANIFESTS
-1 RT_MANIFEST "puttygen.mft"
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "../../puttygen.exe.manifest"
 #endif /* NO_MANIFESTS */