diff --git a/comps-f37.xml.in b/comps-f37.xml.in
index 32408b83..be13854c 100644
--- a/comps-f37.xml.in
+++ b/comps-f37.xml.in
@@ -1770,14 +1770,20 @@
       <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-music-fonts</packagereq>
       <packagereq type="optional">google-noto-naskh-arabic-ui-vf-fonts</packagereq>
-      <packagereq type="optional">google-noto-nastaliq-urdu-fonts</packagereq>
+      <packagereq type="optional">google-noto-nastaliq-urdu-vf-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-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-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>
@@ -1786,30 +1792,46 @@
       <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-carian-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-chorasmian-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-cjk-jp-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-cjk-kr-fonts</packagereq>
       <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-cypro-minoan-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-deseret-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-devanagari-ui-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-devanagari-vf-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-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-elbasan-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-elymaic-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-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-gunjala-gondi-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-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>
       <packagereq type="optional">google-noto-sans-inscriptional-parthian-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-javanese-fonts</packagereq>
+      <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>
@@ -1824,12 +1846,20 @@
       <packagereq type="optional">google-noto-sans-lao-ui-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>
+      <packagereq type="optional">google-noto-sans-linear-b-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-lisu-vf-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-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-manichaean-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-marchen-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-masaram-gondi-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-math-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-mayan-numerals-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>
@@ -1842,12 +1872,17 @@
       <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-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>
       <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-nushu-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-ogham-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>
@@ -1857,13 +1892,15 @@
       <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-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>
       <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-psalter-pahlavi-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-rejang-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-runic-vf-fonts</packagereq>
@@ -1871,23 +1908,28 @@
       <packagereq type="optional">google-noto-sans-saurashtra-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-sc-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-sharada-fonts</packagereq>
+      <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-sogdian-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-sora-sompeng-vf-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-soyombo-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-tai-le-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-tai-viet-vf-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-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-vf-fonts</packagereq>
@@ -1906,6 +1948,12 @@
       <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-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-vai-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-vithkuqi-vf-fonts</packagereq>
+      <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-serif-ahom-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-armenian-vf-fonts</packagereq>
@@ -1918,7 +1966,8 @@
       <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-display-vf-fonts</packagereq>
-      <packagereq type="optional">google-noto-serif-dogra-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-ethiopic-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-georgian-vf-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-grantha-fonts</packagereq>
@@ -1931,17 +1980,23 @@
       <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-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-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>
       <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-toto-vf-fonts</packagereq>
+      <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-roboto-condensed-fonts</packagereq>