diff --git a/fedora-livedvd-robotics.ks b/fedora-livedvd-robotics.ks
index 6fce88c..9931233 100644
--- a/fedora-livedvd-robotics.ks
+++ b/fedora-livedvd-robotics.ks
@@ -9,31 +9,30 @@
 # Start with GNOME
 @gnome-desktop
 
-# Add robotics development
+# Add robotics development packages
 @robotics-suite
 -fawkes*
 player-devel
 stage-devel
 mrpt-devel
 
-# Remove gnome-y things
+# Remove extra gnome-y things
 -@graphical-internet
 -@games
 -@sound-and-video
 
+# Add a web browser
 firefox
 
-# No Office
+# Remove office suite
 -libreoffice-*
 -planner
 
 # Drop the Java plugin
 -icedtea-web
--java-1.6.0-openjdk
 
 # Drop things that pull in perl
 -linux-atm
--perf
 
 # No printing
 -foomatic-db-ppds
@@ -58,7 +57,6 @@ firefox
 -pam_krb5
 -quota
 -nano
--minicom
 -dos2unix
 -finger
 -ftp
@@ -66,7 +64,6 @@ firefox
 -mtr
 -pinfo
 -rsh
--telnet
 -nfs-utils
 -ypbind
 -yp-tools
@@ -84,5 +81,55 @@ firefox
 
 %end
 
+# Rip the post-configuration from the live-desktop, set default shortcuts to IDEs 
 %post
+cat >> /etc/rc.d/init.d/livesys << EOF
+# disable screensaver locking
+cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override << FOE
+[org.gnome.desktop.screensaver]
+lock-enabled=false
+FOE
+
+# and hide the lock screen option
+cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override << FOE
+[org.gnome.desktop.lockdown]
+disable-lock-screen=true
+FOE
+
+# disable updates plugin
+cat >> /usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override << FOE
+[org.gnome.settings-daemon.plugins.updates]
+active=false
+FOE
+
+# make the installer show up
+if [ -f /usr/share/applications/liveinst.desktop ]; then
+  # Show harddisk install in shell dash
+  sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop ""
+  # need to move it to anaconda.desktop to make shell happy
+  mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop
+
+  cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
+[org.gnome.shell]
+favorite-apps=['mozilla-firefox.desktop', 'eclipse.desktop', 'arduino.desktop', 'gnome-terminal.desktop','nautilus.desktop', 'anaconda.desktop']
+FOE
+
+fi
+
+# rebuild schema cache with any overrides we installed
+glib-compile-schemas /usr/share/glib-2.0/schemas
+
+# set up auto-login
+cat >> /etc/gdm/custom.conf << FOE
+[daemon]
+AutomaticLoginEnable=True
+AutomaticLogin=liveuser
+FOE
+
+# Turn off PackageKit-command-not-found while uninstalled
+if [ -f /etc/PackageKit/CommandNotFound.conf ]; then
+  sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf
+fi
+
+EOF
 %end