diff --git a/dvd.group b/dvd.group
index 1773d492..6a100c6b 100644
--- a/dvd.group
+++ b/dvd.group
@@ -226,6 +226,8 @@
     <package name="bcm20702a1-firmware" supportstatus="unsupported"/> <!-- reason: dvd:bcm20702a1-firmware -->
     <package name="bcm43xx-firmware" supportstatus="unsupported"/> <!-- reason: dvd:bcm43xx-firmware -->
     <package name="bea-stax-api" supportstatus="unsupported"/> <!-- reason: dvd:patterns-lxde-lxde -->
+    <package name="bijiben" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="bijiben-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="bin86" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-C-C++-devel_C_C++ -->
     <package name="bind" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-dhcp_dns_server -->
     <package name="bind-chrootenv" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-dhcp_dns_server -->
@@ -249,6 +251,8 @@
     <package name="bluez-qt-imports" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="bluez-qt-udev" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="bluez-tools" supportstatus="unsupported"/> <!-- reason: dvd:patterns-xfce-xfce -->
+    <package name="bogofilter-common" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+    <package name="bogofilter-db" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="bolt" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="boost-devel" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-C-C++-devel_C_C++ -->
     <package name="boost-jam" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-C-C++-devel_C_C++ -->
@@ -460,6 +464,7 @@
     <package name="efont-unicode-bitmap-fonts" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="ekiga" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="ekiga-lang" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+    <package name="ekiga-plugins-evolution" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="elementary-xfce-icon-theme" supportstatus="unsupported"/> <!-- reason: dvd:patterns-xfce-xfce -->
     <package name="elfutils" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="elfutils-lang" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
@@ -500,6 +505,18 @@
     <package name="evince-plugin-pdfdocument" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="evince-plugin-tiffdocument" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="evince-plugin-xpsdocument" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+    <package name="evolution" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="evolution-data-server" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="evolution-data-server-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="evolution-ews" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="evolution-ews-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="evolution-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="evolution-plugin-bogofilter" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+    <package name="evolution-plugin-pst-import" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+    <package name="evolution-plugin-rss" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+    <package name="evolution-plugin-rss-lang" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+    <package name="evolution-plugin-spamassassin" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+    <package name="evolution-plugin-text-highlight" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="exif" supportstatus="unsupported"/> <!-- reason: dvd:patterns-lxde-lxde -->
     <package name="exiftool" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="exim" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
@@ -558,6 +575,7 @@
     <package name="flatpak-builder" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="flex" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-C-C++-devel_C_C++ -->
     <package name="flute" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
+    <package name="folks-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="fontconfig" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="fontconfig-devel" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="fontconfig-lang" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
@@ -673,6 +691,8 @@
     <package name="gitg-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="gitk" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-C-C++-devel_C_C++ -->
     <package name="gjs" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="glabels" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+    <package name="glabels-lang" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="glade" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="glade-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="glassfish-servlet-api" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-technical_writing -->
@@ -708,6 +728,8 @@
     <package name="gnome-clocks-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="gnome-color-manager" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="gnome-color-manager-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="gnome-contacts" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="gnome-contacts-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="gnome-control-center" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="gnome-control-center-color" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="gnome-control-center-goa" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -732,6 +754,8 @@
     <package name="gnome-logs-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="gnome-mahjongg" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="gnome-mahjongg-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="gnome-maps" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="gnome-maps-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="gnome-menus" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="gnome-menus-branding-openSUSE" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="gnome-menus-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -758,12 +782,15 @@
     <package name="gnome-settings-daemon" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="gnome-settings-daemon-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="gnome-shell" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="gnome-shell-calendar" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="gnome-shell-classic" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="gnome-shell-classic-session" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="gnome-shell-extension-desktop-icons" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="gnome-shell-extensions-common" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="gnome-shell-extensions-common-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="gnome-shell-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="gnome-shell-search-provider-bijiben" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="gnome-shell-search-provider-contacts" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="gnome-shell-search-provider-documents" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="gnome-shell-search-provider-epiphany" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="gnome-shell-search-provider-gnome-calculator" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -951,6 +978,7 @@
     <package name="hfsutils" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="hicolor-icon-theme" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="hicolor-icon-theme-branding-openSUSE" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
+    <package name="highlight" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="hostname" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="hp2xx" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="hplip" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
@@ -1834,6 +1862,7 @@
     <package name="libcairo2" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libcairomm-1_0-1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libcamd2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="libcamel-1_2-62" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libcanberra-gtk-module-common" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libcanberra-gtk0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libcanberra-gtk2-module" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -1857,6 +1886,7 @@
     <package name="libcetcd0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-transactional_base -->
     <package name="libcfg6" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libcfitsio8" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
+    <package name="libchamplain-0_12-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libcheese-common" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libcheese-gtk25" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libcheese8" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -1946,10 +1976,18 @@
     <package name="libdvdread7" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libdw1" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libe-book-0_1-1" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
+    <package name="libebackend-1_2-10" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libebl-plugins" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libebml4" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
+    <package name="libebook-1_2-20" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="libebook-contacts-1_2-3" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="libecal-2_0-1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libeconf0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libecpg6" supportstatus="unsupported"/> <!-- reason: dvd:postgresql-devel -->
+    <package name="libedata-book-1_2-26" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="libedata-cal-2_0-1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="libedataserver-1_2-24" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="libedataserverui-1_2-2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libedc_ecc1_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libedc_ecc_dec1_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libedit0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -2014,6 +2052,9 @@
     <package name="libfm-gtk4" supportstatus="unsupported"/> <!-- reason: dvd:patterns-lxde-lxde -->
     <package name="libfm-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-lxde-lxde -->
     <package name="libfm4" supportstatus="unsupported"/> <!-- reason: dvd:patterns-lxde-lxde -->
+    <package name="libfolks-data" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="libfolks-eds25" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="libfolks25" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libfont-specimen0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libfontconfig1" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libfontenc-devel" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
@@ -2100,6 +2141,7 @@
     <package name="libgmp10" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libgmpxx4" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-C-C++-devel_C_C++ -->
     <package name="libgnome-autoar-0-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="libgnome-autoar-gtk-0-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libgnome-bluetooth13" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libgnome-desktop-3-18" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libgnome-desktop-3_0-common" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -2224,6 +2266,7 @@
     <package name="libibus-1_0-5" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libibverbs" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-osc-devel_osc_build -->
     <package name="libibverbs1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-osc-devel_osc_build -->
+    <package name="libical-glib3" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libical3" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libicu-suse65_1" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libicu65_1-ledata" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
@@ -2570,6 +2613,7 @@
     <package name="libproxy1-pacrunner-webkit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libpskc0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libpsl5" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
+    <package name="libpst4" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libpt2_10_11" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libpulse-mainloop-glib0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libpulse0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
@@ -5031,6 +5075,7 @@
     <package name="typelib-1_0-AccountsService-1_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="typelib-1_0-Atk-1_0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="typelib-1_0-Atspi-2_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="typelib-1_0-Champlain-0_12" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="typelib-1_0-Cheese-3_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-xfce-xfce -->
     <package name="typelib-1_0-Clutter-1_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="typelib-1_0-Cogl-1_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -5040,6 +5085,7 @@
     <package name="typelib-1_0-Flatpak-1_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="typelib-1_0-GData-0_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="typelib-1_0-GES-1_0" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+    <package name="typelib-1_0-GFBGraph-0_2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="typelib-1_0-GMenu-3_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="typelib-1_0-GSound-1_0" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="typelib-1_0-GWeather-3_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -5048,6 +5094,7 @@
     <package name="typelib-1_0-GdkPixbuf-2_0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="typelib-1_0-Gdm-1_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="typelib-1_0-Geoclue-2_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="typelib-1_0-GeocodeGlib-1_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="typelib-1_0-GjsPrivate-1_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="typelib-1_0-GnomeBluetooth-1_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="typelib-1_0-GnomeDesktop-3_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -5613,10 +5660,6 @@
     <package name="alsa-plugins-pulse-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="apulse" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="apulse-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="bijiben" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="bijiben-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="bogofilter-common" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="bogofilter-db" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="checkpolicy" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-directory_server -->
     <package name="chrome-gnome-shell" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="crash-kmp-default" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
@@ -5626,36 +5669,13 @@
     <package name="drbd-kmp-default" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="drbd-utils" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="efibootmgr" supportstatus="unsupported"/> <!-- reason: dvd:grub2-x86_64-efi -->
-    <package name="ekiga-plugins-evolution" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="evolution" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="evolution-data-server" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="evolution-data-server-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="evolution-ews" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="evolution-ews-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="evolution-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="evolution-plugin-bogofilter" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="evolution-plugin-pst-import" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="evolution-plugin-rss" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="evolution-plugin-rss-lang" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="evolution-plugin-spamassassin" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="evolution-plugin-text-highlight" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="fipscheck" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-base-devel_kernel -->
     <package name="firefox-uget-integrator" supportstatus="unsupported"/> <!-- reason: dvd:patterns-lxde-lxde -->
-    <package name="folks-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="fprintd-pam-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="gdk-pixbuf-query-loaders-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="glabels" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="glabels-lang" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="glibc-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="gnome-contacts" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="gnome-contacts-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="gnome-keyring-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="gnome-keyring-pam-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="gnome-maps" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="gnome-maps-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="gnome-shell-calendar" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="gnome-shell-search-provider-bijiben" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="gnome-shell-search-provider-contacts" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="gnutls" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="grub2-x86_64-efi" supportstatus="unsupported"/> <!-- reason: dvd:grub2-x86_64-efi -->
     <package name="grub2-x86_64-xen" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-xen_server -->
@@ -5664,7 +5684,6 @@
     <package name="gtk2-theming-engine-adwaita-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="gtk2-tools-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="guestfs-data" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="highlight" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="ibus-gtk-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="kernel-syms" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-base-devel_kernel -->
     <package name="kmozillahelper" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
@@ -5699,12 +5718,10 @@
     <package name="libc++abi-devel" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libc++abi1" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libcairo2-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="libcamel-1_2-62" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libcanberra-gtk0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libcanberra-gtk2-module-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libcanberra0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libcap2-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="libchamplain-0_12-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libcom_err2-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libcontainers-common" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libcrack2-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
@@ -5718,22 +5735,11 @@
     <package name="libdcerpc-binding0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libdcerpc0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libdevmapper1_03-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="libebackend-1_2-10" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="libebook-1_2-20" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="libebook-contacts-1_2-3" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="libecal-2_0-1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libeconf0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="libedata-book-1_2-26" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="libedata-cal-2_0-1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="libedataserver-1_2-24" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="libedataserverui-1_2-2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libexpat1-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libfam0-gamin-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libffi7-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libfipscheck1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-base-devel_kernel -->
-    <package name="libfolks-data" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="libfolks-eds25" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="libfolks25" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libfontconfig1-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libfreetype6-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libfribidi0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
@@ -5746,7 +5752,6 @@
     <package name="libglvnd-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libgmodule-2_0-0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libgmp10-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="libgnome-autoar-gtk-0-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libgnutls-dane0" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libgnutls30-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libgobject-2_0-0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
@@ -5758,7 +5763,6 @@
     <package name="libhivex0" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libhogweed5-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libibus-1_0-5-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="libical-glib3" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libidn2-0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libjansson4-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libjbig2-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
@@ -5794,7 +5798,6 @@
     <package name="libpmem1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-osc-devel_osc_build -->
     <package name="libpng16-16-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libpopt0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="libpst4" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="librados2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-osc-devel_osc_build -->
     <package name="librbd1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-osc-devel_osc_build -->
     <package name="libsamba-credentials0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
@@ -5892,9 +5895,6 @@
     <package name="sssd-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="supermin" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="systemd-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
-    <package name="typelib-1_0-Champlain-0_12" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="typelib-1_0-GFBGraph-0_2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="typelib-1_0-GeocodeGlib-1_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="uget-integrator" supportstatus="unsupported"/> <!-- reason: dvd:patterns-lxde-lxde -->
     <package name="unbound-anchor" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="virt-sandbox" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
diff --git a/openSUSE-dvd5-dvd-i586.kiwi b/openSUSE-dvd5-dvd-i586.kiwi
index cfb74356..2bf041fb 100644
--- a/openSUSE-dvd5-dvd-i586.kiwi
+++ b/openSUSE-dvd5-dvd-i586.kiwi
@@ -225,6 +225,8 @@
       <repopackage name="bcm20702a1-firmware"/>
       <repopackage name="bcm43xx-firmware"/>
       <repopackage name="bea-stax-api"/>
+      <repopackage name="bijiben"/>
+      <repopackage name="bijiben-lang"/>
       <repopackage name="bin86"/>
       <repopackage name="bind"/>
       <repopackage name="bind-chrootenv"/>
@@ -248,6 +250,8 @@
       <repopackage name="bluez-qt-imports"/>
       <repopackage name="bluez-qt-udev"/>
       <repopackage name="bluez-tools"/>
+      <repopackage name="bogofilter-common"/>
+      <repopackage name="bogofilter-db"/>
       <repopackage name="bolt"/>
       <repopackage name="boost-devel"/>
       <repopackage name="boost-jam"/>
@@ -459,6 +463,7 @@
       <repopackage name="efont-unicode-bitmap-fonts"/>
       <repopackage name="ekiga"/>
       <repopackage name="ekiga-lang"/>
+      <repopackage name="ekiga-plugins-evolution"/>
       <repopackage name="elementary-xfce-icon-theme"/>
       <repopackage name="elfutils"/>
       <repopackage name="elfutils-lang"/>
@@ -500,6 +505,18 @@
       <repopackage name="evince-plugin-pdfdocument"/>
       <repopackage name="evince-plugin-tiffdocument"/>
       <repopackage name="evince-plugin-xpsdocument"/>
+      <repopackage name="evolution"/>
+      <repopackage name="evolution-data-server"/>
+      <repopackage name="evolution-data-server-lang"/>
+      <repopackage name="evolution-ews"/>
+      <repopackage name="evolution-ews-lang"/>
+      <repopackage name="evolution-lang"/>
+      <repopackage name="evolution-plugin-bogofilter"/>
+      <repopackage name="evolution-plugin-pst-import"/>
+      <repopackage name="evolution-plugin-rss"/>
+      <repopackage name="evolution-plugin-rss-lang"/>
+      <repopackage name="evolution-plugin-spamassassin"/>
+      <repopackage name="evolution-plugin-text-highlight"/>
       <repopackage name="exif"/>
       <repopackage name="exiftool"/>
       <repopackage name="exim"/>
@@ -559,6 +576,7 @@
       <repopackage name="flatpak-builder"/>
       <repopackage name="flex"/>
       <repopackage name="flute"/>
+      <repopackage name="folks-lang"/>
       <repopackage name="fontconfig"/>
       <repopackage name="fontconfig-devel"/>
       <repopackage name="fontconfig-lang"/>
@@ -676,6 +694,8 @@
       <repopackage name="gitg-lang"/>
       <repopackage name="gitk"/>
       <repopackage name="gjs"/>
+      <repopackage name="glabels"/>
+      <repopackage name="glabels-lang"/>
       <repopackage name="glade"/>
       <repopackage name="glade-lang"/>
       <repopackage name="glassfish-servlet-api"/>
@@ -713,6 +733,8 @@
       <repopackage name="gnome-clocks-lang"/>
       <repopackage name="gnome-color-manager"/>
       <repopackage name="gnome-color-manager-lang"/>
+      <repopackage name="gnome-contacts"/>
+      <repopackage name="gnome-contacts-lang"/>
       <repopackage name="gnome-control-center"/>
       <repopackage name="gnome-control-center-color"/>
       <repopackage name="gnome-control-center-goa"/>
@@ -737,6 +759,8 @@
       <repopackage name="gnome-logs-lang"/>
       <repopackage name="gnome-mahjongg"/>
       <repopackage name="gnome-mahjongg-lang"/>
+      <repopackage name="gnome-maps"/>
+      <repopackage name="gnome-maps-lang"/>
       <repopackage name="gnome-menus"/>
       <repopackage name="gnome-menus-branding-openSUSE"/>
       <repopackage name="gnome-menus-lang"/>
@@ -763,12 +787,15 @@
       <repopackage name="gnome-settings-daemon"/>
       <repopackage name="gnome-settings-daemon-lang"/>
       <repopackage name="gnome-shell"/>
+      <repopackage name="gnome-shell-calendar"/>
       <repopackage name="gnome-shell-classic"/>
       <repopackage name="gnome-shell-classic-session"/>
       <repopackage name="gnome-shell-extension-desktop-icons"/>
       <repopackage name="gnome-shell-extensions-common"/>
       <repopackage name="gnome-shell-extensions-common-lang"/>
       <repopackage name="gnome-shell-lang"/>
+      <repopackage name="gnome-shell-search-provider-bijiben"/>
+      <repopackage name="gnome-shell-search-provider-contacts"/>
       <repopackage name="gnome-shell-search-provider-documents"/>
       <repopackage name="gnome-shell-search-provider-epiphany"/>
       <repopackage name="gnome-shell-search-provider-gnome-calculator"/>
@@ -956,6 +983,7 @@
       <repopackage name="hfsutils"/>
       <repopackage name="hicolor-icon-theme"/>
       <repopackage name="hicolor-icon-theme-branding-openSUSE"/>
+      <repopackage name="highlight"/>
       <repopackage name="hostname"/>
       <repopackage name="hp2xx"/>
       <repopackage name="hplip"/>
@@ -1554,6 +1582,7 @@
       <repopackage name="libcairo2"/>
       <repopackage name="libcairomm-1_0-1"/>
       <repopackage name="libcamd2"/>
+      <repopackage name="libcamel-1_2-62"/>
       <repopackage name="libcanberra-gtk-module-common"/>
       <repopackage name="libcanberra-gtk0"/>
       <repopackage name="libcanberra-gtk2-module"/>
@@ -1577,6 +1606,7 @@
       <repopackage name="libcetcd0"/>
       <repopackage name="libcfg6"/>
       <repopackage name="libcfitsio8"/>
+      <repopackage name="libchamplain-0_12-0"/>
       <repopackage name="libcheese-common"/>
       <repopackage name="libcheese-gtk25"/>
       <repopackage name="libcheese8"/>
@@ -1666,10 +1696,18 @@
       <repopackage name="libdvdread7"/>
       <repopackage name="libdw1"/>
       <repopackage name="libe-book-0_1-1"/>
+      <repopackage name="libebackend-1_2-10"/>
       <repopackage name="libebl-plugins"/>
       <repopackage name="libebml4"/>
+      <repopackage name="libebook-1_2-20"/>
+      <repopackage name="libebook-contacts-1_2-3"/>
+      <repopackage name="libecal-2_0-1"/>
       <repopackage name="libeconf0"/>
       <repopackage name="libecpg6"/>
+      <repopackage name="libedata-book-1_2-26"/>
+      <repopackage name="libedata-cal-2_0-1"/>
+      <repopackage name="libedataserver-1_2-24"/>
+      <repopackage name="libedataserverui-1_2-2"/>
       <repopackage name="libedc_ecc1_0"/>
       <repopackage name="libedc_ecc_dec1_0"/>
       <repopackage name="libedit0"/>
@@ -1737,6 +1775,9 @@
       <repopackage name="libfm-gtk4"/>
       <repopackage name="libfm-lang"/>
       <repopackage name="libfm4"/>
+      <repopackage name="libfolks-data"/>
+      <repopackage name="libfolks-eds25"/>
+      <repopackage name="libfolks25"/>
       <repopackage name="libfont-specimen0"/>
       <repopackage name="libfontconfig1"/>
       <repopackage name="libfontenc-devel"/>
@@ -1826,6 +1867,7 @@
       <repopackage name="libgmp10"/>
       <repopackage name="libgmpxx4"/>
       <repopackage name="libgnome-autoar-0-0"/>
+      <repopackage name="libgnome-autoar-gtk-0-0"/>
       <repopackage name="libgnome-bluetooth13"/>
       <repopackage name="libgnome-desktop-3-18"/>
       <repopackage name="libgnome-desktop-3_0-common"/>
@@ -1952,6 +1994,7 @@
       <repopackage name="libibus-1_0-5"/>
       <repopackage name="libibverbs"/>
       <repopackage name="libibverbs1"/>
+      <repopackage name="libical-glib3"/>
       <repopackage name="libical3"/>
       <repopackage name="libICE-devel"/>
       <repopackage name="libICE6"/>
@@ -2475,6 +2518,7 @@
       <repopackage name="libproxy1-pacrunner-webkit"/>
       <repopackage name="libpskc0"/>
       <repopackage name="libpsl5"/>
+      <repopackage name="libpst4"/>
       <repopackage name="libpt2_10_11"/>
       <repopackage name="libpulse-mainloop-glib0"/>
       <repopackage name="libpulse0"/>
@@ -5085,6 +5129,7 @@
       <repopackage name="typelib-1_0-AccountsService-1_0"/>
       <repopackage name="typelib-1_0-Atk-1_0"/>
       <repopackage name="typelib-1_0-Atspi-2_0"/>
+      <repopackage name="typelib-1_0-Champlain-0_12"/>
       <repopackage name="typelib-1_0-Cheese-3_0"/>
       <repopackage name="typelib-1_0-Clutter-1_0"/>
       <repopackage name="typelib-1_0-Cogl-1_0"/>
@@ -5098,7 +5143,9 @@
       <repopackage name="typelib-1_0-GdkPixbuf-2_0"/>
       <repopackage name="typelib-1_0-Gdm-1_0"/>
       <repopackage name="typelib-1_0-Geoclue-2_0"/>
+      <repopackage name="typelib-1_0-GeocodeGlib-1_0"/>
       <repopackage name="typelib-1_0-GES-1_0"/>
+      <repopackage name="typelib-1_0-GFBGraph-0_2"/>
       <repopackage name="typelib-1_0-GjsPrivate-1_0"/>
       <repopackage name="typelib-1_0-GMenu-3_0"/>
       <repopackage name="typelib-1_0-GnomeBluetooth-1_0"/>
diff --git a/openSUSE-dvd5-dvd-x86_64.kiwi b/openSUSE-dvd5-dvd-x86_64.kiwi
index cf800455..3de072dc 100644
--- a/openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-dvd5-dvd-x86_64.kiwi
@@ -233,8 +233,8 @@
       <repopackage name="bcm20702a1-firmware"/>
       <repopackage name="bcm43xx-firmware"/>
       <repopackage name="bea-stax-api"/>
-      <repopackage name="bijiben" arch="x86_64"/>
-      <repopackage name="bijiben-lang" arch="x86_64"/>
+      <repopackage name="bijiben"/>
+      <repopackage name="bijiben-lang"/>
       <repopackage name="bin86"/>
       <repopackage name="bind"/>
       <repopackage name="bind-chrootenv"/>
@@ -258,8 +258,8 @@
       <repopackage name="bluez-qt-imports"/>
       <repopackage name="bluez-qt-udev"/>
       <repopackage name="bluez-tools"/>
-      <repopackage name="bogofilter-common" arch="x86_64"/>
-      <repopackage name="bogofilter-db" arch="x86_64"/>
+      <repopackage name="bogofilter-common"/>
+      <repopackage name="bogofilter-db"/>
       <repopackage name="bolt"/>
       <repopackage name="boost-devel"/>
       <repopackage name="boost-jam"/>
@@ -480,7 +480,7 @@
       <repopackage name="efont-unicode-bitmap-fonts"/>
       <repopackage name="ekiga"/>
       <repopackage name="ekiga-lang"/>
-      <repopackage name="ekiga-plugins-evolution" arch="x86_64"/>
+      <repopackage name="ekiga-plugins-evolution"/>
       <repopackage name="elementary-xfce-icon-theme"/>
       <repopackage name="elfutils"/>
       <repopackage name="elfutils-lang"/>
@@ -521,18 +521,18 @@
       <repopackage name="evince-plugin-pdfdocument"/>
       <repopackage name="evince-plugin-tiffdocument"/>
       <repopackage name="evince-plugin-xpsdocument"/>
-      <repopackage name="evolution" arch="x86_64"/>
-      <repopackage name="evolution-data-server" arch="x86_64"/>
-      <repopackage name="evolution-data-server-lang" arch="x86_64"/>
-      <repopackage name="evolution-ews" arch="x86_64"/>
-      <repopackage name="evolution-ews-lang" arch="x86_64"/>
-      <repopackage name="evolution-lang" arch="x86_64"/>
-      <repopackage name="evolution-plugin-bogofilter" arch="x86_64"/>
-      <repopackage name="evolution-plugin-pst-import" arch="x86_64"/>
-      <repopackage name="evolution-plugin-rss" arch="x86_64"/>
-      <repopackage name="evolution-plugin-rss-lang" arch="x86_64"/>
-      <repopackage name="evolution-plugin-spamassassin" arch="x86_64"/>
-      <repopackage name="evolution-plugin-text-highlight" arch="x86_64"/>
+      <repopackage name="evolution"/>
+      <repopackage name="evolution-data-server"/>
+      <repopackage name="evolution-data-server-lang"/>
+      <repopackage name="evolution-ews"/>
+      <repopackage name="evolution-ews-lang"/>
+      <repopackage name="evolution-lang"/>
+      <repopackage name="evolution-plugin-bogofilter"/>
+      <repopackage name="evolution-plugin-pst-import"/>
+      <repopackage name="evolution-plugin-rss"/>
+      <repopackage name="evolution-plugin-rss-lang"/>
+      <repopackage name="evolution-plugin-spamassassin"/>
+      <repopackage name="evolution-plugin-text-highlight"/>
       <repopackage name="exif"/>
       <repopackage name="exiftool"/>
       <repopackage name="exim"/>
@@ -594,7 +594,7 @@
       <repopackage name="flatpak-builder"/>
       <repopackage name="flex"/>
       <repopackage name="flute"/>
-      <repopackage name="folks-lang" arch="x86_64"/>
+      <repopackage name="folks-lang"/>
       <repopackage name="fontconfig"/>
       <repopackage name="fontconfig-devel"/>
       <repopackage name="fontconfig-lang"/>
@@ -714,8 +714,8 @@
       <repopackage name="gitg-lang"/>
       <repopackage name="gitk"/>
       <repopackage name="gjs"/>
-      <repopackage name="glabels" arch="x86_64"/>
-      <repopackage name="glabels-lang" arch="x86_64"/>
+      <repopackage name="glabels"/>
+      <repopackage name="glabels-lang"/>
       <repopackage name="glade"/>
       <repopackage name="glade-lang"/>
       <repopackage name="glassfish-servlet-api"/>
@@ -752,8 +752,8 @@
       <repopackage name="gnome-clocks-lang"/>
       <repopackage name="gnome-color-manager"/>
       <repopackage name="gnome-color-manager-lang"/>
-      <repopackage name="gnome-contacts" arch="x86_64"/>
-      <repopackage name="gnome-contacts-lang" arch="x86_64"/>
+      <repopackage name="gnome-contacts"/>
+      <repopackage name="gnome-contacts-lang"/>
       <repopackage name="gnome-control-center"/>
       <repopackage name="gnome-control-center-color"/>
       <repopackage name="gnome-control-center-goa"/>
@@ -780,8 +780,8 @@
       <repopackage name="gnome-logs-lang"/>
       <repopackage name="gnome-mahjongg"/>
       <repopackage name="gnome-mahjongg-lang"/>
-      <repopackage name="gnome-maps" arch="x86_64"/>
-      <repopackage name="gnome-maps-lang" arch="x86_64"/>
+      <repopackage name="gnome-maps"/>
+      <repopackage name="gnome-maps-lang"/>
       <repopackage name="gnome-menus"/>
       <repopackage name="gnome-menus-branding-openSUSE"/>
       <repopackage name="gnome-menus-lang"/>
@@ -808,15 +808,15 @@
       <repopackage name="gnome-settings-daemon"/>
       <repopackage name="gnome-settings-daemon-lang"/>
       <repopackage name="gnome-shell"/>
-      <repopackage name="gnome-shell-calendar" arch="x86_64"/>
+      <repopackage name="gnome-shell-calendar"/>
       <repopackage name="gnome-shell-classic"/>
       <repopackage name="gnome-shell-classic-session"/>
       <repopackage name="gnome-shell-extension-desktop-icons"/>
       <repopackage name="gnome-shell-extensions-common"/>
       <repopackage name="gnome-shell-extensions-common-lang"/>
       <repopackage name="gnome-shell-lang"/>
-      <repopackage name="gnome-shell-search-provider-bijiben" arch="x86_64"/>
-      <repopackage name="gnome-shell-search-provider-contacts" arch="x86_64"/>
+      <repopackage name="gnome-shell-search-provider-bijiben"/>
+      <repopackage name="gnome-shell-search-provider-contacts"/>
       <repopackage name="gnome-shell-search-provider-documents"/>
       <repopackage name="gnome-shell-search-provider-epiphany"/>
       <repopackage name="gnome-shell-search-provider-gnome-calculator"/>
@@ -1012,7 +1012,7 @@
       <repopackage name="hfsutils"/>
       <repopackage name="hicolor-icon-theme"/>
       <repopackage name="hicolor-icon-theme-branding-openSUSE"/>
-      <repopackage name="highlight" arch="x86_64"/>
+      <repopackage name="highlight"/>
       <repopackage name="hostname"/>
       <repopackage name="hp2xx"/>
       <repopackage name="hplip"/>
@@ -1630,7 +1630,7 @@
       <repopackage name="libcairo2-32bit" arch="x86_64"/>
       <repopackage name="libcairomm-1_0-1"/>
       <repopackage name="libcamd2"/>
-      <repopackage name="libcamel-1_2-62" arch="x86_64"/>
+      <repopackage name="libcamel-1_2-62"/>
       <repopackage name="libcanberra-gtk-module-common"/>
       <repopackage name="libcanberra-gtk0"/>
       <repopackage name="libcanberra-gtk0-32bit" arch="x86_64"/>
@@ -1658,7 +1658,7 @@
       <repopackage name="libcetcd0"/>
       <repopackage name="libcfg6"/>
       <repopackage name="libcfitsio8"/>
-      <repopackage name="libchamplain-0_12-0" arch="x86_64"/>
+      <repopackage name="libchamplain-0_12-0"/>
       <repopackage name="libcheese-common"/>
       <repopackage name="libcheese-gtk25"/>
       <repopackage name="libcheese8"/>
@@ -1761,19 +1761,19 @@
       <repopackage name="libdvdread7"/>
       <repopackage name="libdw1"/>
       <repopackage name="libe-book-0_1-1"/>
-      <repopackage name="libebackend-1_2-10" arch="x86_64"/>
+      <repopackage name="libebackend-1_2-10"/>
       <repopackage name="libebl-plugins"/>
       <repopackage name="libebml4"/>
-      <repopackage name="libebook-1_2-20" arch="x86_64"/>
-      <repopackage name="libebook-contacts-1_2-3" arch="x86_64"/>
-      <repopackage name="libecal-2_0-1" arch="x86_64"/>
+      <repopackage name="libebook-1_2-20"/>
+      <repopackage name="libebook-contacts-1_2-3"/>
+      <repopackage name="libecal-2_0-1"/>
       <repopackage name="libeconf0"/>
       <repopackage name="libeconf0-32bit" arch="x86_64"/>
       <repopackage name="libecpg6"/>
-      <repopackage name="libedata-book-1_2-26" arch="x86_64"/>
-      <repopackage name="libedata-cal-2_0-1" arch="x86_64"/>
-      <repopackage name="libedataserver-1_2-24" arch="x86_64"/>
-      <repopackage name="libedataserverui-1_2-2" arch="x86_64"/>
+      <repopackage name="libedata-book-1_2-26"/>
+      <repopackage name="libedata-cal-2_0-1"/>
+      <repopackage name="libedataserver-1_2-24"/>
+      <repopackage name="libedataserverui-1_2-2"/>
       <repopackage name="libedc_ecc1_0"/>
       <repopackage name="libedc_ecc_dec1_0"/>
       <repopackage name="libedit0"/>
@@ -1845,9 +1845,9 @@
       <repopackage name="libfm-gtk4"/>
       <repopackage name="libfm-lang"/>
       <repopackage name="libfm4"/>
-      <repopackage name="libfolks-data" arch="x86_64"/>
-      <repopackage name="libfolks-eds25" arch="x86_64"/>
-      <repopackage name="libfolks25" arch="x86_64"/>
+      <repopackage name="libfolks-data"/>
+      <repopackage name="libfolks-eds25"/>
+      <repopackage name="libfolks25"/>
       <repopackage name="libfont-specimen0"/>
       <repopackage name="libfontconfig1"/>
       <repopackage name="libfontconfig1-32bit" arch="x86_64"/>
@@ -1949,7 +1949,7 @@
       <repopackage name="libgmp10-32bit" arch="x86_64"/>
       <repopackage name="libgmpxx4"/>
       <repopackage name="libgnome-autoar-0-0"/>
-      <repopackage name="libgnome-autoar-gtk-0-0" arch="x86_64"/>
+      <repopackage name="libgnome-autoar-gtk-0-0"/>
       <repopackage name="libgnome-bluetooth13"/>
       <repopackage name="libgnome-desktop-3-18"/>
       <repopackage name="libgnome-desktop-3_0-common"/>
@@ -2088,7 +2088,7 @@
       <repopackage name="libibus-1_0-5-32bit" arch="x86_64"/>
       <repopackage name="libibverbs"/>
       <repopackage name="libibverbs1"/>
-      <repopackage name="libical-glib3" arch="x86_64"/>
+      <repopackage name="libical-glib3"/>
       <repopackage name="libical3"/>
       <repopackage name="libICE-devel"/>
       <repopackage name="libICE6"/>
@@ -2647,7 +2647,7 @@
       <repopackage name="libproxy1-pacrunner-webkit"/>
       <repopackage name="libpskc0"/>
       <repopackage name="libpsl5"/>
-      <repopackage name="libpst4" arch="x86_64"/>
+      <repopackage name="libpst4"/>
       <repopackage name="libpt2_10_11"/>
       <repopackage name="libpulse-mainloop-glib0"/>
       <repopackage name="libpulse0"/>
@@ -5366,7 +5366,7 @@
       <repopackage name="typelib-1_0-AccountsService-1_0"/>
       <repopackage name="typelib-1_0-Atk-1_0"/>
       <repopackage name="typelib-1_0-Atspi-2_0"/>
-      <repopackage name="typelib-1_0-Champlain-0_12" arch="x86_64"/>
+      <repopackage name="typelib-1_0-Champlain-0_12"/>
       <repopackage name="typelib-1_0-Cheese-3_0"/>
       <repopackage name="typelib-1_0-Clutter-1_0"/>
       <repopackage name="typelib-1_0-Cogl-1_0"/>
@@ -5380,9 +5380,9 @@
       <repopackage name="typelib-1_0-GdkPixbuf-2_0"/>
       <repopackage name="typelib-1_0-Gdm-1_0"/>
       <repopackage name="typelib-1_0-Geoclue-2_0"/>
-      <repopackage name="typelib-1_0-GeocodeGlib-1_0" arch="x86_64"/>
+      <repopackage name="typelib-1_0-GeocodeGlib-1_0"/>
       <repopackage name="typelib-1_0-GES-1_0"/>
-      <repopackage name="typelib-1_0-GFBGraph-0_2" arch="x86_64"/>
+      <repopackage name="typelib-1_0-GFBGraph-0_2"/>
       <repopackage name="typelib-1_0-GjsPrivate-1_0"/>
       <repopackage name="typelib-1_0-GMenu-3_0"/>
       <repopackage name="typelib-1_0-GnomeBluetooth-1_0"/>
diff --git a/unsorted.yml b/unsorted.yml
index 2f36f968..d13dfe29 100644
--- a/unsorted.yml
+++ b/unsorted.yml
@@ -1125,8 +1125,6 @@ unsorted:
   - biboumi 
   - bibtool 
   - bibview 
-  - bijiben: [i586] 
-  - bijiben-lang: [i586] 
   - bind-devel 
   - bind-devel-32bit: [x86_64] 
   - bind-lwresd 
@@ -1200,8 +1198,6 @@ unsorted:
   - bmon 
   - bnd-maven-plugin 
   - bnd-maven-plugin-javadoc 
-  - bogofilter-common: [i586] 
-  - bogofilter-db: [i586] 
   - bogofilter-doc 
   - bogofilter-kyotocabinet 
   - bogofilter-sqlite3 
@@ -2529,7 +2525,6 @@ unsorted:
   - eiciel-lang 
   - eigen3-devel 
   - eigen3-doc 
-  - ekiga-plugins-evolution: [i586] 
   - elektra 
   - elektra-qt-gui 
   - elementary 
@@ -2697,21 +2692,9 @@ unsorted:
   - evince-devel 
   - evince-plugin-psdocument 
   - evmctl: [i586] 
-  - evolution: [i586] 
-  - evolution-data-server: [i586] 
   - evolution-data-server-32bit: [x86_64] 
   - evolution-data-server-devel 
-  - evolution-data-server-lang: [i586] 
   - evolution-devel 
-  - evolution-ews: [i586] # suggested by dvd:suggested:patterns-gnome-gnome 
-  - evolution-ews-lang: [i586] 
-  - evolution-lang: [i586] 
-  - evolution-plugin-bogofilter: [i586] # suggested by dvd:suggested:patterns-gnome-gnome 
-  - evolution-plugin-pst-import: [i586] # suggested by dvd:suggested:patterns-gnome-gnome 
-  - evolution-plugin-rss: [i586] # suggested by dvd:suggested:patterns-gnome-gnome 
-  - evolution-plugin-rss-lang: [i586] 
-  - evolution-plugin-spamassassin: [i586] # suggested by dvd:suggested:patterns-gnome-gnome 
-  - evolution-plugin-text-highlight: [i586] # suggested by dvd:suggested:patterns-gnome-gnome 
   - evtest 
   - exa: [x86_64] 
   - exaile 
@@ -3044,7 +3027,6 @@ unsorted:
   - folder-color-common 
   - folder-color-common-lang 
   - folks-devel 
-  - folks-lang: [i586] 
   - folks-tools 
   - foma 
   - foma-devel 
@@ -4301,9 +4283,7 @@ unsorted:
   - gkrellm-lang 
   - gkrellmd 
   - gl2ps-devel 
-  - glabels: [i586] # suggested by dvd:suggested:patterns-gnome-gnome 
   - glabels-devel 
-  - glabels-lang: [i586] 
   - glade-catalog-anjuta 
   - glade-catalog-evolution 
   - glade-catalog-gitg 
@@ -4416,8 +4396,6 @@ unsorted:
   - gnome-calendar-lang 
   - gnome-colors-icon-theme 
   - gnome-common 
-  - gnome-contacts: [i586] 
-  - gnome-contacts-lang: [i586] 
   - gnome-control-center-devel 
   - gnome-desktop2 
   - gnome-desktop2-lang 
@@ -4449,8 +4427,6 @@ unsorted:
   - gnome-klotski 
   - gnome-klotski-lang 
   - gnome-latex 
-  - gnome-maps: [i586] 
-  - gnome-maps-lang: [i586] 
   - gnome-menus-branding-SLED 
   - gnome-menus-branding-upstream 
   - gnome-menus-devel 
@@ -4477,15 +4453,12 @@ unsorted:
   - gnome-search-tool 
   - gnome-search-tool-lang 
   - gnome-settings-daemon-devel 
-  - gnome-shell-calendar: [i586] 
   - gnome-shell-devel 
   - gnome-shell-extension-gpaste 
   - gnome-shell-extension-hamster-time-tracker 
   - gnome-shell-extension-onboard 
   - gnome-shell-extension-terminus 
-  - gnome-shell-search-provider-bijiben: [i586] 
   - gnome-shell-search-provider-boxes 
-  - gnome-shell-search-provider-contacts: [i586] 
   - gnome-shell-search-provider-eolie 
   - gnome-shell-search-provider-gnome-calendar 
   - gnome-shell-search-provider-gnome-recipes 
@@ -5257,7 +5230,6 @@ unsorted:
   - hiawatha 
   - hiawatha-letsencrypt 
   - hibiscus 
-  - highlight: [i586] 
   - highlight-gui 
   - highlight-gui-lang 
   - himeno 
@@ -8035,7 +8007,6 @@ unsorted:
   - libcal3d12 
   - libcalc2 
   - libcamd-doc 
-  - libcamel-1_2-62: [i586] 
   - libcamel-1_2-62-32bit: [x86_64] 
   - libcamera-devel 
   - libcamera-suse1 
@@ -8113,7 +8084,6 @@ unsorted:
   - libcfile1 
   - libcgns3_4 
   - libchafa0 
-  - libchamplain-0_12-0: [i586] 
   - libchamplain-devel 
   - libchardet-devel 
   - libchardet1 
@@ -8498,19 +8468,15 @@ unsorted:
   - libeXosip2-12 
   - libeXosip2-devel 
   - libeb16 
-  - libebackend-1_2-10: [i586] 
   - libebackend-1_2-10-32bit: [x86_64] 
   - libebl-devel 
   - libebl-plugins-32bit: [x86_64] 
   - libebml-devel 
   - libebml4-32bit: [x86_64] 
-  - libebook-1_2-20: [i586] 
   - libebook-1_2-20-32bit: [x86_64] 
-  - libebook-contacts-1_2-3: [i586] 
   - libebook-contacts-1_2-3-32bit: [x86_64] 
   - libebur128-1 
   - libebur128-devel 
-  - libecal-2_0-1: [i586] 
   - libecal-2_0-1-32bit: [x86_64] 
   - libecholib1_3 
   - libecholib1_3-devel 
@@ -8524,13 +8490,9 @@ unsorted:
   - libecryptfs1 
   - libecryptfs1-32bit: [x86_64] 
   - libector1 
-  - libedata-book-1_2-26: [i586] 
   - libedata-book-1_2-26-32bit: [x86_64] 
-  - libedata-cal-2_0-1: [i586] 
   - libedata-cal-2_0-1-32bit: [x86_64] 
-  - libedataserver-1_2-24: [i586] 
   - libedataserver-1_2-24-32bit: [x86_64] 
-  - libedataserverui-1_2-2: [i586] 
   - libedataserverui-1_2-2-32bit: [x86_64] 
   - libedit-devel 
   - libedit0-32bit: [x86_64] 
@@ -8756,11 +8718,8 @@ unsorted:
   - libfmt5-32bit: [x86_64] 
   - libfole-devel 
   - libfole1 
-  - libfolks-data: [i586] 
-  - libfolks-eds25: [i586] 
   - libfolks-telepathy25 
   - libfolks-tracker25 
-  - libfolks25: [i586] 
   - libfoma-hfst0 
   - libfoma0 
   - libfontenc-devel-32bit: [x86_64] 
@@ -8981,7 +8940,6 @@ unsorted:
   - libgmime-3_0-0-32bit: [x86_64] 
   - libgmpxx4-32bit: [x86_64] 
   - libgmsh4_4 
-  - libgnome-autoar-gtk-0-0: [i586] 
   - libgnome-desktop-2-17 
   - libgnome-desktop-2-17-32bit: [x86_64] 
   - libgnome-desktop-2-devel 
@@ -9401,7 +9359,6 @@ unsorted:
   - libical-doc 
   - libical-glib-devel 
   - libical-glib-doc 
-  - libical-glib3: [i586] 
   - libical-glib3-32bit: [x86_64] 
   - libical3-32bit: [x86_64] 
   - libicecream-devel 
@@ -10691,7 +10648,6 @@ unsorted:
   - libpspell15-32bit: [x86_64] 
   - libpst 
   - libpst-devel 
-  - libpst4: [i586] 
   - libpt-devel 
   - libpt2_10_11-plugins-avc 
   - libpt2_10_11-plugins-pulse 
@@ -32209,7 +32165,6 @@ unsorted:
   - typelib-1_0-Caja-2_0 
   - typelib-1_0-Camel-1_2 
   - typelib-1_0-Caribou-1_0 
-  - typelib-1_0-Champlain-0_12: [i586] 
   - typelib-1_0-CinnamonDesktop-3_0 
   - typelib-1_0-CjsPrivate-1_0 
   - typelib-1_0-CloudProviders-0_3_0 
@@ -32246,7 +32201,6 @@ unsorted:
   - typelib-1_0-Fwupd-2_0 
   - typelib-1_0-GCab-1_0 
   - typelib-1_0-GExiv2-0_10 
-  - typelib-1_0-GFBGraph-0_2: [i586] 
   - typelib-1_0-GMime-2_6 
   - typelib-1_0-GMime-3_0 
   - typelib-1_0-GOffice-0_10 
@@ -32271,7 +32225,6 @@ unsorted:
   - typelib-1_0-Gee-0_8 
   - typelib-1_0-Gee-1_0 
   - typelib-1_0-Gegl-0_4 
-  - typelib-1_0-GeocodeGlib-1_0: [i586] 
   - typelib-1_0-Gepub-0_6 
   - typelib-1_0-Ggit-1_0 
   - typelib-1_0-Gitg-1_0