Index: packaging/win32/dist-impl.sh
===================================================================
--- packaging/win32/dist-impl.sh	(revision 19217)
+++ packaging/win32/dist-impl.sh	(working copy)
@@ -97,7 +97,7 @@
     wget_unpacked $PANGO_URL $DOWNLOAD_DIR $DIST_DIR
     wget_unpacked $LIBART_LGPL_URL $DOWNLOAD_DIR $DIST_DIR
     wget_unpacked $GTK_URL $DOWNLOAD_DIR $DIST_DIR
-    cp $DIST_DIR/share/themes/MS-Windows/gtk-2.0/gtkrc $DIST_DIR/etc/gtk-2.0
+    echo 'gtk-theme-name = "MS-Windows"' > $DIST_DIR/etc/gtk-2.0/gtkrc
     wget_unpacked $ORBIT2_URL $DOWNLOAD_DIR $DIST_DIR
     wget_unpacked $GAIL_URL $DOWNLOAD_DIR $DIST_DIR
     wget_unpacked $POPT_URL $DOWNLOAD_DIR $DIST_DIR
@@ -111,6 +111,18 @@
     wget_unpacked $LIBGLADE_URL $DOWNLOAD_DIR $DIST_DIR
 	wget_unpacked $PIXMAN_URL $DOWNLOAD_DIR $DIST_DIR
     wget_unpacked $GTKHTML_URL $DOWNLOAD_DIR $DIST_DIR
+	wget_unpacked $GTK_THEME_URL $DOWNLOAD_DIR $TMP_DIR
+
+    assert_one_dir $TMP_UDIR/gtk2-themes-*
+    cp -a $TMP_UDIR/gtk2-themes-*/lib $DIST_DIR/
+    cp -a $TMP_UDIR/gtk2-themes-*/share $DIST_DIR/
+    rm -rf $TMP_UDIR/gtk2-themes-*
+
+    wget_unpacked $GTK_PREFS_URL $DOWNLOAD_DIR $TMP_DIR
+    assert_one_dir $TMP_UDIR/gtk2_prefs-*
+    mv $TMP_UDIR/gtk2_prefs-*/gtk2_prefs.exe $DIST_DIR/bin
+    rm -rf $TMP_UDIR/gtk2_prefs-*
+
     rm -rf $DIST_UDIR/etc/gconf/gconf.xml.defaults/{desktop,schemas}
     cp -a $DIST_UDIR/lib/locale $DIST_UDIR/share
     rm -rf $DIST_UDIR/lib/locale
Index: packaging/win32/defaults.sh
===================================================================
--- packaging/win32/defaults.sh	(revision 19217)
+++ packaging/win32/defaults.sh	(working copy)
@@ -258,6 +258,8 @@
 set_default GTKHTML_URL "$GNOME_WIN32_URL/gtkhtml/3.24/gtkhtml_3.24.2-1_win32.zip"
 set_default GTKHTML_DEV_URL "$GNOME_WIN32_URL/gtkhtml/3.24/gtkhtml-dev_3.24.2-1_win32.zip"
 set_default GTK_DOC_URL "$GNOME_MIRROR/sources/gtk-doc/1.13/gtk-doc-1.13.tar.bz2"
+set_default GTK_THEME_URL "$SF_MIRROR/gtk-win/gtk2-themes-2009-09-07-win32_bin.zip"
+set_default GTK_PREFS_URL "$SF_MIRROR/gtk-win/gtk2_prefs-0.4.1.bin-gtk2.10-win32.zip"
 set_default GNOME_DIR $GLOBAL_DIR\\gnome
 
 set_default LIBBONOBOUI_URL "$GNOME_WIN32_URL/libbonoboui/2.24/libbonoboui_2.24.0-1_win32.zip"
Index: packaging/win32/gnucash.iss.in
===================================================================
--- packaging/win32/gnucash.iss.in	(revision 19217)
+++ packaging/win32/gnucash.iss.in	(working copy)
@@ -46,6 +46,7 @@
 Name: "{group}\{cm:IconName_FAQ}"; Filename: "http://wiki.gnucash.org/wiki/FAQ"; Tasks: menuicon
 Name: "{group}\{cm:IconName_Bugzilla}"; Filename: "http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash"; Tasks: menuicon
 Name: "{group}\{cm:IconName_InstallFQ}"; Filename: "{app}\bin\install-fq-mods.cmd"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_InstallFQ}"; Tasks: menuicon
+Name: "{group}\{cm:IconName_Theme}"; Filename: "{app}\bin\gtk2_prefs.exe"; WorkingDir: "{app}\bin"; Tasks: menuicon
 Name: "{group}\{cm:IconName_Uninstall}"; Filename: "{uninstallexe}"; Comment: "{cm:IconComment_Uninstall}"; Tasks: menuicon
 
 Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\gnucash-bin.exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: desktopicon; Flags: runminimized
@@ -325,6 +326,7 @@
 IconName_Bugzilla=Report a Bug (Online)
 IconName_InstallFQ=Install Online Price Retrieval
 IconComment_InstallFQ=Install the necessary perl module Finance-Quote for online retrieval of prices.  Requires ActivePerl 5.8 or 5.10
+IconName_Theme=Select Theme
 IconName_Uninstall=Uninstall GnuCash
 IconComment_Uninstall=Uninstall the Finance Manager GnuCash
 
Index: packaging/win32/install-impl.sh
===================================================================
--- packaging/win32/install-impl.sh	(revision 19217)
+++ packaging/win32/install-impl.sh	(working copy)
@@ -554,6 +554,7 @@
         wget_unpacked $LIBART_LGPL_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
         wget_unpacked $GTK_URL $DOWNLOAD_DIR $GNOME_DIR
         wget_unpacked $GTK_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+        echo 'gtk-theme-name = "MS-Windows"' > $GNOME_DIR/etc/gtk-2.0/gtkrc
         wget_unpacked $INTLTOOL_URL $DOWNLOAD_DIR $GNOME_DIR
         wget_unpacked $ORBIT2_URL $DOWNLOAD_DIR $GNOME_DIR
         wget_unpacked $ORBIT2_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
@@ -579,6 +580,17 @@
         wget_unpacked $LIBGLADE_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
         wget_unpacked $GTKHTML_URL $DOWNLOAD_DIR $GNOME_DIR
         wget_unpacked $GTKHTML_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+        wget_unpacked $GTK_THEME_URL $DOWNLOAD_DIR $TMP_DIR
+        assert_one_dir $TMP_UDIR/gtk2-themes-*
+        cp -a $TMP_UDIR/gtk2-themes-*/lib $_GNOME_UDIR/
+        cp -a $TMP_UDIR/gtk2-themes-*/share $_GNOME_UDIR/
+        rm -rf $TMP_UDIR/gtk2-themes-*
+
+        wget_unpacked $GTK_PREFS_URL $DOWNLOAD_DIR $TMP_DIR
+        assert_one_dir $TMP_UDIR/gtk2_prefs-*
+        mv $TMP_UDIR/gtk2_prefs-*/gtk2_prefs.exe $_GNOME_UDIR/bin
+        rm -rf $TMP_UDIR/gtk2_prefs-*
+
         wget_unpacked $GTK_DOC_URL $DOWNLOAD_DIR $TMP_DIR
         qpushd $_GNOME_UDIR
             assert_one_dir $TMP_UDIR/gtk-doc-*
