diff --git a/conf/comps-qubes.xml b/conf/comps-qubes.xml
index 0b94153..54efd84 100644
--- a/conf/comps-qubes.xml
+++ b/conf/comps-qubes.xml
@@ -281,15 +281,12 @@
       <packagereq>xfce4-genmon-plugin</packagereq>
       <packagereq>xfce4-mailwatch-plugin</packagereq>
       <packagereq>xfce4-mount-plugin</packagereq>
-      <packagereq>xfce4-netload-plugin</packagereq>
       <packagereq>xfce4-sensors-plugin</packagereq>
-      <packagereq>xfce4-smartbookmark-plugin</packagereq>
       <packagereq>xfce4-systemload-plugin</packagereq>
       <packagereq>xfce4-taskmanager</packagereq>
       <packagereq>xfce4-time-out-plugin</packagereq>
       <packagereq>xfce4-timer-plugin</packagereq>
       <packagereq>xfce4-verve-plugin</packagereq>
-      <packagereq>xfce4-weather-plugin</packagereq>
       <packagereq>xfce4-websearch-plugin</packagereq>
       <packagereq>xfce4-xkb-plugin</packagereq>
     </packagelist>
@@ -789,6 +786,7 @@
     <name xml:lang="en_GB">Hardware Support</name>
     <name xml:lang="es">Soporte para Hardware</name>
     <name xml:lang="et">Riistvara tugi</name>
+    <name xml:lang="eu">Hardware euskarria</name>
     <name xml:lang="fa">پشتیبانی سخت‌افزاری</name>
     <name xml:lang="fi">Laitteistotuki</name>
     <name xml:lang="fr">Prise en charge du matériel</name>
@@ -798,6 +796,7 @@
     <name xml:lang="hi">हार्डवेयर समर्थन</name>
     <name xml:lang="hr">Hardverska podrška</name>
     <name xml:lang="hu">Hardvertámogatás</name>
+    <name xml:lang="ia">Supporto de hardware</name>
     <name xml:lang="id">Dukungan Perangkat Keras</name>
     <name xml:lang="is">Vélbúnaðarstuðningur</name>
     <name xml:lang="it">Supporto hardware</name>
@@ -860,6 +859,7 @@
     <description xml:lang="hi">यह समूह विविध हार्डवेयर विशिष्ट उपयोगिता के लिये औज़ारों का समूह है.</description>
     <description xml:lang="hr">Ova grupa je kolekcija alata i namijenjenih određenom hardveru.</description>
     <description xml:lang="hu">E csoport különböző hardverspecifikus segédprogramokhoz való eszközök gyűjteménye.</description>
+    <description xml:lang="ia">Iste gruppo es un collection de diverse utensiles de hardware.</description>
     <description xml:lang="id">Kelompok ini adalah koleksi alat bantu untuk beragam utilitas perangkat keras tertentu.</description>
     <description xml:lang="is">Þessi pakkahópur inniheldur ýmis vélbúnaðartól.</description>
     <description xml:lang="it">Questo gruppo contiene strumenti specifici per vari componenti hardware.</description>
@@ -911,6 +911,7 @@
       <packagereq type="default">iwl1000-firmware</packagereq>
       <packagereq type="default">iwl2000-firmware</packagereq>
       <packagereq type="default">iwl2030-firmware</packagereq>
+      <packagereq type="default">iwl3160-firmware</packagereq>
       <packagereq type="default">iwl3945-firmware</packagereq>
       <packagereq type="default">iwl4965-firmware</packagereq>
       <packagereq type="default">iwl5000-firmware</packagereq>
@@ -919,14 +920,11 @@
       <packagereq type="default">iwl6000g2a-firmware</packagereq>
       <packagereq type="default">iwl6000g2b-firmware</packagereq>
       <packagereq type="default">iwl6050-firmware</packagereq>
+      <packagereq type="default">iwl7260-firmware</packagereq>
       <packagereq type="default">libertas-usb8388-firmware</packagereq>
       <packagereq type="default">ql2100-firmware</packagereq>
       <packagereq type="default">ql2200-firmware</packagereq>
       <packagereq type="default">ql23xx-firmware</packagereq>
-      <packagereq type="default">ql2400-firmware</packagereq>
-      <packagereq type="default">ql2500-firmware</packagereq>
-      <packagereq type="default">rt61pci-firmware</packagereq>
-      <packagereq type="default">rt73usb-firmware</packagereq>
       <packagereq type="default">usb_modeswitch</packagereq>
       <packagereq type="default">zd1211-firmware</packagereq>
       <packagereq type="optional">acpi</packagereq>
@@ -948,19 +946,30 @@
       <packagereq type="optional">opensc</packagereq>
       <packagereq type="optional">pcsc-lite</packagereq>
       <packagereq type="optional">pcsc-lite-ccid</packagereq>
-      <packagereq type="optional">s3switch</packagereq>
     </packagelist>
   </group>
   <group>
     <id>anaconda-tools</id>
     <name>Anaconda tools</name>
+    <name xml:lang="cs">Nástroje Anaconda</name>
     <name xml:lang="de">Anaconda-Werkzeuge</name>
+    <name xml:lang="en_GB">Anaconda tools</name>
+    <name xml:lang="es">Herramientas Anaconda</name>
+    <name xml:lang="fi">Anaconda-työkalut</name>
+    <name xml:lang="fr">Outils Anaconda</name>
     <name xml:lang="hu">Anaconda eszközök</name>
+    <name xml:lang="ia">Instrumentos de Anaconda</name>
+    <name xml:lang="it">Strumenti di Anaconda</name>
     <name xml:lang="ja">Anaconda ツール</name>
     <name xml:lang="nb">Anaconda-verktøy</name>
     <name xml:lang="nl">Anaconda gereedschappen</name>
+    <name xml:lang="pa">ਐਨਾਕੌਂਡਾ ਟੂਲ</name>
     <name xml:lang="pl">Narzędzia dla instalatora Anaconda</name>
+    <name xml:lang="pt_BR">Ferramentas do Anaconda</name>
+    <name xml:lang="ru">Средства anaconda</name>
+    <name xml:lang="te">అనకొండా టూల్స్</name>
     <name xml:lang="uk">Засоби Anaconda</name>
+    <name xml:lang="zh_CN">Anaconda 工具</name>
     <name xml:lang="zh_TW">Anaconda 工具</name>
     <description/>
     <default>false</default>
@@ -968,17 +977,17 @@
     <packagelist>
       <packagereq>authconfig</packagereq>
       <packagereq>btrfs-progs</packagereq>
-      <packagereq>chkconfig</packagereq>
       <packagereq>cryptsetup</packagereq>
       <packagereq>dmraid</packagereq>
       <packagereq>dosfstools</packagereq>
       <packagereq>dracut-network</packagereq>
       <packagereq>e2fsprogs</packagereq>
       <packagereq>efibootmgr</packagereq>
+      <packagereq>fcoe-utils</packagereq>
       <packagereq>firewalld</packagereq>
       <packagereq>gfs2-utils</packagereq>
-      <packagereq>grub2</packagereq>
       <packagereq>grub2-efi</packagereq>
+      <packagereq>grub2</packagereq>
       <packagereq>hfsplus-tools</packagereq>
       <packagereq>iscsi-initiator-utils</packagereq>
       <packagereq>lvm2</packagereq>
@@ -987,6 +996,7 @@
       <packagereq>ntfsprogs</packagereq>
       <packagereq>reiserfs-utils</packagereq>
       <packagereq>shim</packagereq>
+      <packagereq>syslinux-extlinux</packagereq>
       <packagereq>system-config-firewall-base</packagereq>
       <packagereq>tboot</packagereq>
       <packagereq>uboot-tools</packagereq>
@@ -1060,11 +1070,11 @@
       <packagereq>gtk-xfce-engine</packagereq>
       <packagereq>gvfs</packagereq>
       <packagereq>openssh-askpass</packagereq>
-      <packagereq>Terminal</packagereq>
       <packagereq>xfce4-about</packagereq>
       <packagereq>xfce4-appfinder</packagereq>
       <packagereq>xfce4-power-manager</packagereq>
       <packagereq>xfce4-session-engines</packagereq>
+      <packagereq>xfce4-terminal</packagereq>
       <packagereq>xfwm4-theme-nodoka</packagereq>
       <packagereq>xscreensaver-base</packagereq>
       <packagereq>ConsoleKit-x11</packagereq>