diff --git a/comps-f13.xml.in b/comps-f13.xml.in
index 870680bc..ff1fcef6 100644
--- a/comps-f13.xml.in
+++ b/comps-f13.xml.in
@@ -354,7 +354,6 @@
xorg-x11-xauth
xorg-x11-xinit
authconfig-gtk
- bitmap-fonts
cups-pk-helper
desktop-backgrounds-basic
firstboot
@@ -375,6 +374,7 @@
xorg-x11-utils
alltray
aterm
+ bitmap-fonts
devilspie
gdm
gxmessage
@@ -485,6 +485,7 @@
true
diveintopython
+ fedora-security-guide-en-US
javanotes
ldd-pdf
@@ -665,7 +666,6 @@
eclipse-nls-zh_TW
ibus-chewing
ibus-pinyin
- ibus-table-chinese
kde-i18n-Chinese
kde-i18n-Chinese-Big5
kde-l10n-Chinese
@@ -678,9 +678,14 @@
openoffice.org-langpack-zh_TW
poppler-data
gcin
+ ibus-table-array30
ibus-table-cangjie
ibus-table-erbi
+ ibus-table-extraphrase
+ ibus-table-quick
ibus-table-wubi
+ ibus-table-xinhua
+ ibus-table-yong
lv
m17n-db-chinese
scim-array
@@ -691,6 +696,7 @@
scim-python-xingma-erbi
scim-python-xingma-wubi
scim-python-xingma-zhengma
+ scim-tables-chinese
scim-tables-chinese-extra
stardict-dic-zh_CN
stardict-dic-zh_TW
@@ -1810,7 +1816,6 @@
dejavu-sans-fonts
dejavu-sans-mono-fonts
dejavu-serif-fonts
- ipa-pgothic-fonts
jomolhari-fonts
kacst-art-fonts
kacst-book-fonts
@@ -1832,11 +1837,13 @@
liberation-sans-fonts
liberation-serif-fonts
lklug-fonts
+ lohit-assamese-fonts
lohit-bengali-fonts
lohit-gujarati-fonts
lohit-hindi-fonts
lohit-kannada-fonts
lohit-maithili-fonts
+ lohit-marathi-fonts
lohit-oriya-fonts
lohit-punjabi-fonts
lohit-tamil-fonts
@@ -1848,6 +1855,7 @@
stix-fonts
thai-scalable-waree-fonts
un-core-dotum-fonts
+ vlgothic-fonts
adf-accanthis-2-fonts
adf-accanthis-3-fonts
adf-accanthis-fonts
@@ -1954,6 +1962,7 @@
inkboy-fonts
ipa-gothic-fonts
ipa-mincho-fonts
+ ipa-pgothic-fonts
ipa-pmincho-fonts
khmeros-battambang-fonts
khmeros-bokor-fonts
@@ -1971,11 +1980,9 @@
lilypond-feta-fonts
lilypond-parmesan-fonts
linux-libertine-fonts
- lohit-assamese-fonts
lohit-kashmiri-fonts
lohit-konkani-fonts
lohit-malayalam-fonts
- lohit-marathi-fonts
lohit-nepali-fonts
lohit-sindhi-fonts
madan-fonts
@@ -2076,7 +2083,6 @@
un-extra-fonts-vada
un-extra-fonts-yetgul
vemana2000-fonts
- vlgothic-fonts
vlgothic-p-fonts
vollkorn-fonts
woodardworks-laconic-fonts
@@ -3062,11 +3068,32 @@
ghc
ghc-doc
happy
+ haskell-platform
+ ghc-cgi-devel
+ ghc-editline-devel
+ ghc-fgl-devel
+ ghc-GLUT-devel
+ ghc-haskell-platform-devel
+ ghc-HTTP-devel
+ ghc-network-devel
+ ghc-OpenGL-devel
+ ghc-time-devel
+ ghc-utf8-string-devel
+ ghc-zlib-devel
cpphs
- ghc-gtk
+ ghc-gtk-devel
ghc-gtk2hs-doc
+ ghc-haskell-platform-doc
+ ghc-haskell-platform-prof
+ ghc-haskell-src-exts-devel
+ ghc-HUnit-devel
ghc-prof
- haddock
+ ghc-tar-devel
+ ghc-uniplate-devel
+ ghc-X11-devel
+ ghc-X11-xft-devel
+ ghc-xmonad-contrib-devel
+ hscolour
hugs98
hugs98-demos
xmonad
@@ -3201,8 +3228,9 @@
true
true
- ibus
+ gtk2-immodule-xim
ibus-gtk
+ ibus-qt
imsettings-xfce
ibus-anthy
ibus-chewing
@@ -3232,9 +3260,14 @@
gok
ibus-sayura
ibus-table-additional
+ ibus-table-array30
ibus-table-cangjie
ibus-table-erbi
+ ibus-table-quick
+ ibus-table-translit
ibus-table-wubi
+ ibus-table-xinhua
+ ibus-table-yong
iok
kinput2
m17n-contrib-esperanto
@@ -3407,16 +3440,18 @@
poppler-data
tkgate-ja
uim-anthy
- ipa-gothic-fonts
- ipa-mincho-fonts
- ipa-pgothic-fonts
- ipa-pmincho-fonts
+ vlgothic-fonts
+ vlgothic-p-fonts
cmigemo
ddskk
ddskk-xemacs
eblook
ebview
hanazono-fonts
+ ipa-gothic-fonts
+ ipa-mincho-fonts
+ ipa-pgothic-fonts
+ ipa-pmincho-fonts
japanese-bitmap-fonts
jfbterm
jisksp16-1990-fonts
@@ -3443,8 +3478,6 @@
stardict-dic-ja
uim-canna
uim-skk
- vlgothic-fonts
- vlgothic-p-fonts
wkf
@@ -3613,6 +3646,7 @@
lohit-kannada-fonts
m17n-contrib-kannada
m17n-db-kannada
+ hunspell-kn
hyphen-kn
ibus-m17n
moodle-kn
@@ -3632,8 +3666,6 @@
m17n-contrib-kashmiri
ibus-m17n
iok
- m17n-contrib-hindi
- m17n-db-hindi
@@ -3863,8 +3895,6 @@
lohit-konkani-fonts
ibus-m17n
iok
- m17n-contrib-hindi
- m17n-db-hindi
@@ -3972,7 +4002,6 @@
false
true
- bitmap-fonts
xorg-x11-fonts-100dpi
xorg-x11-fonts-ISO8859-15-100dpi
xorg-x11-fonts-misc
@@ -3980,6 +4009,7 @@
artwiz-aleczapka-fonts
baekmuk-bdf-fonts
bitmap-cjk-fonts
+ bitmap-fonts
ctan-musixtex-fonts
culmus-aharoni-clm-fonts
culmus-caladings-clm-fonts
@@ -4869,6 +4899,7 @@
kde-l10n-Punjabi
openoffice.org-langpack-pa_IN
iok
+ saab-fonts
@@ -4933,6 +4964,7 @@
fonts-KOI8-R
fonts-KOI8-R-100dpi
fonts-KOI8-R-75dpi
+ ibus-table-translit
m17n-contrib-russian
m17n-db-russian
scim-tables-russian
@@ -5027,6 +5059,7 @@
lohit-sindhi-fonts
m17n-contrib-sindhi
+ ibus-m17n
iok
@@ -5358,9 +5391,22 @@
sugar-terminal
sugar-turtleart
sugar-write
+ sugar-analyze
+ sugar-clock
+ sugar-connect
+ sugar-distance
+ sugar-emulator
sugar-finance
+ sugar-flipsticks
sugar-help
+ sugar-implode
+ sugar-infoslicer
+ sugar-memorize
sugar-moon
+ sugar-playgo
+ sugar-record
+ sugar-speak
+ sugar-update-control
sugar-xoirc
sugar-xomail
@@ -5668,7 +5714,7 @@
openoffice.org-langpack-ta_IN
iok
samyak-tamil-fonts
- serafettin-cartoon-fonts
+ serafettin-cartoon-fonts
@@ -5688,7 +5734,8 @@
ibus-m17n
openoffice.org-langpack-te_IN
iok
- pothana2000-fonts
+ pothana2000-fonts
+ vemana2000-fonts
@@ -5920,6 +5967,7 @@
paktype-tehreer-fonts
hunspell-ur
openoffice.org-langpack-ur
+ ibus-m17n
dejavu-sans-fonts
dejavu-sans-mono-fonts
nafees-web-naskh-fonts
@@ -6555,6 +6603,15 @@
virtualization
+
+ content
+ <_name>Content
+ <_description>Text and other Free content.
+ 99
+
+ books
+
+