diff --git a/fedora-kickstarts b/fedora-kickstarts
index 101c5ac..331ab0d 160000
--- a/fedora-kickstarts
+++ b/fedora-kickstarts
@@ -1 +1 @@
-Subproject commit 101c5ac63a5a4eaa04b442524c6fdfcfd219f72f
+Subproject commit 331ab0d31fee19ec4547bd498de6b83d4299d2d7
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 2287362..c861e15 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -41,6 +41,7 @@ anaconda-live
 # https://fedoraproject.org/wiki/Changes/RemoveDeviceMapperMultipathFromWorkstationLiveCD
 -fcoe-utils
 -device-mapper-multipath
+-sdubby
 
 # Need aajohan-comfortaa-fonts for the SVG rnotes images
 aajohan-comfortaa-fonts
diff --git a/fedora-live-workstation.ks b/fedora-live-workstation.ks
index fad49ba..f3391ce 100644
--- a/fedora-live-workstation.ks
+++ b/fedora-live-workstation.ks
@@ -17,89 +17,6 @@ part / --size 10000
 # set livesys session type
 sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys
 
-
-# disable gnome-software automatically downloading updates
-cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE
-[org.gnome.software]
-allow-updates=false
-download-updates=false
-FOE
-
-# don't autostart gnome-software session service
-rm -f /etc/xdg/autostart/org.gnome.Software.desktop
-
-# disable the gnome-software shell search provider
-cat >> /usr/share/gnome-shell/search-providers/org.gnome.Software-search-provider.ini << FOE
-DefaultDisabled=true
-FOE
-
-# don't run gnome-initial-setup
-mkdir ~liveuser/.config
-touch ~liveuser/.config/gnome-initial-setup-done
-
-# suppress anaconda spokes redundant with gnome-initial-setup
-cat >> /etc/sysconfig/anaconda << FOE
-[NetworkSpoke]
-visited=1
-
-[PasswordSpoke]
-visited=1
-
-[UserSpoke]
-visited=1
-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=['firefox.desktop', 'org.gnome.Calendar.desktop', 'rhythmbox.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop']
-FOE
-
-  # Make the welcome screen show up
-  if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then
-    mkdir -p ~liveuser/.config/autostart
-    cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/
-    cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/
-  fi
-
-  # Disable GNOME welcome tour so it doesn't overlap with Fedora welcome screen
-  cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
-welcome-dialog-last-shown-version='4294967295'
-FOE
-
-  # Copy Anaconda branding in place
-  if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then
-    cp -a /usr/share/lorax/product/* /
-  fi
-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
-
-# make sure to set the right permissions and selinux contexts
-chown -R liveuser:liveuser /home/liveuser/
-restorecon -R /home/liveuser/
-
-EOF
-
 %end
 
 %post
diff --git a/fedora-workstation-common.ks b/fedora-workstation-common.ks
index 9a79c6d..1b71629 100644
--- a/fedora-workstation-common.ks
+++ b/fedora-workstation-common.ks
@@ -13,47 +13,55 @@
 -reiserfs-utils
 
 # horal
+rogue
+ularn
 nethack
 nethack-vultures
 slashem
 crawl
 crawl-tiles
-openttd
-fortune-mod
-bsd-games
 angband
+hyperrogue
+bsd-games
+fortune-mod
+
+openttd
+warzone2100
+-warzone2100-sequences
 chocolate-doom
-xblast
-gnome-mines
-armacycles-ad
-gnome-nibbles
-hedgewars
-gnome-robots
-tuxanci
-supertuxkart
-supertux
-pingus
 freedoom
 freedoom-freedm
 freedoom2
-warzone2100
--warzone2100-sequences
-minetest
-quadrapassel
-rogue
 
-vlc
+gnome-mines
+quadrapassel
+gnome-robots
+pingus
+minetest
+
+xblast
+armacycles-ad
+gnome-nibbles
+hedgewars
+tuxanci
+supertuxkart
+supertux
 
 htop
 vim
 gvim
 tmux
-nmap
-telnet
-hexchat
 bc
+bvi
 ranger
+netcat
+
+hexchat
 gimp
+vlc
+
 testdisk
+nmap
+wireshark
 
 %end