diff --git a/comps-f36.xml.in b/comps-f36.xml.in
index 80eac768..f4b4cceb 100644
--- a/comps-f36.xml.in
+++ b/comps-f36.xml.in
@@ -1756,23 +1756,34 @@
       <packagereq type="optional">google-droid-sans-fonts</packagereq>
       <packagereq type="optional">google-droid-sans-mono-fonts</packagereq>
       <packagereq type="optional">google-droid-serif-fonts</packagereq>
-      <!-- <packagereq type="optional">google-noto-cjk-fonts</packagereq> -->
       <packagereq type="optional">google-noto-emoji-fonts</packagereq>
-      <packagereq type="optional">google-noto-kufi-arabic-fonts</packagereq>
-      <packagereq type="optional">google-noto-naskh-arabic-fonts</packagereq>
-      <packagereq type="optional">google-noto-naskh-arabic-ui-fonts</packagereq>
+      <packagereq type="optional">google-noto-kufi-arabic-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-music-fonts</packagereq>
+      <packagereq type="optional">google-noto-naskh-arabic-ui-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-naskh-arabic-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-nastaliq-urdu-fonts</packagereq>
+      <packagereq type="optional">google-noto-rashi-hebrew-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-adlam-unjoined-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-adlam-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-anatolian-hieroglyphs-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-arabic-ui-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-arabic-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-armenian-vf-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-avestan-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-bamum-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-avestan-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-balinese-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-bamum-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-bassa-vah-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-batak-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-bengali-ui-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-bengali-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-bhaiksuki-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-brahmi-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-buginese-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-buhid-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-buginese-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-buhid-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-canadian-aboriginal-vf-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-carian-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-carian-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-caucasian-albanian-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-chakma-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-cham-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-cherokee-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-cjk-jp-fonts</packagereq>
@@ -1780,22 +1791,31 @@
       <packagereq type="optional">google-noto-sans-cjk-sc-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-cjk-tc-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-coptic-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-cuneiform-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-cypriot-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-deseret-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-cuneiform-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-cypriot-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-deseret-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-devanagari-ui-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-devanagari-vf-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-egyptian-hieroglyphs-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-display-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-duployan-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-egyptian-hieroglyphs-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-elbasan-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-elymaic-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-ethiopic-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-georgian-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-glagolitic-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-gothic-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-gothic-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-grantha-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-gujarati-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-gujarati-ui-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-gurmukhi-ui-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-gunjala-gondi-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-gurmukhi-ui-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-hanifi-rohingya-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-hanunoo-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-hatran-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-hebrew-vf-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-imperial-aramaic-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-imperial-aramaic-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-indic-siyaq-numbers-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-inscriptional-pahlavi-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-inscriptional-parthian-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-javanese-fonts</packagereq>
@@ -1803,93 +1823,167 @@
       <packagereq type="optional">google-noto-sans-kaithi-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-kannada-ui-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-kannada-vf-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-kayah-li-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-kayah-li-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-kharoshthi-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-khmer-ui-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-khmer-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-khojki-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-khudawadi-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-kr-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-lao-looped-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-lao-ui-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-lao-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-lepcha-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-limbu-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-linear-b-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-lisu-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-lycian-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-lydian-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-linear-a-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-linear-b-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-lisu-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-lycian-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-lydian-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-mahajani-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-malayalam-ui-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-malayalam-vf-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-mandaic-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-mandaic-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-manichaean-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-marchen-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-masaram-gondi-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-math-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-mayan-numerals-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-medefaidrin-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-meetei-mayek-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-meeteimayek-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-mende-kikakui-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-meroitic-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-miao-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-modi-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-mongolian-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-mono-cjk-jp-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-mono-cjk-kr-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-mono-cjk-sc-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-mono-cjk-tc-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-mono-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-mro-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-multani-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-myanmar-ui-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-myanmar-vf-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-new-tai-lue-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-nabataean-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-new-tai-lue-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-newa-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-nko-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-ogham-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-ol-chiki-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-nushu-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-ogham-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-ol-chiki-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-old-hungarian-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-old-italic-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-old-north-arabian-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-old-permic-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-old-persian-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-old-sogdian-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-old-south-arabian-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-old-turkic-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-oriya-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-oriya-ui-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-osmanya-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-osage-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-osmanya-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-pahawh-hmong-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-palmyrene-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-pau-cin-hau-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-phags-pa-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-phoenician-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-phoenician-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-psalter-pahlavi-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-rejang-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-runic-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-runic-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-samaritan-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-saurashtra-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-sc-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-shavian-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-sundanese-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-sharada-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-shavian-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-siddham-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-signwriting-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-sinhala-ui-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-sogdian-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-sora-sompeng-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-soyombo-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-sundanese-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-syloti-nagri-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-symbols-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-symbols2-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-syriac-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-tagalog-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-tagbanwa-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-tagbanwa-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-tai-le-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-tai-tham-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-tai-tham-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-tai-viet-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-takri-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-tamil-supplement-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-tamil-ui-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-tamil-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-tc-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-telugu-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-telugu-ui-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-telugu-ui-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-telugu-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-thaana-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-thai-looped-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-thai-ui-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-thai-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-tifinagh-adrar-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-tifinagh-agraw-imazighen-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-tifinagh-ahaggar-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-tifinagh-air-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-tifinagh-apt-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-tifinagh-azawagh-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-tifinagh-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-ugaritic-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-vai-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-tifinagh-ghat-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-tifinagh-hawad-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-tifinagh-rhissa-ixa-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-tifinagh-sil-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-tifinagh-tawellemmet-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-tirhuta-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-ugaritic-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-vai-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-vf-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-yi-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-wancho-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-warang-citi-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-yi-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-zanabazar-square-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-serif-ahom-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-armenian-vf-fonts</packagereq>
-      <packagereq type="optional">google-noto-serif-bengali-fonts</packagereq>
+      <packagereq type="optional">google-noto-serif-balinese-fonts</packagereq>
+      <packagereq type="optional">google-noto-serif-bengali-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-cjk-jp-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-cjk-kr-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-cjk-sc-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-cjk-tc-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-cjk-ttc-fonts</packagereq>
-      <packagereq type="optional">google-noto-serif-devanagari-fonts</packagereq>
+      <packagereq type="optional">google-noto-serif-devanagari-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-serif-display-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-serif-dogra-fonts</packagereq>
+      <packagereq type="optional">google-noto-serif-ethiopic-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-georgian-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-serif-grantha-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-gujarati-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-serif-gurmukhi-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-serif-hebrew-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-jp-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-kannada-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-khmer-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-serif-khojki-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-kr-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-lao-vf-fonts</packagereq>
-      <packagereq type="optional">google-noto-serif-malayalam-fonts</packagereq>
+      <packagereq type="optional">google-noto-serif-malayalam-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-serif-myanmar-fonts</packagereq>
+      <packagereq type="optional">google-noto-serif-nyiakeng-puachue-hmong-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-sc-fonts</packagereq>
+      <packagereq type="optional">google-noto-serif-sinhala-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-serif-tamil-slanted-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-tamil-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-serif-tangut-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-tc-fonts</packagereq>
-      <packagereq type="optional">google-noto-serif-telugu-fonts</packagereq>
+      <packagereq type="optional">google-noto-serif-telugu-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-thai-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-serif-tibetan-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-serif-yezidi-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-traditional-nushu-fonts</packagereq>
       <packagereq type="optional">google-roboto-condensed-fonts</packagereq>
       <packagereq type="optional">google-roboto-fonts</packagereq>
       <packagereq type="optional">google-roboto-mono-fonts</packagereq>
@@ -1958,7 +2052,6 @@
       <packagereq type="optional">layla-thuluth-fonts</packagereq>
       <packagereq type="optional">levien-inconsolata-fonts</packagereq>
       <packagereq type="optional">levien-museum-fonts</packagereq>
-      <!-- <packagereq type="optional">liberation-fonts</packagereq> -->
       <packagereq type="optional">liberation-narrow-fonts</packagereq>
       <packagereq type="optional">libreoffice-opensymbol-fonts</packagereq>
       <packagereq type="optional">lilypond-emmentaler-fonts</packagereq>
@@ -2018,7 +2111,6 @@
       <packagereq type="optional">open-sans-fonts</packagereq>
       <packagereq type="optional">opendyslexic-fonts</packagereq>
       <packagereq type="optional">overpass-fonts</packagereq>
-      <!-- <packagereq type="optional">oxygen-fonts</packagereq> -->
       <packagereq type="optional">oxygen-mono-fonts</packagereq>
       <packagereq type="optional">oxygen-sans-fonts</packagereq>
       <packagereq type="optional">paktype-ajrak-fonts</packagereq>
@@ -2032,6 +2124,11 @@
       <packagereq type="optional">polarsys-b612-sans-fonts</packagereq>
       <packagereq type="optional">pothana2000-fonts</packagereq>
       <packagereq type="optional">pt-sans-fonts</packagereq>
+      <packagereq type="optional">rit-ezhuthu-fonts</packagereq>
+      <packagereq type="optional">rit-panmana-fonts</packagereq>
+      <packagereq type="optional">rit-rachana-fonts</packagereq>
+      <packagereq type="optional">rit-sundar-fonts</packagereq>
+      <packagereq type="optional">rit-tn-joy-fonts</packagereq>
       <packagereq type="optional">saab-fonts</packagereq>
       <packagereq type="optional">samyak-devanagari-fonts</packagereq>
       <packagereq type="optional">samyak-gujarati-fonts</packagereq>
@@ -2059,11 +2156,6 @@
       <packagereq type="optional">smc-anjalioldlipi-fonts</packagereq>
       <packagereq type="optional">smc-dyuthi-fonts</packagereq>
       <packagereq type="optional">smc-suruma-fonts</packagereq>
-      <packagereq type="optional">rit-rachana-fonts</packagereq>
-      <packagereq type="optional">rit-sundar-fonts</packagereq>
-      <packagereq type="optional">rit-panmana-fonts</packagereq>
-      <packagereq type="optional">rit-ezhuthu-fonts</packagereq>
-      <packagereq type="optional">rit-tn-joy-fonts</packagereq>
       <packagereq type="optional">thai-arundina-sans-fonts</packagereq>
       <packagereq type="optional">thai-arundina-sans-mono-fonts</packagereq>
       <packagereq type="optional">thai-arundina-serif-fonts</packagereq>