diff --git a/base/setup/guiphase/CMakeLists.txt b/base/setup/guiphase/CMakeLists.txt
index 8c716de..a960c95 100644
--- a/base/setup/guiphase/CMakeLists.txt
+++ b/base/setup/guiphase/CMakeLists.txt
@@ -117,10 +117,14 @@ install(
     FILES
         ${CMAKE_BINARY_DIR}/xinitrc
         res/xfwm4.xml
-        res/xsettings.xml
         res/wsetupx.service
     DESTINATION ${WINTC_ASSETS_INSTALL_DIR}/wsetupx
 )
+install(
+    FILES
+        res/gtk-settings.ini
+    DESTINATION ${WINTC_ASSETS_INSTALL_DIR}/wsetupx
+)
 install(
     PROGRAMS ${CMAKE_BINARY_DIR}/startwsetupx
     DESTINATION ${CMAKE_INSTALL_BINDIR}
diff --git a/base/setup/guiphase/res/gtk-settings.ini b/base/setup/guiphase/res/gtk-settings.ini
new file mode 100644
index 0000000..ac11415
--- /dev/null
+++ b/base/setup/guiphase/res/gtk-settings.ini
@@ -0,0 +1,5 @@
+[Settings]
+gtk-cursor-theme-name=standard-with-shadow
+gtk-icon-theme-name=luna
+gtk-font-name=Tahoma 8
+gtk-theme-name=Windows Classic style
diff --git a/base/setup/guiphase/res/startwsetupx.in b/base/setup/guiphase/res/startwsetupx.in
index 4b5bc28..7780d2d 100644
--- a/base/setup/guiphase/res/startwsetupx.in
+++ b/base/setup/guiphase/res/startwsetupx.in
@@ -33,7 +33,12 @@ XFCONF_DIR=$XDG_CONFIG_HOME/xfce4/xfconf/xfce-perchannel-xml
 mkdir -p $XFCONF_DIR
 
 cp -f @CMAKE_INSTALL_PREFIX@/@WINTC_ASSETS_INSTALL_DIR@/wsetupx/xfwm4.xml $XFCONF_DIR
-cp -r @CMAKE_INSTALL_PREFIX@/@WINTC_ASSETS_INSTALL_DIR@/wsetupx/xsettings.xml $XFCONF_DIR
+
+# Copy over default GTK settings
+#
+GTKCONF_DIR=$XDG_CONFIG_HOME/gtk-3.0
+
+cp -f @CMAKE_INSTALL_PREFIX@/@WINTC_ASSETS_INSTALL_DIR@/wsetupx/gtk-settings.ini $GTKCONF_DIR/settings.ini
 
 # FIXME: This might only work on systemd due to XDG_VTNR, figure out what to
 #        do on other init systems
diff --git a/base/setup/guiphase/res/wsetupx.service b/base/setup/guiphase/res/wsetupx.service
index eb78f20..069f814 100644
--- a/base/setup/guiphase/res/wsetupx.service
+++ b/base/setup/guiphase/res/wsetupx.service
@@ -3,8 +3,8 @@ Description=Windows WinTC Setup (Graphical Phase)
 Before=display-manager.service
 
 [Service]
-# FIXME: Needs to be configured by CMake...
-ExecStart=startx /usr/share/wintc/wsetupx/xinitrc
+# FIXME: Check FreeBSD
+ExecStart=/usr/bin/startwsetupx
 
 [Install]
 WantedBy=multi-user.target
diff --git a/base/setup/guiphase/res/xfwm4.xml b/base/setup/guiphase/res/xfwm4.xml
index 36dc646..1cc8956 100644
--- a/base/setup/guiphase/res/xfwm4.xml
+++ b/base/setup/guiphase/res/xfwm4.xml
@@ -59,7 +59,7 @@
     <property name="theme" type="string" value="Windows Classic style"/>
     <property name="tile_on_move" type="bool" value="true"/>
     <property name="title_alignment" type="string" value="left"/>
-    <property name="title_font" type="string" value="Tahoma Bold 10"/>
+    <property name="title_font" type="string" value="Tahoma Bold 8"/>
     <property name="title_horizontal_offset" type="int" value="0"/>
     <property name="titleless_maximize" type="bool" value="false"/>
     <property name="title_shadow_active" type="string" value="false"/>
diff --git a/base/setup/guiphase/res/xsettings.xml b/base/setup/guiphase/res/xsettings.xml
deleted file mode 100644
index 8475dba..0000000
--- a/base/setup/guiphase/res/xsettings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xsettings" version="1.0">
-  <property name="Net" type="empty">
-    <property name="ThemeName" type="string" value="Windows Classic style"/>
-  </property>
-  <property name="Gtk" type="empty">
-    <property name="CursorThemeName" type="string" value="standard-with-shadow"/>
-    <property name="CursorThemeSize" type="int" value="16"/>
-  </property>
-</channel>
diff --git a/base/setup/initial/complist.ini.in b/base/setup/initial/complist.ini.in
index a7cefe5..43127a3 100644
--- a/base/setup/initial/complist.ini.in
+++ b/base/setup/initial/complist.ini.in
@@ -1,6 +1,6 @@
 [BaseSystem]
 Libs=@WSETUP_LIBLIST@
-OurPackages=wintc-setup-gui,wintc-theme-native,wintc-cursor-theme-standard-with-shadow,wintc-bootvid,wintc-fonts-xp
+OurPackages=wintc-setup-gui,wintc-theme-native,wintc-icon-theme-luna,wintc-cursor-theme-standard-with-shadow,wintc-bootvid,wintc-fonts-xp
 DistPackagesDeb=xfwm4,xfconf,plymouth,xserver-xorg,xinit
 # FIXME: Other distro packages here