diff --git a/comps.xml b/comps.xml
index 990e9a6..526488e 100644
--- a/comps.xml
+++ b/comps.xml
@@ -5150,79 +5150,79 @@
       <packagereq variant="Server" type="mandatory">ModemManager</packagereq>
       <packagereq variant="Server" type="mandatory">NetworkManager-adsl</packagereq>
       <packagereq variant="Server" type="mandatory">polkit</packagereq>
-      <packagereq variant="AppStream" type="mandatory">at-spi2-atk</packagereq>
-      <packagereq variant="AppStream" type="mandatory">at-spi2-core</packagereq>
-      <packagereq variant="AppStream" type="mandatory">baobab</packagereq>
-      <packagereq variant="AppStream" type="mandatory">cheese</packagereq>
-      <packagereq variant="AppStream" type="mandatory">chrome-gnome-shell</packagereq>
-      <packagereq variant="AppStream" type="mandatory">dconf</packagereq>
-      <packagereq variant="AppStream" type="mandatory">eog</packagereq>
-      <packagereq variant="AppStream" type="mandatory">evince</packagereq>
-      <packagereq variant="AppStream" type="mandatory">evince-nautilus</packagereq>
-      <packagereq variant="AppStream" type="mandatory">file-roller</packagereq>
-      <packagereq variant="AppStream" type="mandatory">fprintd-pam</packagereq>
-      <packagereq variant="AppStream" type="mandatory">gdm</packagereq>
-      <packagereq variant="AppStream" type="mandatory">gedit</packagereq>
-      <packagereq variant="AppStream" type="mandatory">gnome-bluetooth</packagereq>
-      <!-- <packagereq variant="AppStream" type="mandatory">gnome-boxes</packagereq> -->
-      <packagereq variant="AppStream" type="mandatory">gnome-calculator</packagereq>
-      <packagereq variant="AppStream" type="mandatory">gnome-characters</packagereq>
-      <packagereq variant="AppStream" type="mandatory">gnome-classic-session</packagereq>
-      <packagereq variant="AppStream" type="mandatory">gnome-color-manager</packagereq>
-      <packagereq variant="AppStream" type="mandatory">gnome-control-center</packagereq>
-      <packagereq variant="AppStream" type="mandatory">gnome-disk-utility</packagereq>
-      <packagereq variant="AppStream" type="mandatory">gnome-font-viewer</packagereq>
-      <packagereq variant="AppStream" type="mandatory">gnome-getting-started-docs</packagereq>
-      <packagereq variant="AppStream" type="mandatory">gnome-initial-setup</packagereq>
-      <packagereq variant="AppStream" type="mandatory">gnome-logs</packagereq>
-      <packagereq variant="AppStream" type="mandatory">gnome-remote-desktop</packagereq>
-      <packagereq variant="AppStream" type="mandatory">gnome-screenshot</packagereq>
-      <packagereq variant="AppStream" type="mandatory">gnome-session-wayland-session</packagereq>
-      <packagereq variant="AppStream" type="mandatory">gnome-session-xsession</packagereq>
-      <packagereq variant="AppStream" type="mandatory">gnome-settings-daemon</packagereq>
-      <packagereq variant="AppStream" type="mandatory">gnome-shell</packagereq>
-      <packagereq variant="AppStream" type="mandatory">gnome-software</packagereq>
-      <packagereq variant="AppStream" type="mandatory">gnome-system-monitor</packagereq>
-      <packagereq variant="AppStream" type="mandatory">gnome-terminal</packagereq>
-      <packagereq variant="AppStream" type="mandatory">gnome-terminal-nautilus</packagereq>
-      <packagereq variant="AppStream" type="mandatory">gnome-themes-standard</packagereq>
-      <packagereq variant="AppStream" type="mandatory">gnome-user-docs</packagereq>
-      <packagereq variant="AppStream" type="mandatory">gvfs-afc</packagereq>
-      <packagereq variant="AppStream" type="mandatory">gvfs-afp</packagereq>
-      <packagereq variant="AppStream" type="mandatory">gvfs-archive</packagereq>
-      <packagereq variant="AppStream" type="mandatory">gvfs-fuse</packagereq>
-      <packagereq variant="AppStream" type="mandatory">gvfs-goa</packagereq>
-      <packagereq variant="AppStream" type="mandatory">gvfs-gphoto2</packagereq>
-      <packagereq variant="AppStream" type="mandatory">gvfs-mtp</packagereq>
-      <packagereq variant="AppStream" type="mandatory">gvfs-smb</packagereq>
-      <packagereq variant="AppStream" type="mandatory">initial-setup-gui</packagereq>
-      <packagereq variant="AppStream" type="mandatory">libcanberra-gtk3</packagereq>
-      <packagereq variant="AppStream" type="mandatory">librsvg2</packagereq>
-      <packagereq variant="AppStream" type="mandatory">libsane-hpaio</packagereq>
-      <packagereq variant="AppStream" type="mandatory">mesa-dri-drivers</packagereq>
-      <packagereq variant="AppStream" type="mandatory">mousetweaks</packagereq>
-      <packagereq variant="AppStream" type="mandatory">nautilus</packagereq>
-      <packagereq variant="AppStream" type="mandatory">nautilus-sendto</packagereq>
-      <packagereq variant="AppStream" type="mandatory">orca</packagereq>
-      <packagereq variant="AppStream" type="mandatory">PackageKit-command-not-found</packagereq>
-      <packagereq variant="AppStream" type="mandatory">PackageKit-gtk3-module</packagereq>
-      <packagereq variant="AppStream" type="mandatory">sane-backends-drivers-scanners</packagereq>
-      <packagereq variant="AppStream" type="mandatory">sushi</packagereq>
-      <packagereq variant="AppStream" type="mandatory">totem</packagereq>
-      <packagereq variant="AppStream" type="mandatory">totem-nautilus</packagereq>
-      <packagereq variant="AppStream" type="mandatory">tracker</packagereq>
-      <packagereq variant="AppStream" type="mandatory">tracker-miners</packagereq>
-      <packagereq variant="AppStream" type="mandatory">vino</packagereq>
-      <packagereq variant="AppStream" type="mandatory">xdg-desktop-portal</packagereq>
-      <packagereq variant="AppStream" type="mandatory">xdg-desktop-portal-gtk</packagereq>
-      <packagereq variant="AppStream" type="mandatory">xdg-user-dirs-gtk</packagereq>
-      <packagereq variant="AppStream" type="mandatory">yelp</packagereq>
-      <packagereq variant="AppStream" type="mandatory">yelp-tools</packagereq>
-      <packagereq variant="AppStream" type="optional">gedit-plugins</packagereq>
-      <packagereq variant="AppStream" type="optional">gnome-backgrounds</packagereq>
-      <packagereq variant="AppStream" type="optional">gnome-shell-extension-disable-screenshield</packagereq>
-      <packagereq variant="AppStream" type="optional">gnome-shell-extension-horizontal-workspaces</packagereq>
-      <packagereq variant="AppStream" type="optional">gnome-shell-extension-window-grouper</packagereq>
+      <packagereq variant="Server" type="mandatory">at-spi2-atk</packagereq>
+      <packagereq variant="Server" type="mandatory">at-spi2-core</packagereq>
+      <packagereq variant="Server" type="mandatory">baobab</packagereq>
+      <packagereq variant="Server" type="mandatory">cheese</packagereq>
+      <packagereq variant="Server" type="mandatory">chrome-gnome-shell</packagereq>
+      <packagereq variant="Server" type="mandatory">dconf</packagereq>
+      <packagereq variant="Server" type="mandatory">eog</packagereq>
+      <packagereq variant="Server" type="mandatory">evince</packagereq>
+      <packagereq variant="Server" type="mandatory">evince-nautilus</packagereq>
+      <packagereq variant="Server" type="mandatory">file-roller</packagereq>
+      <packagereq variant="Server" type="mandatory">fprintd-pam</packagereq>
+      <packagereq variant="Server" type="mandatory">gdm</packagereq>
+      <packagereq variant="Server" type="mandatory">gedit</packagereq>
+      <packagereq variant="Server" type="mandatory">gnome-bluetooth</packagereq>
+      <!-- <packagereq variant="Server" type="mandatory">gnome-boxes</packagereq> -->
+      <packagereq variant="Server" type="mandatory">gnome-calculator</packagereq>
+      <packagereq variant="Server" type="mandatory">gnome-characters</packagereq>
+      <packagereq variant="Server" type="mandatory">gnome-classic-session</packagereq>
+      <packagereq variant="Server" type="mandatory">gnome-color-manager</packagereq>
+      <packagereq variant="Server" type="mandatory">gnome-control-center</packagereq>
+      <packagereq variant="Server" type="mandatory">gnome-disk-utility</packagereq>
+      <packagereq variant="Server" type="mandatory">gnome-font-viewer</packagereq>
+      <packagereq variant="Server" type="mandatory">gnome-getting-started-docs</packagereq>
+      <packagereq variant="Server" type="mandatory">gnome-initial-setup</packagereq>
+      <packagereq variant="Server" type="mandatory">gnome-logs</packagereq>
+      <packagereq variant="Server" type="mandatory">gnome-remote-desktop</packagereq>
+      <packagereq variant="Server" type="mandatory">gnome-screenshot</packagereq>
+      <packagereq variant="Server" type="mandatory">gnome-session-wayland-session</packagereq>
+      <packagereq variant="Server" type="mandatory">gnome-session-xsession</packagereq>
+      <packagereq variant="Server" type="mandatory">gnome-settings-daemon</packagereq>
+      <packagereq variant="Server" type="mandatory">gnome-shell</packagereq>
+      <packagereq variant="Server" type="mandatory">gnome-software</packagereq>
+      <packagereq variant="Server" type="mandatory">gnome-system-monitor</packagereq>
+      <packagereq variant="Server" type="mandatory">gnome-terminal</packagereq>
+      <packagereq variant="Server" type="mandatory">gnome-terminal-nautilus</packagereq>
+      <packagereq variant="Server" type="mandatory">gnome-themes-standard</packagereq>
+      <packagereq variant="Server" type="mandatory">gnome-user-docs</packagereq>
+      <packagereq variant="Server" type="mandatory">gvfs-afc</packagereq>
+      <packagereq variant="Server" type="mandatory">gvfs-afp</packagereq>
+      <packagereq variant="Server" type="mandatory">gvfs-archive</packagereq>
+      <packagereq variant="Server" type="mandatory">gvfs-fuse</packagereq>
+      <packagereq variant="Server" type="mandatory">gvfs-goa</packagereq>
+      <packagereq variant="Server" type="mandatory">gvfs-gphoto2</packagereq>
+      <packagereq variant="Server" type="mandatory">gvfs-mtp</packagereq>
+      <packagereq variant="Server" type="mandatory">gvfs-smb</packagereq>
+      <packagereq variant="Server" type="mandatory">initial-setup-gui</packagereq>
+      <packagereq variant="Server" type="mandatory">libcanberra-gtk3</packagereq>
+      <packagereq variant="Server" type="mandatory">librsvg2</packagereq>
+      <packagereq variant="Server" type="mandatory">libsane-hpaio</packagereq>
+      <packagereq variant="Server" type="mandatory">mesa-dri-drivers</packagereq>
+      <packagereq variant="Server" type="mandatory">mousetweaks</packagereq>
+      <packagereq variant="Server" type="mandatory">nautilus</packagereq>
+      <packagereq variant="Server" type="mandatory">nautilus-sendto</packagereq>
+      <packagereq variant="Server" type="mandatory">orca</packagereq>
+      <packagereq variant="Server" type="mandatory">PackageKit-command-not-found</packagereq>
+      <packagereq variant="Server" type="mandatory">PackageKit-gtk3-module</packagereq>
+      <packagereq variant="Server" type="mandatory">sane-backends-drivers-scanners</packagereq>
+      <packagereq variant="Server" type="mandatory">sushi</packagereq>
+      <packagereq variant="Server" type="mandatory">totem</packagereq>
+      <packagereq variant="Server" type="mandatory">totem-nautilus</packagereq>
+      <packagereq variant="Server" type="mandatory">tracker</packagereq>
+      <packagereq variant="Server" type="mandatory">tracker-miners</packagereq>
+      <packagereq variant="Server" type="mandatory">vino</packagereq>
+      <packagereq variant="Server" type="mandatory">xdg-desktop-portal</packagereq>
+      <packagereq variant="Server" type="mandatory">xdg-desktop-portal-gtk</packagereq>
+      <packagereq variant="Server" type="mandatory">xdg-user-dirs-gtk</packagereq>
+      <packagereq variant="Server" type="mandatory">yelp</packagereq>
+      <packagereq variant="Server" type="mandatory">yelp-tools</packagereq>
+      <packagereq variant="Server" type="optional">gedit-plugins</packagereq>
+      <packagereq variant="Server" type="optional">gnome-backgrounds</packagereq>
+      <packagereq variant="Server" type="optional">gnome-shell-extension-disable-screenshield</packagereq>
+      <packagereq variant="Server" type="optional">gnome-shell-extension-horizontal-workspaces</packagereq>
+      <packagereq variant="Server" type="optional">gnome-shell-extension-window-grouper</packagereq>
     </packagelist>
   </group>
   <group variant="Minimal">