diff --git a/molecules/mate.common b/molecules/mate.common
index 8a42b90..b1278ba 100644
--- a/molecules/mate.common
+++ b/molecules/mate.common
@@ -48,7 +48,6 @@ packages_to_remove:
 # List of packages that would be added from chrooted system (comma separated)
 packages_to_add:
 	@X,
-	@mate,
 	@fluxbox,
 	app-admin/rigo,
 	app-misc/sabayon-skel,
@@ -58,6 +57,7 @@ packages_to_add:
 	app-misc/anaconda-runtime-gui,
 	app-text/pastebunz,
 	gnome-extra/nm-applet-gtk2,
+	mate-base/mate,
 	media-fonts/ttf-bitstream-vera,
 	media-fonts/dejavu,
 	media-fonts/corefonts,
@@ -78,7 +78,6 @@ packages_to_add:
 	www-client/midori,
 	x11-misc/lightdm-gtk-greeter,
 	x11-misc/magneto-gtk,
-	x11-drivers/ati-drivers,
 	x11-drivers/nvidia-drivers,
 	x11-drivers/xf86-video-virtualbox,
 	x11-themes/equinox-themes,