diff --git a/etc/templates/install.ltmpl b/etc/templates/install.ltmpl
index 0601a403..a39c6def 100644
--- a/etc/templates/install.ltmpl
+++ b/etc/templates/install.ltmpl
@@ -1,5 +1,6 @@
 ## files to remove from install.img
 remove "boot"
+remove "cgroup"
 remove "dev"
 remove "home"
 remove "media"
@@ -11,7 +12,6 @@ remove "selinux"
 remove "srv"
 remove "sys"
 remove "tmp"
-remove "cgroup"
 
 remove "usr/share/alsa"
 remove "usr/share/doc"
@@ -22,12 +22,50 @@ remove "usr/share/selinux"
 remove "usr/share/sgml"
 
 remove "var/cache"
+remove "var/lib/alternatives"
+remove "var/lib/logrotate.status"
+remove "var/lib/nfs"
+remove "var/lib/plymouth"
 remove "var/lib/rpm"
 remove "var/lib/yum"
+remove "var/log"
+remove "var/mail"
+remove "var/run/utmp"
+remove "var/spool"
 
 remove "lib/device-mapper"
 remove "lib/kbd"
+remove "lib/libBrokenLocale*"
+remove "lib/libSegFault*"
+remove "lib/libanl*"
+remove "lib/libasound*"
+remove "lib/libauparse*"
+remove "lib/libcgroup*"
+remove "lib/libcidn*"
+remove "lib/libdevmapper-event-lvm2*"
+remove "lib/libdmraid-events-isw*"
+remove "lib/libdmraid.so"
+remove "lib/libgssrpc*"
+remove "lib/libhandle*"
+remove "lib/libip?tc*"
+remove "lib/libipq*"
+remove "lib/libiptc*"
+remove "lib/liblvm2app*"
+remove "lib/liblvm2cmd*"
+remove "lib/libmount*"
+remove "lib/libnih*"
+remove "lib/libnss_compat*"
+remove "lib/libnss_hesiod*"
+remove "lib/libnss_nis*"
+remove "lib/libnss_winbind*"
+remove "lib/libnss_wins*"
+remove "lib/libpamc*"
+remove "lib/libply*"
+remove "lib/libthread_db*"
 remove "lib/libxtables*"
+remove "lib/rtkaio"
+remove "lib/systemd"
+remove "lib/upstart"
 remove "lib/xtables"
 
 remove "usr/lib/ConsoleKit"
@@ -63,7 +101,12 @@ remove "usr/lib/sse2"
 remove "usr/lib/tc"
 
 remove "usr/include"
+remove "usr/local"
 
+remove "usr/share/GConf"
+remove "usr/share/NetworkManager"
+remove "usr/share/X11/fonts/encodings"
+remove "usr/share/X11/fonts/util"
 remove "usr/share/aclocal"
 remove "usr/share/applications"
 remove "usr/share/authconfig"
@@ -75,7 +118,12 @@ remove "usr/share/emacs"
 remove "usr/share/file"
 remove "usr/share/firmware-tools"
 remove "usr/share/firstboot"
+remove "usr/share/fonts/bitmap"
+remove "usr/share/fonts/default"
+remove "usr/share/fonts/iso8859-2"
+remove "usr/share/gcc-*"
 remove "usr/share/gcr"
+remove "usr/share/gdb"
 remove "usr/share/gdm"
 remove "usr/share/gettext"
 remove "usr/share/gnome"
@@ -92,6 +140,9 @@ remove "usr/share/icons/Crux"
 remove "usr/share/icons/Echo"
 remove "usr/share/icons/HighContrast*"
 remove "usr/share/info"
+remove "usr/share/kde4"
+remove "usr/share/libthai"
+remove "usr/share/magic"
 remove "usr/share/makebootfat"
 remove "usr/share/metacity"
 remove "usr/share/misc"
@@ -103,6 +154,7 @@ remove "usr/share/plymouth"
 remove "usr/share/pygtk"
 remove "usr/share/smbios-utils"
 remove "usr/share/sounds"
+remove "usr/share/systemtap"
 remove "usr/share/system-config-firewall"
 remove "usr/share/system-config-users"
 remove "usr/share/tabset"
@@ -110,6 +162,7 @@ remove "usr/share/tc"
 remove "usr/share/themes/AgingGorilla"
 remove "usr/share/themes/Bright"
 remove "usr/share/themes/Crux"
+remove "usr/share/themes/GNOME3"
 remove "usr/share/themes/HighContrast*"
 remove "usr/share/themes/LowContrast*"
 remove "usr/share/themes/Simple"
@@ -118,14 +171,6 @@ remove "usr/share/usermode"
 remove "usr/share/xml"
 remove "usr/share/yum-cli"
 
-remove "var/lib/logrotate.status"
-remove "var/lib/alternatives"
-remove "var/lib/nfs"
-remove "var/lib/plymouth"
-remove "var/log"
-remove "var/run/utmp"
-remove "var/spool"
-
 remove "etc/ConsoleKit"
 remove "etc/X11"
 remove "etc/alternatives"
@@ -161,7 +206,25 @@ remove "etc/xdg"
 remove "etc/xinetd.d"
 remove "etc/xml"
 
+remove "usr/libexec/gam_server"
+remove "usr/libexec/gconf-defaults-mechanism"
+remove "usr/libexec/gnome-keyring-prompt"
+remove "usr/libexec/gnupg-pcsc-wrapper"
+remove "usr/libexec/gpg*"
+remove "usr/libexec/hal*"
+remove "usr/libexec/nm-avahi-autoipd.action"
+remove "usr/libexec/notification-daemon"
+remove "usr/libexec/pt_chown"
 remove "usr/libexec/perf*"
+remove "usr/libexec/awk"
+remove "usr/libexec/getconf"
+remove "usr/libexec/gstreamer*"
+remove "usr/libexec/man-db"
+remove "usr/libexec/openssh"
+remove "usr/libexec/plymouth"
+remove "usr/libexec/scripts"
+remove "usr/libexec/utempter"
+
 remove "usr/lib/cracklib*"
 remove "usr/lib/libnetapi*"
 
@@ -186,7 +249,6 @@ remove "usr/sbin/lvcreate"
 remove "usr/sbin/lvconvert"
 remove "usr/sbin/lvchange"
 
-remove "lib/libnss_wins*"
 remove "usr/lib/libnss_wins*"
 remove "usr/lib/libvorbis*"
 remove "usr/lib/libgstreamer*"
@@ -214,7 +276,6 @@ remove "usr/bin/newaliases"
 remove "usr/bin/mailq.exim"
 remove "usr/bin/mailq"
 remove "usr/bin/gnome-keyring-daemon"
-remove "lib/libasound*"
 remove "usr/lib/libbfd*"
 
 remove "usr/bin/gpg"
@@ -263,7 +324,6 @@ remove "usr/bin/ntfs-3g.*"
 
 remove "usr/sbin/authconfig*"
 
-
 remove "usr/lib/libavahi-*"
 remove "usr/lib/libchromeXvMC*"
 remove "usr/lib/libgirepository*"