diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index 319a7df3..039933e3 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -6107,12 +6107,15 @@
     </grouplist>
     <optionlist>
       <groupid>firefox</groupid>
+      <groupid>cinnamon-desktop</groupid>
       <groupid>gnome-desktop</groupid>
       <groupid>input-methods</groupid>
       <groupid>kde-desktop</groupid>
       <groupid>legacy-fonts</groupid>
       <groupid>libreoffice</groupid>
       <groupid>lxde-desktop</groupid>
+      <groupid>mate-desktop</groupid>
+      <groupid>sugar-desktop<groupid>
       <groupid>xfce-desktop</groupid>
       <groupid>xmonad</groupid>
       <groupid>xmonad-gnome</groupid>
diff --git a/comps-f19.xml.in b/comps-f19.xml.in
index bae65185..1499cc73 100644
--- a/comps-f19.xml.in
+++ b/comps-f19.xml.in
@@ -6153,7 +6153,6 @@
       <groupid>multimedia</groupid>
       <groupid>hardware-support</groupid>
       <groupid>printing</groupid>
-      <groupid>guest-desktop-agents</groupid>
       <groupid>mate-desktop</groupid>
     </grouplist>
     <optionlist>
@@ -6304,12 +6303,15 @@
     </grouplist>
     <optionlist>
       <groupid>firefox</groupid>
+      <groupid>cinnamon-desktop</groupid>
       <groupid>gnome-desktop</groupid>
       <groupid>input-methods</groupid>
       <groupid>kde-desktop</groupid>
       <groupid>legacy-fonts</groupid>
       <groupid>libreoffice</groupid>
       <groupid>lxde-desktop</groupid>
+      <groupid>mate-desktop</groupid>
+      <groupid>sugar-desktop</groupid>
       <groupid>xfce-desktop</groupid>
       <groupid>xmonad</groupid>
       <groupid>xmonad-gnome</groupid>
diff --git a/comps-f20.xml.in b/comps-f20.xml.in
index c3398c33..e76cb9fb 100644
--- a/comps-f20.xml.in
+++ b/comps-f20.xml.in
@@ -6307,12 +6307,15 @@
     </grouplist>
     <optionlist>
       <groupid>firefox</groupid>
+      <groupid>cinnamon-desktop</groupid>
       <groupid>gnome-desktop</groupid>
       <groupid>input-methods</groupid>
       <groupid>kde-desktop</groupid>
       <groupid>legacy-fonts</groupid>
       <groupid>libreoffice</groupid>
       <groupid>lxde-desktop</groupid>
+      <groupid>mate-desktop</groupid>
+      <groupid>sugar-desktop<groupid>
       <groupid>xfce-desktop</groupid>
       <groupid>xmonad</groupid>
       <groupid>xmonad-gnome</groupid>