diff --git a/examples/scripts/inner_chroot_script.sh b/examples/scripts/inner_chroot_script.sh
index 1e547f2..406a6eb 100755
--- a/examples/scripts/inner_chroot_script.sh
+++ b/examples/scripts/inner_chroot_script.sh
@@ -1,11 +1,7 @@
 #!/bin/bash
 
-/usr/sbin/env-update
 source /etc/profile
-
-for arg in $*; do
-    [[ "${arg}" = "spinbase" ]] && SPINBASE="1"
-done
+/usr/sbin/env-update && source /etc/profile
 
 # Setup locale to en_US
 echo LANG=\"en_US.UTF-8\" > /etc/env.d/02locale
@@ -24,7 +20,7 @@ sed -i 's:exec -l /bin/bash:exec -l /bin/bash -l:' /bin/bashlogin
 [ -e /etc/sudoers ] && sed -i '/NOPASSWD: ALL/ s/^# //' /etc/sudoers
 
 # setup opengl in /etc (if configured)
-[[ -z "${SPINBASE}" ]] && eselect opengl set xorg-x11
+eselect opengl set xorg-x11 &> /dev/null
 
 # touch /etc/asound.state
 touch /etc/asound.state
@@ -32,37 +28,6 @@ touch /etc/asound.state
 update-pciids
 update-usbids
 
-if [ -z "${SPINBASE}" ]; then
-	# Prepare NVIDIA legacy drivers infrastructure
-
-	if [ ! -d "/install-data/drivers" ]; then
-        	mkdir -p /install-data/drivers
-	fi
-	myuname=$(uname -m)
-	mydir="x86"
-	if [ "$myuname" == "x86_64" ]; then
-        	mydir="amd64"
-	fi
-	kernel_tag="#$(equo query installed -qv sys-kernel/linux-sabayon | sort | head -n 1 | cut -d"-" -f 4 | sed 's/ //g')-sabayon"
-
-	rm -rf /var/lib/entropy/packages*/${mydir}/5/x11-drivers*
-	ACCEPT_LICENSE="NVIDIA" equo install --fetch --nodeps =x11-drivers/nvidia-drivers-173*$kernel_tag
-	ACCEPT_LICENSE="NVIDIA" equo install --fetch --nodeps =x11-drivers/nvidia-drivers-96*$kernel_tag
-	# testing xorg-server-1.5 support
-	# ACCEPT_LICENSE="NVIDIA" equo install --fetch --nodeps ~x11-drivers/nvidia-drivers-71.86.*$kernel_tag
-	mv /var/lib/entropy/packages-nonfree/${mydir}/*/x11-drivers\:nvidia-drivers*.tbz2 /install-data/drivers/
-
-	# Add fusion icon to desktop
-	if [ -f "/usr/share/applications/fusion-icon.desktop" ]; then
-		cp /usr/share/applications/fusion-icon.desktop /etc/skel/Desktop/
-	fi
-fi
-
-# EXPERIMENTAL, clean icon cache files
-for file in `find /usr/share/icons -name "icon-theme.cache"`; do
-	rm $file
-done
-
 echo -5 | etc-update
 mount -t proc proc /proc
 /lib/rc/bin/rc-depend -u
@@ -81,34 +46,15 @@ umount /proc
 equo deptest --pretend
 emaint --fix world
 
-# remove anaconda .git
-rm /opt/anaconda/.git -rf
-rm /opt/anaconda/usr/share/anaconda/po/*.po -rf
-
-
 # copy Portage config from sabayonlinux.org entropy repo to system
 cp /var/lib/entropy/client/database/*/sabayonlinux.org/standard/*/*/package.mask /etc/portage/package.mask
 cp /var/lib/entropy/client/database/*/sabayonlinux.org/standard/*/*/package.unmask /etc/portage/package.unmask
 cp /var/lib/entropy/client/database/*/sabayonlinux.org/standard/*/*/package.use /etc/portage/package.use
-[[ -z "${SPINBASE}" ]] && cp /var/lib/entropy/client/database/*/sabayonlinux.org/standard/*/*/make.conf /etc/make.conf
+cp /var/lib/entropy/client/database/*/sabayonlinux.org/standard/*/*/make.conf /etc/make.conf
 
 # Update sabayon overlay
-layman -s sabayon
-if [ -z "${SPINBASE}" ]; then
-	layman -d sabayon
-	rm -rf /var/lib/layman/sabayon
-fi
-
-# if Sabayon GNOME, drop qt-gui bins
-gnome_panel=$(qlist -ICve gnome-base/gnome-panel)
-if [ -n "${gnome_panel}" ]; then
-	find /usr/share/applications -name "*qt-gui*.desktop" | xargs rm
-fi
-# we don't want this on our ISO
-rm -f /usr/share/applications/sandbox.desktop
-
-# Remove wicd from autostart
-rm -f /usr/share/autostart/wicd-tray.desktop /etc/xdg/autostart/wicd-tray.desktop
+layman -d sabayon
+rm -rf /var/lib/layman/sabayon
 
 # Reset users' password
 echo "sabayonuser:" | chpasswd
@@ -127,9 +73,6 @@ if [ ! -d "/var/run/screen" ]; then
 	chown root:utmp /var/run/screen
 fi
 
-# Revert to blocked entropy repo URL
-sed -i 's/pkgbuild.sabayon.org/pkg.sabayon.org/g' /etc/entropy/repositories.conf
-
 # Tweak user groups
 usermod -a -G lpadmin sabayonuser
 
diff --git a/examples/scripts/remaster_generic_inner_chroot_script_after.sh b/examples/scripts/remaster_generic_inner_chroot_script_after.sh
index 9a9001c..824e40c 100755
--- a/examples/scripts/remaster_generic_inner_chroot_script_after.sh
+++ b/examples/scripts/remaster_generic_inner_chroot_script_after.sh
@@ -1,48 +1,130 @@
 #!/bin/bash
 
-# Use gdm by default
-sed -i 's/DISPLAYMANAGER=".*"/DISPLAYMANAGER="gdm"/g' /etc/conf.d/xdm
+# do not remove these
+/usr/sbin/env-update
+source /etc/profile
+
+eselect opengl set xorg-x11 &> /dev/null
 
 # automatically start xdm
-rc-update del xdm
+rc-update del xdm default
+rc-update del xdm boot
 rc-update add xdm boot
+
+# consolekit must be run at boot level
+rc-update add consolekit boot
+
+rc-update del hald boot
 rc-update del hald
-rc-update add hald default
+rc-update add hald boot
+
+rc-update del NetworkManager default
 rc-update del NetworkManager
 rc-update add NetworkManager default
 
-echo -5 | equo conf update
+rc-update del music boot
+rc-update add music default
 
-# remove stuff from Skel we don't have
-rm /etc/skel/Desktop/WorldOfGooDemo-world-of-goo-demo.desktop
-rm /etc/skel/Desktop/fusion-icon.desktop
-rm /etc/skel/Desktop/xbmc.desktop
+rc-update del sabayon-mce default
+rc-update add sabayon-mce boot
+
+rc-update add nfsmount default
+
+remove_desktop_files() {
+	rm /etc/skel/Desktop/WorldOfGooDemo-world-of-goo-demo.desktop
+	rm /etc/skel/Desktop/fusion-icon.desktop
+	rm /etc/skel/Desktop/xbmc.desktop
+}
+
+setup_sabayon_mce() {
+	# Sabayon Media Center user setup
+	source /sbin/sabayon-functions.sh
+	sabayon_setup_live_user "sabayonmce"
+}
 
 if [ "$1" = "lxde" ]; then
 	# Fix ~/.dmrc to have it load LXDE
 	echo "[Desktop]" > /etc/skel/.dmrc
 	echo "Session=LXDE" >> /etc/skel/.dmrc
+	remove_desktop_files
+	sed -i 's/DISPLAYMANAGER=".*"/DISPLAYMANAGER="gdm"/g' /etc/conf.d/xdm
+	# properly tweak lxde autostart tweak, adding --desktop option
+	sed -i 's/pcmanfm -d/pcmanfm -d --desktop/g' /etc/xdg/lxsession/LXDE/autostart
 elif [ "$1" = "xfce" ]; then
 	# Fix ~/.dmrc to have it load XFCE
 	echo "[Desktop]" > /etc/skel/.dmrc
 	echo "Session=xfce" >> /etc/skel/.dmrc
+	remove_desktop_files
+	sed -i 's/DISPLAYMANAGER=".*"/DISPLAYMANAGER="gdm"/g' /etc/conf.d/xdm
 elif [ "$1" = "fluxbox" ]; then
 	# Fix ~/.dmrc to have it load Fluxbox
 	echo "[Desktop]" > /etc/skel/.dmrc
 	echo "Session=fluxbox" >> /etc/skel/.dmrc
+	remove_desktop_files
+	sed -i 's/DISPLAYMANAGER=".*"/DISPLAYMANAGER="gdm"/g' /etc/conf.d/xdm
+elif [ "$1" = "gnome" ]; then
+	# Fix ~/.dmrc to have it load GNOME
+	echo "[Desktop]" > /etc/skel/.dmrc
+	echo "Session=gnome" >> /etc/skel/.dmrc
+	SHIP_NVIDIA_LEGACY="1"
+	rc-update del system-tools-backends boot
+	rc-update add system-tools-backends default
+	sed -i 's/DISPLAYMANAGER=".*"/DISPLAYMANAGER="gdm"/g' /etc/conf.d/xdm
+	setup_sabayon_mce
+elif [ "$1" = "kde" ]; then
+	# Fix ~/.dmrc to have it load KDE
+	echo "[Desktop]" > /etc/skel/.dmrc
+	echo "Session=KDE-4" >> /etc/skel/.dmrc
+	SHIP_NVIDIA_LEGACY="1"
+	sed -i 's/DISPLAYMANAGER=".*"/DISPLAYMANAGER="kdm"/g' /etc/conf.d/xdm
+	setup_sabayon_mce
 fi
 
+if [ -n "${SHIP_NVIDIA_LEGACY}" ]; then
+	# Prepare NVIDIA legacy drivers infrastructure
+
+	if [ ! -d "/install-data/drivers" ]; then
+        	mkdir -p /install-data/drivers
+	fi
+	myuname=$(uname -m)
+	mydir="x86"
+	if [ "$myuname" == "x86_64" ]; then
+        	mydir="amd64"
+	fi
+	kernel_tag="#$(equo query installed -qv sys-kernel/linux-sabayon | sort | head -n 1 | cut -d"-" -f 4 | sed 's/ //g')-sabayon"
+
+	rm -rf /var/lib/entropy/client/packages/packages*/${mydir}/*/x11-drivers*
+	ACCEPT_LICENSE="NVIDIA" equo install --fetch --nodeps =x11-drivers/nvidia-drivers-173*$kernel_tag
+	ACCEPT_LICENSE="NVIDIA" equo install --fetch --nodeps =x11-drivers/nvidia-drivers-96*$kernel_tag
+	# not working with >=xorg-server-1.5
+	# ACCEPT_LICENSE="NVIDIA" equo install --fetch --nodeps ~x11-drivers/nvidia-drivers-71.86.*$kernel_tag
+	mv /var/lib/entropy/client/packages/packages-nonfree/${mydir}/*/x11-drivers\:nvidia-drivers*.tbz2 /install-data/drivers/
+
+	# Add fusion icon to desktop
+	if [ -f "/usr/share/applications/fusion-icon.desktop" ]; then
+		cp /usr/share/applications/fusion-icon.desktop /etc/skel/Desktop/
+	fi
+fi
+
+# if Sabayon GNOME, drop qt-gui bins
+gnome_panel=$(qlist -ICve gnome-base/gnome-panel)
+if [ -n "${gnome_panel}" ]; then
+        find /usr/share/applications -name "*qt-gui*.desktop" | xargs rm
+fi
+# we don't want this on our ISO
+rm -f /usr/share/applications/sandbox.desktop
+
+# Remove wicd from autostart
+rm -f /usr/share/autostart/wicd-tray.desktop /etc/xdg/autostart/wicd-tray.desktop
+
+# EXPERIMENTAL, clean icon cache files
+for file in `find /usr/share/icons -name "icon-theme.cache"`; do
+        rm $file
+done
+
 # Update package list
 equo query list installed -qv > /etc/sabayon-pkglist
 
-# We installed feh and now use it to set a background!
-echo "@feh --bg-scale /usr/share/backgrounds/sabayonlinux.png" >> /etc/xdg/lxsession/LXDE/autostart
-
-rm /var/lib/entropy/client/database/*/sabayonlinux.org -rf
-equo rescue vacuum
-
-rm -rf /opt/anaconda*
-
 # Setup basic GTK theme for root user
 if [ ! -f "/root/.gtkrc-2.0" ]; then
 	echo "include \"/usr/share/themes/Clearlooks/gtk-2.0/gtkrc\"" > /root/.gtkrc-2.0
@@ -56,4 +138,24 @@ fi
 layman -d sabayon
 rm -rf /var/lib/layman/sabayon
 
+
+echo -5 | equo conf update
+mount -t proc proc /proc
+/lib/rc/bin/rc-depend -u
+
+echo "Vacuum cleaning client db"
+rm /var/lib/entropy/client/database/*/sabayonlinux.org -rf
+equo rescue vacuum
+
+# Generate openrc cache
+/etc/init.d/savecache start
+/etc/init.d/savecache zap
+
+ldconfig
+ldconfig
+umount /proc
+
+equo deptest --pretend
+emaint --fix world
+
 exit 0