diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index 02e35853..73732b93 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -6086,68 +6086,83 @@
     </optionlist>
   </environment>
   <category>
-    <id>language-support</id>
-    <_name>Languages</_name>
-    <_description>These packages provide support for various locales including fonts and input methods.</_description>
+    <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>arabic-support</groupid>
-      <groupid>assamese-support</groupid>
-      <groupid>bengali-support</groupid>
-      <groupid>bhutanese-support</groupid>
-      <groupid>bodo-support</groupid>
-      <groupid>burmese-support</groupid>
-      <groupid>dogri-support</groupid>
-      <groupid>ethiopic-support</groupid>
-      <groupid>finnish-support</groupid>
-      <groupid>georgian-support</groupid>
-      <groupid>greek-support</groupid>
-      <groupid>gujarati-support</groupid>
-      <groupid>hebrew-support</groupid>
-      <groupid>hindi-support</groupid>
-      <groupid>japanese-support</groupid>
-      <groupid>kannada-support</groupid>
-      <groupid>kashmiri-support</groupid>
-      <groupid>khmer-support</groupid>
-      <groupid>konkani-support</groupid>
-      <groupid>korean-support</groupid>
-      <groupid>kurdish-support</groupid>
-      <groupid>maithili-support</groupid>
-      <groupid>malayalam-support</groupid>
-      <groupid>manipuri-support</groupid>
-      <groupid>marathi-support</groupid>
-      <groupid>nepali-support</groupid>
-      <groupid>oriya-support</groupid>
-      <groupid>persian-support</groupid>
-      <groupid>punjabi-support</groupid>
-      <groupid>russian-support</groupid>
-      <groupid>sanskrit-support</groupid>
-      <groupid>santali-support</groupid>
-      <groupid>serbian-support</groupid>
-      <groupid>simplified-chinese-support</groupid>
-      <groupid>sindhi-support</groupid>
-      <groupid>sinhala-support</groupid>
-      <groupid>tamil-support</groupid>
-      <groupid>telugu-support</groupid>
-      <groupid>thai-support</groupid>
-      <groupid>tibetan-support</groupid>
-      <groupid>traditional-chinese-support</groupid>
-      <groupid>urdu-support</groupid>
-      <groupid>yiddish-support</groupid>
+      <groupid>firefox</groupid>
+      <groupid>gnome-desktop</groupid>
+      <groupid>gnome-games</groupid>
+      <groupid>epiphany</groupid>
+      <groupid>libreoffice</groupid>
     </grouplist>
   </category>
   <category>
-    <id>desktops</id>
-    <_name>Desktop Environments</_name>
-    <_description>Desktop environments</_description>
+    <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>gnome-desktop</groupid>
       <groupid>kde-desktop</groupid>
-      <groupid>lxde-desktop</groupid>
-      <groupid>mate-desktop</groupid>
-      <groupid>sugar-desktop</groupid>
-      <groupid>window-managers</groupid>
+      <groupid>kde-apps</groupid>
+      <groupid>kde-education</groupid>
+      <groupid>kde-media</groupid>
+      <groupid>kde-office</groupid>
+    </grouplist>
+  </category>
+  <category>
+    <id>xfce-desktop-environment</id>
+    <_name>Xfce Desktop</_name>
+    <_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-extra-plugins</groupid>
+      <groupid>xfce-media</groupid>
+      <groupid>xfce-office</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-media</groupid>
+      <groupid>lxde-office</groupid>
+    </grouplist>
+  </category>
+  <category>
+    <id>cinnamon-desktop-environment</id>
+    <_name>Cinnamon Desktop</_name>
+    <_description>Cinnamon provides a desktop with a traditional layout, advanced features, easy to use, powerful and flexible.</_description>
+    <display_order>21</display_order>
+    <grouplist>
+      <groupid>cinnamon-desktop</groupid>
+      <groupid>libreoffice</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>
+  <category>
+    <id>sugar-desktop-environment</id>
+    <_name>Sugar Desktop Environment</_name>
+    <_description>A software playground for learning about learning.</_description>
+    <display_order>25</display_order>
+    <grouplist>
+      <groupid>sugar-desktop</groupid>
+      <groupid>sugar-apps</groupid>
     </grouplist>
   </category>
   <category>
@@ -6161,11 +6176,13 @@
       <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>medical</groupid>
+      <groupid>libreoffice</groupid>
       <groupid>office</groupid>
       <groupid>sound-and-video</groupid>
       <groupid>text-internet</groupid>
@@ -6177,23 +6194,34 @@
     <_description>Packages which provide functionality for developing and building applications.</_description>
     <display_order>70</display_order>
     <grouplist>
+      <groupid>design-suite</groupid>
       <groupid>development-libs</groupid>
       <groupid>development-tools</groupid>
       <groupid>eclipse</groupid>
       <groupid>electronic-lab</groupid>
       <groupid>fedora-packager</groupid>
+      <groupid>font-design</groupid>
       <groupid>gnome-software-development</groupid>
       <groupid>haskell</groupid>
       <groupid>java-development</groupid>
+      <groupid>jbossas</groupid>
       <groupid>kde-software-development</groupid>
       <groupid>legacy-software-development</groupid>
       <groupid>libreoffice-development</groupid>
       <groupid>milkymist</groupid>
       <groupid>mingw32</groupid>
+      <groupid>mongodb</groupid>
+      <groupid>mysql</groupid>
       <groupid>ocaml</groupid>
       <groupid>perl</groupid>
+      <groupid>perl-web</groupid>
+      <groupid>php</groupid>
       <groupid>robotics-suite</groupid>
       <groupid>ruby</groupid>
+      <groupid>rubyonrails</groupid>
+      <groupid>sql-server</groupid>
+      <groupid>virtualization</groupid>
+      <groupid>web-server</groupid>
       <groupid>x-software-development</groupid>
       <groupid>xfce-software-development</groupid>
     </grouplist>
@@ -6210,15 +6238,26 @@
       <groupid>dns-server</groupid>
       <groupid>dogtag</groupid>
       <groupid>ftp-server</groupid>
+      <groupid>ha</groupid>
+      <groupid>haproxy</groupid>
+      <groupid>jbossas</groupid>
+      <groupid>load-balancer</groupid>
       <groupid>legacy-network-server</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>rubyonrails</groupid>
       <groupid>server-cfg</groupid>
       <groupid>smb-server</groupid>
       <groupid>sql-server</groupid>
+      <groupid>tomcat</groupid>
+      <groupid>virtualization</groupid>
       <groupid>web-server</groupid>
     </grouplist>
   </category>
@@ -6230,7 +6269,6 @@
     <grouplist>
       <groupid>admin-tools</groupid>
       <groupid>standard</groupid>
-      <groupid>base-x</groupid>
       <groupid>dial-up</groupid>
       <groupid>fonts</groupid>
       <groupid>hardware-support</groupid>
diff --git a/comps-f19.xml.in b/comps-f19.xml.in
index e3ff9f1e..fdd862f2 100644
--- a/comps-f19.xml.in
+++ b/comps-f19.xml.in
@@ -6073,68 +6073,83 @@
     </optionlist>
   </environment>
   <category>
-    <id>language-support</id>
-    <_name>Languages</_name>
-    <_description>These packages provide support for various locales including fonts and input methods.</_description>
+    <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>arabic-support</groupid>
-      <groupid>assamese-support</groupid>
-      <groupid>bengali-support</groupid>
-      <groupid>bhutanese-support</groupid>
-      <groupid>bodo-support</groupid>
-      <groupid>burmese-support</groupid>
-      <groupid>dogri-support</groupid>
-      <groupid>ethiopic-support</groupid>
-      <groupid>finnish-support</groupid>
-      <groupid>georgian-support</groupid>
-      <groupid>greek-support</groupid>
-      <groupid>gujarati-support</groupid>
-      <groupid>hebrew-support</groupid>
-      <groupid>hindi-support</groupid>
-      <groupid>japanese-support</groupid>
-      <groupid>kannada-support</groupid>
-      <groupid>kashmiri-support</groupid>
-      <groupid>khmer-support</groupid>
-      <groupid>konkani-support</groupid>
-      <groupid>korean-support</groupid>
-      <groupid>kurdish-support</groupid>
-      <groupid>maithili-support</groupid>
-      <groupid>malayalam-support</groupid>
-      <groupid>manipuri-support</groupid>
-      <groupid>marathi-support</groupid>
-      <groupid>nepali-support</groupid>
-      <groupid>oriya-support</groupid>
-      <groupid>persian-support</groupid>
-      <groupid>punjabi-support</groupid>
-      <groupid>russian-support</groupid>
-      <groupid>sanskrit-support</groupid>
-      <groupid>santali-support</groupid>
-      <groupid>serbian-support</groupid>
-      <groupid>simplified-chinese-support</groupid>
-      <groupid>sindhi-support</groupid>
-      <groupid>sinhala-support</groupid>
-      <groupid>tamil-support</groupid>
-      <groupid>telugu-support</groupid>
-      <groupid>thai-support</groupid>
-      <groupid>tibetan-support</groupid>
-      <groupid>traditional-chinese-support</groupid>
-      <groupid>urdu-support</groupid>
-      <groupid>yiddish-support</groupid>
+      <groupid>firefox</groupid>
+      <groupid>gnome-desktop</groupid>
+      <groupid>gnome-games</groupid>
+      <groupid>epiphany</groupid>
+      <groupid>libreoffice</groupid>
     </grouplist>
   </category>
   <category>
-    <id>desktops</id>
-    <_name>Desktop Environments</_name>
-    <_description>Desktop environments</_description>
+    <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>gnome-desktop</groupid>
       <groupid>kde-desktop</groupid>
-      <groupid>lxde-desktop</groupid>
-      <groupid>mate-desktop</groupid>
-      <groupid>sugar-desktop</groupid>
-      <groupid>window-managers</groupid>
+      <groupid>kde-apps</groupid>
+      <groupid>kde-education</groupid>
+      <groupid>kde-media</groupid>
+      <groupid>kde-office</groupid>
+    </grouplist>
+  </category>
+  <category>
+    <id>xfce-desktop-environment</id>
+    <_name>Xfce Desktop</_name>
+    <_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-extra-plugins</groupid>
+      <groupid>xfce-media</groupid>
+      <groupid>xfce-office</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-media</groupid>
+      <groupid>lxde-office</groupid>
+    </grouplist>
+  </category>
+  <category>
+    <id>cinnamon-desktop-environment</id>
+    <_name>Cinnamon Desktop</_name>
+    <_description>Cinnamon provides a desktop with a traditional layout, advanced features, easy to use, powerful and flexible.</_description>
+    <display_order>21</display_order>
+    <grouplist>
+      <groupid>cinnamon-desktop</groupid>
+      <groupid>libreoffice</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>
+  <category>
+    <id>sugar-desktop-environment</id>
+    <_name>Sugar Desktop Environment</_name>
+    <_description>A software playground for learning about learning.</_description>
+    <display_order>25</display_order>
+    <grouplist>
+      <groupid>sugar-desktop</groupid>
+      <groupid>sugar-apps</groupid>
     </grouplist>
   </category>
   <category>
@@ -6148,11 +6163,13 @@
       <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>medical</groupid>
+      <groupid>libreoffice</groupid>
       <groupid>office</groupid>
       <groupid>sound-and-video</groupid>
       <groupid>text-internet</groupid>
@@ -6164,23 +6181,34 @@
     <_description>Packages which provide functionality for developing and building applications.</_description>
     <display_order>70</display_order>
     <grouplist>
+      <groupid>design-suite</groupid>
       <groupid>development-libs</groupid>
       <groupid>development-tools</groupid>
       <groupid>eclipse</groupid>
       <groupid>electronic-lab</groupid>
       <groupid>fedora-packager</groupid>
+      <groupid>font-design</groupid>
       <groupid>gnome-software-development</groupid>
       <groupid>haskell</groupid>
       <groupid>java-development</groupid>
+      <groupid>jbossas</groupid>
       <groupid>kde-software-development</groupid>
       <groupid>legacy-software-development</groupid>
       <groupid>libreoffice-development</groupid>
       <groupid>milkymist</groupid>
       <groupid>mingw32</groupid>
+      <groupid>mongodb</groupid>
+      <groupid>mysql</groupid>
       <groupid>ocaml</groupid>
       <groupid>perl</groupid>
+      <groupid>perl-web</groupid>
+      <groupid>php</groupid>
       <groupid>robotics-suite</groupid>
       <groupid>ruby</groupid>
+      <groupid>rubyonrails</groupid>
+      <groupid>sql-server</groupid>
+      <groupid>virtualization</groupid>
+      <groupid>web-server</groupid>
       <groupid>x-software-development</groupid>
       <groupid>xfce-software-development</groupid>
     </grouplist>
@@ -6197,15 +6225,26 @@
       <groupid>dns-server</groupid>
       <groupid>dogtag</groupid>
       <groupid>ftp-server</groupid>
+      <groupid>ha</groupid>
+      <groupid>haproxy</groupid>
+      <groupid>jbossas</groupid>
+      <groupid>load-balancer</groupid>
       <groupid>legacy-network-server</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>rubyonrails</groupid>
       <groupid>server-cfg</groupid>
       <groupid>smb-server</groupid>
       <groupid>sql-server</groupid>
+      <groupid>tomcat</groupid>
+      <groupid>virtualization</groupid>
       <groupid>web-server</groupid>
     </grouplist>
   </category>
@@ -6217,7 +6256,6 @@
     <grouplist>
       <groupid>admin-tools</groupid>
       <groupid>standard</groupid>
-      <groupid>base-x</groupid>
       <groupid>dial-up</groupid>
       <groupid>fonts</groupid>
       <groupid>hardware-support</groupid>