diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index ed216084..58d7c8e7 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -8,14 +8,14 @@
false
false
- xorg-x11-drivers
- xorg-x11-server-Xorg
- xorg-x11-xauth
- xorg-x11-xinit
- glx-utils
- mesa-dri-drivers
- plymouth-system-theme
- xorg-x11-utils
+ xorg-x11-drivers
+ xorg-x11-server-Xorg
+ xorg-x11-xauth
+ xorg-x11-xinit
+ glx-utils
+ mesa-dri-drivers
+ plymouth-system-theme
+ xorg-x11-utils
@@ -25,14 +25,14 @@
false
false
- gstreamer-plugins-good
- PackageKit-gstreamer-plugin
- alsa-utils
- alsa-plugins-pulseaudio
- pulseaudio
- pulseaudio-module-bluetooth
- pulseaudio-utils
- pulseaudio-module-x11
+ gstreamer-plugins-good
+ PackageKit-gstreamer-plugin
+ alsa-utils
+ alsa-plugins-pulseaudio
+ pulseaudio
+ pulseaudio-module-bluetooth
+ pulseaudio-utils
+ pulseaudio-module-x11
@@ -42,82 +42,81 @@
false
false
- desktop-backgrounds-basic
- control-center
- dconf
- gnome-panel
- gnome-session
- gnome-shell
- gnome-themes-standard
- metacity
- notification-daemon
- abrt-desktop
- aisleriot
- at-spi2-atk
- at-spi2-core
- avahi
- baobab
- brasero-nautilus
- caribou
- cheese
- deja-dup
- eog
- evince
- evince-nautilus
- file-roller
- file-roller-nautilus
- fprintd-pam
- gcalctool
- gdm
- gedit
- glib-networking
- gnome-backgrounds
- gnome-bluetooth
- gnome-color-manager
- gnome-contacts
- gnome-dictionary
- gnome-disk-utility
- gnome-disk-utility-nautilus
- gnome-documents
- gnome-font-viewer
- gnome-icon-theme
- gnome-icon-theme-extras
- gnome-icon-theme-symbolic
- gnome-packagekit
- gnome-screensaver
- gnome-screenshot
- gnome-system-log
- gnome-system-monitor
- gnome-terminal
- gnome-user-docs
- gucharmap
- gvfs-fuse
- gvfs-gphoto2
- gvfs-smb
- libcanberra-gtk2
- libcanberra-gtk3
- libproxy-mozjs
- librsvg2
- libsane-hpaio
- mousetweaks
- nautilus
- nautilus-sendto
- NetworkManager-gnome
- NetworkManager-openconnect
- NetworkManager-openvpn
- NetworkManager-pptp
- NetworkManager-vpnc
- orca
- PackageKit-command-not-found
- PackageKit-gtk-module
- PackageKit-gtk3-module
- policycoreutils-restorecond
- polkit-gnome
- seahorse
- sushi
- xdg-user-dirs-gtk
- yelp
- zenity
+ desktop-backgrounds-basic
+ control-center
+ dconf
+ gnome-panel
+ gnome-session
+ gnome-shell
+ gnome-themes-standard
+ metacity
+ notification-daemon
+ abrt-desktop
+ aisleriot
+ at-spi2-atk
+ at-spi2-core
+ avahi
+ baobab
+ brasero-nautilus
+ caribou
+ cheese
+ deja-dup
+ eog
+ evince
+ evince-nautilus
+ file-roller
+ file-roller-nautilus
+ fprintd-pam
+ gcalctool
+ gdm
+ gedit
+ glib-networking
+ gnome-backgrounds
+ gnome-bluetooth
+ gnome-color-manager
+ gnome-contacts
+ gnome-dictionary
+ gnome-disk-utility
+ gnome-disk-utility-nautilus
+ gnome-documents
+ gnome-font-viewer
+ gnome-icon-theme
+ gnome-icon-theme-extras
+ gnome-icon-theme-symbolic
+ gnome-packagekit
+ gnome-screensaver
+ gnome-screenshot
+ gnome-system-log
+ gnome-system-monitor
+ gnome-terminal
+ gnome-user-docs
+ gucharmap
+ gvfs-fuse
+ gvfs-gphoto2
+ gvfs-smb
+ libcanberra-gtk2
+ libcanberra-gtk3
+ libproxy-mozjs
+ librsvg2
+ libsane-hpaio
+ mousetweaks
+ nautilus
+ nautilus-sendto
+ NetworkManager-gnome
+ NetworkManager-openconnect
+ NetworkManager-openvpn
+ NetworkManager-pptp
+ NetworkManager-vpnc
+ orca
+ PackageKit-command-not-found
+ PackageKit-gtk-module
+ PackageKit-gtk3-module
+ policycoreutils-restorecond
+ polkit-gnome
+ seahorse
+ sushi
+ xdg-user-dirs-gtk
+ yelp
@@ -127,17 +126,17 @@
false
false
- empathy
- evolution
- evolution-help
- evolution-NetworkManager
- gnome-boxes
- gnome-games
- shotwell
- simple-scan
- sane-backends-drivers-scanners
- vinagre
- vino
+ empathy
+ evolution
+ evolution-help
+ evolution-NetworkManager
+ gnome-boxes
+ gnome-games
+ shotwell
+ simple-scan
+ sane-backends-drivers-scanners
+ vinagre
+ vino
@@ -147,8 +146,8 @@
false
false
- firefox
- icedtea-web
+ firefox
+ icedtea-web
@@ -158,25 +157,25 @@
false
false
- brasero
- rhythmbox
- sound-juicer
- totem
- totem-mozplugin
- totem-nautilus
+ brasero
+ rhythmbox
+ sound-juicer
+ totem
+ totem-mozplugin
+ totem-nautilus
libreoffice
<_name>LibreOffice
<_description>LibreOffice Productivity Suite
- libreoffice-calc
- libreoffice-draw
- libreoffice-graphicfilter
- libreoffice-impress
- libreoffice-math
- libreoffice-writer
- libreoffice-xsltfilter
+ libreoffice-calc
+ libreoffice-draw
+ libreoffice-graphicfilter
+ libreoffice-impress
+ libreoffice-math
+ libreoffice-writer
+ libreoffice-xsltfilter
@@ -184,72 +183,72 @@
<_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
- true
+ false
- kde-runtime
- kde-workspace
- kdelibs
- apper
- ark
- bluedevil
- cagibi
- cups-pk-helper
- gwenview
- 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
- kdegames-minimal
- kdegraphics-strigi-analyzer
- kdegraphics-thumbnailers
- kdenetwork-kdnssd
- kdenetwork-kget
- kdeplasma-addons
- kdm
- kgpg
- kipi-plugins
- kolourpaint
- konsole
- 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
- phonon-backend-gstreamer
- plasma-scriptengine-python
- system-config-date
- system-config-printer-kde
- system-config-services
- xsettings-kde
- xterm
+ kde-runtime
+ kde-workspace
+ kdelibs
+ apper
+ ark
+ bluedevil
+ cagibi
+ cups-pk-helper
+ gwenview
+ 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
+ kdegames-minimal
+ kdegraphics-strigi-analyzer
+ kdegraphics-thumbnailers
+ kdenetwork-kdnssd
+ kdenetwork-kget
+ kdeplasma-addons
+ kdm
+ kgpg
+ kipi-plugins
+ kolourpaint
+ konsole
+ 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
+ phonon-backend-gstreamer
+ plasma-scriptengine-python
+ system-config-date
+ system-config-printer-kde
+ system-config-services
+ xsettings-kde
+ xterm
@@ -259,15 +258,15 @@
false
false
- kdeartwork-screensavers
- kdegames
- digikam
- kdenetwork-krdc
- kdenetwork-krfb
- kdepim
- konversation
- twinkle
- krusader
+ kdeartwork-screensavers
+ kdegames
+ digikam
+ kdenetwork-krdc
+ kdenetwork-krfb
+ kdepim
+ konversation
+ twinkle
+ krusader
@@ -277,26 +276,26 @@
false
false
- blinken
- kalzium
- kanagram
- kgeography
- khangman
- kiten
- klettres
- ktouch
- kturtle
- kwordquiz
- parley
- step
- marble
- kstars
- kalgebra
- kbruch
- kig
- kmplot
- rocs
- cantor
+ blinken
+ kalzium
+ kanagram
+ kgeography
+ khangman
+ kiten
+ klettres
+ ktouch
+ kturtle
+ kwordquiz
+ parley
+ step
+ marble
+ kstars
+ kalgebra
+ kbruch
+ kig
+ kmplot
+ rocs
+ cantor
@@ -306,11 +305,11 @@
false
false
- amarok
- kmix
- dragon
- k3b
- kscd
+ amarok
+ kmix
+ dragon
+ k3b
+ kscd
@@ -318,19 +317,19 @@
<_name>KDE Office
<_description>Office suite for KDE
false
- true
+ false
- scribus
- calligra-karbon
- calligra-krita
- calligra
- calligra-braindump
- calligra-flow
- calligra-kexi
- calligra-plan
- calligra-sheets
- calligra-stage
- calligra-words
+ scribus
+ calligra-karbon
+ calligra-krita
+ calligra
+ calligra-braindump
+ calligra-flow
+ calligra-kexi
+ calligra-plan
+ calligra-sheets
+ calligra-stage
+ calligra-words
@@ -338,40 +337,241 @@
<_name>Xfce
<_description>A lightweight desktop environment that works well on low end machines.
false
- true
+ false
- desktop-backgrounds-compat
- Thunar
- xfce-utils
- xfce4-panel
- xfce4-session
- xfce4-settings
- xfconf
- xfdesktop
- xfwm4
- ConsoleKit
- fedora-icon-theme
- lightgdm
- gtk-xfce-engine
- gvfs
- leafpad
- NetworkManager-gnome
- 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
-
+ desktop-backgrounds-compat
+ Thunar
+ xfce-utils
+ xfce4-panel
+ xfce4-session
+ xfce4-settings
+ xfconf
+ xfdesktop
+ xfwm4
+ ConsoleKit
+ fedora-icon-theme
+ lightgdm-gtk
+ gtk-xfce-engine
+ gvfs
+ leafpad
+ NetworkManager-gnome
+ 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
+ cheese
+ catfish
+ galculator
+ seahorse
+ ConsoleKit-x11
+ NetworkManager-vpnc
+ NetworkManager-openvpn
+ NetworkManager-pptp
+ gnome-bluetooth
+ xdg-user-dirs-gtk
+ adwaita-cursor-theme
+ adwaita-gtk2-theme
+ adwaita-gtk3-theme
+ greybird-gtk2-theme
+ greybird-gtk3-theme
+ greybird-xfce4-notifyd-theme
+ greybird-xfwm4-theme
+ albatross-gtk2-theme
+ albatross-gtk3-theme
+ albatross-xfwm4-theme
+ bluebird-gtk2-theme
+ bluebird-gtk3-theme
+ bluebird-xfwm4-theme
+ ristretto
+ thunar-media-tags-plugin
+ xfce4-battery-plugin
+ xfce4-cellmodem-plugin
+ xfce4-clipman-plugin
+ xfce4-cpugraph-plugin
+ xfce4-datetime-plugin
+ xfce4-dict-plugin
+ xfce4-diskperf-plugin
+ xfce4-eyes-plugin
+ xfce4-fsguard-plugin
+ xfce4-genmon-plugin
+ xfce4-mailwatch-plugin
+ xfce4-mount-plugin
+ xfce4-netload-plugin
+ xfce4-notes-plugin
+ xfce4-places-plugin
+ xfce4-quicklauncher-plugin
+ 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-weather-plugin
+ xfce4-websearch-plugin
+ xfce4-xfswitch-plugin
+ xfce4-xkb-plugin
+ xfwm4-themes
+
+
+ xfce-apps
+ <_name>Applications for the XFCE Desktop
+ <_description>A set of commonly used applications for the XFCE Desktop
+ false
+ false
+
+ epdfview
+ midori
+ claws-mail
+ claws-mail-plugins-archive
+ claws-mail-plugins-att-remover
+ claws-mail-plugins-attachwarner
+ claws-mail-plugins-bogofilter
+ claws-mail-plugins-fetchinfo
+ claws-mail-plugins-mailmbox
+ claws-mail-plugins-newmail
+ claws-mail-plugins-notification
+ claws-mail-plugins-pgp
+ claws-mail-plugins-rssyl
+ claws-mail-plugins-smime
+ claws-mail-plugins-spam-report
+ claws-mail-plugins-tnef
+ claws-mail-plugins-vcalendar
+ liferea
+ pidgin
+ remmina
+ remmina-plugins-rdp
+ remmina-plugins-vnc
+ transmission
+
+
+
+ xfce-media
+ <_name>Multimedia support for XFCE
+ <_description>Multimedia support for XFCE
+ false
+ false
+
+ asunder
+ pavucontrol
+ parole
+ pragha
+ xfburn
+
+
+
+ xfce-office
+ <_name>XFCE Office
+ <_description>Office suite for XFCE
+ false
+ false
+
+ abiword
+ gnumeric
+
+
+
+ lxde
+ <_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
+ false
+
+ lxde-common
+ lxmenu-data
+ lxpanel
+ lxsession
+ openbox
+ pcmanfm
+ fedora-icon-theme
+ gpicview
+ leafpad
+ lxappearance
+ lxappearance-obconf
+ lxdm
+ lxinput
+ lxlauncher
+ lxpolkit
+ lxrandr
+ lxsession-edit
+ lxshortcut
+ lxtask
+ lxterminal
+ obconf
+ openssh-askpass
+ xarchiver
+ xscreensaver-base
+ clipit
+ galculator
+ xpad
+ gigolo
+ fedora-icon-theme
+ adwaita-cursor-theme
+ adwaita-gtk2-theme
+ adwaita-gtk3-theme
+ gnome-keyring-pam
+ NetworkManager-gnome
+ perl-File-MimeInfo
+ xcompmgr
+ xdg-user-dirs-gtk
+ xscreensaver-extras
+ yumex
+ notification-daemon
+ upower
+
+
+ lxde-apps
+ <_name>Applications for the LXDE Desktop
+ <_description>A set of commonly used applications for the LXDE Desktop
+ false
+ false
+
+ pidgin
+ sylpheed
+ transmission
+ epdfview
+ mtpaint
+
+
+
+ lxde-media
+ <_name>Multimedia support for LXDE
+ <_description>Multimedia support for LXDE
+ false
+ false
+
+ asunder
+ lxmusic
+ gxine
+ gxine-mozplugin
+ pavucontrol
+ pnmixer
+ gnomebaker
+
+
+
+ lxde-office
+ <_name>LXDE Office
+ <_description>Office suite for LXDE
+ false
+ false
+
+ abiword
+ gnumeric
+ osmo
+
admin-tools