diff --git a/dvd.group b/dvd.group
index 46fe1130..cf389d74 100644
--- a/dvd.group
+++ b/dvd.group
@@ -86,8 +86,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="akregator" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
@@ -1196,11 +1194,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 -->
@@ -1301,8 +1294,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="kturtle" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
@@ -2958,8 +2949,6 @@
     <package name="mariadb-client" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="mariadb-errormessages" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="mbimcli-bash-completion" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
-    <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 -->
@@ -3437,10 +3426,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 -->
@@ -5052,6 +5037,8 @@
   <packagelist relationship="recommends">
     <package name="389-ds" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-directory_server -->
     <package name="Mesa-dri-devel" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+    <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:patterns-media-rest_dvd -->
     <package name="alsa-plugins-pulse-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="apulse" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
@@ -5102,11 +5089,18 @@
     <package name="hexchat" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="hexchat-lang" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="ibus-gtk-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
+    <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="krb5-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="krdc" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="krdc-lang" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="krfb" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="krfb-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="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 -->
@@ -5323,6 +5317,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:patterns-media-rest_cd_core -->
+    <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-base-console -->
     <package name="mhvtl-kmp-default" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="mokutil" supportstatus="unsupported"/> <!-- reason: dvd:mokutil -->
@@ -5352,6 +5348,10 @@
     <package name="perl-Sys-Guestfs" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="perl-Win-Hivex" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="perl-libintl-perl" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+    <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="pmdk" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_server -->
     <package name="powertop" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="powertop-lang" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
diff --git a/openSUSE-dvd5-dvd-i586.kiwi b/openSUSE-dvd5-dvd-i586.kiwi
index dcf8536f..e9da23d8 100644
--- a/openSUSE-dvd5-dvd-i586.kiwi
+++ b/openSUSE-dvd5-dvd-i586.kiwi
@@ -85,8 +85,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="akregator"/>
@@ -1202,11 +1200,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"/>
@@ -1307,8 +1300,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="kturtle"/>
@@ -2965,8 +2956,6 @@
       <repopackage name="mariadb-client"/>
       <repopackage name="mariadb-errormessages"/>
       <repopackage name="mbimcli-bash-completion"/>
-      <repopackage name="mbox-importer"/>
-      <repopackage name="mbox-importer-lang"/>
       <repopackage name="mc"/>
       <repopackage name="mc-lang"/>
       <repopackage name="mdadm"/>
@@ -3486,10 +3475,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 8b810d6f..99d94cb1 100644
--- a/openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-dvd5-dvd-x86_64.kiwi
@@ -89,8 +89,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="akregator"/>
@@ -1252,11 +1252,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"/>
@@ -1362,8 +1362,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="kturtle"/>
@@ -3235,8 +3235,8 @@
       <repopackage name="mariadb-client"/>
       <repopackage name="mariadb-errormessages"/>
       <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"/>
@@ -3785,10 +3785,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 a05b0454..52206125 100644
--- a/unsorted.yml
+++ b/unsorted.yml
@@ -425,7 +425,10 @@ unsorted:
   - akonadi-import-wizard-devel 
   - akonadi-mime-devel 
   - akonadi-notes-devel 
+  - akonadi-search: [i586] 
   - akonadi-search-devel 
+  - akonadi-search-lang: [i586] 
+  - akonadi-server-apparmor 
   - akonadi-server-devel 
   - akonadi-server-sqlite 
   - akonadiconsole 
@@ -5857,8 +5860,6 @@ unsorted:
   - go1.9-doc 
   - go1.9-race: [x86_64] 
   - goaccess 
-  - goatattack 
-  - goatattack-data 
   - gob2 
   - gobby 
   - gobby-lang 
@@ -7974,6 +7975,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 
@@ -8120,7 +8126,9 @@ unsorted:
   - ktextwidgets-devel-32bit: [x86_64] 
   - ktimetracker 
   - ktimetracker-lang 
+  - ktnef: [i586] 
   - ktnef-devel 
+  - ktnef-lang: [i586] 
   - ktoblzcheck 
   - ktoblzcheck-devel 
   - ktorrent 
@@ -10108,8 +10116,6 @@ unsorted:
   - libcsync-plugin-smb 
   - libcsync0 
   - libcsync0-32bit: [x86_64] 
-  - libcsystem-devel 
-  - libcsystem1 
   - libct4 
   - libctemplate-devel 
   - libctemplate3 
@@ -15698,6 +15704,8 @@ unsorted:
   - mayavi-doc 
   - mayavi-jupyter 
   - mbedtls-devel 
+  - mbox-importer: [i586] 
+  - mbox-importer-lang: [i586] 
   - mbpfan: [x86_64] 
   - mbpoll 
   - mbuffer 
@@ -16958,6 +16966,9 @@ unsorted:
   - nodejs10 
   - nodejs10-devel 
   - nodejs10-docs 
+  - nodejs14: [x86_64] 
+  - nodejs14-devel: [x86_64] 
+  - nodejs14-docs: [x86_64] 
   - nodejs16-devel 
   - nodejs16-docs 
   - noisetorch 
@@ -17205,6 +17216,7 @@ unsorted:
   - npkg 
   - npm-default 
   - npm10 
+  - npm14: [x86_64] 
   - npth-devel 
   - nqp 
   - nrpe 
@@ -20132,6 +20144,10 @@ unsorted:
   - pijul 
   - 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-efl 
@@ -20962,8 +20978,7 @@ unsorted:
   - python-novaclient-doc 
   - python-nss-doc 
   - python-octaviaclient-doc 
-  - python-onionshare: [i586] 
-  - python-onionshare-data: [x86_64] 
+  - python-onionshare 
   - python-openstackclient-doc 
   - python-openstacksdk-doc 
   - python-optcomplete 
@@ -22504,8 +22519,6 @@ unsorted:
   - python36-gTTS 
   - python36-gTTS-token 
   - python36-gast 
-  - python36-gcsfs 
-  - python36-gcsfs-fuse 
   - python36-gear 
   - python36-ged4py 
   - python36-genson 
@@ -23003,7 +23016,6 @@ unsorted:
   - python36-olefile 
   - python36-oletools 
   - python36-olm 
-  - python36-onionshare: [x86_64] 
   - python36-opcodes 
   - python36-openapi-codec 
   - python36-openapi-core 
@@ -25859,7 +25871,6 @@ unsorted:
   - python38-oiffile 
   - python38-oletools 
   - python38-olm 
-  - python38-onionshare: [x86_64] 
   - python38-onnx 
   - python38-onnxconverter-common 
   - python38-opcodes 
@@ -28861,7 +28872,6 @@ unsorted:
   - python39-olefile 
   - python39-oletools 
   - python39-olm 
-  - python39-onionshare: [x86_64] 
   - python39-onnx 
   - python39-onnxconverter-common 
   - python39-opcodes