diff --git a/molecules/3rdparty/mcs.common b/molecules/3rdparty/mcs.common
index f67e138..dcbe47a 100644
--- a/molecules/3rdparty/mcs.common
+++ b/molecules/3rdparty/mcs.common
@@ -62,7 +62,7 @@ packages_to_remove:
 	net-irc/xchat,
 	net-im/pidgin,
 	mail-client/evolution,
-	app-admin/sulfur,
+	app-admin/rigo,
 	sys-apps/magneto-core,
 	media-tv/xbmc,
 	media-sound/audacious,
diff --git a/molecules/e17.common b/molecules/e17.common
index 9f5bc15..b5b3ab3 100644
--- a/molecules/e17.common
+++ b/molecules/e17.common
@@ -50,7 +50,7 @@ packages_to_add:
 	@e17,
         @fluxbox,
 	@wireless,
-	app-admin/sulfur,
+	app-admin/rigo,
 	app-crypt/gnupg,
         app-crypt/pinentry-gtk2,
 	app-emulation/virtualbox-guest-additions,
diff --git a/molecules/gnome.common b/molecules/gnome.common
index 7e20f14..2eeda8c 100644
--- a/molecules/gnome.common
+++ b/molecules/gnome.common
@@ -54,7 +54,7 @@ packages_to_add:
 	app-admin/gnome-system-tools,
 	app-admin/packagekit-base,
 	app-admin/packagekit-gtk,
-	app-admin/sulfur,
+	app-admin/rigo,
 	app-admin/system-tools-backends,
 	app-backup/deja-dup,
 	app-crypt/gnupg,
diff --git a/molecules/kde.common b/molecules/kde.common
index eff0dd0..76247f3 100644
--- a/molecules/kde.common
+++ b/molecules/kde.common
@@ -52,7 +52,7 @@ packages_to_add:
 	@wireless,
 	app-admin/packagekit-base,
 	app-admin/packagekit-qt4,
-	app-admin/sulfur,
+	app-admin/rigo,
 	app-cdr/k3b,
 	app-crypt/gnupg,
 	app-crypt/pinentry-qt4,
diff --git a/molecules/lxde.common b/molecules/lxde.common
index 50ea00d..1e40e04 100644
--- a/molecules/lxde.common
+++ b/molecules/lxde.common
@@ -50,7 +50,7 @@ packages_to_add:
 	@X,
 	@lxde,
 	@fluxbox,
-	app-admin/sulfur,
+	app-admin/rigo,
 	app-arch/xarchiver,
 	app-crypt/gnupg,
         app-crypt/pinentry-gtk2,
diff --git a/molecules/xfce.common b/molecules/xfce.common
index e0e0677..d88f350 100644
--- a/molecules/xfce.common
+++ b/molecules/xfce.common
@@ -52,7 +52,7 @@ packages_to_add:
 	@fluxbox,
 	@gst-plugins,
 	@xfce,
-	app-admin/sulfur,
+	app-admin/rigo,
 	app-arch/file-roller,
 	app-arch/unrar,
 	app-crypt/gnupg,