diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index 828e2562..627853b1 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -38,46 +38,6 @@
yumex
-
- afrikaans-support
- <_name>Afrikaans Support
- <_description/>
- false
- true
- af
-
-
-
-
- akan-support
- <_name>Akan Support
- <_description/>
- false
- true
- ak
-
-
-
-
- albanian-support
- <_name>Albanian Support
- <_description/>
- false
- true
- sq
-
-
-
-
- amazigh-support
- <_name>Amazigh Support
- <_description/>
- false
- true
- ber
-
-
-
arabic-support
<_name>Arabic Support
@@ -110,17 +70,6 @@
sil-scheherazade-fonts
-
- armenian-support
- <_name>Armenian Support
- <_description>This group is a collection of tools and resources of Armenian environments.
- false
- true
- hy
-
- dejavu-sans-fonts
-
-
assamese-support
<_name>Assamese Support
@@ -136,16 +85,6 @@
iok
-
- asturian-support
- <_name>Asturian Support
- <_description/>
- false
- true
- ast
-
-
-
authoring-and-publishing
<_name>Authoring and Publishing
@@ -189,16 +128,6 @@
xmlcopyeditor
-
- azerbaijani-support
- <_name>Azerbaijani Support
- <_description/>
- false
- true
- az
-
-
-
base
<_name>Base
@@ -417,16 +346,6 @@
xterm
-
- basque-support
- <_name>Basque Support
- <_description/>
- false
- true
- eu
-
-
-
belarusian-support
<_name>Belarusian Support
@@ -479,46 +398,6 @@
ldd-pdf
-
- bosnian-support
- <_name>Bosnian Support
- <_description/>
- false
- true
- bs
-
-
-
-
- brazilian-support
- <_name>Brazilian Portuguese Support
- <_description/>
- false
- true
- pt_BR
-
-
-
-
- breton-support
- <_name>Breton Support
- <_description/>
- false
- true
- br
-
-
-
-
- british-support
- <_name>English (UK) Support
- <_description/>
- false
- true
- en_GB
-
-
-
buildsys-build
<_name>Buildsystem building group
@@ -578,26 +457,6 @@
myanmar3-unicode-fonts
-
- catalan-support
- <_name>Catalan Support
- <_description/>
- false
- true
- ca
-
-
-
-
- chichewa-support
- <_name>Chichewa Support
- <_description/>
- false
- true
- ny
-
-
-
chuvash-support
<_name>Chuvash Support
@@ -652,16 +511,6 @@
pacemaker
-
- coptic-support
- <_name>Coptic Support
- <_description/>
- false
- true
- cop
-
-
-
core
<_name>Core
@@ -868,16 +717,6 @@
stardict-dic-cs_CZ
-
- danish-support
- <_name>Danish Support
- <_description/>
- false
- true
- da
-
-
-
design-suite
<_name>Design Suite
@@ -1294,16 +1133,6 @@
pki-util-javadoc
-
- dutch-support
- <_name>Dutch Support
- <_description/>
- false
- true
- nl
-
-
-
eclipse
<_name>Fedora Eclipse
@@ -1719,16 +1548,6 @@
zenon
-
- esperanto-support
- <_name>Esperanto Support
- <_description/>
- false
- true
- eo
-
-
-
estonian-support
<_name>Estonian Support
@@ -1766,16 +1585,6 @@
xorg-x11-fonts-ethiopic
-
- faroese-support
- <_name>Faroese Support
- <_description/>
- false
- true
- fo
-
-
-
fedora-packager
<_name>Fedora Packager
@@ -1802,16 +1611,6 @@
plague-client
-
- fijian-support
- <_name>Fijian Support
- <_description/>
- false
- true
- fj
-
-
-
filesystems
<_name>Filesystems
@@ -1829,16 +1628,6 @@
xfsprogs
-
- filipino-support
- <_name>Filipino Support
- <_description/>
- false
- true
- fil
-
-
-
finnish-support
<_name>Finnish Support
@@ -2237,26 +2026,6 @@
ecolier-court-lignes-fonts
-
- frisian-support
- <_name>Frisian Support
- <_description/>
- false
- true
- fy
-
-
-
-
- friulian-support
- <_name>Friulian Support
- <_description/>
- false
- true
- fur
-
-
-
ftp-server
<_name>FTP Server
@@ -2270,26 +2039,6 @@
xferstats
-
- gaelic-support
- <_name>Gaelic Support
- <_description/>
- false
- true
- gd
-
-
-
-
- galician-support
- <_name>Galician Support
- <_description/>
- false
- true
- gl
-
-
-
games
<_name>Games and Entertainment
@@ -2598,16 +2347,6 @@
bpg-serif-modern-fonts
-
- german-support
- <_name>German Support
- <_description/>
- false
- true
- de
-
-
-
gnome-desktop
<_name>GNOME Desktop Environment
@@ -3115,16 +2854,6 @@
samyak-gujarati-fonts
-
- haitian-creole-support
- <_name>Haitian Creole Support
- <_description/>
- false
- true
- ht
-
-
-
hardware-support
<_name>Hardware Support
@@ -3250,16 +2979,6 @@
culmus-yehuda-clm-fonts
-
- hiligaynon-support
- <_name>Hiligaynon Support
- <_description/>
- false
- true
- hil
-
-
-
hindi-support
<_name>Hindi Support
@@ -3292,26 +3011,6 @@
iso8859-2-misc-fonts
-
- icelandic-support
- <_name>Icelandic Support
- <_description/>
- false
- true
- is
-
-
-
-
- indonesian-support
- <_name>Indonesian Support
- <_description/>
- false
- true
- id
-
-
-
input-methods
<_name>Input Methods
@@ -3417,47 +3116,6 @@
xsunpinyin
-
- interlingua-support
- <_name>Interlingua Support
- <_description/>
- false
- true
- ia
-
-
-
-
- inuktitut-support
- <_name>Inuktitut Support
- <_description/>
- false
- true
- iu
-
- dejavu-sans-fonts
-
-
-
- irish-support
- <_name>Irish Support
- <_description/>
- false
- true
- ga
-
-
-
-
- italian-support
- <_name>Italian Support
- <_description/>
- false
- true
- it
-
-
-
japanese-support
<_name>Japanese Support
@@ -3636,26 +3294,6 @@
iok
-
- kashubian-support
- <_name>Kashubian Support
- <_description/>
- false
- true
- csb
-
-
-
-
- kazakh-support
- <_name>Kazakh Support
- <_description/>
- false
- true
- kk
-
-
-
kde-desktop
<_name>KDE Software Compilation
@@ -3890,16 +3528,6 @@
khmeros-siemreap-fonts
-
- kinyarwanda-support
- <_name>Kinyarwanda Support
- <_description/>
- false
- true
- rw
-
-
-
konkani-support
<_name>Konkani Support
@@ -3982,37 +3610,6 @@
xorg-x11-fonts-cyrillic
-
- lao-support
- <_name>Lao Support
- <_description/>
- false
- true
- lo
-
- dejavu-sans-fonts
-
-
-
- latin-support
- <_name>Latin Support
- <_description/>
- false
- true
- la
-
-
-
-
- latvian-support
- <_name>Latvian Support
- <_description/>
- false
- true
- lv
-
-
-
legacy-fonts
<_name>Legacy Fonts
@@ -4147,46 +3744,6 @@
libreoffice-testtools
-
- lingala-support
- <_name>Lingala Support
- <_description/>
- false
- true
- ln
-
-
-
-
- lithuanian-support
- <_name>Lithuanian Support
- <_description/>
- false
- true
- lt
-
-
-
-
- low-german-support
- <_name>Low German Support
- <_description/>
- false
- true
- nds
-
-
-
-
- low-saxon-support
- <_name>Low Saxon Support
- <_description/>
- false
- true
- nds
-
-
-
lower-sorbian-support
<_name>Lower Sorbian Support
@@ -4200,26 +3757,6 @@
iso8859-2-misc-fonts
-
- lule-sami-support
- <_name>Lule Sami Support
- <_description/>
- false
- true
- smj
-
-
-
-
- luxembourgish-support
- <_name>Luxembourgish Support
- <_description/>
- false
- true
- lb
-
-
-
lxde-desktop
<_name>LXDE
@@ -4259,16 +3796,6 @@
parcellite
-
- macedonian-support
- <_name>Macedonian Support
- <_description/>
- false
- true
- mk
-
-
-
mail-server
<_name>Mail Server
@@ -4323,26 +3850,6 @@
iok
-
- malagasy-support
- <_name>Malagasy Support
- <_description/>
- false
- true
- mg
-
-
-
-
- malay-support
- <_name>Malay Support
- <_description/>
- false
- true
- ms
-
-
-
malayalam-support
<_name>Malayalam Support
@@ -4366,36 +3873,6 @@
smc-suruma-fonts
-
- maltese-support
- <_name>Maltese Support
- <_description/>
- false
- true
- mt
-
-
-
-
- manx-support
- <_name>Manx Support
- <_description/>
- false
- true
- gv
-
-
-
-
- maori-support
- <_name>Maori Support
- <_description/>
- false
- true
- mi
-
-
-
marathi-support
<_name>Marathi Support
@@ -4531,26 +4008,6 @@
mingw32-zlib
-
- mongolian-support
- <_name>Mongolian Support
- <_description/>
- false
- true
- mn
-
-
-
-
- mossi-support
- <_name>Mossi Support
- <_description/>
- false
- true
- mos
-
-
-
mysql
<_name>MySQL Database
@@ -4654,36 +4111,6 @@
suck
-
- northern-sami-support
- <_name>Northern Sami Support
- <_description/>
- false
- true
- se
-
-
-
-
- northern-sotho-support
- <_name>Northern Sotho Support
- <_description/>
- false
- true
- nso
-
-
-
-
- norwegian-support
- <_name>Norwegian Support
- <_description/>
- false
- true
- nb
-
-
-
ocaml
<_name>OCaml
@@ -4723,16 +4150,6 @@
xemacs-tuareg
-
- occitan-support
- <_name>Occitan Support
- <_description/>
- false
- true
- oc
-
-
-
office
<_name>Office/Productivity
@@ -4852,16 +4269,6 @@
samyak-oriya-fonts
-
- oromo-support
- <_name>Oromo Support
- <_description/>
- false
- true
- om
-
-
-
perl
<_name>Perl Development
@@ -4905,16 +4312,6 @@
iso8859-2-misc-fonts
-
- portuguese-support
- <_name>Portuguese Support
- <_description/>
- false
- true
- pt
-
-
-
printing
<_name>Printing Support
@@ -4963,16 +4360,6 @@
saab-fonts
-
- quechua-support
- <_name>Quechua Support
- <_description/>
- false
- true
- qu
-
-
-
robotics-suite
<_name>Robotics
@@ -5091,16 +4478,6 @@
xorg-x11-fonts-cyrillic
-
- samoan-support
- <_name>Samoan Support
- <_description/>
- false
- true
- sm
-
-
-
sanskrit-support
<_name>Sanskrit Support
@@ -5113,16 +4490,6 @@
ibus-m17n
-
- sardinian-support
- <_name>Sardinian Support
- <_description/>
- false
- true
- sc
-
-
-
serbian-support
<_name>Serbian Support
@@ -5154,16 +4521,6 @@
system-switch-mail-gnome
-
- shuswap-support
- <_name>Shuswap Support
- <_description/>
- false
- true
- shs
-
-
-
simplified-chinese-support
<_name>Simplified Chinese Support
@@ -5268,15 +4625,6 @@
system-config-samba
-
- somali-support
- <_name>Somali Support
- <_description/>
- false
- true
-
-
-
sound-and-video
<_name>Sound and Video
@@ -5417,26 +4765,6 @@
xmp
-
- southern-ndebele-support
- <_name>Southern Ndebele Support
- <_description/>
- false
- true
- nr
-
-
-
-
- southern-sotho-support
- <_name>Southern Sotho Support
- <_description/>
- false
- true
- st
-
-
-
spanish-support
<_name>Spanish Support
@@ -5532,36 +4860,6 @@
sugar-xomail
-
- swahili-support
- <_name>Swahili Support
- <_description/>
- false
- true
- sw
-
-
-
-
- swati-support
- <_name>Swati Support
- <_description/>
- false
- true
- ss
-
-
-
-
- swedish-support
- <_name>Swedish Support
- <_description/>
- false
- true
- sv
-
-
-
system-tools
<_name>System Tools
@@ -5778,29 +5076,6 @@
zidrav
-
- tagalog-support
- <_name>Tagalog Support
- <_description/>
- false
- true
- tl
-
-
-
-
- tajik-support
- <_name>Tajik Support
- <_description/>
- false
- true
- tg
-
- dejavu-sans-fonts
- dejavu-sans-mono-fonts
- dejavu-serif-fonts
-
-
tamil-support
<_name>Tamil Support
@@ -5837,16 +5112,6 @@
vemana2000-fonts
-
- tetum-support
- <_name>Tetum Support
- <_description/>
- false
- true
- tet
-
-
-
text-internet
<_name>Text-based Internet
@@ -5940,26 +5205,6 @@
jomolhari-fonts
-
- tigrinya-support
- <_name>Tigrinya Support
- <_description/>
- false
- true
- ti
-
-
-
-
- tonga-support
- <_name>Tonga Support
- <_description/>
- false
- true
- to
-
-
-
traditional-chinese-support
<_name>Traditional Chinese Support
@@ -5989,26 +5234,6 @@
taipeifonts
-
- tsonga-support
- <_name>Tsonga Support
- <_description/>
- false
- true
- ts
-
-
-
-
- tswana-support
- <_name>Tswana Support
- <_description/>
- false
- true
- tn
-
-
-
turkish-support
<_name>Turkish Support
@@ -6021,16 +5246,6 @@
xorg-x11-fonts-ISO8859-9-75dpi
-
- turkmen-support
- <_name>Turkmen Support
- <_description/>
- false
- true
- tk
-
-
-
ukrainian-support
<_name>Ukrainian Support
@@ -6046,16 +5261,6 @@
xorg-x11-fonts-cyrillic
-
- upper-sorbian-support
- <_name>Upper Sorbian Support
- <_description/>
- false
- true
- hsb
-
-
-
urdu-support
<_name>Urdu Support
@@ -6100,29 +5305,6 @@
paktype-naskh-basic-urdu-fonts
-
- uzbek-support
- <_name>Uzbek Support
- <_description/>
- false
- true
- uz
-
-
-
-
- venda-support
- <_name>Venda Support
- <_description/>
- false
- true
- ve
-
- dejavu-sans-fonts
- dejavu-sans-mono-fonts
- dejavu-serif-fonts
-
-
vietnamese-support
<_name>Vietnamese Support
@@ -6153,16 +5335,6 @@
virt-top
-
- walloon-support
- <_name>Walloon Support
- <_description/>
- false
- true
- wa
-
-
-
web-development
<_name>Web Development
@@ -6250,16 +5422,6 @@
wordpress
-
- welsh-support
- <_name>Welsh Support
- <_description/>
- false
- true
- cy
-
-
-
window-managers
<_name>Window Managers
@@ -6457,16 +5619,6 @@
xfce4-session-devel
-
- xhosa-support
- <_name>Xhosa Support
- <_description/>
- false
- true
- xh
-
-
-
yiddish-support
<_name>Yiddish Support
@@ -6494,164 +5646,68 @@
culmus-yehuda-clm-fonts
-
- zulu-support
- <_name>Zulu Support
- <_description/>
- false
- true
- zu
-
-
-
language-support
<_name>Languages
<_description>These packages provide support for various locales including fonts and input methods.
- afrikaans-support
- akan-support
- albanian-support
- amazigh-support
arabic-support
- armenian-support
assamese-support
- asturian-support
- azerbaijani-support
- basque-support
belarusian-support
bengali-support
bhutanese-support
- bosnian-support
- brazilian-support
- breton-support
- british-support
bulgarian-support
burmese-support
- catalan-support
- chichewa-support
- chinese-support
chuvash-support
- coptic-support
croatian-support
czech-support
- danish-support
- dutch-support
- esperanto-support
estonian-support
ethiopic-support
- faroese-support
- fijian-support
- filipino-support
finnish-support
french-support
- frisian-support
- friulian-support
- gaelic-support
- galician-support
georgian-support
- german-support
greek-support
gujarati-support
- haitian-creole-support
hebrew-support
- hiligaynon-support
hindi-support
hungarian-support
- icelandic-support
- indonesian-support
- interlingua-support
- inuktitut-support
- irish-support
- italian-support
japanese-support
kannada-support
kashmiri-support
- kashubian-support
- kazakh-support
khmer-support
- kinyarwanda-support
konkani-support
korean-support
kurdish-support
kyrgyz-support
- lao-support
- latin-support
- latvian-support
- lingala-support
- lithuanian-support
- low-german-support
- low-saxon-support
lower-sorbian-support
- lule-sami-support
- luxembourgish-support
- macedonian-support
maithili-support
- malagasy-support
- malay-support
malayalam-support
- maltese-support
- manx-support
- maori-support
marathi-support
- mongolian-support
- mossi-support
nepali-support
- northern-sami-support
- northern-sotho-support
- norwegian-support
- occitan-support
oriya-support
- oromo-support
persian-support
polish-support
- portuguese-support
punjabi-support
- quechua-support
romanian-support
russian-support
- samoan-support
sanskrit-support
- sardinian-support
serbian-support
- shuswap-support
simplified-chinese-support
sindhi-support
sinhala-support
slovak-support
slovenian-support
- somali-support
- southern-ndebele-support
- southern-sotho-support
spanish-support
- swahili-support
- swati-support
- swedish-support
- tagalog-support
- tajik-support
tamil-support
telugu-support
- tetum-support
thai-support
tibetan-support
- tigrinya-support
- tonga-support
traditional-chinese-support
- tsonga-support
- tswana-support
turkish-support
- turkmen-support
ukrainian-support
- upper-sorbian-support
urdu-support
- uzbek-support
- venda-support
vietnamese-support
- walloon-support
- welsh-support
- xhosa-support
yiddish-support
- zulu-support