diff --git a/molecules/enlightenment.common b/molecules/enlightenment.common
index 1553f01..4ebc38b 100644
--- a/molecules/enlightenment.common
+++ b/molecules/enlightenment.common
@@ -50,6 +50,7 @@ packages_to_add:
 	app-crypt/pinentry-gtk2,
 	app-editors/leafpad,
 	app-text/pastebunz,
+	app-misc/calamares-sabayon,
 	dev-libs/fribidi,
 	games-misc/cowsay,
 	gnome-extra/nm-applet-gtk2,
diff --git a/molecules/forensicxfce.common b/molecules/forensicxfce.common
index 6c9e443..8fd1f3b 100644
--- a/molecules/forensicxfce.common
+++ b/molecules/forensicxfce.common
@@ -85,6 +85,7 @@ packages_to_add:
 	app-crypt/gifshuffle,
 	app-crypt/pdfcrack,
 	app-crypt/WiRouterKeyRec,
+	app-misc/calamares-sabayon,
 	app-misc/screen,
 	app-office/libreoffice,
 	dev-util/geany,
diff --git a/molecules/gnome.common b/molecules/gnome.common
index 2eb8038..46d1d92 100644
--- a/molecules/gnome.common
+++ b/molecules/gnome.common
@@ -72,6 +72,7 @@ packages_to_add:
 	app-dicts/myspell-nl,
 	app-editors/atom,
 	app-editors/gedit,
+        app-misc/calamares-sabayon,
 	app-misc/gnote,
 	app-misc/sabayon-greeter,
 	app-misc/sabayon-version,
diff --git a/molecules/kde.common b/molecules/kde.common
index 10b8e09..6cefe62 100644
--- a/molecules/kde.common
+++ b/molecules/kde.common
@@ -66,6 +66,7 @@ packages_to_add:
 	app-dicts/myspell-nl,
 	app-editors/atom,
 	app-misc/sabayon-greeter,
+	app-misc/calamares-sabayon,
 	app-misc/sabayon-skel,
 	app-misc/sabayon-version,
 	app-office/libreoffice,
diff --git a/molecules/mate.common b/molecules/mate.common
index a61dc63..811ca09 100644
--- a/molecules/mate.common
+++ b/molecules/mate.common
@@ -51,6 +51,8 @@ packages_to_add:
 	app-crypt/gnupg,
 	app-misc/sabayon-greeter,
 	app-editors/atom,
+	app-crypt/pinentry-gtk2,
+        app-misc/calamares-sabayon,
 	app-text/pastebunz,
 	app-office/libreoffice,
 	games-action/minetest,
diff --git a/molecules/minimal.common b/molecules/minimal.common
index ab3874d..03e8947 100644
--- a/molecules/minimal.common
+++ b/molecules/minimal.common
@@ -44,6 +44,7 @@ extra_mksquashfs_parameters: -comp xz
 packages_to_add:
 	@wireless,
 	@fluxbox,
+        app-misc/calamares-sabayon,
 	app-text/pastebunz,
 	lxde-base/lxdm,
 	media-gfx/feh,
diff --git a/molecules/server.common b/molecules/server.common
index bb15572..ad73cbb 100644
--- a/molecules/server.common
+++ b/molecules/server.common
@@ -42,7 +42,7 @@ packages_to_add:
 	@wireless,
 	app-misc/calamares-sabayon-server,
 	app-text/pastebunz,
-	x11-base/xorg-server,
+	 x11-base/xorg-server,
 	net-dialup/ppp,
 	net-dialup/rp-pppoe,
 	net-misc/openssh,
diff --git a/molecules/xfce.common b/molecules/xfce.common
index c2a6994..f64c4ea 100644
--- a/molecules/xfce.common
+++ b/molecules/xfce.common
@@ -66,6 +66,7 @@ packages_to_add:
 	app-dicts/myspell-fr,
 	app-dicts/myspell-it,
 	app-dicts/myspell-nl,
+        app-misc/calamares-sabayon,
 	app-misc/gnote,
 	app-misc/sabayon-greeter,
 	app-office/libreoffice,