diff --git a/dvd.group b/dvd.group
index 6c21859f..a1057b5c 100644
--- a/dvd.group
+++ b/dvd.group
@@ -332,7 +332,6 @@
     <package name="clang8-checker" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_ide -->
     <package name="claws-mail" supportstatus="unsupported"/> <!-- reason: dvd:patterns-lxde-lxde -->
     <package name="claws-mail-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-lxde-lxde -->
-    <package name="clazy" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_ide -->
     <package name="clicfs" supportstatus="unsupported"/> <!-- reason: dvd:clicfs -->
     <package name="clutter-gtk-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="clutter-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -581,7 +580,6 @@
     <package name="firewalld-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="flac" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="flatpak" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <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 -->
@@ -721,12 +719,6 @@
     <package name="gnome-backgrounds-lang" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="gnome-bluetooth" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="gnome-bluetooth-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="gnome-builder" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
-    <package name="gnome-builder-doc" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
-    <package name="gnome-builder-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
-    <package name="gnome-builder-plugin-jedi" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
-    <package name="gnome-builder-plugin-jhbuild" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
-    <package name="gnome-builder-plugin-vala-pack" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="gnome-calculator" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="gnome-calculator-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="gnome-characters" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -1638,7 +1630,6 @@
     <package name="libKPimSMTP5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="libKScreenLocker5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="libKasten4" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_ide -->
-    <package name="libLLVM7" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_ide -->
     <package name="libLLVM8" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libLTO8" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_ide -->
     <package name="libMagick++-7_Q16HDRI4" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-technical_writing -->
@@ -1898,7 +1889,6 @@
     <package name="libcholmod3" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libchromaprint1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="libclamav9" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
-    <package name="libclang7" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_ide -->
     <package name="libclang8" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="libclastfm0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-xfce-xfce -->
     <package name="libclucene-contribs-lib1" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
@@ -2319,7 +2309,6 @@
     <package name="libjson-c4" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libjson-glib-1_0-0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libjsoncpp19" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_edutainment -->
-    <package name="libjsonrpc-glib-1_0-1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="libjte1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libkaccounts1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="libkactivities6" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
@@ -2859,7 +2848,6 @@
     <package name="libteamdctl0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libtelepathy-glib0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libtelepathy-logger3" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="libtemplate_glib-1_0-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="libtevent-util0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libtevent0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libthai-data" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
@@ -4123,7 +4111,6 @@
     <package name="python3-constantly" supportstatus="unsupported"/> <!-- reason: dvd:salt-master -->
     <package name="python3-createrepo_c" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="python3-cryptography" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="python3-cssselect" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="python3-cupshelpers" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="python3-curses" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="python3-dbm" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
@@ -4147,14 +4134,12 @@
     <package name="python3-idna" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="python3-incremental" supportstatus="unsupported"/> <!-- reason: dvd:salt-master -->
     <package name="python3-ipaddr" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_server -->
-    <package name="python3-jedi" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="python3-kiwisolver" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-directory_server -->
     <package name="python3-ldb" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="python3-libvirt-python" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_server -->
     <package name="python3-libxml2-python" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_server -->
     <package name="python3-linux-procfs" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="python3-louis" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="python3-lxml" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="python3-matplotlib" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-directory_server -->
     <package name="python3-matplotlib-cairo" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="python3-matplotlib-gtk3" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
@@ -4164,7 +4149,6 @@
     <package name="python3-olefile" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-directory_server -->
     <package name="python3-packaging" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="python3-paramiko" supportstatus="unsupported"/> <!-- reason: dvd:salt-master -->
-    <package name="python3-parso" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="python3-pexpect" supportstatus="unsupported"/> <!-- reason: dvd:patterns-xfce-xfce -->
     <package name="python3-pip" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="python3-ply" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -4883,8 +4867,6 @@
     <package name="sysfsutils" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-laptop -->
     <package name="syslinux" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="syslog-service" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="sysprof" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
-    <package name="sysprof-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="system-config-printer" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="system-config-printer-applet" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="system-config-printer-common" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -4939,7 +4921,6 @@
     <package name="telepathy-mission-control" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="telepathy-mission-control-plugin-goa" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="telnet" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="template-glib-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="terminfo" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="terminfo-base" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="terminfo-screen" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
@@ -5079,12 +5060,10 @@
     <package name="typelib-1_0-Soup-2_4" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="typelib-1_0-TelepathyGlib-0_12" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="typelib-1_0-TelepathyLogger-0_2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="typelib-1_0-Template-1_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="typelib-1_0-TotemPlParser-1_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="typelib-1_0-Tracker-2_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="typelib-1_0-TrackerControl-2_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="typelib-1_0-UpowerGlib-1_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="typelib-1_0-Vte-2.91" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="typelib-1_0-WebKit2-4_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="typelib-1_0-Wnck-3_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="typelib-1_0-Zpj-0_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -5619,9 +5598,16 @@
     <package name="efibootmgr" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <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="flatpak-builder" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <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:patterns-media-rest_dvd -->
     <package name="glibc-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
+    <package name="gnome-builder" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
+    <package name="gnome-builder-doc" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
+    <package name="gnome-builder-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
+    <package name="gnome-builder-plugin-jedi" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
+    <package name="gnome-builder-plugin-jhbuild" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
+    <package name="gnome-builder-plugin-vala-pack" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="gnome-keyring-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="gnome-keyring-pam-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="gnutls" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
@@ -5721,6 +5707,7 @@
     <package name="libjbig2-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="libjpeg8-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="libjson-c4-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
+    <package name="libjsonrpc-glib-1_0-1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="libkeyutils1-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="liblcms2-2-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="libldap-2_4-2-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
@@ -5778,6 +5765,7 @@
     <package name="libtalloc2-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libtasn1-6-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libtdb1-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
+    <package name="libtemplate_glib-1_0-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="libtevent-util0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libtevent0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libthai0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
@@ -5828,10 +5816,14 @@
     <package name="python3-argcomplete" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-directory_server -->
     <package name="python3-argparse-manpage" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-directory_server -->
     <package name="python3-audit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-directory_server -->
+    <package name="python3-cssselect" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="python3-ipy" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-directory_server -->
+    <package name="python3-jedi" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="python3-ldap" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-directory_server -->
     <package name="python3-libguestfs" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+    <package name="python3-lxml" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="python3-networkx" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-directory_server -->
+    <package name="python3-parso" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="python3-passlib" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="python3-policycoreutils" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-directory_server -->
     <package name="python3-pydot" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-directory_server -->
@@ -5853,7 +5845,12 @@
     <package name="sni-qt-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="sssd-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="supermin" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+    <package name="sysprof" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
+    <package name="sysprof-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="systemd-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
+    <package name="template-glib-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
+    <package name="typelib-1_0-Template-1_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
+    <package name="typelib-1_0-Vte-2.91" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="uget-integrator" supportstatus="unsupported"/> <!-- reason: dvd:patterns-lxde-lxde -->
     <package name="virt-sandbox" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="xen" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-xen_server -->
diff --git a/openSUSE-dvd5-dvd-i586.kiwi b/openSUSE-dvd5-dvd-i586.kiwi
index 6a41bdf6..e41e746d 100644
--- a/openSUSE-dvd5-dvd-i586.kiwi
+++ b/openSUSE-dvd5-dvd-i586.kiwi
@@ -330,7 +330,6 @@
       <repopackage name="clang8-checker"/>
       <repopackage name="claws-mail"/>
       <repopackage name="claws-mail-lang"/>
-      <repopackage name="clazy"/>
       <repopackage name="clicfs"/>
       <repopackage name="clutter-gtk-lang"/>
       <repopackage name="clutter-lang"/>
@@ -581,7 +580,6 @@
       <repopackage name="firewalld-lang"/>
       <repopackage name="flac"/>
       <repopackage name="flatpak"/>
-      <repopackage name="flatpak-builder"/>
       <repopackage name="flex"/>
       <repopackage name="flute"/>
       <repopackage name="folks-lang"/>
@@ -725,12 +723,6 @@
       <repopackage name="gnome-backgrounds-lang"/>
       <repopackage name="gnome-bluetooth"/>
       <repopackage name="gnome-bluetooth-lang"/>
-      <repopackage name="gnome-builder"/>
-      <repopackage name="gnome-builder-doc"/>
-      <repopackage name="gnome-builder-lang"/>
-      <repopackage name="gnome-builder-plugin-jedi"/>
-      <repopackage name="gnome-builder-plugin-jhbuild"/>
-      <repopackage name="gnome-builder-plugin-vala-pack"/>
       <repopackage name="gnome-calculator"/>
       <repopackage name="gnome-calculator-lang"/>
       <repopackage name="gnome-characters"/>
@@ -1614,7 +1606,6 @@
       <repopackage name="libcholmod3"/>
       <repopackage name="libchromaprint1"/>
       <repopackage name="libclamav9"/>
-      <repopackage name="libclang7"/>
       <repopackage name="libclang8"/>
       <repopackage name="libclastfm0"/>
       <repopackage name="libclucene-contribs-lib1"/>
@@ -2049,7 +2040,6 @@
       <repopackage name="libjson-c4"/>
       <repopackage name="libjson-glib-1_0-0"/>
       <repopackage name="libjsoncpp19"/>
-      <repopackage name="libjsonrpc-glib-1_0-1"/>
       <repopackage name="libjte1"/>
       <repopackage name="libJudy1"/>
       <repopackage name="libkaccounts1"/>
@@ -2287,7 +2277,6 @@
       <repopackage name="liblilv-0-0"/>
       <repopackage name="liblink-grammar5"/>
       <repopackage name="liblirc_client0"/>
-      <repopackage name="libLLVM7"/>
       <repopackage name="libLLVM8"/>
       <repopackage name="liblmdb-0_9_23"/>
       <repopackage name="libloader"/>
@@ -2822,7 +2811,6 @@
       <repopackage name="libteamdctl0"/>
       <repopackage name="libtelepathy-glib0"/>
       <repopackage name="libtelepathy-logger3"/>
-      <repopackage name="libtemplate_glib-1_0-0"/>
       <repopackage name="libtevent-util0"/>
       <repopackage name="libtevent0"/>
       <repopackage name="libthai-data"/>
@@ -4163,7 +4151,6 @@
       <repopackage name="python3-constantly"/>
       <repopackage name="python3-createrepo_c"/>
       <repopackage name="python3-cryptography"/>
-      <repopackage name="python3-cssselect"/>
       <repopackage name="python3-cupshelpers"/>
       <repopackage name="python3-curses"/>
       <repopackage name="python3-Cycler"/>
@@ -4188,7 +4175,6 @@
       <repopackage name="python3-idna"/>
       <repopackage name="python3-incremental"/>
       <repopackage name="python3-ipaddr"/>
-      <repopackage name="python3-jedi"/>
       <repopackage name="python3-Jinja2"/>
       <repopackage name="python3-kiwisolver"/>
       <repopackage name="python3-ldb"/>
@@ -4196,7 +4182,6 @@
       <repopackage name="python3-libxml2-python"/>
       <repopackage name="python3-linux-procfs"/>
       <repopackage name="python3-louis"/>
-      <repopackage name="python3-lxml"/>
       <repopackage name="python3-M2Crypto"/>
       <repopackage name="python3-MarkupSafe"/>
       <repopackage name="python3-matplotlib"/>
@@ -4208,7 +4193,6 @@
       <repopackage name="python3-olefile"/>
       <repopackage name="python3-packaging"/>
       <repopackage name="python3-paramiko"/>
-      <repopackage name="python3-parso"/>
       <repopackage name="python3-pexpect"/>
       <repopackage name="python3-Pillow"/>
       <repopackage name="python3-pip"/>
@@ -4935,8 +4919,6 @@
       <repopackage name="sysfsutils"/>
       <repopackage name="syslinux"/>
       <repopackage name="syslog-service"/>
-      <repopackage name="sysprof"/>
-      <repopackage name="sysprof-lang"/>
       <repopackage name="system-config-printer"/>
       <repopackage name="system-config-printer-applet"/>
       <repopackage name="system-config-printer-common"/>
@@ -4991,7 +4973,6 @@
       <repopackage name="telepathy-mission-control"/>
       <repopackage name="telepathy-mission-control-plugin-goa"/>
       <repopackage name="telnet"/>
-      <repopackage name="template-glib-lang"/>
       <repopackage name="terminfo"/>
       <repopackage name="terminfo-base"/>
       <repopackage name="terminfo-screen"/>
@@ -5132,12 +5113,10 @@
       <repopackage name="typelib-1_0-Soup-2_4"/>
       <repopackage name="typelib-1_0-TelepathyGlib-0_12"/>
       <repopackage name="typelib-1_0-TelepathyLogger-0_2"/>
-      <repopackage name="typelib-1_0-Template-1_0"/>
       <repopackage name="typelib-1_0-TotemPlParser-1_0"/>
       <repopackage name="typelib-1_0-Tracker-2_0"/>
       <repopackage name="typelib-1_0-TrackerControl-2_0"/>
       <repopackage name="typelib-1_0-UpowerGlib-1_0"/>
-      <repopackage name="typelib-1_0-Vte-2.91"/>
       <repopackage name="typelib-1_0-WebKit2-4_0"/>
       <repopackage name="typelib-1_0-Wnck-3_0"/>
       <repopackage name="typelib-1_0-Zpj-0_0"/>
diff --git a/openSUSE-dvd5-dvd-x86_64.kiwi b/openSUSE-dvd5-dvd-x86_64.kiwi
index 80c09ef7..54ba0c61 100644
--- a/openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-dvd5-dvd-x86_64.kiwi
@@ -340,7 +340,6 @@
       <repopackage name="clang8-checker"/>
       <repopackage name="claws-mail"/>
       <repopackage name="claws-mail-lang"/>
-      <repopackage name="clazy"/>
       <repopackage name="clicfs"/>
       <repopackage name="clutter-gtk-lang"/>
       <repopackage name="clutter-lang"/>
@@ -599,7 +598,7 @@
       <repopackage name="firewalld-lang"/>
       <repopackage name="flac"/>
       <repopackage name="flatpak"/>
-      <repopackage name="flatpak-builder"/>
+      <repopackage name="flatpak-builder" arch="x86_64"/>
       <repopackage name="flex"/>
       <repopackage name="flute"/>
       <repopackage name="folks-lang"/>
@@ -744,12 +743,12 @@
       <repopackage name="gnome-backgrounds-lang"/>
       <repopackage name="gnome-bluetooth"/>
       <repopackage name="gnome-bluetooth-lang"/>
-      <repopackage name="gnome-builder"/>
-      <repopackage name="gnome-builder-doc"/>
-      <repopackage name="gnome-builder-lang"/>
-      <repopackage name="gnome-builder-plugin-jedi"/>
-      <repopackage name="gnome-builder-plugin-jhbuild"/>
-      <repopackage name="gnome-builder-plugin-vala-pack"/>
+      <repopackage name="gnome-builder" arch="x86_64"/>
+      <repopackage name="gnome-builder-doc" arch="x86_64"/>
+      <repopackage name="gnome-builder-lang" arch="x86_64"/>
+      <repopackage name="gnome-builder-plugin-jedi" arch="x86_64"/>
+      <repopackage name="gnome-builder-plugin-jhbuild" arch="x86_64"/>
+      <repopackage name="gnome-builder-plugin-vala-pack" arch="x86_64"/>
       <repopackage name="gnome-calculator"/>
       <repopackage name="gnome-calculator-lang"/>
       <repopackage name="gnome-characters"/>
@@ -1667,7 +1666,6 @@
       <repopackage name="libcholmod3"/>
       <repopackage name="libchromaprint1"/>
       <repopackage name="libclamav9"/>
-      <repopackage name="libclang7"/>
       <repopackage name="libclang8"/>
       <repopackage name="libclastfm0"/>
       <repopackage name="libclucene-contribs-lib1"/>
@@ -2150,7 +2148,7 @@
       <repopackage name="libjson-c4-32bit" arch="x86_64"/>
       <repopackage name="libjson-glib-1_0-0"/>
       <repopackage name="libjsoncpp19"/>
-      <repopackage name="libjsonrpc-glib-1_0-1"/>
+      <repopackage name="libjsonrpc-glib-1_0-1" arch="x86_64"/>
       <repopackage name="libjte1"/>
       <repopackage name="libJudy1"/>
       <repopackage name="libkaccounts1"/>
@@ -2393,7 +2391,6 @@
       <repopackage name="liblilv-0-0"/>
       <repopackage name="liblink-grammar5"/>
       <repopackage name="liblirc_client0"/>
-      <repopackage name="libLLVM7"/>
       <repopackage name="libLLVM8"/>
       <repopackage name="liblmdb-0_9_23"/>
       <repopackage name="libloader"/>
@@ -2980,7 +2977,7 @@
       <repopackage name="libteamdctl0"/>
       <repopackage name="libtelepathy-glib0"/>
       <repopackage name="libtelepathy-logger3"/>
-      <repopackage name="libtemplate_glib-1_0-0"/>
+      <repopackage name="libtemplate_glib-1_0-0" arch="x86_64"/>
       <repopackage name="libtevent-util0"/>
       <repopackage name="libtevent-util0-32bit" arch="x86_64"/>
       <repopackage name="libtevent0"/>
@@ -4388,7 +4385,7 @@
       <repopackage name="python3-constantly"/>
       <repopackage name="python3-createrepo_c"/>
       <repopackage name="python3-cryptography"/>
-      <repopackage name="python3-cssselect"/>
+      <repopackage name="python3-cssselect" arch="x86_64"/>
       <repopackage name="python3-cupshelpers"/>
       <repopackage name="python3-curses"/>
       <repopackage name="python3-Cycler"/>
@@ -4414,7 +4411,7 @@
       <repopackage name="python3-incremental"/>
       <repopackage name="python3-ipaddr"/>
       <repopackage name="python3-ipy" arch="x86_64"/>
-      <repopackage name="python3-jedi"/>
+      <repopackage name="python3-jedi" arch="x86_64"/>
       <repopackage name="python3-Jinja2"/>
       <repopackage name="python3-kiwisolver"/>
       <repopackage name="python3-ldap" arch="x86_64"/>
@@ -4424,7 +4421,7 @@
       <repopackage name="python3-libxml2-python"/>
       <repopackage name="python3-linux-procfs"/>
       <repopackage name="python3-louis"/>
-      <repopackage name="python3-lxml"/>
+      <repopackage name="python3-lxml" arch="x86_64"/>
       <repopackage name="python3-M2Crypto"/>
       <repopackage name="python3-MarkupSafe"/>
       <repopackage name="python3-matplotlib"/>
@@ -4437,7 +4434,7 @@
       <repopackage name="python3-olefile"/>
       <repopackage name="python3-packaging"/>
       <repopackage name="python3-paramiko"/>
-      <repopackage name="python3-parso"/>
+      <repopackage name="python3-parso" arch="x86_64"/>
       <repopackage name="python3-passlib" arch="x86_64"/>
       <repopackage name="python3-pexpect"/>
       <repopackage name="python3-Pillow"/>
@@ -5185,8 +5182,8 @@
       <repopackage name="sysfsutils"/>
       <repopackage name="syslinux"/>
       <repopackage name="syslog-service"/>
-      <repopackage name="sysprof"/>
-      <repopackage name="sysprof-lang"/>
+      <repopackage name="sysprof" arch="x86_64"/>
+      <repopackage name="sysprof-lang" arch="x86_64"/>
       <repopackage name="system-config-printer"/>
       <repopackage name="system-config-printer-applet"/>
       <repopackage name="system-config-printer-common"/>
@@ -5242,7 +5239,7 @@
       <repopackage name="telepathy-mission-control"/>
       <repopackage name="telepathy-mission-control-plugin-goa"/>
       <repopackage name="telnet"/>
-      <repopackage name="template-glib-lang"/>
+      <repopackage name="template-glib-lang" arch="x86_64"/>
       <repopackage name="terminfo"/>
       <repopackage name="terminfo-base"/>
       <repopackage name="terminfo-screen"/>
@@ -5383,12 +5380,12 @@
       <repopackage name="typelib-1_0-Soup-2_4"/>
       <repopackage name="typelib-1_0-TelepathyGlib-0_12"/>
       <repopackage name="typelib-1_0-TelepathyLogger-0_2"/>
-      <repopackage name="typelib-1_0-Template-1_0"/>
+      <repopackage name="typelib-1_0-Template-1_0" arch="x86_64"/>
       <repopackage name="typelib-1_0-TotemPlParser-1_0"/>
       <repopackage name="typelib-1_0-Tracker-2_0"/>
       <repopackage name="typelib-1_0-TrackerControl-2_0"/>
       <repopackage name="typelib-1_0-UpowerGlib-1_0"/>
-      <repopackage name="typelib-1_0-Vte-2.91"/>
+      <repopackage name="typelib-1_0-Vte-2.91" arch="x86_64"/>
       <repopackage name="typelib-1_0-WebKit2-4_0"/>
       <repopackage name="typelib-1_0-Wnck-3_0"/>
       <repopackage name="typelib-1_0-Zpj-0_0"/>
diff --git a/unsorted.yml b/unsorted.yml
index db46905c..f7a00c42 100644
--- a/unsorted.yml
+++ b/unsorted.yml
@@ -1534,6 +1534,7 @@ unsorted:
   - clanlib-examples 
   - clatd 
   - claws-mail-devel 
+  - clazy 
   - cld2-devel 
   - cldr-emoji-annotation 
   - cldr-emoji-annotation-devel 
@@ -2855,6 +2856,7 @@ unsorted:
   - flashfocus 
   - flashrom 
   - flatbuffers-devel 
+  - flatpak-builder: [i586] 
   - flatpak-devel 
   - flatpak-zsh-completion 
   - fldigi 
@@ -4245,6 +4247,12 @@ unsorted:
   - gnome-boxes-lang 
   - gnome-break-timer 
   - gnome-break-timer-lang 
+  - gnome-builder: [i586] 
+  - gnome-builder-doc: [i586] 
+  - gnome-builder-lang: [i586] 
+  - gnome-builder-plugin-jedi: [i586] 
+  - gnome-builder-plugin-jhbuild: [i586] 
+  - gnome-builder-plugin-vala-pack: [i586] 
   - gnome-calendar 
   - gnome-calendar-lang 
   - gnome-colors-icon-theme 
@@ -6812,6 +6820,7 @@ unsorted:
   - libLHAPDF-6_2_1 
   - libLLVM6 
   - libLLVM6-32bit: [x86_64] 
+  - libLLVM7 
   - libLLVM7-32bit: [x86_64] 
   - libLLVM8-32bit: [x86_64] 
   - libLTO6 
@@ -7855,6 +7864,7 @@ unsorted:
   - libclFFT2: [x86_64] 
   - libclang6 
   - libclang6-32bit: [x86_64] 
+  - libclang7 
   - libclang7-32bit: [x86_64] 
   - libclang8-32bit: [x86_64] 
   - libclastfm-devel 
@@ -9226,6 +9236,7 @@ unsorted:
   - libjson-c-devel 
   - libjson-c-doc 
   - libjson-glib-1_0-0-32bit: [x86_64] 
+  - libjsonrpc-glib-1_0-1: [i586] 
   - libjte-devel 
   - libjthread1_3_3 
   - libjwt_verify_lib0: [x86_64] 
@@ -11219,6 +11230,7 @@ unsorted:
   - libtelepathy-qt5-farstream0-32bit: [x86_64] 
   - libtelepathy-qt5-service0 
   - libtelepathy-qt5-service0-32bit: [x86_64] 
+  - libtemplate_glib-1_0-0: [i586] 
   - libtepl-4-0 
   - libteredo5 
   - libtermkey-devel 
@@ -12087,7 +12099,7 @@ unsorted:
   - lldb6: [x86_64] 
   - lldb6-devel: [x86_64] # devel package of dvd:libc++abi1 
   - lldb7: [x86_64] 
-  - lldb7-devel: [x86_64] # devel package of dvd:libLLVM7 
+  - lldb7-devel: [x86_64] 
   - lldb8: [x86_64] 
   - lldb8-devel: [x86_64] # devel package of dvd:libomp8-devel 
   - lldpd 
@@ -19852,6 +19864,7 @@ unsorted:
   - python3-cryptography-vectors 
   - python3-css-parser 
   - python3-csscompressor 
+  - python3-cssselect: [i586] 
   - python3-cssselect2 
   - python3-cssutils 
   - python3-csvkit 
@@ -20282,6 +20295,7 @@ unsorted:
   - python3-jaraco.text 
   - python3-javapackages 
   - python3-jdcal 
+  - python3-jedi: [i586] 
   - python3-jedihttp 
   - python3-jeepney 
   - python3-jellyfish 
@@ -20441,6 +20455,7 @@ unsorted:
   - python3-logzero 
   - python3-lttngust 
   - python3-lupa 
+  - python3-lxml: [i586] 
   - python3-lxml-devel 
   - python3-lz4 
   - python3-lzmaffi 
@@ -20666,6 +20681,7 @@ unsorted:
   - python3-parse_type 
   - python3-parsedatetime 
   - python3-parsel 
+  - python3-parso: [i586] 
   - python3-partd 
   - python3-parted 
   - python3-parver 
@@ -23559,8 +23575,10 @@ unsorted:
   - syslog-ng-smtp 
   - syslog-ng-sql 
   - syslogd 
+  - sysprof: [i586] 
   - sysprof-capture-devel-static 
   - sysprof-devel 
+  - sysprof-lang: [i586] 
   - sysstat 
   - sysstat-isag 
   - system-group-obsolete 
@@ -23681,6 +23699,7 @@ unsorted:
   - tellico-lang 
   - telnet-server 
   - template-glib-devel 
+  - template-glib-lang: [i586] 
   - tennebon-dynamic-wallpaper 
   - tensorflow: [x86_64] 
   - tensorflow-avx2-gnu-hpc: [x86_64] 
@@ -31167,6 +31186,7 @@ unsorted:
   - typelib-1_0-SpiceClientGlib-2_0 
   - typelib-1_0-SpiceClientGtk-3_0 
   - typelib-1_0-TelepathyFarstream-0_6 
+  - typelib-1_0-Template-1_0: [i586] 
   - typelib-1_0-Tepl-4 
   - typelib-1_0-Thunarx-3_0 
   - typelib-1_0-TrackerMiner-2_0 
@@ -31177,6 +31197,7 @@ unsorted:
   - typelib-1_0-UnityExtras-7_0 
   - typelib-1_0-Urfkill-0_0 
   - typelib-1_0-Vips-8_5 
+  - typelib-1_0-Vte-2.91: [i586] 
   - typelib-1_0-WebKit2WebExtension-4_0 
   - typelib-1_0-Wnck-1_0 
   - typelib-1_0-Workrave-1_0