diff --git a/molecules/e17.common b/molecules/e17.common
index e87eda8..f2ee4dd 100644
--- a/molecules/e17.common
+++ b/molecules/e17.common
@@ -48,11 +48,11 @@ destination_iso_directory: /sabayon/iso
 packages_to_add: 
 	@X,
 	@e17,
-        @fluxbox,
+	@fluxbox,
 	@wireless,
 	app-admin/rigo,
 	app-crypt/gnupg,
-        app-crypt/pinentry-gtk2,
+	app-crypt/pinentry-gtk2,
 	app-emulation/virtualbox-guest-additions,
 	app-editors/leafpad,
 	app-misc/anaconda-runtime-gui,
@@ -64,9 +64,9 @@ packages_to_add:
 	lxde-base/lxdm,
 	lxde-base/lxpolkit,
 	lxde-base/lxterminal,
-        media-fonts/corefonts,
-        media-fonts/dejavu,
-        media-fonts/ttf-bitstream-vera,
+	media-fonts/corefonts,
+	media-fonts/dejavu,
+	media-fonts/ttf-bitstream-vera,
 	media-gfx/ristretto,
 	media-plugins/alsa-plugins,
 	media-sound/xnoise,
@@ -75,19 +75,19 @@ packages_to_add:
 	net-irc/xchat,
 	net-p2p/transmission-gtk,
 	sys-apps/gnome-disk-utility,
-        sys-apps/gpu-detector,
-        sys-auth/consolekit,
+	sys-apps/gpu-detector,
+	sys-auth/consolekit,
 	sys-block/parted,
 	sys-fs/ntfs3g,
 	sys-power/cpufrequtils,
 	www-client/midori,
 	x11-drivers/ati-drivers,
 	x11-drivers/nvidia-drivers,
-        x11-drivers/xf86-video-virtualbox,
+	x11-drivers/xf86-video-virtualbox,
 	x11-libs/gksu,
 	x11-misc/bumblebee,
-        x11-misc/magneto-gtk,
-        x11-terms/xterm,
+	x11-misc/magneto-gtk,
+	x11-terms/xterm,
 	x11-themes/equinox-themes,
 	x11-themes/gtk-engines-xfce,
 	x11-themes/tango-icon-theme,
diff --git a/molecules/lxde.common b/molecules/lxde.common
index 3596155..536ce1f 100644
--- a/molecules/lxde.common
+++ b/molecules/lxde.common
@@ -53,7 +53,7 @@ packages_to_add:
 	app-admin/rigo,
 	app-arch/xarchiver,
 	app-crypt/gnupg,
-        app-crypt/pinentry-gtk2,
+	app-crypt/pinentry-gtk2,
 	app-editors/leafpad,
 	app-emulation/virtualbox-guest-additions,
 	app-misc/anaconda-runtime-gui,
@@ -64,9 +64,9 @@ packages_to_add:
 	games-misc/cowsay,
 	gnome-extra/nm-applet-gtk2,
 	lxde-base/lxpolkit,
-        media-fonts/ttf-bitstream-vera,
-        media-fonts/dejavu,
-        media-fonts/corefonts,
+	media-fonts/ttf-bitstream-vera,
+	media-fonts/dejavu,
+	media-fonts/corefonts,
 	media-plugins/alsa-plugins,
 	media-sound/audacious,
 	net-dialup/rp-pppoe,