run xsltproc --novalid -o <cleaned file> comps-cleanup.xsl <origional file>

on each of the comps files. process is descrid in the wiki
https://fedoraproject.org/wiki/How_to_use_and_edit_comps.xml_for_package_groups

comps-el6.xml.in

@@ -473,7 +473,7 @@
     <packagelist>
       <packagereq type="default">alliance</packagereq>
       <packagereq type="default">archimedes</packagereq>
-	  <packagereq type="default">avarice</packagereq>
+      <packagereq type="default">avarice</packagereq>
       <packagereq type="default">avr-binutils</packagereq>
       <packagereq type="default">avr-gcc</packagereq>
       <packagereq type="default">avr-gcc-c++</packagereq>
@@ -531,7 +531,7 @@
       <packagereq type="default">magic-doc</packagereq>
       <packagereq type="default">mcu8051ide</packagereq>
       <packagereq type="default">minicom</packagereq>
-	  <packagereq type="default">mot-adms</packagereq>
+      <packagereq type="default">mot-adms</packagereq>
       <packagereq type="default">nesc</packagereq>
       <packagereq type="default">netgen</packagereq>
       <packagereq type="default">ngspice</packagereq>
@@ -821,6 +821,21 @@
       <packagereq type="optional">powerman</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>haskell</id>
+    <_name>Haskell</_name>
+    <_description>Support for developing programs in the Haskell programming language.</_description>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq type="conditional" requires="gtk2-devel">ghc-gtk-devel</packagereq>
+      <packagereq type="default">darcs</packagereq>
+      <packagereq type="default">ghc</packagereq>
+      <packagereq type="default">ghc-rpm-macros</packagereq>
+      <packagereq type="default">haskell-platform</packagereq>
+      <packagereq type="default">hscolour</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>hebrew-support</id>
     <_name>Hebrew Support</_name>
@@ -839,21 +854,6 @@
     <langonly>hil</langonly>
     <packagelist/>
   </group>
-  <group>
-    <id>haskell</id>
-    <_name>Haskell</_name>
-    <_description>Support for developing programs in the Haskell programming language.</_description>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <packagelist>
-      <packagereq type="conditional" requires="gtk2-devel">ghc-gtk-devel</packagereq>
-      <packagereq type="default">darcs</packagereq>
-      <packagereq type="default">ghc</packagereq>
-      <packagereq type="default">ghc-rpm-macros</packagereq>
-      <packagereq type="default">haskell-platform</packagereq>
-      <packagereq type="default">hscolour</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>hindi-support</id>
     <_name>Hindi Support</_name>
@@ -1285,9 +1285,9 @@
       <packagereq type="default">avr-gdb</packagereq>
       <packagereq type="default">avr-libc</packagereq>
       <packagereq type="default">avr-libc-docs</packagereq>
-	  <packagereq type="default">clang</packagereq>
+      <packagereq type="default">clang</packagereq>
-	  <packagereq type="default">gcc</packagereq>
+      <packagereq type="default">gcc</packagereq>
-	  <packagereq type="default">gd-devel</packagereq>
+      <packagereq type="default">gd-devel</packagereq>
       <packagereq type="default">gplcver</packagereq>
       <packagereq type="default">gtkwave</packagereq>
       <packagereq type="default">iverilog</packagereq>

comps-epel7.xml.in

@@ -1,30 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
 <comps>
-  <environment>
-    <id>mate-desktop-environment</id>
-    <_name>MATE Desktop</_name>
-    <_description>MATE Desktop is based on GNOME 2 and provides a powerful graphical user interface for users who seek a simple easy to use traditional desktop interface.</_description>
-    <display_order>22</display_order>
-    <grouplist>
-      <groupid>base-x</groupid>
-      <groupid>standard</groupid>
-      <groupid>core</groupid>
-      <groupid>admin-tools</groupid>
-      <groupid>dial-up</groupid>
-      <groupid>fonts</groupid>
-      <groupid>input-methods</groupid>
-      <groupid>multimedia</groupid>
-      <groupid>hardware-support</groupid>
-      <groupid>printing</groupid>
-      <groupid>guest-desktop-agents</groupid>
-      <groupid>mate-desktop</groupid>
-    </grouplist>
-    <optionlist>
-      <groupid>libreoffice</groupid>
-      <groupid>3d-printing</groupid>
-    </optionlist>
-  </environment>
   <group>
     <id>additional-devel</id>
     <_name>Additional Development</_name>
@@ -498,7 +474,7 @@
     <packagelist>
       <packagereq type="default">alliance</packagereq>
       <packagereq type="default">archimedes</packagereq>
-	  <packagereq type="default">avarice</packagereq>
+      <packagereq type="default">avarice</packagereq>
       <packagereq type="default">avr-binutils</packagereq>
       <packagereq type="default">avr-gcc</packagereq>
       <packagereq type="default">avr-gcc-c++</packagereq>
@@ -556,7 +532,7 @@
       <packagereq type="default">magic-doc</packagereq>
       <packagereq type="default">mcu8051ide</packagereq>
       <packagereq type="default">minicom</packagereq>
-	  <packagereq type="default">mot-adms</packagereq>
+      <packagereq type="default">mot-adms</packagereq>
       <packagereq type="default">nesc</packagereq>
       <packagereq type="default">netgen</packagereq>
       <packagereq type="default">ngspice</packagereq>
@@ -846,6 +822,21 @@
       <packagereq type="optional">powerman</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>haskell</id>
+    <_name>Haskell</_name>
+    <_description>Support for developing programs in the Haskell programming language.</_description>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq type="conditional" requires="gtk2-devel">ghc-gtk-devel</packagereq>
+      <packagereq type="default">darcs</packagereq>
+      <packagereq type="default">ghc</packagereq>
+      <packagereq type="default">ghc-rpm-macros</packagereq>
+      <packagereq type="default">haskell-platform</packagereq>
+      <packagereq type="default">hscolour</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>hebrew-support</id>
     <_name>Hebrew Support</_name>
@@ -864,21 +855,6 @@
     <langonly>hil</langonly>
     <packagelist/>
   </group>
-  <group>
-    <id>haskell</id>
-    <_name>Haskell</_name>
-    <_description>Support for developing programs in the Haskell programming language.</_description>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <packagelist>
-      <packagereq type="conditional" requires="gtk2-devel">ghc-gtk-devel</packagereq>
-      <packagereq type="default">darcs</packagereq>
-      <packagereq type="default">ghc</packagereq>
-      <packagereq type="default">ghc-rpm-macros</packagereq>
-      <packagereq type="default">haskell-platform</packagereq>
-      <packagereq type="default">hscolour</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>hindi-support</id>
     <_name>Hindi Support</_name>
@@ -1305,12 +1281,12 @@
       <packagereq type="mandatory">caja</packagereq>
       <packagereq type="mandatory">dconf</packagereq>
       <packagereq type="mandatory">gtk2-engines</packagereq>
+      <packagereq type="mandatory">gvfs</packagereq>
       <packagereq type="mandatory">gvfs-afc</packagereq>
       <packagereq type="mandatory">gvfs-archive</packagereq>
       <packagereq type="mandatory">gvfs-fuse</packagereq>
       <packagereq type="mandatory">gvfs-gphoto2</packagereq>
       <packagereq type="mandatory">gvfs-mtp</packagereq>
-      <packagereq type="mandatory">gvfs</packagereq>
       <packagereq type="mandatory">gvfs-smb</packagereq>
       <packagereq type="mandatory">libmatekbd</packagereq>
       <packagereq type="mandatory">libmateweather</packagereq>
@@ -1350,8 +1326,8 @@
       <packagereq type="default">gnote</packagereq>
       <packagereq type="default">gparted</packagereq>
       <packagereq type="default">gucharmap</packagereq>
-      <packagereq type="default">lightdm-gtk</packagereq>
       <packagereq type="default">lightdm</packagereq>
+      <packagereq type="default">lightdm-gtk</packagereq>
       <packagereq type="default">mate-applets</packagereq>
       <packagereq type="default">mate-calc</packagereq>
       <packagereq type="default">mate-dictionary</packagereq>
@@ -1365,10 +1341,10 @@
       <packagereq type="default">mate-terminal</packagereq>
       <packagereq type="default">mozo</packagereq>
       <packagereq type="default">network-manager-applet</packagereq>
+      <packagereq type="default">NetworkManager</packagereq>
       <packagereq type="default">NetworkManager-l2tp</packagereq>
       <packagereq type="default">NetworkManager-openconnect</packagereq>
       <packagereq type="default">NetworkManager-openvpn</packagereq>
-      <packagereq type="default">NetworkManager</packagereq>
       <packagereq type="default">NetworkManager-pptp</packagereq>
       <packagereq type="default">NetworkManager-vpnc</packagereq>
       <packagereq type="default">NetworkManager-vpnc-gnome</packagereq>
@@ -1399,7 +1375,7 @@
       <packagereq type="optional">mintmenu</packagereq>
       <packagereq type="optional">pluma-beesu-plugin</packagereq>
     </packagelist>
-   </group>
+  </group>
   <group>
     <id>milkymist</id>
     <_name>Milkymist</_name>
@@ -1415,9 +1391,9 @@
       <packagereq type="default">avr-gdb</packagereq>
       <packagereq type="default">avr-libc</packagereq>
       <packagereq type="default">avr-libc-docs</packagereq>
-	  <packagereq type="default">clang</packagereq>
+      <packagereq type="default">clang</packagereq>
-	  <packagereq type="default">gcc</packagereq>
+      <packagereq type="default">gcc</packagereq>
-	  <packagereq type="default">gd-devel</packagereq>
+      <packagereq type="default">gd-devel</packagereq>
       <packagereq type="default">gplcver</packagereq>
       <packagereq type="default">gtkwave</packagereq>
       <packagereq type="default">iverilog</packagereq>
@@ -2282,6 +2258,39 @@
     <langonly>zu</langonly>
     <packagelist/>
   </group>
+  <environment>
+    <id>mate-desktop-environment</id>
+    <_name>MATE Desktop</_name>
+    <_description>MATE Desktop is based on GNOME 2 and provides a powerful graphical user interface for users who seek a simple easy to use traditional desktop interface.</_description>
+    <display_order>22</display_order>
+    <grouplist>
+      <groupid>base-x</groupid>
+      <groupid>standard</groupid>
+      <groupid>core</groupid>
+      <groupid>admin-tools</groupid>
+      <groupid>dial-up</groupid>
+      <groupid>fonts</groupid>
+      <groupid>input-methods</groupid>
+      <groupid>multimedia</groupid>
+      <groupid>hardware-support</groupid>
+      <groupid>printing</groupid>
+      <groupid>guest-desktop-agents</groupid>
+      <groupid>mate-desktop</groupid>
+    </grouplist>
+    <optionlist>
+      <groupid>libreoffice</groupid>
+      <groupid>3d-printing</groupid>
+    </optionlist>
+  </environment>
+  <category>
+    <id>mate-desktop-environment</id>
+    <_name>MATE Desktop</_name>
+    <_description>MATE Desktop is based on GNOME 2 and provides a powerful graphical user interface for users who seek a simple easy to use traditional desktop interface.</_description>
+    <display_order>22</display_order>
+    <grouplist>
+      <groupid>mate-desktop</groupid>
+    </grouplist>
+  </category>
   <category>
     <id>desktops</id>
     <display_order>70</display_order>
@@ -2311,13 +2320,4 @@
       <groupid>xfce-software-development</groupid>
     </grouplist>
   </category>
-  <category>
-    <id>mate-desktop-environment</id>
-    <_name>MATE Desktop</_name>
-    <_description>MATE Desktop is based on GNOME 2 and provides a powerful graphical user interface for users who seek a simple easy to use traditional desktop interface.</_description>
-    <display_order>22</display_order>
-    <grouplist>
-      <groupid>mate-desktop</groupid>
-    </grouplist>
-  </category>
 </comps>

comps-f21.xml.in

@@ -30,8 +30,8 @@
     <packagelist>
       <packagereq>abrt-desktop</packagereq>
       <packagereq>authconfig-gtk</packagereq>
-      <packagereq>gnome-disk-utility</packagereq>
       <packagereq>fros-recordmydesktop</packagereq>
+      <packagereq>gnome-disk-utility</packagereq>
       <packagereq>recordmydesktop</packagereq>
       <packagereq>setroubleshoot</packagereq>
       <packagereq>system-config-date</packagereq>
@@ -526,8 +526,8 @@
       <packagereq>cinnamon-screensaver</packagereq>
       <packagereq>eog</packagereq>
       <packagereq>evince</packagereq>
-      <packagereq>fedora-icon-theme</packagereq>
       <packagereq>f21-backgrounds-base</packagereq>
+      <packagereq>fedora-icon-theme</packagereq>
       <packagereq>firefox</packagereq>
       <packagereq>firewall-config</packagereq>
       <packagereq>fros-recordmydesktop</packagereq>
@@ -793,18 +793,6 @@
       <packagereq type="mandatory">sddm</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>critical-path-lxqt</id>
-    <_name>Critical Path (LXQt)</_name>
-    <_description>A set of packages that provide the Critical Path functionality for the LXQt desktop</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">lxqt-common</packagereq>
-      <!-- specify this because otherwise xfce4-notifyd wins -->
-      <packagereq type="default">notification-daemon</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>critical-path-lxde</id>
     <_name>Critical Path (LXDE)</_name>
@@ -817,6 +805,18 @@
       <packagereq type="default">notification-daemon</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>critical-path-lxqt</id>
+    <_name>Critical Path (LXQt)</_name>
+    <_description>A set of packages that provide the Critical Path functionality for the LXQt desktop</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">lxqt-common</packagereq>
+      <!-- specify this because otherwise xfce4-notifyd wins -->
+      <packagereq type="default">notification-daemon</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>critical-path-xfce</id>
     <_name>Critical Path (Xfce)</_name>
@@ -862,12 +862,9 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq type="conditional" requires="blender">LuxRender-blender</packagereq>
-      <packagereq type="conditional" requires="blender">YafaRay-blender</packagereq>
-      <packagereq type="conditional" requires="digikam">kipi-plugins</packagereq>
       <packagereq type="conditional" requires="gimp">gimp-data-extras</packagereq>
-      <packagereq type="conditional" requires="gimp">gimp-dds</packagereq>
       <packagereq type="conditional" requires="gimp">gimp-dbp</packagereq>
+      <packagereq type="conditional" requires="gimp">gimp-dds</packagereq>
       <packagereq type="conditional" requires="gimp">gimp-elsamuko</packagereq>
       <packagereq type="conditional" requires="gimp">gimp-fourier-plugin</packagereq>
       <packagereq type="conditional" requires="gimp">gimp-gap</packagereq>
@@ -875,16 +872,19 @@
       <packagereq type="conditional" requires="gimp">gimp-help-browser</packagereq>
       <packagereq type="conditional" requires="gimp">gimp-high-pass-filter</packagereq>
       <packagereq type="conditional" requires="gimp">gimp-lqr-plugin</packagereq>
-      <packagereq type="conditional" requires="gimp">gimp-paint-studio</packagereq>
       <packagereq type="conditional" requires="gimp">gimp-normalmap</packagereq>
+      <packagereq type="conditional" requires="gimp">gimp-paint-studio</packagereq>
       <packagereq type="conditional" requires="gimp">gimp-resynthesizer</packagereq>
       <packagereq type="conditional" requires="gimp">gimp-separate+</packagereq>
       <packagereq type="conditional" requires="gimp">gimp-wavelet-denoise-plugin</packagereq>
       <packagereq type="conditional" requires="gimp">gmic-gimp</packagereq>
-      <packagereq type="conditional" requires="gimp">sane-backends-drivers-scanners</packagereq>
-      <packagereq type="conditional" requires="gimp">xsane-gimp</packagereq>
       <packagereq type="conditional" requires="inkscape">inkscape-sozi</packagereq>
       <packagereq type="conditional" requires="inkscape">inkscape-table</packagereq>
+      <packagereq type="conditional" requires="digikam">kipi-plugins</packagereq>
+      <packagereq type="conditional" requires="blender">LuxRender-blender</packagereq>
+      <packagereq type="conditional" requires="gimp">sane-backends-drivers-scanners</packagereq>
+      <packagereq type="conditional" requires="gimp">xsane-gimp</packagereq>
+      <packagereq type="conditional" requires="blender">YafaRay-blender</packagereq>
       <packagereq type="default">aajohan-comfortaa-fonts</packagereq>
       <packagereq type="default">adobe-source-sans-pro-fonts</packagereq>
       <packagereq type="default">audacity</packagereq>
@@ -898,18 +898,18 @@
       <packagereq type="default">fontforge</packagereq>
       <packagereq type="default">gimp</packagereq>
       <packagereq type="default">gpick</packagereq>
-      <packagereq type="default">hugin</packagereq>
       <packagereq type="default">GraphicsMagick</packagereq>
+      <packagereq type="default">hugin</packagereq>
       <packagereq type="default">inkscape</packagereq>
       <packagereq type="default">lato-fonts</packagereq>
       <packagereq type="default">mypaint</packagereq>
       <packagereq type="default">nautilus-image-converter</packagereq>
-      <packagereq type="default">optipng</packagereq>
       <packagereq type="default">open-sans-fonts</packagereq>
+      <packagereq type="default">optipng</packagereq>
       <packagereq type="default">overpass-fonts</packagereq>
-      <packagereq type="default">phatch</packagereq>
       <packagereq type="default">pdfmod</packagereq>
       <packagereq type="default">pdfshuffler</packagereq>
+      <packagereq type="default">phatch</packagereq>
       <packagereq type="default">pitivi</packagereq>
       <packagereq type="default">screenruler</packagereq>
       <packagereq type="default">scribus</packagereq>
@@ -920,8 +920,8 @@
       <packagereq type="optional">calligra-krita</packagereq>
       <packagereq type="optional">cinepaint</packagereq>
       <packagereq type="optional">digikam</packagereq>
-      <packagereq type="optional">gthumb</packagereq>
       <packagereq type="optional">GREYCstoration</packagereq>
+      <packagereq type="optional">gthumb</packagereq>
       <packagereq type="optional">ImageMagick</packagereq>
       <packagereq type="optional">LuxRender</packagereq>
       <packagereq type="optional">meshlab</packagereq>
@@ -2047,12 +2047,12 @@
       <packagereq type="optional">nafees-riqa-fonts</packagereq>
       <packagereq type="optional">nafees-tehreer-naskh-fonts</packagereq>
       <packagereq type="optional">nafees-web-naskh-fonts</packagereq>
-      <packagereq type="optional">navilu-fonts</packagereq>
       <packagereq type="optional">naver-nanum-barun-gothic-fonts</packagereq>
       <packagereq type="optional">naver-nanum-brush-fonts</packagereq>
-      <packagereq type="optional">nhn-nanum-gothic-coding-fonts</packagereq>
       <packagereq type="optional">naver-nanum-myeongjo-fonts</packagereq>
       <packagereq type="optional">naver-nanum-pen-fonts</packagereq>
+      <packagereq type="optional">navilu-fonts</packagereq>
+      <packagereq type="optional">nhn-nanum-gothic-coding-fonts</packagereq>
       <packagereq type="optional">ns-bola-fonts</packagereq>
       <packagereq type="optional">ns-tiza-chalk-fonts</packagereq>
       <packagereq type="optional">oflb-asana-math-fonts</packagereq>
@@ -2071,10 +2071,10 @@
       <packagereq type="optional">paktype-ajrak-fonts</packagereq>
       <packagereq type="optional">paktype-naqsh-fonts</packagereq>
       <packagereq type="optional">paktype-tehreer-fonts</packagereq>
-      <packagereq type="optional">paratype-pt-sans-caption-fonts</packagereq>
-      <packagereq type="optional">paratype-pt-serif-fonts</packagereq>
-      <packagereq type="optional">paratype-pt-serif-caption-fonts</packagereq>
       <packagereq type="optional">paratype-pt-mono-fonts</packagereq>
+      <packagereq type="optional">paratype-pt-sans-caption-fonts</packagereq>
+      <packagereq type="optional">paratype-pt-serif-caption-fonts</packagereq>
+      <packagereq type="optional">paratype-pt-serif-fonts</packagereq>
       <packagereq type="optional">pothana2000-fonts</packagereq>
       <packagereq type="optional">saab-fonts</packagereq>
       <packagereq type="optional">samyak-devanagari-fonts</packagereq>
@@ -3528,9 +3528,9 @@
       <packagereq>sni-qt</packagereq>
       <packagereq>xsettings-kde</packagereq>
       <packagereq>xterm</packagereq>
-      <packagereq type="conditional" requires="at-spi2-core">qt-at-spi</packagereq>
       <packagereq type="conditional" requires="libreoffice-core">libreoffice-kde</packagereq>
       <packagereq type="conditional" requires="pinentry">pinentry-qt</packagereq>
+      <packagereq type="conditional" requires="at-spi2-core">qt-at-spi</packagereq>
       <packagereq type="conditional" requires="qt5-style-oxygen">qt5-qtbase-gui</packagereq>
       <packagereq type="conditional" requires="pam_kwallet">socat</packagereq>
     </packagelist>
@@ -4038,6 +4038,32 @@
       <packagereq>yumex</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>lxde-media</id>
+    <_name>Multimedia support for LXDE</_name>
+    <_description>Multimedia support for LXDE</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>asunder</packagereq>
+      <packagereq>gnomebaker</packagereq>
+      <packagereq>lxmusic</packagereq>
+      <packagereq>pavucontrol</packagereq>
+      <packagereq>pnmixer</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>lxde-office</id>
+    <_name>LXDE Office</_name>
+    <_description>Office suite for LXDE</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>abiword</packagereq>
+      <packagereq>gnumeric</packagereq>
+      <packagereq>osmo</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>lxqt-apps</id>
     <_name>Applications for the LXQt Desktop</_name>
@@ -4055,51 +4081,37 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq>oxygen-gtk2-theme</packagereq>
       <packagereq>fedora-icon-theme</packagereq>
       <packagereq>firewall-config</packagereq>
       <packagereq>initial-setup-gui</packagereq>
-      <packagereq>sddm</packagereq>
-      <packagereq>lxqt-common</packagereq>
-      <packagereq>lxqt-runner</packagereq>
-      <packagereq>lxqt-qtplugin</packagereq>
-      <packagereq>lxqt-powermanagement</packagereq>
-      <packagereq>lxqt-panel</packagereq>
-      <packagereq>lxqt-openssh-askpass</packagereq>
-      <packagereq>lxqt-config</packagereq>
-      <packagereq>lxqt-session</packagereq>
-      <packagereq>lxqt-policykit</packagereq>
       <packagereq>lxqt-about</packagereq>
+      <packagereq>lxqt-common</packagereq>
+      <packagereq>lxqt-config</packagereq>
       <packagereq>lxqt-globalkeys</packagereq>
       <packagereq>lxqt-notificationd</packagereq>
-      <packagereq>qterminal</packagereq>
+      <packagereq>lxqt-openssh-askpass</packagereq>
-      <packagereq>qupzilla</packagereq>
+      <packagereq>lxqt-panel</packagereq>
+      <packagereq>lxqt-policykit</packagereq>
+      <packagereq>lxqt-powermanagement</packagereq>
+      <packagereq>lxqt-qtplugin</packagereq>
+      <packagereq>lxqt-runner</packagereq>
+      <packagereq>lxqt-session</packagereq>
       <packagereq>network-manager-applet</packagereq>
       <packagereq>nm-connection-editor</packagereq>
       <packagereq>notification-daemon</packagereq>
       <packagereq>obconf</packagereq>
       <packagereq>openbox</packagereq>
+      <packagereq>oxygen-gtk2-theme</packagereq>
       <packagereq>pcmanfm-qt</packagereq>
       <packagereq>perl-File-MimeInfo</packagereq>
+      <packagereq>qterminal</packagereq>
+      <packagereq>qupzilla</packagereq>
+      <packagereq>sddm</packagereq>
       <packagereq>upower</packagereq>
       <packagereq>xarchiver</packagereq>
       <packagereq>xdg-user-dirs</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>lxde-media</id>
-    <_name>Multimedia support for LXDE</_name>
-    <_description>Multimedia support for LXDE</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>asunder</packagereq>
-      <packagereq>gnomebaker</packagereq>
-      <packagereq>lxmusic</packagereq>
-      <packagereq>pavucontrol</packagereq>
-      <packagereq>pnmixer</packagereq>
-    </packagelist>
-</group>
   <group>
     <id>lxqt-media</id>
     <_name>Multimedia support for LXQt</_name>
@@ -4111,19 +4123,6 @@
       <packagereq>pnmixer</packagereq>
     </packagelist>
   </group>
-
-  <group>
-    <id>lxde-office</id>
-    <_name>LXDE Office</_name>
-    <_description>Office suite for LXDE</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>abiword</packagereq>
-      <packagereq>gnumeric</packagereq>
-      <packagereq>osmo</packagereq>
-    </packagelist>
-</group>
   <group>
     <id>lxqt-office</id>
     <_name>LXQt Office</_name>
@@ -4131,12 +4130,11 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq>libreoffice-writer</packagereq>
       <packagereq>libreoffice-calc</packagereq>
       <packagereq>libreoffice-impress</packagereq>
+      <packagereq>libreoffice-writer</packagereq>
     </packagelist>
   </group>
-
   <group>
     <id>mail-server</id>
     <_name>Mail Server</_name>
@@ -4307,9 +4305,9 @@
     <packagelist>
       <packagereq>abrt-desktop</packagereq>
       <packagereq>abrt-java-connector</packagereq>
-      <packagereq>audacious</packagereq>
       <packagereq>atril</packagereq>
       <packagereq>atril-caja</packagereq>
+      <packagereq>audacious</packagereq>
       <packagereq>caja</packagereq>
       <packagereq>caja-image-converter</packagereq>
       <packagereq>caja-open-terminal</packagereq>
@@ -4317,17 +4315,17 @@
       <packagereq>claws-mail</packagereq>
       <packagereq>dconf</packagereq>
       <packagereq>dconf-editor</packagereq>
-      <packagereq>f21-backgrounds-base</packagereq>
       <packagereq>engrampa</packagereq>
       <packagereq>eom</packagereq>
+      <packagereq>f21-backgrounds-base</packagereq>
       <packagereq>filezilla</packagereq>
       <packagereq>firefox</packagereq>
       <packagereq>firewall-config</packagereq>
       <packagereq>fros-recordmydesktop</packagereq>
       <packagereq>gnote</packagereq>
       <packagereq>gparted</packagereq>
-      <packagereq>gucharmap</packagereq>
       <packagereq>gtk2-engines</packagereq>
+      <packagereq>gucharmap</packagereq>
       <packagereq>gvfs</packagereq>
       <packagereq>gvfs-afc</packagereq>
       <packagereq>gvfs-archive</packagereq>
@@ -5144,10 +5142,10 @@
       <packagereq type="optional">fonts-KOI8-R-100dpi</packagereq>
       <packagereq type="optional">fonts-KOI8-R-75dpi</packagereq>
       <packagereq type="optional">ibus-table-cyrillic</packagereq>
-      <packagereq type="optional">paratype-pt-sans-caption-fonts</packagereq>
-      <packagereq type="optional">paratype-pt-serif-fonts</packagereq>
-      <packagereq type="optional">paratype-pt-serif-caption-fonts</packagereq>
       <packagereq type="optional">paratype-pt-mono-fonts</packagereq>
+      <packagereq type="optional">paratype-pt-sans-caption-fonts</packagereq>
+      <packagereq type="optional">paratype-pt-serif-caption-fonts</packagereq>
+      <packagereq type="optional">paratype-pt-serif-fonts</packagereq>
       <packagereq type="optional">scim-tables-russian</packagereq>
       <packagereq type="optional">stardict-dic-ru</packagereq>
       <packagereq type="optional">xorg-x11-fonts-cyrillic</packagereq>
@@ -6417,8 +6415,8 @@
       <packagereq>gnome-initial-setup</packagereq>
       <packagereq>gnome-packagekit</packagereq>
       <packagereq>gnome-screenshot</packagereq>
-      <packagereq>gnome-session-xsession</packagereq>
       <packagereq>gnome-session-wayland-session</packagereq>
+      <packagereq>gnome-session-xsession</packagereq>
       <packagereq>gnome-settings-daemon</packagereq>
       <packagereq>gnome-shell</packagereq>
       <packagereq>gnome-shell-extension-background-logo</packagereq>
@@ -6844,36 +6842,6 @@
       <packagereq type="default">culmus-yehuda-clm-fonts</packagereq>
     </packagelist>
   </group>
-  <environment>
-    <!-- Intended to allow interactive installation of components that will eventually be
-         used in a cloud image. -->
-    <id>cloud-server-environment</id>
-    <_name>Fedora Cloud Server</_name>
-    <_description>A server install with components needed to run in a cloud environment.</_description>
-    <display_order>3</display_order>
-    <grouplist>
-      <groupid>cloud-server</groupid>
-      <groupid>core</groupid>
-    </grouplist>
-    <optionlist>
-      <groupid>standard</groupid>
-      <groupid>headless-management</groupid>
-      <groupid>dogtag</groupid>
-      <groupid>directory-server</groupid>
-      <groupid>dns-server</groupid>
-      <groupid>freeipa-server</groupid>
-      <groupid>ftp-server</groupid>
-      <groupid>guest-agents</groupid>
-      <groupid>ha</groupid>
-      <groupid>load-balancer</groupid>
-      <groupid>mail-server</groupid>
-      <groupid>mysql</groupid>
-      <groupid>network-server</groupid>
-      <groupid>smb-server</groupid>
-      <groupid>sql-server</groupid>
-      <groupid>web-server</groupid>
-    </optionlist>
-  </environment>
   <environment>
     <!-- Intended only for the Fedora Server product; other products will not
          show this because they don’t include the fedora-release-server
@@ -7053,7 +7021,6 @@
       <groupid>cloud-management</groupid>
     </optionlist>
   </environment>
-
   <environment>
     <id>cinnamon-desktop-environment</id>
     <_name>Cinnamon Desktop</_name>
@@ -7131,6 +7098,36 @@
       <groupid>sugar-apps</groupid>
     </optionlist>
   </environment>
+  <environment>
+    <!-- Intended to allow interactive installation of components that will eventually be
+         used in a cloud image. -->
+    <id>cloud-server-environment</id>
+    <_name>Fedora Cloud Server</_name>
+    <_description>A server install with components needed to run in a cloud environment.</_description>
+    <display_order>3</display_order>
+    <grouplist>
+      <groupid>cloud-server</groupid>
+      <groupid>core</groupid>
+    </grouplist>
+    <optionlist>
+      <groupid>standard</groupid>
+      <groupid>headless-management</groupid>
+      <groupid>dogtag</groupid>
+      <groupid>directory-server</groupid>
+      <groupid>dns-server</groupid>
+      <groupid>freeipa-server</groupid>
+      <groupid>ftp-server</groupid>
+      <groupid>guest-agents</groupid>
+      <groupid>ha</groupid>
+      <groupid>load-balancer</groupid>
+      <groupid>mail-server</groupid>
+      <groupid>mysql</groupid>
+      <groupid>network-server</groupid>
+      <groupid>smb-server</groupid>
+      <groupid>sql-server</groupid>
+      <groupid>web-server</groupid>
+    </optionlist>
+  </environment>
   <environment>
     <id>developer-workstation-environment</id>
     <_name>Development and Creative Workstation</_name>
@@ -7370,7 +7367,6 @@
       <groupid>lxqt-office</groupid>
     </grouplist>
   </category>
-
   <category>
     <id>cinnamon-desktop-environment</id>
     <_name>Cinnamon Desktop</_name>

comps-f22.xml.in

@@ -527,8 +527,8 @@
       <packagereq>cinnamon-screensaver</packagereq>
       <packagereq>eog</packagereq>
       <packagereq>evince</packagereq>
-      <packagereq>fedora-icon-theme</packagereq>
       <packagereq>f21-backgrounds-base</packagereq>
+      <packagereq>fedora-icon-theme</packagereq>
       <packagereq>firefox</packagereq>
       <packagereq>firewall-config</packagereq>
       <packagereq>fros-recordmydesktop</packagereq>
@@ -795,18 +795,6 @@
       <packagereq type="mandatory">sddm</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>critical-path-lxqt</id>
-    <_name>Critical Path (LXQt)</_name>
-    <_description>A set of packages that provide the Critical Path functionality for the LXQt desktop</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">lxqt-common</packagereq>
-      <!-- specify this because otherwise xfce4-notifyd wins -->
-      <packagereq type="default">notification-daemon</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>critical-path-lxde</id>
     <_name>Critical Path (LXDE)</_name>
@@ -819,7 +807,18 @@
       <packagereq type="default">notification-daemon</packagereq>
     </packagelist>
   </group>
-
+  <group>
+    <id>critical-path-lxqt</id>
+    <_name>Critical Path (LXQt)</_name>
+    <_description>A set of packages that provide the Critical Path functionality for the LXQt desktop</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">lxqt-common</packagereq>
+      <!-- specify this because otherwise xfce4-notifyd wins -->
+      <packagereq type="default">notification-daemon</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>critical-path-xfce</id>
     <_name>Critical Path (Xfce)</_name>
@@ -865,12 +864,9 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq type="conditional" requires="blender">LuxRender-blender</packagereq>
-      <packagereq type="conditional" requires="blender">YafaRay-blender</packagereq>
-      <packagereq type="conditional" requires="digikam">kipi-plugins</packagereq>
       <packagereq type="conditional" requires="gimp">gimp-data-extras</packagereq>
-      <packagereq type="conditional" requires="gimp">gimp-dds</packagereq>
       <packagereq type="conditional" requires="gimp">gimp-dbp</packagereq>
+      <packagereq type="conditional" requires="gimp">gimp-dds</packagereq>
       <packagereq type="conditional" requires="gimp">gimp-elsamuko</packagereq>
       <packagereq type="conditional" requires="gimp">gimp-fourier-plugin</packagereq>
       <packagereq type="conditional" requires="gimp">gimp-gap</packagereq>
@@ -878,16 +874,19 @@
       <packagereq type="conditional" requires="gimp">gimp-help-browser</packagereq>
       <packagereq type="conditional" requires="gimp">gimp-high-pass-filter</packagereq>
       <packagereq type="conditional" requires="gimp">gimp-lqr-plugin</packagereq>
-      <packagereq type="conditional" requires="gimp">gimp-paint-studio</packagereq>
       <packagereq type="conditional" requires="gimp">gimp-normalmap</packagereq>
+      <packagereq type="conditional" requires="gimp">gimp-paint-studio</packagereq>
       <packagereq type="conditional" requires="gimp">gimp-resynthesizer</packagereq>
       <packagereq type="conditional" requires="gimp">gimp-separate+</packagereq>
       <packagereq type="conditional" requires="gimp">gimp-wavelet-denoise-plugin</packagereq>
       <packagereq type="conditional" requires="gimp">gmic-gimp</packagereq>
-      <packagereq type="conditional" requires="gimp">sane-backends-drivers-scanners</packagereq>
-      <packagereq type="conditional" requires="gimp">xsane-gimp</packagereq>
       <packagereq type="conditional" requires="inkscape">inkscape-sozi</packagereq>
       <packagereq type="conditional" requires="inkscape">inkscape-table</packagereq>
+      <packagereq type="conditional" requires="digikam">kipi-plugins</packagereq>
+      <packagereq type="conditional" requires="blender">LuxRender-blender</packagereq>
+      <packagereq type="conditional" requires="gimp">sane-backends-drivers-scanners</packagereq>
+      <packagereq type="conditional" requires="gimp">xsane-gimp</packagereq>
+      <packagereq type="conditional" requires="blender">YafaRay-blender</packagereq>
       <packagereq type="default">aajohan-comfortaa-fonts</packagereq>
       <packagereq type="default">adobe-source-sans-pro-fonts</packagereq>
       <packagereq type="default">audacity</packagereq>
@@ -901,18 +900,18 @@
       <packagereq type="default">fontforge</packagereq>
       <packagereq type="default">gimp</packagereq>
       <packagereq type="default">gpick</packagereq>
-      <packagereq type="default">hugin</packagereq>
       <packagereq type="default">GraphicsMagick</packagereq>
+      <packagereq type="default">hugin</packagereq>
       <packagereq type="default">inkscape</packagereq>
       <packagereq type="default">lato-fonts</packagereq>
       <packagereq type="default">mypaint</packagereq>
       <packagereq type="default">nautilus-image-converter</packagereq>
-      <packagereq type="default">optipng</packagereq>
       <packagereq type="default">open-sans-fonts</packagereq>
+      <packagereq type="default">optipng</packagereq>
       <packagereq type="default">overpass-fonts</packagereq>
-      <packagereq type="default">phatch</packagereq>
       <packagereq type="default">pdfmod</packagereq>
       <packagereq type="default">pdfshuffler</packagereq>
+      <packagereq type="default">phatch</packagereq>
       <packagereq type="default">pitivi</packagereq>
       <packagereq type="default">screenruler</packagereq>
       <packagereq type="default">scribus</packagereq>
@@ -923,8 +922,8 @@
       <packagereq type="optional">calligra-krita</packagereq>
       <packagereq type="optional">cinepaint</packagereq>
       <packagereq type="optional">digikam</packagereq>
-      <packagereq type="optional">gthumb</packagereq>
       <packagereq type="optional">GREYCstoration</packagereq>
+      <packagereq type="optional">gthumb</packagereq>
       <packagereq type="optional">ImageMagick</packagereq>
       <packagereq type="optional">LuxRender</packagereq>
       <packagereq type="optional">meshlab</packagereq>
@@ -2049,12 +2048,12 @@
       <packagereq type="optional">nafees-riqa-fonts</packagereq>
       <packagereq type="optional">nafees-tehreer-naskh-fonts</packagereq>
       <packagereq type="optional">nafees-web-naskh-fonts</packagereq>
-      <packagereq type="optional">navilu-fonts</packagereq>
       <packagereq type="optional">naver-nanum-barun-gothic-fonts</packagereq>
       <packagereq type="optional">naver-nanum-brush-fonts</packagereq>
-      <packagereq type="optional">nhn-nanum-gothic-coding-fonts</packagereq>
       <packagereq type="optional">naver-nanum-myeongjo-fonts</packagereq>
       <packagereq type="optional">naver-nanum-pen-fonts</packagereq>
+      <packagereq type="optional">navilu-fonts</packagereq>
+      <packagereq type="optional">nhn-nanum-gothic-coding-fonts</packagereq>
       <packagereq type="optional">ns-bola-fonts</packagereq>
       <packagereq type="optional">ns-tiza-chalk-fonts</packagereq>
       <packagereq type="optional">oflb-asana-math-fonts</packagereq>
@@ -2073,10 +2072,10 @@
       <packagereq type="optional">paktype-ajrak-fonts</packagereq>
       <packagereq type="optional">paktype-naqsh-fonts</packagereq>
       <packagereq type="optional">paktype-tehreer-fonts</packagereq>
-      <packagereq type="optional">paratype-pt-sans-caption-fonts</packagereq>
-      <packagereq type="optional">paratype-pt-serif-fonts</packagereq>
-      <packagereq type="optional">paratype-pt-serif-caption-fonts</packagereq>
       <packagereq type="optional">paratype-pt-mono-fonts</packagereq>
+      <packagereq type="optional">paratype-pt-sans-caption-fonts</packagereq>
+      <packagereq type="optional">paratype-pt-serif-caption-fonts</packagereq>
+      <packagereq type="optional">paratype-pt-serif-fonts</packagereq>
       <packagereq type="optional">pothana2000-fonts</packagereq>
       <packagereq type="optional">saab-fonts</packagereq>
       <packagereq type="optional">samyak-devanagari-fonts</packagereq>
@@ -3544,9 +3543,9 @@
       <packagereq>sni-qt</packagereq>
       <packagereq>xorg-x11-drv-libinput</packagereq>
       <packagereq>xsettings-kde</packagereq>
-      <packagereq type="conditional" requires="at-spi2-core">qt-at-spi</packagereq>
       <packagereq type="conditional" requires="libreoffice-core">libreoffice-kde</packagereq>
       <packagereq type="conditional" requires="pinentry">pinentry-qt</packagereq>
+      <packagereq type="conditional" requires="at-spi2-core">qt-at-spi</packagereq>
       <packagereq type="conditional" requires="pam_kwallet">socat</packagereq>
     </packagelist>
   </group>
@@ -4052,54 +4051,6 @@
       <packagereq>yumex</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>lxqt-apps</id>
-    <_name>Applications for the LXQt Desktop</_name>
-    <_description>A set of commonly used applications for the LXQt Desktop</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>transmission-qt</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>lxqt-desktop</id>
-    <_name>LXQt</_name>
-    <_description>LXQt is a lightweight X11 desktop environment designed for computers with low hardware specifications like netbooks, mobile devices or older computers.</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>oxygen-gtk2-theme</packagereq>
-      <packagereq>fedora-icon-theme</packagereq>
-      <packagereq>firewall-config</packagereq>
-      <packagereq>initial-setup-gui</packagereq>
-      <packagereq>sddm</packagereq>
-      <packagereq>lxqt-common</packagereq>
-      <packagereq>lxqt-runner</packagereq>
-      <packagereq>lxqt-qtplugin</packagereq>
-      <packagereq>lxqt-powermanagement</packagereq>
-      <packagereq>lxqt-panel</packagereq>
-      <packagereq>lxqt-openssh-askpass</packagereq>
-      <packagereq>lxqt-config</packagereq>
-      <packagereq>lxqt-session</packagereq>
-      <packagereq>lxqt-policykit</packagereq>
-      <packagereq>lxqt-about</packagereq>
-      <packagereq>lxqt-globalkeys</packagereq>
-      <packagereq>lxqt-notificationd</packagereq>
-      <packagereq>qterminal</packagereq>
-      <packagereq>qupzilla</packagereq>
-      <packagereq>network-manager-applet</packagereq>
-      <packagereq>nm-connection-editor</packagereq>
-      <packagereq>notification-daemon</packagereq>
-      <packagereq>obconf</packagereq>
-      <packagereq>openbox</packagereq>
-      <packagereq>pcmanfm-qt</packagereq>
-      <packagereq>perl-File-MimeInfo</packagereq>
-      <packagereq>upower</packagereq>
-      <packagereq>xarchiver</packagereq>
-      <packagereq>xdg-user-dirs</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>lxde-media</id>
     <_name>Multimedia support for LXDE</_name>
@@ -4114,17 +4065,6 @@
       <packagereq>pnmixer</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>lxqt-media</id>
-    <_name>Multimedia support for LXQt</_name>
-    <_description>Multimedia support for LXQt</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>pavucontrol</packagereq>
-      <packagereq>pnmixer</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>lxde-office</id>
     <_name>LXDE Office</_name>
@@ -4137,6 +4077,65 @@
       <packagereq>osmo</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>lxqt-apps</id>
+    <_name>Applications for the LXQt Desktop</_name>
+    <_description>A set of commonly used applications for the LXQt Desktop</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>transmission-qt</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>lxqt-desktop</id>
+    <_name>LXQt</_name>
+    <_description>LXQt is a lightweight X11 desktop environment designed for computers with low hardware specifications like netbooks, mobile devices or older computers.</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>fedora-icon-theme</packagereq>
+      <packagereq>firewall-config</packagereq>
+      <packagereq>initial-setup-gui</packagereq>
+      <packagereq>lxqt-about</packagereq>
+      <packagereq>lxqt-common</packagereq>
+      <packagereq>lxqt-config</packagereq>
+      <packagereq>lxqt-globalkeys</packagereq>
+      <packagereq>lxqt-notificationd</packagereq>
+      <packagereq>lxqt-openssh-askpass</packagereq>
+      <packagereq>lxqt-panel</packagereq>
+      <packagereq>lxqt-policykit</packagereq>
+      <packagereq>lxqt-powermanagement</packagereq>
+      <packagereq>lxqt-qtplugin</packagereq>
+      <packagereq>lxqt-runner</packagereq>
+      <packagereq>lxqt-session</packagereq>
+      <packagereq>network-manager-applet</packagereq>
+      <packagereq>nm-connection-editor</packagereq>
+      <packagereq>notification-daemon</packagereq>
+      <packagereq>obconf</packagereq>
+      <packagereq>openbox</packagereq>
+      <packagereq>oxygen-gtk2-theme</packagereq>
+      <packagereq>pcmanfm-qt</packagereq>
+      <packagereq>perl-File-MimeInfo</packagereq>
+      <packagereq>qterminal</packagereq>
+      <packagereq>qupzilla</packagereq>
+      <packagereq>sddm</packagereq>
+      <packagereq>upower</packagereq>
+      <packagereq>xarchiver</packagereq>
+      <packagereq>xdg-user-dirs</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>lxqt-media</id>
+    <_name>Multimedia support for LXQt</_name>
+    <_description>Multimedia support for LXQt</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>pavucontrol</packagereq>
+      <packagereq>pnmixer</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>lxqt-office</id>
     <_name>LXQt Office</_name>
@@ -4144,9 +4143,9 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq>libreoffice-writer</packagereq>
       <packagereq>libreoffice-calc</packagereq>
       <packagereq>libreoffice-impress</packagereq>
+      <packagereq>libreoffice-writer</packagereq>
     </packagelist>
   </group>
   <group>
@@ -4319,9 +4318,9 @@
     <packagelist>
       <packagereq>abrt-desktop</packagereq>
       <packagereq>abrt-java-connector</packagereq>
-      <packagereq>audacious</packagereq>
       <packagereq>atril</packagereq>
       <packagereq>atril-caja</packagereq>
+      <packagereq>audacious</packagereq>
       <packagereq>caja</packagereq>
       <packagereq>caja-image-converter</packagereq>
       <packagereq>caja-open-terminal</packagereq>
@@ -4330,17 +4329,17 @@
       <packagereq>claws-mail</packagereq>
       <packagereq>dconf</packagereq>
       <packagereq>dconf-editor</packagereq>
-      <packagereq>f22-backgrounds-base</packagereq>
       <packagereq>engrampa</packagereq>
       <packagereq>eom</packagereq>
+      <packagereq>f22-backgrounds-base</packagereq>
       <packagereq>filezilla</packagereq>
       <packagereq>firefox</packagereq>
       <packagereq>firewall-config</packagereq>
       <packagereq>fros-recordmydesktop</packagereq>
       <packagereq>gnote</packagereq>
       <packagereq>gparted</packagereq>
-      <packagereq>gucharmap</packagereq>
       <packagereq>gtk2-engines</packagereq>
+      <packagereq>gucharmap</packagereq>
       <packagereq>gvfs</packagereq>
       <packagereq>gvfs-afc</packagereq>
       <packagereq>gvfs-archive</packagereq>
@@ -5159,10 +5158,10 @@
       <packagereq type="optional">fonts-KOI8-R-100dpi</packagereq>
       <packagereq type="optional">fonts-KOI8-R-75dpi</packagereq>
       <packagereq type="optional">ibus-table-cyrillic</packagereq>
-      <packagereq type="optional">paratype-pt-sans-caption-fonts</packagereq>
-      <packagereq type="optional">paratype-pt-serif-fonts</packagereq>
-      <packagereq type="optional">paratype-pt-serif-caption-fonts</packagereq>
       <packagereq type="optional">paratype-pt-mono-fonts</packagereq>
+      <packagereq type="optional">paratype-pt-sans-caption-fonts</packagereq>
+      <packagereq type="optional">paratype-pt-serif-caption-fonts</packagereq>
+      <packagereq type="optional">paratype-pt-serif-fonts</packagereq>
       <packagereq type="optional">scim-tables-russian</packagereq>
       <packagereq type="optional">stardict-dic-ru</packagereq>
       <packagereq type="optional">xorg-x11-fonts-cyrillic</packagereq>
@@ -5395,6 +5394,22 @@
       <packagereq type="optional">system-switch-mail-gnome</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>server-hardware-support</id>
+    <_name>Hardware Support for Server Systems</_name>
+    <_description>This group is a limited collection of tools for various hardware specific utilities.</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">lm_sensors</packagereq>
+      <packagereq type="default">openhpi</packagereq>
+      <packagereq type="default">smp_utils</packagereq>
+      <packagereq type="optional">firmware-addon-dell</packagereq>
+      <packagereq type="optional">hddtemp</packagereq>
+      <packagereq type="optional">hdparm</packagereq>
+      <packagereq type="optional">lsscsi</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>server-product</id>
     <_name>Fedora Server product core</_name>
@@ -5433,22 +5448,6 @@
       <packagereq type="optional">wqy-zenhei-fonts</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>server-hardware-support</id>
-    <_name>Hardware Support for Server Systems</_name>
-    <_description>This group is a limited collection of tools for various hardware specific utilities.</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="default">lm_sensors</packagereq>
-      <packagereq type="default">smp_utils</packagereq>
-      <packagereq type="default">openhpi</packagereq>
-      <packagereq type="optional">firmware-addon-dell</packagereq>
-      <packagereq type="optional">hddtemp</packagereq>
-      <packagereq type="optional">hdparm</packagereq>
-      <packagereq type="optional">lsscsi</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>sindhi-support</id>
     <_name>Sindhi Support</_name>
@@ -6448,8 +6447,8 @@
       <packagereq>gnome-getting-started-docs</packagereq>
       <packagereq>gnome-initial-setup</packagereq>
       <packagereq>gnome-screenshot</packagereq>
-      <packagereq>gnome-session-xsession</packagereq>
       <packagereq>gnome-session-wayland-session</packagereq>
+      <packagereq>gnome-session-xsession</packagereq>
       <packagereq>gnome-settings-daemon</packagereq>
       <packagereq>gnome-shell</packagereq>
       <packagereq>gnome-shell-extension-background-logo</packagereq>
@@ -6460,8 +6459,8 @@
       <packagereq>gnome-user-docs</packagereq>
       <packagereq>gnome-user-share</packagereq>
       <packagereq>gnome-weather</packagereq>
-      <packagereq>google-android-emoji-fonts</packagereq>
       <packagereq>gnupg2</packagereq>
+      <packagereq>google-android-emoji-fonts</packagereq>
       <packagereq>gucharmap</packagereq>
       <packagereq>gvfs-afc</packagereq>
       <packagereq>gvfs-afp</packagereq>
@@ -6871,74 +6870,17 @@
     </packagelist>
   </group>
   <environment>
-    <!-- Intended to allow interactive installation of components that will eventually be
+    <id>minimal-environment</id>
-         used in a cloud image. -->
+    <_name>Minimal Install</_name>
-    <id>cloud-server-environment</id>
+    <_description>Basic functionality.</_description>
-    <_name>Fedora Cloud Server</_name>
+    <display_order>1</display_order>
-    <_description>A server install with components needed to run in a cloud environment.</_description>
-    <display_order>3</display_order>
     <grouplist>
-      <groupid>cloud-server</groupid>
       <groupid>core</groupid>
+      <groupid>fedora-release-nonproduct</groupid>
     </grouplist>
     <optionlist>
       <groupid>standard</groupid>
-      <groupid>headless-management</groupid>
-      <groupid>dogtag</groupid>
-      <groupid>directory-server</groupid>
-      <groupid>dns-server</groupid>
-      <groupid>freeipa-server</groupid>
-      <groupid>ftp-server</groupid>
       <groupid>guest-agents</groupid>
-      <groupid>ha</groupid>
-      <groupid>load-balancer</groupid>
-      <groupid>mail-server</groupid>
-      <groupid>mysql</groupid>
-      <groupid>network-server</groupid>
-      <groupid>smb-server</groupid>
-      <groupid>sql-server</groupid>
-      <groupid>web-server</groupid>
-    </optionlist>
-  </environment>
-  <environment>
-    <!-- Intended only for the Fedora Server product; other products will not
-         show this because they don’t include the fedora-release-server
-         package.  Please keep this mostly in sync with
-         infrastructure-server-environment. -->
-    <id>server-product-environment</id>
-    <_name>Fedora Server</_name>
-    <!-- Should eventually say “with a web UI accessible right after installation”
-         or something else to differentiate from
-         infrastructure-server-environment. -->
-    <_description>An integrated, easier to manage server.</_description>
-    <display_order>2</display_order>
-    <grouplist>
-      <groupid>server-product</groupid>
-      <groupid>standard</groupid>
-      <groupid>core</groupid>
-      <groupid>server-hardware-support</groupid>
-      <groupid>headless-management</groupid>
-      <groupid>container-management</groupid>
-      <groupid>domain-client</groupid>
-    </grouplist>
-    <optionlist>
-      <groupid>dogtag</groupid>
-      <groupid>directory-server</groupid>
-      <groupid>dns-server</groupid>
-      <groupid>freeipa-server</groupid>
-      <groupid>ftp-server</groupid>
-      <groupid>guest-agents</groupid>
-      <groupid>ha</groupid>
-      <groupid>hardware-support</groupid>
-      <groupid>load-balancer</groupid>
-      <groupid>mail-server</groupid>
-      <groupid>mysql</groupid>
-      <groupid>network-server</groupid>
-      <groupid>printing</groupid>
-      <groupid>smb-server</groupid>
-      <groupid>sql-server</groupid>
-      <groupid>virtualization</groupid>
-      <groupid>web-server</groupid>
     </optionlist>
   </environment>
   <environment>
@@ -7002,6 +6944,47 @@
       <groupid>cloud-management</groupid>
     </optionlist>
   </environment>
+  <environment>
+    <!-- Intended only for the Fedora Server product; other products will not
+         show this because they don’t include the fedora-release-server
+         package.  Please keep this mostly in sync with
+         infrastructure-server-environment. -->
+    <id>server-product-environment</id>
+    <_name>Fedora Server</_name>
+    <!-- Should eventually say “with a web UI accessible right after installation”
+         or something else to differentiate from
+         infrastructure-server-environment. -->
+    <_description>An integrated, easier to manage server.</_description>
+    <display_order>2</display_order>
+    <grouplist>
+      <groupid>server-product</groupid>
+      <groupid>standard</groupid>
+      <groupid>core</groupid>
+      <groupid>server-hardware-support</groupid>
+      <groupid>headless-management</groupid>
+      <groupid>container-management</groupid>
+      <groupid>domain-client</groupid>
+    </grouplist>
+    <optionlist>
+      <groupid>dogtag</groupid>
+      <groupid>directory-server</groupid>
+      <groupid>dns-server</groupid>
+      <groupid>freeipa-server</groupid>
+      <groupid>ftp-server</groupid>
+      <groupid>guest-agents</groupid>
+      <groupid>ha</groupid>
+      <groupid>hardware-support</groupid>
+      <groupid>load-balancer</groupid>
+      <groupid>mail-server</groupid>
+      <groupid>mysql</groupid>
+      <groupid>network-server</groupid>
+      <groupid>printing</groupid>
+      <groupid>smb-server</groupid>
+      <groupid>sql-server</groupid>
+      <groupid>virtualization</groupid>
+      <groupid>web-server</groupid>
+    </optionlist>
+  </environment>
   <environment>
     <id>workstation-product-environment</id>
     <_name>Fedora Workstation</_name>
@@ -7078,7 +7061,6 @@
       <groupid>cloud-management</groupid>
     </optionlist>
   </environment>
-
   <environment>
     <id>cinnamon-desktop-environment</id>
     <_name>Cinnamon Desktop</_name>
@@ -7156,6 +7138,36 @@
       <groupid>sugar-apps</groupid>
     </optionlist>
   </environment>
+  <environment>
+    <!-- Intended to allow interactive installation of components that will eventually be
+         used in a cloud image. -->
+    <id>cloud-server-environment</id>
+    <_name>Fedora Cloud Server</_name>
+    <_description>A server install with components needed to run in a cloud environment.</_description>
+    <display_order>3</display_order>
+    <grouplist>
+      <groupid>cloud-server</groupid>
+      <groupid>core</groupid>
+    </grouplist>
+    <optionlist>
+      <groupid>standard</groupid>
+      <groupid>headless-management</groupid>
+      <groupid>dogtag</groupid>
+      <groupid>directory-server</groupid>
+      <groupid>dns-server</groupid>
+      <groupid>freeipa-server</groupid>
+      <groupid>ftp-server</groupid>
+      <groupid>guest-agents</groupid>
+      <groupid>ha</groupid>
+      <groupid>load-balancer</groupid>
+      <groupid>mail-server</groupid>
+      <groupid>mysql</groupid>
+      <groupid>network-server</groupid>
+      <groupid>smb-server</groupid>
+      <groupid>sql-server</groupid>
+      <groupid>web-server</groupid>
+    </optionlist>
+  </environment>
   <environment>
     <id>developer-workstation-environment</id>
     <_name>Development and Creative Workstation</_name>
@@ -7297,7 +7309,7 @@
       <groupid>kde-desktop</groupid>
       <groupid>legacy-fonts</groupid>
       <groupid>libreoffice</groupid>
-	  <groupid>lxde-desktop</groupid>
+      <groupid>lxde-desktop</groupid>
       <groupid>lxqt-desktop</groupid>
       <groupid>mate-desktop</groupid>
       <groupid>sugar-desktop</groupid>
@@ -7306,20 +7318,6 @@
       <groupid>xmonad-mate</groupid>
     </optionlist>
   </environment>
-  <environment>
-    <id>minimal-environment</id>
-    <_name>Minimal Install</_name>
-    <_description>Basic functionality.</_description>
-    <display_order>1</display_order>
-    <grouplist>
-      <groupid>core</groupid>
-      <groupid>fedora-release-nonproduct</groupid>
-    </grouplist>
-    <optionlist>
-      <groupid>standard</groupid>
-      <groupid>guest-agents</groupid>
-    </optionlist>
-  </environment>
   <category>
     <id>kde-desktop-environment</id>
     <_name>KDE Desktop</_name>
@@ -7395,7 +7393,6 @@
       <groupid>lxqt-office</groupid>
     </grouplist>
   </category>
-
   <category>
     <id>cinnamon-desktop-environment</id>
     <_name>Cinnamon Desktop</_name>

comps-f23.xml.in

@@ -1,26 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
 <comps>
-  <group>
-    <id>3d-printing</id>
-    <_name>3D Printing</_name>
-    <_description>3D printing software</_description>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <packagelist>
-      <packagereq type="default">blender</packagereq>
-      <packagereq type="default">cura</packagereq>
-      <packagereq type="default">meshlab</packagereq>
-      <packagereq type="default">openscad</packagereq>
-      <packagereq type="default">openscad-MCAD</packagereq>
-      <packagereq type="default">printrun</packagereq>
-      <packagereq type="default">RepetierHost</packagereq>
-      <packagereq type="default">repsnapper</packagereq>
-      <packagereq type="default">sfact</packagereq>
-      <packagereq type="default">skeinforge</packagereq>
-      <packagereq type="default">slic3r</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>admin-tools</id>
     <_name>Administration Tools</_name>
@@ -527,8 +507,8 @@
       <packagereq>cinnamon-screensaver</packagereq>
       <packagereq>eog</packagereq>
       <packagereq>evince</packagereq>
-      <packagereq>fedora-icon-theme</packagereq>
       <packagereq>f21-backgrounds-base</packagereq>
+      <packagereq>fedora-icon-theme</packagereq>
       <packagereq>firefox</packagereq>
       <packagereq>firewall-config</packagereq>
       <packagereq>fros-recordmydesktop</packagereq>
@@ -795,18 +775,6 @@
       <packagereq type="mandatory">sddm</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>critical-path-lxqt</id>
-    <_name>Critical Path (LXQt)</_name>
-    <_description>A set of packages that provide the Critical Path functionality for the LXQt desktop</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">lxqt-common</packagereq>
-      <!-- specify this because otherwise xfce4-notifyd wins -->
-      <packagereq type="default">notification-daemon</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>critical-path-lxde</id>
     <_name>Critical Path (LXDE)</_name>
@@ -819,6 +787,18 @@
       <packagereq type="default">notification-daemon</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>critical-path-lxqt</id>
+    <_name>Critical Path (LXQt)</_name>
+    <_description>A set of packages that provide the Critical Path functionality for the LXQt desktop</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">lxqt-common</packagereq>
+      <!-- specify this because otherwise xfce4-notifyd wins -->
+      <packagereq type="default">notification-daemon</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>critical-path-xfce</id>
     <_name>Critical Path (Xfce)</_name>
@@ -864,12 +844,9 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq type="conditional" requires="blender">LuxRender-blender</packagereq>
-      <packagereq type="conditional" requires="blender">YafaRay-blender</packagereq>
-      <packagereq type="conditional" requires="digikam">kipi-plugins</packagereq>
       <packagereq type="conditional" requires="gimp">gimp-data-extras</packagereq>
-      <packagereq type="conditional" requires="gimp">gimp-dds</packagereq>
       <packagereq type="conditional" requires="gimp">gimp-dbp</packagereq>
+      <packagereq type="conditional" requires="gimp">gimp-dds</packagereq>
       <packagereq type="conditional" requires="gimp">gimp-elsamuko</packagereq>
       <packagereq type="conditional" requires="gimp">gimp-fourier-plugin</packagereq>
       <packagereq type="conditional" requires="gimp">gimp-gap</packagereq>
@@ -877,16 +854,19 @@
       <packagereq type="conditional" requires="gimp">gimp-help-browser</packagereq>
       <packagereq type="conditional" requires="gimp">gimp-high-pass-filter</packagereq>
       <packagereq type="conditional" requires="gimp">gimp-lqr-plugin</packagereq>
-      <packagereq type="conditional" requires="gimp">gimp-paint-studio</packagereq>
       <packagereq type="conditional" requires="gimp">gimp-normalmap</packagereq>
+      <packagereq type="conditional" requires="gimp">gimp-paint-studio</packagereq>
       <packagereq type="conditional" requires="gimp">gimp-resynthesizer</packagereq>
       <packagereq type="conditional" requires="gimp">gimp-separate+</packagereq>
       <packagereq type="conditional" requires="gimp">gimp-wavelet-denoise-plugin</packagereq>
       <packagereq type="conditional" requires="gimp">gmic-gimp</packagereq>
-      <packagereq type="conditional" requires="gimp">sane-backends-drivers-scanners</packagereq>
-      <packagereq type="conditional" requires="gimp">xsane-gimp</packagereq>
       <packagereq type="conditional" requires="inkscape">inkscape-sozi</packagereq>
       <packagereq type="conditional" requires="inkscape">inkscape-table</packagereq>
+      <packagereq type="conditional" requires="digikam">kipi-plugins</packagereq>
+      <packagereq type="conditional" requires="blender">LuxRender-blender</packagereq>
+      <packagereq type="conditional" requires="gimp">sane-backends-drivers-scanners</packagereq>
+      <packagereq type="conditional" requires="gimp">xsane-gimp</packagereq>
+      <packagereq type="conditional" requires="blender">YafaRay-blender</packagereq>
       <packagereq type="default">aajohan-comfortaa-fonts</packagereq>
       <packagereq type="default">adobe-source-sans-pro-fonts</packagereq>
       <packagereq type="default">audacity</packagereq>
@@ -900,18 +880,18 @@
       <packagereq type="default">fontforge</packagereq>
       <packagereq type="default">gimp</packagereq>
       <packagereq type="default">gpick</packagereq>
-      <packagereq type="default">hugin</packagereq>
       <packagereq type="default">GraphicsMagick</packagereq>
+      <packagereq type="default">hugin</packagereq>
       <packagereq type="default">inkscape</packagereq>
       <packagereq type="default">lato-fonts</packagereq>
       <packagereq type="default">mypaint</packagereq>
       <packagereq type="default">nautilus-image-converter</packagereq>
-      <packagereq type="default">optipng</packagereq>
       <packagereq type="default">open-sans-fonts</packagereq>
+      <packagereq type="default">optipng</packagereq>
       <packagereq type="default">overpass-fonts</packagereq>
-      <packagereq type="default">phatch</packagereq>
       <packagereq type="default">pdfmod</packagereq>
       <packagereq type="default">pdfshuffler</packagereq>
+      <packagereq type="default">phatch</packagereq>
       <packagereq type="default">pitivi</packagereq>
       <packagereq type="default">screenruler</packagereq>
       <packagereq type="default">scribus</packagereq>
@@ -922,8 +902,8 @@
       <packagereq type="optional">calligra-krita</packagereq>
       <packagereq type="optional">cinepaint</packagereq>
       <packagereq type="optional">digikam</packagereq>
-      <packagereq type="optional">gthumb</packagereq>
       <packagereq type="optional">GREYCstoration</packagereq>
+      <packagereq type="optional">gthumb</packagereq>
       <packagereq type="optional">ImageMagick</packagereq>
       <packagereq type="optional">LuxRender</packagereq>
       <packagereq type="optional">meshlab</packagereq>
@@ -2048,12 +2028,12 @@
       <packagereq type="optional">nafees-riqa-fonts</packagereq>
       <packagereq type="optional">nafees-tehreer-naskh-fonts</packagereq>
       <packagereq type="optional">nafees-web-naskh-fonts</packagereq>
-      <packagereq type="optional">navilu-fonts</packagereq>
       <packagereq type="optional">naver-nanum-barun-gothic-fonts</packagereq>
       <packagereq type="optional">naver-nanum-brush-fonts</packagereq>
-      <packagereq type="optional">nhn-nanum-gothic-coding-fonts</packagereq>
       <packagereq type="optional">naver-nanum-myeongjo-fonts</packagereq>
       <packagereq type="optional">naver-nanum-pen-fonts</packagereq>
+      <packagereq type="optional">navilu-fonts</packagereq>
+      <packagereq type="optional">nhn-nanum-gothic-coding-fonts</packagereq>
       <packagereq type="optional">ns-bola-fonts</packagereq>
       <packagereq type="optional">ns-tiza-chalk-fonts</packagereq>
       <packagereq type="optional">oflb-asana-math-fonts</packagereq>
@@ -2072,10 +2052,10 @@
       <packagereq type="optional">paktype-ajrak-fonts</packagereq>
       <packagereq type="optional">paktype-naqsh-fonts</packagereq>
       <packagereq type="optional">paktype-tehreer-fonts</packagereq>
-      <packagereq type="optional">paratype-pt-sans-caption-fonts</packagereq>
-      <packagereq type="optional">paratype-pt-serif-fonts</packagereq>
-      <packagereq type="optional">paratype-pt-serif-caption-fonts</packagereq>
       <packagereq type="optional">paratype-pt-mono-fonts</packagereq>
+      <packagereq type="optional">paratype-pt-sans-caption-fonts</packagereq>
+      <packagereq type="optional">paratype-pt-serif-caption-fonts</packagereq>
+      <packagereq type="optional">paratype-pt-serif-fonts</packagereq>
       <packagereq type="optional">pothana2000-fonts</packagereq>
       <packagereq type="optional">saab-fonts</packagereq>
       <packagereq type="optional">samyak-devanagari-fonts</packagereq>
@@ -3543,9 +3523,9 @@
       <packagereq>sni-qt</packagereq>
       <packagereq>xorg-x11-drv-libinput</packagereq>
       <packagereq>xsettings-kde</packagereq>
-      <packagereq type="conditional" requires="at-spi2-core">qt-at-spi</packagereq>
       <packagereq type="conditional" requires="libreoffice-core">libreoffice-kde</packagereq>
       <packagereq type="conditional" requires="pinentry">pinentry-qt</packagereq>
+      <packagereq type="conditional" requires="at-spi2-core">qt-at-spi</packagereq>
       <packagereq type="conditional" requires="pam_kwallet">socat</packagereq>
     </packagelist>
   </group>
@@ -4051,54 +4031,6 @@
       <packagereq>yumex</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>lxqt-apps</id>
-    <_name>Applications for the LXQt Desktop</_name>
-    <_description>A set of commonly used applications for the LXQt Desktop</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>transmission-qt</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>lxqt-desktop</id>
-    <_name>LXQt</_name>
-    <_description>LXQt is a lightweight X11 desktop environment designed for computers with low hardware specifications like netbooks, mobile devices or older computers.</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>oxygen-gtk2-theme</packagereq>
-      <packagereq>fedora-icon-theme</packagereq>
-      <packagereq>firewall-config</packagereq>
-      <packagereq>initial-setup-gui</packagereq>
-      <packagereq>sddm</packagereq>
-      <packagereq>lxqt-common</packagereq>
-      <packagereq>lxqt-runner</packagereq>
-      <packagereq>lxqt-qtplugin</packagereq>
-      <packagereq>lxqt-powermanagement</packagereq>
-      <packagereq>lxqt-panel</packagereq>
-      <packagereq>lxqt-openssh-askpass</packagereq>
-      <packagereq>lxqt-config</packagereq>
-      <packagereq>lxqt-session</packagereq>
-      <packagereq>lxqt-policykit</packagereq>
-      <packagereq>lxqt-about</packagereq>
-      <packagereq>lxqt-globalkeys</packagereq>
-      <packagereq>lxqt-notificationd</packagereq>
-      <packagereq>qterminal</packagereq>
-      <packagereq>qupzilla</packagereq>
-      <packagereq>network-manager-applet</packagereq>
-      <packagereq>nm-connection-editor</packagereq>
-      <packagereq>notification-daemon</packagereq>
-      <packagereq>obconf</packagereq>
-      <packagereq>openbox</packagereq>
-      <packagereq>pcmanfm-qt</packagereq>
-      <packagereq>perl-File-MimeInfo</packagereq>
-      <packagereq>upower</packagereq>
-      <packagereq>xarchiver</packagereq>
-      <packagereq>xdg-user-dirs</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>lxde-media</id>
     <_name>Multimedia support for LXDE</_name>
@@ -4113,17 +4045,6 @@
       <packagereq>pnmixer</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>lxqt-media</id>
-    <_name>Multimedia support for LXQt</_name>
-    <_description>Multimedia support for LXQt</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>pavucontrol</packagereq>
-      <packagereq>pnmixer</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>lxde-office</id>
     <_name>LXDE Office</_name>
@@ -4136,6 +4057,65 @@
       <packagereq>osmo</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>lxqt-apps</id>
+    <_name>Applications for the LXQt Desktop</_name>
+    <_description>A set of commonly used applications for the LXQt Desktop</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>transmission-qt</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>lxqt-desktop</id>
+    <_name>LXQt</_name>
+    <_description>LXQt is a lightweight X11 desktop environment designed for computers with low hardware specifications like netbooks, mobile devices or older computers.</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>fedora-icon-theme</packagereq>
+      <packagereq>firewall-config</packagereq>
+      <packagereq>initial-setup-gui</packagereq>
+      <packagereq>lxqt-about</packagereq>
+      <packagereq>lxqt-common</packagereq>
+      <packagereq>lxqt-config</packagereq>
+      <packagereq>lxqt-globalkeys</packagereq>
+      <packagereq>lxqt-notificationd</packagereq>
+      <packagereq>lxqt-openssh-askpass</packagereq>
+      <packagereq>lxqt-panel</packagereq>
+      <packagereq>lxqt-policykit</packagereq>
+      <packagereq>lxqt-powermanagement</packagereq>
+      <packagereq>lxqt-qtplugin</packagereq>
+      <packagereq>lxqt-runner</packagereq>
+      <packagereq>lxqt-session</packagereq>
+      <packagereq>network-manager-applet</packagereq>
+      <packagereq>nm-connection-editor</packagereq>
+      <packagereq>notification-daemon</packagereq>
+      <packagereq>obconf</packagereq>
+      <packagereq>openbox</packagereq>
+      <packagereq>oxygen-gtk2-theme</packagereq>
+      <packagereq>pcmanfm-qt</packagereq>
+      <packagereq>perl-File-MimeInfo</packagereq>
+      <packagereq>qterminal</packagereq>
+      <packagereq>qupzilla</packagereq>
+      <packagereq>sddm</packagereq>
+      <packagereq>upower</packagereq>
+      <packagereq>xarchiver</packagereq>
+      <packagereq>xdg-user-dirs</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>lxqt-media</id>
+    <_name>Multimedia support for LXQt</_name>
+    <_description>Multimedia support for LXQt</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>pavucontrol</packagereq>
+      <packagereq>pnmixer</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>lxqt-office</id>
     <_name>LXQt Office</_name>
@@ -4143,9 +4123,9 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq>libreoffice-writer</packagereq>
       <packagereq>libreoffice-calc</packagereq>
       <packagereq>libreoffice-impress</packagereq>
+      <packagereq>libreoffice-writer</packagereq>
     </packagelist>
   </group>
   <group>
@@ -4318,9 +4298,9 @@
     <packagelist>
       <packagereq>abrt-desktop</packagereq>
       <packagereq>abrt-java-connector</packagereq>
-      <packagereq>audacious</packagereq>
       <packagereq>atril</packagereq>
       <packagereq>atril-caja</packagereq>
+      <packagereq>audacious</packagereq>
       <packagereq>caja</packagereq>
       <packagereq>caja-image-converter</packagereq>
       <packagereq>caja-open-terminal</packagereq>
@@ -4329,17 +4309,17 @@
       <packagereq>claws-mail</packagereq>
       <packagereq>dconf</packagereq>
       <packagereq>dconf-editor</packagereq>
-      <packagereq>f22-backgrounds-base</packagereq>
       <packagereq>engrampa</packagereq>
       <packagereq>eom</packagereq>
+      <packagereq>f22-backgrounds-base</packagereq>
       <packagereq>filezilla</packagereq>
       <packagereq>firefox</packagereq>
       <packagereq>firewall-config</packagereq>
       <packagereq>fros-recordmydesktop</packagereq>
       <packagereq>gnote</packagereq>
       <packagereq>gparted</packagereq>
-      <packagereq>gucharmap</packagereq>
       <packagereq>gtk2-engines</packagereq>
+      <packagereq>gucharmap</packagereq>
       <packagereq>gvfs</packagereq>
       <packagereq>gvfs-afc</packagereq>
       <packagereq>gvfs-archive</packagereq>
@@ -5158,10 +5138,10 @@
       <packagereq type="optional">fonts-KOI8-R-100dpi</packagereq>
       <packagereq type="optional">fonts-KOI8-R-75dpi</packagereq>
       <packagereq type="optional">ibus-table-cyrillic</packagereq>
-      <packagereq type="optional">paratype-pt-sans-caption-fonts</packagereq>
-      <packagereq type="optional">paratype-pt-serif-fonts</packagereq>
-      <packagereq type="optional">paratype-pt-serif-caption-fonts</packagereq>
       <packagereq type="optional">paratype-pt-mono-fonts</packagereq>
+      <packagereq type="optional">paratype-pt-sans-caption-fonts</packagereq>
+      <packagereq type="optional">paratype-pt-serif-caption-fonts</packagereq>
+      <packagereq type="optional">paratype-pt-serif-fonts</packagereq>
       <packagereq type="optional">scim-tables-russian</packagereq>
       <packagereq type="optional">stardict-dic-ru</packagereq>
       <packagereq type="optional">xorg-x11-fonts-cyrillic</packagereq>
@@ -5394,6 +5374,22 @@
       <packagereq type="optional">system-switch-mail-gnome</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>server-hardware-support</id>
+    <_name>Hardware Support for Server Systems</_name>
+    <_description>This group is a limited collection of tools for various hardware specific utilities.</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">lm_sensors</packagereq>
+      <packagereq type="default">openhpi</packagereq>
+      <packagereq type="default">smp_utils</packagereq>
+      <packagereq type="optional">firmware-addon-dell</packagereq>
+      <packagereq type="optional">hddtemp</packagereq>
+      <packagereq type="optional">hdparm</packagereq>
+      <packagereq type="optional">lsscsi</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>server-product</id>
     <_name>Fedora Server product core</_name>
@@ -5432,22 +5428,6 @@
       <packagereq type="optional">wqy-zenhei-fonts</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>server-hardware-support</id>
-    <_name>Hardware Support for Server Systems</_name>
-    <_description>This group is a limited collection of tools for various hardware specific utilities.</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="default">lm_sensors</packagereq>
-      <packagereq type="default">smp_utils</packagereq>
-      <packagereq type="default">openhpi</packagereq>
-      <packagereq type="optional">firmware-addon-dell</packagereq>
-      <packagereq type="optional">hddtemp</packagereq>
-      <packagereq type="optional">hdparm</packagereq>
-      <packagereq type="optional">lsscsi</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>sindhi-support</id>
     <_name>Sindhi Support</_name>
@@ -6155,6 +6135,26 @@
       <packagereq type="optional">scim-tables-thai</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>threed-printing</id>
+    <_name>3D Printing</_name>
+    <_description>3D printing software</_description>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq type="default">blender</packagereq>
+      <packagereq type="default">cura</packagereq>
+      <packagereq type="default">meshlab</packagereq>
+      <packagereq type="default">openscad</packagereq>
+      <packagereq type="default">openscad-MCAD</packagereq>
+      <packagereq type="default">printrun</packagereq>
+      <packagereq type="default">RepetierHost</packagereq>
+      <packagereq type="default">repsnapper</packagereq>
+      <packagereq type="default">sfact</packagereq>
+      <packagereq type="default">skeinforge</packagereq>
+      <packagereq type="default">slic3r</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>tibetan-support</id>
     <_name>Tibetan Support</_name>
@@ -6447,8 +6447,8 @@
       <packagereq>gnome-getting-started-docs</packagereq>
       <packagereq>gnome-initial-setup</packagereq>
       <packagereq>gnome-screenshot</packagereq>
-      <packagereq>gnome-session-xsession</packagereq>
       <packagereq>gnome-session-wayland-session</packagereq>
+      <packagereq>gnome-session-xsession</packagereq>
       <packagereq>gnome-settings-daemon</packagereq>
       <packagereq>gnome-shell</packagereq>
       <packagereq>gnome-shell-extension-background-logo</packagereq>
@@ -6459,8 +6459,8 @@
       <packagereq>gnome-user-docs</packagereq>
       <packagereq>gnome-user-share</packagereq>
       <packagereq>gnome-weather</packagereq>
-      <packagereq>google-android-emoji-fonts</packagereq>
       <packagereq>gnupg2</packagereq>
+      <packagereq>google-android-emoji-fonts</packagereq>
       <packagereq>gucharmap</packagereq>
       <packagereq>gvfs-afc</packagereq>
       <packagereq>gvfs-afp</packagereq>
@@ -6871,74 +6871,17 @@
     </packagelist>
   </group>
   <environment>
-    <!-- Intended to allow interactive installation of components that will eventually be
+    <id>minimal-environment</id>
-         used in a cloud image. -->
+    <_name>Minimal Install</_name>
-    <id>cloud-server-environment</id>
+    <_description>Basic functionality.</_description>
-    <_name>Fedora Cloud Server</_name>
+    <display_order>1</display_order>
-    <_description>A server install with components needed to run in a cloud environment.</_description>
-    <display_order>3</display_order>
     <grouplist>
-      <groupid>cloud-server</groupid>
       <groupid>core</groupid>
+      <groupid>fedora-release-nonproduct</groupid>
     </grouplist>
     <optionlist>
       <groupid>standard</groupid>
-      <groupid>headless-management</groupid>
-      <groupid>dogtag</groupid>
-      <groupid>directory-server</groupid>
-      <groupid>dns-server</groupid>
-      <groupid>freeipa-server</groupid>
-      <groupid>ftp-server</groupid>
       <groupid>guest-agents</groupid>
-      <groupid>ha</groupid>
-      <groupid>load-balancer</groupid>
-      <groupid>mail-server</groupid>
-      <groupid>mysql</groupid>
-      <groupid>network-server</groupid>
-      <groupid>smb-server</groupid>
-      <groupid>sql-server</groupid>
-      <groupid>web-server</groupid>
-    </optionlist>
-  </environment>
-  <environment>
-    <!-- Intended only for the Fedora Server product; other products will not
-         show this because they don’t include the fedora-release-server
-         package.  Please keep this mostly in sync with
-         infrastructure-server-environment. -->
-    <id>server-product-environment</id>
-    <_name>Fedora Server</_name>
-    <!-- Should eventually say “with a web UI accessible right after installation”
-         or something else to differentiate from
-         infrastructure-server-environment. -->
-    <_description>An integrated, easier to manage server.</_description>
-    <display_order>2</display_order>
-    <grouplist>
-      <groupid>server-product</groupid>
-      <groupid>standard</groupid>
-      <groupid>core</groupid>
-      <groupid>server-hardware-support</groupid>
-      <groupid>headless-management</groupid>
-      <groupid>container-management</groupid>
-      <groupid>domain-client</groupid>
-    </grouplist>
-    <optionlist>
-      <groupid>dogtag</groupid>
-      <groupid>directory-server</groupid>
-      <groupid>dns-server</groupid>
-      <groupid>freeipa-server</groupid>
-      <groupid>ftp-server</groupid>
-      <groupid>guest-agents</groupid>
-      <groupid>ha</groupid>
-      <groupid>hardware-support</groupid>
-      <groupid>load-balancer</groupid>
-      <groupid>mail-server</groupid>
-      <groupid>mysql</groupid>
-      <groupid>network-server</groupid>
-      <groupid>printing</groupid>
-      <groupid>smb-server</groupid>
-      <groupid>sql-server</groupid>
-      <groupid>virtualization</groupid>
-      <groupid>web-server</groupid>
     </optionlist>
   </environment>
   <environment>
@@ -7002,6 +6945,47 @@
       <groupid>cloud-management</groupid>
     </optionlist>
   </environment>
+  <environment>
+    <!-- Intended only for the Fedora Server product; other products will not
+         show this because they don’t include the fedora-release-server
+         package.  Please keep this mostly in sync with
+         infrastructure-server-environment. -->
+    <id>server-product-environment</id>
+    <_name>Fedora Server</_name>
+    <!-- Should eventually say “with a web UI accessible right after installation”
+         or something else to differentiate from
+         infrastructure-server-environment. -->
+    <_description>An integrated, easier to manage server.</_description>
+    <display_order>2</display_order>
+    <grouplist>
+      <groupid>server-product</groupid>
+      <groupid>standard</groupid>
+      <groupid>core</groupid>
+      <groupid>server-hardware-support</groupid>
+      <groupid>headless-management</groupid>
+      <groupid>container-management</groupid>
+      <groupid>domain-client</groupid>
+    </grouplist>
+    <optionlist>
+      <groupid>dogtag</groupid>
+      <groupid>directory-server</groupid>
+      <groupid>dns-server</groupid>
+      <groupid>freeipa-server</groupid>
+      <groupid>ftp-server</groupid>
+      <groupid>guest-agents</groupid>
+      <groupid>ha</groupid>
+      <groupid>hardware-support</groupid>
+      <groupid>load-balancer</groupid>
+      <groupid>mail-server</groupid>
+      <groupid>mysql</groupid>
+      <groupid>network-server</groupid>
+      <groupid>printing</groupid>
+      <groupid>smb-server</groupid>
+      <groupid>sql-server</groupid>
+      <groupid>virtualization</groupid>
+      <groupid>web-server</groupid>
+    </optionlist>
+  </environment>
   <environment>
     <id>workstation-product-environment</id>
     <_name>Fedora Workstation</_name>
@@ -7078,7 +7062,6 @@
       <groupid>cloud-management</groupid>
     </optionlist>
   </environment>
-
   <environment>
     <id>cinnamon-desktop-environment</id>
     <_name>Cinnamon Desktop</_name>
@@ -7156,6 +7139,36 @@
       <groupid>sugar-apps</groupid>
     </optionlist>
   </environment>
+  <environment>
+    <!-- Intended to allow interactive installation of components that will eventually be
+         used in a cloud image. -->
+    <id>cloud-server-environment</id>
+    <_name>Fedora Cloud Server</_name>
+    <_description>A server install with components needed to run in a cloud environment.</_description>
+    <display_order>3</display_order>
+    <grouplist>
+      <groupid>cloud-server</groupid>
+      <groupid>core</groupid>
+    </grouplist>
+    <optionlist>
+      <groupid>standard</groupid>
+      <groupid>headless-management</groupid>
+      <groupid>dogtag</groupid>
+      <groupid>directory-server</groupid>
+      <groupid>dns-server</groupid>
+      <groupid>freeipa-server</groupid>
+      <groupid>ftp-server</groupid>
+      <groupid>guest-agents</groupid>
+      <groupid>ha</groupid>
+      <groupid>load-balancer</groupid>
+      <groupid>mail-server</groupid>
+      <groupid>mysql</groupid>
+      <groupid>network-server</groupid>
+      <groupid>smb-server</groupid>
+      <groupid>sql-server</groupid>
+      <groupid>web-server</groupid>
+    </optionlist>
+  </environment>
   <environment>
     <id>developer-workstation-environment</id>
     <_name>Development and Creative Workstation</_name>
@@ -7297,7 +7310,7 @@
       <groupid>kde-desktop</groupid>
       <groupid>legacy-fonts</groupid>
       <groupid>libreoffice</groupid>
-	  <groupid>lxde-desktop</groupid>
+      <groupid>lxde-desktop</groupid>
       <groupid>lxqt-desktop</groupid>
       <groupid>mate-desktop</groupid>
       <groupid>sugar-desktop</groupid>
@@ -7306,20 +7319,6 @@
       <groupid>xmonad-mate</groupid>
     </optionlist>
   </environment>
-  <environment>
-    <id>minimal-environment</id>
-    <_name>Minimal Install</_name>
-    <_description>Basic functionality.</_description>
-    <display_order>1</display_order>
-    <grouplist>
-      <groupid>core</groupid>
-      <groupid>fedora-release-nonproduct</groupid>
-    </grouplist>
-    <optionlist>
-      <groupid>standard</groupid>
-      <groupid>guest-agents</groupid>
-    </optionlist>
-  </environment>
   <category>
     <id>kde-desktop-environment</id>
     <_name>KDE Desktop</_name>
@@ -7395,7 +7394,6 @@
       <groupid>lxqt-office</groupid>
     </grouplist>
   </category>
-
   <category>
     <id>cinnamon-desktop-environment</id>
     <_name>Cinnamon Desktop</_name>