diff --git a/dvd.group b/dvd.group
index e87bae7f..7ffe60c4 100644
--- a/dvd.group
+++ b/dvd.group
@@ -493,6 +493,7 @@
     <package name="eog-plugins" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="eog-plugins-lang" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="epiphany" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+    <package name="epiphany-branding-openSUSE" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="epiphany-lang" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="epson-inkjet-printer-escpr" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-printing -->
     <package name="erofs-utils" supportstatus="unsupported"/> <!-- reason: dvd:erofs-utils -->
@@ -525,7 +526,6 @@
     <package name="exiftool" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="exim" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="exo-branding-openSUSE" supportstatus="unsupported"/> <!-- reason: dvd:patterns-lxde-lxde -->
-    <package name="exo-branding-upstream" supportstatus="unsupported"/> <!-- reason: dvd:patterns-lxde-lxde -->
     <package name="exo-data" supportstatus="unsupported"/> <!-- reason: dvd:patterns-lxde-lxde -->
     <package name="exo-helpers" supportstatus="unsupported"/> <!-- reason: dvd:patterns-lxde-lxde -->
     <package name="exo-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-lxde-lxde -->
@@ -1694,7 +1694,7 @@
     <package name="libSDL2-2_0-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-osc-devel_osc_build -->
     <package name="libSDL2_image-2_0-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-osc-devel_osc_build -->
     <package name="libSDL_gfx15" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="libSDL_image-1_2-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
+    <package name="libSDL_image-1_2-0" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libSDL_mixer-1_2-0" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libSDL_ttf-2_0-0" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libSM-devel" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
@@ -5646,7 +5646,6 @@
   <conditional name="only_i586"/>
   <packagelist relationship="recommends">
     <package name="elinks" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="epiphany-branding-upstream" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libpng12-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
   </packagelist>
 </group>
@@ -5670,7 +5669,6 @@
     <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:patterns-gnome-gnome -->
-    <package name="epiphany-branding-openSUSE" 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="fprintd-pam-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
diff --git a/openSUSE-dvd5-dvd-i586.kiwi b/openSUSE-dvd5-dvd-i586.kiwi
index b137d8d9..2c7c5dfd 100644
--- a/openSUSE-dvd5-dvd-i586.kiwi
+++ b/openSUSE-dvd5-dvd-i586.kiwi
@@ -493,7 +493,7 @@
       <repopackage name="eog-plugins"/>
       <repopackage name="eog-plugins-lang"/>
       <repopackage name="epiphany"/>
-      <repopackage name="epiphany-branding-upstream" arch="i586,i686"/>
+      <repopackage name="epiphany-branding-openSUSE"/>
       <repopackage name="epiphany-lang"/>
       <repopackage name="epson-inkjet-printer-escpr"/>
       <repopackage name="erofs-utils"/>
@@ -526,7 +526,6 @@
       <repopackage name="exiftool"/>
       <repopackage name="exim"/>
       <repopackage name="exo-branding-openSUSE"/>
-      <repopackage name="exo-branding-upstream"/>
       <repopackage name="exo-data"/>
       <repopackage name="exo-helpers"/>
       <repopackage name="exo-lang"/>
diff --git a/openSUSE-dvd5-dvd-x86_64.kiwi b/openSUSE-dvd5-dvd-x86_64.kiwi
index 2388636c..ada9b1c1 100644
--- a/openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-dvd5-dvd-x86_64.kiwi
@@ -509,7 +509,7 @@
       <repopackage name="eog-plugins"/>
       <repopackage name="eog-plugins-lang"/>
       <repopackage name="epiphany"/>
-      <repopackage name="epiphany-branding-openSUSE" arch="x86_64"/>
+      <repopackage name="epiphany-branding-openSUSE"/>
       <repopackage name="epiphany-lang"/>
       <repopackage name="epson-inkjet-printer-escpr"/>
       <repopackage name="erofs-utils"/>
@@ -542,7 +542,6 @@
       <repopackage name="exiftool"/>
       <repopackage name="exim"/>
       <repopackage name="exo-branding-openSUSE"/>
-      <repopackage name="exo-branding-upstream"/>
       <repopackage name="exo-data"/>
       <repopackage name="exo-helpers"/>
       <repopackage name="exo-lang"/>
diff --git a/unsorted.yml b/unsorted.yml
index 43d38f09..81d08531 100644
--- a/unsorted.yml
+++ b/unsorted.yml
@@ -2516,8 +2516,7 @@ unsorted:
   - ephoto 
   - ephoto-lang 
   - epic 
-  - epiphany-branding-openSUSE: [i586] 
-  - epiphany-branding-upstream: [x86_64] 
+  - epiphany-branding-upstream 
   - epour 
   - epour-lang 
   - epplet-base 
@@ -2600,6 +2599,7 @@ unsorted:
   - exiv2 
   - exiv2-lang 
   - exmh 
+  - exo-branding-upstream 
   - exo-devel 
   - exodusii-devel 
   - expect-devel 
@@ -5840,7 +5840,7 @@ unsorted:
   - jupyter-rise 
   - jupyter-sidecar-jupyterlab 
   - jupyter-vega 
-  - jupyter-vispy: [i586] 
+  - jupyter-vispy 
   - jupyter-voila 
   - jupyter-widgetsnbextension 
   - jvnet-parent 
@@ -5897,6 +5897,7 @@ unsorted:
   - karchive-devel 
   - karchive-devel-32bit: [x86_64] 
   - kasumi 
+  - katacontainers: [x86_64] 
   - katacontainers-image-initrd: [x86_64] 
   - kate4-parts 
   - kauth-devel 
@@ -8617,9 +8618,11 @@ unsorted:
   - libgdiplus0 
   - libgdruntime76 
   - libgdruntime76-32bit: [x86_64] 
+  - libgeda-data 
   - libgeda-devel 
-  - libgeda42 
-  - libgeda42-data 
+  - libgeda45 
+  - libgedacairo-devel 
+  - libgedacairo1 
   - libgee-0_8-2-32bit: [x86_64] 
   - libgee-devel 
   - libgee06-devel 
@@ -17045,7 +17048,6 @@ unsorted:
   - python-pyghmi-doc 
   - python-pygraphviz-doc 
   - python-pyinsane 
-  - python-pyinsane2 
   - python-pylibacl 
   - python-pylibacl-doc 
   - python-pymetar 
@@ -18649,6 +18651,7 @@ unsorted:
   - python2-pygraphviz 
   - python2-pyhibp 
   - python2-pyinotify 
+  - python2-pyinsane2 
   - python2-pyjavaproperties 
   - python2-pyjokes 
   - python2-pyjsparser 
@@ -20983,6 +20986,7 @@ unsorted:
   - python3-pygraphviz: [i586] 
   - python3-pyhibp 
   - python3-pyinotify 
+  - python3-pyinsane2 
   - python3-pyjavaproperties 
   - python3-pyjokes 
   - python3-pyjsparser