diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index b0f2a048..44e854c1 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -54,7 +54,7 @@
- gnome
+ gnome-desktop
<_name>GNOME Desktop Environment
<_description>GNOME is a powerful graphical user interface which includes a panel, desktop, system icons, and a graphical file manager
false
@@ -212,7 +212,7 @@
- kde
+ kde-desktop
<_name>KDE
<_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.
false
@@ -368,7 +368,7 @@
- xfce
+ xfce-desktop
<_name>Xfce
<_description>A lightweight desktop environment that works well on low end machines.
false
@@ -533,7 +533,7 @@
- lxde
+ lxde-desktop
<_name>LXDE
<_description>LXDE is a lightweight X11 desktop environment designed for computers with low hardware specifications like netbooks, mobile devices or older computers.
false
@@ -3102,165 +3102,6 @@
bpg-serif-modern-fonts
-
- gnome-desktop
- <_name>GNOME Desktop Environment
- <_description>GNOME is a highly intuitive and user friendly desktop environment.
- false
- true
-
- control-center
- dconf
- gnome-panel
- gnome-session
- gnome-shell
- gnome-themes-standard
- metacity
- notification-daemon
- imsettings-gnome
- pinentry-gtk
- scim-bridge-gtk
- abrt-desktop
- aisleriot
- at-spi2-atk
- at-spi2-core
- avahi
- baobab
- brasero-nautilus
- caribou
- cheese
- deja-dup
- dejavu-sans-fonts
- dejavu-sans-mono-fonts
- dejavu-serif-fonts
- eog
- evince
- evince-nautilus
- file-roller
- file-roller-nautilus
- fprintd-pam
- gcalctool
- gdm
- gedit
- glib-networking
- gnome-backgrounds
- gnome-bluetooth
- gnome-boxes
- gnome-color-manager
- gnome-contacts
- gnome-dictionary
- gnome-disk-utility
- gnome-documents
- gnome-font-viewer
- gnome-games-sudoku
- gnome-games-swell-foop
- gnome-icon-theme
- gnome-icon-theme-extras
- gnome-icon-theme-symbolic
- gnome-media
- gnome-packagekit
- gnome-screensaver
- gnome-screenshot
- gnome-system-log
- gnome-system-monitor
- gnome-terminal
- gnome-user-docs
- gucharmap
- gvfs-fuse
- gvfs-gphoto2
- gvfs-smb
- ibus
-
- libcanberra-gtk2
- libcanberra-gtk3
- libproxy-mozjs
- librsvg2
- libsane-hpaio
- mousetweaks
- nautilus
- nautilus-sendto
- network-manager-applet
- NetworkManager-openconnect
- NetworkManager-openvpn
- NetworkManager-pptp
- NetworkManager-vpnc
- nm-connection-editor
- orca
- PackageKit-command-not-found
- PackageKit-gtk3-module
- policycoreutils-restorecond
- polkit-gnome
- pulseaudio-module-x11
- sane-backends-drivers-scanners
- seahorse
- shotwell
- simple-scan
- sushi
- vinagre
- vino
- xdg-user-dirs-gtk
- yelp
- zenity
- alacarte
- byzanz
- cinnamon
- dasher
- esc
- evince-djvu
- evince-dvi
- gconf-editor
- gdesklets
- gedit-plugins
- gmpc
- gmrun
- gnome-applet-alarm-clock
- gnome-applet-sensors
- gnome-applets
- gnome-commander
- gnome-media-apps
- gnome-phone-manager
- gnome-power-manager
- gnome-schedule
- gnome-search-tool
- gnome-theme-curvylooks
- gnote
- gonvert
- gthumb
- gtkhash-nautilus
- gtrayicon
- gtweakui
- gvfs-archive
- gvfs-obexftp
- istanbul
- nautilus-actions
- nautilus-image-converter
- nautilus-open-terminal
- nautilus-search-tool
- nautilus-sound-converter
- pcmanfm
- preferences-menus
- pulseaudio-esound-compat
- qtcurve-gtk2
- rss-glx-gnome-screensaver
- sabayon
- sane-backends-drivers-cameras
- scim-gtk
- screenruler
- seahorse-nautilus
- seahorse-sharing
- stardict-dic-en
- tango-icon-theme
- tango-icon-theme-extras
- tomboy
- verbiste-gnome
- wallpapoz
- xiphos
- xscreensaver-extras-gss
- xscreensaver-gl-extras-gss
-
-
gnome-software-development
<_name>GNOME Software Development
@@ -3950,181 +3791,6 @@
iok
-
- kde-desktop
- <_name>KDE Software Compilation
- <_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.
- false
- true
-
- kde-runtime
- kde-workspace
- kdelibs
- gstreamer-plugins-good
- ibus-qt
- imsettings-qt
- libreoffice-kde
- pinentry-qt
- scim-bridge-qt
- abrt-desktop
- amarok
- apper
- ark
- bluedevil
- cagibi
- cups-pk-helper
- dejavu-sans-fonts
- dejavu-sans-mono-fonts
- dejavu-serif-fonts
- digikam
- dragon
- gwenview
- k3b
- kamera
- kamoso
- kcalc
- kcharselect
- kcm-gtk
- kcm_touchpad
- kcolorchooser
- kde-baseapps
- kde-plasma-networkmanagement
- kde-plasma-networkmanagement-openconnect
- kde-plasma-networkmanagement-openvpn
- kde-plasma-networkmanagement-pptp
- kde-plasma-networkmanagement-vpnc
- kde-printer-applet
- kde-settings-pulseaudio
- kdeaccessibility
- kdeartwork-screensavers
- kdegames
- kdegraphics-strigi-analyzer
- kdegraphics-thumbnailers
- kdenetwork-kdnssd
- kdenetwork-kget
- kdenetwork-krdc
- kdenetwork-krfb
- kdepim
- kdeplasma-addons
- kdm
- kgpg
- kipi-plugins
- kmix
- kolourpaint
- konsole
- konversation
- kruler
- krusader
- ksnapshot
- ksshaskpass
- ksysguard
- ktorrent
- ktp-accounts-kcm
- ktp-approver
- ktp-auth-handler
- ktp-contact-applet
- ktp-contact-list
- ktp-filetransfer-handler
- ktp-kded-integration-module
- ktp-presence-applet
- ktp-send-file
- ktp-text-ui
- kwallet
- kwebkitpart
- kwrite
- okular
- oxygen-gtk
- PackageKit-gstreamer-plugin
- phonon-backend-gstreamer
- plasma-scriptengine-python
- scribus
- system-config-date
- system-config-printer-kde
- system-config-services
-
- xorg-x11-apps
- xsettings-kde
-
- xterm
- amarok-doc
- bibletime
- calligra
- colord-kde
- crystal
- filelight
- juk
- kaffeine
- kbibtex
- kbilliards
- kchmviewer
- kcm-qt-graphicssystem
- kcoloredit
- kcometen4
- kde-colorscheme-plastik
- kde-partitionmanager
- kde-plasma-ihatethecashew
- kde-plasma-ktorrent
- kde-plasma-qstardict
- kde-plasma-quickaccess
- kde-plasma-runcommand
- kde-plasma-smooth-tasks
- kde-plasma-translatoid
- kde-plasma-yawp
- kde-wallpapers
- kdeadmin
- kdeartwork
- kdeartwork-sounds
- kdeartwork-wallpapers
- kdenetwork-fileshare-samba
- kdenetwork-kopete
- kdenetwork-kppp
- kdetoys
- kdissert
- kfloppy
- kgamma
- kgrab
- kiconedit
- kio-ftps
- kio_gopher
- klamav
- klatexformula-ktexteditor-plugin
- kmenu-gnome
- kmetronome
- kmid2
- kmymoney
- knemo
- koverartist
- krecipes
- kremotecontrol
- krename
- ksaneplugin
- kscd
- ksecrets
- ksensors
- kshutdown
- ksig
- kvirc
- leonidas-kde-theme-landscape
- leonidas-kde-theme-lion
- plasma-scriptengine-ruby
- qstardict
- qt-recordmydesktop
- qtcurve-gtk2
- qtcurve-kde4
- rekall
- rsibreak
- rss-glx-kde
- scim-bridge-qt3
- skanlite
- smb4k
- speedcrunch
- superkaramba
- sweeper
- transmission-qt
- uim-qt3
- yakuake
-
-
kde-software-development
<_name>KDE Software Development
@@ -4417,46 +4083,6 @@
libreoffice-sdk-doc
-
- lxde-desktop
- <_name>LXDE
- <_description>LXDE is a lightweight X11 desktop environment designed for computers with low hardware specifications like netbooks, mobile devices or older computers.
- false
- true
-
- lxde-common
- lxmenu-data
- lxpanel
- lxsession
- openbox
- pcmanfm
- imsettings-lxde
- pinentry-gtk
- abrt-desktop
- fedora-icon-theme
- gpicview
- leafpad
- lxappearance
- lxappearance-obconf
- lxdm
- lxinput
- lxpolkit
- lxrandr
- lxsession-edit
- lxshortcut
- lxtask
- lxterminal
- obconf
- openssh-askpass
- xarchiver
- xscreensaver-base
- lxde-icon-theme
- lxlauncher
- lxmusic
- obmenu
- parcellite
-
-
mail-server
<_name>Mail Server
@@ -6020,93 +5646,6 @@
xorg-x11-xbitmaps
-
- xfce-desktop
- <_name>Xfce
- <_description>A lightweight desktop environment that works well on low end machines.
- false
- true
-
- desktop-backgrounds-compat
- Thunar
- xfce4-panel
- xfce4-session
- xfce4-settings
- xfconf
- xfdesktop
- xfwm4
- im-chooser-xfce
- imsettings-xfce
- pinentry-gtk
- abrt-desktop
- ConsoleKit
- fedora-icon-theme
- gtk-xfce-engine
- gvfs
- leafpad
- lightdm-gtk
- network-manager-applet
- nm-connection-editor
- openssh-askpass
- orage
- polkit-gnome
- Terminal
- thunar-archive-plugin
- thunar-volman
- tumbler
- xarchiver
- xfce4-appfinder
- xfce4-icon-theme
- xfce4-mixer
- xfce4-power-manager
- xfce4-session-engines
- xfwm4-theme-nodoka
- xscreensaver-base
- parole
- ristretto
- thunar-media-tags-plugin
- thunar-vcs-plugin
- xfbib
- xfburn
- xfce4-battery-plugin
- xfce4-cellmodem-plugin
- xfce4-clipman-plugin
- xfce4-cpugraph-plugin
- xfce4-datetime-plugin
- xfce4-dict
- xfce4-dict-plugin
- xfce4-diskperf-plugin
- xfce4-eyes-plugin
- xfce4-fsguard-plugin
- xfce4-genmon-plugin
- xfce4-mailwatch-plugin
- xfce4-mount-plugin
- xfce4-mpc-plugin
- xfce4-netload-plugin
- xfce4-notes-plugin
- xfce4-notifyd
- xfce4-places-plugin
- xfce4-quicklauncher-plugin
- xfce4-radio-plugin
- xfce4-screenshooter
- xfce4-screenshooter-plugin
- xfce4-sensors-plugin
- xfce4-smartbookmark-plugin
- xfce4-systemload-plugin
- xfce4-taskmanager
- xfce4-time-out-plugin
- xfce4-timer-plugin
- xfce4-verve-plugin
- xfce4-volumed
- xfce4-wavelan-plugin
- xfce4-weather-plugin
- xfce4-websearch-plugin
- xfce4-xfswitch-plugin
- xfce4-xkb-plugin
- xfmpc
- xfwm4-themes
-
-
xfce-software-development
<_name>XFCE Software Development
@@ -6169,7 +5708,7 @@
hardware-support
printing
firefox
- gnome
+ gnome-desktop
gnome-apps
@@ -6193,7 +5732,7 @@
multimedia
hardware-support
printing
- kde
+ kde-desktop
kde-apps
@@ -6217,7 +5756,7 @@
multimedia
hardware-support
printing
- xfce
+ xfce-desktop
xfce-apps
@@ -6241,7 +5780,7 @@
multimedia
hardware-support
printing
- lxde
+ lxde-desktop
lxde-apps
@@ -6285,7 +5824,7 @@
hardware-support
printing
firefox
- gnome
+ gnome-desktop
eclipse
development-libs
development-tools