https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=1d5ec164f5839e1ef3f130dba2f74e2ef84b3139

commit 1d5ec164f5839e1ef3f130dba2f74e2ef84b3139
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Fri Apr 12 17:25:32 2024 +0100

    Suggest URLs for updated setup based on build architecture
    
    Suggest URLs for updated setup based on build architecture, rather than
    on that specified with '--arch'.
    
    (Or maybe we should just point at cygwin.com/install.html? Since the URL
    isn't clickable due to :reasons:)
    
    Also: reword messages indicating setup should be updated for clarity,
    don't mention the internal detail of an "ini file".
    
    Future work: These messages (along with other errors coming from the ini
    file parser), should be localizable.

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=fd571d502636dfd0fef69fec60a1f42dd67f4419

commit fd571d502636dfd0fef69fec60a1f42dd67f4419
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Fri Apr 12 17:14:47 2024 +0100

    Display the build architecture in the splash screen
    
    Display the build architecture in the splash screen, not the
    architecture specified by the '--arch' option.

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=d34347b3128fa8bf547b35ffcfd519e7e728eb4a

commit d34347b3128fa8bf547b35ffcfd519e7e728eb4a
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Mon Apr 15 16:50:14 2024 +0100

    Avoid accidental 8-bit flattening of clickable dialog text
    
    See discussion in 75bfcddb.
    
    Also adjust this when installing Window::WindowProcReflector, but it's
    unclear if that's actually used by anything..

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=96cd4c3066fd781af8e987bdf1fea74900c4e8bc

commit 96cd4c3066fd781af8e987bdf1fea74900c4e8bc
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Mon Apr 15 14:23:10 2024 +0100

    Switch to using "Microsoft YaHei UI" for zh localized dialogs
    
    Do this by applying a post-processing step to the generated RC file.
    This lets us fix up any minor, per-language layout problems.
    
    Apparently using "MS Shell Dlg" for Chinese gylphs is "annoying", so use
    "Microsoft YaHei UI".
    
    See https://cygwin.com/pipermail/cygwin/2024-April/255806.html

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=443c580d11896757bb5ed38d3356411d4c03a5e6

commit 443c580d11896757bb5ed38d3356411d4c03a5e6
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Fri Apr 12 16:27:14 2024 +0100

    Make DIALOG STYLEs consistent
    
    * Drop obsolete DS_3DLOOK
    * Don't include (unneccessary) WS_VISIBLE
    * Consistently use DS_CENTER and DS_SYSMENU
    * Use DS_SHELLFONT
    
    (The DS_SHELLFONT dialog style for a property sheet turns off bug
    compatibility with pre-Window 2000 behaviour, so that the property sheet
    manager can interpret the dialog template dimensions relative to the
    font used by the dialog template, rather than the "MS Sans Serif" font,
    which is probably what you wanted)

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=f97b5c117340c52ebc9adf7c56fb2f7c24de3f98

commit f97b5c117340c52ebc9adf7c56fb2f7c24de3f98
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Fri Apr 12 16:33:22 2024 +0100

    Bump displayed copyright year
    
    Make it a wide-character string so we can incorporate a copyright
    symbol.


Diff:
---
 IniDBBuilderPackage.cc | 21 +++++++------
 Makefile.am            |  3 +-
 nio-ie5.cc             | 21 -------------
 proppage.cc            |  2 +-
 rc-postprocess         |  8 +++++
 res.rc                 |  9 +++++-
 res/de/res.rc          | 46 ++++++++++++---------------
 res/en/res.rc          | 46 ++++++++++++---------------
 res/fr/res.rc          | 46 ++++++++++++---------------
 res/pl/res.rc          | 46 ++++++++++++---------------
 res/tr/res.rc          | 46 ++++++++++++---------------
 res/zh_Hans/res.rc     | 84 +++++++++++++++++++++++---------------------------
 splash.cc              | 16 +++++-----
 win32.cc               | 38 +++++++++++++++++++++++
 win32.h                |  2 ++
 window.cc              |  2 +-
 16 files changed, 214 insertions(+), 222 deletions(-)

diff --git a/IniDBBuilderPackage.cc b/IniDBBuilderPackage.cc
index 039404ba..11edcd66 100644
--- a/IniDBBuilderPackage.cc
+++ b/IniDBBuilderPackage.cc
@@ -45,6 +45,12 @@ IniDBBuilderPackage::buildTimestamp (const std::string& time)
   timestamp = strtoul (time.c_str(), 0, 0);
 }
 
+static std::string
+setup_dl_url()
+{
+  return "https://cygwin.com/setup-" + machine_name(WindowsProcessMachine()) +".exe";
+}
+
 void
 IniDBBuilderPackage::buildVersion (const std::string& aVersion)
 {
@@ -64,11 +70,9 @@ IniDBBuilderPackage::buildVersion (const std::string& aVersion)
 	{
 	  char old_vers[256];
 	  snprintf (old_vers, sizeof old_vers,
-	    "The current ini file is from a newer version of setup-%s.exe. "
-	    "If you have any trouble installing, please download a fresh "
-	    "version from https://cygwin.com/setup-%s.exe",
-	    is_64bit ? "x86_64" : "x86",
-	    is_64bit ? "x86_64" : "x86");
+                    "A newer version of setup is available. "
+                    "If you have any trouble installing, please download the latest "
+                    "version from %s", setup_dl_url().c_str());
 	  _feedback.warning(old_vers);
 	}
     }
@@ -82,10 +86,9 @@ IniDBBuilderPackage::buildMinimumVersion (const std::string& minimum)
     {
       char min_vers[256];
       snprintf (min_vers, sizeof(min_vers),
-                "The current ini file requires at least version %s of setup.\n"
-                "Please download a newer version from https://cygwin.com/setup-%s.exe",
-                minimum.c_str(),
-                is_64bit ? "x86_64" : "x86");
+                "At least version %s of setup is required.\n"
+                "Please download a newer version from %s",
+                minimum.c_str(), setup_dl_url().c_str());
       return min_vers;
     }
   return "";
diff --git a/Makefile.am b/Makefile.am
index 8a50cb05..72c66109 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -323,7 +323,8 @@ po2rc:
 		./langopts $$l >/dev/null && \
 		$(MKDIR_P) res/$$l/ && \
 		po2rc -t res/en/res.rc --charset-output=utf-8 $$(./langopts $$l) po/$$l/res.po res/$$l/res.rc && \
-		d2u -q res/$$l/res.rc ; \
+		d2u -q res/$$l/res.rc && \
+		./rc-postprocess $$l res/$$l/res.rc ; \
 	done
 
 # files included by res.rc
diff --git a/nio-ie5.cc b/nio-ie5.cc
index 2117e33e..68bb1a82 100644
--- a/nio-ie5.cc
+++ b/nio-ie5.cc
@@ -34,27 +34,6 @@
 
 static StringOption UserAgent ("", '\0', "user-agent", IDS_HELPTEXT_USER_AGENT);
 
-static const std::string
-machine_name(USHORT machine)
-{
-  switch (machine)
-    {
-    case IMAGE_FILE_MACHINE_I386:
-      return "Win32";
-      break;
-    case IMAGE_FILE_MACHINE_AMD64:
-      return "Win64";
-      break;
-    case IMAGE_FILE_MACHINE_ARM64:
-      return "ARM64";
-      break;
-    default:
-      std::stringstream machine_desc;
-      machine_desc << std::hex << machine;
-      return machine_desc.str();
-    }
-}
-
 const std::string &
 determine_default_useragent(void)
 {
diff --git a/proppage.cc b/proppage.cc
index 82a825cb..514c1085 100644
--- a/proppage.cc
+++ b/proppage.cc
@@ -418,7 +418,7 @@ PropertyPage::makeClickable (int id, std::string link)
   c.url = link;
   c.font = NULL;      // these will be created as needed
   c.brush = NULL;
-  if ((c.origWinProc = reinterpret_cast<WNDPROC>(SetWindowLongPtr (hctl, 
+  if ((c.origWinProc = reinterpret_cast<WNDPROC>(SetWindowLongPtrW (hctl,
           GWLP_WNDPROC, (LONG_PTR) & PropertyPage::urlWinProc))) == 0)
     return;           // failure
     
diff --git a/rc-postprocess b/rc-postprocess
new file mode 100755
index 00000000..086bfa1a
--- /dev/null
+++ b/rc-postprocess
@@ -0,0 +1,8 @@
+#!
+# post-process the generated rc file
+
+case $1 in
+    zh_Hans)  # 0804
+        sed -i 's#FONT 8, "MS Shell Dlg"#FONT 9, "Microsoft YaHei UI"#' $2
+        ;;
+esac
diff --git a/res.rc b/res.rc
index c2aef025..fb5e0202 100644
--- a/res.rc
+++ b/res.rc
@@ -76,7 +76,14 @@ CYGWIN-TERMINAL.ICON    FILE    "cygwin-terminal.ico"
 // work around some not-fully-understood issues with PropertySheets. Hopefully,
 // using this font will cause things to 'just work'. Further information on
 // this topic is at:
-//   http://sources.redhat.com/ml/cygwin-apps/2003-05/msg00177.html
+//   https://sourceware.org/legacy-ml/cygwin-apps/2003-05/msg00177.html
+//
+// The issue alluded to here seems to be a bug in propsheet, in that the DLU for
+// each page is determined using the font of the property sheet frame, not that
+// specified in the propsheet dialog. Allegedly, the DS_SHELLFONT style
+// indicates that you don't want compatibility with that buggy behaviour, but
+// that the DLU should be correctly computed based on the propsheet font
+// instead.
 
 #include "res/en/res.rc"
 
diff --git a/res/de/res.rc b/res/de/res.rc
index f5da527a..0634db8c 100644
--- a/res/de/res.rc
+++ b/res/de/res.rc
@@ -6,7 +6,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
 //
 
 IDD_SOURCE DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Setup - Installationsart wählen"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -20,7 +20,7 @@ BEGIN
 END
 
 IDD_VIRUS DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Setup - Virenscanner deaktivieren?"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -34,7 +34,7 @@ BEGIN
 END
 
 IDD_LOCAL_DIR DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Setup - Lokales Paketverzeichnis auswählen"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -49,7 +49,7 @@ BEGIN
 END
 
 IDD_ROOT DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Setup - Installationsverzeichnis wählen"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -68,8 +68,7 @@ BEGIN
 END
 
 IDD_SITE DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTROLPARENT
 CAPTION "Cygwin-Setup - Download-Site(n) auswählen"
 FONT 8, "MS Shell Dlg"
@@ -86,7 +85,7 @@ BEGIN
 END
 
 IDD_NET DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin-Einrichtung - Verbindungsart auswählen"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -105,8 +104,7 @@ BEGIN
 END
 
 IDD_INSTATUS DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin-Einrichtung"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -126,7 +124,7 @@ BEGIN
 END
 
 IDD_PROXY_AUTH DIALOG 0, 0, SETUP_SMALL_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Proxy-Authentifizierung erforderlich"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -141,7 +139,7 @@ BEGIN
 END
 
 IDD_NET_AUTH DIALOG 0, 0, SETUP_SMALL_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Server-Authentifizierung erforderlich"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -156,8 +154,7 @@ BEGIN
 END
 
 IDD_SPLASH DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin-Einrichtung"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -171,8 +168,7 @@ BEGIN
 END
 
 IDD_DESKTOP DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin-Einrichtung - Installationsstatus und Symbole erstellen"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -190,7 +186,7 @@ BEGIN
 END
 
 IDD_FTP_AUTH DIALOG 0, 0, SETUP_SMALL_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "FTP-Authentifizierung erforderlich"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -205,8 +201,7 @@ BEGIN
 END
 
 IDD_CHOOSE DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin-Einrichtung - Pakete auswählen"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -230,8 +225,7 @@ BEGIN
 END
 
 IDD_PREREQ DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin-Einrichtung - Abhängigkeiten auflösen"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -244,8 +238,7 @@ BEGIN
 END
 
 IDD_CONFIRM DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION |
-    WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin-Einrichtung - Änderungen überprüfen und bestätigen"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -256,7 +249,7 @@ BEGIN
 END
 
 IDD_DROPPED DIALOG 0, 0, SETUP_STANDARD_DIALOG_W, 142
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Setup - Veraltete Mirror-Server verwenden?"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -270,7 +263,7 @@ BEGIN
 END
 
 IDD_DOWNLOAD_ERROR DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Herunterladen unvollständig"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -285,8 +278,7 @@ BEGIN
 END
 
 IDD_POSTINSTALL DIALOG 0, 0, SETUP_STANDARD_DIALOG_W, 142
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE |
-    WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin-Einrichtung - Ausführen von Nachinstallationsskripten"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -298,7 +290,7 @@ BEGIN
 END
 
 IDD_FILE_INUSE DIALOG 0, 0, SETUP_MEDIUM_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Datei in Verwendung entdeckt"
 FONT 8, "MS Shell Dlg"
 BEGIN
diff --git a/res/en/res.rc b/res/en/res.rc
index 20cd921e..e526b99d 100644
--- a/res/en/res.rc
+++ b/res/en/res.rc
@@ -6,7 +6,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 IDD_SOURCE DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Setup - Choose Installation Type"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -36,7 +36,7 @@ BEGIN
 END
 
 IDD_VIRUS DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Setup - Disable Virus Scanner?"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -56,7 +56,7 @@ BEGIN
 END
 
 IDD_LOCAL_DIR DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Setup - Select Local Package Directory"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -79,7 +79,7 @@ BEGIN
 END
 
 IDD_ROOT DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Setup - Choose Installation Directory"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -112,8 +112,7 @@ BEGIN
 END
 
 IDD_SITE DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTROLPARENT
 CAPTION "Cygwin Setup - Choose Download Site(s)"
 FONT 8, "MS Shell Dlg"
@@ -137,7 +136,7 @@ BEGIN
 END
 
 IDD_NET DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Setup - Select Connection Type"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -166,8 +165,7 @@ BEGIN
 END
 
 IDD_INSTATUS DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -193,7 +191,7 @@ BEGIN
 END
 
 IDD_PROXY_AUTH DIALOG 0, 0, SETUP_SMALL_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Proxy Authentication required"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -210,7 +208,7 @@ BEGIN
 END
 
 IDD_NET_AUTH DIALOG 0, 0, SETUP_SMALL_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Server Authentication required"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -227,8 +225,7 @@ BEGIN
 END
 
 IDD_SPLASH DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -255,8 +252,7 @@ BEGIN
 END
 
 IDD_DESKTOP DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Setup - Installation Status and Create Icons"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -281,7 +277,7 @@ BEGIN
 END
 
 IDD_FTP_AUTH DIALOG 0, 0, SETUP_SMALL_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "FTP Authentication required"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -298,8 +294,7 @@ BEGIN
 END
 
 IDD_CHOOSE DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Setup - Select Packages"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -339,8 +334,7 @@ BEGIN
 END
 
 IDD_PREREQ DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Setup - Resolving Dependencies"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -361,8 +355,7 @@ BEGIN
 END
 
 IDD_CONFIRM DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION |
-    WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Setup - Review and confirm changes"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -377,7 +370,7 @@ BEGIN
 END
 
 IDD_DROPPED DIALOG 0, 0, SETUP_STANDARD_DIALOG_W, 142
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Setup - Use dropped mirrors?"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -403,7 +396,7 @@ BEGIN
 END
 
 IDD_DOWNLOAD_ERROR DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Download Incomplete"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -425,8 +418,7 @@ BEGIN
 END
 
 IDD_POSTINSTALL DIALOG 0, 0, SETUP_STANDARD_DIALOG_W, 142
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE |
-    WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Setup - Running postinstall scripts"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -446,7 +438,7 @@ BEGIN
 END
 
 IDD_FILE_INUSE DIALOG 0, 0, SETUP_MEDIUM_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "In-use file detected"
 FONT 8, "MS Shell Dlg"
 BEGIN
diff --git a/res/fr/res.rc b/res/fr/res.rc
index c0396bf0..917261e4 100644
--- a/res/fr/res.rc
+++ b/res/fr/res.rc
@@ -6,7 +6,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
 //
 
 IDD_SOURCE DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Assistant Cygwin - Choisissez le type d'installation"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -20,7 +20,7 @@ BEGIN
 END
 
 IDD_VIRUS DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Assistant Cygwin - Inhiber l'Anti-Virus ?"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -34,7 +34,7 @@ BEGIN
 END
 
 IDD_LOCAL_DIR DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Assistant Cygwin - Sélection du dossier local des paquets"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -49,7 +49,7 @@ BEGIN
 END
 
 IDD_ROOT DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Assistant Cygwin - Choix du dossier d'installation"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -68,8 +68,7 @@ BEGIN
 END
 
 IDD_SITE DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTROLPARENT
 CAPTION "Assistant Cygwin - Choix site(s) de téléchargement"
 FONT 8, "MS Shell Dlg"
@@ -86,7 +85,7 @@ BEGIN
 END
 
 IDD_NET DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Assistant Cygwin - Sélection du type de connexion"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -105,8 +104,7 @@ BEGIN
 END
 
 IDD_INSTATUS DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Assistant Cygwin"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -126,7 +124,7 @@ BEGIN
 END
 
 IDD_PROXY_AUTH DIALOG 0, 0, SETUP_SMALL_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Authentification proxy requise"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -141,7 +139,7 @@ BEGIN
 END
 
 IDD_NET_AUTH DIALOG 0, 0, SETUP_SMALL_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Authentification serveur requise"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -156,8 +154,7 @@ BEGIN
 END
 
 IDD_SPLASH DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Assistant Cygwin"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -171,8 +168,7 @@ BEGIN
 END
 
 IDD_DESKTOP DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Assistant Cygwin - État de l'installation et création des icônes"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -190,7 +186,7 @@ BEGIN
 END
 
 IDD_FTP_AUTH DIALOG 0, 0, SETUP_SMALL_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Authentification FTP requise"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -205,8 +201,7 @@ BEGIN
 END
 
 IDD_CHOOSE DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Assistant Cygwin - Sélection des paquets"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -230,8 +225,7 @@ BEGIN
 END
 
 IDD_PREREQ DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Assistant Cygwin - Résolution des dépendances"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -244,8 +238,7 @@ BEGIN
 END
 
 IDD_CONFIRM DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION |
-    WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Assistant Cygwin - Revoir et confirmer les changements"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -256,7 +249,7 @@ BEGIN
 END
 
 IDD_DROPPED DIALOG 0, 0, SETUP_STANDARD_DIALOG_W, 142
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Assistant Cygwin - Utiliser les sites miroirs éliminés ?"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -270,7 +263,7 @@ BEGIN
 END
 
 IDD_DOWNLOAD_ERROR DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Téléchargement Incomplet"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -285,8 +278,7 @@ BEGIN
 END
 
 IDD_POSTINSTALL DIALOG 0, 0, SETUP_STANDARD_DIALOG_W, 142
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE |
-    WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Assistant Cygwin - Lancement des scripts post-installation"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -298,7 +290,7 @@ BEGIN
 END
 
 IDD_FILE_INUSE DIALOG 0, 0, SETUP_MEDIUM_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Détection d'un fichier en cours d'utilisation"
 FONT 8, "MS Shell Dlg"
 BEGIN
diff --git a/res/pl/res.rc b/res/pl/res.rc
index 686727df..446c38f6 100644
--- a/res/pl/res.rc
+++ b/res/pl/res.rc
@@ -6,7 +6,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 //
 
 IDD_SOURCE DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Instalacja Cygwin - wybierz typ instalacji"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -20,7 +20,7 @@ BEGIN
 END
 
 IDD_VIRUS DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Setup - Wyłączyć skaner antywirusowy?"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -34,7 +34,7 @@ BEGIN
 END
 
 IDD_LOCAL_DIR DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Konfiguracja Cygwin - Wybierz lokalny katalog pakietów"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -49,7 +49,7 @@ BEGIN
 END
 
 IDD_ROOT DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Instalacja Cygwin - wybierz katalog instalacyjny"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -68,8 +68,7 @@ BEGIN
 END
 
 IDD_SITE DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTROLPARENT
 CAPTION "Konfiguracja Cygwin - wybierz stronę(y) pobierania"
 FONT 8, "MS Shell Dlg"
@@ -86,7 +85,7 @@ BEGIN
 END
 
 IDD_NET DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Konfiguracja Cygwin - Wybierz typ połączenia"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -105,8 +104,7 @@ BEGIN
 END
 
 IDD_INSTATUS DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Konfiguracja Cygwin"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -126,7 +124,7 @@ BEGIN
 END
 
 IDD_PROXY_AUTH DIALOG 0, 0, SETUP_SMALL_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Wymagane uwierzytelnienie proxy"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -141,7 +139,7 @@ BEGIN
 END
 
 IDD_NET_AUTH DIALOG 0, 0, SETUP_SMALL_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Wymagane uwierzytelnienie serwera"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -156,8 +154,7 @@ BEGIN
 END
 
 IDD_SPLASH DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Konfiguracja Cygwin"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -171,8 +168,7 @@ BEGIN
 END
 
 IDD_DESKTOP DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Setup - Status instalacji i tworzenie ikon"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -190,7 +186,7 @@ BEGIN
 END
 
 IDD_FTP_AUTH DIALOG 0, 0, SETUP_SMALL_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Wymagane uwierzytelnienie FTP"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -205,8 +201,7 @@ BEGIN
 END
 
 IDD_CHOOSE DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Konfiguracja Cygwin - wybór pakietów"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -230,8 +225,7 @@ BEGIN
 END
 
 IDD_PREREQ DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Konfiguracja Cygwin - rozwiązywanie zależności"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -244,8 +238,7 @@ BEGIN
 END
 
 IDD_CONFIRM DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION |
-    WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Konfiguracja Cygwin - przejrzyj i potwierdź zmiany"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -256,7 +249,7 @@ BEGIN
 END
 
 IDD_DROPPED DIALOG 0, 0, SETUP_STANDARD_DIALOG_W, 142
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Setup - Używasz zrzuconych serwerów lustrzanych?"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -270,7 +263,7 @@ BEGIN
 END
 
 IDD_DOWNLOAD_ERROR DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Pobieranie zakończone"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -285,8 +278,7 @@ BEGIN
 END
 
 IDD_POSTINSTALL DIALOG 0, 0, SETUP_STANDARD_DIALOG_W, 142
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE |
-    WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Konfiguracja Cygwin - uruchamianie skryptów poinstalacyjnych"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -298,7 +290,7 @@ BEGIN
 END
 
 IDD_FILE_INUSE DIALOG 0, 0, SETUP_MEDIUM_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Wykryto plik w użyciu"
 FONT 8, "MS Shell Dlg"
 BEGIN
diff --git a/res/tr/res.rc b/res/tr/res.rc
index fc3c27d0..acd5f08d 100644
--- a/res/tr/res.rc
+++ b/res/tr/res.rc
@@ -6,7 +6,7 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 //
 
 IDD_SOURCE DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Kurucu - Kurulum Türünü Seç"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -20,7 +20,7 @@ BEGIN
 END
 
 IDD_VIRUS DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Kurucu - Virüs Tarayıcıyı Devre Dışı Bırak?"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -34,7 +34,7 @@ BEGIN
 END
 
 IDD_LOCAL_DIR DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Kurucu - Yerel Paket Dizinini Seç"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -49,7 +49,7 @@ BEGIN
 END
 
 IDD_ROOT DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Kurucu - Kurulum Dizinini Seç"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -68,8 +68,7 @@ BEGIN
 END
 
 IDD_SITE DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTROLPARENT
 CAPTION "Cygwin Kurucu - İndirme Site(ler)ini Seç"
 FONT 8, "MS Shell Dlg"
@@ -86,7 +85,7 @@ BEGIN
 END
 
 IDD_NET DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Kurucu - Bağlantı Türünü Seç"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -105,8 +104,7 @@ BEGIN
 END
 
 IDD_INSTATUS DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Kurucu"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -126,7 +124,7 @@ BEGIN
 END
 
 IDD_PROXY_AUTH DIALOG 0, 0, SETUP_SMALL_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Vekil Kimlik Doğrulaması Gerekli"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -141,7 +139,7 @@ BEGIN
 END
 
 IDD_NET_AUTH DIALOG 0, 0, SETUP_SMALL_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Sunucu Kimlik Doğrulaması Gerekli"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -156,8 +154,7 @@ BEGIN
 END
 
 IDD_SPLASH DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Kurucu"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -171,8 +168,7 @@ BEGIN
 END
 
 IDD_DESKTOP DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Kurucu - Kurulum Durumu ve Simge Oluşturulması"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -190,7 +186,7 @@ BEGIN
 END
 
 IDD_FTP_AUTH DIALOG 0, 0, SETUP_SMALL_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "FTP Kimlik Doğrulaması Gerekli"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -205,8 +201,7 @@ BEGIN
 END
 
 IDD_CHOOSE DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Kurucu - Paket Seç"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -230,8 +225,7 @@ BEGIN
 END
 
 IDD_PREREQ DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Kurucu - Bağımlılıkları Çözümle"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -244,8 +238,7 @@ BEGIN
 END
 
 IDD_CONFIRM DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION |
-    WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Kurucu - Değişiklikleri gözden geçirin ve onaylayın"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -256,7 +249,7 @@ BEGIN
 END
 
 IDD_DROPPED DIALOG 0, 0, SETUP_STANDARD_DIALOG_W, 142
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Kurucu - Kaldırılan yansılar kullanılsın mı?"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -270,7 +263,7 @@ BEGIN
 END
 
 IDD_DOWNLOAD_ERROR DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "İndirme Tamamlanmadı"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -285,8 +278,7 @@ BEGIN
 END
 
 IDD_POSTINSTALL DIALOG 0, 0, SETUP_STANDARD_DIALOG_W, 142
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE |
-    WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Kurucu - Kurulum sonrası betiklerini çalıştır"
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -298,7 +290,7 @@ BEGIN
 END
 
 IDD_FILE_INUSE DIALOG 0, 0, SETUP_MEDIUM_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Kullanımda olan dosya tespit edildi"
 FONT 8, "MS Shell Dlg"
 BEGIN
diff --git a/res/zh_Hans/res.rc b/res/zh_Hans/res.rc
index 9f67a5aa..1a3366a2 100644
--- a/res/zh_Hans/res.rc
+++ b/res/zh_Hans/res.rc
@@ -6,9 +6,9 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 //
 
 IDD_SOURCE DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin 安装程序 - 选择安装类型"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     CONTROL         "从互联网安装(&I)\n（下载的文件将保留以备将来重复使用）",IDC_SOURCE_NETINST,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP | BS_MULTILINE | BS_TOP,71,60,200,30
     CONTROL         "下载而不安装(&D)",IDC_SOURCE_DOWNLOAD,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,71,90,200,10
@@ -20,9 +20,9 @@ BEGIN
 END
 
 IDD_VIRUS DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin 安装程序 - 禁用病毒扫描程序？"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     CONTROL         "禁用病毒扫描程序(&D)",IDC_DISABLE_AV,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,101,69,115,10
     CONTROL         "保留病毒扫描程序(&L)",IDC_LEAVE_AV,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,101,84,115,10
@@ -34,9 +34,9 @@ BEGIN
 END
 
 IDD_LOCAL_DIR DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin 安装程序 - 选择本地软件包目录"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     LTEXT           "选择本地软件包目录",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
     LTEXT           "选择希望安装程序存储其下载的安装文件的目录。如果该目录尚不存在，则将创建该目录。",IDC_LOCAL_DIR_DOWNLOAD_DESC,21,9,248,16,NOT WS_GROUP
@@ -49,9 +49,9 @@ BEGIN
 END
 
 IDD_ROOT DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin 安装程序 - 选择安装目录"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     LTEXT           "选择根安装目录",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT WS_GROUP
     LTEXT           "选择要安装 Cygwin 的目录。以及一些安装参数。",IDC_ROOTDIR_SUBTEXT,21,9,239,16,NOT WS_GROUP
@@ -68,11 +68,10 @@ BEGIN
 END
 
 IDD_SITE DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTROLPARENT
 CAPTION "Cygwin 安装程序 - 选择下载站点"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
     LISTBOX         IDC_URL_LIST,66,45,185,110,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_GROUP | WS_TABSTOP
@@ -86,9 +85,9 @@ BEGIN
 END
 
 IDD_NET DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin 安装程序 - 选择连接类型"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     CONTROL         "使用系统代理设置(&S)",IDC_NET_PRECONFIG,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,55,185,10
     CONTROL         "直接连接(&D)",IDC_NET_DIRECT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,70,185,10
@@ -105,10 +104,9 @@ BEGIN
 END
 
 IDD_INSTATUS DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin 安装程序"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     LTEXT           "正在安装...",IDC_INS_ACTION,45,55,205,8,SS_ENDELLIPSIS
     LTEXT           "（软件包）",IDC_INS_PKG,45,70,205,8,SS_ENDELLIPSIS
@@ -126,9 +124,9 @@ BEGIN
 END
 
 IDD_PROXY_AUTH DIALOG 0, 0, SETUP_SMALL_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "需要代理身份验证"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     ICON            IDI_CYGWIN,IDC_HEADICON,5,5,21,20
     LTEXT           "代理用户 ID(&U)",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,WS_EX_RIGHT
@@ -141,9 +139,9 @@ BEGIN
 END
 
 IDD_NET_AUTH DIALOG 0, 0, SETUP_SMALL_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "需要服务器身份验证"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     ICON            IDI_CYGWIN,IDC_HEADICON,5,5,21,20
     LTEXT           "用户 ID(&U)",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,WS_EX_RIGHT
@@ -156,10 +154,9 @@ BEGIN
 END
 
 IDD_SPLASH DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin 安装程序"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     LTEXT           "Cygwin 在线安装程序",IDC_STATIC_WELCOME_TITLE,115,1,195,24
     LTEXT           "本安装程序用于 Cygwin 环境的初始安装以及所有后续更新。以下页面将指导您完成安装。\n\n请注意，默认情况下，我们只安装一组基本的软件包。Cygwin 提供了大量涵盖各种用途的软件包。\n\n您将来可以随时运行此程序，以根据需要添加、删除或升级软件包。",IDC_SPLASH_TEXT,115,25,195,100
@@ -171,10 +168,9 @@ BEGIN
 END
 
 IDD_DESKTOP DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin 安装程序 - 安装状态和创建快捷方式"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     CONTROL         "在桌面上创建快捷方式(&D)",IDC_ROOT_DESKTOP,"Button",BS_AUTOCHECKBOX,108,78,110,8
     CONTROL         "将快捷方式添加到“开始”菜单(&S)",IDC_ROOT_MENU,"Button",BS_AUTOCHECKBOX,108,93,140,8
@@ -190,9 +186,9 @@ BEGIN
 END
 
 IDD_FTP_AUTH DIALOG 0, 0, SETUP_SMALL_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "需要 FTP 身份验证"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     ICON            IDI_CYGWIN,IDC_HEADICON,5,5,21,20
     LTEXT           "用户 ID(&U)",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,WS_EX_RIGHT
@@ -205,10 +201,9 @@ BEGIN
 END
 
 IDD_CHOOSE DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin 安装程序 - 选择软件包"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     LTEXT           "视图(&V)",IDC_CHOOSE_VIEWCAPTION,SETUP_VIEW_X,33,SETUP_VIEW_W,10
     COMBOBOX        IDC_CHOOSE_VIEW,SETUP_VIEWLIST_X,30,SETUP_VIEWLIST_W,84,CBS_DROPDOWNLIST | WS_TABSTOP
@@ -230,10 +225,9 @@ BEGIN
 END
 
 IDD_PREREQ DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin 安装程序 - 解决依赖关系"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
     ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
@@ -244,10 +238,9 @@ BEGIN
 END
 
 IDD_CONFIRM DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION |
-    WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin 安装程序 - 审查并确认更改"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
     ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
@@ -256,9 +249,9 @@ BEGIN
 END
 
 IDD_DROPPED DIALOG 0, 0, SETUP_STANDARD_DIALOG_W, 142
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin 安装程序 - 使用非官方镜像？"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     LTEXT           "警告：",IDC_STATIC,7,8,40,8
     LTEXT           "您选择的一个或多个镜像不再在官方 Cygwin 镜像列表中。它/它们可能已过时或缺少某些软件包。\n这会影响以下镜像：",IDC_STATIC,47,8,263,32
@@ -270,9 +263,9 @@ BEGIN
 END
 
 IDD_DOWNLOAD_ERROR DIALOG 0, 0, SETUP_STANDARD_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "下载不完整"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     ICON            IDI_WARNING,IDC_HEADICON,10,10
     LTEXT           "以下软件包出现下载错误：",IDC_STATIC,7,8,320,16
@@ -285,10 +278,9 @@ BEGIN
 END
 
 IDD_POSTINSTALL DIALOG 0, 0, SETUP_STANDARD_DIALOG_W, 142
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE |
-    WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin 安装程序 - 执行安装后操作"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,SETUP_STANDARD_DIALOG_W,1
     ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
@@ -298,9 +290,9 @@ BEGIN
 END
 
 IDD_FILE_INUSE DIALOG 0, 0, SETUP_MEDIUM_DIALOG_DIMS
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
+STYLE DS_MODALFRAME | DS_CENTER | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "检测到正在使用的文件"
-FONT 8, "MS Shell Dlg"
+FONT 9, "Microsoft YaHei UI"
 BEGIN
     ICON            IDI_WARNING,IDC_HEADICON,10,10
     LTEXT           "无法解压缩",IDC_FILE_INUSE_MSG,33,10,234,8,SS_PATHELLIPSIS
diff --git a/splash.cc b/splash.cc
index 40c1334b..4c40f2aa 100644
--- a/splash.cc
+++ b/splash.cc
@@ -19,10 +19,9 @@
 #include "setup_version.h"
 #include "resource.h"
 #include "splash.h"
-#include "ini.h"
 
 #define SPLASH_URL "https://cygwin.com"
-#define SPLASH_COPYRIGHT "Copyright 2000-2023"
+#define SPLASH_COPYRIGHT L"Copyright © 2000-2024"
 #define SPLASH_TRANSLATE_URL "https://cygwin.com/setup/translate"
 
 static ControlAdjuster::ControlInfo SplashControlsInfo[] = {
@@ -49,12 +48,15 @@ SplashPage::Create ()
 void
 SplashPage::OnInit ()
 {
-  std::string ver = "Setup version ";
-  ver += (setup_version[0] ? setup_version : "[unknown]");
-  ver += is_64bit ? " (64 bit)" : " (32 bit)";
-  SetDlgItemFont(IDC_VERSION, "Arial", 10, FW_BOLD);
+  std::string ver;
+  if (setup_version[0])
+    {
+      ver = setup_version;
+      ver += " (" + machine_name(WindowsProcessMachine()) + ")";
+    }
+
   ::SetWindowText (GetDlgItem (IDC_VERSION), ver.c_str());
-  ::SetWindowText (GetDlgItem (IDC_SPLASH_COPYR), SPLASH_COPYRIGHT);
+  ::SetWindowTextW (GetDlgItem (IDC_SPLASH_COPYR), SPLASH_COPYRIGHT);
   ::SetWindowText (GetDlgItem (IDC_SPLASH_URL), SPLASH_URL);
   makeClickable (IDC_SPLASH_URL, SPLASH_URL);
   makeClickable (IDC_SPLASH_TRANSLATE, SPLASH_TRANSLATE_URL);
diff --git a/win32.cc b/win32.cc
index ea3d53af..cd7fec51 100644
--- a/win32.cc
+++ b/win32.cc
@@ -454,6 +454,44 @@ WowNativeMachine ()
 #endif
 }
 
+/* Identify machine arch for the current process */
+USHORT
+WindowsProcessMachine ()
+{
+#if defined(__x86_64__)
+  USHORT processMachine = IMAGE_FILE_MACHINE_AMD64;
+#elif defined(__i386__)
+  USHORT processMachine = IMAGE_FILE_MACHINE_I386;
+#elif defined(__aarch64__)
+  USHORT processMachine = IMAGE_FILE_MACHINE_ARM64;
+#else
+  #error "Unknown architecture"
+#endif
+  return processMachine;
+}
+
+/* Convert a machine arch identifier to a string */
+const std::string
+machine_name(USHORT machine)
+{
+  switch (machine)
+    {
+    case IMAGE_FILE_MACHINE_I386:
+      return "x86";
+      break;
+    case IMAGE_FILE_MACHINE_AMD64:
+      return "x86_64";
+      break;
+    case IMAGE_FILE_MACHINE_ARM64:
+      return "ARM64";
+      break;
+    default:
+      std::stringstream machine_desc;
+      machine_desc << std::hex << machine;
+      return machine_desc.str();
+    }
+}
+
 const std::wstring
 LoadStringWEx(UINT uID, UINT langId)
 {
diff --git a/win32.h b/win32.h
index bf3ff101..b60d8e21 100644
--- a/win32.h
+++ b/win32.h
@@ -179,6 +179,8 @@ VersionInfo& GetVer ();
 #define OSBuildNumber() (GetVer ().buildNumber ())
 
 USHORT WowNativeMachine ();
+USHORT WindowsProcessMachine ();
+const std::string machine_name(USHORT machine);
 
 static inline void
 GetDlgItemRect (HWND h, int item, LPRECT r)
diff --git a/window.cc b/window.cc
index 5f435cc8..26696e07 100644
--- a/window.cc
+++ b/window.cc
@@ -72,7 +72,7 @@ Window::FirstWindowProcReflector (HWND hwnd, UINT uMsg, WPARAM wParam,
       // We could instead simply do the contents of Window::WindowProcReflector
       // in the 'else' clause below, but this way we eliminate an unnecessary 'if/else' on
       // every message.  Yeah, it's probably not worth the trouble.
-      SetWindowLongPtr (hwnd, GWLP_WNDPROC, (LONG_PTR) & Window::WindowProcReflector);
+      SetWindowLongPtrW (hwnd, GWLP_WNDPROC, (LONG_PTR) & Window::WindowProcReflector);
       // Finally, store the window handle in the class.
       wnd->WindowHandle = hwnd;
     }