diff --git a/comps-f20.xml.in b/comps-f20.xml.in
index 26eedf8a..a5757f75 100644
--- a/comps-f20.xml.in
+++ b/comps-f20.xml.in
@@ -4248,9 +4248,7 @@
       <packagereq>libmateweather</packagereq>
       <packagereq>libmatewnck</packagereq>
       <packagereq>mate-applets</packagereq>
-      <packagereq>mate-applet-softupd</packagereq>
       <packagereq>mate-backgrounds</packagereq>
-      <packagereq>mate-bluetooth</packagereq>
       <packagereq>mate-calc</packagereq>
       <packagereq>mate-control-center</packagereq>
       <packagereq>mate-desktop</packagereq>
@@ -4260,7 +4258,6 @@
       <packagereq>mate-file-manager</packagereq>
       <packagereq>mate-file-manager-image-converter</packagereq>
       <packagereq>mate-file-manager-sendto</packagereq>
-      <packagereq>mate-file-manager-share</packagereq>
       <packagereq>mate-file-manager-open-terminal</packagereq>
       <packagereq>mate-icon-theme</packagereq>
       <packagereq>mate-image-viewer</packagereq>
@@ -4269,7 +4266,6 @@
       <packagereq>mate-media</packagereq>
       <packagereq>mate-menus</packagereq>
       <packagereq>mate-menu-editor</packagereq>
-      <packagereq>mate-netspeed</packagereq>
       <packagereq>mate-notification-daemon</packagereq>
       <packagereq>mate-panel</packagereq>
       <packagereq>mate-polkit</packagereq>
@@ -4282,8 +4278,6 @@
       <packagereq>mate-terminal</packagereq>
       <packagereq>mate-text-editor</packagereq>
       <packagereq>mate-themes</packagereq>
-      <packagereq>mate-user-share</packagereq>
-      <packagereq>mate-utils</packagereq>
       <packagereq>mate-window-manager</packagereq>
       <packagereq>NetworkManager</packagereq>
       <packagereq>network-manager-applet</packagereq>
@@ -4298,9 +4292,7 @@
       <packagereq>desktop-backgrounds-basic</packagereq>
       <packagereq>fedora-icon-theme</packagereq>
       <packagereq>firefox</packagereq>
-      <packagereq>filezilla</packagereq>
       <packagereq>firewall-config</packagereq>
-      <packagereq>geany</packagereq>
       <packagereq>gvfs</packagereq>
       <packagereq>gvfs-smb</packagereq>
       <packagereq>gvfs-fuse</packagereq>
@@ -4310,19 +4302,43 @@
       <packagereq>gtk2-engines</packagereq>
       <packagereq>imsettings-mate</packagereq>
       <packagereq>pavucontrol</packagereq>
-      <packagereq>pidgin</packagereq>
       <packagereq>simple-scan</packagereq>
       <packagereq>claws-mail</packagereq>
-      <packagereq>tigervnc</packagereq>
       <packagereq>transmission-gtk</packagereq>
-      <packagereq>vim-enhanced</packagereq>
-      <packagereq>xterm</packagereq>
       <packagereq>yelp</packagereq>
       <packagereq>yumex</packagereq>
       <packagereq>system-config-users</packagereq>
       <packagereq>system-config-language</packagereq>
     </packagelist>
    </group>
+  <group>
+    <id>mate-applications</id>
+    <_name>MATE Applications</_name>
+    <_description>Applications for the MATE Desktop.</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>geany</packagereq>
+      <packagereq>filezilla</packagereq>
+      <packagereq>mate-applet-lockkeys</packagereq>
+      <packagereq>mate-applet-softupd</packagereq>
+      <packagereq>mate-bluetooth</packagereq>
+      <packagereq>mate-dictionary</packagereq>
+      <packagereq>mate-disk-usage-analyzer</packagereq>
+      <packagereq>mate-file-manager-share</packagereq>
+      <packagereq>mate-icon-theme-faenza</packagereq>
+      <packagereq>mate-menus-preferences-category-menu</packagereq>
+      <packagereq>mate-netspeed</packagereq>
+      <packagereq>mate-sensors-applet</packagereq>
+      <packagereq>mate-user-share</packagereq>
+      <packagereq>mate-utils</packagereq>
+      <packagereq>mintmenu</packagereq>
+      <packagereq>pidgin</packagereq>
+      <packagereq>tigervnc</packagereq>
+      <packagereq>vim-enhanced</packagereq>
+      <packagereq>xterm</packagereq>
+    </packagelist>
+   </group>
    <group>
     <id>marathi-support</id>
     <_name>Marathi Support</_name>
@@ -6183,6 +6199,7 @@
       <groupid>mate-desktop</groupid>
     </grouplist>
     <optionlist>
+      <groupid>mate-applications</groupid>
       <groupid>libreoffice</groupid>
       <groupid>3d-printing</groupid>
     </optionlist>
@@ -6426,6 +6443,7 @@
     <display_order>22</display_order>
     <grouplist>
       <groupid>mate-desktop</groupid>
+      <groupid>mate-applications</groupid>
     </grouplist>
   </category>
   <category>