diff --git a/molecules/e17.common b/molecules/e17.common
index a019690..98b8b47 100644
--- a/molecules/e17.common
+++ b/molecules/e17.common
@@ -54,7 +54,7 @@ packages_to_add:
 	app-text/pastebunz,
 	dev-libs/fribidi,
 	gnome-extra/nm-applet,
-	lxde-base/lxdm,
+	gnome-base/gdm,
         media-fonts/ttf-bitstream-vera,
         media-fonts/dejavu,
         media-fonts/corefonts,
@@ -76,7 +76,8 @@ packages_to_add:
 	x11-themes/tango-icon-theme,
 	x11-themes/gnome-icon-theme,
 	x11-terms/terminal,
-	x11-themes/gtk2-E17-bling
+	x11-themes/gtk2-E17-bling,
+	x11-themes/sabayon-artwork-gnome
 
 # Determine whether repositories update should be run (if packages_to_add is set)
 # (default is: no), values are: yes, no.
diff --git a/scripts/remaster_generic_inner_chroot_script_after.sh b/scripts/remaster_generic_inner_chroot_script_after.sh
index 9d9603a..de4baec 100755
--- a/scripts/remaster_generic_inner_chroot_script_after.sh
+++ b/scripts/remaster_generic_inner_chroot_script_after.sh
@@ -119,9 +119,10 @@ elif [ "$1" = "e17" ]; then
         echo "Session=enlightenment" >> /etc/skel/.dmrc
         remove_desktop_files
 	setup_displaymanager
+	# Not using lxdm for now
 	# TODO: improve the lines below
 	# Make sure enlightenment is selected in lxdm
-	sed -i '/lxdm-greeter-gtk/ a\\nlast_session=enlightenment.desktop\nlast_lang=' /etc/lxdm/lxdm.conf
+	# sed -i '/lxdm-greeter-gtk/ a\\nlast_session=enlightenment.desktop\nlast_lang=' /etc/lxdm/lxdm.conf
 	# Fix ~/.gtkrc-2.0 for some nice icons in gtk
 	echo 'gtk-icon-theme-name="Tango" gtk-theme-name="Xfce"' | tr " " "\n" > /etc/skel/.gtkrc-2.0
 	setup_cpufrequtils