diff --git a/dvd.group b/dvd.group
index 8e544e18..14abe0e4 100644
--- a/dvd.group
+++ b/dvd.group
@@ -89,8 +89,6 @@
     <package name="akonadi-plugin-contacts" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="akonadi-plugin-kalarmcal" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="akonadi-plugin-mime" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
-    <package name="akonadi-search" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
-    <package name="akonadi-search-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="akonadi-server" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="akonadi-server-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="akonadi-server-sqlite" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
@@ -1280,11 +1278,6 @@
     <package name="kmag-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="kmahjongg" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="kmahjongg-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
-    <package name="kmail" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
-    <package name="kmail-account-wizard" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
-    <package name="kmail-account-wizard-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
-    <package name="kmail-application-icons" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
-    <package name="kmail-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="kmailtransport" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="kmailtransport-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="kmenuedit5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
@@ -1386,8 +1379,6 @@
     <package name="ktexteditor-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="ktimer" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="ktimer-lang" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="ktnef" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
-    <package name="ktnef-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="ktouch" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_edutainment -->
     <package name="ktouch-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_edutainment -->
     <package name="ktuberling" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
@@ -3108,8 +3099,6 @@
     <package name="mate-calc" supportstatus="unsupported"/> <!-- reason: dvd:patterns-xfce-xfce -->
     <package name="mate-calc-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-xfce-xfce -->
     <package name="mbimcli-bash-completion" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="mbox-importer" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
-    <package name="mbox-importer-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="mc" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
     <package name="mc-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
     <package name="mdadm" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
@@ -3366,6 +3355,7 @@
     <package name="pam_mount" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="pam_pwquality" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="pam_ssh" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+    <package name="paperkey" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="paprefs" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="paprefs-lang" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="par" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
@@ -3603,10 +3593,6 @@
     <package name="pidgin-plugin-skypeweb" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="pidgin-plugin-telegram" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="pigz" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
-    <package name="pim-data-exporter" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
-    <package name="pim-data-exporter-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
-    <package name="pim-sieve-editor" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
-    <package name="pim-sieve-editor-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="pimcommon" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="pimcommon-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="pinentry" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
@@ -5369,6 +5355,8 @@
     <package name="MozillaFirefox" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="MozillaFirefox-branding-openSUSE" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="MozillaFirefox-translations-common" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="akonadi-search" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
+    <package name="akonadi-search-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="alsa-oss-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="alsa-plugins-pulse-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="apulse" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
@@ -5394,8 +5382,15 @@
     <package name="gtk2-tools-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="guestfs-data" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="ibus-gtk-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+    <package name="kmail" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
+    <package name="kmail-account-wizard" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
+    <package name="kmail-account-wizard-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
+    <package name="kmail-application-icons" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
+    <package name="kmail-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="kmozillahelper" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="krb5-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
+    <package name="ktnef" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
+    <package name="ktnef-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="ldmtool" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="lib389" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-directory_server -->
     <package name="libHX32-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
@@ -5553,6 +5548,8 @@
     <package name="libxml2-2-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libz1-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libzstd1-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+    <package name="mbox-importer" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
+    <package name="mbox-importer-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="mcelog" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="mokutil" supportstatus="unsupported"/> <!-- reason: dvd:mokutil -->
     <package name="mozilla-nss-tools" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-directory_server -->
@@ -5570,9 +5567,12 @@
     <package name="pam_mount-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="pam_pwquality-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="pam_ssh-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="paperkey" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <!-- patterns-media-rest_dvd uninstallable: nothing provides pattern() = apparmor_opt needed by patterns-media-rest_dvd-20170319-23.3.x86_64-->
     <package name="patterns-server-xen_server" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-xen_server -->
+    <package name="pim-data-exporter" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
+    <package name="pim-data-exporter-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
+    <package name="pim-sieve-editor" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
+    <package name="pim-sieve-editor-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="plasma-browser-integration" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="plasma-browser-integration-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="pmdk" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-osc-devel_osc_build -->
diff --git a/openSUSE-dvd5-dvd-i586.kiwi b/openSUSE-dvd5-dvd-i586.kiwi
index cc3d278a..433da4c8 100644
--- a/openSUSE-dvd5-dvd-i586.kiwi
+++ b/openSUSE-dvd5-dvd-i586.kiwi
@@ -89,8 +89,6 @@
       <repopackage name="akonadi-plugin-contacts"/>
       <repopackage name="akonadi-plugin-kalarmcal"/>
       <repopackage name="akonadi-plugin-mime"/>
-      <repopackage name="akonadi-search"/>
-      <repopackage name="akonadi-search-lang"/>
       <repopackage name="akonadi-server"/>
       <repopackage name="akonadi-server-lang"/>
       <repopackage name="akonadi-server-sqlite"/>
@@ -1289,11 +1287,6 @@
       <repopackage name="kmag-lang"/>
       <repopackage name="kmahjongg"/>
       <repopackage name="kmahjongg-lang"/>
-      <repopackage name="kmail"/>
-      <repopackage name="kmail-account-wizard"/>
-      <repopackage name="kmail-account-wizard-lang"/>
-      <repopackage name="kmail-application-icons"/>
-      <repopackage name="kmail-lang"/>
       <repopackage name="kmailtransport"/>
       <repopackage name="kmailtransport-lang"/>
       <repopackage name="kmenuedit5"/>
@@ -1395,8 +1388,6 @@
       <repopackage name="ktexteditor-lang"/>
       <repopackage name="ktimer"/>
       <repopackage name="ktimer-lang"/>
-      <repopackage name="ktnef"/>
-      <repopackage name="ktnef-lang"/>
       <repopackage name="ktouch"/>
       <repopackage name="ktouch-lang"/>
       <repopackage name="ktuberling"/>
@@ -3117,8 +3108,6 @@
       <repopackage name="mate-calc"/>
       <repopackage name="mate-calc-lang"/>
       <repopackage name="mbimcli-bash-completion"/>
-      <repopackage name="mbox-importer"/>
-      <repopackage name="mbox-importer-lang"/>
       <repopackage name="mc"/>
       <repopackage name="mc-lang"/>
       <repopackage name="mdadm"/>
@@ -3420,6 +3409,7 @@
       <repopackage name="pam_mount"/>
       <repopackage name="pam_pwquality"/>
       <repopackage name="pam_ssh"/>
+      <repopackage name="paperkey"/>
       <repopackage name="paprefs"/>
       <repopackage name="paprefs-lang"/>
       <repopackage name="par"/>
@@ -3656,10 +3646,6 @@
       <repopackage name="pidgin-plugin-skypeweb"/>
       <repopackage name="pidgin-plugin-telegram"/>
       <repopackage name="pigz"/>
-      <repopackage name="pim-data-exporter"/>
-      <repopackage name="pim-data-exporter-lang"/>
-      <repopackage name="pim-sieve-editor"/>
-      <repopackage name="pim-sieve-editor-lang"/>
       <repopackage name="pimcommon"/>
       <repopackage name="pimcommon-lang"/>
       <repopackage name="pinentry"/>
diff --git a/openSUSE-dvd5-dvd-x86_64.kiwi b/openSUSE-dvd5-dvd-x86_64.kiwi
index a4864e78..4b5dd108 100644
--- a/openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-dvd5-dvd-x86_64.kiwi
@@ -93,8 +93,8 @@
       <repopackage name="akonadi-plugin-contacts"/>
       <repopackage name="akonadi-plugin-kalarmcal"/>
       <repopackage name="akonadi-plugin-mime"/>
-      <repopackage name="akonadi-search"/>
-      <repopackage name="akonadi-search-lang"/>
+      <repopackage name="akonadi-search" arch="x86_64"/>
+      <repopackage name="akonadi-search-lang" arch="x86_64"/>
       <repopackage name="akonadi-server"/>
       <repopackage name="akonadi-server-lang"/>
       <repopackage name="akonadi-server-sqlite"/>
@@ -1314,11 +1314,11 @@
       <repopackage name="kmag-lang"/>
       <repopackage name="kmahjongg"/>
       <repopackage name="kmahjongg-lang"/>
-      <repopackage name="kmail"/>
-      <repopackage name="kmail-account-wizard"/>
-      <repopackage name="kmail-account-wizard-lang"/>
-      <repopackage name="kmail-application-icons"/>
-      <repopackage name="kmail-lang"/>
+      <repopackage name="kmail" arch="x86_64"/>
+      <repopackage name="kmail-account-wizard" arch="x86_64"/>
+      <repopackage name="kmail-account-wizard-lang" arch="x86_64"/>
+      <repopackage name="kmail-application-icons" arch="x86_64"/>
+      <repopackage name="kmail-lang" arch="x86_64"/>
       <repopackage name="kmailtransport"/>
       <repopackage name="kmailtransport-lang"/>
       <repopackage name="kmenuedit5"/>
@@ -1422,8 +1422,8 @@
       <repopackage name="ktexteditor-lang"/>
       <repopackage name="ktimer"/>
       <repopackage name="ktimer-lang"/>
-      <repopackage name="ktnef"/>
-      <repopackage name="ktnef-lang"/>
+      <repopackage name="ktnef" arch="x86_64"/>
+      <repopackage name="ktnef-lang" arch="x86_64"/>
       <repopackage name="ktouch"/>
       <repopackage name="ktouch-lang"/>
       <repopackage name="ktuberling"/>
@@ -3301,8 +3301,8 @@
       <repopackage name="mate-calc"/>
       <repopackage name="mate-calc-lang"/>
       <repopackage name="mbimcli-bash-completion"/>
-      <repopackage name="mbox-importer"/>
-      <repopackage name="mbox-importer-lang"/>
+      <repopackage name="mbox-importer" arch="x86_64"/>
+      <repopackage name="mbox-importer-lang" arch="x86_64"/>
       <repopackage name="mc"/>
       <repopackage name="mc-lang"/>
       <repopackage name="mcelog" arch="x86_64"/>
@@ -3621,7 +3621,7 @@
       <repopackage name="pam_pwquality-32bit" arch="x86_64"/>
       <repopackage name="pam_ssh"/>
       <repopackage name="pam_ssh-32bit" arch="x86_64"/>
-      <repopackage name="paperkey" arch="x86_64"/>
+      <repopackage name="paperkey"/>
       <repopackage name="paprefs"/>
       <repopackage name="paprefs-lang"/>
       <repopackage name="par"/>
@@ -3859,10 +3859,10 @@
       <repopackage name="pidgin-plugin-skypeweb"/>
       <repopackage name="pidgin-plugin-telegram"/>
       <repopackage name="pigz"/>
-      <repopackage name="pim-data-exporter"/>
-      <repopackage name="pim-data-exporter-lang"/>
-      <repopackage name="pim-sieve-editor"/>
-      <repopackage name="pim-sieve-editor-lang"/>
+      <repopackage name="pim-data-exporter" arch="x86_64"/>
+      <repopackage name="pim-data-exporter-lang" arch="x86_64"/>
+      <repopackage name="pim-sieve-editor" arch="x86_64"/>
+      <repopackage name="pim-sieve-editor-lang" arch="x86_64"/>
       <repopackage name="pimcommon"/>
       <repopackage name="pimcommon-lang"/>
       <repopackage name="pinentry"/>
diff --git a/unsorted.yml b/unsorted.yml
index ff335823..8568cb49 100644
--- a/unsorted.yml
+++ b/unsorted.yml
@@ -384,7 +384,9 @@ unsorted:
   - akonadi-import-wizard-devel 
   - akonadi-mime-devel 
   - akonadi-notes-devel 
+  - akonadi-search: [i586] 
   - akonadi-search-devel 
+  - akonadi-search-lang: [i586] 
   - akonadi-server-devel 
   - akonadiconsole 
   - alac 
@@ -6836,6 +6838,11 @@ unsorted:
   - klftools-devel 
   - klickety 
   - klickety-lang 
+  - kmail: [i586] 
+  - kmail-account-wizard: [i586] 
+  - kmail-account-wizard-lang: [i586] 
+  - kmail-application-icons: [i586] 
+  - kmail-lang: [i586] 
   - kmailtransport-devel 
   - kmarkdownwebview 
   - kmarkdownwebview-lang 
@@ -6991,7 +6998,9 @@ unsorted:
   - ktextwidgets-devel-32bit: [x86_64] 
   - ktimetracker 
   - ktimetracker-lang 
+  - ktnef: [i586] 
   - ktnef-devel 
+  - ktnef-lang: [i586] 
   - ktoblzcheck 
   - ktoblzcheck-devel 
   - ktorrent 
@@ -13868,6 +13877,8 @@ unsorted:
   - mayavi-doc 
   - mayavi-jupyter 
   - mbedtls-devel 
+  - mbox-importer: [i586] 
+  - mbox-importer-lang: [i586] 
   - mbuffer 
   - mcabber 
   - mcabber-devel 
@@ -16216,7 +16227,6 @@ unsorted:
   - paperclips 
   - paperclips-javadoc 
   - paperjam 
-  - paperkey: [i586] 
   - papi 
   - papi-devel 
   - papi-devel-32bit: [x86_64] 
@@ -17869,6 +17879,10 @@ unsorted:
   - pijul-zsh-completion 
   - pilot 
   - pilot-link 
+  - pim-data-exporter: [i586] 
+  - pim-data-exporter-lang: [i586] 
+  - pim-sieve-editor: [i586] 
+  - pim-sieve-editor-lang: [i586] 
   - pimcommon-devel 
   - pin 
   - pinentry-emacs