From d00102bbf5e29d53c82ff59fb6e6e14e5918cf0c Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Sat, 6 Apr 2024 18:36:38 -0700
Subject: [PATCH] fix comps

---
 comps/AppStream-aarch64.xml | 147 +++++-------------------------------
 comps/AppStream-ppc64le.xml | 147 +++++-------------------------------
 comps/AppStream-s390x.xml   | 147 +++++-------------------------------
 comps/AppStream-x86_64.xml  | 147 +++++-------------------------------
 comps/BaseOS-aarch64.xml    |   6 +-
 comps/BaseOS-ppc64le.xml    |   6 +-
 comps/BaseOS-s390x.xml      |   6 +-
 comps/BaseOS-x86_64.xml     |   6 +-
 8 files changed, 92 insertions(+), 520 deletions(-)

diff --git a/comps/AppStream-aarch64.xml b/comps/AppStream-aarch64.xml
index 12cdde6..ae1fef8 100644
--- a/comps/AppStream-aarch64.xml
+++ b/comps/AppStream-aarch64.xml
@@ -347,143 +347,36 @@
     <default>true</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="default">abattis-cantarell-fonts</packagereq>
-      <packagereq type="default">google-noto-emoji-color-fonts</packagereq>
-      <packagereq type="default">google-noto-sans-cjk-ttc-fonts</packagereq>
-      <packagereq type="default">google-noto-sans-gurmukhi-fonts</packagereq>
-      <packagereq type="default">google-noto-sans-sinhala-vf-fonts</packagereq>
-      <packagereq type="default">google-noto-serif-cjk-ttc-fonts</packagereq>
-      <packagereq type="default">jomolhari-fonts</packagereq>
+      <packagereq type="default">default-fonts-cjk-mono</packagereq>
+      <packagereq type="default">default-fonts-cjk-sans</packagereq>
+      <packagereq type="default">default-fonts-cjk-serif</packagereq>
+      <packagereq type="default">default-fonts-core-emoji</packagereq>
+      <packagereq type="default">default-fonts-core-math</packagereq>
+      <packagereq type="default">default-fonts-other-mono</packagereq>
+      <packagereq type="default">default-fonts-other-sans</packagereq>
+      <packagereq type="default">default-fonts-other-serif</packagereq>
+      <packagereq type="default">dejavu-sans-fonts</packagereq>
+      <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
+      <packagereq type="default">dejavu-serif-fonts</packagereq>
       <packagereq type="default">julietaula-montserrat-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>
-      <packagereq type="default">lohit-assamese-fonts</packagereq>
-      <packagereq type="default">lohit-bengali-fonts</packagereq>
-      <packagereq type="default">lohit-devanagari-fonts</packagereq>
-      <packagereq type="default">lohit-gujarati-fonts</packagereq>
-      <packagereq type="default">lohit-kannada-fonts</packagereq>
-      <packagereq type="default">lohit-odia-fonts</packagereq>
-      <packagereq type="default">lohit-tamil-fonts</packagereq>
-      <packagereq type="default">lohit-telugu-fonts</packagereq>
-      <packagereq type="default">paktype-naskh-basic-fonts</packagereq>
       <packagereq type="default">pt-sans-fonts</packagereq>
-      <packagereq type="default">sil-abyssinica-fonts</packagereq>
-      <packagereq type="default">sil-nuosu-fonts</packagereq>
-      <packagereq type="default">sil-padauk-fonts</packagereq>
-      <packagereq type="default">smc-meera-fonts</packagereq>
-      <packagereq type="default">stix-fonts</packagereq>
-      <packagereq type="default">thai-scalable-waree-fonts</packagereq>
+      <packagereq type="default">redhat-display-vf-fonts</packagereq>
+      <packagereq type="default">redhat-mono-vf-fonts</packagereq>
+      <packagereq type="default">redhat-text-vf-fonts</packagereq>
       <packagereq type="optional">fontawesome-fonts</packagereq>
+      <packagereq type="optional">google-arimo-fonts</packagereq>
+      <packagereq type="optional">google-carlito-fonts</packagereq>
+      <packagereq type="optional">google-cousine-fonts</packagereq>
+      <packagereq type="optional">google-crosextra-caladea-fonts</packagereq>
       <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-sans-armenian-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-avestan-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-bengali-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-bengali-ui-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-brahmi-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-carian-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-cherokee-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-coptic-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-deseret-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-devanagari-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-devanagari-ui-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-egyptian-hieroglyphs-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-ethiopic-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-georgian-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-glagolitic-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-hebrew-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-imperial-aramaic-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-kaithi-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-kannada-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-kannada-ui-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-kayah-li-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-kharoshthi-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-khmer-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-khmer-ui-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-lao-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-lao-ui-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-malayalam-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-malayalam-ui-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-nko-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-osmanya-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-phoenician-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-shavian-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-sinhala-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-symbols-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-tamil-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-tamil-ui-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-thaana-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-thai-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-thai-ui-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-serif-armenian-fonts</packagereq>
-      <packagereq type="optional">google-noto-serif-fonts</packagereq>
-      <packagereq type="optional">google-noto-serif-georgian-fonts</packagereq>
-      <packagereq type="optional">google-noto-serif-khmer-fonts</packagereq>
-      <packagereq type="optional">google-noto-serif-lao-fonts</packagereq>
-      <packagereq type="optional">google-noto-serif-thai-fonts</packagereq>
-      <packagereq type="optional">gubbi-fonts</packagereq>
-      <packagereq type="optional">kacst-art-fonts</packagereq>
-      <packagereq type="optional">kacst-book-fonts</packagereq>
-      <packagereq type="optional">kacst-decorative-fonts</packagereq>
-      <packagereq type="optional">kacst-digital-fonts</packagereq>
-      <packagereq type="optional">kacst-farsi-fonts</packagereq>
-      <packagereq type="optional">kacst-letter-fonts</packagereq>
-      <packagereq type="optional">kacst-naskh-fonts</packagereq>
-      <packagereq type="optional">kacst-office-fonts</packagereq>
-      <packagereq type="optional">kacst-one-fonts</packagereq>
-      <packagereq type="optional">kacst-pen-fonts</packagereq>
-      <packagereq type="optional">kacst-poster-fonts</packagereq>
-      <packagereq type="optional">kacst-qurn-fonts</packagereq>
-      <packagereq type="optional">kacst-screen-fonts</packagereq>
-      <packagereq type="optional">kacst-title-fonts</packagereq>
-      <packagereq type="optional">kacst-titlel-fonts</packagereq>
-      <packagereq type="optional">khmer-os-battambang-fonts</packagereq>
-      <packagereq type="optional">khmer-os-bokor-fonts</packagereq>
-      <packagereq type="optional">khmer-os-content-fonts</packagereq>
-      <packagereq type="optional">khmer-os-fasthand-fonts</packagereq>
-      <packagereq type="optional">khmer-os-freehand-fonts</packagereq>
-      <packagereq type="optional">khmer-os-handwritten-fonts</packagereq>
-      <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">google-noto-emoji-fonts</packagereq>
+      <packagereq type="optional">google-noto-fonts-all</packagereq>
       <packagereq type="optional">lato-fonts</packagereq>
-      <packagereq type="optional">lohit-gurmukhi-fonts</packagereq>
-      <packagereq type="optional">lohit-marathi-fonts</packagereq>
-      <packagereq type="optional">madan-fonts</packagereq>
-      <packagereq type="optional">navilu-fonts</packagereq>
       <packagereq type="optional">open-sans-fonts</packagereq>
       <packagereq type="optional">overpass-fonts</packagereq>
-      <packagereq type="optional">paktype-naqsh-fonts</packagereq>
-      <packagereq type="optional">paktype-tehreer-fonts</packagereq>
       <packagereq type="optional">paratype-pt-sans-caption-fonts</packagereq>
-      <packagereq type="optional">saab-fonts</packagereq>
-      <packagereq type="optional">sil-scheherazade-fonts</packagereq>
-      <packagereq type="optional">smc-rachana-fonts</packagereq>
-      <packagereq type="optional">thai-scalable-garuda-fonts</packagereq>
-      <packagereq type="optional">thai-scalable-kinnari-fonts</packagereq>
-      <packagereq type="optional">thai-scalable-loma-fonts</packagereq>
-      <packagereq type="optional">thai-scalable-norasi-fonts</packagereq>
-      <packagereq type="optional">thai-scalable-purisa-fonts</packagereq>
-      <packagereq type="optional">thai-scalable-sawasdee-fonts</packagereq>
-      <packagereq type="optional">thai-scalable-tlwgmono-fonts</packagereq>
-      <packagereq type="optional">thai-scalable-tlwgtypewriter-fonts</packagereq>
-      <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">xorg-x11-fonts-100dpi</packagereq>
       <packagereq type="optional">xorg-x11-fonts-75dpi</packagereq>
       <packagereq type="optional">xorg-x11-fonts-ISO8859-1-100dpi</packagereq>
diff --git a/comps/AppStream-ppc64le.xml b/comps/AppStream-ppc64le.xml
index 4927e13..2793d56 100644
--- a/comps/AppStream-ppc64le.xml
+++ b/comps/AppStream-ppc64le.xml
@@ -340,143 +340,36 @@
     <default>true</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="default">abattis-cantarell-fonts</packagereq>
-      <packagereq type="default">google-noto-emoji-color-fonts</packagereq>
-      <packagereq type="default">google-noto-sans-cjk-ttc-fonts</packagereq>
-      <packagereq type="default">google-noto-sans-gurmukhi-fonts</packagereq>
-      <packagereq type="default">google-noto-sans-sinhala-vf-fonts</packagereq>
-      <packagereq type="default">google-noto-serif-cjk-ttc-fonts</packagereq>
-      <packagereq type="default">jomolhari-fonts</packagereq>
+      <packagereq type="default">default-fonts-cjk-mono</packagereq>
+      <packagereq type="default">default-fonts-cjk-sans</packagereq>
+      <packagereq type="default">default-fonts-cjk-serif</packagereq>
+      <packagereq type="default">default-fonts-core-emoji</packagereq>
+      <packagereq type="default">default-fonts-core-math</packagereq>
+      <packagereq type="default">default-fonts-other-mono</packagereq>
+      <packagereq type="default">default-fonts-other-sans</packagereq>
+      <packagereq type="default">default-fonts-other-serif</packagereq>
+      <packagereq type="default">dejavu-sans-fonts</packagereq>
+      <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
+      <packagereq type="default">dejavu-serif-fonts</packagereq>
       <packagereq type="default">julietaula-montserrat-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>
-      <packagereq type="default">lohit-assamese-fonts</packagereq>
-      <packagereq type="default">lohit-bengali-fonts</packagereq>
-      <packagereq type="default">lohit-devanagari-fonts</packagereq>
-      <packagereq type="default">lohit-gujarati-fonts</packagereq>
-      <packagereq type="default">lohit-kannada-fonts</packagereq>
-      <packagereq type="default">lohit-odia-fonts</packagereq>
-      <packagereq type="default">lohit-tamil-fonts</packagereq>
-      <packagereq type="default">lohit-telugu-fonts</packagereq>
-      <packagereq type="default">paktype-naskh-basic-fonts</packagereq>
       <packagereq type="default">pt-sans-fonts</packagereq>
-      <packagereq type="default">sil-abyssinica-fonts</packagereq>
-      <packagereq type="default">sil-nuosu-fonts</packagereq>
-      <packagereq type="default">sil-padauk-fonts</packagereq>
-      <packagereq type="default">smc-meera-fonts</packagereq>
-      <packagereq type="default">stix-fonts</packagereq>
-      <packagereq type="default">thai-scalable-waree-fonts</packagereq>
+      <packagereq type="default">redhat-display-vf-fonts</packagereq>
+      <packagereq type="default">redhat-mono-vf-fonts</packagereq>
+      <packagereq type="default">redhat-text-vf-fonts</packagereq>
       <packagereq type="optional">fontawesome-fonts</packagereq>
+      <packagereq type="optional">google-arimo-fonts</packagereq>
+      <packagereq type="optional">google-carlito-fonts</packagereq>
+      <packagereq type="optional">google-cousine-fonts</packagereq>
+      <packagereq type="optional">google-crosextra-caladea-fonts</packagereq>
       <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-sans-armenian-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-avestan-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-bengali-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-bengali-ui-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-brahmi-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-carian-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-cherokee-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-coptic-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-deseret-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-devanagari-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-devanagari-ui-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-egyptian-hieroglyphs-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-ethiopic-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-georgian-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-glagolitic-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-hebrew-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-imperial-aramaic-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-kaithi-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-kannada-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-kannada-ui-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-kayah-li-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-kharoshthi-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-khmer-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-khmer-ui-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-lao-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-lao-ui-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-malayalam-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-malayalam-ui-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-nko-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-osmanya-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-phoenician-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-shavian-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-sinhala-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-symbols-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-tamil-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-tamil-ui-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-thaana-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-thai-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-thai-ui-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-serif-armenian-fonts</packagereq>
-      <packagereq type="optional">google-noto-serif-fonts</packagereq>
-      <packagereq type="optional">google-noto-serif-georgian-fonts</packagereq>
-      <packagereq type="optional">google-noto-serif-khmer-fonts</packagereq>
-      <packagereq type="optional">google-noto-serif-lao-fonts</packagereq>
-      <packagereq type="optional">google-noto-serif-thai-fonts</packagereq>
-      <packagereq type="optional">gubbi-fonts</packagereq>
-      <packagereq type="optional">kacst-art-fonts</packagereq>
-      <packagereq type="optional">kacst-book-fonts</packagereq>
-      <packagereq type="optional">kacst-decorative-fonts</packagereq>
-      <packagereq type="optional">kacst-digital-fonts</packagereq>
-      <packagereq type="optional">kacst-farsi-fonts</packagereq>
-      <packagereq type="optional">kacst-letter-fonts</packagereq>
-      <packagereq type="optional">kacst-naskh-fonts</packagereq>
-      <packagereq type="optional">kacst-office-fonts</packagereq>
-      <packagereq type="optional">kacst-one-fonts</packagereq>
-      <packagereq type="optional">kacst-pen-fonts</packagereq>
-      <packagereq type="optional">kacst-poster-fonts</packagereq>
-      <packagereq type="optional">kacst-qurn-fonts</packagereq>
-      <packagereq type="optional">kacst-screen-fonts</packagereq>
-      <packagereq type="optional">kacst-title-fonts</packagereq>
-      <packagereq type="optional">kacst-titlel-fonts</packagereq>
-      <packagereq type="optional">khmer-os-battambang-fonts</packagereq>
-      <packagereq type="optional">khmer-os-bokor-fonts</packagereq>
-      <packagereq type="optional">khmer-os-content-fonts</packagereq>
-      <packagereq type="optional">khmer-os-fasthand-fonts</packagereq>
-      <packagereq type="optional">khmer-os-freehand-fonts</packagereq>
-      <packagereq type="optional">khmer-os-handwritten-fonts</packagereq>
-      <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">google-noto-emoji-fonts</packagereq>
+      <packagereq type="optional">google-noto-fonts-all</packagereq>
       <packagereq type="optional">lato-fonts</packagereq>
-      <packagereq type="optional">lohit-gurmukhi-fonts</packagereq>
-      <packagereq type="optional">lohit-marathi-fonts</packagereq>
-      <packagereq type="optional">madan-fonts</packagereq>
-      <packagereq type="optional">navilu-fonts</packagereq>
       <packagereq type="optional">open-sans-fonts</packagereq>
       <packagereq type="optional">overpass-fonts</packagereq>
-      <packagereq type="optional">paktype-naqsh-fonts</packagereq>
-      <packagereq type="optional">paktype-tehreer-fonts</packagereq>
       <packagereq type="optional">paratype-pt-sans-caption-fonts</packagereq>
-      <packagereq type="optional">saab-fonts</packagereq>
-      <packagereq type="optional">sil-scheherazade-fonts</packagereq>
-      <packagereq type="optional">smc-rachana-fonts</packagereq>
-      <packagereq type="optional">thai-scalable-garuda-fonts</packagereq>
-      <packagereq type="optional">thai-scalable-kinnari-fonts</packagereq>
-      <packagereq type="optional">thai-scalable-loma-fonts</packagereq>
-      <packagereq type="optional">thai-scalable-norasi-fonts</packagereq>
-      <packagereq type="optional">thai-scalable-purisa-fonts</packagereq>
-      <packagereq type="optional">thai-scalable-sawasdee-fonts</packagereq>
-      <packagereq type="optional">thai-scalable-tlwgmono-fonts</packagereq>
-      <packagereq type="optional">thai-scalable-tlwgtypewriter-fonts</packagereq>
-      <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">xorg-x11-fonts-100dpi</packagereq>
       <packagereq type="optional">xorg-x11-fonts-75dpi</packagereq>
       <packagereq type="optional">xorg-x11-fonts-ISO8859-1-100dpi</packagereq>
diff --git a/comps/AppStream-s390x.xml b/comps/AppStream-s390x.xml
index 90bff7c..e11870d 100644
--- a/comps/AppStream-s390x.xml
+++ b/comps/AppStream-s390x.xml
@@ -352,143 +352,36 @@
     <default>true</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="default">abattis-cantarell-fonts</packagereq>
-      <packagereq type="default">google-noto-emoji-color-fonts</packagereq>
-      <packagereq type="default">google-noto-sans-cjk-ttc-fonts</packagereq>
-      <packagereq type="default">google-noto-sans-gurmukhi-fonts</packagereq>
-      <packagereq type="default">google-noto-sans-sinhala-vf-fonts</packagereq>
-      <packagereq type="default">google-noto-serif-cjk-ttc-fonts</packagereq>
-      <packagereq type="default">jomolhari-fonts</packagereq>
+      <packagereq type="default">default-fonts-cjk-mono</packagereq>
+      <packagereq type="default">default-fonts-cjk-sans</packagereq>
+      <packagereq type="default">default-fonts-cjk-serif</packagereq>
+      <packagereq type="default">default-fonts-core-emoji</packagereq>
+      <packagereq type="default">default-fonts-core-math</packagereq>
+      <packagereq type="default">default-fonts-other-mono</packagereq>
+      <packagereq type="default">default-fonts-other-sans</packagereq>
+      <packagereq type="default">default-fonts-other-serif</packagereq>
+      <packagereq type="default">dejavu-sans-fonts</packagereq>
+      <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
+      <packagereq type="default">dejavu-serif-fonts</packagereq>
       <packagereq type="default">julietaula-montserrat-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>
-      <packagereq type="default">lohit-assamese-fonts</packagereq>
-      <packagereq type="default">lohit-bengali-fonts</packagereq>
-      <packagereq type="default">lohit-devanagari-fonts</packagereq>
-      <packagereq type="default">lohit-gujarati-fonts</packagereq>
-      <packagereq type="default">lohit-kannada-fonts</packagereq>
-      <packagereq type="default">lohit-odia-fonts</packagereq>
-      <packagereq type="default">lohit-tamil-fonts</packagereq>
-      <packagereq type="default">lohit-telugu-fonts</packagereq>
-      <packagereq type="default">paktype-naskh-basic-fonts</packagereq>
       <packagereq type="default">pt-sans-fonts</packagereq>
-      <packagereq type="default">sil-abyssinica-fonts</packagereq>
-      <packagereq type="default">sil-nuosu-fonts</packagereq>
-      <packagereq type="default">sil-padauk-fonts</packagereq>
-      <packagereq type="default">smc-meera-fonts</packagereq>
-      <packagereq type="default">stix-fonts</packagereq>
-      <packagereq type="default">thai-scalable-waree-fonts</packagereq>
+      <packagereq type="default">redhat-display-vf-fonts</packagereq>
+      <packagereq type="default">redhat-mono-vf-fonts</packagereq>
+      <packagereq type="default">redhat-text-vf-fonts</packagereq>
       <packagereq type="optional">fontawesome-fonts</packagereq>
+      <packagereq type="optional">google-arimo-fonts</packagereq>
+      <packagereq type="optional">google-carlito-fonts</packagereq>
+      <packagereq type="optional">google-cousine-fonts</packagereq>
+      <packagereq type="optional">google-crosextra-caladea-fonts</packagereq>
       <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-sans-armenian-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-avestan-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-bengali-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-bengali-ui-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-brahmi-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-carian-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-cherokee-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-coptic-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-deseret-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-devanagari-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-devanagari-ui-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-egyptian-hieroglyphs-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-ethiopic-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-georgian-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-glagolitic-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-hebrew-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-imperial-aramaic-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-kaithi-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-kannada-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-kannada-ui-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-kayah-li-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-kharoshthi-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-khmer-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-khmer-ui-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-lao-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-lao-ui-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-malayalam-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-malayalam-ui-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-nko-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-osmanya-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-phoenician-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-shavian-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-sinhala-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-symbols-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-tamil-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-tamil-ui-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-thaana-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-thai-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-thai-ui-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-serif-armenian-fonts</packagereq>
-      <packagereq type="optional">google-noto-serif-fonts</packagereq>
-      <packagereq type="optional">google-noto-serif-georgian-fonts</packagereq>
-      <packagereq type="optional">google-noto-serif-khmer-fonts</packagereq>
-      <packagereq type="optional">google-noto-serif-lao-fonts</packagereq>
-      <packagereq type="optional">google-noto-serif-thai-fonts</packagereq>
-      <packagereq type="optional">gubbi-fonts</packagereq>
-      <packagereq type="optional">kacst-art-fonts</packagereq>
-      <packagereq type="optional">kacst-book-fonts</packagereq>
-      <packagereq type="optional">kacst-decorative-fonts</packagereq>
-      <packagereq type="optional">kacst-digital-fonts</packagereq>
-      <packagereq type="optional">kacst-farsi-fonts</packagereq>
-      <packagereq type="optional">kacst-letter-fonts</packagereq>
-      <packagereq type="optional">kacst-naskh-fonts</packagereq>
-      <packagereq type="optional">kacst-office-fonts</packagereq>
-      <packagereq type="optional">kacst-one-fonts</packagereq>
-      <packagereq type="optional">kacst-pen-fonts</packagereq>
-      <packagereq type="optional">kacst-poster-fonts</packagereq>
-      <packagereq type="optional">kacst-qurn-fonts</packagereq>
-      <packagereq type="optional">kacst-screen-fonts</packagereq>
-      <packagereq type="optional">kacst-title-fonts</packagereq>
-      <packagereq type="optional">kacst-titlel-fonts</packagereq>
-      <packagereq type="optional">khmer-os-battambang-fonts</packagereq>
-      <packagereq type="optional">khmer-os-bokor-fonts</packagereq>
-      <packagereq type="optional">khmer-os-content-fonts</packagereq>
-      <packagereq type="optional">khmer-os-fasthand-fonts</packagereq>
-      <packagereq type="optional">khmer-os-freehand-fonts</packagereq>
-      <packagereq type="optional">khmer-os-handwritten-fonts</packagereq>
-      <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">google-noto-emoji-fonts</packagereq>
+      <packagereq type="optional">google-noto-fonts-all</packagereq>
       <packagereq type="optional">lato-fonts</packagereq>
-      <packagereq type="optional">lohit-gurmukhi-fonts</packagereq>
-      <packagereq type="optional">lohit-marathi-fonts</packagereq>
-      <packagereq type="optional">madan-fonts</packagereq>
-      <packagereq type="optional">navilu-fonts</packagereq>
       <packagereq type="optional">open-sans-fonts</packagereq>
       <packagereq type="optional">overpass-fonts</packagereq>
-      <packagereq type="optional">paktype-naqsh-fonts</packagereq>
-      <packagereq type="optional">paktype-tehreer-fonts</packagereq>
       <packagereq type="optional">paratype-pt-sans-caption-fonts</packagereq>
-      <packagereq type="optional">saab-fonts</packagereq>
-      <packagereq type="optional">sil-scheherazade-fonts</packagereq>
-      <packagereq type="optional">smc-rachana-fonts</packagereq>
-      <packagereq type="optional">thai-scalable-garuda-fonts</packagereq>
-      <packagereq type="optional">thai-scalable-kinnari-fonts</packagereq>
-      <packagereq type="optional">thai-scalable-loma-fonts</packagereq>
-      <packagereq type="optional">thai-scalable-norasi-fonts</packagereq>
-      <packagereq type="optional">thai-scalable-purisa-fonts</packagereq>
-      <packagereq type="optional">thai-scalable-sawasdee-fonts</packagereq>
-      <packagereq type="optional">thai-scalable-tlwgmono-fonts</packagereq>
-      <packagereq type="optional">thai-scalable-tlwgtypewriter-fonts</packagereq>
-      <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">xorg-x11-fonts-100dpi</packagereq>
       <packagereq type="optional">xorg-x11-fonts-75dpi</packagereq>
       <packagereq type="optional">xorg-x11-fonts-ISO8859-1-100dpi</packagereq>
diff --git a/comps/AppStream-x86_64.xml b/comps/AppStream-x86_64.xml
index 05e312e..35dbdcc 100644
--- a/comps/AppStream-x86_64.xml
+++ b/comps/AppStream-x86_64.xml
@@ -357,143 +357,36 @@
     <default>true</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="default">abattis-cantarell-fonts</packagereq>
-      <packagereq type="default">google-noto-emoji-color-fonts</packagereq>
-      <packagereq type="default">google-noto-sans-cjk-ttc-fonts</packagereq>
-      <packagereq type="default">google-noto-sans-gurmukhi-fonts</packagereq>
-      <packagereq type="default">google-noto-sans-sinhala-vf-fonts</packagereq>
-      <packagereq type="default">google-noto-serif-cjk-ttc-fonts</packagereq>
-      <packagereq type="default">jomolhari-fonts</packagereq>
+      <packagereq type="default">default-fonts-cjk-mono</packagereq>
+      <packagereq type="default">default-fonts-cjk-sans</packagereq>
+      <packagereq type="default">default-fonts-cjk-serif</packagereq>
+      <packagereq type="default">default-fonts-core-emoji</packagereq>
+      <packagereq type="default">default-fonts-core-math</packagereq>
+      <packagereq type="default">default-fonts-other-mono</packagereq>
+      <packagereq type="default">default-fonts-other-sans</packagereq>
+      <packagereq type="default">default-fonts-other-serif</packagereq>
+      <packagereq type="default">dejavu-sans-fonts</packagereq>
+      <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
+      <packagereq type="default">dejavu-serif-fonts</packagereq>
       <packagereq type="default">julietaula-montserrat-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>
-      <packagereq type="default">lohit-assamese-fonts</packagereq>
-      <packagereq type="default">lohit-bengali-fonts</packagereq>
-      <packagereq type="default">lohit-devanagari-fonts</packagereq>
-      <packagereq type="default">lohit-gujarati-fonts</packagereq>
-      <packagereq type="default">lohit-kannada-fonts</packagereq>
-      <packagereq type="default">lohit-odia-fonts</packagereq>
-      <packagereq type="default">lohit-tamil-fonts</packagereq>
-      <packagereq type="default">lohit-telugu-fonts</packagereq>
-      <packagereq type="default">paktype-naskh-basic-fonts</packagereq>
       <packagereq type="default">pt-sans-fonts</packagereq>
-      <packagereq type="default">sil-abyssinica-fonts</packagereq>
-      <packagereq type="default">sil-nuosu-fonts</packagereq>
-      <packagereq type="default">sil-padauk-fonts</packagereq>
-      <packagereq type="default">smc-meera-fonts</packagereq>
-      <packagereq type="default">stix-fonts</packagereq>
-      <packagereq type="default">thai-scalable-waree-fonts</packagereq>
+      <packagereq type="default">redhat-display-vf-fonts</packagereq>
+      <packagereq type="default">redhat-mono-vf-fonts</packagereq>
+      <packagereq type="default">redhat-text-vf-fonts</packagereq>
       <packagereq type="optional">fontawesome-fonts</packagereq>
+      <packagereq type="optional">google-arimo-fonts</packagereq>
+      <packagereq type="optional">google-carlito-fonts</packagereq>
+      <packagereq type="optional">google-cousine-fonts</packagereq>
+      <packagereq type="optional">google-crosextra-caladea-fonts</packagereq>
       <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-sans-armenian-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-avestan-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-bengali-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-bengali-ui-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-brahmi-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-carian-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-cherokee-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-coptic-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-deseret-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-devanagari-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-devanagari-ui-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-egyptian-hieroglyphs-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-ethiopic-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-georgian-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-glagolitic-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-hebrew-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-imperial-aramaic-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-kaithi-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-kannada-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-kannada-ui-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-kayah-li-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-kharoshthi-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-khmer-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-khmer-ui-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-lao-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-lao-ui-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-malayalam-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-malayalam-ui-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-nko-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-osmanya-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-phoenician-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-shavian-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-sinhala-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-symbols-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-tamil-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-tamil-ui-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-thaana-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-thai-fonts</packagereq>
-      <packagereq type="optional">google-noto-sans-thai-ui-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-serif-armenian-fonts</packagereq>
-      <packagereq type="optional">google-noto-serif-fonts</packagereq>
-      <packagereq type="optional">google-noto-serif-georgian-fonts</packagereq>
-      <packagereq type="optional">google-noto-serif-khmer-fonts</packagereq>
-      <packagereq type="optional">google-noto-serif-lao-fonts</packagereq>
-      <packagereq type="optional">google-noto-serif-thai-fonts</packagereq>
-      <packagereq type="optional">gubbi-fonts</packagereq>
-      <packagereq type="optional">kacst-art-fonts</packagereq>
-      <packagereq type="optional">kacst-book-fonts</packagereq>
-      <packagereq type="optional">kacst-decorative-fonts</packagereq>
-      <packagereq type="optional">kacst-digital-fonts</packagereq>
-      <packagereq type="optional">kacst-farsi-fonts</packagereq>
-      <packagereq type="optional">kacst-letter-fonts</packagereq>
-      <packagereq type="optional">kacst-naskh-fonts</packagereq>
-      <packagereq type="optional">kacst-office-fonts</packagereq>
-      <packagereq type="optional">kacst-one-fonts</packagereq>
-      <packagereq type="optional">kacst-pen-fonts</packagereq>
-      <packagereq type="optional">kacst-poster-fonts</packagereq>
-      <packagereq type="optional">kacst-qurn-fonts</packagereq>
-      <packagereq type="optional">kacst-screen-fonts</packagereq>
-      <packagereq type="optional">kacst-title-fonts</packagereq>
-      <packagereq type="optional">kacst-titlel-fonts</packagereq>
-      <packagereq type="optional">khmer-os-battambang-fonts</packagereq>
-      <packagereq type="optional">khmer-os-bokor-fonts</packagereq>
-      <packagereq type="optional">khmer-os-content-fonts</packagereq>
-      <packagereq type="optional">khmer-os-fasthand-fonts</packagereq>
-      <packagereq type="optional">khmer-os-freehand-fonts</packagereq>
-      <packagereq type="optional">khmer-os-handwritten-fonts</packagereq>
-      <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">google-noto-emoji-fonts</packagereq>
+      <packagereq type="optional">google-noto-fonts-all</packagereq>
       <packagereq type="optional">lato-fonts</packagereq>
-      <packagereq type="optional">lohit-gurmukhi-fonts</packagereq>
-      <packagereq type="optional">lohit-marathi-fonts</packagereq>
-      <packagereq type="optional">madan-fonts</packagereq>
-      <packagereq type="optional">navilu-fonts</packagereq>
       <packagereq type="optional">open-sans-fonts</packagereq>
       <packagereq type="optional">overpass-fonts</packagereq>
-      <packagereq type="optional">paktype-naqsh-fonts</packagereq>
-      <packagereq type="optional">paktype-tehreer-fonts</packagereq>
       <packagereq type="optional">paratype-pt-sans-caption-fonts</packagereq>
-      <packagereq type="optional">saab-fonts</packagereq>
-      <packagereq type="optional">sil-scheherazade-fonts</packagereq>
-      <packagereq type="optional">smc-rachana-fonts</packagereq>
-      <packagereq type="optional">thai-scalable-garuda-fonts</packagereq>
-      <packagereq type="optional">thai-scalable-kinnari-fonts</packagereq>
-      <packagereq type="optional">thai-scalable-loma-fonts</packagereq>
-      <packagereq type="optional">thai-scalable-norasi-fonts</packagereq>
-      <packagereq type="optional">thai-scalable-purisa-fonts</packagereq>
-      <packagereq type="optional">thai-scalable-sawasdee-fonts</packagereq>
-      <packagereq type="optional">thai-scalable-tlwgmono-fonts</packagereq>
-      <packagereq type="optional">thai-scalable-tlwgtypewriter-fonts</packagereq>
-      <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">xorg-x11-fonts-100dpi</packagereq>
       <packagereq type="optional">xorg-x11-fonts-75dpi</packagereq>
       <packagereq type="optional">xorg-x11-fonts-ISO8859-1-100dpi</packagereq>
diff --git a/comps/BaseOS-aarch64.xml b/comps/BaseOS-aarch64.xml
index a0408e1..a2f299e 100644
--- a/comps/BaseOS-aarch64.xml
+++ b/comps/BaseOS-aarch64.xml
@@ -266,9 +266,9 @@
     <default>true</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="default">dejavu-sans-fonts</packagereq>
-      <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
-      <packagereq type="default">dejavu-serif-fonts</packagereq>
+      <packagereq type="default">default-fonts-core-mono</packagereq>
+      <packagereq type="default">default-fonts-core-sans</packagereq>
+      <packagereq type="default">default-fonts-core-serif</packagereq>
     </packagelist>
   </group>
   <group>
diff --git a/comps/BaseOS-ppc64le.xml b/comps/BaseOS-ppc64le.xml
index 5455db0..c66ee45 100644
--- a/comps/BaseOS-ppc64le.xml
+++ b/comps/BaseOS-ppc64le.xml
@@ -268,9 +268,9 @@
     <default>true</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="default">dejavu-sans-fonts</packagereq>
-      <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
-      <packagereq type="default">dejavu-serif-fonts</packagereq>
+      <packagereq type="default">default-fonts-core-mono</packagereq>
+      <packagereq type="default">default-fonts-core-sans</packagereq>
+      <packagereq type="default">default-fonts-core-serif</packagereq>
     </packagelist>
   </group>
   <group>
diff --git a/comps/BaseOS-s390x.xml b/comps/BaseOS-s390x.xml
index 1ee3251..18ab3dc 100644
--- a/comps/BaseOS-s390x.xml
+++ b/comps/BaseOS-s390x.xml
@@ -260,9 +260,9 @@
     <default>true</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="default">dejavu-sans-fonts</packagereq>
-      <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
-      <packagereq type="default">dejavu-serif-fonts</packagereq>
+      <packagereq type="default">default-fonts-core-mono</packagereq>
+      <packagereq type="default">default-fonts-core-sans</packagereq>
+      <packagereq type="default">default-fonts-core-serif</packagereq>
     </packagelist>
   </group>
   <group>
diff --git a/comps/BaseOS-x86_64.xml b/comps/BaseOS-x86_64.xml
index 59f8103..b2cb8ae 100644
--- a/comps/BaseOS-x86_64.xml
+++ b/comps/BaseOS-x86_64.xml
@@ -286,9 +286,9 @@
     <default>true</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="default">dejavu-sans-fonts</packagereq>
-      <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
-      <packagereq type="default">dejavu-serif-fonts</packagereq>
+      <packagereq type="default">default-fonts-core-mono</packagereq>
+      <packagereq type="default">default-fonts-core-sans</packagereq>
+      <packagereq type="default">default-fonts-core-serif</packagereq>
     </packagelist>
   </group>
   <group>