diff --git a/comps-epel8-next.xml.in b/comps-epel8-next.xml.in
index b0010aac..ca97adf1 100644
--- a/comps-epel8-next.xml.in
+++ b/comps-epel8-next.xml.in
@@ -10,15 +10,6 @@
       <packagereq type="mandatory">glx-utils</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>standard</id>
-    <_name>standard</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="default">wget</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>core</id>
     <_name>core</_name>
@@ -28,78 +19,6 @@
       <packagereq type="default">rhc</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>dial-up</id>
-    <_name>dial-up</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="default">minicom</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>fonts</id>
-    <_name>fonts</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="default">abattis-cantarell-fonts</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>input-methods</id>
-    <_name>input-methods</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="optional">ibus-table-array30</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>multimedia</id>
-    <_name>multimedia</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">alsa-utils</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>networkmanager-submodules</id>
-    <_name>networkmanager-submodules</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="default">dnsmasq</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>hardware-support</id>
-    <_name>hardware-support</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="default">bolt</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>print-client</id>
-    <_name>print-client</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">cups</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>guest-desktop-agents</id>
-    <_name>guest-desktop-agents</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="optional">spice-streaming-agent</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>critical-path-kde</id>
     <_name>Critical Path (KDE)</_name>
@@ -111,6 +30,15 @@
       <packagereq type="mandatory">sddm</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>dial-up</id>
+    <_name>dial-up</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">minicom</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>fedora-packager</id>
     <_name>Fedora Packager</_name>
@@ -139,6 +67,42 @@
       <packagereq type="mandatory">firefox</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>fonts</id>
+    <_name>fonts</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">abattis-cantarell-fonts</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>guest-desktop-agents</id>
+    <_name>guest-desktop-agents</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="optional">spice-streaming-agent</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>hardware-support</id>
+    <_name>hardware-support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">bolt</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>input-methods</id>
+    <_name>input-methods</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="optional">ibus-table-array30</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>kde-apps</id>
     <_name>KDE Applications</_name>
@@ -220,8 +184,8 @@
       <packagereq>kwin</packagereq>
       <packagereq>kwrite</packagereq>
       <packagereq>okular</packagereq>
-      <packagereq>pam-kwallet</packagereq>
       <packagereq>PackageKit-command-not-found</packagereq>
+      <packagereq>pam-kwallet</packagereq>
       <packagereq>phonon-qt5-backend-gstreamer</packagereq>
       <packagereq>plasma-breeze</packagereq>
       <packagereq>plasma-desktop-doc</packagereq>
@@ -374,6 +338,42 @@
       <packagereq type="optional">qt5-qtxmlpatterns-devel</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>multimedia</id>
+    <_name>multimedia</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">alsa-utils</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>networkmanager-submodules</id>
+    <_name>networkmanager-submodules</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">dnsmasq</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>print-client</id>
+    <_name>print-client</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">cups</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>standard</id>
+    <_name>standard</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">wget</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>xfce-desktop</id>
     <_name>Xfce</_name>
diff --git a/comps-epel8.xml.in b/comps-epel8.xml.in
index b0010aac..ca97adf1 100644
--- a/comps-epel8.xml.in
+++ b/comps-epel8.xml.in
@@ -10,15 +10,6 @@
       <packagereq type="mandatory">glx-utils</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>standard</id>
-    <_name>standard</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="default">wget</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>core</id>
     <_name>core</_name>
@@ -28,78 +19,6 @@
       <packagereq type="default">rhc</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>dial-up</id>
-    <_name>dial-up</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="default">minicom</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>fonts</id>
-    <_name>fonts</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="default">abattis-cantarell-fonts</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>input-methods</id>
-    <_name>input-methods</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="optional">ibus-table-array30</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>multimedia</id>
-    <_name>multimedia</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">alsa-utils</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>networkmanager-submodules</id>
-    <_name>networkmanager-submodules</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="default">dnsmasq</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>hardware-support</id>
-    <_name>hardware-support</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="default">bolt</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>print-client</id>
-    <_name>print-client</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">cups</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>guest-desktop-agents</id>
-    <_name>guest-desktop-agents</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="optional">spice-streaming-agent</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>critical-path-kde</id>
     <_name>Critical Path (KDE)</_name>
@@ -111,6 +30,15 @@
       <packagereq type="mandatory">sddm</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>dial-up</id>
+    <_name>dial-up</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">minicom</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>fedora-packager</id>
     <_name>Fedora Packager</_name>
@@ -139,6 +67,42 @@
       <packagereq type="mandatory">firefox</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>fonts</id>
+    <_name>fonts</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">abattis-cantarell-fonts</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>guest-desktop-agents</id>
+    <_name>guest-desktop-agents</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="optional">spice-streaming-agent</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>hardware-support</id>
+    <_name>hardware-support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">bolt</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>input-methods</id>
+    <_name>input-methods</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="optional">ibus-table-array30</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>kde-apps</id>
     <_name>KDE Applications</_name>
@@ -220,8 +184,8 @@
       <packagereq>kwin</packagereq>
       <packagereq>kwrite</packagereq>
       <packagereq>okular</packagereq>
-      <packagereq>pam-kwallet</packagereq>
       <packagereq>PackageKit-command-not-found</packagereq>
+      <packagereq>pam-kwallet</packagereq>
       <packagereq>phonon-qt5-backend-gstreamer</packagereq>
       <packagereq>plasma-breeze</packagereq>
       <packagereq>plasma-desktop-doc</packagereq>
@@ -374,6 +338,42 @@
       <packagereq type="optional">qt5-qtxmlpatterns-devel</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>multimedia</id>
+    <_name>multimedia</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">alsa-utils</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>networkmanager-submodules</id>
+    <_name>networkmanager-submodules</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">dnsmasq</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>print-client</id>
+    <_name>print-client</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">cups</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>standard</id>
+    <_name>standard</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">wget</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>xfce-desktop</id>
     <_name>Xfce</_name>
diff --git a/comps-epel9-next.xml.in b/comps-epel9-next.xml.in
index 5288f781..304bf6aa 100644
--- a/comps-epel9-next.xml.in
+++ b/comps-epel9-next.xml.in
@@ -1,33 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
 <comps>
-  <group>
-    <id>base-x</id>
-    <_name>base-x</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">glx-utils</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>firefox</id>
-    <_name>firefox</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="default">firefox</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>office-suite</id>
-    <_name>office-suite</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="default">libreoffice-writer</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>admin-tools</id>
     <_name>admin-tools</_name>
@@ -35,66 +8,12 @@
     <uservisible>true</uservisible>
   </group>
   <group>
-    <id>fonts</id>
-    <_name>fonts</_name>
+    <id>base-x</id>
+    <_name>base-x</_name>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="default">abattis-cantarell-fonts</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>input-methods</id>
-    <_name>input-methods</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="optional">ibus-table-array30</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>multimedia</id>
-    <_name>multimedia</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">alsa-utils</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>networkmanager-submodules</id>
-    <_name>networkmanager-submodules</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="default">dnsmasq</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>hardware-support</id>
-    <_name>hardware-support</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="default">bolt</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>print-client</id>
-    <_name>print-client</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">cups</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>guest-desktop-agents</id>
-    <_name>guest-desktop-agents</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="optional">spice-streaming-agent</packagereq>
+      <packagereq type="mandatory">glx-utils</packagereq>
     </packagelist>
   </group>
   <group>
@@ -126,6 +45,51 @@
       <packagereq type="mandatory">rpmdevtools</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>firefox</id>
+    <_name>firefox</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">firefox</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>fonts</id>
+    <_name>fonts</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">abattis-cantarell-fonts</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>guest-desktop-agents</id>
+    <_name>guest-desktop-agents</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="optional">spice-streaming-agent</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>hardware-support</id>
+    <_name>hardware-support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">bolt</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>input-methods</id>
+    <_name>input-methods</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="optional">ibus-table-array30</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>kde-apps</id>
     <_name>KDE Applications</_name>
@@ -206,8 +170,8 @@
       <packagereq>kwin</packagereq>
       <packagereq>kwrite</packagereq>
       <packagereq>okular</packagereq>
-      <packagereq>pam-kwallet</packagereq>
       <packagereq>PackageKit-command-not-found</packagereq>
+      <packagereq>pam-kwallet</packagereq>
       <packagereq>phonon-qt5-backend-gstreamer</packagereq>
       <packagereq>plasma-breeze</packagereq>
       <packagereq>plasma-desktop-doc</packagereq>
@@ -361,12 +325,48 @@
     </packagelist>
   </group>
   <group>
-   <id>xfce-desktop</id>
-   <_name>Xfce</_name>
-   <_description>A lightweight desktop environment that works well on low end machines.</_description>
-   <default>false</default>
-   <uservisible>true</uservisible>
-   <packagelist>
+    <id>multimedia</id>
+    <_name>multimedia</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">alsa-utils</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>networkmanager-submodules</id>
+    <_name>networkmanager-submodules</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">dnsmasq</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>office-suite</id>
+    <_name>office-suite</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">libreoffice-writer</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>print-client</id>
+    <_name>print-client</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">cups</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>xfce-desktop</id>
+    <_name>Xfce</_name>
+    <_description>A lightweight desktop environment that works well on low end machines.</_description>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
       <packagereq type="mandatory">Thunar</packagereq>
       <packagereq type="mandatory">xfce4-panel</packagereq>
       <packagereq type="mandatory">xfce4-session</packagereq>
diff --git a/comps-epel9.xml.in b/comps-epel9.xml.in
index 4c309dfc..304bf6aa 100644
--- a/comps-epel9.xml.in
+++ b/comps-epel9.xml.in
@@ -1,33 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
 <comps>
-  <group>
-    <id>base-x</id>
-    <_name>base-x</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">glx-utils</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>firefox</id>
-    <_name>firefox</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="default">firefox</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>office-suite</id>
-    <_name>office-suite</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="default">libreoffice-writer</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>admin-tools</id>
     <_name>admin-tools</_name>
@@ -35,66 +8,12 @@
     <uservisible>true</uservisible>
   </group>
   <group>
-    <id>fonts</id>
-    <_name>fonts</_name>
+    <id>base-x</id>
+    <_name>base-x</_name>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="default">abattis-cantarell-fonts</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>input-methods</id>
-    <_name>input-methods</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="optional">ibus-table-array30</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>multimedia</id>
-    <_name>multimedia</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">alsa-utils</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>networkmanager-submodules</id>
-    <_name>networkmanager-submodules</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="default">dnsmasq</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>hardware-support</id>
-    <_name>hardware-support</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="default">bolt</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>print-client</id>
-    <_name>print-client</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">cups</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>guest-desktop-agents</id>
-    <_name>guest-desktop-agents</_name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="optional">spice-streaming-agent</packagereq>
+      <packagereq type="mandatory">glx-utils</packagereq>
     </packagelist>
   </group>
   <group>
@@ -126,6 +45,51 @@
       <packagereq type="mandatory">rpmdevtools</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>firefox</id>
+    <_name>firefox</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">firefox</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>fonts</id>
+    <_name>fonts</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">abattis-cantarell-fonts</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>guest-desktop-agents</id>
+    <_name>guest-desktop-agents</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="optional">spice-streaming-agent</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>hardware-support</id>
+    <_name>hardware-support</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">bolt</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>input-methods</id>
+    <_name>input-methods</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="optional">ibus-table-array30</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>kde-apps</id>
     <_name>KDE Applications</_name>
@@ -206,8 +170,8 @@
       <packagereq>kwin</packagereq>
       <packagereq>kwrite</packagereq>
       <packagereq>okular</packagereq>
-      <packagereq>pam-kwallet</packagereq>
       <packagereq>PackageKit-command-not-found</packagereq>
+      <packagereq>pam-kwallet</packagereq>
       <packagereq>phonon-qt5-backend-gstreamer</packagereq>
       <packagereq>plasma-breeze</packagereq>
       <packagereq>plasma-desktop-doc</packagereq>
@@ -361,12 +325,48 @@
     </packagelist>
   </group>
   <group>
-   <id>xfce-desktop</id>
-   <_name>Xfce</_name>
-   <_description>A lightweight desktop environment that works well on low end machines.</_description>
-   <default>false</default>
-   <uservisible>true</uservisible>
-   <packagelist>
+    <id>multimedia</id>
+    <_name>multimedia</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">alsa-utils</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>networkmanager-submodules</id>
+    <_name>networkmanager-submodules</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">dnsmasq</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>office-suite</id>
+    <_name>office-suite</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">libreoffice-writer</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>print-client</id>
+    <_name>print-client</_name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">cups</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>xfce-desktop</id>
+    <_name>Xfce</_name>
+    <_description>A lightweight desktop environment that works well on low end machines.</_description>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
       <packagereq type="mandatory">Thunar</packagereq>
       <packagereq type="mandatory">xfce4-panel</packagereq>
       <packagereq type="mandatory">xfce4-session</packagereq>
@@ -387,7 +387,7 @@
       <packagereq type="default">xfce4-pulseaudio-plugin</packagereq>
       <packagereq type="default">xfce4-screensaver</packagereq>
       <packagereq type="default">xfce4-terminal</packagereq>
-   </packagelist>
+    </packagelist>
   </group>
   <environment>
     <id>kde-desktop-environment</id>
diff --git a/comps-f34.xml.in b/comps-f34.xml.in
index d04c6b8a..f3af4151 100644
--- a/comps-f34.xml.in
+++ b/comps-f34.xml.in
@@ -2825,8 +2825,8 @@
       <packagereq type="optional">libifp</packagereq>
       <packagereq type="optional">liquidio-firmware</packagereq>
       <packagereq type="optional">lsscsi</packagereq>
-      <packagereq type="optional">multican</packagereq>
       <packagereq type="optional">mrvlprestera-firmware</packagereq>
+      <packagereq type="optional">multican</packagereq>
       <packagereq type="optional">netronome-firmware</packagereq>
       <packagereq type="optional">opensc</packagereq>
       <packagereq type="optional">pcsc-lite</packagereq>
@@ -3194,8 +3194,8 @@
       <packagereq type="mandatory">sddm</packagereq>
       <packagereq type="mandatory">sddm-breeze</packagereq>
       <packagereq type="mandatory">sddm-kcm</packagereq>
-      <packagereq type="optional">plasma-pk-updates</packagereq>
       <packagereq type="conditional" requires="at-spi2-core">qt-at-spi</packagereq>
+      <packagereq type="optional">plasma-pk-updates</packagereq>
     </packagelist>
   </group>
   <group>
diff --git a/comps-f35.xml.in b/comps-f35.xml.in
index 1dfa4f3e..7cc1cb85 100644
--- a/comps-f35.xml.in
+++ b/comps-f35.xml.in
@@ -2838,9 +2838,9 @@
       <packagereq type="optional">libifp</packagereq>
       <packagereq type="optional">liquidio-firmware</packagereq>
       <packagereq type="optional">lsscsi</packagereq>
-      <packagereq type="optional">multican</packagereq>
       <packagereq type="optional">mlxsw_spectrum-firmware</packagereq>
       <packagereq type="optional">mrvlprestera-firmware</packagereq>
+      <packagereq type="optional">multican</packagereq>
       <packagereq type="optional">netronome-firmware</packagereq>
       <packagereq type="optional">opensc</packagereq>
       <packagereq type="optional">pcsc-lite</packagereq>
@@ -2859,8 +2859,8 @@
       <packagereq>cabal-rpm</packagereq>
       <packagereq>darcs</packagereq>
       <packagereq>ghc</packagereq>
-      <packagereq>ghcid</packagereq>
       <packagereq>ghc-rpm-macros</packagereq>
+      <packagereq>ghcid</packagereq>
       <packagereq>haskell-platform</packagereq>
       <packagereq>hlint</packagereq>
       <packagereq type="conditional" requires="emacs">emacs-haskell-mode</packagereq>
@@ -3121,7 +3121,6 @@
       <packagereq type="mandatory">sddm</packagereq>
       <packagereq type="mandatory">sddm-breeze</packagereq>
       <packagereq type="mandatory">sddm-kcm</packagereq>
-      <packagereq type="optional">plasma-pk-updates</packagereq>
       <packagereq type="conditional" requires="at-spi2-core">qt-at-spi</packagereq>
       <packagereq type="default">abrt-desktop</packagereq>
       <packagereq type="default">adwaita-gtk2-theme</packagereq>
@@ -3206,6 +3205,7 @@
       <packagereq type="default">spectacle</packagereq>
       <packagereq type="default">xdg-desktop-portal-gnome</packagereq>
       <packagereq type="default">xorg-x11-drv-libinput</packagereq>
+      <packagereq type="optional">plasma-pk-updates</packagereq>
     </packagelist>
   </group>
   <group>
diff --git a/comps-f36.xml.in b/comps-f36.xml.in
index 50e7ac5b..d7efea37 100644
--- a/comps-f36.xml.in
+++ b/comps-f36.xml.in
@@ -1577,9 +1577,9 @@
       <packagereq type="default">google-noto-sans-georgian-vf-fonts</packagereq>
       <packagereq type="default">google-noto-sans-gurmukhi-vf-fonts</packagereq>
       <packagereq type="default">google-noto-sans-hebrew-vf-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-lao-vf-fonts</packagereq>
       <packagereq type="default">google-noto-sans-math-vf-fonts</packagereq>
       <packagereq type="default">google-noto-sans-mono-vf-fonts</packagereq>
-      <packagereq type="default">google-noto-sans-lao-vf-fonts</packagereq>
       <packagereq type="default">google-noto-sans-sinhala-vf-fonts</packagereq>
       <packagereq type="default">google-noto-sans-thaana-vf-fonts</packagereq>
       <packagereq type="default">google-noto-sans-vf-fonts</packagereq>
@@ -1599,10 +1599,10 @@
       <packagereq type="default">lohit-tamil-fonts</packagereq>
       <packagereq type="default">lohit-telugu-fonts</packagereq>
       <packagereq type="default">paktype-naskh-basic-fonts</packagereq>
+      <packagereq type="default">rit-meera-new-fonts</packagereq>
       <packagereq type="default">sil-mingzat-fonts</packagereq>
       <packagereq type="default">sil-nuosu-fonts</packagereq>
       <packagereq type="default">sil-padauk-fonts</packagereq>
-      <packagereq type="default">rit-meera-new-fonts</packagereq>
       <packagereq type="default">stix-fonts</packagereq>
       <packagereq type="default">thai-scalable-waree-fonts</packagereq>
       <packagereq type="optional">aajohan-comfortaa-fonts</packagereq>
@@ -2549,7 +2549,6 @@
     <packagelist>
       <packagereq type="mandatory">dconf</packagereq>
       <packagereq type="mandatory">gdm</packagereq>
-      <packagereq type="mandatory">gnome-text-editor</packagereq>
       <packagereq type="mandatory">gnome-boxes</packagereq>
       <packagereq type="mandatory">gnome-connections</packagereq>
       <packagereq type="mandatory">gnome-control-center</packagereq>
@@ -2560,6 +2559,7 @@
       <packagereq type="mandatory">gnome-shell</packagereq>
       <packagereq type="mandatory">gnome-software</packagereq>
       <packagereq type="mandatory">gnome-terminal</packagereq>
+      <packagereq type="mandatory">gnome-text-editor</packagereq>
       <packagereq type="mandatory">nautilus</packagereq>
       <packagereq type="mandatory">polkit</packagereq>
       <packagereq type="mandatory">yelp</packagereq>
@@ -2922,9 +2922,9 @@
       <packagereq type="optional">libifp</packagereq>
       <packagereq type="optional">liquidio-firmware</packagereq>
       <packagereq type="optional">lsscsi</packagereq>
-      <packagereq type="optional">multican</packagereq>
       <packagereq type="optional">mlxsw_spectrum-firmware</packagereq>
       <packagereq type="optional">mrvlprestera-firmware</packagereq>
+      <packagereq type="optional">multican</packagereq>
       <packagereq type="optional">netronome-firmware</packagereq>
       <packagereq type="optional">opensc</packagereq>
       <packagereq type="optional">pcsc-lite</packagereq>
@@ -2943,8 +2943,8 @@
       <packagereq>cabal-rpm</packagereq>
       <packagereq>darcs</packagereq>
       <packagereq>ghc</packagereq>
-      <packagereq>ghcid</packagereq>
       <packagereq>ghc-rpm-macros</packagereq>
+      <packagereq>ghcid</packagereq>
       <packagereq>haskell-platform</packagereq>
       <packagereq>hlint</packagereq>
       <packagereq type="conditional" requires="emacs">emacs-haskell-mode</packagereq>
@@ -4173,12 +4173,12 @@
       <packagereq type="optional">COPASI</packagereq>
       <packagereq type="optional">genesis-simulator</packagereq>
       <packagereq type="optional">moose</packagereq>
+      <packagereq type="optional">neuron-devel</packagereq>
       <packagereq type="optional">python3-brian2</packagereq>
       <packagereq type="optional">python3-lfpy</packagereq>
       <packagereq type="optional">python3-nest</packagereq>
       <packagereq type="optional">python3-netpyne</packagereq>
       <packagereq type="optional">python3-neuron</packagereq>
-      <packagereq type="optional">neuron-devel</packagereq>
       <packagereq type="optional">python3-PyLEMS</packagereq>
       <packagereq type="optional">python3-pynn</packagereq>
       <packagereq type="optional">python3-steps</packagereq>
diff --git a/comps-f37.xml.in b/comps-f37.xml.in
index 272cda42..90c78266 100644
--- a/comps-f37.xml.in
+++ b/comps-f37.xml.in
@@ -1573,9 +1573,9 @@
       <packagereq type="default">google-noto-sans-georgian-vf-fonts</packagereq>
       <packagereq type="default">google-noto-sans-gurmukhi-vf-fonts</packagereq>
       <packagereq type="default">google-noto-sans-hebrew-vf-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-lao-vf-fonts</packagereq>
       <packagereq type="default">google-noto-sans-math-vf-fonts</packagereq>
       <packagereq type="default">google-noto-sans-mono-vf-fonts</packagereq>
-      <packagereq type="default">google-noto-sans-lao-vf-fonts</packagereq>
       <packagereq type="default">google-noto-sans-sinhala-vf-fonts</packagereq>
       <packagereq type="default">google-noto-sans-thaana-vf-fonts</packagereq>
       <packagereq type="default">google-noto-sans-vf-fonts</packagereq>
@@ -1595,10 +1595,10 @@
       <packagereq type="default">lohit-tamil-fonts</packagereq>
       <packagereq type="default">lohit-telugu-fonts</packagereq>
       <packagereq type="default">paktype-naskh-basic-fonts</packagereq>
+      <packagereq type="default">rit-meera-new-fonts</packagereq>
       <packagereq type="default">sil-mingzat-fonts</packagereq>
       <packagereq type="default">sil-nuosu-fonts</packagereq>
       <packagereq type="default">sil-padauk-fonts</packagereq>
-      <packagereq type="default">rit-meera-new-fonts</packagereq>
       <packagereq type="default">stix-fonts</packagereq>
       <packagereq type="default">thai-scalable-waree-fonts</packagereq>
       <packagereq type="default">vazirmatn-vf-fonts</packagereq>
@@ -2546,7 +2546,6 @@
     <packagelist>
       <packagereq type="mandatory">dconf</packagereq>
       <packagereq type="mandatory">gdm</packagereq>
-      <packagereq type="mandatory">gnome-text-editor</packagereq>
       <packagereq type="mandatory">gnome-boxes</packagereq>
       <packagereq type="mandatory">gnome-connections</packagereq>
       <packagereq type="mandatory">gnome-control-center</packagereq>
@@ -2557,6 +2556,7 @@
       <packagereq type="mandatory">gnome-shell</packagereq>
       <packagereq type="mandatory">gnome-software</packagereq>
       <packagereq type="mandatory">gnome-terminal</packagereq>
+      <packagereq type="mandatory">gnome-text-editor</packagereq>
       <packagereq type="mandatory">nautilus</packagereq>
       <packagereq type="mandatory">polkit</packagereq>
       <packagereq type="mandatory">yelp</packagereq>
@@ -2919,9 +2919,9 @@
       <packagereq type="optional">libifp</packagereq>
       <packagereq type="optional">liquidio-firmware</packagereq>
       <packagereq type="optional">lsscsi</packagereq>
-      <packagereq type="optional">multican</packagereq>
       <packagereq type="optional">mlxsw_spectrum-firmware</packagereq>
       <packagereq type="optional">mrvlprestera-firmware</packagereq>
+      <packagereq type="optional">multican</packagereq>
       <packagereq type="optional">netronome-firmware</packagereq>
       <packagereq type="optional">opensc</packagereq>
       <packagereq type="optional">pcsc-lite</packagereq>
@@ -2940,8 +2940,8 @@
       <packagereq>cabal-rpm</packagereq>
       <packagereq>darcs</packagereq>
       <packagereq>ghc</packagereq>
-      <packagereq>ghcid</packagereq>
       <packagereq>ghc-rpm-macros</packagereq>
+      <packagereq>ghcid</packagereq>
       <packagereq>haskell-platform</packagereq>
       <packagereq>hlint</packagereq>
       <packagereq type="conditional" requires="emacs">emacs-haskell-mode</packagereq>
@@ -4170,12 +4170,12 @@
       <packagereq type="optional">COPASI</packagereq>
       <packagereq type="optional">genesis-simulator</packagereq>
       <packagereq type="optional">moose</packagereq>
+      <packagereq type="optional">neuron-devel</packagereq>
       <packagereq type="optional">python3-brian2</packagereq>
       <packagereq type="optional">python3-lfpy</packagereq>
       <packagereq type="optional">python3-nest</packagereq>
       <packagereq type="optional">python3-netpyne</packagereq>
       <packagereq type="optional">python3-neuron</packagereq>
-      <packagereq type="optional">neuron-devel</packagereq>
       <packagereq type="optional">python3-PyLEMS</packagereq>
       <packagereq type="optional">python3-pynn</packagereq>
       <packagereq type="optional">python3-steps</packagereq>
@@ -4411,18 +4411,17 @@
       <packagereq>gnome-calculator</packagereq>
       <packagereq>gnome-calendar</packagereq>
       <packagereq>gnome-clocks</packagereq>
+      <packagereq>gnome-console</packagereq>
       <packagereq>gnome-contacts</packagereq>
       <packagereq>gnome-maps</packagereq>
       <packagereq>gnome-photos</packagereq>
       <packagereq>gnome-software</packagereq>
-      <packagereq>gnome-console</packagereq>
       <packagereq>gstreamer1-plugin-openh264</packagereq>
       <packagereq>gstreamer1-plugins-bad-free</packagereq>
       <packagereq>gstreamer1-plugins-good</packagereq>
       <packagereq>gstreamer1-plugins-ugly-free</packagereq>
       <packagereq>linux-firmware</packagereq>
       <packagereq>mesa-dri-drivers</packagereq>
-      <packagereq type="optional">mmsd-tng</packagereq>
       <packagereq>NetworkManager</packagereq>
       <packagereq>NetworkManager-bluetooth</packagereq>
       <packagereq>NetworkManager-config-connectivity-fedora</packagereq>
@@ -4436,6 +4435,7 @@
       <packagereq>sudo</packagereq>
       <packagereq>systemd-udev</packagereq>
       <packagereq>totem</packagereq>
+      <packagereq type="optional">mmsd-tng</packagereq>
     </packagelist>
   </group>
   <group>
@@ -5112,7 +5112,6 @@
       <packagereq>hunspell</packagereq>
       <packagereq>iptstate</packagereq>
       <packagereq>irqbalance</packagereq>
-      <packagereq>whois</packagereq>
       <packagereq>logrotate</packagereq>
       <packagereq>lsof</packagereq>
       <packagereq>mailcap</packagereq>
@@ -5152,6 +5151,7 @@
       <packagereq>util-linux-user</packagereq>
       <packagereq>wget</packagereq>
       <packagereq>which</packagereq>
+      <packagereq>whois</packagereq>
       <packagereq>words</packagereq>
       <packagereq>zip</packagereq>
       <packagereq type="conditional" requires="gnome-control-center">chrony</packagereq>
@@ -5666,7 +5666,6 @@
       <packagereq type="default">ibus-m17n</packagereq>
       <packagereq type="default">ibus-typing-booster</packagereq>
       <packagereq type="default">iptstate</packagereq>
-      <packagereq type="default">whois</packagereq>
       <packagereq type="default">logrotate</packagereq>
       <packagereq type="default">lrzsz</packagereq>
       <packagereq type="default">lsof</packagereq>
@@ -5718,6 +5717,7 @@
       <packagereq type="default">usbutils</packagereq>
       <packagereq type="default">wget</packagereq>
       <packagereq type="default">which</packagereq>
+      <packagereq type="default">whois</packagereq>
       <packagereq type="default">words</packagereq>
       <packagereq type="default">zip</packagereq>
     </packagelist>