diff --git a/comps-f22.xml.in b/comps-f22.xml.in
index 69c2f3ae..0b4b6270 100644
--- a/comps-f22.xml.in
+++ b/comps-f22.xml.in
@@ -4258,12 +4258,9 @@
       <packagereq>caja-beesu-manager</packagereq>
       <packagereq>caja-share</packagereq>
       <packagereq>caja-terminal</packagereq>
-      <packagereq>filezilla</packagereq>
       <packagereq>firewall-applet</packagereq>
       <packagereq>mate-applet-lockkeys</packagereq>
       <packagereq>mate-applet-softupd</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-netspeed</packagereq>
@@ -4324,9 +4321,10 @@
       <packagereq>f21-backgrounds-base</packagereq>
       <packagereq>engrampa</packagereq>
       <packagereq>eom</packagereq>
-      <packagereq>fedora-icon-theme</packagereq>
+      <packagereq>filezilla</packagereq>
       <packagereq>firefox</packagereq>
       <packagereq>firewall-config</packagereq>
+      <packagereq>gnote</packagereq>
       <packagereq>gparted</packagereq>
       <packagereq>gucharmap</packagereq>
       <packagereq>gtk2-engines</packagereq>
@@ -4340,7 +4338,6 @@
       <packagereq>hexchat</packagereq>
       <packagereq>initial-setup-gui</packagereq>
       <packagereq>libmatekbd</packagereq>
-      <packagereq>libmatemixer</packagereq>
       <packagereq>libmateweather</packagereq>
       <packagereq>libsecret</packagereq>
       <packagereq>lightdm</packagereq>
@@ -4351,6 +4348,9 @@
       <packagereq>mate-calc</packagereq>
       <packagereq>mate-control-center</packagereq>
       <packagereq>mate-desktop</packagereq>
+      <packagereq>mate-dialogs</packagereq>
+      <packagereq>mate-dictionary</packagereq>
+      <packagereq>mate-disk-usage-analyzer</packagereq>
       <packagereq>mate-icon-theme</packagereq>
       <packagereq>mate-media</packagereq>
       <packagereq>mate-menus</packagereq>
@@ -4380,7 +4380,9 @@
       <packagereq>seahorse</packagereq>
       <packagereq>setroubleshoot</packagereq>
       <packagereq>simple-scan</packagereq>
+      <packagereq>system-config-date</packagereq>
       <packagereq>system-config-language</packagereq>
+      <packagereq>system-config-printer</packagereq>
       <packagereq>system-config-users</packagereq>
       <packagereq>transmission-gtk</packagereq>
       <packagereq>vim-enhanced</packagereq>
@@ -4388,7 +4390,6 @@
       <packagereq>xfburn</packagereq>
       <packagereq>yelp</packagereq>
       <packagereq>yumex</packagereq>
-      <packagereq>zenity</packagereq>
     </packagelist>
   </group>
   <group>