diff --git a/.files b/.files
index 55c3baa..c121c8f 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 1855451..4f09efb 100644
--- a/.rev
+++ b/.rev
@@ -19914,4 +19914,11 @@
     <user>staging-bot</user>
     <comment>Automatic update</comment>
   </revision>
+  <revision rev="2846" vrev="2846">
+    <srcmd5>e8ac8919b2fbe4c815bd2feaf4db6991</srcmd5>
+    <version>unknown</version>
+    <time>1629452858</time>
+    <user>staging-bot</user>
+    <comment>Automatic update</comment>
+  </revision>
 </revisionlist>
diff --git a/.servicemark b/.servicemark
index a1972ec..7d81429 100644
--- a/.servicemark
+++ b/.servicemark
@@ -1 +1 @@
-10b9f2e59404c659745e667749429f37
+aac5cfd51051ec03d45235326b55828c
diff --git a/dvd.group b/dvd.group
index b37de39..051df5a 100644
--- a/dvd.group
+++ b/dvd.group
@@ -166,6 +166,7 @@
     <package name="avahi" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="avahi-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="awesfx" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
+    <package name="aws-cli" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="b43-fwcutter" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="babeltrace" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="baloo5-file" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
@@ -3111,12 +3112,6 @@
     <package name="notification-daemon-lang" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="noto-coloremoji-fonts" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="noto-sans-fonts" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="noto-sans-sc-bold-fonts" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
-    <package name="noto-sans-sc-fonts" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
-    <package name="noto-sans-sc-regular-fonts" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
-    <package name="noto-sans-tc-bold-fonts" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
-    <package name="noto-sans-tc-fonts" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
-    <package name="noto-sans-tc-regular-fonts" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="noto-serif-jp-bold-fonts" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="noto-serif-jp-fonts" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="noto-serif-jp-regular-fonts" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
@@ -3644,6 +3639,7 @@
     <package name="python38-chardet" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="python38-click" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
     <package name="python38-cmdln" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="python38-colorama" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="python38-configobj" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
     <package name="python38-constantly" supportstatus="unsupported"/> <!-- reason: dvd:salt-master -->
     <package name="python38-cramjam" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
@@ -3656,6 +3652,7 @@
     <package name="python38-distro" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-directory_server -->
     <package name="python38-dkimpy" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
     <package name="python38-dnspython" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
+    <package name="python38-docutils" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="python38-ecdsa" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
     <package name="python38-et_xmlfile" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="python38-falcon" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
@@ -3761,7 +3758,9 @@
     <package name="python38-reportlab" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="python38-requests" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="python38-requests-toolbelt" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
+    <package name="python38-roman" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="python38-rpm" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
+    <package name="python38-rsa" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="python38-s3fs" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="python38-s3transfer" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="python38-scipy" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-selinux -->
@@ -4450,6 +4449,7 @@
     <package name="swell-foop" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="swell-foop-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="swtpm" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
+    <package name="swtpm-selinux" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="syntax-highlighting" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="sysconfig" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="sysconfig-netconfig" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -5406,7 +5406,6 @@
     <package name="python38-ldap" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-directory_server -->
     <package name="python38-oauthlib" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="python38-requests-oauthlib" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="python38-rsa" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="qemu-block-rbd" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_server -->
     <package name="qemu-ovmf-x86_64" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_server -->
     <package name="qemu-uefi-aarch64" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
diff --git a/openSUSE-dvd5-dvd-i586.kiwi b/openSUSE-dvd5-dvd-i586.kiwi
index 13e8365..9fb22d8 100644
--- a/openSUSE-dvd5-dvd-i586.kiwi
+++ b/openSUSE-dvd5-dvd-i586.kiwi
@@ -167,6 +167,7 @@
       <repopackage name="avahi"/>
       <repopackage name="avahi-lang"/>
       <repopackage name="awesfx"/>
+      <repopackage name="aws-cli"/>
       <repopackage name="b43-fwcutter"/>
       <repopackage name="babeltrace"/>
       <repopackage name="baloo5-file"/>
@@ -3153,12 +3154,6 @@
       <repopackage name="notification-daemon-lang"/>
       <repopackage name="noto-coloremoji-fonts"/>
       <repopackage name="noto-sans-fonts"/>
-      <repopackage name="noto-sans-sc-bold-fonts"/>
-      <repopackage name="noto-sans-sc-fonts"/>
-      <repopackage name="noto-sans-sc-regular-fonts"/>
-      <repopackage name="noto-sans-tc-bold-fonts"/>
-      <repopackage name="noto-sans-tc-fonts"/>
-      <repopackage name="noto-sans-tc-regular-fonts"/>
       <repopackage name="noto-serif-jp-bold-fonts"/>
       <repopackage name="noto-serif-jp-fonts"/>
       <repopackage name="noto-serif-jp-regular-fonts"/>
@@ -3677,6 +3672,7 @@
       <repopackage name="python38-chardet"/>
       <repopackage name="python38-click"/>
       <repopackage name="python38-cmdln"/>
+      <repopackage name="python38-colorama"/>
       <repopackage name="python38-configobj"/>
       <repopackage name="python38-constantly"/>
       <repopackage name="python38-cramjam"/>
@@ -3690,6 +3686,7 @@
       <repopackage name="python38-distro"/>
       <repopackage name="python38-dkimpy"/>
       <repopackage name="python38-dnspython"/>
+      <repopackage name="python38-docutils"/>
       <repopackage name="python38-ecdsa"/>
       <repopackage name="python38-et_xmlfile"/>
       <repopackage name="python38-falcon"/>
@@ -3807,7 +3804,9 @@
       <repopackage name="python38-reportlab"/>
       <repopackage name="python38-requests"/>
       <repopackage name="python38-requests-toolbelt"/>
+      <repopackage name="python38-roman"/>
       <repopackage name="python38-rpm"/>
+      <repopackage name="python38-rsa"/>
       <repopackage name="python38-s3fs"/>
       <repopackage name="python38-s3transfer"/>
       <repopackage name="python38-scipy"/>
@@ -4500,6 +4499,7 @@
       <repopackage name="swell-foop"/>
       <repopackage name="swell-foop-lang"/>
       <repopackage name="swtpm"/>
+      <repopackage name="swtpm-selinux"/>
       <repopackage name="syntax-highlighting"/>
       <repopackage name="sysconfig"/>
       <repopackage name="sysconfig-netconfig"/>
diff --git a/openSUSE-dvd5-dvd-x86_64.kiwi b/openSUSE-dvd5-dvd-x86_64.kiwi
index 5619e87..a231f27 100644
--- a/openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-dvd5-dvd-x86_64.kiwi
@@ -179,6 +179,7 @@
       <repopackage name="avahi"/>
       <repopackage name="avahi-lang"/>
       <repopackage name="awesfx"/>
+      <repopackage name="aws-cli"/>
       <repopackage name="b43-fwcutter"/>
       <repopackage name="babeltrace"/>
       <repopackage name="baloo5-file"/>
@@ -3433,12 +3434,6 @@
       <repopackage name="notification-daemon-lang"/>
       <repopackage name="noto-coloremoji-fonts"/>
       <repopackage name="noto-sans-fonts"/>
-      <repopackage name="noto-sans-sc-bold-fonts"/>
-      <repopackage name="noto-sans-sc-fonts"/>
-      <repopackage name="noto-sans-sc-regular-fonts"/>
-      <repopackage name="noto-sans-tc-bold-fonts"/>
-      <repopackage name="noto-sans-tc-fonts"/>
-      <repopackage name="noto-sans-tc-regular-fonts"/>
       <repopackage name="noto-serif-jp-bold-fonts"/>
       <repopackage name="noto-serif-jp-fonts"/>
       <repopackage name="noto-serif-jp-regular-fonts"/>
@@ -3990,6 +3985,7 @@
       <repopackage name="python38-chardet"/>
       <repopackage name="python38-click"/>
       <repopackage name="python38-cmdln"/>
+      <repopackage name="python38-colorama"/>
       <repopackage name="python38-configobj"/>
       <repopackage name="python38-constantly"/>
       <repopackage name="python38-cramjam"/>
@@ -4004,6 +4000,7 @@
       <repopackage name="python38-dkimpy"/>
       <repopackage name="python38-dnspython"/>
       <repopackage name="python38-doc" arch="x86_64"/>
+      <repopackage name="python38-docutils"/>
       <repopackage name="python38-ecdsa"/>
       <repopackage name="python38-et_xmlfile"/>
       <repopackage name="python38-evtx" arch="x86_64"/>
@@ -4132,8 +4129,9 @@
       <repopackage name="python38-requests"/>
       <repopackage name="python38-requests-oauthlib" arch="x86_64"/>
       <repopackage name="python38-requests-toolbelt"/>
+      <repopackage name="python38-roman"/>
       <repopackage name="python38-rpm"/>
-      <repopackage name="python38-rsa" arch="x86_64"/>
+      <repopackage name="python38-rsa"/>
       <repopackage name="python38-s3fs"/>
       <repopackage name="python38-s3transfer"/>
       <repopackage name="python38-scipy"/>
@@ -4838,6 +4836,7 @@
       <repopackage name="swell-foop"/>
       <repopackage name="swell-foop-lang"/>
       <repopackage name="swtpm"/>
+      <repopackage name="swtpm-selinux"/>
       <repopackage name="syntax-highlighting"/>
       <repopackage name="sysconfig"/>
       <repopackage name="sysconfig-netconfig"/>
diff --git a/unsorted.yml b/unsorted.yml
index 4a0b2fb..1595885 100644
--- a/unsorted.yml
+++ b/unsorted.yml
@@ -385,6 +385,8 @@ unsorted:
   - adobe-sourcehansans-kr-fonts 
   - adobe-sourcehanserif-jp-fonts 
   - adobe-sourcehanserif-kr-fonts 
+  - adobe-sourcesans3-fonts 
+  - adobe-sourceserif4-fonts 
   - adolc-devel 
   - adolc-devel-32bit: [x86_64] 
   - adolc-doc 
@@ -995,7 +997,6 @@ unsorted:
   - awf-gtk3 
   - awf-gtk4 
   - awkward-devel 
-  - aws-cli 
   - aws-efs-utils 
   - aws-sdk-java 
   - aws-sdk-java-acm 
@@ -8575,10 +8576,6 @@ unsorted:
   - libCEGUIOgreRenderer-0-2 
   - libCEGUIOpenGLESRenderer-0-2 
   - libCEGUIOpenGLRenderer-0-2 
-  - libCGAL13 
-  - libCGAL_Core13 
-  - libCGAL_ImageIO14 
-  - libCGAL_Qt5-14 
   - libCSXCAD0 
   - libCoin60 
   - libColPack0 
@@ -9155,7 +9152,6 @@ unsorted:
   - libSoundTouch1-32bit: [x86_64] 
   - libStatTimer2: [x86_64] 
   - libSvtAv1Dec0: [x86_64] 
-  - libSwiften4 
   - libTMCG-devel 
   - libTMCG18 
   - libTutf-devel 
@@ -13885,7 +13881,7 @@ unsorted:
   - libthriftnb-0_14_1 
   - libthriftz-0_14_1 
   - libtidy-devel 
-  - libtidy5 
+  - libtidy58 
   - libtidyp-1_04-0 
   - libtidyp-devel 
   - libtiff-devel 
@@ -14323,7 +14319,6 @@ unsorted:
   - libwhich 
   - libwiiuse0 
   - libwim15 
-  - libwkhtmltox0 
   - libwlroots9 
   - libwmf-0_2-7-32bit: [x86_64] 
   - libwmf-devel 
@@ -17114,11 +17109,14 @@ unsorted:
   - noto-sans-samaritan-fonts 
   - noto-sans-saurashtra-fonts 
   - noto-sans-sc-black-fonts 
+  - noto-sans-sc-bold-fonts 
   - noto-sans-sc-demilight-fonts 
+  - noto-sans-sc-fonts 
   - noto-sans-sc-fonts-full 
   - noto-sans-sc-light-fonts 
   - noto-sans-sc-medium-fonts 
   - noto-sans-sc-mono-fonts 
+  - noto-sans-sc-regular-fonts 
   - noto-sans-sc-thin-fonts 
   - noto-sans-shavian-fonts 
   - noto-sans-sinhala-fonts 
@@ -17138,11 +17136,14 @@ unsorted:
   - noto-sans-tamil-fonts 
   - noto-sans-tamil-ui-fonts 
   - noto-sans-tc-black-fonts 
+  - noto-sans-tc-bold-fonts 
   - noto-sans-tc-demilight-fonts 
+  - noto-sans-tc-fonts 
   - noto-sans-tc-fonts-full 
   - noto-sans-tc-light-fonts 
   - noto-sans-tc-medium-fonts 
   - noto-sans-tc-mono-fonts 
+  - noto-sans-tc-regular-fonts 
   - noto-sans-tc-thin-fonts 
   - noto-sans-telugu-fonts 
   - noto-sans-telugu-ui-fonts 
@@ -17962,7 +17963,6 @@ unsorted:
   - openscap-devel 
   - openscap-docker 
   - openscap-utils 
-  - openshot-qt 
   - openslide-doc 
   - openslide-tools 
   - openslp-devel 
@@ -24909,7 +24909,6 @@ unsorted:
   - python38-codecov 
   - python38-cogapp 
   - python38-colander 
-  - python38-colorama 
   - python38-colorcet 
   - python38-colorclass 
   - python38-coloredlogs 
@@ -25173,7 +25172,6 @@ unsorted:
   - python38-dockerpty 
   - python38-docopt 
   - python38-docrepr 
-  - python38-docutils 
   - python38-docutils-ast-writer 
   - python38-dogslow 
   - python38-dominate 
@@ -26586,7 +26584,6 @@ unsorted:
   - python38-robotframework 
   - python38-roifile 
   - python38-rollbar 
-  - python38-roman 
   - python38-rope 
   - python38-rpcq 
   - python38-rply 
@@ -26595,7 +26592,6 @@ unsorted:
   - python38-rpy2 
   - python38-rpyc 
   - python38-rq 
-  - python38-rsa: [i586] 
   - python38-rss2email 
   - python38-rst.linker 
   - python38-rstcheck 
@@ -32288,8 +32284,6 @@ unsorted:
   - swaylock-bash-completion 
   - swaylock-fish-completion 
   - swaylock-zsh-completion 
-  - swift-im 
-  - swiften-devel 
   - swig 
   - swig-doc 
   - swig-examples 
@@ -41797,8 +41791,6 @@ unsorted:
   - wireshark-plugin-libvirt 
   - withlock 
   - wizznic 
-  - wkhtmltopdf 
-  - wkhtmltopdf-devel 
   - wl-clipboard 
   - wl-clipboard-bash-completion 
   - wl-clipboard-zsh-completion