diff --git a/molecules/gnome.common b/molecules/gnome.common
index a56cf2e..e4d8f72 100644
--- a/molecules/gnome.common
+++ b/molecules/gnome.common
@@ -75,6 +75,7 @@ packages_to_add:
 	app-emulation/wine,
 	app-misc/gnote,
 	app-misc/sabayon-mce,
+	app-misc/sabayon-steambox,
 	app-misc/sabayon-version,
 	app-office/libreoffice,
 	app-office/libreoffice-l10n-de,
@@ -85,6 +86,7 @@ packages_to_add:
 	app-office/libreoffice-l10n-pt,
 	app-text/pastebunz,
 	games-misc/cowsay,
+	games-util/steam-meta,
 	gnome-base/gnome-shell,
 	gnome-extra/gnome-calculator,
 	gnome-extra/gconf-editor,
diff --git a/molecules/kde.common b/molecules/kde.common
index 1648c03..a39b951 100644
--- a/molecules/kde.common
+++ b/molecules/kde.common
@@ -70,6 +70,7 @@ packages_to_add:
 	app-emulation/wine,
 	app-misc/sabayon-mce,
 	app-misc/sabayon-skel,
+	app-misc/sabayon-steambox,
 	app-misc/sabayon-version,
 	app-office/libreoffice,
 	app-office/libreoffice-l10n-de,
@@ -80,6 +81,7 @@ packages_to_add:
 	app-office/libreoffice-l10n-pt,
 	app-text/pastebunz,
 	games-misc/cowsay,
+	games-util/steam-meta,
 	kde-base/akregator,
 	kde-base/ark,
 	kde-base/bomber,
diff --git a/molecules/sabayon-amd64-steambox.spec b/molecules/sabayon-amd64-steambox.spec
deleted file mode 100644
index edae09f..0000000
--- a/molecules/sabayon-amd64-steambox.spec
+++ /dev/null
@@ -1,15 +0,0 @@
-# Use abs path, otherwise daily builds automagic won't work
-%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/steambox.common
-%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/amd64.common
-
-# Release Version
-%env release_version: ${SABAYON_RELEASE:-11}
-
-# Release Version string description
-release_desc: amd64 SteamBox
-
-# Path to source ISO file (MANDATORY)
-%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_${ISO_TAG:-DAILY}_amd64_SpinBase.iso
-
-# Destination ISO image name, call whatever you want.iso, not mandatory
-%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_amd64_SteamBox.iso
diff --git a/molecules/steambox.common b/molecules/steambox.common
deleted file mode 100644
index d41b11a..0000000
--- a/molecules/steambox.common
+++ /dev/null
@@ -1,129 +0,0 @@
-# Define an alternative execution strategy, in this case, the value must be
-# "iso_remaster"
-execution_strategy: iso_remaster
-
-# Release string
-release_string: Sabayon Linux
-
-# File to write release string
-release_file: /etc/sabayon-edition
-
-# ISO Image title
-iso_title: Sabayon SteamBox
-
-# Enable XZ compression in mksquashfs
-extra_mksquashfs_parameters: -comp xz -Xbcj x86
-
-# Outer chroot script command, to be executed outside destination chroot before
-# before entering it (and before inner_chroot_script)
-%env outer_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_pre.sh
-
-# Execute repositories update here, in a more fault-tolerant flavor
-%env inner_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_generic_inner_chroot_script.sh
-
-# Inner chroot script command, to be executed inside destination chroot after
-# packages installation and removal
-%env inner_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_generic_inner_chroot_script_after.sh steambox
-
-# Outer chroot script command, to be executed outside destination chroot before
-# before entering it (and AFTER inner_chroot_script)
-%env outer_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_post.sh
-
-# Used to umount /proc and unbind packages dir
-%env error_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_error_script.sh
-
-# Pre-ISO building script. Hook to be able to copy kernel images in place, for example
-%env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh SteamBox
-
-# Destination directory for the ISO image path (MANDATORY)
-%env destination_iso_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso
-
-# List of packages that would be removed from chrooted system (comma separated)
-# packages_to_remove:
-
-# Import the Graphic Environment module.
-%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/graphic-environment.common
-
-# List of packages that would be added from chrooted system (comma separated)
-packages_to_add:
-	@gnome,
-	@gst-plugins,
-	@gst-plugins-extra,
-	@wireless,
-	app-admin/gnome-system-tools,
-	app-admin/rigo,
-	app-admin/system-tools-backends,
-	app-crypt/gnupg,
-	app-crypt/pinentry-gtk2,
-	app-misc/sabayon-steambox,
-	app-misc/sabayon-version,
-	app-text/pastebunz,
-	games-util/steam-meta,
-	gnome-base/gnome-shell,
-	gnome-extra/gnome-calculator,
-	gnome-extra/gnome-power-manager,
-	gnome-extra/gnome-system-monitor,
-	gnome-extra/gnome-tweak-tool,
-	gnome-extra/gnome-utils,
-	gnome-extra/nautilus-file-roller,
-	gnome-extra/nautilus-open-terminal,
-	gnome-extra/nautilus-sendto,
-	gnome-extra/nm-applet,
-	gnome-extra/polkit-gnome,
-	media-libs/libdvdcss,
-	media-libs/libdvdnav,
-	media-libs/libdvdplay,
-	media-libs/libdvdread,
-	media-plugins/alsa-plugins,
-	net-dialup/gnome-ppp,
-	net-dialup/ppp,
-	net-dialup/rp-pppoe,
-	net-firewall/ufw-frontends,
-	net-fs/samba,
-	net-misc/networkmanager,
-	net-misc/networkmanager-openvpn,
-	net-misc/networkmanager-pptp,
-	net-misc/networkmanager-vpnc,
-	net-misc/ntp,
-	net-wireless/bluez,
-	net-wireless/bluez-firmware,
-	net-wireless/bluez-hcidump,
-	net-wireless/gnome-bluetooth,
-	sys-apps/hdparm,
-	sys-apps/sdparm,
-	sys-block/gparted,
-	sys-block/parted,
-	sys-fs/dmraid,
-	sys-fs/ntfs3g,
-	sys-power/acpid,
-	sys-power/cpufrequtils,
-	www-client/chromium,
-	www-plugins/adobe-flash,
-	x11-apps/xdm,
-	x11-libs/libva-vdpau-driver,
-	x11-libs/xvba-video,
-	x11-misc/magneto-gtk3,
-	x11-terms/gnome-terminal,
-	x11-themes/gnome-icon-theme,
-	x11-themes/gnome-themes,
-	x11-themes/sabayon-artwork-extra,
-	x11-themes/sabayon-artwork-gnome,
-	x11-themes/sound-theme-freedesktop,
-	x11-themes/xcursor-themes,
-	x11-wm/twm
-
-# Custom shell call to packages add (default is: equo install)
-# custom_packages_add_cmd:
-
-# Custom command for updating repositories (default is: equo update)
-# repositories_update_cmd:
-
-# Determine whether repositories update should be run (if packages_to_add is set)
-# (default is: no), values are: yes, no.
-execute_repositories_update: no
-
-# Directories to remove completely (comma separated)
-# paths_to_remove:
-
-# Directories to empty (comma separated)
-# paths_to_empty:
diff --git a/remaster/standard_grub.cfg b/remaster/standard_grub.cfg
index 2938822..3bb3d05 100644
--- a/remaster/standard_grub.cfg
+++ b/remaster/standard_grub.cfg
@@ -72,6 +72,15 @@ menuentry "Start Sabayon __VERSION__ Media Center" {
    initrd /boot/sabayon.igz
 }
 
+menuentry "Start Sabayon __VERSION__ SteamBox" {
+   set gfxpayload=keep
+   echo "Language: ${bootlang}"
+   echo "Keyboard: ${bootkeymap}"
+   echo "Please wait..."
+   linux /boot/sabayon aufs cdroot ${init_opt} splash quiet steambox vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
+   initrd /boot/sabayon.igz
+}
+
 menuentry "Installation" {
    set gfxpayload=keep
    echo "Language: ${bootlang}"
@@ -86,7 +95,16 @@ menuentry "Installation (Media Center)" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /boot/sabayon aufs cdroot ${init_opt} splash quiet vconsole.keymap=${bootkeymap} installer-gui mceinstall locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
+   linux /boot/sabayon aufs cdroot ${init_opt} splash quiet vconsole.keymap=${bootkeymap} installer-gui mceinstall locale=${bootlang} ${modeset_opt} ${acpi_opt} --
+   initrd /boot/sabayon.igz
+}
+
+menuentry "Installation (SteamBox)" {
+   set gfxpayload=keep
+   echo "Language: ${bootlang}"
+   echo "Keyboard: ${bootkeymap}"
+   echo "Please wait..."
+   linux /boot/sabayon aufs cdroot ${init_opt} splash quiet steaminstall vconsole.keymap=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} --
    initrd /boot/sabayon.igz
 }
 
@@ -97,7 +115,7 @@ submenu "Advanced Options" {
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /boot/sabayon aufs cdroot ${init_opt} quiet vconsole.keymap=${bootkeymap} gentoo=nox locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
+      linux /boot/sabayon aufs cdroot ${init_opt} quiet vconsole.keymap=${bootkeymap} gentoo=nox locale=${bootlang} ${modeset_opt} ${acpi_opt} --
       initrd /boot/sabayon.igz
    }
 
@@ -106,7 +124,7 @@ submenu "Advanced Options" {
       echo "Language: ${bootlang}"
       echo "Keyboard: ${bootkeymap}"
       echo "Please wait..."
-      linux /boot/sabayon aufs cdroot ${init_opt} splash quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
+      linux /boot/sabayon aufs cdroot ${init_opt} splash quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} --
       initrd /boot/sabayon.igz
    }
 
diff --git a/remaster/standard_isolinux.cfg b/remaster/standard_isolinux.cfg
index a3a285f..c285718 100644
--- a/remaster/standard_isolinux.cfg
+++ b/remaster/standard_isolinux.cfg
@@ -3,12 +3,17 @@ default sabayon
 label sabayon
   menu label ^Start Sabayon __VERSION__ __FLAVOUR__
   kernel /boot/sabayon
-  append initrd=/boot/sabayon.igz aufs cdroot splash vga=791 quiet -- 
+  append initrd=/boot/sabayon.igz aufs cdroot splash vga=791 quiet --
 
 label sabayonmce
   menu label ^Start Sabayon Media Center
   kernel /boot/sabayon
-  append initrd=/boot/sabayon.igz aufs cdroot splash vga=791 quiet sabayonmce -- 
+  append initrd=/boot/sabayon.igz aufs cdroot splash vga=791 quiet sabayonmce --
+
+label steambox
+  menu label ^Start Sabayon SteamBox
+  kernel /boot/sabayon
+  append initrd=/boot/sabayon.igz aufs cdroot splash vga=791 quiet steambox --
 
 label install
   menu label ^Installation
@@ -18,26 +23,30 @@ label mceinstall
   menu label ^Installation (Media Center)
   kernel /boot/sabayon
   append initrd=/boot/sabayon.igz aufs cdroot splash vga=791 quiet installer-gui mceinstall --
+label steaminstall
+  menu label ^Installation (SteamBox)
+  kernel /boot/sabayon
+  append initrd=/boot/sabayon.igz aufs cdroot splash vga=791 quiet installer-gui steaminstall --
 
 label genuine
   menu label Safe ^Mode
   kernel /boot/sabayon
-  append initrd=/boot/sabayon.igz aufs cdroot noproprietary pci=routeirq irqpoll quiet nokvm -- 
+  append initrd=/boot/sabayon.igz aufs cdroot noproprietary pci=routeirq irqpoll quiet nokvm --
 
 label console
   menu label ^Console mode
   kernel /boot/sabayon
-  append initrd=/boot/sabayon.igz aufs cdroot splash vga=791 gentoo=nox quiet -- 
+  append initrd=/boot/sabayon.igz aufs cdroot splash vga=791 gentoo=nox quiet --
 
 label console-safe
   menu label ^Console mode (no splash)
   kernel /boot/sabayon
-  append initrd=/boot/sabayon.igz aufs cdroot gentoo=nox quiet -- 
+  append initrd=/boot/sabayon.igz aufs cdroot gentoo=nox quiet --
 
 label checkdisk
   menu label ^Check disc for defects
   kernel /boot/sabayon
-  append initrd=/boot/sabayon.igz aufs cdroot splash quiet checkdisc -- 
+  append initrd=/boot/sabayon.igz aufs cdroot splash quiet checkdisc --
 
 label debug
   menu label Deb^ug mode
diff --git a/remaster/steambox_grub.cfg b/remaster/steambox_grub.cfg
deleted file mode 100644
index 224b21f..0000000
--- a/remaster/steambox_grub.cfg
+++ /dev/null
@@ -1,133 +0,0 @@
-set timeout=5
-set default=0
-set fallback=2
-set pager=1
-
-function load_video {
-  if [ x$feature_all_video_module = xy ]; then
-    insmod all_video
-  else
-    insmod efi_gop
-    insmod efi_uga
-    insmod ieee1275_fb
-    insmod vbe
-    insmod vga
-    insmod video_bochs
-    insmod video_cirrus
-  fi
-}
-
-if loadfont /boot/grub/unicode.pf2 ; then
-   set gfxmode=auto
-   load_video
-   insmod gfxterm
-   terminal_output gfxterm
-   insmod gettext
-fi
-
-if [ -f /boot/grub/default-splash.png ]; then
-   insmod png
-   background_image -m stretch /boot/grub/default-splash.png
-fi
-
-if [ x$bootlang = x ]; then
-   bootlang=en_US
-   export bootlang
-fi
-if [ x$bootkeymap = x ]; then
-   bootkeymap=us
-   export bootkeymap
-fi
-
-if [ x$acpi_opt = x ]; then
-   acpi_opt=''
-   export acpi_opt
-fi
-if [ x$modeset_opt = x ]; then
-   modeset_opt=''
-   export modeset_opt
-fi
-if [ x$noefi_opt = x ]; then
-   noefi_opt=''
-   export noefi_opt
-fi
-
-insmod part_gpt
-
-menuentry "Start Sabayon __VERSION__ __FLAVOUR__" {
-   set gfxpayload=keep
-   echo "Language: ${bootlang}"
-   echo "Keyboard: ${bootkeymap}"
-   echo "Please wait..."
-   linux /boot/sabayon aufs cdroot ${init_opt} splash quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} steambox-- 
-   initrd /boot/sabayon.igz
-}
-
-menuentry "Installation" {
-   set gfxpayload=keep
-   echo "Language: ${bootlang}"
-   echo "Keyboard: ${bootkeymap}"
-   echo "Please wait..."
-   linux /boot/sabayon aufs cdroot ${init_opt} splash quiet vconsole.keymap=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} steaminstall -- 
-   initrd /boot/sabayon.igz
-}
-
-
-submenu "Advanced Options" {
-
-   menuentry "Console mode" {
-      set gfxpayload=keep
-      echo "Language: ${bootlang}"
-      echo "Keyboard: ${bootkeymap}"
-      echo "Please wait..."
-      linux /boot/sabayon aufs cdroot ${init_opt} quiet vconsole.keymap=${bootkeymap} gentoo=nox locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-      initrd /boot/sabayon.igz
-   }
-
-   menuentry "Check disc for defects" {
-      set gfxpayload=keep
-      echo "Language: ${bootlang}"
-      echo "Keyboard: ${bootkeymap}"
-      echo "Please wait..."
-      linux /boot/sabayon aufs cdroot ${init_opt} splash quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-      initrd /boot/sabayon.igz
-   }
-
-   menuentry "Disable systemd" {
-      echo "Disabling Systemd..."
-      set init_opt="real_init=/sbin/init.d/sysvinit/init"
-      export init_opt
-      configfile /boot/grub/grub.cfg
-   }
-
-   menuentry "Disable Kernel Mode Settings (for AMD Radeon GPUs with fglrx)" {
-      echo "Disabling Kernel Mode Setting..."
-      set modeset_opt="nomodeset"
-      export modeset_opt
-      configfile /boot/grub/grub.cfg
-   }
-
-   menuentry "Disable ACPI" {
-      echo "Disabling ACPI..."
-      set acpi_opt="noacpi acpi=off"
-      export acpi_opt
-      configfile /boot/grub/grub.cfg
-   }
-
-   menuentry "Disable EFI" {
-      echo "Disabling EFI..."
-      set noefi_opt="noefi"
-      export noefi_opt
-      configfile /boot/grub/grub.cfg
-   }
-
-   menuentry "Debug mode" {
-      set gfxpayload=keep
-      echo "Language: ${bootlang}"
-      echo "Keyboard: ${bootkeymap}"
-      echo "Please wait..."
-      linux /boot/sabayon aufs cdroot ${init_opt} debug vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} steambox --
-      initrd /boot/sabayon.igz
-   }
-
-}
diff --git a/remaster/steambox_isolinux.cfg b/remaster/steambox_isolinux.cfg
deleted file mode 100644
index e87dc72..0000000
--- a/remaster/steambox_isolinux.cfg
+++ /dev/null
@@ -1,41 +0,0 @@
-default sabayon
-
-label sabayon
-  menu label ^Start Sabayon __VERSION__ __FLAVOUR__
-  kernel /boot/sabayon
-  append initrd=/boot/sabayon.igz aufs cdroot splash vga=791 quiet steambox --
-
-label install
-  menu label ^Installation
-  kernel /boot/sabayon
-  append initrd=/boot/sabayon.igz aufs cdroot splash vga=791 quiet installer-gui steaminstall -
-
-label console
-  menu label ^Console mode
-  kernel /boot/sabayon
-  append initrd=/boot/sabayon.igz aufs cdroot splash vga=791 gentoo=nox quiet --
-
-label console-safe
-  menu label ^Console mode (no splash)
-  kernel /boot/sabayon
-  append initrd=/boot/sabayon.igz aufs cdroot gentoo=nox quiet --
-
-label checkdisk
-  menu label ^Check disc for defects
-  kernel /boot/sabayon
-  append initrd=/boot/sabayon.igz aufs cdroot splash vga=791 quiet checkdisc --
-
-label debug
-  menu label Deb^ug mode
-  kernel /boot/sabayon
-  append initrd=/boot/sabayon.igz aufs cdroot debug steambox --
-
-label memtest
-  menu label Memory ^test
-  kernel /boot/memtest
-  append -
-
-label hd
-  menu label ^Boot from first hard disk
-  localboot 0x80
-  append -
diff --git a/scripts/generic_pre_iso_script.sh b/scripts/generic_pre_iso_script.sh
index d2ea0ba..776d483 100755
--- a/scripts/generic_pre_iso_script.sh
+++ b/scripts/generic_pre_iso_script.sh
@@ -23,9 +23,6 @@ fi
 if [ "${remaster_type}" = "KDE" ] || [ "${remaster_type}" = "GNOME" ]; then
 	isolinux_source="${SABAYON_MOLECULE_HOME}/remaster/standard_isolinux.cfg"
 	grub_source="${SABAYON_MOLECULE_HOME}/remaster/standard_grub.cfg"
-elif [ "${remaster_type}" = "SteamBox" ]; then
-	isolinux_source="${SABAYON_MOLECULE_HOME}/remaster/steambox_isolinux.cfg"
-	grub_source="${SABAYON_MOLECULE_HOME}/remaster/steambox_grub.cfg"
 fi
 cp "${isolinux_source}" "${isolinux_destination}" || exit 1
 cp "${grub_source}" "${grub_destination}" || exit 1
diff --git a/scripts/remaster_generic_inner_chroot_script_after.sh b/scripts/remaster_generic_inner_chroot_script_after.sh
index 1207614..8d45d00 100755
--- a/scripts/remaster_generic_inner_chroot_script_after.sh
+++ b/scripts/remaster_generic_inner_chroot_script_after.sh
@@ -89,6 +89,11 @@ setup_sabayon_mce() {
 	sd_enable sabayon-mce
 }
 
+setup_sabayon_steambox() {
+	rc-update add steambox boot
+	sd_enable steambox
+}
+
 switch_kernel() {
 	local from_kernel="${1}"
 	local to_kernel="${2}"
@@ -385,17 +390,7 @@ prepare_gnome() {
 	# no systemd counterpart
 
 	setup_sabayon_mce
-}
-
-prepare_steambox() {
-	setup_default_xsession "steambox"
-
-	rc-update del system-tools-backends boot
-	rc-update add system-tools-backends default
-	# no systemd counterpart
-
-	rc-update add steambox boot
-	sd_enable steambox
+	setup_sabayon_steambox
 }
 
 prepare_xfceforensic() {
@@ -410,6 +405,7 @@ prepare_kde() {
 	mv /etc/skel/.config/gtk-3.0/settings.ini._kde_molecule \
 		/etc/skel/.config/gtk-3.0/settings.ini
 	setup_sabayon_mce
+	setup_sabayon_steambox
 }
 
 prepare_awesome() {
@@ -431,8 +427,6 @@ prepare_system() {
 		prepare_fluxbox
 	elif [ "${de}" = "gnome" ]; then
 		prepare_gnome
-	elif [ "${de}" = "steambox" ]; then
-		prepare_steambox
 	elif [ "${de}" = "xfceforensic" ]; then
 		prepare_xfceforensic
 	elif [ "${de}" = "kde" ]; then