From 4d30b41c1d130fa7303393b5f474d32e1f967a45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Tue, 23 May 2017 02:04:23 +0200
Subject: [PATCH] comps: sort groups

Sort groups by id, and also sort packages inside groups. This will make
diffs more readable, especially when syncing with upstream.
---
 conf/comps-qubes.xml | 441 +++++++++++++++++++++----------------------
 1 file changed, 220 insertions(+), 221 deletions(-)

diff --git a/conf/comps-qubes.xml b/conf/comps-qubes.xml
index a0b556e..f264e56 100644
--- a/conf/comps-qubes.xml
+++ b/conf/comps-qubes.xml
@@ -1,6 +1,141 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
 <comps>
+  <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>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>authconfig</packagereq>
+      <packagereq>btrfs-progs</packagereq>
+      <packagereq>cryptsetup</packagereq>
+      <packagereq>dmraid</packagereq>
+      <packagereq>dosfstools</packagereq>
+      <packagereq>dracut-live</packagereq>
+      <packagereq>dracut-network</packagereq>
+      <packagereq>e2fsprogs</packagereq>
+      <packagereq>efibootmgr</packagereq>
+      <packagereq>fcoe-utils</packagereq>
+      <packagereq>firewalld</packagereq>
+      <packagereq>gfs2-utils</packagereq>
+      <packagereq>grub2-efi</packagereq>
+      <packagereq>grub2-starfield-theme</packagereq>
+      <packagereq>grub2</packagereq>
+      <packagereq>hfsplus-tools</packagereq>
+      <packagereq>iscsi-initiator-utils</packagereq>
+      <packagereq>lvm2</packagereq>
+      <packagereq>mactel-boot</packagereq>
+      <packagereq>mdadm</packagereq>
+      <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>
+      <packagereq>xfsprogs</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>base</id>
+    <name>Base</name>
+    <default>true</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">at</packagereq>
+      <packagereq type="mandatory">authconfig</packagereq>
+      <packagereq type="mandatory">bzip2</packagereq>
+      <packagereq type="mandatory">cronie</packagereq>
+      <packagereq type="mandatory">dbus</packagereq>
+      <packagereq type="mandatory">diffutils</packagereq>
+      <packagereq type="mandatory">dmraid</packagereq>
+      <packagereq type="mandatory">dump</packagereq>
+      <packagereq type="mandatory">ed</packagereq>
+      <packagereq type="mandatory">gnupg2</packagereq>
+      <packagereq type="mandatory">grub2-starfield-theme</packagereq>
+      <packagereq type="mandatory">irqbalance</packagereq>
+      <packagereq type="mandatory">linux-firmware</packagereq>
+      <packagereq type="mandatory">logrotate</packagereq>
+      <packagereq type="mandatory">lsof</packagereq>
+      <packagereq type="mandatory">man-db</packagereq>
+      <packagereq type="mandatory">man-pages</packagereq>
+      <packagereq type="mandatory">mcelog</packagereq>
+      <packagereq type="mandatory">mdadm</packagereq>
+      <packagereq type="mandatory">microcode_ctl</packagereq>
+      <packagereq type="mandatory">mlocate</packagereq>
+      <packagereq type="mandatory">nano</packagereq>
+      <packagereq type="mandatory">ntsysv</packagereq>
+      <packagereq type="mandatory">numactl</packagereq>
+      <packagereq type="mandatory">parted</packagereq>
+      <packagereq type="mandatory">pciutils</packagereq>
+      <packagereq type="mandatory">pcmciautils</packagereq>
+      <packagereq type="mandatory">perf</packagereq>
+      <packagereq type="mandatory">pinfo</packagereq>
+      <packagereq type="mandatory">qubes-anaconda-addon</packagereq>
+      <packagereq type="mandatory">qubes-release-notes</packagereq>
+      <packagereq type="mandatory">qubes-release</packagereq>
+      <packagereq type="mandatory">quota</packagereq>
+      <packagereq type="mandatory">rsyslog</packagereq>
+      <packagereq type="mandatory">smartmontools</packagereq>
+      <packagereq type="mandatory">sudo</packagereq>
+      <packagereq type="mandatory">symlinks</packagereq>
+      <packagereq type="mandatory">systemd</packagereq>
+      <packagereq type="mandatory">tar</packagereq>
+      <packagereq type="mandatory">time</packagereq>
+      <packagereq type="mandatory">tmpwatch</packagereq>
+      <packagereq type="mandatory">tree</packagereq>
+      <packagereq type="mandatory">unzip</packagereq>
+      <packagereq type="mandatory">usbutils</packagereq>
+      <packagereq type="mandatory">util-linux</packagereq>
+      <packagereq type="mandatory">vim-enhanced</packagereq>
+      <packagereq type="mandatory">which</packagereq>
+      <packagereq type="mandatory">yum-utils</packagereq>
+      <packagereq type="mandatory">zip</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>base-x</id>
+    <name>X Window System</name>
+    <default>true</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">desktop-backgrounds-basic</packagereq>
+      <packagereq type="mandatory">glx-utils</packagereq>
+      <packagereq type="mandatory">gnome-packagekit</packagereq>
+      <packagereq type="mandatory">initial-setup-gui</packagereq>
+      <packagereq type="mandatory">initial-setup</packagereq>
+      <packagereq type="mandatory">mesa-dri-drivers</packagereq>
+      <packagereq type="mandatory">xorg-x11-drivers</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-libinput</packagereq>
+      <packagereq type="mandatory">xorg-x11-server-Xorg</packagereq>
+      <packagereq type="mandatory">xorg-x11-utils</packagereq>
+      <packagereq type="mandatory">xorg-x11-xauth</packagereq>
+      <packagereq type="mandatory">xorg-x11-xinit</packagereq>
+      <packagereq type="mandatory">xterm</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>core</id>
     <name>Core</name>
@@ -191,102 +326,6 @@
       <packagereq type="mandatory">yum</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>base</id>
-    <name>Base</name>
-    <default>true</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">at</packagereq>
-      <packagereq type="mandatory">authconfig</packagereq>
-      <packagereq type="mandatory">bzip2</packagereq>
-      <packagereq type="mandatory">cronie</packagereq>
-      <packagereq type="mandatory">dbus</packagereq>
-      <packagereq type="mandatory">diffutils</packagereq>
-      <packagereq type="mandatory">dmraid</packagereq>
-      <packagereq type="mandatory">dump</packagereq>
-      <packagereq type="mandatory">ed</packagereq>
-      <packagereq type="mandatory">util-linux</packagereq>
-      <packagereq type="mandatory">gnupg2</packagereq>
-      <packagereq type="mandatory">grub2-starfield-theme</packagereq>
-      <packagereq type="mandatory">irqbalance</packagereq>
-      <packagereq type="mandatory">linux-firmware</packagereq>
-      <packagereq type="mandatory">logrotate</packagereq>
-      <packagereq type="mandatory">lsof</packagereq>
-      <packagereq type="mandatory">man-db</packagereq>
-      <packagereq type="mandatory">man-pages</packagereq>
-      <packagereq type="mandatory">mcelog</packagereq>
-      <packagereq type="mandatory">mdadm</packagereq>
-      <packagereq type="mandatory">microcode_ctl</packagereq>
-      <packagereq type="mandatory">mlocate</packagereq>
-      <packagereq type="mandatory">nano</packagereq>
-      <packagereq type="mandatory">ntsysv</packagereq>
-      <packagereq type="mandatory">numactl</packagereq>
-      <packagereq type="mandatory">parted</packagereq>
-      <packagereq type="mandatory">pciutils</packagereq>
-      <packagereq type="mandatory">pcmciautils</packagereq>
-      <packagereq type="mandatory">perf</packagereq>
-      <packagereq type="mandatory">pinfo</packagereq>
-      <packagereq type="mandatory">qubes-release</packagereq>
-      <packagereq type="mandatory">qubes-release-notes</packagereq>
-      <packagereq type="mandatory">qubes-anaconda-addon</packagereq>
-      <packagereq type="mandatory">quota</packagereq>
-      <packagereq type="mandatory">systemd</packagereq>
-      <packagereq type="mandatory">rsyslog</packagereq>
-      <packagereq type="mandatory">smartmontools</packagereq>
-      <packagereq type="mandatory">sudo</packagereq>
-      <packagereq type="mandatory">symlinks</packagereq>
-      <packagereq type="mandatory">tar</packagereq>
-      <packagereq type="mandatory">time</packagereq>
-      <packagereq type="mandatory">tmpwatch</packagereq>
-      <packagereq type="mandatory">tree</packagereq>
-      <packagereq type="mandatory">unzip</packagereq>
-      <packagereq type="mandatory">usbutils</packagereq>
-      <packagereq type="mandatory">vim-enhanced</packagereq>
-      <packagereq type="mandatory">which</packagereq>
-      <packagereq type="mandatory">yum-utils</packagereq>
-      <packagereq type="mandatory">zip</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>xfce-extra-plugins</id>
-    <name>Extra plugins for the Xfce panel</name>
-    <name xml:lang="de">Zusätzliche Plugins für die Xfce-Menüleiste</name>
-    <name xml:lang="hu">Kiegészítő modulok az XFCE panelhez</name>
-    <name xml:lang="ja">Xfce パネルの拡張プラグイン</name>
-    <name xml:lang="nl">Extra plug-ins voor het Xfce paneel</name>
-    <name xml:lang="pl">Dodatkowe wtyczki dla panelu Xfce</name>
-    <name xml:lang="uk">Додатки для панелі Xfce</name>
-    <name xml:lang="zh_TW">Xfce 面板的額外插件</name>
-    <description>Extend the functionality of the Xfce panel</description>
-    <description xml:lang="de">Erweiterung der Funktionalität des Xfce-Menüleiste</description>
-    <description xml:lang="hu">Kibővíti az XFCE panel képességeit</description>
-    <description xml:lang="ja">Xfce パネルの機能拡張</description>
-    <description xml:lang="nl">Breidt de functionaliteit van het Xfce paneel uit</description>
-    <description xml:lang="pl">Rozszerza funkcjonalność panelu Xfce</description>
-    <description xml:lang="uk">Додатки, що розширюють функціональні можливості панелі Xfce</description>
-    <description xml:lang="zh_TW">擴增 Xfce 面板提供的功能</description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>xfce4-battery-plugin</packagereq>
-      <packagereq>xfce4-cellmodem-plugin</packagereq>
-      <packagereq>xfce4-cpugraph-plugin</packagereq>
-      <packagereq>xfce4-diskperf-plugin</packagereq>
-      <packagereq>xfce4-eyes-plugin</packagereq>
-      <packagereq>xfce4-fsguard-plugin</packagereq>
-      <packagereq>xfce4-genmon-plugin</packagereq>
-      <packagereq>xfce4-mailwatch-plugin</packagereq>
-      <packagereq>xfce4-mount-plugin</packagereq>
-      <packagereq>xfce4-sensors-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-xkb-plugin</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>fonts</id>
     <name>Fonts</name>
@@ -643,12 +682,12 @@
       <packagereq type="optional">nafees-riqa-fonts</packagereq>
       <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">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">naver-nanum-myeongjo-fonts</packagereq>
       <packagereq type="optional">naver-nanum-pen-fonts</packagereq>
+      <packagereq type="optional">navilu-fonts</packagereq>
+      <packagereq type="optional">nhn-nanum-gothic-coding-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>
@@ -667,10 +706,10 @@
       <packagereq type="optional">paktype-ajrak-fonts</packagereq>
       <packagereq type="optional">paktype-naqsh-fonts</packagereq>
       <packagereq type="optional">paktype-tehreer-fonts</packagereq>
+      <packagereq type="optional">paratype-pt-mono-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">paratype-pt-serif-fonts</packagereq>
       <packagereq type="optional">pothana2000-fonts</packagereq>
       <packagereq type="optional">saab-fonts</packagereq>
       <packagereq type="optional">samyak-devanagari-fonts</packagereq>
@@ -926,97 +965,8 @@
       <packagereq type="optional">lsscsi</packagereq>
       <packagereq type="optional">openct</packagereq>
       <packagereq type="optional">opensc</packagereq>
-      <packagereq type="optional">pcsc-lite</packagereq>
       <packagereq type="optional">pcsc-lite-ccid</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>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq>authconfig</packagereq>
-      <packagereq>btrfs-progs</packagereq>
-      <packagereq>cryptsetup</packagereq>
-      <packagereq>dmraid</packagereq>
-      <packagereq>dosfstools</packagereq>
-      <packagereq>dracut-network</packagereq>
-      <packagereq>dracut-live</packagereq>
-      <packagereq>e2fsprogs</packagereq>
-      <packagereq>efibootmgr</packagereq>
-      <packagereq>fcoe-utils</packagereq>
-      <packagereq>firewalld</packagereq>
-      <packagereq>gfs2-utils</packagereq>
-      <packagereq>grub2-efi</packagereq>
-      <packagereq>grub2-starfield-theme</packagereq>
-      <packagereq>grub2</packagereq>
-      <packagereq>hfsplus-tools</packagereq>
-      <packagereq>iscsi-initiator-utils</packagereq>
-      <packagereq>lvm2</packagereq>
-      <packagereq>mactel-boot</packagereq>
-      <packagereq>mdadm</packagereq>
-      <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>
-      <packagereq>xfsprogs</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>sound-basic</id>
-    <name>Sound basic support</name>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="default">paman</packagereq>
-      <packagereq type="default">paprefs</packagereq>
-      <packagereq type="default">pavucontrol</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>base-x</id>
-    <name>X Window System</name>
-    <default>true</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">desktop-backgrounds-basic</packagereq>
-      <packagereq type="mandatory">initial-setup</packagereq>
-      <packagereq type="mandatory">initial-setup-gui</packagereq>
-      <packagereq type="mandatory">glx-utils</packagereq>
-      <packagereq type="mandatory">gnome-packagekit</packagereq>
-      <packagereq type="mandatory">mesa-dri-drivers</packagereq>
-      <packagereq type="mandatory">xorg-x11-drivers</packagereq>
-      <packagereq type="mandatory">xorg-x11-drv-libinput</packagereq>
-      <packagereq type="mandatory">xorg-x11-server-Xorg</packagereq>
-      <packagereq type="mandatory">xorg-x11-utils</packagereq>
-      <packagereq type="mandatory">xorg-x11-xauth</packagereq>
-      <packagereq type="mandatory">xorg-x11-xinit</packagereq>
-      <packagereq type="mandatory">xterm</packagereq>
+      <packagereq type="optional">pcsc-lite</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1032,12 +982,12 @@
       <packagereq type="mandatory">dolphin</packagereq>
       <packagereq type="mandatory">kcm-gtk</packagereq>
       <packagereq type="mandatory">kcm_systemd</packagereq>
-      <packagereq type="mandatory">kdelibs</packagereq>
-      <packagereq type="mandatory">kdepasswd</packagereq>
-      <packagereq type="mandatory">kdeplasma-addons</packagereq>
       <packagereq type="mandatory">kde-runtime</packagereq>
       <packagereq type="mandatory">kde-settings-pulseaudio</packagereq>
       <packagereq type="mandatory">kde-style-breeze</packagereq>
+      <packagereq type="mandatory">kdelibs</packagereq>
+      <packagereq type="mandatory">kdepasswd</packagereq>
+      <packagereq type="mandatory">kdeplasma-addons</packagereq>
       <packagereq type="mandatory">kdialog</packagereq>
       <packagereq type="mandatory">khelpcenter</packagereq>
       <packagereq type="mandatory">khotkeys</packagereq>
@@ -1073,6 +1023,17 @@
       <packagereq type="default">kmix</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>sound-basic</id>
+    <name>Sound basic support</name>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">paman</packagereq>
+      <packagereq type="default">paprefs</packagereq>
+      <packagereq type="default">pavucontrol</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>xfce-desktop-qubes</id>
     <name>Xfce4</name>
@@ -1080,46 +1041,84 @@
     <default>true</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq>xfce4-panel</packagereq>
-      <packagereq>xfce4-session</packagereq>
-      <packagereq>xfce4-settings</packagereq>
-      <packagereq>xfce4-settings-qubes</packagereq>
-      <packagereq>xfconf</packagereq>
-      <packagereq>xfwm4</packagereq>
-      <packagereq>xfdesktop</packagereq>
-      <!-- FIXME? <packagereq>fedora-icon-theme</packagereq>-->
-      <packagereq>lightdm-gtk</packagereq>
-      <packagereq>gtk-xfce-engine</packagereq>
-      <packagereq>gvfs</packagereq>
-      <packagereq>openssh-askpass</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>xdg-user-dirs-gtk</packagereq>
       <packagereq>adwaita-cursor-theme</packagereq>
       <packagereq>adwaita-gtk2-theme</packagereq>
-      <packagereq>greybird-gtk2-theme</packagereq>
-      <packagereq>greybird-gtk3-theme</packagereq>
-      <packagereq>greybird-xfce4-notifyd-theme</packagereq>
-      <packagereq>greybird-xfwm4-theme</packagereq>
       <packagereq>albatross-gtk2-theme</packagereq>
       <packagereq>albatross-gtk3-theme</packagereq>
       <packagereq>albatross-xfwm4-theme</packagereq>
       <packagereq>bluebird-gtk2-theme</packagereq>
       <packagereq>bluebird-gtk3-theme</packagereq>
       <packagereq>bluebird-xfwm4-theme</packagereq>
+      <packagereq>greybird-gtk2-theme</packagereq>
+      <packagereq>greybird-gtk3-theme</packagereq>
+      <packagereq>greybird-xfce4-notifyd-theme</packagereq>
+      <packagereq>greybird-xfwm4-theme</packagereq>
+      <packagereq>gtk-xfce-engine</packagereq>
+      <packagereq>gvfs</packagereq>
+      <packagereq>lightdm-gtk</packagereq>
+      <packagereq>openssh-askpass</packagereq>
+      <packagereq>xdg-user-dirs-gtk</packagereq>
+      <packagereq>xfce4-about</packagereq>
+      <packagereq>xfce4-appfinder</packagereq>
       <packagereq>xfce4-datetime-plugin</packagereq>
+      <packagereq>xfce4-panel</packagereq>
       <packagereq>xfce4-places-plugin</packagereq>
+      <packagereq>xfce4-power-manager</packagereq>
       <packagereq>xfce4-screenshooter-plugin</packagereq>
+      <packagereq>xfce4-session-engines</packagereq>
+      <packagereq>xfce4-session</packagereq>
+      <packagereq>xfce4-settings-qubes</packagereq>
+      <packagereq>xfce4-settings</packagereq>
+      <packagereq>xfce4-terminal</packagereq>
+      <packagereq>xfconf</packagereq>
+      <packagereq>xfdesktop</packagereq>
+      <packagereq>xfwm4-theme-nodoka</packagereq>
       <packagereq>xfwm4-themes</packagereq>
+      <packagereq>xfwm4</packagereq>
+      <packagereq>xscreensaver-base</packagereq>
       <packagereq>yumex</packagereq>
       <packagereq>zenity</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>xfce-extra-plugins</id>
+    <name>Extra plugins for the Xfce panel</name>
+    <name xml:lang="de">Zusätzliche Plugins für die Xfce-Menüleiste</name>
+    <name xml:lang="hu">Kiegészítő modulok az XFCE panelhez</name>
+    <name xml:lang="ja">Xfce パネルの拡張プラグイン</name>
+    <name xml:lang="nl">Extra plug-ins voor het Xfce paneel</name>
+    <name xml:lang="pl">Dodatkowe wtyczki dla panelu Xfce</name>
+    <name xml:lang="uk">Додатки для панелі Xfce</name>
+    <name xml:lang="zh_TW">Xfce 面板的額外插件</name>
+    <description>Extend the functionality of the Xfce panel</description>
+    <description xml:lang="de">Erweiterung der Funktionalität des Xfce-Menüleiste</description>
+    <description xml:lang="hu">Kibővíti az XFCE panel képességeit</description>
+    <description xml:lang="ja">Xfce パネルの機能拡張</description>
+    <description xml:lang="nl">Breidt de functionaliteit van het Xfce paneel uit</description>
+    <description xml:lang="pl">Rozszerza funkcjonalność panelu Xfce</description>
+    <description xml:lang="uk">Додатки, що розширюють функціональні можливості панелі Xfce</description>
+    <description xml:lang="zh_TW">擴增 Xfce 面板提供的功能</description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>xfce4-battery-plugin</packagereq>
+      <packagereq>xfce4-cellmodem-plugin</packagereq>
+      <packagereq>xfce4-cpugraph-plugin</packagereq>
+      <packagereq>xfce4-diskperf-plugin</packagereq>
+      <packagereq>xfce4-eyes-plugin</packagereq>
+      <packagereq>xfce4-fsguard-plugin</packagereq>
+      <packagereq>xfce4-genmon-plugin</packagereq>
+      <packagereq>xfce4-mailwatch-plugin</packagereq>
+      <packagereq>xfce4-mount-plugin</packagereq>
+      <packagereq>xfce4-sensors-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-xkb-plugin</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>xfce-media</id>
     <name>Multimedia support for Xfce</name>
@@ -1152,19 +1151,19 @@
     <default>true</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="mandatory">kernel</packagereq>
       <packagereq type="mandatory">kernel-qubes-vm</packagereq>
-      <packagereq type="mandatory">qubes-core-dom0</packagereq>
+      <packagereq type="mandatory">kernel</packagereq>
+      <packagereq type="mandatory">qubes-artwork</packagereq>
       <packagereq type="mandatory">qubes-core-dom0-doc</packagereq>
+      <packagereq type="mandatory">qubes-core-dom0</packagereq>
       <packagereq type="mandatory">qubes-gui-dom0</packagereq>
-      <packagereq type="mandatory">qubes-artwork</packagereq>
       <packagereq type="mandatory">qubes-manager</packagereq>
       <packagereq type="mandatory">qubes-mgmt-salt-dom0</packagereq>
       <packagereq type="mandatory">qubes-template-fedora-23</packagereq>
       <packagereq type="default">qubes-gpg-split-dom0</packagereq>
       <packagereq type="default">qubes-img-converter-dom0</packagereq>
-      <packagereq type="default">qubes-pdf-converter-dom0</packagereq>
       <packagereq type="default">qubes-input-proxy</packagereq>
+      <packagereq type="default">qubes-pdf-converter-dom0</packagereq>
       <packagereq type="default">qubes-usb-proxy-dom0</packagereq>
     </packagelist>
   </group>