diff --git a/comps-f22.xml.in b/comps-f22.xml.in
index e6d69432..ac71a5a8 100644
--- a/comps-f22.xml.in
+++ b/comps-f22.xml.in
@@ -4308,14 +4308,15 @@
       <packagereq>compiz-bcop</packagereq>
       <packagereq>compizconfig-python</packagereq>
       <packagereq>compiz-manager</packagereq>
+      <packagereq>compiz-plugins-experimental</packagereq>
       <packagereq>compiz-plugins-extra</packagereq>
       <packagereq>compiz-plugins-main</packagereq>
-      <packagereq>compiz-plugins-unsupported</packagereq>
       <packagereq>emerald</packagereq>
       <packagereq>emerald-themes</packagereq>
       <packagereq>emerald-themes-extra</packagereq>
       <packagereq>fusion-icon</packagereq>
       <packagereq>libcompizconfig</packagereq>
+      <packagereq>simple-ccsm</packagereq>
     </packagelist>
   </group>
   <group>
diff --git a/comps-f23.xml.in b/comps-f23.xml.in
index 32fc6f1a..bfb35fbb 100644
--- a/comps-f23.xml.in
+++ b/comps-f23.xml.in
@@ -4236,7 +4236,6 @@
       <packagereq>mate-icon-theme-faenza</packagereq>
       <packagereq>mate-netspeed</packagereq>
       <packagereq>mate-sensors-applet</packagereq>
-      <packagereq>mate-user-guide</packagereq>
       <packagereq>mate-utils</packagereq>
       <packagereq>mintmenu</packagereq>
       <packagereq>pidgin</packagereq>
@@ -4257,14 +4256,15 @@
       <packagereq>compiz-bcop</packagereq>
       <packagereq>compizconfig-python</packagereq>
       <packagereq>compiz-manager</packagereq>
+      <packagereq>compiz-plugins-experimental</packagereq>
       <packagereq>compiz-plugins-extra</packagereq>
       <packagereq>compiz-plugins-main</packagereq>
-      <packagereq>compiz-plugins-unsupported</packagereq>
       <packagereq>emerald</packagereq>
       <packagereq>emerald-themes</packagereq>
       <packagereq>emerald-themes-extra</packagereq>
       <packagereq>fusion-icon</packagereq>
       <packagereq>libcompizconfig</packagereq>
+      <packagereq>simple-ccsm</packagereq>
     </packagelist>
   </group>
   <group>
@@ -4340,6 +4340,7 @@
       <packagereq>mate-system-monitor</packagereq>
       <packagereq>mate-terminal</packagereq>
       <packagereq>mate-themes</packagereq>
+      <packagereq>mate-user-guide</packagereq>
       <packagereq>mozo</packagereq>
       <packagereq>network-manager-applet</packagereq>
       <packagereq>NetworkManager-adsl</packagereq>
diff --git a/comps-f24.xml.in b/comps-f24.xml.in
index f60cfbd3..b1596a43 100644
--- a/comps-f24.xml.in
+++ b/comps-f24.xml.in
@@ -4291,7 +4291,6 @@
       <packagereq>mate-applet-softupd</packagereq>
       <packagereq>mate-icon-theme-faenza</packagereq>
       <packagereq>mate-sensors-applet</packagereq>
-      <packagereq>mate-user-guide</packagereq>
       <packagereq>mate-utils</packagereq>
       <packagereq>mintmenu</packagereq>
       <packagereq>pidgin</packagereq>
@@ -4312,14 +4311,15 @@
       <packagereq>compiz-bcop</packagereq>
       <packagereq>compizconfig-python</packagereq>
       <packagereq>compiz-manager</packagereq>
+      <packagereq>compiz-plugins-experimental</packagereq>
       <packagereq>compiz-plugins-extra</packagereq>
       <packagereq>compiz-plugins-main</packagereq>
-      <packagereq>compiz-plugins-unsupported</packagereq>
       <packagereq>emerald</packagereq>
       <packagereq>emerald-themes</packagereq>
       <packagereq>emerald-themes-extra</packagereq>
       <packagereq>fusion-icon</packagereq>
       <packagereq>libcompizconfig</packagereq>
+      <packagereq>simple-ccsm</packagereq>
     </packagelist>
   </group>
   <group>
@@ -4344,9 +4344,7 @@
       <packagereq>engrampa</packagereq>
       <packagereq>eom</packagereq>
       <packagereq>exaile</packagereq>
-      <packagereq>f23-backgrounds-base</packagereq>
       <packagereq>f23-backgrounds-extras-base</packagereq>
-      <packagereq>f23-backgrounds-mate</packagereq>
       <packagereq>f24-backgrounds-base</packagereq>
       <packagereq>f24-backgrounds-mate</packagereq>
       <packagereq>filezilla</packagereq>
@@ -4397,6 +4395,7 @@
       <packagereq>mate-system-monitor</packagereq>
       <packagereq>mate-terminal</packagereq>
       <packagereq>mate-themes</packagereq>
+      <packagereq>mate-user-guide</packagereq>
       <packagereq>mozo</packagereq>
       <packagereq>network-manager-applet</packagereq>
       <packagereq>NetworkManager-adsl</packagereq>
diff --git a/comps-f25.xml.in b/comps-f25.xml.in
index 94915f6e..6ef8e207 100644
--- a/comps-f25.xml.in
+++ b/comps-f25.xml.in
@@ -4292,7 +4292,6 @@
       <packagereq>mate-applet-softupd</packagereq>
       <packagereq>mate-icon-theme-faenza</packagereq>
       <packagereq>mate-sensors-applet</packagereq>
-      <packagereq>mate-user-guide</packagereq>
       <packagereq>mate-utils</packagereq>
       <packagereq>mintmenu</packagereq>
       <packagereq>pidgin</packagereq>
@@ -4313,14 +4312,15 @@
       <packagereq>compiz-bcop</packagereq>
       <packagereq>compizconfig-python</packagereq>
       <packagereq>compiz-manager</packagereq>
+      <packagereq>compiz-plugins-experimental</packagereq>
       <packagereq>compiz-plugins-extra</packagereq>
       <packagereq>compiz-plugins-main</packagereq>
-      <packagereq>compiz-plugins-unsupported</packagereq>
       <packagereq>emerald</packagereq>
       <packagereq>emerald-themes</packagereq>
       <packagereq>emerald-themes-extra</packagereq>
       <packagereq>fusion-icon</packagereq>
       <packagereq>libcompizconfig</packagereq>
+      <packagereq>simple-ccsm</packagereq>
     </packagelist>
   </group>
   <group>
@@ -4345,9 +4345,7 @@
       <packagereq>engrampa</packagereq>
       <packagereq>eom</packagereq>
       <packagereq>exaile</packagereq>
-      <packagereq>f23-backgrounds-base</packagereq>
       <packagereq>f23-backgrounds-extras-base</packagereq>
-      <packagereq>f23-backgrounds-mate</packagereq>
       <packagereq>f24-backgrounds-base</packagereq>
       <packagereq>f24-backgrounds-mate</packagereq>
       <packagereq>filezilla</packagereq>
@@ -4398,6 +4396,7 @@
       <packagereq>mate-system-monitor</packagereq>
       <packagereq>mate-terminal</packagereq>
       <packagereq>mate-themes</packagereq>
+      <packagereq>mate-user-guide</packagereq>
       <packagereq>mozo</packagereq>
       <packagereq>network-manager-applet</packagereq>
       <packagereq>NetworkManager-adsl</packagereq>