diff --git a/conf/comps-qubes.xml b/conf/comps-qubes.xml
index 3c1a886..040e814 100644
--- a/conf/comps-qubes.xml
+++ b/conf/comps-qubes.xml
@@ -161,7 +161,6 @@
       <packagereq type="mandatory">audit</packagereq>
       <packagereq type="mandatory">basesystem</packagereq>
       <packagereq type="mandatory">bash</packagereq>
-      <packagereq type="mandatory">biosdevname</packagereq>
       <packagereq type="mandatory">coreutils</packagereq>
       <packagereq type="mandatory">cronie</packagereq>
       <packagereq type="mandatory">curl</packagereq>
@@ -169,6 +168,7 @@
       <packagereq type="mandatory">e2fsprogs</packagereq>
       <packagereq type="mandatory">filesystem</packagereq>
       <packagereq type="mandatory">glibc</packagereq>
+      <packagereq type="mandatory">grubby</packagereq>
       <packagereq type="mandatory">hostname</packagereq>
       <packagereq type="mandatory">initscripts</packagereq>
       <packagereq type="mandatory">iproute</packagereq>
@@ -309,6 +309,7 @@
     <name xml:lang="en_GB">Fonts</name>
     <name xml:lang="es">Fuentes</name>
     <name xml:lang="et">Kirjatüübid (fondid)</name>
+    <name xml:lang="eu">Letra-tipoak</name>
     <name xml:lang="fa">قلم ها</name>
     <name xml:lang="fi">Kirjasimet</name>
     <name xml:lang="fr">Polices de caractères</name>
@@ -317,6 +318,7 @@
     <name xml:lang="he">גופנים</name>
     <name xml:lang="hi">फ़ॉन्ट</name>
     <name xml:lang="hu">Betűkészletek</name>
+    <name xml:lang="ia">Characteres</name>
     <name xml:lang="id">Huruf</name>
     <name xml:lang="is">Letur</name>
     <name xml:lang="it">Caratteri</name>
@@ -366,6 +368,7 @@
     <description xml:lang="en_GB">Fonts packages for rendering text on the desktop.</description>
     <description xml:lang="es">Paquete de fuentes para renderizar texto en el escritorio</description>
     <description xml:lang="et">Töölaual kasutatavad kirjatüübid</description>
+    <description xml:lang="eu">Letra-tipo paketeak testua mahaigainean errendatzeko.</description>
     <description xml:lang="fa">بسته‌های قلم برای نمایش متن بر روی میزکار</description>
     <description xml:lang="fi">Kirjasinpaketteja tekstin piirtämiseen työpöydällä.</description>
     <description xml:lang="fr">Paquets de polices de caractères pour afficher du texte sur le bureau.</description>
@@ -373,6 +376,7 @@
     <description xml:lang="he">חבילות גופנים עבור שולחן העבודה.</description>
     <description xml:lang="hi">डेस्कटॉप पर पाठ रेंडर करने के लिए फ़ॉन्ट संकुल</description>
     <description xml:lang="hu">Betűkészlet csomagok szöveg megjelenítéséhez az asztalon.</description>
+    <description xml:lang="ia">Pacchettos de characteres pro render texto sur le scriptorio.</description>
     <description xml:lang="id">Paket huruf untuk merender teks di desktop.</description>
     <description xml:lang="is">Leturpakkar til birtingar texta áí skjáborðinu.</description>
     <description xml:lang="it">Pacchetti di caratteri per la rappresentazione di testo sul desktop.</description>
@@ -403,18 +407,25 @@
     <description xml:lang="th">แพคเกจแบบอักษรสำหรับวาดข้อความบนพื้นโต๊ะ</description>
     <description xml:lang="uk">Пакунки шрифтів для виводу тексту на екрані.</description>
     <description xml:lang="zh_CN">用于渲染桌面上文字的字体软件包。</description>
-    <description xml:lang="zh_TW">在桌面上繪製文字的字型套件。</description>
+    <description xml:lang="zh_TW">在桌面上繪製文字的字型軟體包。</description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="default">abattis-cantarell-fonts</packagereq>
-      <packagereq type="default">cjkuni-uming-fonts</packagereq>
+      <packagereq type="default">adobe-source-han-sans-cn-fonts</packagereq>
+      <packagereq type="default">adobe-source-han-sans-twhk-fonts</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">gnu-free-mono-fonts</packagereq>
       <packagereq type="default">gnu-free-sans-fonts</packagereq>
       <packagereq type="default">gnu-free-serif-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-lisu-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-mandaic-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-meeteimayek-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-tagalog-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-tai-tham-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-tai-viet-fonts</packagereq>
       <packagereq type="default">jomolhari-fonts</packagereq>
       <packagereq type="default">khmeros-base-fonts</packagereq>
       <packagereq type="default">liberation-mono-fonts</packagereq>
@@ -425,22 +436,23 @@
       <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-gurmukhi-fonts</packagereq>
       <packagereq type="default">lohit-kannada-fonts</packagereq>
-      <packagereq type="default">lohit-oriya-fonts</packagereq>
-      <packagereq type="default">lohit-punjabi-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">nhn-nanum-gothic-fonts</packagereq>
-      <packagereq type="default">paktype-naqsh-fonts</packagereq>
+      <packagereq type="default">naver-nanum-gothic-fonts</packagereq>
+      <packagereq type="default">paktype-naskh-basic-fonts</packagereq>
       <packagereq type="default">paratype-pt-sans-fonts</packagereq>
       <packagereq type="default">sil-abyssinica-fonts</packagereq>
+      <packagereq type="default">sil-mingzat-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">tabish-eeyek-fonts</packagereq>
       <packagereq type="default">thai-scalable-waree-fonts</packagereq>
       <packagereq type="default">vlgothic-fonts</packagereq>
-      <packagereq type="default">wqy-zenhei-fonts</packagereq>
       <packagereq type="optional">aajohan-comfortaa-fonts</packagereq>
       <packagereq type="optional">adf-accanthis-2-fonts</packagereq>
       <packagereq type="optional">adf-accanthis-3-fonts</packagereq>
@@ -454,7 +466,6 @@
       <packagereq type="optional">apa-new-athena-unicode-fonts</packagereq>
       <packagereq type="optional">apanov-edrip-fonts</packagereq>
       <packagereq type="optional">apanov-heuristica-fonts</packagereq>
-      <packagereq type="optional">aplus-fsf-KAPL-fonts</packagereq>
       <packagereq type="optional">baekmuk-ttf-batang-fonts</packagereq>
       <packagereq type="optional">baekmuk-ttf-dotum-fonts</packagereq>
       <packagereq type="optional">baekmuk-ttf-gulim-fonts</packagereq>
@@ -481,12 +492,14 @@
       <packagereq type="optional">bpg-sans-regular-fonts</packagereq>
       <packagereq type="optional">bpg-serif-fonts</packagereq>
       <packagereq type="optional">bpg-serif-modern-fonts</packagereq>
+      <packagereq type="optional">campivisivi-titillium-fonts</packagereq>
       <packagereq type="optional">cave9-mutante-fonts</packagereq>
       <packagereq type="optional">cf-bonveno-fonts</packagereq>
       <packagereq type="optional">cf-sorts-mill-goudy-fonts</packagereq>
       <packagereq type="optional">chisholm-letterslaughing-fonts</packagereq>
       <packagereq type="optional">chisholm-to-be-continued-fonts</packagereq>
       <packagereq type="optional">cjkuni-ukai-fonts</packagereq>
+      <packagereq type="optional">cjkuni-uming-fonts</packagereq>
       <packagereq type="optional">conakry-fonts</packagereq>
       <packagereq type="optional">ctan-cm-lgc-roman-fonts</packagereq>
       <packagereq type="optional">ctan-cm-lgc-sans-fonts</packagereq>
@@ -511,6 +524,7 @@
       <packagereq type="optional">ecolier-court-lignes-fonts</packagereq>
       <packagereq type="optional">extremetuxracer-papercuts-fonts</packagereq>
       <packagereq type="optional">extremetuxracer-papercuts-outline-fonts</packagereq>
+      <packagereq type="optional">fontawesome-fonts</packagereq>
       <packagereq type="optional">freecol-imperator-fonts</packagereq>
       <packagereq type="optional">freecol-shadowedblack-fonts</packagereq>
       <packagereq type="optional">gargi-fonts</packagereq>
@@ -553,6 +567,62 @@
       <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-hanunno-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-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-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-ui-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">grimmer-proggy-tinysz-fonts</packagereq>
       <packagereq type="optional">gubbi-fonts</packagereq>
       <packagereq type="optional">hanazono-fonts</packagereq>
@@ -615,6 +685,7 @@
       <packagereq type="optional">motoya-lcedar-fonts</packagereq>
       <packagereq type="optional">motoya-lmaru-fonts</packagereq>
       <packagereq type="optional">moyogo-molengo-fonts</packagereq>
+      <packagereq type="optional">mph-2b-damase-fonts</packagereq>
       <packagereq type="optional">mplus-1c-fonts</packagereq>
       <packagereq type="optional">mplus-1m-fonts</packagereq>
       <packagereq type="optional">mplus-1mn-fonts</packagereq>
@@ -633,10 +704,11 @@
       <packagereq type="optional">nafees-tehreer-naskh-fonts</packagereq>
       <packagereq type="optional">nafees-web-naskh-fonts</packagereq>
       <packagereq type="optional">navilu-fonts</packagereq>
-      <packagereq type="optional">nhn-nanum-brush-fonts</packagereq>
+      <packagereq type="optional">naver-nanum-barun-gothic-fonts</packagereq>
+      <packagereq type="optional">naver-nanum-brush-fonts</packagereq>
       <packagereq type="optional">nhn-nanum-gothic-coding-fonts</packagereq>
-      <packagereq type="optional">nhn-nanum-myeongjo-fonts</packagereq>
-      <packagereq type="optional">nhn-nanum-pen-fonts</packagereq>
+      <packagereq type="optional">naver-nanum-myeongjo-fonts</packagereq>
+      <packagereq type="optional">naver-nanum-pen-fonts</packagereq>
       <packagereq type="optional">ns-bola-fonts</packagereq>
       <packagereq type="optional">ns-tiza-chalk-fonts</packagereq>
       <packagereq type="optional">oflb-asana-math-fonts</packagereq>
@@ -650,11 +722,15 @@
       <packagereq type="optional">oflb-smonohand-fonts</packagereq>
       <packagereq type="optional">oflb-sportrop-fonts</packagereq>
       <packagereq type="optional">oldstandard-sfd-fonts</packagereq>
+      <packagereq type="optional">open-sans-fonts</packagereq>
       <packagereq type="optional">pagul-fonts</packagereq>
       <packagereq type="optional">paktype-ajrak-fonts</packagereq>
-      <packagereq type="optional">paktype-naskh-basic-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">paratype-pt-serif-fonts</packagereq>
+      <packagereq type="optional">paratype-pt-serif-caption-fonts</packagereq>
+      <packagereq type="optional">paratype-pt-mono-fonts</packagereq>
       <packagereq type="optional">pothana2000-fonts</packagereq>
       <packagereq type="optional">saab-fonts</packagereq>
       <packagereq type="optional">samyak-devanagari-fonts</packagereq>
@@ -686,7 +762,6 @@
       <packagereq type="optional">sil-gentium-basic-fonts</packagereq>
       <packagereq type="optional">sil-gentium-fonts</packagereq>
       <packagereq type="optional">sil-lateef-fonts</packagereq>
-      <packagereq type="optional">sil-nuosu-fonts</packagereq>
       <packagereq type="optional">sil-scheherazade-fonts</packagereq>
       <packagereq type="optional">silkscreen-expanded-fonts</packagereq>
       <packagereq type="optional">silkscreen-fonts</packagereq>
@@ -699,7 +774,6 @@
       <packagereq type="optional">smc-raghumalayalam-fonts</packagereq>
       <packagereq type="optional">smc-suruma-fonts</packagereq>
       <packagereq type="optional">stix-math-fonts</packagereq>
-      <packagereq type="optional">tabish-eeyek-fonts</packagereq>
       <packagereq type="optional">tangerine-fonts</packagereq>
       <packagereq type="optional">thai-arundina-sans-fonts</packagereq>
       <packagereq type="optional">thai-arundina-sans-mono-fonts</packagereq>
@@ -732,6 +806,7 @@
       <packagereq type="optional">tlomt-league-gothic-fonts</packagereq>
       <packagereq type="optional">tlomt-orbitron-fonts</packagereq>
       <packagereq type="optional">tlomt-sniglet-fonts</packagereq>
+      <packagereq type="optional">trabajo-fonts</packagereq>
       <packagereq type="optional">tulrich-tuffy-fonts</packagereq>
       <packagereq type="optional">typemade-josefinsansstd-light-fonts</packagereq>
       <packagereq type="optional">ubuntu-title-fonts</packagereq>
@@ -763,6 +838,7 @@
       <packagereq type="optional">woodardworks-laconic-fonts</packagereq>
       <packagereq type="optional">woodardworks-laconic-shadow-fonts</packagereq>
       <packagereq type="optional">wqy-microhei-fonts</packagereq>
+      <packagereq type="optional">wqy-zenhei-fonts</packagereq>
       <packagereq type="optional">xorg-x11-fonts-ethiopic</packagereq>
       <packagereq type="optional">yanone-kaffeesatz-fonts</packagereq>
       <packagereq type="optional">yanone-tagesschrift-fonts</packagereq>
@@ -900,6 +976,7 @@
       <packagereq type="default">usb_modeswitch</packagereq>
       <packagereq type="optional">acpi</packagereq>
       <packagereq type="optional">acpitool</packagereq>
+      <packagereq type="optional">alsa-firmware</packagereq>
       <packagereq type="optional">cmospwd</packagereq>
       <packagereq type="optional">firmware-addon-dell</packagereq>
       <packagereq type="optional">hddtemp</packagereq>