diff --git a/comps-f21.xml.in b/comps-f21.xml.in
index 6e3a7244..5d5f8252 100644
--- a/comps-f21.xml.in
+++ b/comps-f21.xml.in
@@ -4440,7 +4440,6 @@
       <packagereq>fedora-icon-theme</packagereq>
       <packagereq>firefox</packagereq>
       <packagereq>firewall-config</packagereq>
-      <packagereq>galculator</packagereq>
       <packagereq>gtk2-engines</packagereq>
       <packagereq>gvfs-afc</packagereq>
       <packagereq>gvfs-archive</packagereq>
@@ -4448,7 +4447,6 @@
       <packagereq>gvfs-gphoto2</packagereq>
       <packagereq>gvfs-mtp</packagereq>
       <packagereq>gvfs</packagereq>
-      <packagereq>gvfs-smb</packagereq>
       <packagereq>hexchat</packagereq>
       <packagereq>initial-setup-gui</packagereq>
       <packagereq>libmatekbd</packagereq>
@@ -4459,9 +4457,9 @@
       <packagereq>marco</packagereq>
       <packagereq>mate-applets</packagereq>
       <packagereq>mate-backgrounds</packagereq>
+      <packagereq>mate-calc</packagereq>
       <packagereq>mate-control-center</packagereq>
       <packagereq>mate-desktop</packagereq>
-      <packagereq>mate-dialogs</packagereq>
       <packagereq>mate-icon-theme</packagereq>
       <packagereq>mate-media</packagereq>
       <packagereq>mate-menus</packagereq>
@@ -4497,10 +4495,12 @@
       <packagereq>system-config-language</packagereq>
       <packagereq>system-config-users</packagereq>
       <packagereq>transmission-gtk</packagereq>
+      <packagereq>vim-enhanced</packagereq>
       <packagereq>xdg-user-dirs-gtk</packagereq>
       <packagereq>xfburn</packagereq>
       <packagereq>yelp</packagereq>
       <packagereq>yumex</packagereq>
+      <packagereq>zenity</packagereq>
     </packagelist>
    </group>
   <group>
@@ -4514,9 +4514,9 @@
       <packagereq>caja-actions</packagereq>
       <packagereq>caja-share</packagereq>
       <packagereq>caja-terminal</packagereq>
-      <packagereq>geany</packagereq>
       <packagereq>filezilla</packagereq>
       <packagereq>firewall-applet</packagereq>
+      <packagereq>gvfs-smb</packagereq>
       <packagereq>mate-applet-lockkeys</packagereq>
       <packagereq>mate-applet-softupd</packagereq>
       <packagereq>mate-dictionary</packagereq>
@@ -4525,14 +4525,12 @@
       <packagereq>mate-icon-theme-faenza</packagereq>
       <packagereq>mate-netspeed</packagereq>
       <packagereq>mate-sensors-applet</packagereq>
+      <packagereq>mate-themes-extras</packagereq>
       <packagereq>mate-user-share</packagereq>
       <packagereq>mate-utils</packagereq>
       <packagereq>mintmenu</packagereq>
-      <packagereq>pavucontrol</packagereq>
       <packagereq>python-caja</packagereq>
       <packagereq>tigervnc</packagereq>
-      <packagereq>vim-enhanced</packagereq>
-      <packagereq>xterm</packagereq>
     </packagelist>
    </group>
    <group>
diff --git a/comps-f22.xml.in b/comps-f22.xml.in
index 38adeea5..aa970789 100644
--- a/comps-f22.xml.in
+++ b/comps-f22.xml.in
@@ -4567,7 +4567,6 @@
       <packagereq>gvfs-gphoto2</packagereq>
       <packagereq>gvfs-mtp</packagereq>
       <packagereq>gvfs</packagereq>
-      <packagereq>gvfs-smb</packagereq>
       <packagereq>hexchat</packagereq>
       <packagereq>initial-setup-gui</packagereq>
       <packagereq>libmatekbd</packagereq>
@@ -4578,7 +4577,7 @@
       <packagereq>marco</packagereq>
       <packagereq>mate-applets</packagereq>
       <packagereq>mate-backgrounds</packagereq>
-      <packagereq>galculator</packagereq>
+      <packagereq>mate-calc</packagereq>
       <packagereq>mate-control-center</packagereq>
       <packagereq>mate-desktop</packagereq>
       <packagereq>mate-icon-theme</packagereq>
@@ -4616,6 +4615,7 @@
       <packagereq>system-config-language</packagereq>
       <packagereq>system-config-users</packagereq>
       <packagereq>transmission-gtk</packagereq>
+      <packagereq>vim-enhanced</packagereq>
       <packagereq>xdg-user-dirs-gtk</packagereq>
       <packagereq>xfburn</packagereq>
       <packagereq>yelp</packagereq>
@@ -4634,9 +4634,9 @@
       <packagereq>caja-actions</packagereq>
       <packagereq>caja-share</packagereq>
       <packagereq>caja-terminal</packagereq>
-      <packagereq>geany</packagereq>
       <packagereq>filezilla</packagereq>
       <packagereq>firewall-applet</packagereq>
+      <packagereq>gvfs-smb</packagereq>
       <packagereq>mate-applet-lockkeys</packagereq>
       <packagereq>mate-applet-softupd</packagereq>
       <packagereq>mate-dictionary</packagereq>
@@ -4645,14 +4645,12 @@
       <packagereq>mate-icon-theme-faenza</packagereq>
       <packagereq>mate-netspeed</packagereq>
       <packagereq>mate-sensors-applet</packagereq>
+      <packagereq>mate-themes-extras</packagereq>
       <packagereq>mate-user-share</packagereq>
       <packagereq>mate-utils</packagereq>
       <packagereq>mintmenu</packagereq>
-      <packagereq>pavucontrol</packagereq>
       <packagereq>python-caja</packagereq>
       <packagereq>tigervnc</packagereq>
-      <packagereq>vim-enhanced</packagereq>
-      <packagereq>xterm</packagereq>
     </packagelist>
    </group>
    <group>