diff --git a/debian/control b/debian/control
index 6b38951..4b5129f 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,6 @@ Vcs-Browser:
 
 Package: lubuntu-default-settings
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, lxsession (>= 0.3.9), gnome-brave-icon-theme
 Description: default settings for Lubuntu
  Various system settings tailored for Lubuntu.
diff --git a/etc/xdg/lxsession/Lubuntu/desktop.conf b/etc/xdg/lxsession/Lubuntu/desktop.conf
new file mode 100644
index 0000000..4508b52
--- /dev/null
+++ b/etc/xdg/lxsession/Lubuntu/desktop.conf
@@ -0,0 +1,21 @@
+[Session]
+window_manager=openbox-lubuntu
+
+[GTK]
+sNet/ThemeName=Clearlooks
+sNet/IconThemeName=gnome-brave
+sGtk/FontName=Sans 10
+iGtk/ToolbarStyle=3
+iGtk/ButtonImages=1
+iGtk/MenuImages=1
+iGtk/CursorThemeSize=18
+iXft/Antialias=1
+
+[Mouse]
+AccFactor=20
+AccThreshold=10
+LeftHanded=0
+
+[Keyboard]
+Delay=500
+Interval=30
diff --git a/usr/bin/startlubuntu b/usr/bin/startlubuntu
index 60f113e..4e07988 100644
--- a/usr/bin/startlubuntu
+++ b/usr/bin/startlubuntu
@@ -18,13 +18,8 @@ if [ ! -f "$OPENBOX_CONF_DIR/lubuntu-rc.xml" ]; then
     cp /usr/share/lubuntu/openbox/rc.xml "$OPENBOX_CONF_DIR/lubuntu-rc.xml"
 fi
 
-# Workaround for gdm, openbox and the number of desktops
-NUMBER_DESKTOPS=`grep \<number\> "$OPENBOX_CONF_DIR/llubuntu-rc.xml" | awk -F \> {'print $2}' | awk -F \< {'print $1}'`
-if test x"`which wmctrl 2>/dev/null`" != x""; then
-    (until [ `wmctrl -d | wc -l ` = "$NUMBER_DESKTOPS" ];do
-	wmctrl -n "$NUMBER_DESKTOPS"
-    done) &
-fi
+# Clean up after GDM (GDM sets the number of desktops to one)
+xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
 
 # Enable GTK+2 integration for OpenOffice.org, if available.
 export SAL_USE_VCLPLUGIN=gtk