diff --git a/molecules/graphic-environment.common b/molecules/graphic-environment.common
index 8fe6f50..0dd83c5 100644
--- a/molecules/graphic-environment.common
+++ b/molecules/graphic-environment.common
@@ -13,6 +13,7 @@ packages_to_add:
 	sys-apps/lsb-release,
 	sys-apps/usb_modeswitch,
 	sys-apps/which,
+	sys-process/htop,
 	x11-apps/xhost,
 	x11-apps/setxkbmap,
 	x11-themes/equinox-themes,
diff --git a/molecules/minimal.common b/molecules/minimal.common
index 88f1113..e746bbb 100644
--- a/molecules/minimal.common
+++ b/molecules/minimal.common
@@ -56,6 +56,7 @@ packages_to_add:
 	sys-block/parted,
 	sys-boot/os-prober,
 	sys-power/cpupower,
+	sys-process/htop,
 	www-client/midori,
 	x11-themes/adwaita-icon-theme,
 	x11-themes/sabayon-artwork-core,
diff --git a/molecules/server.common b/molecules/server.common
index 51ff6f6..3793655 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,
@@ -50,6 +50,7 @@ packages_to_add:
 	sys-boot/os-prober,
 	sys-fs/btrfs-progs,
 	sys-power/cpupower,
+	sys-process/htop,
 	x11-themes/sabayon-artwork-core,
 	x11-drivers/xf86-video-vmware,
 	x11-themes/sabayon-artwork-grub