diff --git a/comps-f38.xml.in b/comps-f38.xml.in
index 6ad096f4..10d78fd0 100644
--- a/comps-f38.xml.in
+++ b/comps-f38.xml.in
@@ -1624,15 +1624,16 @@
       <packagereq type="default">google-noto-sans-georgian-vf-fonts</packagereq>
       <packagereq type="default">google-noto-sans-gurmukhi-vf-fonts</packagereq>
       <packagereq type="default">google-noto-sans-hebrew-vf-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-khmer-vf-fonts</packagereq>
       <packagereq type="default">google-noto-sans-lao-vf-fonts</packagereq>
       <packagereq type="default">google-noto-sans-math-fonts</packagereq>
       <packagereq type="default">google-noto-sans-mono-vf-fonts</packagereq>
       <packagereq type="default">google-noto-sans-sinhala-vf-fonts</packagereq>
       <packagereq type="default">google-noto-sans-thaana-vf-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-thai-vf-fonts</packagereq>
       <packagereq type="default">google-noto-sans-vf-fonts</packagereq>
       <packagereq type="default">google-noto-serif-vf-fonts</packagereq>
       <packagereq type="default">jomolhari-fonts</packagereq>
-      <packagereq type="default">khmer-os-system-fonts</packagereq>
       <packagereq type="default">liberation-mono-fonts</packagereq>
       <packagereq type="default">liberation-sans-fonts</packagereq>
       <packagereq type="default">liberation-serif-fonts</packagereq>
@@ -1651,7 +1652,6 @@
       <packagereq type="default">sil-nuosu-fonts</packagereq>
       <packagereq type="default">sil-padauk-fonts</packagereq>
       <packagereq type="default">stix-fonts</packagereq>
-      <packagereq type="default">thai-scalable-waree-fonts</packagereq>
       <packagereq type="default">vazirmatn-vf-fonts</packagereq>
       <packagereq type="optional">aajohan-comfortaa-fonts</packagereq>
       <packagereq type="optional">adf-accanthis-2-fonts</packagereq>
@@ -1818,11 +1818,9 @@
       <packagereq type="optional">google-droid-sans-mono-fonts</packagereq>
       <packagereq type="optional">google-droid-serif-fonts</packagereq>
       <packagereq type="optional">google-noto-emoji-fonts</packagereq>
-      <packagereq type="optional">google-noto-kufi-arabic-vf-fonts</packagereq>
-      <packagereq type="optional">google-noto-looped-lao-ui-vf-fonts</packagereq>
-      <packagereq type="optional">google-noto-looped-lao-vf-fonts</packagereq>
-      <packagereq type="optional">google-noto-looped-thai-ui-vf-fonts</packagereq>
-      <packagereq type="optional">google-noto-looped-thai-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-fangsong-kss-rotated-fonts</packagereq>
+      <packagereq type="optional">google-noto-fangsong-kss-vertical-fonts</packagereq>
+      <packagereq type="optional">google-noto-looped-thai-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-nastaliq-urdu-vf-fonts</packagereq>
@@ -1830,13 +1828,12 @@
       <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-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-arabic-ui-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-avestan-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-ui-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>
@@ -1868,12 +1865,10 @@
       <packagereq type="optional">google-noto-sans-gujarati-ui-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-gujarati-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-gunjala-gondi-vf-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-gurmukhi-ui-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-gurmukhi-ui-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-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-hebrew-droid-vf-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-hebrew-new-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-imperial-aramaic-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-indic-siyaq-numbers-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-inscriptional-pahlavi-fonts</packagereq>
@@ -1881,16 +1876,15 @@
       <packagereq type="optional">google-noto-sans-javanese-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-jp-fonts</packagereq>
       <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-ui-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-kannada-vf-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-ui-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-lao-looped-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-lao-looped-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-a-fonts</packagereq>
@@ -1899,7 +1893,7 @@
       <packagereq type="optional">google-noto-sans-lycian-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-lydian-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-ui-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-manichaean-fonts</packagereq>
@@ -1920,7 +1914,6 @@
       <packagereq type="optional">google-noto-sans-mono-cjk-tc-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-mro-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-multani-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-nabataean-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-nandinagari-fonts</packagereq>
@@ -1938,7 +1931,6 @@
       <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-ui-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-oriya-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-osage-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-osmanya-fonts</packagereq>
@@ -1949,7 +1941,7 @@
       <packagereq type="optional">google-noto-sans-phoenician-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-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-runic-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>
@@ -1957,7 +1949,7 @@
       <packagereq type="optional">google-noto-sans-shavian-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-sinhala-ui-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-fonts</packagereq>
@@ -1965,22 +1957,26 @@
       <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-eastern-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-syriac-eastern-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-syriac-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-syriac-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-syriac-western-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-syriac-western-vf-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-tai-le-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-tai-tham-vf-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-tai-viet-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-tai-viet-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-takri-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-supplement-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-tamil-ui-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-tamil-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-tangsa-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-tc-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-telugu-ui-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-telugu-ui-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-telugu-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-thai-looped-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>
@@ -2000,7 +1996,7 @@
       <packagereq type="optional">google-noto-sans-wancho-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-warang-citi-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-yi-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-zanabazar-square-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-zanabazar-square-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-balinese-fonts</packagereq>
@@ -2012,7 +2008,7 @@
       <packagereq type="optional">google-noto-serif-cjk-ttc-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-devanagari-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-dives-akuru-fonts</packagereq>
-      <packagereq type="optional">google-noto-serif-dogra-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>
@@ -2021,6 +2017,7 @@
       <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-khitan-small-script-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>
@@ -2028,12 +2025,13 @@
       <packagereq type="optional">google-noto-serif-makasar-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-myanmar-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-serif-np-hmong-fonts</packagereq>
+      <packagereq type="optional">google-noto-serif-np-hmong-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-old-uyghur-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-oriya-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-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-tc-fonts</packagereq>
@@ -2044,6 +2042,7 @@
       <packagereq type="optional">google-noto-serif-vithkuqi-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-noto-traditional-nushu-vf-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>
@@ -2098,6 +2097,7 @@
       <packagereq type="optional">khmer-os-metal-chrieng-fonts</packagereq>
       <packagereq type="optional">khmer-os-muol-fonts-all</packagereq>
       <packagereq type="optional">khmer-os-siemreap-fonts</packagereq>
+      <packagereq type="optional">khmer-os-system-fonts</packagereq>
       <packagereq type="optional">kurdit-unikurd-web-fonts</packagereq>
       <packagereq type="optional">labiryntowy-fonts</packagereq>
       <packagereq type="optional">lato-fonts</packagereq>
@@ -2230,6 +2230,7 @@
       <packagereq type="optional">thai-scalable-tlwgtypist-fonts</packagereq>
       <packagereq type="optional">thai-scalable-tlwgtypo-fonts</packagereq>
       <packagereq type="optional">thai-scalable-umpush-fonts</packagereq>
+      <packagereq type="optional">thai-scalable-waree-fonts</packagereq>
       <packagereq type="optional">thibault-essays1743-fonts</packagereq>
       <packagereq type="optional">thibault-isabella-fonts</packagereq>
       <packagereq type="optional">thibault-rockets-fonts</packagereq>