comps-el6.xml.in comps-epel7.xml.in comps-f20.xml.in comps-f21.xml.in comps-f22.xml.in comps-f23.xml.in

Dennis Gilmore ausil at fedoraproject.org
Thu Mar 26 17:57:51 UTC 2015


 comps-el6.xml.in   |   40 
 comps-epel7.xml.in |  114 -
 comps-f20.xml.in   | 3276 ++++++++++++++++++++++++++---------------------------
 comps-f21.xml.in   |  206 +--
 comps-f22.xml.in   |  331 ++---
 comps-f23.xml.in   |  370 ++---
 6 files changed, 2161 insertions(+), 2176 deletions(-)

New commits:
commit 7c1f5345380736e18253445304c0ef046f10b8cc
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Thu Mar 26 12:56:44 2015 -0500

    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

diff --git a/comps-el6.xml.in b/comps-el6.xml.in
index 8365a5f..95ea4ba 100644
--- a/comps-el6.xml.in
+++ b/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>
@@ -822,6 +822,21 @@
     </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>
     <_description/>
@@ -840,21 +855,6 @@
     <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>
     <_description/>
@@ -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">gcc</packagereq>
-	  <packagereq type="default">gd-devel</packagereq>
+      <packagereq type="default">clang</packagereq>
+      <packagereq type="default">gcc</packagereq>
+      <packagereq type="default">gd-devel</packagereq>
       <packagereq type="default">gplcver</packagereq>
       <packagereq type="default">gtkwave</packagereq>
       <packagereq type="default">iverilog</packagereq>
diff --git a/comps-epel7.xml.in b/comps-epel7.xml.in
index 66a7718..e3f4e46 100644
--- a/comps-epel7.xml.in
+++ b/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>
@@ -847,6 +823,21 @@
     </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>
     <_description/>
@@ -865,21 +856,6 @@
     <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>
     <_description/>
@@ -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">gcc</packagereq>
-	  <packagereq type="default">gd-devel</packagereq>
+      <packagereq type="default">clang</packagereq>
+      <packagereq type="default">gcc</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>
diff --git a/comps-f20.xml.in b/comps-f20.xml.in
index 79a1e17..79205eb 100644
--- a/comps-f20.xml.in
+++ b/comps-f20.xml.in
@@ -2,1009 +2,23 @@
 <!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
 <comps>
   <group>
-    <id>base-x</id>
-    <_name>base-x</_name>
-    <_description>Local X.org display server</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>xorg-x11-drv-ati</packagereq>
-      <packagereq>xorg-x11-drv-evdev</packagereq>
-      <packagereq>xorg-x11-drv-fbdev</packagereq>
-      <packagereq>xorg-x11-drv-geode</packagereq>
-      <packagereq>xorg-x11-drv-intel</packagereq>
-      <packagereq>xorg-x11-drv-mga</packagereq>
-      <packagereq>xorg-x11-drv-modesetting</packagereq>
-      <packagereq>xorg-x11-drv-nouveau</packagereq>
-      <packagereq>xorg-x11-drv-omap</packagereq>
-      <packagereq>xorg-x11-drv-openchrome</packagereq>
-      <packagereq>xorg-x11-drv-qxl</packagereq>
-      <packagereq>xorg-x11-drv-synaptics</packagereq>
-      <packagereq>xorg-x11-drv-vesa</packagereq>
-      <packagereq>xorg-x11-drv-vmmouse</packagereq>
-      <packagereq>xorg-x11-drv-vmware</packagereq>
-      <packagereq>xorg-x11-drv-wacom</packagereq>
-      <packagereq>xorg-x11-server-Xorg</packagereq>
-      <packagereq>xorg-x11-xauth</packagereq>
-      <packagereq>xorg-x11-xinit</packagereq>
-      <packagereq>glx-utils</packagereq>
-      <packagereq>mesa-dri-drivers</packagereq>
-      <packagereq>plymouth-system-theme</packagereq>
-      <packagereq>xorg-x11-utils</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>multimedia</id>
-    <_name>Multimedia</_name>
-    <_description>Audio/video framework common to desktops</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>gstreamer-plugins-bad-free</packagereq>
-      <packagereq>gstreamer-plugins-espeak</packagereq>
-      <packagereq>gstreamer-plugins-good</packagereq>
-      <packagereq type="conditional" requires="gstreamer1">gstreamer1-plugins-bad-free</packagereq>
-      <packagereq type="conditional" requires="gstreamer1">gstreamer1-plugins-good</packagereq>
-      <packagereq>PackageKit-gstreamer-plugin</packagereq>
-      <packagereq>alsa-utils</packagereq>
-      <packagereq>alsa-plugins-pulseaudio</packagereq>
-      <packagereq>pulseaudio</packagereq>
-      <packagereq>pulseaudio-utils</packagereq>
-      <packagereq>pulseaudio-module-x11</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>gnome-desktop</id>
-    <_name>GNOME</_name>
-    <_description>GNOME is a highly intuitive and user friendly desktop environment.</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>desktop-backgrounds-basic</packagereq>
-      <packagereq>control-center</packagereq>
-      <packagereq>dconf</packagereq>
-      <packagereq>gnome-session-xsession</packagereq>
-      <packagereq>gnome-settings-daemon</packagereq>
-      <packagereq>gnome-shell</packagereq>
-      <packagereq>gnome-themes-standard</packagereq>
-      <packagereq>abrt-desktop</packagereq>
-      <packagereq>abrt-java-connector</packagereq>
-      <packagereq>setroubleshoot</packagereq>
-      <packagereq>aisleriot</packagereq>
-      <packagereq>at-spi2-atk</packagereq>
-      <packagereq>at-spi2-core</packagereq>
-      <packagereq>avahi</packagereq>
-      <packagereq>baobab</packagereq>
-      <packagereq>bijiben</packagereq>
-      <packagereq>brasero</packagereq>
-      <packagereq>brasero-nautilus</packagereq>
-      <packagereq>caribou</packagereq>
-      <packagereq>caribou-gtk2-module</packagereq>
-      <packagereq>caribou-gtk3-module</packagereq>
-      <packagereq>cheese</packagereq>
-      <packagereq>deja-dup</packagereq>
-      <packagereq>empathy</packagereq>
-      <packagereq>eog</packagereq>
-      <packagereq>evince</packagereq>
-      <packagereq>evince-nautilus</packagereq>
-      <packagereq>evolution</packagereq>
-      <packagereq>evolution-ews</packagereq>
-      <packagereq>evolution-help</packagereq>
-      <packagereq>file-roller</packagereq>
-      <packagereq>file-roller-nautilus</packagereq>
-      <packagereq>firewall-config</packagereq>
-      <packagereq>fprintd-pam</packagereq>
-      <packagereq>fros-gnome</packagereq>
-      <packagereq>gdm</packagereq>
-      <packagereq>gedit</packagereq>
-      <packagereq>glib-networking</packagereq>
-      <packagereq>gnome-backgrounds</packagereq>
-      <packagereq>gnome-bluetooth</packagereq>
-      <packagereq>gnome-boxes</packagereq>
-      <packagereq>gnome-calculator</packagereq>
-      <packagereq>gnome-clocks</packagereq>
-      <packagereq>gnome-color-manager</packagereq>
-      <packagereq>gnome-contacts</packagereq>
-      <packagereq>gnome-dictionary</packagereq>
-      <packagereq>gnome-disk-utility</packagereq>
-      <packagereq>gnome-documents</packagereq>
-      <packagereq>gnome-epub-thumbnailer</packagereq>
-      <packagereq>gnome-font-viewer</packagereq>
-      <packagereq>gnome-getting-started-docs</packagereq>
-      <packagereq>gnome-icon-theme</packagereq>
-      <packagereq>gnome-icon-theme-extras</packagereq>
-      <packagereq>gnome-icon-theme-symbolic</packagereq>
-      <packagereq>gnome-initial-setup</packagereq>
-      <packagereq>gnome-maps</packagereq>
-      <packagereq>gnome-packagekit</packagereq>
-      <packagereq>gnome-photos</packagereq>
-      <packagereq>gnome-screenshot</packagereq>
-      <packagereq>gnome-software</packagereq>
-      <packagereq>gnome-system-log</packagereq>
-      <packagereq>gnome-system-monitor</packagereq>
-      <packagereq>gnome-terminal</packagereq>
-      <packagereq>gnome-user-docs</packagereq>
-      <packagereq>gnome-weather</packagereq>
-      <packagereq>gucharmap</packagereq>
-      <packagereq>gvfs-fuse</packagereq>
-      <packagereq>gvfs-afc</packagereq>
-      <packagereq>gvfs-afp</packagereq>
-      <packagereq>gvfs-archive</packagereq>
-      <packagereq>gvfs-goa</packagereq>
-      <packagereq>gvfs-gphoto2</packagereq>
-      <packagereq>gvfs-mtp</packagereq>
-      <packagereq>gvfs-smb</packagereq>
-      <packagereq>libcanberra-gtk2</packagereq>
-      <packagereq>libcanberra-gtk3</packagereq>
-      <packagereq>libproxy-mozjs</packagereq>
-      <packagereq>librsvg2</packagereq>
-      <packagereq>libsane-hpaio</packagereq>
-      <packagereq>mousetweaks</packagereq>
-      <packagereq>nautilus</packagereq>
-      <packagereq>nautilus-sendto</packagereq>
-      <packagereq>NetworkManager-l2tp</packagereq>
-      <packagereq>NetworkManager-openconnect</packagereq>
-      <packagereq>NetworkManager-openvpn-gnome</packagereq>
-      <packagereq>NetworkManager-pptp-gnome</packagereq>
-      <packagereq>NetworkManager-vpnc-gnome</packagereq>
-      <packagereq>nm-connection-editor</packagereq>
-      <packagereq>orca</packagereq>
-      <packagereq>PackageKit-command-not-found</packagereq>
-      <packagereq>PackageKit-gtk3-module</packagereq>
-      <packagereq>polkit-js-engine</packagereq>
-      <packagereq>rhythmbox</packagereq>
-      <packagereq>sane-backends-drivers-scanners</packagereq>
-      <packagereq>seahorse</packagereq>
-      <packagereq>shotwell</packagereq>
-      <packagereq>simple-scan</packagereq>
-      <packagereq>sushi</packagereq>
-      <packagereq>totem</packagereq>
-      <packagereq>totem-mozplugin</packagereq>
-      <packagereq>totem-nautilus</packagereq>
-      <packagereq>transmission-gtk</packagereq>
-      <packagereq>xdg-user-dirs-gtk</packagereq>
-      <packagereq>vinagre</packagereq>
-      <packagereq>yelp</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>gnome-games</id>
-    <_name>Extra games for the GNOME Desktop</_name>
-    <_description>A variety of games for the GNOME Desktop</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>five-or-more</packagereq>
-      <packagereq>four-in-a-row</packagereq>
-      <packagereq>gnome-chess</packagereq>
-      <packagereq>gnome-klotski</packagereq>
-      <packagereq>gnome-mahjongg</packagereq>
-      <packagereq>gnome-mines</packagereq>
-      <packagereq>gnome-nibbles</packagereq>
-      <packagereq>gnome-robots</packagereq>
-      <packagereq>gnome-sudoku</packagereq>
-      <packagereq>gnome-tetravex</packagereq>
-      <packagereq>iagno</packagereq>
-      <packagereq>lightsoff</packagereq>
-      <packagereq>quadrapassel</packagereq>
-      <packagereq>swell-foop</packagereq>
-      <packagereq>tali</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>firefox</id>
-    <_name>Firefox Web Browser</_name>
-    <_description>The Firefox web browser</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>firefox</packagereq>
-      <packagereq>icedtea-web</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>epiphany</id>
-    <_name>Epiphany Web Browser</_name>
-    <_description>Epiphany Web Browser for GNOME</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>epiphany</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>libreoffice</id>
-    <_name>LibreOffice</_name>
-    <_description>LibreOffice Productivity Suite</_description>
-    <packagelist>
-      <packagereq>libreoffice-calc</packagereq>
-      <packagereq>libreoffice-draw</packagereq>
-      <packagereq>libreoffice-emailmerge</packagereq>
-      <packagereq>libreoffice-graphicfilter</packagereq>
-      <packagereq>libreoffice-impress</packagereq>
-      <packagereq>libreoffice-math</packagereq>
-      <packagereq>libreoffice-writer</packagereq>
-      <packagereq type="optional">libreoffice-base</packagereq>
-      <packagereq type="optional">libreoffice-pyuno</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>kde-desktop</id>
-    <_name>KDE</_name>
-    <_description>The KDE Plasma Workspaces, a highly-configurable graphical user interface which includes a panel, desktop, system icons and desktop widgets, and many powerful KDE applications.</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="conditional" requires="libreoffice-core">libreoffice-kde</packagereq>
-      <packagereq type="conditional" requires="pinentry">pinentry-qt</packagereq>
-      <packagereq type="conditional" requires="qt5-style-oxygen">qt5-qtbase-gui</packagereq>
-      <packagereq>akonadi</packagereq>
-      <packagereq>akonadi-mysql</packagereq>
-      <packagereq>appmenu-qt</packagereq>
-      <packagereq>apper</packagereq>
-      <packagereq>ark</packagereq>
-      <packagereq>bluedevil</packagereq>
-      <packagereq>baloo-file</packagereq>
-      <packagereq>cagibi</packagereq>
-      <packagereq>colord-kde</packagereq>
-      <packagereq>cups-pk-helper</packagereq>
-      <packagereq>firewall-config</packagereq>
-      <packagereq>gwenview</packagereq>
-      <packagereq>initial-setup</packagereq>
-      <packagereq>kamera</packagereq>
-      <packagereq>kamoso</packagereq>
-      <packagereq>kcalc</packagereq>
-      <packagereq>kcharselect</packagereq>
-      <packagereq>kcm-gtk</packagereq>
-      <packagereq>kcm_touchpad</packagereq>
-      <packagereq>kcolorchooser</packagereq>
-      <packagereq>kde-baseapps</packagereq>
-      <packagereq>kde-plasma-nm</packagereq>
-      <packagereq>kde-plasma-nm-l2tp</packagereq>
-      <packagereq>kde-plasma-nm-openconnect</packagereq>
-      <packagereq>kde-plasma-nm-openswan</packagereq>
-      <packagereq>kde-plasma-nm-openvpn</packagereq>
-      <packagereq>kde-plasma-nm-pptp</packagereq>
-      <packagereq>kde-plasma-nm-vpnc</packagereq>
-      <packagereq>kde-print-manager</packagereq>
-      <packagereq>kde-runtime</packagereq>
-      <packagereq>kde-runtime-docs</packagereq>
-      <packagereq>kde-settings-pulseaudio</packagereq>
-      <packagereq>kde-workspace</packagereq>
-      <packagereq>kdeaccessibility</packagereq>
-      <packagereq>kdegames-minimal</packagereq>
-      <packagereq>kdegraphics-strigi-analyzer</packagereq>
-      <packagereq>kdegraphics-thumbnailers</packagereq>
-      <packagereq>kdelibs</packagereq>
-      <packagereq>kdepim</packagereq>
-      <packagereq>kdeplasma-addons</packagereq>
-      <packagereq>kdm</packagereq>
-      <packagereq>kdnssd</packagereq>
-      <packagereq>kget</packagereq>
-      <packagereq>kgpg</packagereq>
-      <packagereq>khelpcenter</packagereq>
-      <packagereq>kipi-plugins</packagereq>
-      <packagereq>kmix</packagereq>
-      <packagereq>konsole</packagereq>
-      <packagereq>kruler</packagereq>
-      <packagereq>kscreen</packagereq>
-      <packagereq>ksnapshot</packagereq>
-      <packagereq>ksshaskpass</packagereq>
-      <packagereq>ksysguard</packagereq>
-      <packagereq>kwallet</packagereq>
-      <packagereq>kwebkitpart</packagereq>
-      <packagereq>kwrite</packagereq>
-      <packagereq>okular</packagereq>
-      <packagereq>oxygen-gtk</packagereq>
-      <packagereq>phonon-backend-gstreamer</packagereq>
-      <packagereq>plasma-scriptengine-python</packagereq>
-      <packagereq>system-config-date</packagereq>
-      <packagereq>system-config-services</packagereq>
-      <packagereq>system-config-users</packagereq>
-      <packagereq>xsettings-kde</packagereq>
-      <packagereq>xterm</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>kde-apps</id>
-    <_name>KDE Applications</_name>
-    <_description>A set of commonly used KDE applications</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>kdeartwork-screensavers</packagereq>
-      <packagereq>kdegames</packagereq>
-      <packagereq>digikam</packagereq>
-      <packagereq>kdenetwork-krdc</packagereq>
-      <packagereq>kdenetwork-krfb</packagereq>
-      <packagereq>konversation</packagereq>
-      <packagereq>kolourpaint</packagereq>
-      <packagereq>krusader</packagereq>
-      <packagereq>ktorrent</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>kde-education</id>
-    <_name>KDE Educational applications</_name>
-    <_description>KDE Educational applications</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>blinken</packagereq>
-      <packagereq>kalzium</packagereq>
-      <packagereq>kanagram</packagereq>
-      <packagereq>kgeography</packagereq>
-      <packagereq>khangman</packagereq>
-      <packagereq>kiten</packagereq>
-      <packagereq>klettres</packagereq>
-      <packagereq>ktouch</packagereq>
-      <packagereq>kturtle</packagereq>
-      <packagereq>kwordquiz</packagereq>
-      <packagereq>parley</packagereq>
-      <packagereq>step</packagereq>
-      <packagereq>marble</packagereq>
-      <packagereq>kstars</packagereq>
-      <packagereq>kalgebra</packagereq>
-      <packagereq>kbruch</packagereq>
-      <packagereq>kig</packagereq>
-      <packagereq>kmplot</packagereq>
-      <packagereq>rocs</packagereq>
-      <packagereq>cantor</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>kde-media</id>
-    <_name>KDE Multimedia support</_name>
-    <_description>Multimedia support for KDE</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>amarok</packagereq>
-      <packagereq>dragon</packagereq>
-      <packagereq>k3b</packagereq>
-      <packagereq>kscd</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>kde-office</id>
-    <_name>KDE Office</_name>
-    <_description>KDE Office applications</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>calligra-karbon</packagereq>
-      <packagereq>calligra-krita</packagereq>
-      <packagereq>calligra</packagereq>
-      <packagereq>calligra-braindump</packagereq>
-      <packagereq>calligra-flow</packagereq>
-      <packagereq>calligra-kexi</packagereq>
-      <packagereq>calligra-plan</packagereq>
-      <packagereq>calligra-sheets</packagereq>
-      <packagereq>calligra-stage</packagereq>
-      <packagereq>calligra-words</packagereq>
-      <packagereq>okular</packagereq>
-      <packagereq>scribus</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>kde-telepathy</id>
-    <_name>KDE Telepathy</_name>
-    <_description>KDE Telepathy applications</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>ktp-accounts-kcm</packagereq>
-      <packagereq>ktp-approver</packagereq>
-      <packagereq>ktp-auth-handler</packagereq>
-      <packagereq>ktp-call-ui</packagereq>
-      <packagereq>ktp-desktop-applets</packagereq>
-      <packagereq>ktp-contact-list</packagereq>
-      <packagereq>ktp-filetransfer-handler</packagereq>
-      <packagereq>ktp-kded-integration-module</packagereq>
-      <packagereq>ktp-send-file</packagereq>
-      <packagereq>ktp-text-ui</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>false</uservisible>
-    <packagelist>
-      <packagereq>alsa-utils</packagereq>
-      <packagereq>desktop-backgrounds-compat</packagereq>
-      <packagereq>Thunar</packagereq>
-      <packagereq>xfce4-panel</packagereq>
-      <packagereq>xfce4-session</packagereq>
-      <packagereq>xfce4-settings</packagereq>
-      <packagereq>xfconf</packagereq>
-      <packagereq>xfdesktop</packagereq>
-      <packagereq>xfwm4</packagereq>
-      <packagereq>firewall-config</packagereq>
-      <packagereq>fedora-icon-theme</packagereq>
-      <packagereq>lightdm-gtk</packagereq>
-      <packagereq>gtk-xfce-engine</packagereq>
-      <packagereq>gvfs</packagereq>
-      <packagereq>initial-setup</packagereq>
-      <packagereq>network-manager-applet</packagereq>
-      <packagereq>nm-connection-editor</packagereq>
-      <packagereq>openssh-askpass</packagereq>
-      <packagereq>rodent-icon-theme</packagereq>
-      <packagereq>xfce4-terminal</packagereq>
-      <packagereq>thunar-archive-plugin</packagereq>
-      <packagereq>thunar-volman</packagereq>
-      <packagereq>tumbler</packagereq>
-      <packagereq>xfce4-about</packagereq>
-      <packagereq>xfce4-appfinder</packagereq>
-      <packagereq>xfce4-power-manager</packagereq>
-      <packagereq>xfce4-session-engines</packagereq>
-      <packagereq>xfwm4-theme-nodoka</packagereq>
-      <packagereq>xscreensaver-base</packagereq>
-      <packagereq>yumex</packagereq>
-      <packagereq>NetworkManager-vpnc</packagereq>
-      <packagereq>NetworkManager-vpnc-gnome</packagereq>
-      <packagereq>NetworkManager-l2tp</packagereq>
-      <packagereq>NetworkManager-openconnect</packagereq>
-      <packagereq>NetworkManager-openvpn</packagereq>
-      <packagereq>NetworkManager-pptp</packagereq>
-      <packagereq>xdg-user-dirs-gtk</packagereq>
-      <packagereq>adwaita-cursor-theme</packagereq>
-      <packagereq>adwaita-gtk2-theme</packagereq>
-      <packagereq>adwaita-gtk3-theme</packagereq>
-      <packagereq>greybird-gtk2-theme</packagereq>
-      <packagereq>greybird-gtk3-theme</packagereq>
-      <packagereq>greybird-xfce4-notifyd-theme</packagereq>
-      <packagereq>greybird-xfwm4-theme</packagereq>
-      <packagereq>albatross-gtk2-theme</packagereq>
-      <packagereq>albatross-gtk3-theme</packagereq>
-      <packagereq>albatross-xfwm4-theme</packagereq>
-      <packagereq>bluebird-gtk2-theme</packagereq>
-      <packagereq>bluebird-gtk3-theme</packagereq>
-      <packagereq>bluebird-xfwm4-theme</packagereq>
-      <packagereq>thunar-media-tags-plugin</packagereq>
-      <packagereq>xfce4-datetime-plugin</packagereq>
-      <packagereq>xfce4-places-plugin</packagereq>
-      <packagereq>xfce4-quicklauncher-plugin</packagereq>
-      <packagereq>xfce4-screenshooter-plugin</packagereq>
-      <packagereq>xfwm4-themes</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>xfce-apps</id>
-    <_name>Applications for the Xfce Desktop</_name>
-    <_description>A set of commonly used applications for the Xfce Desktop</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>claws-mail</packagereq>
-      <packagereq>claws-mail-plugins-archive</packagereq>
-      <packagereq>claws-mail-plugins-attachwarner</packagereq>
-      <packagereq>claws-mail-plugins-att-remover</packagereq>
-      <packagereq>claws-mail-plugins-fetchinfo</packagereq>
-      <packagereq>claws-mail-plugins-mailmbox</packagereq>
-      <packagereq>claws-mail-plugins-newmail</packagereq>
-      <packagereq>claws-mail-plugins-notification</packagereq>
-      <packagereq>claws-mail-plugins-pgp</packagereq>
-      <packagereq>claws-mail-plugins-rssyl</packagereq>
-      <packagereq>claws-mail-plugins-smime</packagereq>
-      <packagereq>claws-mail-plugins-spam-report</packagereq>
-      <packagereq>claws-mail-plugins-tnef</packagereq>
-      <packagereq>claws-mail-plugins-vcalendar</packagereq>
-      <packagereq>catfish</packagereq>
-      <packagereq>galculator</packagereq>
-      <packagereq>geany</packagereq>
-      <packagereq>gparted</packagereq>
-      <packagereq>leafpad</packagereq>
-      <packagereq>liferea</packagereq>
-      <packagereq>midori</packagereq>
-      <packagereq>orage</packagereq>
-      <packagereq>pidgin</packagereq>
-      <packagereq>remmina</packagereq>
-      <packagereq>remmina-plugins-vnc</packagereq>
-      <packagereq>ristretto</packagereq>
-      <packagereq>seahorse</packagereq>
-      <packagereq>transmission</packagereq>
-      <packagereq>xarchiver</packagereq>
-      <packagereq>xfce4-clipman-plugin</packagereq>
-      <packagereq>xfce4-dict-plugin</packagereq>
-      <packagereq>xfce4-notes-plugin</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>xfce-extra-plugins</id>
-    <_name>Extra plugins for the Xfce panel</_name>
-    <_description>Extend the functionality of the Xfce panel</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>xfce4-battery-plugin</packagereq>
-      <packagereq>xfce4-cellmodem-plugin</packagereq>
-      <packagereq>xfce4-cpugraph-plugin</packagereq>
-      <packagereq>xfce4-diskperf-plugin</packagereq>
-      <packagereq>xfce4-eyes-plugin</packagereq>
-      <packagereq>xfce4-fsguard-plugin</packagereq>
-      <packagereq>xfce4-genmon-plugin</packagereq>
-      <packagereq>xfce4-mailwatch-plugin</packagereq>
-      <packagereq>xfce4-mount-plugin</packagereq>
-      <packagereq>xfce4-netload-plugin</packagereq>
-      <packagereq>xfce4-sensors-plugin</packagereq>
-      <packagereq>xfce4-smartbookmark-plugin</packagereq>
-      <packagereq>xfce4-systemload-plugin</packagereq>
-      <packagereq>xfce4-taskmanager</packagereq>
-      <packagereq>xfce4-time-out-plugin</packagereq>
-      <packagereq>xfce4-timer-plugin</packagereq>
-      <packagereq>xfce4-verve-plugin</packagereq>
-      <packagereq>xfce4-weather-plugin</packagereq>
-      <packagereq>xfce4-websearch-plugin</packagereq>
-      <packagereq>xfce4-xkb-plugin</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>xfce-media</id>
-    <_name>Multimedia support for Xfce</_name>
-    <_description>Multimedia support for Xfce</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>asunder</packagereq>
-      <packagereq>pavucontrol</packagereq>
-      <packagereq>parole</packagereq>
-      <packagereq>pragha</packagereq>
-      <packagereq>xfburn</packagereq>
-      <packagereq>xfce4-mixer</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>xfce-office</id>
-    <_name>Xfce Office</_name>
-    <_description>Office suite for Xfce</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>abiword</packagereq>
-      <packagereq>gnumeric</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>lxde-desktop</id>
-    <_name>LXDE</_name>
-    <_description>LXDE 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>lxde-common</packagereq>
-      <packagereq>lxmenu-data</packagereq>
-      <packagereq>lxpanel</packagereq>
-      <packagereq>lxsession</packagereq>
-      <packagereq>openbox</packagereq>
-      <packagereq>pcmanfm</packagereq>
-      <packagereq>firewall-config</packagereq>
-      <packagereq>gpicview</packagereq>
-      <packagereq>initial-setup</packagereq>
-      <packagereq>leafpad</packagereq>
-      <packagereq>lxappearance</packagereq>
-      <packagereq>lxappearance-obconf</packagereq>
-      <packagereq>lxdm</packagereq>
-      <packagereq>lxinput</packagereq>
-      <packagereq>lxlauncher</packagereq>
-      <packagereq>lxpolkit</packagereq>
-      <packagereq>lxrandr</packagereq>
-      <packagereq>lxsession-edit</packagereq>
-      <packagereq>lxshortcut</packagereq>
-      <packagereq>lxtask</packagereq>
-      <packagereq>lxterminal</packagereq>
-      <packagereq>obconf</packagereq>
-      <packagereq>openssh-askpass</packagereq>
-      <packagereq>xarchiver</packagereq>
-      <packagereq>xscreensaver-base</packagereq>
-      <packagereq>clipit</packagereq>
-      <packagereq>galculator</packagereq>
-      <packagereq>xpad</packagereq>
-      <packagereq>gigolo</packagereq>
-      <packagereq>fedora-icon-theme</packagereq>
-      <packagereq>adwaita-cursor-theme</packagereq>
-      <packagereq>adwaita-gtk2-theme</packagereq>
-      <packagereq>adwaita-gtk3-theme</packagereq>
-      <packagereq>gnome-keyring-pam</packagereq>
-      <packagereq>network-manager-applet</packagereq>
-      <packagereq>nm-connection-editor</packagereq>
-      <packagereq>perl-File-MimeInfo</packagereq>
-      <packagereq>xcompmgr</packagereq>
-      <packagereq>xdg-user-dirs-gtk</packagereq>
-      <packagereq>xscreensaver-extras</packagereq>
-      <packagereq>yumex</packagereq>
-      <packagereq>notification-daemon</packagereq>
-      <packagereq>upower</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>lxde-apps</id>
-    <_name>Applications for the LXDE Desktop</_name>
-    <_description>A set of commonly used applications for the LXDE Desktop</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>midori</packagereq>
-      <packagereq>pidgin</packagereq>
-      <packagereq>sylpheed</packagereq>
-      <packagereq>transmission</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>lxmusic</packagereq>
-      <packagereq>pavucontrol</packagereq>
-      <packagereq>pnmixer</packagereq>
-      <packagereq>gnomebaker</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>sugar-apps</id>
-    <_name>Additional Sugar Activities</_name>
-    <_description>Additional activities for use with the Sugar Environment.</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>sugar-analyze</packagereq>
-      <packagereq>sugar-calendario</packagereq>
-      <packagereq>sugar-connect</packagereq>
-      <packagereq>sugar-distance</packagereq>
-      <packagereq>sugar-emulator</packagereq>
-      <packagereq>sugar-flipsticks</packagereq>
-      <packagereq>sugar-implode</packagereq>
-      <packagereq>sugar-playgo</packagereq>
-      <packagereq>sugar-pukllanapac</packagereq>
-      <packagereq>sugar-view-slides</packagereq>
-      <packagereq>sugar-xomail</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>basic-desktop</id>
-    <_name>Basic Desktop</_name>
-    <_description>Basic X Window System with a choice of window manager.</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>adwaita-cursor-theme</packagereq>
-      <packagereq>adwaita-gtk2-theme</packagereq>
-      <packagereq>adwaita-gtk3-theme</packagereq>
-      <packagereq>awesome</packagereq>
-      <packagereq>dwm</packagereq>
-      <packagereq>fedora-icon-theme</packagereq>
-      <packagereq>gnome-icon-theme-symbolic</packagereq>
-      <packagereq>i3</packagereq>
-      <packagereq>initial-setup</packagereq>
-      <packagereq>lightdm</packagereq>
-      <packagereq>metacity</packagereq>
-      <packagereq>openbox</packagereq>
-      <packagereq>ratpoison</packagereq>
-      <packagereq>xmonad-basic</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>cinnamon-desktop</id>
-    <_name>Cinnamon</_name>
-    <_description>Cinnamon provides a desktop with a traditional layout, advanced features, easy to use, powerful and flexible.</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>cinnamon</packagereq>
-      <packagereq>metacity</packagereq>
-      <packagereq>abrt-desktop</packagereq>
-      <packagereq>abrt-java-connector</packagereq>
-      <packagereq>cinnamon-control-center</packagereq>
-      <packagereq>shotwell</packagereq>
-      <packagereq>eog</packagereq>
-      <packagereq>evince</packagereq>
-      <packagereq>firefox</packagereq>
-      <packagereq>fros-recordmydesktop</packagereq>
-      <packagereq>icedtea-web</packagereq>
-      <packagereq>thunderbird</packagereq>
-      <packagereq>brasero</packagereq>
-      <packagereq>totem</packagereq>
-      <packagereq>totem-mozplugin</packagereq>
-      <packagereq>lightdm-gtk</packagereq>
-      <packagereq>xdg-user-dirs-gtk</packagereq>
-      <packagereq>gedit</packagereq>
-      <packagereq>initial-setup</packagereq>
-      <packagereq>imsettings-cinnamon</packagereq>
-      <packagereq>nemo-fileroller</packagereq>
-      <packagereq>nemo-preview</packagereq>
-      <packagereq>network-manager-applet</packagereq>
-      <packagereq>NetworkManager-l2tp</packagereq>
-      <packagereq>NetworkManager-openconnect</packagereq>
-      <packagereq>NetworkManager-openvpn</packagereq>
-      <packagereq>NetworkManager-pptp</packagereq>
-      <packagereq>NetworkManager-vpnc</packagereq>
-      <packagereq>nm-connection-editor</packagereq>
-      <packagereq>gnome-backgrounds</packagereq>
-      <packagereq>gnome-calculator</packagereq>
-      <packagereq>gnome-disk-utility</packagereq>
-      <packagereq>gnome-icon-theme</packagereq>
-      <packagereq>gnome-icon-theme-extras</packagereq>
-      <packagereq>gnome-icon-theme-legacy</packagereq>
-      <packagereq>gnome-icon-theme-symbolic</packagereq>
-      <packagereq>yumex</packagereq>
-      <packagereq>gnome-screenshot</packagereq>
-      <packagereq>cinnamon-screensaver</packagereq>
-      <packagereq>gnome-system-monitor</packagereq>
-      <packagereq>gnome-terminal</packagereq>
-      <packagereq>gvfs-archive</packagereq>
-      <packagereq>gvfs-gphoto2</packagereq>
-      <packagereq>gvfs-smb</packagereq>
-      <packagereq>gvfs-mtp</packagereq>
-      <packagereq>fedora-icon-theme</packagereq>
-      <packagereq>firewall-config</packagereq>
-      <packagereq>policycoreutils-gui</packagereq>
-      <packagereq>setroubleshoot</packagereq>
-      <packagereq>simple-scan</packagereq>
-      <packagereq>sane-backends-drivers-scanners</packagereq>
-      <packagereq>alsa-plugins-pulseaudio</packagereq>     
-    </packagelist>
-  </group>
-  <group>
-    <id>xmonad</id>
-    <_name>XMonad</_name>
-    <_description>A tiling window manager</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>xmobar</packagereq>
-      <packagereq>xmonad</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>xmonad-mate</id>
-    <_name>XMonad for MATE</_name>
-    <_description>XMonad window manager with MATE</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>mate-control-center</packagereq>
-      <packagereq>mate-panel</packagereq>
-      <packagereq>mate-screensaver</packagereq>
-      <packagereq>xmonad-mate</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>haproxy</id>
-    <_name>HAProxy</_name>
-    <_description>TCP/HTTP Load Balancer.</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>haproxy</packagereq>
-      <packagereq>rubygem-abrt</packagereq>
-      <packagereq>rubygem-daemons</packagereq>
-      <packagereq>rubygem-rest-client</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>jbossas</id>
-    <_name>JBoss Application Server</_name>
-    <_description>Java application server.</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>abrt-java-connector</packagereq>
-      <packagereq>java-1.7.0-openjdk</packagereq>
-      <packagereq>java-1.7.0-openjdk-devel</packagereq>
-      <packagereq>jboss-as</packagereq>
-      <packagereq>jboss-modules</packagereq>
-      <packagereq>maven</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>mongodb</id>
-    <_name>MongoDB</_name>
-    <_description>Scalable high-performance NoSQL database.</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>libmongodb</packagereq>
-      <packagereq>mongodb</packagereq>
-      <packagereq>mongodb-devel</packagereq>
-      <packagereq>mongodb-server</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>perl-web</id>
-    <_name>Perl for Web</_name>
-    <_description>Basic Perl web application support.</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>perl-core</packagereq>
-      <packagereq>ImageMagick-perl</packagereq>
-      <packagereq>mod_perl</packagereq>
-      <packagereq>perl-App-cpanminus</packagereq>
-      <packagereq>perl-CPAN</packagereq>
-      <packagereq>perl-CPANPLUS</packagereq>
-      <packagereq>perl-DBD-MySQL</packagereq>
-      <packagereq>perl-DBD-SQLite</packagereq>
-      <packagereq>perl-MongoDB</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>php</id>
-    <_name>PHP</_name>
-    <_description>General-purpose web development scripting language.</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>php</packagereq>
-      <packagereq>php</packagereq>
-      <packagereq>php-bcmath</packagereq>
-      <packagereq>php-devel</packagereq>
-      <packagereq>php-gd</packagereq>
-      <packagereq>php-imap</packagereq>
-      <packagereq>php-mbstring</packagereq>
-      <packagereq>php-mcrypt</packagereq>
-      <packagereq>php-mysqlnd</packagereq>
-      <packagereq>php-pdo</packagereq>
-      <packagereq>php-pear</packagereq>
-      <packagereq>php-pecl-apc</packagereq>
-      <packagereq>php-pecl-mongo</packagereq>
-      <packagereq>php-pgsql</packagereq>
-      <packagereq>php-process</packagereq>
-      <packagereq>php-soap</packagereq>
-      <packagereq>php-xml</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>python-web</id>
-    <_name>Python</_name>
-    <_description>Basic Python web application support.</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>freetype-devel</packagereq>
-      <packagereq>libcurl</packagereq>
-      <packagereq>libcurl-devel</packagereq>
-      <packagereq>libjpeg-turbo</packagereq>
-      <packagereq>libjpeg-turbo-devel</packagereq>
-      <packagereq>mod_wsgi</packagereq>
-      <packagereq>MySQL-python</packagereq>
-      <packagereq>numpy</packagereq>
-      <packagereq>numpy-f2py</packagereq>
-      <packagereq>pymongo</packagereq>
-      <packagereq>pymongo-gridfs</packagereq>
-      <packagereq>python</packagereq>
-      <packagereq>python-magic</packagereq>
-      <packagereq>python-psycopg2</packagereq>
-      <packagereq>python-virtualenv</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>rubyonrails</id>
-    <_name>Ruby on Rails</_name>
-    <_description>Ruby on Rails web application stack.</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>ruby</packagereq>
-      <packagereq>ruby-devel</packagereq>
-      <packagereq>rubygems</packagereq>
-      <packagereq>rubygem-abrt</packagereq>
-      <packagereq>rubygem-actionmailer</packagereq>
-      <packagereq>rubygem-actionpack</packagereq>
-      <packagereq>rubygem-activemodel</packagereq>
-      <packagereq>rubygem-activerecord</packagereq>
-      <packagereq>rubygem-activeresource</packagereq>
-      <packagereq>rubygem-activesupport</packagereq>
-      <packagereq>rubygem-arel</packagereq>
-      <packagereq>rubygem-bcrypt-ruby</packagereq>
-      <packagereq>rubygem-bigdecimal</packagereq>
-      <packagereq>rubygem-builder</packagereq>
-      <packagereq>rubygem-bundler</packagereq>
-      <packagereq>rubygem-coffee-rails</packagereq>
-      <packagereq>rubygem-coffee-script</packagereq>
-      <packagereq>rubygem-coffee-script-source</packagereq>
-      <packagereq>rubygem-diff-lcs</packagereq>
-      <packagereq>rubygem-erubis</packagereq>
-      <packagereq>rubygem-execjs</packagereq>
-      <packagereq>rubygem-hike</packagereq>
-      <packagereq>rubygem-i18n</packagereq>
-      <packagereq>rubygem-io-console</packagereq>
-      <packagereq>rubygem-jbuilder</packagereq>
-      <packagereq>rubygem-journey</packagereq>
-      <packagereq>rubygem-jquery-rails</packagereq>
-      <packagereq>rubygem-json</packagereq>
-      <packagereq>rubygem-listen</packagereq>
-      <packagereq>rubygem-mail</packagereq>
-      <packagereq>rubygem-mime-types</packagereq>
-      <packagereq>rubygem-minitest</packagereq>
-      <packagereq>rubygem-mongo</packagereq>
-      <packagereq>rubygem-multi_json</packagereq>
-      <packagereq>rubygem-passenger</packagereq>
-      <packagereq>rubygem-passenger-devel</packagereq>
-      <packagereq>rubygem-passenger-native</packagereq>
-      <packagereq>rubygem-passenger-native-libs</packagereq>
-      <packagereq>rubygem-net-http-persistent</packagereq>
-      <packagereq>rubygem-polyglot</packagereq>
-      <packagereq>rubygem-rack</packagereq>
-      <packagereq>rubygem-rack-cache</packagereq>
-      <packagereq>rubygem-rack-ssl</packagereq>
-      <packagereq>rubygem-rack-test</packagereq>
-      <packagereq>rubygem-rails</packagereq>
-      <packagereq>rubygem-railties</packagereq>
-      <packagereq>rubygem-rake</packagereq>
-      <packagereq>rubygem-rdoc</packagereq>
-      <packagereq>rubygem-ref</packagereq>
-      <packagereq>rubygem-ruby2ruby</packagereq>
-      <packagereq>rubygem-ruby_parser</packagereq>
-      <packagereq>rubygem-sass</packagereq>
-      <packagereq>rubygem-sass-rails</packagereq>
-      <packagereq>rubygem-sexp_processor</packagereq>
-      <packagereq>rubygem-sinatra</packagereq>
-      <packagereq>rubygem-sprockets</packagereq>
-      <packagereq>rubygem-sqlite3</packagereq>
-      <packagereq>rubygem-therubyracer</packagereq>
-      <packagereq>rubygem-thor</packagereq>
-      <packagereq>rubygem-tilt</packagereq>
-      <packagereq>rubygem-treetop</packagereq>
-      <packagereq>rubygem-turbolinks</packagereq>
-      <packagereq>rubygem-tzinfo</packagereq>
-      <packagereq>rubygem-uglifier</packagereq>
-      <packagereq>ruby-irb</packagereq>
-      <packagereq>ruby-libs</packagereq>
-      <packagereq>sqlite-devel</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>tomcat</id>
-    <_name>Tomcat</_name>
-    <_description>Tomcat web application server.</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>tomcat-native</packagereq>
-      <packagereq>tomcat</packagereq>
-      <packagereq>tomcat-admin-webapps</packagereq>
-      <packagereq>tomcat-webapps</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>load-balancer</id>
-    <_name>Load Balancer</_name>
-    <_description>Load balancing support for network traffic</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>ipvsadm</packagereq>
-      <packagereq>keepalived</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>ha</id>
-    <_name>High Availability</_name>
-    <_description>Infrastructure for highly available services and/or shared storage.</_description>
+    <id>3d-printing</id>
+    <_name>3D Printing</_name>
+    <_description>3D printing software</_description>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <packagelist>
-      <packagereq>pacemaker</packagereq>
-      <packagereq>fence-agents</packagereq>
-      <packagereq>omping</packagereq>
-      <packagereq>pcs</packagereq>
+      <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>
@@ -1077,8 +91,8 @@
       <packagereq>uboot-smdkv310</packagereq>
       <packagereq>uboot-tools</packagereq>
       <packagereq>uboot-wandboard_dl</packagereq>
-      <packagereq>uboot-wandboard_solo</packagereq>
       <packagereq>uboot-wandboard_quad</packagereq>
+      <packagereq>uboot-wandboard_solo</packagereq>
       <packagereq>xfsprogs</packagereq>
       <packagereq>yaboot</packagereq>
     </packagelist>
@@ -1139,8 +153,8 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq type="default">Add64</packagereq>
       <packagereq type="default">a2jmidid</packagereq>
+      <packagereq type="default">Add64</packagereq>
       <packagereq type="default">aj-snapshot</packagereq>
       <packagereq type="default">alsa-firmware</packagereq>
       <packagereq type="default">alsa-plugins-jack</packagereq>
@@ -1173,8 +187,8 @@
       <packagereq type="default">jack-audio-connection-kit</packagereq>
       <packagereq type="default">jack-audio-connection-kit-dbus</packagereq>
       <packagereq type="default">jack-rack</packagereq>
-      <packagereq type="default">jack_capture</packagereq>
       <packagereq type="default">jackctlmmc</packagereq>
+      <packagereq type="default">jack_capture</packagereq>
       <packagereq type="default">jamin</packagereq>
       <packagereq type="default">japa</packagereq>
       <packagereq type="default">jmeters</packagereq>
@@ -1267,10 +281,10 @@
       <packagereq type="default">docbook5-schemas</packagereq>
       <packagereq type="default">docbook5-style-xsl</packagereq>
       <packagereq type="default">linuxdoc-tools</packagereq>
+      <packagereq type="default">tex-fonts-hebrew</packagereq>
       <packagereq type="default">texlive</packagereq>
       <packagereq type="default">texlive-cm-lgc</packagereq>
       <packagereq type="default">texlive-kerkis</packagereq>
-      <packagereq type="default">tex-fonts-hebrew</packagereq>
       <packagereq type="default">xhtml1-dtds</packagereq>
       <packagereq type="default">xmlto</packagereq>
       <packagereq type="optional">abcm2ps</packagereq>
@@ -1293,116 +307,65 @@
       <packagereq type="optional">scribus</packagereq>
       <packagereq type="optional">tex-zfuzz</packagereq>
       <packagereq type="optional">texlive-latex</packagereq>
+      <packagereq type="optional">texlive-xdvi</packagereq>
       <packagereq type="optional">txt2rss</packagereq>
       <packagereq type="optional">w3c-markup-validator</packagereq>
-      <packagereq type="optional">texlive-xdvi</packagereq>
       <packagereq type="optional">xmlcopyeditor</packagereq>
     </packagelist>
   </group>
   <group>
-    <id>standard</id>
-    <_name>Standard</_name>
-    <_description>Common set of utilities that extend the minimal installation.</_description>
+    <id>base-x</id>
+    <_name>base-x</_name>
+    <_description>Local X.org display server</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq>acl</packagereq>
-      <packagereq>at</packagereq>
-      <packagereq>attr</packagereq>
-      <packagereq>bc</packagereq>
-      <packagereq>bind-utils</packagereq>
-      <packagereq>bzip2</packagereq>
-      <packagereq>cpio</packagereq>
-      <packagereq>crontabs</packagereq>
-      <packagereq>cyrus-sasl-plain</packagereq>
-      <packagereq>dbus</packagereq>
-      <packagereq>ed</packagereq>
-      <packagereq>file</packagereq>
-      <packagereq>fpaste</packagereq>
-      <packagereq>logrotate</packagereq>
-      <packagereq>lsof</packagereq>
-      <packagereq>mailcap</packagereq>
-      <packagereq>ntsysv</packagereq>
-      <packagereq>pciutils</packagereq>
-      <packagereq>psacct</packagereq>
-      <packagereq>quota</packagereq>
-      <packagereq>tmpwatch</packagereq>
-      <packagereq>traceroute</packagereq>
-      <packagereq type="conditional" requires="control-center">chrony</packagereq>
-      <packagereq>bash-completion</packagereq>
-      <packagereq>bridge-utils</packagereq>
-      <packagereq>btrfs-progs</packagereq>
-      <packagereq>cifs-utils</packagereq>
-      <packagereq>coolkey</packagereq>
-      <packagereq>cryptsetup</packagereq>
-      <packagereq>deltarpm</packagereq>
-      <packagereq>dos2unix</packagereq>
-      <packagereq>dosfstools</packagereq>
-      <packagereq>dump</packagereq>
-      <packagereq>ethtool</packagereq>
-      <packagereq>fedora-release-notes</packagereq>
-      <packagereq>finger</packagereq>
-      <packagereq>fprintd-pam</packagereq>
-      <packagereq>ftp</packagereq>
-      <packagereq>gnupg2</packagereq>
-      <packagereq>hunspell</packagereq>
-      <packagereq>iptstate</packagereq>
-      <packagereq>irda-utils</packagereq>
-      <packagereq>irqbalance</packagereq>
-      <packagereq>jwhois</packagereq>
-      <packagereq>lftp</packagereq>
-      <packagereq>man-pages</packagereq>
-      <packagereq>mcelog</packagereq>
-      <packagereq>mdadm</packagereq>
-      <packagereq>microcode_ctl</packagereq>
-      <packagereq>mlocate</packagereq>
-      <packagereq>mtr</packagereq>
-      <packagereq>nano</packagereq>
-      <packagereq>net-tools</packagereq>
-      <packagereq>nfs-utils</packagereq>
-      <packagereq>nmap-ncat</packagereq>
-      <packagereq>ntfs-3g</packagereq>
-      <packagereq>ntfsprogs</packagereq>
-      <packagereq>numactl</packagereq>
-      <packagereq>PackageKit-yum-plugin</packagereq>
-      <packagereq>pam_krb5</packagereq>
-      <packagereq>pam_pkcs11</packagereq>
-      <packagereq>passwdqc</packagereq>
-      <packagereq>pcmciautils</packagereq>
-      <packagereq>pinfo</packagereq>
-      <packagereq>plymouth</packagereq>
-      <packagereq>pm-utils</packagereq>
-      <packagereq>prelink</packagereq>
-      <packagereq>rdist</packagereq>
-      <packagereq>realmd</packagereq>
-      <packagereq>rng-tools</packagereq>
-      <packagereq>rsh</packagereq>
-      <packagereq>rsync</packagereq>
-      <packagereq>rsyslog</packagereq>
-      <packagereq>setuptool</packagereq>
-      <packagereq>smartmontools</packagereq>
-      <packagereq>sos</packagereq>
-      <packagereq>sssd</packagereq>
-      <packagereq>stunnel</packagereq>
-      <packagereq>sudo</packagereq>
-      <packagereq>symlinks</packagereq>
-      <packagereq>talk</packagereq>
-      <packagereq>tar</packagereq>
-      <packagereq>tcpdump</packagereq>
-      <packagereq>tcp_wrappers</packagereq>
-      <packagereq>telnet</packagereq>
-      <packagereq>time</packagereq>
-      <packagereq>tree</packagereq>
-      <packagereq>unzip</packagereq>
-      <packagereq>usbutils</packagereq>
-      <packagereq>vconfig</packagereq>
-      <packagereq>wget</packagereq>
-      <packagereq>which</packagereq>
-      <packagereq>wireless-tools</packagereq>
-      <packagereq>words</packagereq>
-      <packagereq>yum-langpacks</packagereq>
-      <packagereq>yum-utils</packagereq>
-      <packagereq>zip</packagereq>
+      <packagereq>glx-utils</packagereq>
+      <packagereq>mesa-dri-drivers</packagereq>
+      <packagereq>plymouth-system-theme</packagereq>
+      <packagereq>xorg-x11-drv-ati</packagereq>
+      <packagereq>xorg-x11-drv-evdev</packagereq>
+      <packagereq>xorg-x11-drv-fbdev</packagereq>
+      <packagereq>xorg-x11-drv-geode</packagereq>
+      <packagereq>xorg-x11-drv-intel</packagereq>
+      <packagereq>xorg-x11-drv-mga</packagereq>
+      <packagereq>xorg-x11-drv-modesetting</packagereq>
+      <packagereq>xorg-x11-drv-nouveau</packagereq>
+      <packagereq>xorg-x11-drv-omap</packagereq>
+      <packagereq>xorg-x11-drv-openchrome</packagereq>
+      <packagereq>xorg-x11-drv-qxl</packagereq>
+      <packagereq>xorg-x11-drv-synaptics</packagereq>
+      <packagereq>xorg-x11-drv-vesa</packagereq>
+      <packagereq>xorg-x11-drv-vmmouse</packagereq>
+      <packagereq>xorg-x11-drv-vmware</packagereq>
+      <packagereq>xorg-x11-drv-wacom</packagereq>
+      <packagereq>xorg-x11-server-Xorg</packagereq>
+      <packagereq>xorg-x11-utils</packagereq>
+      <packagereq>xorg-x11-xauth</packagereq>
+      <packagereq>xorg-x11-xinit</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>basic-desktop</id>
+    <_name>Basic Desktop</_name>
+    <_description>Basic X Window System with a choice of window manager.</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>adwaita-cursor-theme</packagereq>
+      <packagereq>adwaita-gtk2-theme</packagereq>
+      <packagereq>adwaita-gtk3-theme</packagereq>
+      <packagereq>awesome</packagereq>
+      <packagereq>dwm</packagereq>
+      <packagereq>fedora-icon-theme</packagereq>
+      <packagereq>gnome-icon-theme-symbolic</packagereq>
+      <packagereq>i3</packagereq>
+      <packagereq>initial-setup</packagereq>
+      <packagereq>lightdm</packagereq>
+      <packagereq>metacity</packagereq>
+      <packagereq>openbox</packagereq>
+      <packagereq>ratpoison</packagereq>
+      <packagereq>xmonad-basic</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1508,6 +471,114 @@
     </packagelist>
   </group>
   <group>
+    <id>c-development</id>
+    <_name>C Development Tools and Libraries</_name>
+    <_description>These tools include core development tools such as automake, gcc and debuggers.</_description>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">autoconf</packagereq>
+      <packagereq type="mandatory">automake</packagereq>
+      <packagereq type="mandatory">binutils</packagereq>
+      <packagereq type="mandatory">bison</packagereq>
+      <packagereq type="mandatory">flex</packagereq>
+      <packagereq basearchonly="true" type="mandatory">gcc</packagereq>
+      <packagereq basearchonly="true" type="mandatory">gcc-c++</packagereq>
+      <packagereq basearchonly="true" type="mandatory">gdb</packagereq>
+      <packagereq type="mandatory">glibc-devel</packagereq>
+      <packagereq type="mandatory">libtool</packagereq>
+      <packagereq type="mandatory">make</packagereq>
+      <packagereq type="mandatory">pkgconfig</packagereq>
+      <packagereq type="mandatory">strace</packagereq>
+      <packagereq type="default">byacc</packagereq>
+      <packagereq type="default">ccache</packagereq>
+      <packagereq type="default">cscope</packagereq>
+      <packagereq type="default">ctags</packagereq>
+      <packagereq type="default">elfutils</packagereq>
+      <packagereq type="default">indent</packagereq>
+      <packagereq basearchonly="true" type="default">ltrace</packagereq>
+      <packagereq basearchonly="true" type="default">oprofile</packagereq>
+      <packagereq basearchonly="true" type="default">oprofile-gui</packagereq>
+      <packagereq type="default">valgrind</packagereq>
+      <packagereq type="optional">astyle</packagereq>
+      <packagereq type="optional">check</packagereq>
+      <packagereq type="optional">cmake</packagereq>
+      <packagereq type="optional">coan</packagereq>
+      <packagereq type="optional">cproto</packagereq>
+      <packagereq type="optional">ElectricFence</packagereq>
+      <packagereq type="optional">elfinfo</packagereq>
+      <packagereq type="optional">insight</packagereq>
+      <packagereq type="optional">nasm</packagereq>
+      <packagereq type="optional">pscan</packagereq>
+      <packagereq type="optional">scons</packagereq>
+      <packagereq type="optional">splint</packagereq>
+      <packagereq type="optional">undertaker</packagereq>
+      <packagereq type="optional">yasm</packagereq>
+      <packagereq type="optional">zzuf</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>cinnamon-desktop</id>
+    <_name>Cinnamon</_name>
+    <_description>Cinnamon provides a desktop with a traditional layout, advanced features, easy to use, powerful and flexible.</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>abrt-desktop</packagereq>
+      <packagereq>abrt-java-connector</packagereq>
+      <packagereq>alsa-plugins-pulseaudio</packagereq>
+      <packagereq>brasero</packagereq>
+      <packagereq>cinnamon</packagereq>
+      <packagereq>cinnamon-control-center</packagereq>
+      <packagereq>cinnamon-screensaver</packagereq>
+      <packagereq>eog</packagereq>
+      <packagereq>evince</packagereq>
+      <packagereq>fedora-icon-theme</packagereq>
+      <packagereq>firefox</packagereq>
+      <packagereq>firewall-config</packagereq>
+      <packagereq>fros-recordmydesktop</packagereq>
+      <packagereq>gedit</packagereq>
+      <packagereq>gnome-backgrounds</packagereq>
+      <packagereq>gnome-calculator</packagereq>
+      <packagereq>gnome-disk-utility</packagereq>
+      <packagereq>gnome-icon-theme</packagereq>
+      <packagereq>gnome-icon-theme-extras</packagereq>
+      <packagereq>gnome-icon-theme-legacy</packagereq>
+      <packagereq>gnome-icon-theme-symbolic</packagereq>
+      <packagereq>gnome-screenshot</packagereq>
+      <packagereq>gnome-system-monitor</packagereq>
+      <packagereq>gnome-terminal</packagereq>
+      <packagereq>gvfs-archive</packagereq>
+      <packagereq>gvfs-gphoto2</packagereq>
+      <packagereq>gvfs-mtp</packagereq>
+      <packagereq>gvfs-smb</packagereq>
+      <packagereq>icedtea-web</packagereq>
+      <packagereq>imsettings-cinnamon</packagereq>
+      <packagereq>initial-setup</packagereq>
+      <packagereq>lightdm-gtk</packagereq>
+      <packagereq>metacity</packagereq>
+      <packagereq>nemo-fileroller</packagereq>
+      <packagereq>nemo-preview</packagereq>
+      <packagereq>network-manager-applet</packagereq>
+      <packagereq>NetworkManager-l2tp</packagereq>
+      <packagereq>NetworkManager-openconnect</packagereq>
+      <packagereq>NetworkManager-openvpn</packagereq>
+      <packagereq>NetworkManager-pptp</packagereq>
+      <packagereq>NetworkManager-vpnc</packagereq>
+      <packagereq>nm-connection-editor</packagereq>
+      <packagereq>policycoreutils-gui</packagereq>
+      <packagereq>sane-backends-drivers-scanners</packagereq>
+      <packagereq>setroubleshoot</packagereq>
+      <packagereq>shotwell</packagereq>
+      <packagereq>simple-scan</packagereq>
+      <packagereq>thunderbird</packagereq>
+      <packagereq>totem</packagereq>
+      <packagereq>totem-mozplugin</packagereq>
+      <packagereq>xdg-user-dirs-gtk</packagereq>
+      <packagereq>yumex</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>cloud-infrastructure</id>
     <_name>Cloud Infrastructure</_name>
     <_description>Infrastructure packages for cloud computing.</_description>
@@ -1578,10 +649,10 @@
       <packagereq type="mandatory">vim-minimal</packagereq>
       <packagereq type="mandatory">yum</packagereq>
       <packagereq type="default">authconfig</packagereq>
+      <packagereq type="default">dracut-config-rescue</packagereq>
       <packagereq type="default">firewalld</packagereq>
       <packagereq type="default">NetworkManager</packagereq>
       <packagereq type="default">ppc64-utils</packagereq>
-      <packagereq type="default">dracut-config-rescue</packagereq>
     </packagelist>
   </group>
   <!-- 
@@ -1613,8 +684,8 @@
       <packagereq type="mandatory">createrepo</packagereq>
       <packagereq type="mandatory">dash</packagereq>
       <packagereq type="mandatory">dracut</packagereq>
-      <packagereq type="mandatory">initial-setup</packagereq>
       <packagereq type="mandatory">gcc-c++</packagereq>
+      <packagereq type="mandatory">initial-setup</packagereq>
       <!-- 'kernel' is listed because we need to ensure that kernel
            packages exist and are installable etc. We're not using this
            to force-install 'kernel' over 'kernel-PAE' or anything. -->
@@ -1698,6 +769,33 @@
     </packagelist>
   </group>
   <group>
+    <id>d-development</id>
+    <_name>D Development Tools and Libraries</_name>
+    <_description>These include development tools and lib such as ldc, geany-tag  .</_description>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq basearchonly="true" type="mandatory">ldc</packagereq>
+      <packagereq basearchonly="true" type="mandatory">ldc-druntime</packagereq>
+      <packagereq basearchonly="true" type="mandatory">ldc-druntime-devel</packagereq>
+      <packagereq basearchonly="true" type="mandatory">ldc-phobos-devel</packagereq>
+      <packagereq type="mandatory">make</packagereq>
+      <packagereq type="mandatory">pkgconfig</packagereq>
+      <packagereq type="default">ctags</packagereq>
+      <packagereq type="default">indent</packagereq>
+      <packagereq type="optional">astyle</packagereq>
+      <packagereq type="optional">cmake</packagereq>
+      <packagereq type="optional">derelict-devel</packagereq>
+      <packagereq type="optional">geany</packagereq>
+      <packagereq type="optional">gl3n-devel</packagereq>
+      <packagereq type="optional">insight</packagereq>
+      <packagereq type="optional">nemiver</packagereq>
+      <packagereq type="optional">syntastic-d</packagereq>
+      <packagereq type="optional">tango-devel</packagereq>
+      <packagereq type="optional">uncrustify</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>design-suite</id>
     <_name>Design Suite</_name>
     <_description>These packages are targeted towards professional designers related to graphics, web and animation</_description>
@@ -1716,8 +814,8 @@
       <packagereq type="default">darktable</packagereq>
       <packagereq type="default">dia</packagereq>
       <packagereq type="default">entangle</packagereq>
-      <packagereq type="default">fontforge</packagereq>
       <packagereq type="default">font-manager</packagereq>
+      <packagereq type="default">fontforge</packagereq>
       <packagereq type="default">gimp</packagereq>
       <packagereq type="default">gimp-data-extras</packagereq>
       <packagereq type="default">gimp-fourier-plugin</packagereq>
@@ -1742,21 +840,21 @@
       <packagereq type="optional">audacity</packagereq>
       <packagereq type="optional">calligra-karbon</packagereq>
       <packagereq type="optional">calligra-krita</packagereq>
-	  <packagereq type="optional">cinepaint</packagereq>
+      <packagereq type="optional">cinepaint</packagereq>
       <packagereq type="optional">digikam</packagereq>
       <packagereq type="optional">gthumb</packagereq>
       <packagereq type="optional">istanbul</packagereq>
-	  <packagereq type="optional">LuxRender</packagereq>
-	  <packagereq type="optional">LuxRender-blender</packagereq>
+      <packagereq type="optional">LuxRender</packagereq>
+      <packagereq type="optional">LuxRender-blender</packagereq>
       <packagereq type="optional">openclipart</packagereq>
-	  <packagereq type="optional">pencil</packagereq>
+      <packagereq type="optional">pencil</packagereq>
       <packagereq type="optional">pitivi</packagereq>
       <packagereq type="optional">pngcrush</packagereq>
-	  <packagereq type="optional">rawtherapee</packagereq>
-	  <packagereq type="optional">ufraw</packagereq>
-	  <packagereq type="optional">wings</packagereq>
-	  <packagereq type="optional">YafaRay</packagereq>
-	  <packagereq type="optional">YafaRay-blender</packagereq>
+      <packagereq type="optional">rawtherapee</packagereq>
+      <packagereq type="optional">ufraw</packagereq>
+      <packagereq type="optional">wings</packagereq>
+      <packagereq type="optional">YafaRay</packagereq>
+      <packagereq type="optional">YafaRay-blender</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1825,24 +923,6 @@
     </packagelist>
   </group>
   <group>
-    <id>rpm-development-tools</id>
-    <_name>RPM Development Tools</_name>
-    <_description>These tools include core development tools such rpmbuild.</_description>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">redhat-rpm-config</packagereq>
-      <packagereq type="mandatory">rpm-build</packagereq>
-      <packagereq type="default">koji</packagereq>
-      <packagereq type="default">mock</packagereq>
-      <packagereq type="default">rpmdevtools</packagereq>
-      <packagereq type="optional">plague-client</packagereq>
-      <packagereq type="optional">pungi</packagereq>
-      <packagereq type="optional">revisor</packagereq>
-      <packagereq type="optional">rpmlint</packagereq>
-    </packagelist>
-  </group>
-  <group>
     <id>development-tools</id>
     <_name>Development Tools</_name>
     <_description>These tools include general development tools such as git and cvs.</_description>
@@ -1872,8 +952,8 @@
       <packagereq type="optional">gambas3-ide</packagereq>
       <packagereq type="optional">giggle</packagereq>
       <packagereq type="optional">git-annex</packagereq>
-      <packagereq type="optional">git2cl</packagereq>
       <packagereq type="optional">git-cola</packagereq>
+      <packagereq type="optional">git2cl</packagereq>
       <packagereq type="optional">gitg</packagereq>
       <packagereq type="optional">gtranslator</packagereq>
       <packagereq type="optional">highlight</packagereq>
@@ -1884,92 +964,18 @@
       <packagereq type="optional">monotone</packagereq>
       <packagereq type="optional">mr</packagereq>
       <packagereq type="optional">nemiver</packagereq>
-      <packagereq type="optional">qgit</packagereq>
-      <packagereq type="optional">quilt</packagereq>
-      <packagereq type="optional">rapidsvn</packagereq>
-      <packagereq type="optional">robodoc</packagereq>
-      <packagereq type="optional">scanmem</packagereq>
-      <packagereq type="optional">svn2cl</packagereq>
-      <packagereq type="optional">tailor</packagereq>
-      <packagereq type="optional">tig</packagereq>
-      <packagereq type="optional">tkcvs</packagereq>
-      <packagereq type="optional">tortoisehg</packagereq>
-      <packagereq type="optional">translate-toolkit</packagereq>
-      <packagereq type="optional">utrac</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>c-development</id>
-    <_name>C Development Tools and Libraries</_name>
-    <_description>These tools include core development tools such as automake, gcc and debuggers.</_description>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">autoconf</packagereq>
-      <packagereq type="mandatory">automake</packagereq>
-      <packagereq type="mandatory">binutils</packagereq>
-      <packagereq type="mandatory">bison</packagereq>
-      <packagereq type="mandatory">flex</packagereq>
-      <packagereq basearchonly="true" type="mandatory">gcc</packagereq>
-      <packagereq basearchonly="true" type="mandatory">gcc-c++</packagereq>
-      <packagereq basearchonly="true" type="mandatory">gdb</packagereq>
-      <packagereq type="mandatory">glibc-devel</packagereq>
-      <packagereq type="mandatory">libtool</packagereq>
-      <packagereq type="mandatory">make</packagereq>
-      <packagereq type="mandatory">pkgconfig</packagereq>
-      <packagereq type="mandatory">strace</packagereq>
-      <packagereq type="default">byacc</packagereq>
-      <packagereq type="default">ccache</packagereq>
-      <packagereq type="default">cscope</packagereq>
-      <packagereq type="default">ctags</packagereq>
-      <packagereq type="default">elfutils</packagereq>
-      <packagereq type="default">indent</packagereq>
-      <packagereq basearchonly="true" type="default">ltrace</packagereq>
-      <packagereq basearchonly="true" type="default">oprofile</packagereq>
-      <packagereq basearchonly="true" type="default">oprofile-gui</packagereq>
-      <packagereq type="default">valgrind</packagereq>
-      <packagereq type="optional">astyle</packagereq>
-      <packagereq type="optional">check</packagereq>
-      <packagereq type="optional">cmake</packagereq>
-      <packagereq type="optional">coan</packagereq>
-      <packagereq type="optional">cproto</packagereq>
-      <packagereq type="optional">ElectricFence</packagereq>
-      <packagereq type="optional">elfinfo</packagereq>
-      <packagereq type="optional">insight</packagereq>
-      <packagereq type="optional">nasm</packagereq>
-      <packagereq type="optional">pscan</packagereq>
-      <packagereq type="optional">scons</packagereq>
-      <packagereq type="optional">splint</packagereq>
-      <packagereq type="optional">undertaker</packagereq>
-      <packagereq type="optional">yasm</packagereq>
-      <packagereq type="optional">zzuf</packagereq>
-    </packagelist>
-    </group>
-    <group>
-    <id>d-development</id>
-    <_name>D Development Tools and Libraries</_name>
-    <_description>These include development tools and lib such as ldc, geany-tag  .</_description>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <packagelist>
-      <packagereq basearchonly="true" type="mandatory">ldc</packagereq>
-      <packagereq basearchonly="true" type="mandatory">ldc-druntime-devel</packagereq>
-      <packagereq basearchonly="true" type="mandatory">ldc-phobos-devel</packagereq>
-      <packagereq basearchonly="true" type="mandatory">ldc-druntime</packagereq>
-      <packagereq type="mandatory">make</packagereq>
-      <packagereq type="mandatory">pkgconfig</packagereq>
-      <packagereq type="default">ctags</packagereq>
-      <packagereq type="default">indent</packagereq>
-      <packagereq type="optional">astyle</packagereq>
-      <packagereq type="optional">cmake</packagereq>
-      <packagereq type="optional">insight</packagereq>
-      <packagereq type="optional">nemiver</packagereq>
-      <packagereq type="optional">uncrustify</packagereq>
-      <packagereq type="optional">geany</packagereq>
-      <packagereq type="optional">syntastic-d</packagereq>
-      <packagereq type="optional">gl3n-devel</packagereq>
-      <packagereq type="optional">derelict-devel</packagereq>
-      <packagereq type="optional">tango-devel</packagereq>
+      <packagereq type="optional">qgit</packagereq>
+      <packagereq type="optional">quilt</packagereq>
+      <packagereq type="optional">rapidsvn</packagereq>
+      <packagereq type="optional">robodoc</packagereq>
+      <packagereq type="optional">scanmem</packagereq>
+      <packagereq type="optional">svn2cl</packagereq>
+      <packagereq type="optional">tailor</packagereq>
+      <packagereq type="optional">tig</packagereq>
+      <packagereq type="optional">tkcvs</packagereq>
+      <packagereq type="optional">tortoisehg</packagereq>
+      <packagereq type="optional">translate-toolkit</packagereq>
+      <packagereq type="optional">utrac</packagereq>
     </packagelist>
   </group>
   <group>
@@ -2109,19 +1115,6 @@
       <packagereq type="optional">eclipse-veditor</packagereq>
     </packagelist>
   </group>
-   <group>
-    <id>freeipa-server</id>
-    <_name>FreeIPA Server</_name>
-    <_description>Provides central directory services for identity, policy management and auditing.</_description>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">freeipa-server</packagereq>
-      <packagereq type="default">freeipa-server-strict</packagereq>
-      <packagereq type="default">freeipa-server-trust-ad</packagereq>
-      <packagereq type="default">bind-dyndb-ldap</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>editors</id>
     <_name>Editors</_name>
@@ -2495,6 +1488,16 @@
     </packagelist>
   </group>
   <group>
+    <id>epiphany</id>
+    <_name>Epiphany Web Browser</_name>
+    <_description>Epiphany Web Browser for GNOME</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>epiphany</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>ethiopic-support</id>
     <_name>Ethiopic Support</_name>
     <_description/>
@@ -2558,6 +1561,17 @@
     </packagelist>
   </group>
   <group>
+    <id>firefox</id>
+    <_name>Firefox Web Browser</_name>
+    <_description>The Firefox web browser</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>firefox</packagereq>
+      <packagereq>icedtea-web</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>font-design</id>
     <_name>Font design and packaging</_name>
     <_description>This group is a collection of tools used in the design, modification, manipulation, and packaging of fonts.</_description>
@@ -2578,9 +1592,9 @@
       <packagereq type="default">gnome-specimen</packagereq>
       <packagereq type="default">gucharmap</packagereq>
       <packagereq type="default">inkscape</packagereq>
-      <packagereq type="default">texlive-lcdftypetools</packagereq>
       <packagereq type="default">perl-Font-TTF</packagereq>
       <packagereq type="default">poppler-utils</packagereq>
+      <packagereq type="default">texlive-lcdftypetools</packagereq>
       <packagereq type="default">xgridfit-doc</packagereq>
       <packagereq type="optional">bzr</packagereq>
       <packagereq type="optional">cube2font</packagereq>
@@ -2816,7 +1830,7 @@
       <packagereq type="optional">google-noto-sans-telugu-ui-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-thai-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-thai-ui-fonts</packagereq>
-     <packagereq type="optional">google-noto-sans-ugaritic-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-ugaritic-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-ui-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-vai-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-armenian-fonts</packagereq>
@@ -2959,8 +1973,6 @@
       <packagereq type="optional">sil-gentium-basic-fonts</packagereq>
       <packagereq type="optional">sil-gentium-fonts</packagereq>
       <packagereq type="optional">sil-lateef-fonts</packagereq>
-      <packagereq type="optional">sil-mingzat-fonts</packagereq>
-      <packagereq type="optional">sil-nuosu-fonts</packagereq>
       <packagereq type="optional">sil-scheherazade-fonts</packagereq>
       <packagereq type="optional">silkscreen-expanded-fonts</packagereq>
       <packagereq type="optional">silkscreen-fonts</packagereq>
@@ -2973,7 +1985,6 @@
       <packagereq type="optional">smc-raghumalayalam-fonts</packagereq>
       <packagereq type="optional">smc-suruma-fonts</packagereq>
       <packagereq type="optional">stix-math-fonts</packagereq>
-      <packagereq type="optional">tabish-eeyek-fonts</packagereq>
       <packagereq type="optional">tangerine-fonts</packagereq>
       <packagereq type="optional">thai-arundina-sans-fonts</packagereq>
       <packagereq type="optional">thai-arundina-sans-mono-fonts</packagereq>
@@ -3044,6 +2055,19 @@
     </packagelist>
   </group>
   <group>
+    <id>freeipa-server</id>
+    <_name>FreeIPA Server</_name>
+    <_description>Provides central directory services for identity, policy management and auditing.</_description>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">freeipa-server</packagereq>
+      <packagereq type="default">bind-dyndb-ldap</packagereq>
+      <packagereq type="default">freeipa-server-strict</packagereq>
+      <packagereq type="default">freeipa-server-trust-ad</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>ftp-server</id>
     <_name>FTP Server</_name>
     <_description>These tools allow you to run an FTP server on the system.</_description>
@@ -3192,12 +2216,12 @@
       <packagereq type="optional">grhino</packagereq>
       <packagereq type="optional">gweled</packagereq>
       <packagereq type="optional">haxima</packagereq>
+      <packagereq type="optional">hedgewars</packagereq>
       <packagereq type="optional">hexglass</packagereq>
       <packagereq type="optional">hitori</packagereq>
-      <packagereq type="optional">iapetal</packagereq>
       <packagereq type="optional">iagno</packagereq>
+      <packagereq type="optional">iapetal</packagereq>
       <packagereq type="optional">joystick</packagereq>
-      <packagereq type="optional">hedgewars</packagereq>
       <packagereq type="optional">kbilliards</packagereq>
       <packagereq type="optional">kcheckers</packagereq>
       <packagereq type="optional">kdeaddons-atlantikdesigner</packagereq>
@@ -3228,8 +2252,8 @@
       <packagereq type="optional">MegaMek</packagereq>
       <packagereq type="optional">methane</packagereq>
       <packagereq type="optional">mindless</packagereq>
-      <packagereq type="optional">mine_detector</packagereq>
       <packagereq type="optional">minetest</packagereq>
+      <packagereq type="optional">mine_detector</packagereq>
       <packagereq type="optional">mirrormagic</packagereq>
       <packagereq type="optional">mj</packagereq>
       <packagereq type="optional">monsterz</packagereq>
@@ -3304,8 +2328,8 @@
       <packagereq type="optional">sumwars</packagereq>
       <packagereq type="optional">supertux</packagereq>
       <packagereq type="optional">supertuxkart</packagereq>
-      <packagereq type="optional">taggle</packagereq>
       <packagereq type="optional">swell-foop</packagereq>
+      <packagereq type="optional">taggle</packagereq>
       <packagereq type="optional">tali</packagereq>
       <packagereq type="optional">taxipilot</packagereq>
       <packagereq type="optional">tecnoballz</packagereq>
@@ -3400,6 +2424,144 @@
     </packagelist>
   </group>
   <group>
+    <id>gnome-desktop</id>
+    <_name>GNOME</_name>
+    <_description>GNOME is a highly intuitive and user friendly desktop environment.</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>abrt-desktop</packagereq>
+      <packagereq>abrt-java-connector</packagereq>
+      <packagereq>aisleriot</packagereq>
+      <packagereq>at-spi2-atk</packagereq>
+      <packagereq>at-spi2-core</packagereq>
+      <packagereq>avahi</packagereq>
+      <packagereq>baobab</packagereq>
+      <packagereq>bijiben</packagereq>
+      <packagereq>brasero</packagereq>
+      <packagereq>brasero-nautilus</packagereq>
+      <packagereq>caribou</packagereq>
+      <packagereq>caribou-gtk2-module</packagereq>
+      <packagereq>caribou-gtk3-module</packagereq>
+      <packagereq>cheese</packagereq>
+      <packagereq>control-center</packagereq>
+      <packagereq>dconf</packagereq>
+      <packagereq>deja-dup</packagereq>
+      <packagereq>desktop-backgrounds-basic</packagereq>
+      <packagereq>empathy</packagereq>
+      <packagereq>eog</packagereq>
+      <packagereq>evince</packagereq>
+      <packagereq>evince-nautilus</packagereq>
+      <packagereq>evolution</packagereq>
+      <packagereq>evolution-ews</packagereq>
+      <packagereq>evolution-help</packagereq>
+      <packagereq>file-roller</packagereq>
+      <packagereq>file-roller-nautilus</packagereq>
+      <packagereq>firewall-config</packagereq>
+      <packagereq>fprintd-pam</packagereq>
+      <packagereq>fros-gnome</packagereq>
+      <packagereq>gdm</packagereq>
+      <packagereq>gedit</packagereq>
+      <packagereq>glib-networking</packagereq>
+      <packagereq>gnome-backgrounds</packagereq>
+      <packagereq>gnome-bluetooth</packagereq>
+      <packagereq>gnome-boxes</packagereq>
+      <packagereq>gnome-calculator</packagereq>
+      <packagereq>gnome-clocks</packagereq>
+      <packagereq>gnome-color-manager</packagereq>
+      <packagereq>gnome-contacts</packagereq>
+      <packagereq>gnome-dictionary</packagereq>
+      <packagereq>gnome-disk-utility</packagereq>
+      <packagereq>gnome-documents</packagereq>
+      <packagereq>gnome-epub-thumbnailer</packagereq>
+      <packagereq>gnome-font-viewer</packagereq>
+      <packagereq>gnome-getting-started-docs</packagereq>
+      <packagereq>gnome-icon-theme</packagereq>
+      <packagereq>gnome-icon-theme-extras</packagereq>
+      <packagereq>gnome-icon-theme-symbolic</packagereq>
+      <packagereq>gnome-initial-setup</packagereq>
+      <packagereq>gnome-maps</packagereq>
+      <packagereq>gnome-packagekit</packagereq>
+      <packagereq>gnome-photos</packagereq>
+      <packagereq>gnome-screenshot</packagereq>
+      <packagereq>gnome-session-xsession</packagereq>
+      <packagereq>gnome-settings-daemon</packagereq>
+      <packagereq>gnome-shell</packagereq>
+      <packagereq>gnome-software</packagereq>
+      <packagereq>gnome-system-log</packagereq>
+      <packagereq>gnome-system-monitor</packagereq>
+      <packagereq>gnome-terminal</packagereq>
+      <packagereq>gnome-themes-standard</packagereq>
+      <packagereq>gnome-user-docs</packagereq>
+      <packagereq>gnome-weather</packagereq>
+      <packagereq>gucharmap</packagereq>
+      <packagereq>gvfs-afc</packagereq>
+      <packagereq>gvfs-afp</packagereq>
+      <packagereq>gvfs-archive</packagereq>
+      <packagereq>gvfs-fuse</packagereq>
+      <packagereq>gvfs-goa</packagereq>
+      <packagereq>gvfs-gphoto2</packagereq>
+      <packagereq>gvfs-mtp</packagereq>
+      <packagereq>gvfs-smb</packagereq>
+      <packagereq>libcanberra-gtk2</packagereq>
+      <packagereq>libcanberra-gtk3</packagereq>
+      <packagereq>libproxy-mozjs</packagereq>
+      <packagereq>librsvg2</packagereq>
+      <packagereq>libsane-hpaio</packagereq>
+      <packagereq>mousetweaks</packagereq>
+      <packagereq>nautilus</packagereq>
+      <packagereq>nautilus-sendto</packagereq>
+      <packagereq>NetworkManager-l2tp</packagereq>
+      <packagereq>NetworkManager-openconnect</packagereq>
+      <packagereq>NetworkManager-openvpn-gnome</packagereq>
+      <packagereq>NetworkManager-pptp-gnome</packagereq>
+      <packagereq>NetworkManager-vpnc-gnome</packagereq>
+      <packagereq>nm-connection-editor</packagereq>
+      <packagereq>orca</packagereq>
+      <packagereq>PackageKit-command-not-found</packagereq>
+      <packagereq>PackageKit-gtk3-module</packagereq>
+      <packagereq>polkit-js-engine</packagereq>
+      <packagereq>rhythmbox</packagereq>
+      <packagereq>sane-backends-drivers-scanners</packagereq>
+      <packagereq>seahorse</packagereq>
+      <packagereq>setroubleshoot</packagereq>
+      <packagereq>shotwell</packagereq>
+      <packagereq>simple-scan</packagereq>
+      <packagereq>sushi</packagereq>
+      <packagereq>totem</packagereq>
+      <packagereq>totem-mozplugin</packagereq>
+      <packagereq>totem-nautilus</packagereq>
+      <packagereq>transmission-gtk</packagereq>
+      <packagereq>vinagre</packagereq>
+      <packagereq>xdg-user-dirs-gtk</packagereq>
+      <packagereq>yelp</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>gnome-games</id>
+    <_name>Extra games for the GNOME Desktop</_name>
+    <_description>A variety of games for the GNOME Desktop</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>five-or-more</packagereq>
+      <packagereq>four-in-a-row</packagereq>
+      <packagereq>gnome-chess</packagereq>
+      <packagereq>gnome-klotski</packagereq>
+      <packagereq>gnome-mahjongg</packagereq>
+      <packagereq>gnome-mines</packagereq>
+      <packagereq>gnome-nibbles</packagereq>
+      <packagereq>gnome-robots</packagereq>
+      <packagereq>gnome-sudoku</packagereq>
+      <packagereq>gnome-tetravex</packagereq>
+      <packagereq>iagno</packagereq>
+      <packagereq>lightsoff</packagereq>
+      <packagereq>quadrapassel</packagereq>
+      <packagereq>swell-foop</packagereq>
+      <packagereq>tali</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>gnome-software-development</id>
     <_name>GNOME Software Development</_name>
     <_description>Install these packages in order to develop GTK+ and GNOME graphical applications.</_description>
@@ -3420,9 +2582,9 @@
       <packagereq type="default">at-spi2-core-devel</packagereq>
       <packagereq type="default">clutter-gst-devel</packagereq>
       <packagereq type="default">clutter-gtk-devel</packagereq>
-      <packagereq type="default">diffstat</packagereq>
       <packagereq type="default">d-feet</packagereq>
       <packagereq type="default">devhelp</packagereq>
+      <packagereq type="default">diffstat</packagereq>
       <packagereq type="default">evolution-data-server-devel</packagereq>
       <packagereq type="default">gdb</packagereq>
       <packagereq type="default">gitg</packagereq>
@@ -3446,7 +2608,6 @@
       <packagereq type="optional">bakery-devel</packagereq>
       <packagereq type="optional">cairomm-devel</packagereq>
       <packagereq type="optional">cairomm-doc</packagereq>
-      <packagereq type="optional">clutter-gst-devel</packagereq>
       <packagereq type="optional">ddd</packagereq>
       <packagereq type="optional">GConf2-devel</packagereq>
       <packagereq type="optional">gconfmm26-devel</packagereq>
@@ -3489,12 +2650,6 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="optional">empathy</packagereq>
-      <packagereq type="optional">evolution</packagereq>
-      <packagereq type="optional">evolution-help</packagereq>
-      <packagereq type="optional">firefox</packagereq>
-      <packagereq type="optional">icedtea-web</packagereq>
-      <packagereq type="optional">transmission-gtk</packagereq>
       <packagereq type="optional">amsn</packagereq>
       <packagereq type="optional">arora</packagereq>
       <packagereq type="optional">azureus</packagereq>
@@ -3506,10 +2661,14 @@
       <packagereq type="optional">deluge</packagereq>
       <packagereq type="optional">dillo</packagereq>
       <packagereq type="optional">ekiga</packagereq>
+      <packagereq type="optional">empathy</packagereq>
       <packagereq type="optional">epiphany</packagereq>
+      <packagereq type="optional">evolution</packagereq>
       <packagereq type="optional">evolution-bogofilter</packagereq>
+      <packagereq type="optional">evolution-help</packagereq>
       <packagereq type="optional">evolution-perl</packagereq>
       <packagereq type="optional">filezilla</packagereq>
+      <packagereq type="optional">firefox</packagereq>
       <packagereq type="optional">fwbuilder</packagereq>
       <packagereq type="optional">gajim</packagereq>
       <packagereq type="optional">gftp</packagereq>
@@ -3519,6 +2678,7 @@
       <packagereq type="optional">gtorrentviewer</packagereq>
       <packagereq type="optional">gwget</packagereq>
       <packagereq type="optional">gyachi</packagereq>
+      <packagereq type="optional">icedtea-web</packagereq>
       <packagereq type="optional">jd</packagereq>
       <packagereq type="optional">kazehakase</packagereq>
       <packagereq type="optional">kdepim</packagereq>
@@ -3554,6 +2714,7 @@
       <packagereq type="optional">streamtuner</packagereq>
       <packagereq type="optional">sylpheed</packagereq>
       <packagereq type="optional">thunderbird</packagereq>
+      <packagereq type="optional">transmission-gtk</packagereq>
       <packagereq type="optional">transmission-qt</packagereq>
       <packagereq type="optional">uget</packagereq>
       <packagereq type="optional">valknut</packagereq>
@@ -3572,14 +2733,6 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="conditional" requires="gimp">xsane-gimp</packagereq>
-      <packagereq type="optional">gimp</packagereq>
-      <packagereq type="optional">gimp-data-extras</packagereq>
-      <packagereq type="optional">gimp-help</packagereq>
-      <packagereq type="optional">gimp-help-browser</packagereq>
-      <packagereq type="optional">libsane-hpaio</packagereq>
-      <packagereq type="optional">sane-backends-drivers-scanners</packagereq>
-      <packagereq type="optional">shotwell</packagereq>
-      <packagereq type="optional">simple-scan</packagereq>
       <packagereq type="optional">argyllcms</packagereq>
       <packagereq type="optional">asciio</packagereq>
       <packagereq type="optional">asymptote</packagereq>
@@ -3595,6 +2748,10 @@
       <packagereq type="optional">geeqie</packagereq>
       <packagereq type="optional">gifsicle</packagereq>
       <packagereq type="optional">gifview</packagereq>
+      <packagereq type="optional">gimp</packagereq>
+      <packagereq type="optional">gimp-data-extras</packagereq>
+      <packagereq type="optional">gimp-help</packagereq>
+      <packagereq type="optional">gimp-help-browser</packagereq>
       <packagereq type="optional">gipfel</packagereq>
       <packagereq type="optional">gpp</packagereq>
       <packagereq type="optional">graphviz</packagereq>
@@ -3610,6 +2767,7 @@
       <packagereq type="optional">kolourpaint</packagereq>
       <packagereq type="optional">kphotoalbum</packagereq>
       <packagereq type="optional">ksnapshot</packagereq>
+      <packagereq type="optional">libsane-hpaio</packagereq>
       <packagereq type="optional">makehuman</packagereq>
       <packagereq type="optional">mirage</packagereq>
       <packagereq type="optional">netpbm-progs</packagereq>
@@ -3622,7 +2780,10 @@
       <packagereq type="optional">rawstudio</packagereq>
       <packagereq type="optional">renrot</packagereq>
       <packagereq type="optional">sane-backends-drivers-cameras</packagereq>
+      <packagereq type="optional">sane-backends-drivers-scanners</packagereq>
       <packagereq type="optional">sane-frontends</packagereq>
+      <packagereq type="optional">shotwell</packagereq>
+      <packagereq type="optional">simple-scan</packagereq>
       <packagereq type="optional">tachyon</packagereq>
       <packagereq type="optional">tuxpaint</packagereq>
       <packagereq type="optional">tzclock</packagereq>
@@ -3677,6 +2838,29 @@
     </packagelist>
   </group>
   <group>
+    <id>guest-agents</id>
+    <_name>Guest Agents</_name>
+    <_description>Agents used when running under a hypervisor.</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>open-vm-tools</packagereq>
+      <packagereq>qemu-guest-agent</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>guest-desktop-agents</id>
+    <_name>Guest Desktop Agents</_name>
+    <_description>Agents used when running as a virtualized desktop.</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>open-vm-tools-desktop</packagereq>
+      <packagereq>qemu-guest-agent</packagereq>
+      <packagereq>spice-vdagent</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>gujarati-support</id>
     <_name>Gujarati Support</_name>
     <_description/>
@@ -3695,6 +2879,32 @@
     </packagelist>
   </group>
   <group>
+    <id>ha</id>
+    <_name>High Availability</_name>
+    <_description>Infrastructure for highly available services and/or shared storage.</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>fence-agents</packagereq>
+      <packagereq>omping</packagereq>
+      <packagereq>pacemaker</packagereq>
+      <packagereq>pcs</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>haproxy</id>
+    <_name>HAProxy</_name>
+    <_description>TCP/HTTP Load Balancer.</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>haproxy</packagereq>
+      <packagereq>rubygem-abrt</packagereq>
+      <packagereq>rubygem-daemons</packagereq>
+      <packagereq>rubygem-rest-client</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>hardware-support</id>
     <_name>Hardware Support</_name>
     <_description>This group is a collection of tools for various hardware specific utilities.</_description>
@@ -3710,9 +2920,9 @@
       <packagereq type="default">ipw2200-firmware</packagereq>
       <packagereq type="default">ivtv-firmware</packagereq>
       <packagereq type="default">iwl100-firmware</packagereq>
+      <packagereq type="default">iwl1000-firmware</packagereq>
       <packagereq type="default">iwl105-firmware</packagereq>
       <packagereq type="default">iwl135-firmware</packagereq>
-      <packagereq type="default">iwl1000-firmware</packagereq>
       <packagereq type="default">iwl2000-firmware</packagereq>
       <packagereq type="default">iwl2030-firmware</packagereq>
       <packagereq type="default">iwl3160-firmware</packagereq>
@@ -3759,7 +2969,6 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="conditional" requires="emacs">emacs-haskell-mode</packagereq>
       <packagereq>cabal-dev</packagereq>
       <packagereq>cabal-rpm</packagereq>
       <packagereq>darcs</packagereq>
@@ -3780,6 +2989,7 @@
       <packagereq>haskell-platform</packagereq>
       <packagereq>hlint</packagereq>
       <packagereq>hscolour</packagereq>
+      <packagereq type="conditional" requires="emacs">emacs-haskell-mode</packagereq>
       <packagereq type="optional">leksah</packagereq>
     </packagelist>
   </group>
@@ -3792,7 +3002,6 @@
     <langonly>he</langonly>
     <packagelist>
       <packagereq type="mandatory">dejavu-sans-fonts</packagereq>
-      <packagereq type="default">google-noto-sans-hebrew-fonts</packagereq>
       <packagereq type="default">culmus-aharoni-clm-fonts</packagereq>
       <packagereq type="default">culmus-caladings-clm-fonts</packagereq>
       <packagereq type="default">culmus-david-clm-fonts</packagereq>
@@ -3808,6 +3017,7 @@
       <packagereq type="default">culmus-stamashkenaz-clm-fonts</packagereq>
       <packagereq type="default">culmus-stamsefarad-clm-fonts</packagereq>
       <packagereq type="default">culmus-yehuda-clm-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-hebrew-fonts</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3822,9 +3032,9 @@
       <packagereq type="mandatory">m17n-contrib</packagereq>
       <packagereq type="mandatory">m17n-db</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
-      <packagereq type="default">iok</packagereq>
       <packagereq type="default">google-noto-sans-devanagari-fonts</packagereq>
       <packagereq type="default">google-noto-sans-devanagari-ui-fonts</packagereq>
+      <packagereq type="default">iok</packagereq>
       <packagereq type="default">samyak-devanagari-fonts</packagereq>
       <packagereq type="default">sarai-fonts</packagereq>
     </packagelist>
@@ -3842,12 +3052,12 @@
       <packagereq type="conditional" requires="gtk3">ibus-gtk3</packagereq>
       <packagereq type="conditional" requires="qt">ibus-qt</packagereq>
       <packagereq type="conditional" requires="xfce4-panel">im-chooser-xfce</packagereq>
+      <packagereq type="conditional" requires="cinnamon">imsettings-cinnamon</packagereq>
       <packagereq type="conditional" requires="gnome-settings-daemon">imsettings-gsettings</packagereq>
       <packagereq type="conditional" requires="lxde-common">imsettings-lxde</packagereq>
+      <packagereq type="conditional" requires="mate-settings-daemon">imsettings-mate</packagereq>
       <packagereq type="conditional" requires="qt">imsettings-qt</packagereq>
       <packagereq type="conditional" requires="xfce4-panel">imsettings-xfce</packagereq>
-      <packagereq type="conditional" requires="mate-settings-daemon">imsettings-mate</packagereq>
-      <packagereq type="conditional" requires="cinnamon">imsettings-cinnamon</packagereq>
       <packagereq type="default">ibus-chewing</packagereq>
       <packagereq type="default">ibus-hangul</packagereq>
       <packagereq type="default">ibus-kkc</packagereq>
@@ -3973,114 +3183,287 @@
     </packagelist>
   </group>
   <group>
-    <id>java-development</id>
-    <_name>Java Development</_name>
-    <_description>Support for developing programs in the Java programming language.</_description>
+    <id>java-development</id>
+    <_name>Java Development</_name>
+    <_description>Support for developing programs in the Java programming language.</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">ant</packagereq>
+      <packagereq type="mandatory">ecj</packagereq>
+      <packagereq type="mandatory">java-1.7.0-openjdk-devel</packagereq>
+      <packagereq type="default">abrt-java-connector</packagereq>
+      <packagereq type="default">ant-antlr</packagereq>
+      <packagereq type="default">ant-apache-bcel</packagereq>
+      <packagereq type="default">ant-apache-log4j</packagereq>
+      <packagereq type="default">ant-apache-oro</packagereq>
+      <packagereq type="default">ant-apache-regexp</packagereq>
+      <packagereq type="default">ant-apache-resolver</packagereq>
+      <packagereq type="default">ant-commons-logging</packagereq>
+      <packagereq type="default">ant-javamail</packagereq>
+      <packagereq type="default">ant-jdepend</packagereq>
+      <packagereq type="default">ant-junit</packagereq>
+      <packagereq type="default">ant-swing</packagereq>
+      <packagereq type="default">apache-commons-beanutils</packagereq>
+      <packagereq type="default">apache-commons-codec</packagereq>
+      <packagereq type="default">apache-commons-collections</packagereq>
+      <packagereq type="default">apache-commons-compress</packagereq>
+      <packagereq type="default">apache-commons-configuration</packagereq>
+      <packagereq type="default">apache-commons-daemon</packagereq>
+      <packagereq type="default">apache-commons-dbcp</packagereq>
+      <packagereq type="default">apache-commons-digester</packagereq>
+      <packagereq type="default">apache-commons-discovery</packagereq>
+      <packagereq type="default">apache-commons-el</packagereq>
+      <packagereq type="default">apache-commons-exec</packagereq>
+      <packagereq type="default">apache-commons-fileupload</packagereq>
+      <packagereq type="default">apache-commons-io</packagereq>
+      <packagereq type="default">apache-commons-lang</packagereq>
+      <packagereq type="default">apache-commons-launcher</packagereq>
+      <packagereq type="default">apache-commons-logging</packagereq>
+      <packagereq type="default">apache-commons-math</packagereq>
+      <packagereq type="default">apache-commons-modeler</packagereq>
+      <packagereq type="default">apache-commons-net</packagereq>
+      <packagereq type="default">apache-commons-pool</packagereq>
+      <packagereq type="default">apache-commons-validator</packagereq>
+      <packagereq type="default">avalon-framework</packagereq>
+      <packagereq type="default">avalon-logkit</packagereq>
+      <packagereq type="default">bcel</packagereq>
+      <packagereq type="default">gnu-getopt</packagereq>
+      <packagereq type="default">jakarta-oro</packagereq>
+      <packagereq type="default">jakarta-taglibs-standard</packagereq>
+      <packagereq type="default">java-1.7.0-openjdk-demo</packagereq>
+      <packagereq type="default">java-1.7.0-openjdk-javadoc</packagereq>
+      <packagereq type="default">java-1.7.0-openjdk-src</packagereq>
+      <packagereq type="default">javamail</packagereq>
+      <packagereq type="default">java_cup</packagereq>
+      <packagereq type="default">jdepend</packagereq>
+      <packagereq type="default">jflex</packagereq>
+      <packagereq type="default">junit</packagereq>
+      <packagereq type="default">ldapjdk</packagereq>
+      <packagereq type="default">log4j</packagereq>
+      <packagereq type="default">maven</packagereq>
+      <packagereq type="default">mx4j</packagereq>
+      <packagereq type="default">regexp</packagereq>
+      <packagereq type="default">xalan-j2</packagereq>
+      <packagereq type="default">xalan-j2-xsltc</packagereq>
+      <packagereq type="default">xerces-j2</packagereq>
+      <packagereq type="default">xml-commons-apis</packagereq>
+      <packagereq type="default">xml-commons-resolver</packagereq>
+      <packagereq type="optional">ant-findbugs</packagereq>
+      <packagereq type="optional">findbugs</packagereq>
+      <packagereq type="optional">findbugs-tools</packagereq>
+      <packagereq type="optional">jcip-annotations</packagereq>
+      <packagereq type="optional">jinput</packagereq>
+      <packagereq type="optional">jsr-305</packagereq>
+      <packagereq type="optional">pmd</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>jbossas</id>
+    <_name>JBoss Application Server</_name>
+    <_description>Java application server.</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>abrt-java-connector</packagereq>
+      <packagereq>java-1.7.0-openjdk</packagereq>
+      <packagereq>java-1.7.0-openjdk-devel</packagereq>
+      <packagereq>jboss-as</packagereq>
+      <packagereq>jboss-modules</packagereq>
+      <packagereq>maven</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>kannada-support</id>
+    <_name>Kannada Support</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>kn</langonly>
+    <packagelist>
+      <packagereq type="mandatory">lohit-kannada-fonts</packagereq>
+      <packagereq type="mandatory">m17n-contrib</packagereq>
+      <packagereq type="mandatory">m17n-db</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
+      <packagereq type="default">google-noto-sans-kannada-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-kannada-ui-fonts</packagereq>
+      <packagereq type="default">gubbi-fonts</packagereq>
+      <packagereq type="default">iok</packagereq>
+      <packagereq type="default">navilu-fonts</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>kashmiri-support</id>
+    <_name>Kashmiri Support</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>ks</langonly>
+    <packagelist>
+      <packagereq type="mandatory">lohit-devanagari-fonts</packagereq>
+      <packagereq type="mandatory">m17n-contrib</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
+      <packagereq type="default">google-noto-sans-devanagari-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-devanagari-ui-fonts</packagereq>
+      <packagereq type="default">iok</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>kde-apps</id>
+    <_name>KDE Applications</_name>
+    <_description>A set of commonly used KDE applications</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>digikam</packagereq>
+      <packagereq>kdeartwork-screensavers</packagereq>
+      <packagereq>kdegames</packagereq>
+      <packagereq>kdenetwork-krdc</packagereq>
+      <packagereq>kdenetwork-krfb</packagereq>
+      <packagereq>kolourpaint</packagereq>
+      <packagereq>konversation</packagereq>
+      <packagereq>krusader</packagereq>
+      <packagereq>ktorrent</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>kde-desktop</id>
+    <_name>KDE</_name>
+    <_description>The KDE Plasma Workspaces, a highly-configurable graphical user interface which includes a panel, desktop, system icons and desktop widgets, and many powerful KDE applications.</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>akonadi</packagereq>
+      <packagereq>akonadi-mysql</packagereq>
+      <packagereq>apper</packagereq>
+      <packagereq>appmenu-qt</packagereq>
+      <packagereq>ark</packagereq>
+      <packagereq>baloo-file</packagereq>
+      <packagereq>bluedevil</packagereq>
+      <packagereq>cagibi</packagereq>
+      <packagereq>colord-kde</packagereq>
+      <packagereq>cups-pk-helper</packagereq>
+      <packagereq>firewall-config</packagereq>
+      <packagereq>gwenview</packagereq>
+      <packagereq>initial-setup</packagereq>
+      <packagereq>kamera</packagereq>
+      <packagereq>kamoso</packagereq>
+      <packagereq>kcalc</packagereq>
+      <packagereq>kcharselect</packagereq>
+      <packagereq>kcm-gtk</packagereq>
+      <packagereq>kcm_touchpad</packagereq>
+      <packagereq>kcolorchooser</packagereq>
+      <packagereq>kde-baseapps</packagereq>
+      <packagereq>kde-plasma-nm</packagereq>
+      <packagereq>kde-plasma-nm-l2tp</packagereq>
+      <packagereq>kde-plasma-nm-openconnect</packagereq>
+      <packagereq>kde-plasma-nm-openswan</packagereq>
+      <packagereq>kde-plasma-nm-openvpn</packagereq>
+      <packagereq>kde-plasma-nm-pptp</packagereq>
+      <packagereq>kde-plasma-nm-vpnc</packagereq>
+      <packagereq>kde-print-manager</packagereq>
+      <packagereq>kde-runtime</packagereq>
+      <packagereq>kde-runtime-docs</packagereq>
+      <packagereq>kde-settings-pulseaudio</packagereq>
+      <packagereq>kde-workspace</packagereq>
+      <packagereq>kdeaccessibility</packagereq>
+      <packagereq>kdegames-minimal</packagereq>
+      <packagereq>kdegraphics-strigi-analyzer</packagereq>
+      <packagereq>kdegraphics-thumbnailers</packagereq>
+      <packagereq>kdelibs</packagereq>
+      <packagereq>kdepim</packagereq>
+      <packagereq>kdeplasma-addons</packagereq>
+      <packagereq>kdm</packagereq>
+      <packagereq>kdnssd</packagereq>
+      <packagereq>kget</packagereq>
+      <packagereq>kgpg</packagereq>
+      <packagereq>khelpcenter</packagereq>
+      <packagereq>kipi-plugins</packagereq>
+      <packagereq>kmix</packagereq>
+      <packagereq>konsole</packagereq>
+      <packagereq>kruler</packagereq>
+      <packagereq>kscreen</packagereq>
+      <packagereq>ksnapshot</packagereq>
+      <packagereq>ksshaskpass</packagereq>
+      <packagereq>ksysguard</packagereq>
+      <packagereq>kwallet</packagereq>
+      <packagereq>kwebkitpart</packagereq>
+      <packagereq>kwrite</packagereq>
+      <packagereq>okular</packagereq>
+      <packagereq>oxygen-gtk</packagereq>
+      <packagereq>phonon-backend-gstreamer</packagereq>
+      <packagereq>plasma-scriptengine-python</packagereq>
+      <packagereq>system-config-date</packagereq>
+      <packagereq>system-config-services</packagereq>
+      <packagereq>system-config-users</packagereq>
+      <packagereq>xsettings-kde</packagereq>
+      <packagereq>xterm</packagereq>
+      <packagereq type="conditional" requires="libreoffice-core">libreoffice-kde</packagereq>
+      <packagereq type="conditional" requires="pinentry">pinentry-qt</packagereq>
+      <packagereq type="conditional" requires="qt5-style-oxygen">qt5-qtbase-gui</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>kde-education</id>
+    <_name>KDE Educational applications</_name>
+    <_description>KDE Educational applications</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="mandatory">ant</packagereq>
-      <packagereq type="mandatory">ecj</packagereq>
-      <packagereq type="mandatory">java-1.7.0-openjdk-devel</packagereq>
-      <packagereq type="default">abrt-java-connector</packagereq>
-      <packagereq type="default">ant-antlr</packagereq>
-      <packagereq type="default">ant-apache-bcel</packagereq>
-      <packagereq type="default">ant-apache-log4j</packagereq>
-      <packagereq type="default">ant-apache-oro</packagereq>
-      <packagereq type="default">ant-apache-regexp</packagereq>
-      <packagereq type="default">ant-apache-resolver</packagereq>
-      <packagereq type="default">ant-commons-logging</packagereq>
-      <packagereq type="default">ant-javamail</packagereq>
-      <packagereq type="default">ant-jdepend</packagereq>
-      <packagereq type="default">ant-junit</packagereq>
-      <packagereq type="default">ant-swing</packagereq>
-      <packagereq type="default">apache-commons-beanutils</packagereq>
-      <packagereq type="default">apache-commons-codec</packagereq>
-      <packagereq type="default">apache-commons-collections</packagereq>
-      <packagereq type="default">apache-commons-compress</packagereq>
-      <packagereq type="default">apache-commons-configuration</packagereq>
-      <packagereq type="default">apache-commons-daemon</packagereq>
-      <packagereq type="default">apache-commons-dbcp</packagereq>
-      <packagereq type="default">apache-commons-digester</packagereq>
-      <packagereq type="default">apache-commons-discovery</packagereq>
-      <packagereq type="default">apache-commons-el</packagereq>
-      <packagereq type="default">apache-commons-exec</packagereq>
-      <packagereq type="default">apache-commons-fileupload</packagereq>
-      <packagereq type="default">apache-commons-io</packagereq>
-      <packagereq type="default">apache-commons-lang</packagereq>
-      <packagereq type="default">apache-commons-launcher</packagereq>
-      <packagereq type="default">apache-commons-logging</packagereq>
-      <packagereq type="default">apache-commons-math</packagereq>
-      <packagereq type="default">apache-commons-modeler</packagereq>
-      <packagereq type="default">apache-commons-net</packagereq>
-      <packagereq type="default">apache-commons-pool</packagereq>
-      <packagereq type="default">apache-commons-validator</packagereq>
-      <packagereq type="default">avalon-framework</packagereq>
-      <packagereq type="default">avalon-logkit</packagereq>
-      <packagereq type="default">bcel</packagereq>
-      <packagereq type="default">gnu-getopt</packagereq>
-      <packagereq type="default">jakarta-oro</packagereq>
-      <packagereq type="default">jakarta-taglibs-standard</packagereq>
-      <packagereq type="default">java-1.7.0-openjdk-demo</packagereq>
-      <packagereq type="default">java-1.7.0-openjdk-javadoc</packagereq>
-      <packagereq type="default">java-1.7.0-openjdk-src</packagereq>
-      <packagereq type="default">javamail</packagereq>
-      <packagereq type="default">java_cup</packagereq>
-      <packagereq type="default">jdepend</packagereq>
-      <packagereq type="default">jflex</packagereq>
-      <packagereq type="default">junit</packagereq>
-      <packagereq type="default">ldapjdk</packagereq>
-      <packagereq type="default">log4j</packagereq>
-      <packagereq type="default">maven</packagereq>
-      <packagereq type="default">mx4j</packagereq>
-      <packagereq type="default">regexp</packagereq>
-      <packagereq type="default">xalan-j2</packagereq>
-      <packagereq type="default">xalan-j2-xsltc</packagereq>
-      <packagereq type="default">xerces-j2</packagereq>
-      <packagereq type="default">xml-commons-apis</packagereq>
-      <packagereq type="default">xml-commons-resolver</packagereq>
-      <packagereq type="optional">ant-findbugs</packagereq>
-      <packagereq type="optional">findbugs</packagereq>
-      <packagereq type="optional">findbugs-tools</packagereq>
-      <packagereq type="optional">jcip-annotations</packagereq>
-      <packagereq type="optional">jinput</packagereq>
-      <packagereq type="optional">jsr-305</packagereq>
-      <packagereq type="optional">pmd</packagereq>
+      <packagereq>blinken</packagereq>
+      <packagereq>cantor</packagereq>
+      <packagereq>kalgebra</packagereq>
+      <packagereq>kalzium</packagereq>
+      <packagereq>kanagram</packagereq>
+      <packagereq>kbruch</packagereq>
+      <packagereq>kgeography</packagereq>
+      <packagereq>khangman</packagereq>
+      <packagereq>kig</packagereq>
+      <packagereq>kiten</packagereq>
+      <packagereq>klettres</packagereq>
+      <packagereq>kmplot</packagereq>
+      <packagereq>kstars</packagereq>
+      <packagereq>ktouch</packagereq>
+      <packagereq>kturtle</packagereq>
+      <packagereq>kwordquiz</packagereq>
+      <packagereq>marble</packagereq>
+      <packagereq>parley</packagereq>
+      <packagereq>rocs</packagereq>
+      <packagereq>step</packagereq>
     </packagelist>
   </group>
   <group>
-    <id>kannada-support</id>
-    <_name>Kannada Support</_name>
-    <_description/>
+    <id>kde-media</id>
+    <_name>KDE Multimedia support</_name>
+    <_description>Multimedia support for KDE</_description>
     <default>false</default>
     <uservisible>false</uservisible>
-    <langonly>kn</langonly>
     <packagelist>
-      <packagereq type="mandatory">lohit-kannada-fonts</packagereq>
-      <packagereq type="mandatory">m17n-contrib</packagereq>
-      <packagereq type="mandatory">m17n-db</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
-      <packagereq type="default">gubbi-fonts</packagereq>
-      <packagereq type="default">google-noto-sans-kannada-fonts</packagereq>
-      <packagereq type="default">google-noto-sans-kannada-ui-fonts</packagereq>
-      <packagereq type="default">iok</packagereq>
-      <packagereq type="default">navilu-fonts</packagereq>
+      <packagereq>amarok</packagereq>
+      <packagereq>dragon</packagereq>
+      <packagereq>k3b</packagereq>
+      <packagereq>kscd</packagereq>
     </packagelist>
   </group>
   <group>
-    <id>kashmiri-support</id>
-    <_name>Kashmiri Support</_name>
-    <_description/>
+    <id>kde-office</id>
+    <_name>KDE Office</_name>
+    <_description>KDE Office applications</_description>
     <default>false</default>
     <uservisible>false</uservisible>
-    <langonly>ks</langonly>
     <packagelist>
-      <packagereq type="mandatory">lohit-devanagari-fonts</packagereq>
-      <packagereq type="mandatory">m17n-contrib</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
-      <packagereq type="default">google-noto-sans-devanagari-fonts</packagereq>
-      <packagereq type="default">google-noto-sans-devanagari-ui-fonts</packagereq>
-      <packagereq type="default">iok</packagereq>
+      <packagereq>calligra</packagereq>
+      <packagereq>calligra-braindump</packagereq>
+      <packagereq>calligra-flow</packagereq>
+      <packagereq>calligra-karbon</packagereq>
+      <packagereq>calligra-kexi</packagereq>
+      <packagereq>calligra-krita</packagereq>
+      <packagereq>calligra-plan</packagereq>
+      <packagereq>calligra-sheets</packagereq>
+      <packagereq>calligra-stage</packagereq>
+      <packagereq>calligra-words</packagereq>
+      <packagereq>okular</packagereq>
+      <packagereq>scribus</packagereq>
     </packagelist>
   </group>
   <group>
@@ -4133,21 +3516,40 @@
       <packagereq type="optional">ktp-common-internals-devel</packagereq>
       <packagereq type="optional">libkcddb-devel</packagereq>
       <packagereq type="optional">libkcompactdisc-devel</packagereq>
-      <packagereq type="optional">libkdegames-devel</packagereq>
       <packagereq type="optional">libkdeedu-devel</packagereq>
+      <packagereq type="optional">libkdegames-devel</packagereq>
       <packagereq type="optional">marble-devel</packagereq>
       <packagereq type="optional">PyKDE-devel</packagereq>
       <packagereq type="optional">PyQt-devel</packagereq>
       <packagereq type="optional">qt-creator</packagereq>
       <packagereq type="optional">qt-mobility-devel</packagereq>
-      <packagereq type="optional">qtwebkit-devel</packagereq>
       <packagereq type="optional">qt3-designer</packagereq>
       <packagereq type="optional">qt3-devel</packagereq>
+      <packagereq type="optional">qtwebkit-devel</packagereq>
       <packagereq type="optional">rocs-devel</packagereq>
       <packagereq type="optional">telepathy-qt4-devel</packagereq>
     </packagelist>
   </group>
   <group>
+    <id>kde-telepathy</id>
+    <_name>KDE Telepathy</_name>
+    <_description>KDE Telepathy applications</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>ktp-accounts-kcm</packagereq>
+      <packagereq>ktp-approver</packagereq>
+      <packagereq>ktp-auth-handler</packagereq>
+      <packagereq>ktp-call-ui</packagereq>
+      <packagereq>ktp-contact-list</packagereq>
+      <packagereq>ktp-desktop-applets</packagereq>
+      <packagereq>ktp-filetransfer-handler</packagereq>
+      <packagereq>ktp-kded-integration-module</packagereq>
+      <packagereq>ktp-send-file</packagereq>
+      <packagereq>ktp-text-ui</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>khmer-support</id>
     <_name>Khmer Support</_name>
     <_description/>
@@ -4365,29 +3767,147 @@
     </packagelist>
   </group>
   <group>
-    <id>lepcha-support</id>
-    <_name>Lepcha Support</_name>
-    <_description/>
+    <id>lepcha-support</id>
+    <_name>Lepcha Support</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>lep</langonly>
+    <packagelist>
+      <packagereq type="mandatory">m17n-contrib</packagereq>
+      <packagereq type="mandatory">m17n-db</packagereq>
+      <packagereq type="mandatory">sil-mingzat-fonts</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
+      <packagereq type="default">iok</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>libreoffice</id>
+    <_name>LibreOffice</_name>
+    <_description>LibreOffice Productivity Suite</_description>
+    <packagelist>
+      <packagereq>libreoffice-calc</packagereq>
+      <packagereq>libreoffice-draw</packagereq>
+      <packagereq>libreoffice-emailmerge</packagereq>
+      <packagereq>libreoffice-graphicfilter</packagereq>
+      <packagereq>libreoffice-impress</packagereq>
+      <packagereq>libreoffice-math</packagereq>
+      <packagereq>libreoffice-writer</packagereq>
+      <packagereq type="optional">libreoffice-base</packagereq>
+      <packagereq type="optional">libreoffice-pyuno</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>libreoffice-development</id>
+    <_name>LibreOffice Development</_name>
+    <_description>These packages are helpful when developing LibreOffice extensions or macros.</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="optional">libreoffice-sdk</packagereq>
+      <packagereq type="optional">libreoffice-sdk-doc</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>load-balancer</id>
+    <_name>Load Balancer</_name>
+    <_description>Load balancing support for network traffic</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>ipvsadm</packagereq>
+      <packagereq>keepalived</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>lxde-apps</id>
+    <_name>Applications for the LXDE Desktop</_name>
+    <_description>A set of commonly used applications for the LXDE Desktop</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>midori</packagereq>
+      <packagereq>pidgin</packagereq>
+      <packagereq>sylpheed</packagereq>
+      <packagereq>transmission</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>lxde-desktop</id>
+    <_name>LXDE</_name>
+    <_description>LXDE 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>adwaita-cursor-theme</packagereq>
+      <packagereq>adwaita-gtk2-theme</packagereq>
+      <packagereq>adwaita-gtk3-theme</packagereq>
+      <packagereq>clipit</packagereq>
+      <packagereq>fedora-icon-theme</packagereq>
+      <packagereq>firewall-config</packagereq>
+      <packagereq>galculator</packagereq>
+      <packagereq>gigolo</packagereq>
+      <packagereq>gnome-keyring-pam</packagereq>
+      <packagereq>gpicview</packagereq>
+      <packagereq>initial-setup</packagereq>
+      <packagereq>leafpad</packagereq>
+      <packagereq>lxappearance</packagereq>
+      <packagereq>lxappearance-obconf</packagereq>
+      <packagereq>lxde-common</packagereq>
+      <packagereq>lxdm</packagereq>
+      <packagereq>lxinput</packagereq>
+      <packagereq>lxlauncher</packagereq>
+      <packagereq>lxmenu-data</packagereq>
+      <packagereq>lxpanel</packagereq>
+      <packagereq>lxpolkit</packagereq>
+      <packagereq>lxrandr</packagereq>
+      <packagereq>lxsession</packagereq>
+      <packagereq>lxsession-edit</packagereq>
+      <packagereq>lxshortcut</packagereq>
+      <packagereq>lxtask</packagereq>
+      <packagereq>lxterminal</packagereq>
+      <packagereq>network-manager-applet</packagereq>
+      <packagereq>nm-connection-editor</packagereq>
+      <packagereq>notification-daemon</packagereq>
+      <packagereq>obconf</packagereq>
+      <packagereq>openbox</packagereq>
+      <packagereq>openssh-askpass</packagereq>
+      <packagereq>pcmanfm</packagereq>
+      <packagereq>perl-File-MimeInfo</packagereq>
+      <packagereq>upower</packagereq>
+      <packagereq>xarchiver</packagereq>
+      <packagereq>xcompmgr</packagereq>
+      <packagereq>xdg-user-dirs-gtk</packagereq>
+      <packagereq>xpad</packagereq>
+      <packagereq>xscreensaver-base</packagereq>
+      <packagereq>xscreensaver-extras</packagereq>
+      <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>
-    <langonly>lep</langonly>
     <packagelist>
-      <packagereq type="mandatory">sil-mingzat-fonts</packagereq>
-      <packagereq type="mandatory">m17n-contrib</packagereq>
-      <packagereq type="mandatory">m17n-db</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
-      <packagereq type="default">iok</packagereq>
+      <packagereq>asunder</packagereq>
+      <packagereq>gnomebaker</packagereq>
+      <packagereq>lxmusic</packagereq>
+      <packagereq>pavucontrol</packagereq>
+      <packagereq>pnmixer</packagereq>
     </packagelist>
   </group>
   <group>
-    <id>libreoffice-development</id>
-    <_name>LibreOffice Development</_name>
-    <_description>These packages are helpful when developing LibreOffice extensions or macros.</_description>
+    <id>lxde-office</id>
+    <_name>LXDE Office</_name>
+    <_description>Office suite for LXDE</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="optional">libreoffice-sdk</packagereq>
-      <packagereq type="optional">libreoffice-sdk-doc</packagereq>
+      <packagereq>abiword</packagereq>
+      <packagereq>gnumeric</packagereq>
+      <packagereq>osmo</packagereq>
     </packagelist>
   </group>
   <group>
@@ -4485,6 +4005,74 @@
     </packagelist>
   </group>
   <group>
+    <id>marathi-support</id>
+    <_name>Marathi Support</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>mr</langonly>
+    <packagelist>
+      <packagereq type="mandatory">lohit-marathi-fonts</packagereq>
+      <packagereq type="mandatory">m17n-contrib</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
+      <packagereq type="default">google-noto-sans-devanagari-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-devanagari-ui-fonts</packagereq>
+      <packagereq type="default">iok</packagereq>
+      <packagereq type="default">samyak-devanagari-fonts</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>mate-applications</id>
+    <_name>MATE Applications</_name>
+    <_description>Applications for the MATE Desktop.</_description>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq>atril-thumbnailer</packagereq>
+      <packagereq>bluedevil</packagereq>
+      <packagereq>caja-actions</packagereq>
+      <packagereq>caja-terminal</packagereq>
+      <packagereq>mate-applet-lockkeys</packagereq>
+      <packagereq>mate-applet-softupd</packagereq>
+      <packagereq>mate-dictionary</packagereq>
+      <packagereq>mate-disk-usage-analyzer</packagereq>
+      <packagereq>mate-file-manager-open-terminal</packagereq>
+      <packagereq>mate-file-manager-share</packagereq>
+      <packagereq>mate-icon-theme-faenza</packagereq>
+      <packagereq>mate-sensors-applet</packagereq>
+      <packagereq>mate-system-log</packagereq>
+      <packagereq>mate-themes-extras</packagereq>
+      <packagereq>mate-user-share</packagereq>
+      <packagereq>mate-utils</packagereq>
+      <packagereq>mintmenu</packagereq>
+      <packagereq>xfburn</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>mate-compiz</id>
+    <_name>mate-compiz</_name>
+    <_description>This package group adds Compiz and Emerald to MATE desktop</_description>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq>ccsm</packagereq>
+      <packagereq>compiz</packagereq>
+      <packagereq>compiz-bcop</packagereq>
+      <packagereq>compiz-config-python</packagereq>
+      <packagereq>compiz-manager</packagereq>
+      <packagereq>compiz-mate</packagereq>
+      <packagereq>compiz-plugins-extra</packagereq>
+      <packagereq>compiz-plugins-main</packagereq>
+      <packagereq>compiz-plugins-unsupported</packagereq>
+      <packagereq>emerald</packagereq>
+      <packagereq>emerald-themes</packagereq>
+      <packagereq>emerald-themes-extra</packagereq>
+      <packagereq>fusion-icon</packagereq>
+      <packagereq>fusion-icon-gtk</packagereq>
+      <packagereq>libcompizconfig</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>mate-desktop</id>
     <_name>MATE</_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>
@@ -4493,41 +4081,34 @@
     <packagelist>
       <packagereq>abrt-desktop</packagereq>
       <packagereq>abrt-java-connector</packagereq>
-      <packagereq>fedora-release-notes</packagereq>
-      <packagereq>NetworkManager-l2tp</packagereq>
-      <packagereq>NetworkManager-openconnect</packagereq>
-      <packagereq>NetworkManager-openvpn</packagereq>
-      <packagereq>NetworkManager-pptp</packagereq>
-      <packagereq>NetworkManager-vpnc</packagereq>
-      <packagereq>NetworkManager-vpnc-gnome</packagereq>
-      <packagereq>NetworkManager</packagereq>
       <packagereq>claws-mail</packagereq>
-      <packagereq>dconf-editor</packagereq>
       <packagereq>dconf</packagereq>
+      <packagereq>dconf-editor</packagereq>
       <packagereq>desktop-backgrounds-basic</packagereq>
       <packagereq>fedora-icon-theme</packagereq>
+      <packagereq>fedora-release-notes</packagereq>
       <packagereq>filezilla</packagereq>
       <packagereq>firefox</packagereq>
       <packagereq>firewall-config</packagereq>
       <packagereq>fros-recordmydesktop</packagereq>
-      <packagereq>gucharmap</packagereq>
       <packagereq>gtk2-engines</packagereq>
+      <packagereq>gucharmap</packagereq>
+      <packagereq>gvfs</packagereq>
       <packagereq>gvfs-afc</packagereq>
       <packagereq>gvfs-archive</packagereq>
       <packagereq>gvfs-fuse</packagereq>
       <packagereq>gvfs-gphoto2</packagereq>
       <packagereq>gvfs-mtp</packagereq>
       <packagereq>gvfs-smb</packagereq>
-      <packagereq>gvfs</packagereq>
       <packagereq>hexchat</packagereq>
       <packagereq>initial-setup</packagereq>
       <packagereq>libmatekbd</packagereq>
-      <packagereq>libsecret</packagereq>
       <packagereq>libmatenotify</packagereq>
       <packagereq>libmateweather</packagereq>
       <packagereq>libmatewnck</packagereq>
-      <packagereq>lightdm-gtk</packagereq>
+      <packagereq>libsecret</packagereq>
       <packagereq>lightdm</packagereq>
+      <packagereq>lightdm-gtk</packagereq>
       <packagereq>mate-applets</packagereq>
       <packagereq>mate-backgrounds</packagereq>
       <packagereq>mate-calc</packagereq>
@@ -4535,18 +4116,18 @@
       <packagereq>mate-control-center</packagereq>
       <packagereq>mate-desktop</packagereq>
       <packagereq>mate-dialogs</packagereq>
-      <packagereq>mate-document-viewer-caja</packagereq>
       <packagereq>mate-document-viewer</packagereq>
+      <packagereq>mate-document-viewer-caja</packagereq>
       <packagereq>mate-file-archiver</packagereq>
+      <packagereq>mate-file-manager</packagereq>
       <packagereq>mate-file-manager-image-converter</packagereq>
       <packagereq>mate-file-manager-sendto</packagereq>
-      <packagereq>mate-file-manager</packagereq>
       <packagereq>mate-icon-theme</packagereq>
       <packagereq>mate-image-viewer</packagereq>
       <packagereq>mate-media</packagereq>
       <packagereq>mate-menu-editor</packagereq>
-      <packagereq>mate-menus-preferences-category-menu</packagereq>
       <packagereq>mate-menus</packagereq>
+      <packagereq>mate-menus-preferences-category-menu</packagereq>
       <packagereq>mate-netspeed</packagereq>
       <packagereq>mate-notification-daemon</packagereq>
       <packagereq>mate-panel</packagereq>
@@ -4563,6 +4144,13 @@
       <packagereq>mate-themes</packagereq>
       <packagereq>mate-window-manager</packagereq>
       <packagereq>network-manager-applet</packagereq>
+      <packagereq>NetworkManager</packagereq>
+      <packagereq>NetworkManager-l2tp</packagereq>
+      <packagereq>NetworkManager-openconnect</packagereq>
+      <packagereq>NetworkManager-openvpn</packagereq>
+      <packagereq>NetworkManager-pptp</packagereq>
+      <packagereq>NetworkManager-vpnc</packagereq>
+      <packagereq>NetworkManager-vpnc-gnome</packagereq>
       <packagereq>pavucontrol</packagereq>
       <packagereq>pidgin</packagereq>
       <packagereq>setroubleshoot</packagereq>
@@ -4577,75 +4165,6 @@
       <packagereq>yelp</packagereq>
       <packagereq>yumex</packagereq>
     </packagelist>
-   </group>
-  <group>
-    <id>mate-applications</id>
-    <_name>MATE Applications</_name>
-    <_description>Applications for the MATE Desktop.</_description>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <packagelist>
-      <packagereq>atril-thumbnailer</packagereq>
-      <packagereq>bluedevil</packagereq>
-      <packagereq>caja-actions</packagereq>
-      <packagereq>caja-terminal</packagereq>
-      <packagereq>mate-applet-lockkeys</packagereq>
-      <packagereq>mate-applet-softupd</packagereq>
-      <packagereq>mate-dictionary</packagereq>
-      <packagereq>mate-disk-usage-analyzer</packagereq>
-      <packagereq>mate-file-manager-open-terminal</packagereq>
-      <packagereq>mate-file-manager-share</packagereq>
-      <packagereq>mate-icon-theme-faenza</packagereq>
-      <packagereq>mate-sensors-applet</packagereq>
-      <packagereq>mate-system-log</packagereq>
-      <packagereq>mate-themes-extras</packagereq>
-      <packagereq>mate-user-share</packagereq>
-      <packagereq>mate-utils</packagereq>
-      <packagereq>mintmenu</packagereq>
-      <packagereq>xfburn</packagereq>
-    </packagelist>
-   </group>
-   <group>
-    <id>mate-compiz</id>
-    <_name>mate-compiz</_name>
-    <_description>This package group adds Compiz and Emerald to MATE desktop</_description>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <packagelist>
-       <packagereq>compiz</packagereq>
-       <packagereq>compiz-plugins-main</packagereq>
-       <packagereq>compiz-plugins-extra</packagereq>
-       <packagereq>compiz-manager</packagereq>
-       <packagereq>compiz-config-python</packagereq>
-       <packagereq>compiz-plugins-unsupported</packagereq>
-       <packagereq>compiz-bcop</packagereq>
-       <packagereq>compiz-mate</packagereq>
-       <packagereq>libcompizconfig</packagereq>
-       <packagereq>compiz-plugins-main</packagereq>
-       <packagereq>ccsm</packagereq>
-       <packagereq>emerald-themes</packagereq>
-       <packagereq>emerald-themes-extra</packagereq>
-       <packagereq>emerald</packagereq>
-       <packagereq>fusion-icon</packagereq>
-       <packagereq>fusion-icon-gtk</packagereq>
-     </packagelist>
-   </group>
-   <group>
-    <id>marathi-support</id>
-    <_name>Marathi Support</_name>
-    <_description/>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <langonly>mr</langonly>
-    <packagelist>
-      <packagereq type="mandatory">lohit-marathi-fonts</packagereq>
-      <packagereq type="mandatory">m17n-contrib</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
-      <packagereq type="default">google-noto-sans-devanagari-fonts</packagereq>
-      <packagereq type="default">google-noto-sans-devanagari-ui-fonts</packagereq>
-      <packagereq type="default">iok</packagereq>
-      <packagereq type="default">samyak-devanagari-fonts</packagereq>
-    </packagelist>
   </group>
   <group>
     <id>medical</id>
@@ -4720,7 +4239,6 @@
       <packagereq type="optional">mingw32-gdbm</packagereq>
       <packagereq type="optional">mingw32-gettext</packagereq>
       <packagereq type="optional">mingw32-glib2</packagereq>
-      <packagereq type="optional">mingw32-win-iconv</packagereq>
       <packagereq type="optional">mingw32-libgcrypt</packagereq>
       <packagereq type="optional">mingw32-libgpg-error</packagereq>
       <packagereq type="optional">mingw32-libjpeg-turbo</packagereq>
@@ -4735,10 +4253,44 @@
       <packagereq type="optional">mingw32-SDL</packagereq>
       <packagereq type="optional">mingw32-sqlite</packagereq>
       <packagereq type="optional">mingw32-termcap</packagereq>
+      <packagereq type="optional">mingw32-win-iconv</packagereq>
       <packagereq type="optional">mingw32-zlib</packagereq>
     </packagelist>
   </group>
   <group>
+    <id>mongodb</id>
+    <_name>MongoDB</_name>
+    <_description>Scalable high-performance NoSQL database.</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>libmongodb</packagereq>
+      <packagereq>mongodb</packagereq>
+      <packagereq>mongodb-devel</packagereq>
+      <packagereq>mongodb-server</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>multimedia</id>
+    <_name>Multimedia</_name>
+    <_description>Audio/video framework common to desktops</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>alsa-plugins-pulseaudio</packagereq>
+      <packagereq>alsa-utils</packagereq>
+      <packagereq>gstreamer-plugins-bad-free</packagereq>
+      <packagereq>gstreamer-plugins-espeak</packagereq>
+      <packagereq>gstreamer-plugins-good</packagereq>
+      <packagereq>PackageKit-gstreamer-plugin</packagereq>
+      <packagereq>pulseaudio</packagereq>
+      <packagereq>pulseaudio-module-x11</packagereq>
+      <packagereq>pulseaudio-utils</packagereq>
+      <packagereq type="conditional" requires="gstreamer1">gstreamer1-plugins-bad-free</packagereq>
+      <packagereq type="conditional" requires="gstreamer1">gstreamer1-plugins-good</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>mysql</id>
     <_name>MariaDB (MySQL) Database</_name>
     <_description>This package group contains packages useful for use with MariaDB (MySQL).</_description>
@@ -4773,9 +4325,9 @@
       <packagereq type="mandatory">m17n-contrib</packagereq>
       <packagereq type="mandatory">madan-fonts</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
-      <packagereq type="optional">scim-tables-nepali</packagereq>
       <packagereq type="default">google-noto-sans-devanagari-fonts</packagereq>
       <packagereq type="default">google-noto-sans-devanagari-ui-fonts</packagereq>
+      <packagereq type="optional">scim-tables-nepali</packagereq>
     </packagelist>
   </group>
   <group>
@@ -4956,11 +4508,11 @@
       <packagereq type="optional">taskjuggler</packagereq>
       <packagereq type="optional">tellico</packagereq>
       <packagereq type="optional">tetex-IEEEtran</packagereq>
+      <packagereq type="optional">texlive-xdvi</packagereq>
       <packagereq type="optional">texmaker</packagereq>
       <packagereq type="optional">vym</packagereq>
       <packagereq type="optional">wyrd</packagereq>
       <packagereq type="optional">xchm</packagereq>
-      <packagereq type="optional">texlive-xdvi</packagereq>
       <packagereq type="optional">xfbib</packagereq>
       <packagereq type="optional">xournal</packagereq>
       <packagereq type="optional">Zim</packagereq>
@@ -5015,6 +4567,24 @@
     </packagelist>
   </group>
   <group>
+    <id>perl-web</id>
+    <_name>Perl for Web</_name>
+    <_description>Basic Perl web application support.</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>ImageMagick-perl</packagereq>
+      <packagereq>mod_perl</packagereq>
+      <packagereq>perl-App-cpanminus</packagereq>
+      <packagereq>perl-core</packagereq>
+      <packagereq>perl-CPAN</packagereq>
+      <packagereq>perl-CPANPLUS</packagereq>
+      <packagereq>perl-DBD-MySQL</packagereq>
+      <packagereq>perl-DBD-SQLite</packagereq>
+      <packagereq>perl-MongoDB</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>persian-support</id>
     <_name>Persian Support</_name>
     <_description/>
@@ -5027,6 +4597,31 @@
     </packagelist>
   </group>
   <group>
+    <id>php</id>
+    <_name>PHP</_name>
+    <_description>General-purpose web development scripting language.</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>php</packagereq>
+      <packagereq>php-bcmath</packagereq>
+      <packagereq>php-devel</packagereq>
+      <packagereq>php-gd</packagereq>
+      <packagereq>php-imap</packagereq>
+      <packagereq>php-mbstring</packagereq>
+      <packagereq>php-mcrypt</packagereq>
+      <packagereq>php-mysqlnd</packagereq>
+      <packagereq>php-pdo</packagereq>
+      <packagereq>php-pear</packagereq>
+      <packagereq>php-pecl-apc</packagereq>
+      <packagereq>php-pecl-mongo</packagereq>
+      <packagereq>php-pgsql</packagereq>
+      <packagereq>php-process</packagereq>
+      <packagereq>php-soap</packagereq>
+      <packagereq>php-xml</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>printing</id>
     <_name>Printing Support</_name>
     <_description>Install these tools to enable the system to print or act as a print server.</_description>
@@ -5047,11 +4642,11 @@
       <packagereq type="default">hpijs</packagereq>
       <packagereq type="default">hplip</packagereq>
       <packagereq type="default">mpage</packagereq>
+      <packagereq type="default">nss-mdns</packagereq>
       <packagereq type="default">paps</packagereq>
       <packagereq type="default">samba-client</packagereq>
       <packagereq type="default">system-config-printer</packagereq>
       <packagereq type="default">system-config-printer-udev</packagereq>
-      <packagereq type="default">nss-mdns</packagereq>
       <packagereq type="optional">a2ps</packagereq>
       <packagereq type="optional">cups-bjnp</packagereq>
       <packagereq type="optional">cups-pdf</packagereq>
@@ -5079,6 +4674,30 @@
     </packagelist>
   </group>
   <group>
+    <id>python-web</id>
+    <_name>Python</_name>
+    <_description>Basic Python web application support.</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>freetype-devel</packagereq>
+      <packagereq>libcurl</packagereq>
+      <packagereq>libcurl-devel</packagereq>
+      <packagereq>libjpeg-turbo</packagereq>
+      <packagereq>libjpeg-turbo-devel</packagereq>
+      <packagereq>mod_wsgi</packagereq>
+      <packagereq>MySQL-python</packagereq>
+      <packagereq>numpy</packagereq>
+      <packagereq>numpy-f2py</packagereq>
+      <packagereq>pymongo</packagereq>
+      <packagereq>pymongo-gridfs</packagereq>
+      <packagereq>python</packagereq>
+      <packagereq>python-magic</packagereq>
+      <packagereq>python-psycopg2</packagereq>
+      <packagereq>python-virtualenv</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>robotics-suite</id>
     <_name>Robotics</_name>
     <_description>Suite of packages for robotics development</_description>
@@ -5148,6 +4767,24 @@
     </packagelist>
   </group>
   <group>
+    <id>rpm-development-tools</id>
+    <_name>RPM Development Tools</_name>
+    <_description>These tools include core development tools such rpmbuild.</_description>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">redhat-rpm-config</packagereq>
+      <packagereq type="mandatory">rpm-build</packagereq>
+      <packagereq type="default">koji</packagereq>
+      <packagereq type="default">mock</packagereq>
+      <packagereq type="default">rpmdevtools</packagereq>
+      <packagereq type="optional">plague-client</packagereq>
+      <packagereq type="optional">pungi</packagereq>
+      <packagereq type="optional">revisor</packagereq>
+      <packagereq type="optional">rpmlint</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>ruby</id>
     <_name>Ruby</_name>
     <_description>Basic support for the Ruby programming language.</_description>
@@ -5162,6 +4799,82 @@
     </packagelist>
   </group>
   <group>
+    <id>rubyonrails</id>
+    <_name>Ruby on Rails</_name>
+    <_description>Ruby on Rails web application stack.</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>ruby</packagereq>
+      <packagereq>ruby-devel</packagereq>
+      <packagereq>ruby-irb</packagereq>
+      <packagereq>ruby-libs</packagereq>
+      <packagereq>rubygem-abrt</packagereq>
+      <packagereq>rubygem-actionmailer</packagereq>
+      <packagereq>rubygem-actionpack</packagereq>
+      <packagereq>rubygem-activemodel</packagereq>
+      <packagereq>rubygem-activerecord</packagereq>
+      <packagereq>rubygem-activeresource</packagereq>
+      <packagereq>rubygem-activesupport</packagereq>
+      <packagereq>rubygem-arel</packagereq>
+      <packagereq>rubygem-bcrypt-ruby</packagereq>
+      <packagereq>rubygem-bigdecimal</packagereq>
+      <packagereq>rubygem-builder</packagereq>
+      <packagereq>rubygem-bundler</packagereq>
+      <packagereq>rubygem-coffee-rails</packagereq>
+      <packagereq>rubygem-coffee-script</packagereq>
+      <packagereq>rubygem-coffee-script-source</packagereq>
+      <packagereq>rubygem-diff-lcs</packagereq>
+      <packagereq>rubygem-erubis</packagereq>
+      <packagereq>rubygem-execjs</packagereq>
+      <packagereq>rubygem-hike</packagereq>
+      <packagereq>rubygem-i18n</packagereq>
+      <packagereq>rubygem-io-console</packagereq>
+      <packagereq>rubygem-jbuilder</packagereq>
+      <packagereq>rubygem-journey</packagereq>
+      <packagereq>rubygem-jquery-rails</packagereq>
+      <packagereq>rubygem-json</packagereq>
+      <packagereq>rubygem-listen</packagereq>
+      <packagereq>rubygem-mail</packagereq>
+      <packagereq>rubygem-mime-types</packagereq>
+      <packagereq>rubygem-minitest</packagereq>
+      <packagereq>rubygem-mongo</packagereq>
+      <packagereq>rubygem-multi_json</packagereq>
+      <packagereq>rubygem-net-http-persistent</packagereq>
+      <packagereq>rubygem-passenger</packagereq>
+      <packagereq>rubygem-passenger-devel</packagereq>
+      <packagereq>rubygem-passenger-native</packagereq>
+      <packagereq>rubygem-passenger-native-libs</packagereq>
+      <packagereq>rubygem-polyglot</packagereq>
+      <packagereq>rubygem-rack</packagereq>
+      <packagereq>rubygem-rack-cache</packagereq>
+      <packagereq>rubygem-rack-ssl</packagereq>
+      <packagereq>rubygem-rack-test</packagereq>
+      <packagereq>rubygem-rails</packagereq>
+      <packagereq>rubygem-railties</packagereq>
+      <packagereq>rubygem-rake</packagereq>
+      <packagereq>rubygem-rdoc</packagereq>
+      <packagereq>rubygem-ref</packagereq>
+      <packagereq>rubygem-ruby2ruby</packagereq>
+      <packagereq>rubygem-ruby_parser</packagereq>
+      <packagereq>rubygem-sass</packagereq>
+      <packagereq>rubygem-sass-rails</packagereq>
+      <packagereq>rubygem-sexp_processor</packagereq>
+      <packagereq>rubygem-sinatra</packagereq>
+      <packagereq>rubygem-sprockets</packagereq>
+      <packagereq>rubygem-sqlite3</packagereq>
+      <packagereq>rubygem-therubyracer</packagereq>
+      <packagereq>rubygem-thor</packagereq>
+      <packagereq>rubygem-tilt</packagereq>
+      <packagereq>rubygem-treetop</packagereq>
+      <packagereq>rubygem-turbolinks</packagereq>
+      <packagereq>rubygem-tzinfo</packagereq>
+      <packagereq>rubygem-uglifier</packagereq>
+      <packagereq>rubygems</packagereq>
+      <packagereq>sqlite-devel</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>russian-support</id>
     <_name>Russian Support</_name>
     <_description/>
@@ -5218,13 +4931,13 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq type="default">ArpON</packagereq>
       <packagereq type="default">afftools</packagereq>
       <packagereq type="default">aide</packagereq>
       <packagereq type="default">aircrack-ng</packagereq>
       <packagereq type="default">airsnort</packagereq>
       <packagereq type="default">argus</packagereq>
       <packagereq type="default">arp-scan</packagereq>
+      <packagereq type="default">ArpON</packagereq>
       <packagereq type="default">bannergrab</packagereq>
       <packagereq type="default">binwalk</packagereq>
       <packagereq type="default">bkhive</packagereq>
@@ -5478,10 +5191,6 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq type="optional">brasero</packagereq>
-      <packagereq type="optional">cdparanoia</packagereq>
-      <packagereq type="optional">genisoimage</packagereq>
-      <packagereq type="optional">icedax</packagereq>
       <packagereq type="optional">abcde</packagereq>
       <packagereq type="optional">AcetoneISO2</packagereq>
       <packagereq type="optional">adplay</packagereq>
@@ -5494,9 +5203,11 @@
       <packagereq type="optional">audacity</packagereq>
       <packagereq type="optional">banshee</packagereq>
       <packagereq type="optional">bluez-alsa</packagereq>
+      <packagereq type="optional">brasero</packagereq>
       <packagereq type="optional">camE</packagereq>
       <packagereq type="optional">cdcollect</packagereq>
       <packagereq type="optional">cdlabelgen</packagereq>
+      <packagereq type="optional">cdparanoia</packagereq>
       <packagereq type="optional">cdrskin</packagereq>
       <packagereq type="optional">cmusphinx3</packagereq>
       <packagereq type="optional">csound-gui</packagereq>
@@ -5512,12 +5223,14 @@
       <packagereq type="optional">festvox-clb-arctic-hts</packagereq>
       <packagereq type="optional">festvox-rms-arctic-hts</packagereq>
       <packagereq type="optional">gcstar</packagereq>
+      <packagereq type="optional">genisoimage</packagereq>
       <packagereq type="optional">gnomad2</packagereq>
       <packagereq type="optional">gnomebaker</packagereq>
       <packagereq type="optional">gnomeradio</packagereq>
       <packagereq type="optional">grip</packagereq>
       <packagereq type="optional">gtk-v4l</packagereq>
       <packagereq type="optional">gtkpod</packagereq>
+      <packagereq type="optional">icedax</packagereq>
       <packagereq type="optional">id3v2</packagereq>
       <packagereq type="optional">isomaster</packagereq>
       <packagereq type="optional">jack-audio-connection-kit</packagereq>
@@ -5556,9 +5269,9 @@
       <packagereq type="optional">regionset</packagereq>
       <packagereq type="optional">rhythmbox</packagereq>
       <packagereq type="optional">rosegarden4</packagereq>
+      <packagereq type="optional">sound-juicer</packagereq>
       <packagereq type="optional">soundconverter</packagereq>
       <packagereq type="optional">soundtracker</packagereq>
-      <packagereq type="optional">sound-juicer</packagereq>
       <packagereq type="optional">sox</packagereq>
       <packagereq type="optional">sweep</packagereq>
       <packagereq type="optional">tagtool</packagereq>
@@ -5623,6 +5336,132 @@
     </packagelist>
   </group>
   <group>
+    <id>standard</id>
+    <_name>Standard</_name>
+    <_description>Common set of utilities that extend the minimal installation.</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>acl</packagereq>
+      <packagereq>at</packagereq>
+      <packagereq>attr</packagereq>
+      <packagereq>bash-completion</packagereq>
+      <packagereq>bc</packagereq>
+      <packagereq>bind-utils</packagereq>
+      <packagereq>bridge-utils</packagereq>
+      <packagereq>btrfs-progs</packagereq>
+      <packagereq>bzip2</packagereq>
+      <packagereq>cifs-utils</packagereq>
+      <packagereq>coolkey</packagereq>
+      <packagereq>cpio</packagereq>
+      <packagereq>crontabs</packagereq>
+      <packagereq>cryptsetup</packagereq>
+      <packagereq>cyrus-sasl-plain</packagereq>
+      <packagereq>dbus</packagereq>
+      <packagereq>deltarpm</packagereq>
+      <packagereq>dos2unix</packagereq>
+      <packagereq>dosfstools</packagereq>
+      <packagereq>dump</packagereq>
+      <packagereq>ed</packagereq>
+      <packagereq>ethtool</packagereq>
+      <packagereq>fedora-release-notes</packagereq>
+      <packagereq>file</packagereq>
+      <packagereq>finger</packagereq>
+      <packagereq>fpaste</packagereq>
+      <packagereq>fprintd-pam</packagereq>
+      <packagereq>ftp</packagereq>
+      <packagereq>gnupg2</packagereq>
+      <packagereq>hunspell</packagereq>
+      <packagereq>iptstate</packagereq>
+      <packagereq>irda-utils</packagereq>
+      <packagereq>irqbalance</packagereq>
+      <packagereq>jwhois</packagereq>
+      <packagereq>lftp</packagereq>
+      <packagereq>logrotate</packagereq>
+      <packagereq>lsof</packagereq>
+      <packagereq>mailcap</packagereq>
+      <packagereq>man-pages</packagereq>
+      <packagereq>mcelog</packagereq>
+      <packagereq>mdadm</packagereq>
+      <packagereq>microcode_ctl</packagereq>
+      <packagereq>mlocate</packagereq>
+      <packagereq>mtr</packagereq>
+      <packagereq>nano</packagereq>
+      <packagereq>net-tools</packagereq>
+      <packagereq>nfs-utils</packagereq>
+      <packagereq>nmap-ncat</packagereq>
+      <packagereq>ntfs-3g</packagereq>
+      <packagereq>ntfsprogs</packagereq>
+      <packagereq>ntsysv</packagereq>
+      <packagereq>numactl</packagereq>
+      <packagereq>PackageKit-yum-plugin</packagereq>
+      <packagereq>pam_krb5</packagereq>
+      <packagereq>pam_pkcs11</packagereq>
+      <packagereq>passwdqc</packagereq>
+      <packagereq>pciutils</packagereq>
+      <packagereq>pcmciautils</packagereq>
+      <packagereq>pinfo</packagereq>
+      <packagereq>plymouth</packagereq>
+      <packagereq>pm-utils</packagereq>
+      <packagereq>prelink</packagereq>
+      <packagereq>psacct</packagereq>
+      <packagereq>quota</packagereq>
+      <packagereq>rdist</packagereq>
+      <packagereq>realmd</packagereq>
+      <packagereq>rng-tools</packagereq>
+      <packagereq>rsh</packagereq>
+      <packagereq>rsync</packagereq>
+      <packagereq>rsyslog</packagereq>
+      <packagereq>setuptool</packagereq>
+      <packagereq>smartmontools</packagereq>
+      <packagereq>sos</packagereq>
+      <packagereq>sssd</packagereq>
+      <packagereq>stunnel</packagereq>
+      <packagereq>sudo</packagereq>
+      <packagereq>symlinks</packagereq>
+      <packagereq>talk</packagereq>
+      <packagereq>tar</packagereq>
+      <packagereq>tcpdump</packagereq>
+      <packagereq>tcp_wrappers</packagereq>
+      <packagereq>telnet</packagereq>
+      <packagereq>time</packagereq>
+      <packagereq>tmpwatch</packagereq>
+      <packagereq>traceroute</packagereq>
+      <packagereq>tree</packagereq>
+      <packagereq>unzip</packagereq>
+      <packagereq>usbutils</packagereq>
+      <packagereq>vconfig</packagereq>
+      <packagereq>wget</packagereq>
+      <packagereq>which</packagereq>
+      <packagereq>wireless-tools</packagereq>
+      <packagereq>words</packagereq>
+      <packagereq>yum-langpacks</packagereq>
+      <packagereq>yum-utils</packagereq>
+      <packagereq>zip</packagereq>
+      <packagereq type="conditional" requires="control-center">chrony</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>sugar-apps</id>
+    <_name>Additional Sugar Activities</_name>
+    <_description>Additional activities for use with the Sugar Environment.</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>sugar-analyze</packagereq>
+      <packagereq>sugar-calendario</packagereq>
+      <packagereq>sugar-connect</packagereq>
+      <packagereq>sugar-distance</packagereq>
+      <packagereq>sugar-emulator</packagereq>
+      <packagereq>sugar-flipsticks</packagereq>
+      <packagereq>sugar-implode</packagereq>
+      <packagereq>sugar-playgo</packagereq>
+      <packagereq>sugar-pukllanapac</packagereq>
+      <packagereq>sugar-view-slides</packagereq>
+      <packagereq>sugar-xomail</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>sugar-desktop</id>
     <_name>Sugar Desktop Environment</_name>
     <_description>A software playground for learning about learning.</_description>
@@ -5630,6 +5469,7 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq>csound-python</packagereq>
+      <packagereq>etoys-sugar</packagereq>
       <packagereq>gnome-power-manager</packagereq>
       <packagereq>gvfs</packagereq>
       <packagereq>lightdm</packagereq>
@@ -5637,16 +5477,13 @@
       <packagereq>metacity</packagereq>
       <packagereq>pygame</packagereq>
       <packagereq>sugar</packagereq>
-      <packagereq>sugar-cp-all</packagereq>
-      <packagereq>sugar-toolkit</packagereq>
-      <packagereq>sugar-toolkit-gtk3</packagereq>
-      <packagereq>etoys-sugar</packagereq>
       <packagereq>sugar-abacus</packagereq>
       <packagereq>sugar-browse</packagereq>
       <packagereq>sugar-calculator</packagereq>
       <packagereq>sugar-chat</packagereq>
       <packagereq>sugar-clock</packagereq>
       <packagereq>sugar-countries</packagereq>
+      <packagereq>sugar-cp-all</packagereq>
       <packagereq>sugar-finance</packagereq>
       <packagereq>sugar-fototoon</packagereq>
       <packagereq>sugar-getiabooks</packagereq>
@@ -5669,6 +5506,8 @@
       <packagereq>sugar-speak</packagereq>
       <packagereq>sugar-stopwatch</packagereq>
       <packagereq>sugar-terminal</packagereq>
+      <packagereq>sugar-toolkit</packagereq>
+      <packagereq>sugar-toolkit-gtk3</packagereq>
       <packagereq>sugar-turtleart</packagereq>
       <packagereq>sugar-typing-turtle</packagereq>
       <packagereq>sugar-visualmatch</packagereq>
@@ -5688,6 +5527,7 @@
       <packagereq type="default">chrony</packagereq>
       <packagereq type="default">cifs-utils</packagereq>
       <packagereq type="default">jigdo</packagereq>
+      <packagereq type="default">libreswan</packagereq>
       <packagereq type="default">NetworkManager-l2tp</packagereq>
       <packagereq type="default">NetworkManager-openconnect</packagereq>
       <packagereq type="default">NetworkManager-openvpn</packagereq>
@@ -5696,7 +5536,6 @@
       <packagereq type="default">ntfs-3g</packagereq>
       <packagereq type="default">openconnect</packagereq>
       <packagereq type="default">openldap-clients</packagereq>
-      <packagereq type="default">libreswan</packagereq>
       <packagereq type="default">openvpn</packagereq>
       <packagereq type="default">samba-client</packagereq>
       <packagereq type="default">screen</packagereq>
@@ -5964,8 +5803,8 @@
       <packagereq type="optional">pork</packagereq>
       <packagereq type="optional">rss2email</packagereq>
       <packagereq type="optional">rtorrent</packagereq>
-      <packagereq type="optional">slrn</packagereq>
       <packagereq type="optional">sitecopy</packagereq>
+      <packagereq type="optional">slrn</packagereq>
       <packagereq type="optional">snownews</packagereq>
       <packagereq type="optional">tftp</packagereq>
       <packagereq type="optional">tin</packagereq>
@@ -6019,6 +5858,19 @@
     </packagelist>
   </group>
   <group>
+    <id>tomcat</id>
+    <_name>Tomcat</_name>
+    <_description>Tomcat web application server.</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>tomcat</packagereq>
+      <packagereq>tomcat-admin-webapps</packagereq>
+      <packagereq>tomcat-native</packagereq>
+      <packagereq>tomcat-webapps</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>traditional-chinese-support</id>
     <_name>Traditional Chinese Support</_name>
     <_description/>
@@ -6098,29 +5950,6 @@
     </packagelist>
   </group>
   <group>
-    <id>guest-agents</id>
-    <_name>Guest Agents</_name>
-    <_description>Agents used when running under a hypervisor.</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>open-vm-tools</packagereq>
-      <packagereq>qemu-guest-agent</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>guest-desktop-agents</id>
-    <_name>Guest Desktop Agents</_name>
-    <_description>Agents used when running as a virtualized desktop.</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>open-vm-tools-desktop</packagereq>
-      <packagereq>qemu-guest-agent</packagereq>
-      <packagereq>spice-vdagent</packagereq>
-    </packagelist>
-  </group>
-  <group>
     <id>virtualization</id>
     <_name>Virtualization</_name>
     <_description>These packages provide a virtualization environment.</_description>
@@ -6128,8 +5957,8 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="mandatory">virt-install</packagereq>
-      <packagereq type="default">libvirt-daemon-kvm</packagereq>
       <packagereq type="default">libvirt-daemon-config-network</packagereq>
+      <packagereq type="default">libvirt-daemon-kvm</packagereq>
       <packagereq type="default">qemu-kvm</packagereq>
       <packagereq type="default">virt-manager</packagereq>
       <packagereq type="default">virt-viewer</packagereq>
@@ -6228,62 +6057,223 @@
     </packagelist>
   </group>
   <group>
-    <id>x-software-development</id>
-    <_name>X Software Development</_name>
-    <_description>These packages allow you to develop applications for the X Window System.</_description>
+    <id>x-software-development</id>
+    <_name>X Software Development</_name>
+    <_description>These packages allow you to develop applications for the X Window System.</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">libICE-devel</packagereq>
+      <packagereq type="mandatory">libX11-devel</packagereq>
+      <packagereq type="mandatory">libXaw-devel</packagereq>
+      <packagereq type="mandatory">libXfixes-devel</packagereq>
+      <packagereq type="mandatory">libXt-devel</packagereq>
+      <packagereq type="default">freetype-devel</packagereq>
+      <packagereq type="default">gd-devel</packagereq>
+      <packagereq type="default">giflib-devel</packagereq>
+      <packagereq type="default">libdmx-devel</packagereq>
+      <packagereq type="default">libdrm-devel</packagereq>
+      <packagereq type="default">libjpeg-turbo-devel</packagereq>
+      <packagereq type="default">libmng-devel</packagereq>
+      <packagereq type="default">libpng-devel</packagereq>
+      <packagereq type="default">libSM-devel</packagereq>
+      <packagereq type="default">libtiff-devel</packagereq>
+      <packagereq type="default">libXau-devel</packagereq>
+      <packagereq type="default">libXcomposite-devel</packagereq>
+      <packagereq type="default">libXcursor-devel</packagereq>
+      <packagereq type="default">libXdamage-devel</packagereq>
+      <packagereq type="default">libXdmcp-devel</packagereq>
+      <packagereq type="default">libXevie-devel</packagereq>
+      <packagereq type="default">libXext-devel</packagereq>
+      <packagereq type="default">libXfont-devel</packagereq>
+      <packagereq type="default">libXft-devel</packagereq>
+      <packagereq type="default">libxkbfile-devel</packagereq>
+      <packagereq type="default">libXmu-devel</packagereq>
+      <packagereq type="default">libXrandr-devel</packagereq>
+      <packagereq type="default">libXrender-devel</packagereq>
+      <packagereq type="default">libXres-devel</packagereq>
+      <packagereq type="default">libXScrnSaver-devel</packagereq>
+      <packagereq type="default">libXtst-devel</packagereq>
+      <packagereq type="default">libXvMC-devel</packagereq>
+      <packagereq type="default">libXxf86dga-devel</packagereq>
+      <packagereq type="default">libXxf86misc-devel</packagereq>
+      <packagereq type="default">libXxf86vm-devel</packagereq>
+      <packagereq type="default">mesa-libGL-devel</packagereq>
+      <packagereq type="default">netpbm-devel</packagereq>
+      <packagereq type="default">pixman-devel</packagereq>
+      <packagereq type="default">SDL-devel</packagereq>
+      <packagereq type="default">Xaw3d-devel</packagereq>
+      <packagereq type="default">xorg-x11-docs</packagereq>
+      <packagereq type="default">xorg-x11-xtrans-devel</packagereq>
+      <packagereq type="default">xrestop</packagereq>
+      <packagereq type="optional">icon-naming-utils</packagereq>
+      <packagereq type="optional">icon-slicer</packagereq>
+      <packagereq type="optional">libXp-devel</packagereq>
+      <packagereq type="optional">mesa-libGLU-devel</packagereq>
+      <packagereq type="optional">neXtaw-devel</packagereq>
+      <packagereq type="optional">xorg-x11-server-devel</packagereq>
+      <packagereq type="optional">xorg-x11-xbitmaps</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>xfce-apps</id>
+    <_name>Applications for the Xfce Desktop</_name>
+    <_description>A set of commonly used applications for the Xfce Desktop</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>catfish</packagereq>
+      <packagereq>claws-mail</packagereq>
+      <packagereq>claws-mail-plugins-archive</packagereq>
+      <packagereq>claws-mail-plugins-att-remover</packagereq>
+      <packagereq>claws-mail-plugins-attachwarner</packagereq>
+      <packagereq>claws-mail-plugins-fetchinfo</packagereq>
+      <packagereq>claws-mail-plugins-mailmbox</packagereq>
+      <packagereq>claws-mail-plugins-newmail</packagereq>
+      <packagereq>claws-mail-plugins-notification</packagereq>
+      <packagereq>claws-mail-plugins-pgp</packagereq>
+      <packagereq>claws-mail-plugins-rssyl</packagereq>
+      <packagereq>claws-mail-plugins-smime</packagereq>
+      <packagereq>claws-mail-plugins-spam-report</packagereq>
+      <packagereq>claws-mail-plugins-tnef</packagereq>
+      <packagereq>claws-mail-plugins-vcalendar</packagereq>
+      <packagereq>galculator</packagereq>
+      <packagereq>geany</packagereq>
+      <packagereq>gparted</packagereq>
+      <packagereq>leafpad</packagereq>
+      <packagereq>liferea</packagereq>
+      <packagereq>midori</packagereq>
+      <packagereq>orage</packagereq>
+      <packagereq>pidgin</packagereq>
+      <packagereq>remmina</packagereq>
+      <packagereq>remmina-plugins-vnc</packagereq>
+      <packagereq>ristretto</packagereq>
+      <packagereq>seahorse</packagereq>
+      <packagereq>transmission</packagereq>
+      <packagereq>xarchiver</packagereq>
+      <packagereq>xfce4-clipman-plugin</packagereq>
+      <packagereq>xfce4-dict-plugin</packagereq>
+      <packagereq>xfce4-notes-plugin</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>false</uservisible>
+    <packagelist>
+      <packagereq>adwaita-cursor-theme</packagereq>
+      <packagereq>adwaita-gtk2-theme</packagereq>
+      <packagereq>adwaita-gtk3-theme</packagereq>
+      <packagereq>albatross-gtk2-theme</packagereq>
+      <packagereq>albatross-gtk3-theme</packagereq>
+      <packagereq>albatross-xfwm4-theme</packagereq>
+      <packagereq>alsa-utils</packagereq>
+      <packagereq>bluebird-gtk2-theme</packagereq>
+      <packagereq>bluebird-gtk3-theme</packagereq>
+      <packagereq>bluebird-xfwm4-theme</packagereq>
+      <packagereq>desktop-backgrounds-compat</packagereq>
+      <packagereq>fedora-icon-theme</packagereq>
+      <packagereq>firewall-config</packagereq>
+      <packagereq>greybird-gtk2-theme</packagereq>
+      <packagereq>greybird-gtk3-theme</packagereq>
+      <packagereq>greybird-xfce4-notifyd-theme</packagereq>
+      <packagereq>greybird-xfwm4-theme</packagereq>
+      <packagereq>gtk-xfce-engine</packagereq>
+      <packagereq>gvfs</packagereq>
+      <packagereq>initial-setup</packagereq>
+      <packagereq>lightdm-gtk</packagereq>
+      <packagereq>network-manager-applet</packagereq>
+      <packagereq>NetworkManager-l2tp</packagereq>
+      <packagereq>NetworkManager-openconnect</packagereq>
+      <packagereq>NetworkManager-openvpn</packagereq>
+      <packagereq>NetworkManager-pptp</packagereq>
+      <packagereq>NetworkManager-vpnc</packagereq>
+      <packagereq>NetworkManager-vpnc-gnome</packagereq>
+      <packagereq>nm-connection-editor</packagereq>
+      <packagereq>openssh-askpass</packagereq>
+      <packagereq>rodent-icon-theme</packagereq>
+      <packagereq>Thunar</packagereq>
+      <packagereq>thunar-archive-plugin</packagereq>
+      <packagereq>thunar-media-tags-plugin</packagereq>
+      <packagereq>thunar-volman</packagereq>
+      <packagereq>tumbler</packagereq>
+      <packagereq>xdg-user-dirs-gtk</packagereq>
+      <packagereq>xfce4-about</packagereq>
+      <packagereq>xfce4-appfinder</packagereq>
+      <packagereq>xfce4-datetime-plugin</packagereq>
+      <packagereq>xfce4-panel</packagereq>
+      <packagereq>xfce4-places-plugin</packagereq>
+      <packagereq>xfce4-power-manager</packagereq>
+      <packagereq>xfce4-quicklauncher-plugin</packagereq>
+      <packagereq>xfce4-screenshooter-plugin</packagereq>
+      <packagereq>xfce4-session</packagereq>
+      <packagereq>xfce4-session-engines</packagereq>
+      <packagereq>xfce4-settings</packagereq>
+      <packagereq>xfce4-terminal</packagereq>
+      <packagereq>xfconf</packagereq>
+      <packagereq>xfdesktop</packagereq>
+      <packagereq>xfwm4</packagereq>
+      <packagereq>xfwm4-theme-nodoka</packagereq>
+      <packagereq>xfwm4-themes</packagereq>
+      <packagereq>xscreensaver-base</packagereq>
+      <packagereq>yumex</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>xfce-extra-plugins</id>
+    <_name>Extra plugins for the Xfce panel</_name>
+    <_description>Extend the functionality of the Xfce panel</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>xfce4-battery-plugin</packagereq>
+      <packagereq>xfce4-cellmodem-plugin</packagereq>
+      <packagereq>xfce4-cpugraph-plugin</packagereq>
+      <packagereq>xfce4-diskperf-plugin</packagereq>
+      <packagereq>xfce4-eyes-plugin</packagereq>
+      <packagereq>xfce4-fsguard-plugin</packagereq>
+      <packagereq>xfce4-genmon-plugin</packagereq>
+      <packagereq>xfce4-mailwatch-plugin</packagereq>
+      <packagereq>xfce4-mount-plugin</packagereq>
+      <packagereq>xfce4-netload-plugin</packagereq>
+      <packagereq>xfce4-sensors-plugin</packagereq>
+      <packagereq>xfce4-smartbookmark-plugin</packagereq>
+      <packagereq>xfce4-systemload-plugin</packagereq>
+      <packagereq>xfce4-taskmanager</packagereq>
+      <packagereq>xfce4-time-out-plugin</packagereq>
+      <packagereq>xfce4-timer-plugin</packagereq>
+      <packagereq>xfce4-verve-plugin</packagereq>
+      <packagereq>xfce4-weather-plugin</packagereq>
+      <packagereq>xfce4-websearch-plugin</packagereq>
+      <packagereq>xfce4-xkb-plugin</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>xfce-media</id>
+    <_name>Multimedia support for Xfce</_name>
+    <_description>Multimedia support for Xfce</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="mandatory">libICE-devel</packagereq>
-      <packagereq type="mandatory">libX11-devel</packagereq>
-      <packagereq type="mandatory">libXaw-devel</packagereq>
-      <packagereq type="mandatory">libXfixes-devel</packagereq>
-      <packagereq type="mandatory">libXt-devel</packagereq>
-      <packagereq type="default">freetype-devel</packagereq>
-      <packagereq type="default">gd-devel</packagereq>
-      <packagereq type="default">giflib-devel</packagereq>
-      <packagereq type="default">libdmx-devel</packagereq>
-      <packagereq type="default">libdrm-devel</packagereq>
-      <packagereq type="default">libjpeg-turbo-devel</packagereq>
-      <packagereq type="default">libmng-devel</packagereq>
-      <packagereq type="default">libpng-devel</packagereq>
-      <packagereq type="default">libSM-devel</packagereq>
-      <packagereq type="default">libtiff-devel</packagereq>
-      <packagereq type="default">libXau-devel</packagereq>
-      <packagereq type="default">libXcomposite-devel</packagereq>
-      <packagereq type="default">libXcursor-devel</packagereq>
-      <packagereq type="default">libXdamage-devel</packagereq>
-      <packagereq type="default">libXdmcp-devel</packagereq>
-      <packagereq type="default">libXevie-devel</packagereq>
-      <packagereq type="default">libXext-devel</packagereq>
-      <packagereq type="default">libXfont-devel</packagereq>
-      <packagereq type="default">libXft-devel</packagereq>
-      <packagereq type="default">libxkbfile-devel</packagereq>
-      <packagereq type="default">libXmu-devel</packagereq>
-      <packagereq type="default">libXrandr-devel</packagereq>
-      <packagereq type="default">libXrender-devel</packagereq>
-      <packagereq type="default">libXres-devel</packagereq>
-      <packagereq type="default">libXScrnSaver-devel</packagereq>
-      <packagereq type="default">libXtst-devel</packagereq>
-      <packagereq type="default">libXvMC-devel</packagereq>
-      <packagereq type="default">libXxf86dga-devel</packagereq>
-      <packagereq type="default">libXxf86misc-devel</packagereq>
-      <packagereq type="default">libXxf86vm-devel</packagereq>
-      <packagereq type="default">mesa-libGL-devel</packagereq>
-      <packagereq type="default">netpbm-devel</packagereq>
-      <packagereq type="default">pixman-devel</packagereq>
-      <packagereq type="default">SDL-devel</packagereq>
-      <packagereq type="default">Xaw3d-devel</packagereq>
-      <packagereq type="default">xorg-x11-docs</packagereq>
-      <packagereq type="default">xorg-x11-xtrans-devel</packagereq>
-      <packagereq type="default">xrestop</packagereq>
-      <packagereq type="optional">icon-naming-utils</packagereq>
-      <packagereq type="optional">icon-slicer</packagereq>
-      <packagereq type="optional">libXp-devel</packagereq>
-      <packagereq type="optional">mesa-libGLU-devel</packagereq>
-      <packagereq type="optional">neXtaw-devel</packagereq>
-      <packagereq type="optional">xorg-x11-server-devel</packagereq>
-      <packagereq type="optional">xorg-x11-xbitmaps</packagereq>
+      <packagereq>asunder</packagereq>
+      <packagereq>parole</packagereq>
+      <packagereq>pavucontrol</packagereq>
+      <packagereq>pragha</packagereq>
+      <packagereq>xfburn</packagereq>
+      <packagereq>xfce4-mixer</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>xfce-office</id>
+    <_name>Xfce Office</_name>
+    <_description>Office suite for Xfce</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>abiword</packagereq>
+      <packagereq>gnumeric</packagereq>
     </packagelist>
   </group>
   <group>
@@ -6307,6 +6297,30 @@
     </packagelist>
   </group>
   <group>
+    <id>xmonad</id>
+    <_name>XMonad</_name>
+    <_description>A tiling window manager</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>xmobar</packagereq>
+      <packagereq>xmonad</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>xmonad-mate</id>
+    <_name>XMonad for MATE</_name>
+    <_description>XMonad window manager with MATE</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>mate-control-center</packagereq>
+      <packagereq>mate-panel</packagereq>
+      <packagereq>mate-screensaver</packagereq>
+      <packagereq>xmonad-mate</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>yiddish-support</id>
     <_name>Yiddish Support</_name>
     <_description/>
@@ -6332,52 +6346,6 @@
       <packagereq type="default">culmus-yehuda-clm-fonts</packagereq>
     </packagelist>
   </group>
-  <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>
-  <environment>
-    <id>gnome-desktop-environment</id>
-    <_name>GNOME Desktop</_name>
-    <_description>GNOME is a highly intuitive and user friendly desktop environment.</_description>
-    <display_order>5</display_order>
-    <grouplist>
-      <groupid>base-x</groupid>
-      <groupid>standard</groupid>
-      <groupid>core</groupid>
-      <groupid>dial-up</groupid>
-      <groupid>fonts</groupid>
-      <groupid>input-methods</groupid>
-      <groupid>multimedia</groupid>
-      <groupid>hardware-support</groupid>
-      <groupid>printing</groupid>
-      <groupid>firefox</groupid>
-      <groupid>guest-desktop-agents</groupid>
-      <groupid>gnome-desktop</groupid>
-    </grouplist>
-    <optionlist>
-      <groupid default="true">libreoffice</groupid>
-      <groupid>gnome-games</groupid>
-      <groupid>epiphany</groupid>
-      <groupid>3d-printing</groupid>
-    </optionlist>
-  </environment>
   <environment>
     <id>kde-desktop-environment</id>
     <_name>KDE Plasma Workspaces</_name>
@@ -6582,6 +6550,32 @@
     </optionlist>
   </environment>
   <environment>
+    <id>gnome-desktop-environment</id>
+    <_name>GNOME Desktop</_name>
+    <_description>GNOME is a highly intuitive and user friendly desktop environment.</_description>
+    <display_order>5</display_order>
+    <grouplist>
+      <groupid>base-x</groupid>
+      <groupid>standard</groupid>
+      <groupid>core</groupid>
+      <groupid>dial-up</groupid>
+      <groupid>fonts</groupid>
+      <groupid>input-methods</groupid>
+      <groupid>multimedia</groupid>
+      <groupid>hardware-support</groupid>
+      <groupid>printing</groupid>
+      <groupid>firefox</groupid>
+      <groupid>guest-desktop-agents</groupid>
+      <groupid>gnome-desktop</groupid>
+    </grouplist>
+    <optionlist>
+      <groupid default="true">libreoffice</groupid>
+      <groupid>gnome-games</groupid>
+      <groupid>epiphany</groupid>
+      <groupid>3d-printing</groupid>
+    </optionlist>
+  </environment>
+  <environment>
     <id>web-server-environment</id>
     <_name>Web Server</_name>
     <_description>Server for serving static and dynamic internet content.</_description>
@@ -6680,26 +6674,13 @@
     </optionlist>
   </environment>
   <category>
-    <id>gnome-desktop-environment</id>
-    <_name>GNOME Desktop</_name>
-    <_description>GNOME is a highly intuitive and user friendly desktop environment.</_description>
-    <display_order>5</display_order>
-    <grouplist>
-      <groupid>firefox</groupid>
-      <groupid>gnome-desktop</groupid>
-      <groupid>gnome-games</groupid>
-      <groupid>epiphany</groupid>
-      <groupid>libreoffice</groupid>
-    </grouplist>
-  </category>
-  <category>
     <id>kde-desktop-environment</id>
     <_name>KDE Desktop</_name>
     <_description>The KDE SC includes the KDE Plasma Desktop, a highly-configurable graphical user interface which includes a panel, desktop, system icons and desktop widgets, and many powerful KDE applications.</_description>
     <display_order>10</display_order>
     <grouplist>
-      <groupid>kde-desktop</groupid>
       <groupid>kde-apps</groupid>
+      <groupid>kde-desktop</groupid>
       <groupid>kde-education</groupid>
       <groupid>kde-media</groupid>
       <groupid>kde-office</groupid>
@@ -6712,21 +6693,44 @@
     <_description>A lightweight desktop environment that works well on low end machines.</_description>
     <display_order>15</display_order>
     <grouplist>
-      <groupid>xfce-desktop</groupid>
       <groupid>xfce-apps</groupid>
+      <groupid>xfce-desktop</groupid>
       <groupid>xfce-extra-plugins</groupid>
       <groupid>xfce-media</groupid>
       <groupid>xfce-office</groupid>
     </grouplist>
   </category>
   <category>
+    <id>apps</id>
+    <_name>Applications</_name>
+    <_description>Applications to perform a variety of tasks</_description>
+    <display_order>20</display_order>
+    <grouplist>
+      <groupid>authoring-and-publishing</groupid>
+      <groupid>design-suite</groupid>
+      <groupid>editors</groupid>
+      <groupid>education</groupid>
+      <groupid>engineering-and-scientific</groupid>
+      <groupid>firefox</groupid>
+      <groupid>font-design</groupid>
+      <groupid>games</groupid>
+      <groupid>graphical-internet</groupid>
+      <groupid>graphics</groupid>
+      <groupid>libreoffice</groupid>
+      <groupid>medical</groupid>
+      <groupid>office</groupid>
+      <groupid>sound-and-video</groupid>
+      <groupid>text-internet</groupid>
+    </grouplist>
+  </category>
+  <category>
     <id>lxde-desktop-environment</id>
     <_name>LXDE Desktop</_name>
     <_description>LXDE is a lightweight X11 desktop environment designed for computers with low hardware specifications like netbooks, mobile devices or older computers.</_description>
     <display_order>20</display_order>
     <grouplist>
-      <groupid>lxde-desktop</groupid>
       <groupid>lxde-apps</groupid>
+      <groupid>lxde-desktop</groupid>
       <groupid>lxde-media</groupid>
       <groupid>lxde-office</groupid>
     </grouplist>
@@ -6747,9 +6751,9 @@
     <_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>
       <groupid>mate-applications</groupid>
       <groupid>mate-compiz</groupid>
+      <groupid>mate-desktop</groupid>
     </grouplist>
   </category>
   <category>
@@ -6758,31 +6762,21 @@
     <_description>A software playground for learning about learning.</_description>
     <display_order>25</display_order>
     <grouplist>
-      <groupid>sugar-desktop</groupid>
       <groupid>sugar-apps</groupid>
+      <groupid>sugar-desktop</groupid>
     </grouplist>
   </category>
   <category>
-    <id>apps</id>
-    <_name>Applications</_name>
-    <_description>Applications to perform a variety of tasks</_description>
-    <display_order>20</display_order>
+    <id>gnome-desktop-environment</id>
+    <_name>GNOME Desktop</_name>
+    <_description>GNOME is a highly intuitive and user friendly desktop environment.</_description>
+    <display_order>5</display_order>
     <grouplist>
-      <groupid>authoring-and-publishing</groupid>
-      <groupid>design-suite</groupid>
-      <groupid>editors</groupid>
-      <groupid>education</groupid>
-      <groupid>engineering-and-scientific</groupid>
+      <groupid>epiphany</groupid>
       <groupid>firefox</groupid>
-      <groupid>font-design</groupid>
-      <groupid>games</groupid>
-      <groupid>graphical-internet</groupid>
-      <groupid>graphics</groupid>
-      <groupid>medical</groupid>
+      <groupid>gnome-desktop</groupid>
+      <groupid>gnome-games</groupid>
       <groupid>libreoffice</groupid>
-      <groupid>office</groupid>
-      <groupid>sound-and-video</groupid>
-      <groupid>text-internet</groupid>
     </grouplist>
   </category>
   <category>
@@ -6791,11 +6785,10 @@
     <_description>Packages which provide functionality for developing and building applications.</_description>
     <display_order>70</display_order>
     <grouplist>
+      <groupid>c-development</groupid>
       <groupid>design-suite</groupid>
       <groupid>development-libs</groupid>
       <groupid>development-tools</groupid>
-      <groupid>rpm-development-tools</groupid>
-      <groupid>c-development</groupid>
       <groupid>eclipse</groupid>
       <groupid>electronic-lab</groupid>
       <groupid>fedora-packager</groupid>
@@ -6817,6 +6810,7 @@
       <groupid>php</groupid>
       <groupid>python-web</groupid>
       <groupid>robotics-suite</groupid>
+      <groupid>rpm-development-tools</groupid>
       <groupid>ruby</groupid>
       <groupid>rubyonrails</groupid>
       <groupid>sql-server</groupid>
@@ -6842,17 +6836,17 @@
       <groupid>ha</groupid>
       <groupid>haproxy</groupid>
       <groupid>jbossas</groupid>
-      <groupid>load-balancer</groupid>
       <groupid>legacy-network-server</groupid>
+      <groupid>load-balancer</groupid>
       <groupid>mail-server</groupid>
       <groupid>mongodb</groupid>
       <groupid>mysql</groupid>
       <groupid>network-server</groupid>
       <groupid>news-server</groupid>
       <groupid>perl-web</groupid>
-      <groupid>python-web</groupid>
       <groupid>php</groupid>
       <groupid>printing</groupid>
+      <groupid>python-web</groupid>
       <groupid>rubyonrails</groupid>
       <groupid>server-cfg</groupid>
       <groupid>smb-server</groupid>
@@ -6869,7 +6863,6 @@
     <display_order>99</display_order>
     <grouplist>
       <groupid>admin-tools</groupid>
-      <groupid>standard</groupid>
       <groupid>dial-up</groupid>
       <groupid>fonts</groupid>
       <groupid>hardware-support</groupid>
@@ -6877,6 +6870,7 @@
       <groupid>java</groupid>
       <groupid>legacy-fonts</groupid>
       <groupid>legacy-software-support</groupid>
+      <groupid>standard</groupid>
       <groupid>system-tools</groupid>
       <groupid>virtualization</groupid>
     </grouplist>
@@ -6997,8 +6991,8 @@
     <ignoredep package="libgnomeprint15" requires="gnome-print"/>
     <ignoredep package="libtermcap" requires="bash"/>
     <ignoredep package="lvm2" requires="kernel"/>
-    <ignoredep package="modutils" requires="vixie-cron"/>
     <ignoredep package="mariadb" requires="perl-DBD-MySQL"/>
+    <ignoredep package="modutils" requires="vixie-cron"/>
     <ignoredep package="nautilus" requires="nautilus-cd-burner"/>
     <ignoredep package="nautilus" requires="nautilus-mozilla"/>
     <ignoredep package="ncurses" requires="gpm"/>
diff --git a/comps-f21.xml.in b/comps-f21.xml.in
index e51c2b8..cae7ac0 100644
--- a/comps-f21.xml.in
+++ b/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>
@@ -794,25 +794,25 @@
     </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>
+    <id>critical-path-lxde</id>
+    <_name>Critical Path (LXDE)</_name>
+    <_description>A set of packages that provide the Critical Path functionality for the LXDE desktop</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="mandatory">lxqt-common</packagereq>
+      <packagereq type="mandatory">lxde-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>
-    <_description>A set of packages that provide the Critical Path functionality for the LXDE desktop</_description>
+    <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">lxde-common</packagereq>
+      <packagereq type="mandatory">lxqt-common</packagereq>
       <!-- specify this because otherwise xfce4-notifyd wins -->
       <packagereq type="default">notification-daemon</packagereq>
     </packagelist>
@@ -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-mono-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-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>
@@ -4039,6 +4039,32 @@
     </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>
     <_description>A set of commonly used applications for the LXQt Desktop</_description>
@@ -4055,52 +4081,38 @@
     <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-about</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>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>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>
     <_description>Multimedia support for LXQt</_description>
@@ -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-mono-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-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>
@@ -6845,36 +6843,6 @@
     </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
          package.  Please keep this mostly in sync with
@@ -7053,7 +7021,6 @@
       <groupid>cloud-management</groupid>
     </optionlist>
   </environment>
-
   <environment>
     <id>cinnamon-desktop-environment</id>
     <_name>Cinnamon Desktop</_name>
@@ -7132,6 +7099,36 @@
     </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>
     <_description>Workstation for software, hardware, graphics, or content development.</_description>
@@ -7370,7 +7367,6 @@
       <groupid>lxqt-office</groupid>
     </grouplist>
   </category>
-
   <category>
     <id>cinnamon-desktop-environment</id>
     <_name>Cinnamon Desktop</_name>
diff --git a/comps-f22.xml.in b/comps-f22.xml.in
index 703030e..7bd8d7e 100644
--- a/comps-f22.xml.in
+++ b/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>
@@ -796,30 +796,29 @@
     </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>
+    <id>critical-path-lxde</id>
+    <_name>Critical Path (LXDE)</_name>
+    <_description>A set of packages that provide the Critical Path functionality for the LXDE desktop</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="mandatory">lxqt-common</packagereq>
+      <packagereq type="mandatory">lxde-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>
-    <_description>A set of packages that provide the Critical Path functionality for the LXDE desktop</_description>
+    <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">lxde-common</packagereq>
+      <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-mono-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-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>
@@ -4053,6 +4052,32 @@
     </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>
     <_description>A set of commonly used applications for the LXQt Desktop</_description>
@@ -4069,52 +4094,38 @@
     <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-about</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>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>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>
     <_description>Multimedia support for LXQt</_description>
@@ -4126,27 +4137,15 @@
     </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>
     <_description>Office suite for LXQt</_description>
     <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-mono-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-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>
@@ -5396,6 +5395,22 @@
     </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>
     <_description>Packages mandatory for the server product.</_description>
@@ -5434,22 +5449,6 @@
     </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>
     <_description/>
@@ -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
-         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>
+    <id>minimal-environment</id>
+    <_name>Minimal Install</_name>
+    <_description>Basic functionality.</_description>
+    <display_order>1</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>
@@ -7003,6 +6945,47 @@
     </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>
     <_description>Fedora Workstation is a user friendly desktop system for laptops and PCs.</_description>
@@ -7078,7 +7061,6 @@
       <groupid>cloud-management</groupid>
     </optionlist>
   </environment>
-
   <environment>
     <id>cinnamon-desktop-environment</id>
     <_name>Cinnamon Desktop</_name>
@@ -7157,6 +7139,36 @@
     </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>
     <_description>Workstation for software, hardware, graphics, or content development.</_description>
@@ -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>
diff --git a/comps-f23.xml.in b/comps-f23.xml.in
index b5913fe..522e95c 100644
--- a/comps-f23.xml.in
+++ b/comps-f23.xml.in
@@ -2,26 +2,6 @@
 <!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>
     <_description>This group is a collection of graphical administration tools for the system, such as for managing user accounts and configuring system hardware.</_description>
@@ -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>
@@ -796,25 +776,25 @@
     </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>
+    <id>critical-path-lxde</id>
+    <_name>Critical Path (LXDE)</_name>
+    <_description>A set of packages that provide the Critical Path functionality for the LXDE desktop</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="mandatory">lxqt-common</packagereq>
+      <packagereq type="mandatory">lxde-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>
-    <_description>A set of packages that provide the Critical Path functionality for the LXDE desktop</_description>
+    <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">lxde-common</packagereq>
+      <packagereq type="mandatory">lxqt-common</packagereq>
       <!-- specify this because otherwise xfce4-notifyd wins -->
       <packagereq type="default">notification-daemon</packagereq>
     </packagelist>
@@ -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-mono-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-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>
@@ -4052,6 +4032,32 @@
     </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>
     <_description>A set of commonly used applications for the LXQt Desktop</_description>
@@ -4068,52 +4074,38 @@
     <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-about</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>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>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>
     <_description>Multimedia support for LXQt</_description>
@@ -4125,27 +4117,15 @@
     </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>
     <_description>Office suite for LXQt</_description>
     <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-mono-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-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 +5375,22 @@
     </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>
     <_description>Packages mandatory for the server product.</_description>
@@ -5433,22 +5429,6 @@
     </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>
     <_description/>
@@ -6156,6 +6136,26 @@
     </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>
     <_description/>
@@ -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
-         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>
+    <id>minimal-environment</id>
+    <_name>Minimal Install</_name>
+    <_description>Basic functionality.</_description>
+    <display_order>1</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>
@@ -7003,6 +6946,47 @@
     </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>
     <_description>Fedora Workstation is a user friendly desktop system for laptops and PCs.</_description>
@@ -7078,7 +7062,6 @@
       <groupid>cloud-management</groupid>
     </optionlist>
   </environment>
-
   <environment>
     <id>cinnamon-desktop-environment</id>
     <_name>Cinnamon Desktop</_name>
@@ -7157,6 +7140,36 @@
     </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>
     <_description>Workstation for software, hardware, graphics, or content development.</_description>
@@ -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>




More information about the scm-commits mailing list