--- ./save_pageant.rc	2021-05-01 16:44:10.812738334 +0100
+++ ./pageant.rc	2021-05-01 16:45:05.712114126 +0100
@@ -14,10 +14,10 @@
 IDI_MAINICON ICON "pageant.ico"
 IDI_TRAYICON ICON "pageants.ico"
 
-IDD_LOAD_PASSPHRASE DIALOG DISCARDABLE 0, 0, 140, 60
+IDD_LOAD_PASSPHRASE DIALOGEX 0, 0, 140, 60
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Pageant: Loading Encrypted Key"
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Shell Dlg 2"
 BEGIN
     CTEXT "Enter passphrase to load key", IDC_PASSPHRASE_STATIC1, 10, 6, 120, 8
     CTEXT "", IDC_PASSPHRASE_FINGERPRINT, 10, 16, 120, 8
@@ -27,10 +27,10 @@
     PUSHBUTTON "&Cancel", IDCANCEL, 80, 42, 40, 14
 END
 
-IDD_ONDEMAND_PASSPHRASE DIALOG DISCARDABLE 0, 0, 250, 78
+IDD_ONDEMAND_PASSPHRASE DIALOGEX 0, 0, 250, 78
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Pageant: Decrypting Stored Key"
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Shell Dlg 2"
 BEGIN
     CTEXT "A client of Pageant wants to use the following encrypted key:",
         IDC_PASSPHRASE_STATIC1, 10, 6, 230, 8
@@ -46,10 +46,10 @@
     PUSHBUTTON "&Help", IDHELP, 165, 60, 50, 14
 END
 
-IDD_KEYLIST DIALOG DISCARDABLE 0, 0, 450, 236
+IDD_KEYLIST DIALOGEX 0, 0, 450, 236
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Pageant Key List"
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Shell Dlg 2"
 BEGIN
     LISTBOX 100, 10, 10, 420, 155,
         LBS_EXTENDEDSEL | LBS_HASSTRINGS | LBS_USETABSTOPS | WS_VSCROLL | WS_TABSTOP
@@ -64,32 +64,32 @@
 END
 
 /* Accelerators used: cl */
-IDD_ABOUT DIALOG DISCARDABLE 140, 40, 270, 136
+IDD_ABOUT DIALOGEX 140, 40, 270, 88
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About Pageant"
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Shell Dlg 2"
 BEGIN
-    DEFPUSHBUTTON "&Close", IDOK, 216, 118, 48, 14
-    PUSHBUTTON "View &Licence", IDC_ABOUT_LICENCE, 6, 118, 70, 14
-    PUSHBUTTON "Visit &Web Site", IDC_ABOUT_WEBSITE, 140, 118, 70, 14
-    EDITTEXT IDC_ABOUT_TEXTBOX, 10, 6, 250, 110,
-        ES_READONLY | ES_MULTILINE | ES_CENTER, WS_EX_STATICEDGE
+    DEFPUSHBUTTON "&Close", IDOK, 216, 70, 48, 14
+    PUSHBUTTON "View &Licence", IDC_ABOUT_LICENCE, 6, 70, 70, 14
+    PUSHBUTTON "Visit &Web Site", IDC_ABOUT_WEBSITE, 140, 70, 70, 14
+    EDITTEXT IDC_ABOUT_TEXTBOX, 10, 6, 250, 62,
+        ES_READONLY | ES_MULTILINE | ES_CENTER
 END
 
 /* No accelerators used */
-IDD_LICENCE DIALOG DISCARDABLE 50, 50, 326, 239
+IDD_LICENCE 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 IDC_LICENCE_TEXTBOX, 10, 10, 306, 200,
-        ES_READONLY | ES_MULTILINE | ES_LEFT, WS_EX_STATICEDGE
+        ES_READONLY | ES_MULTILINE | ES_LEFT
 END
 
 #include "version.rc2"
 
 #ifndef NO_MANIFESTS
-1 RT_MANIFEST "pageant.mft"
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "../../pageant.exe.manifest"
 #endif /* NO_MANIFESTS */