diff --git a/dvd.group b/dvd.group
index 51118fe5..5f8f43b8 100644
--- a/dvd.group
+++ b/dvd.group
@@ -108,6 +108,7 @@
     <package name="alsa-plugins" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="alsa-plugins-pulse" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="alsa-utils" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="amarok" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="amavisd-new" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
     <package name="amavisd-new-docs" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
     <package name="amtk-5-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
@@ -326,6 +327,7 @@
     <package name="circuslinux" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="ckermit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="clamav" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
+    <package name="clamz" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="clang8" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_ide -->
     <package name="clang8-checker" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_ide -->
     <package name="claws-mail" supportstatus="unsupported"/> <!-- reason: dvd:patterns-lxde-lxde -->
@@ -2169,6 +2171,9 @@
     <package name="libgphoto2-6" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libgphoto2-6-lang" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libgpm2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="libgpod-lang" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+    <package name="libgpod-tools" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+    <package name="libgpod4" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libgps24" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="libgraphene-1_0-0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libgraphite2-3" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
@@ -2364,6 +2369,7 @@
     <package name="liblangtag1" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="liblapack3" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="liblasem-0_4-4" supportstatus="unsupported"/> <!-- reason: dvd:patterns-lxde-lxde -->
+    <package name="liblastfm1" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="liblavfile-2_0-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="liblavjpeg-2_0-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="liblavplay-2_0-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -2387,6 +2393,7 @@
     <package name="liblockdev1" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="liblogging0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="liblognorm5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="libloudmouth-1-0" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="liblouis-data" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="liblouis17" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="liblpsolve55-0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
@@ -2456,9 +2463,11 @@
     <package name="libmutter-4-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libmwaw-0_3-3" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libmxml1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-technical_writing -->
+    <package name="libmygpo-qt1" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libmypaint-1_3-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libmypaint-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libmysofa0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="libmysqld19" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libmythes-1_2-0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libnautilus-extension1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libncurses6" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
@@ -2649,7 +2658,9 @@
     <package name="libqb20" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libqca-qt5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="libqca-qt5-plugins" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
+    <package name="libqca2" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libqgpgme7" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
+    <package name="libqjson0" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libqmi-glib5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libqmi-tools" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libqpdf21" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -2835,6 +2846,7 @@
     <package name="libswscale5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libsynctex2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libsystemd0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
+    <package name="libtag-extras1" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libtag1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libtag_c0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libtalloc2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -4232,6 +4244,7 @@
     <package name="qemu-vgabios" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-osc-devel_osc_build -->
     <package name="qemu-x86" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-osc-devel_osc_build -->
     <package name="qqc2-desktop-style" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
+    <package name="qt4-qtscript" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="quadrapassel" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="quadrapassel-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="quagga" supportstatus="unsupported"/> <!-- reason: dvd:patterns-network-network_admin -->
@@ -4908,6 +4921,7 @@
     <package name="sysuser-shadow" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="sysvinit-tools" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="tack" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-C-C++-devel_C_C++ -->
+    <package name="taglib" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="tagsoup" supportstatus="unsupported"/> <!-- reason: dvd:patterns-lxde-lxde -->
     <package name="tango-icon-theme" supportstatus="unsupported"/> <!-- reason: dvd:patterns-lxde-lxde -->
     <package name="tar" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
diff --git a/openSUSE-dvd5-dvd-i586.kiwi b/openSUSE-dvd5-dvd-i586.kiwi
index 3954c29e..a938b71a 100644
--- a/openSUSE-dvd5-dvd-i586.kiwi
+++ b/openSUSE-dvd5-dvd-i586.kiwi
@@ -104,6 +104,7 @@
       <repopackage name="alsa-plugins"/>
       <repopackage name="alsa-plugins-pulse"/>
       <repopackage name="alsa-utils"/>
+      <repopackage name="amarok"/>
       <repopackage name="amavisd-new"/>
       <repopackage name="amavisd-new-docs"/>
       <repopackage name="amtk-5-lang"/>
@@ -324,6 +325,7 @@
       <repopackage name="circuslinux"/>
       <repopackage name="ckermit"/>
       <repopackage name="clamav"/>
+      <repopackage name="clamz"/>
       <repopackage name="clang8"/>
       <repopackage name="clang8-checker"/>
       <repopackage name="claws-mail"/>
@@ -1892,6 +1894,9 @@
       <repopackage name="libgphoto2-6"/>
       <repopackage name="libgphoto2-6-lang"/>
       <repopackage name="libgpm2"/>
+      <repopackage name="libgpod-lang"/>
+      <repopackage name="libgpod-tools"/>
+      <repopackage name="libgpod4"/>
       <repopackage name="libgps24"/>
       <repopackage name="libgraphene-1_0-0"/>
       <repopackage name="libgraphite2-3"/>
@@ -2263,6 +2268,7 @@
       <repopackage name="liblangtag1"/>
       <repopackage name="liblapack3"/>
       <repopackage name="liblasem-0_4-4"/>
+      <repopackage name="liblastfm1"/>
       <repopackage name="liblavfile-2_0-0"/>
       <repopackage name="liblavjpeg-2_0-0"/>
       <repopackage name="liblavplay-2_0-0"/>
@@ -2287,6 +2293,7 @@
       <repopackage name="liblockdev1"/>
       <repopackage name="liblogging0"/>
       <repopackage name="liblognorm5"/>
+      <repopackage name="libloudmouth-1-0"/>
       <repopackage name="liblouis-data"/>
       <repopackage name="liblouis17"/>
       <repopackage name="liblpsolve55-0"/>
@@ -2360,9 +2367,11 @@
       <repopackage name="libmutter-4-0"/>
       <repopackage name="libmwaw-0_3-3"/>
       <repopackage name="libmxml1"/>
+      <repopackage name="libmygpo-qt1"/>
       <repopackage name="libmypaint-1_3-0"/>
       <repopackage name="libmypaint-lang"/>
       <repopackage name="libmysofa0"/>
+      <repopackage name="libmysqld19"/>
       <repopackage name="libmythes-1_2-0"/>
       <repopackage name="libnautilus-extension1"/>
       <repopackage name="libncurses6"/>
@@ -2556,7 +2565,9 @@
       <repopackage name="libqb20"/>
       <repopackage name="libqca-qt5"/>
       <repopackage name="libqca-qt5-plugins"/>
+      <repopackage name="libqca2"/>
       <repopackage name="libqgpgme7"/>
+      <repopackage name="libqjson0"/>
       <repopackage name="libqmi-glib5"/>
       <repopackage name="libqmi-tools"/>
       <repopackage name="libqpdf21"/>
@@ -2798,6 +2809,7 @@
       <repopackage name="libswscale5"/>
       <repopackage name="libsynctex2"/>
       <repopackage name="libsystemd0"/>
+      <repopackage name="libtag-extras1"/>
       <repopackage name="libtag1"/>
       <repopackage name="libtag_c0"/>
       <repopackage name="libtalloc2"/>
@@ -4283,6 +4295,7 @@
       <repopackage name="qemu-vgabios"/>
       <repopackage name="qemu-x86"/>
       <repopackage name="qqc2-desktop-style"/>
+      <repopackage name="qt4-qtscript"/>
       <repopackage name="quadrapassel"/>
       <repopackage name="quadrapassel-lang"/>
       <repopackage name="quagga"/>
@@ -4960,6 +4973,7 @@
       <repopackage name="sysuser-shadow"/>
       <repopackage name="sysvinit-tools"/>
       <repopackage name="tack"/>
+      <repopackage name="taglib"/>
       <repopackage name="tagsoup"/>
       <repopackage name="tango-icon-theme"/>
       <repopackage name="tar"/>
diff --git a/openSUSE-dvd5-dvd-x86_64.kiwi b/openSUSE-dvd5-dvd-x86_64.kiwi
index e07b6d17..2b3968de 100644
--- a/openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-dvd5-dvd-x86_64.kiwi
@@ -110,6 +110,7 @@
       <repopackage name="alsa-plugins-pulse"/>
       <repopackage name="alsa-plugins-pulse-32bit" arch="x86_64"/>
       <repopackage name="alsa-utils"/>
+      <repopackage name="amarok"/>
       <repopackage name="amavisd-new"/>
       <repopackage name="amavisd-new-docs"/>
       <repopackage name="amtk-5-lang"/>
@@ -334,6 +335,7 @@
       <repopackage name="circuslinux"/>
       <repopackage name="ckermit"/>
       <repopackage name="clamav"/>
+      <repopackage name="clamz"/>
       <repopackage name="clang8"/>
       <repopackage name="clang8-checker"/>
       <repopackage name="claws-mail"/>
@@ -1977,6 +1979,9 @@
       <repopackage name="libgphoto2-6"/>
       <repopackage name="libgphoto2-6-lang"/>
       <repopackage name="libgpm2"/>
+      <repopackage name="libgpod-lang"/>
+      <repopackage name="libgpod-tools"/>
+      <repopackage name="libgpod4"/>
       <repopackage name="libgps24"/>
       <repopackage name="libgraphene-1_0-0"/>
       <repopackage name="libgraphite2-3"/>
@@ -2364,6 +2369,7 @@
       <repopackage name="liblangtag1"/>
       <repopackage name="liblapack3"/>
       <repopackage name="liblasem-0_4-4"/>
+      <repopackage name="liblastfm1"/>
       <repopackage name="liblavfile-2_0-0"/>
       <repopackage name="liblavjpeg-2_0-0"/>
       <repopackage name="liblavplay-2_0-0"/>
@@ -2392,6 +2398,7 @@
       <repopackage name="liblockdev1"/>
       <repopackage name="liblogging0"/>
       <repopackage name="liblognorm5"/>
+      <repopackage name="libloudmouth-1-0"/>
       <repopackage name="liblouis-data"/>
       <repopackage name="liblouis17"/>
       <repopackage name="liblpsolve55-0"/>
@@ -2474,9 +2481,11 @@
       <repopackage name="libmutter-4-0"/>
       <repopackage name="libmwaw-0_3-3"/>
       <repopackage name="libmxml1"/>
+      <repopackage name="libmygpo-qt1"/>
       <repopackage name="libmypaint-1_3-0"/>
       <repopackage name="libmypaint-lang"/>
       <repopackage name="libmysofa0"/>
+      <repopackage name="libmysqld19"/>
       <repopackage name="libmythes-1_2-0"/>
       <repopackage name="libnautilus-extension1"/>
       <repopackage name="libncurses6"/>
@@ -2690,7 +2699,9 @@
       <repopackage name="libqb20"/>
       <repopackage name="libqca-qt5"/>
       <repopackage name="libqca-qt5-plugins"/>
+      <repopackage name="libqca2"/>
       <repopackage name="libqgpgme7"/>
+      <repopackage name="libqjson0"/>
       <repopackage name="libqmi-glib5"/>
       <repopackage name="libqmi-tools"/>
       <repopackage name="libqpdf21"/>
@@ -2955,6 +2966,7 @@
       <repopackage name="libsynctex2"/>
       <repopackage name="libsystemd0"/>
       <repopackage name="libsystemd0-32bit" arch="x86_64"/>
+      <repopackage name="libtag-extras1"/>
       <repopackage name="libtag1"/>
       <repopackage name="libtag_c0"/>
       <repopackage name="libtalloc2"/>
@@ -4525,6 +4537,7 @@
       <repopackage name="qemu-vgabios"/>
       <repopackage name="qemu-x86"/>
       <repopackage name="qqc2-desktop-style"/>
+      <repopackage name="qt4-qtscript"/>
       <repopackage name="quadrapassel"/>
       <repopackage name="quadrapassel-lang"/>
       <repopackage name="quagga"/>
@@ -5213,6 +5226,7 @@
       <repopackage name="sysuser-shadow"/>
       <repopackage name="sysvinit-tools"/>
       <repopackage name="tack"/>
+      <repopackage name="taglib"/>
       <repopackage name="tagsoup"/>
       <repopackage name="tango-icon-theme"/>
       <repopackage name="tar"/>
diff --git a/unsorted.yml b/unsorted.yml
index dfc41b71..b795dc5e 100644
--- a/unsorted.yml
+++ b/unsorted.yml
@@ -385,7 +385,6 @@ unsorted:
   - alure 
   - alure-devel 
   - amanda: [x86_64] 
-  - amarok 
   - amarok-lang 
   - amazon-ecs-init 
   - amazon-ssm-agent 
@@ -1527,7 +1526,6 @@ unsorted:
   - clamav-devel 
   - clamtk 
   - clamtk-lang 
-  - clamz 
   - clang 
   - clang-checker 
   - clang-devel 
@@ -8764,9 +8762,6 @@ unsorted:
   - libgpm2-32bit: [x86_64] 
   - libgpod-devel 
   - libgpod-doc 
-  - libgpod-lang 
-  - libgpod-tools 
-  - libgpod4 
   - libgpod4-32bit: [x86_64] 
   - libgrail6 
   - libgrail6-32bit: [x86_64] 
@@ -9378,7 +9373,6 @@ unsorted:
   - liblapacke3-32bit: [x86_64] 
   - liblastfm-devel 
   - liblastfm-qt5-devel 
-  - liblastfm1 
   - liblastfm5-1 
   - liblastfm5-1-32bit: [x86_64] 
   - liblastfm_fingerprint5-1 
@@ -9479,7 +9473,6 @@ unsorted:
   - libloki-devel 
   - libloki-doc 
   - libloki0_1_7 
-  - libloudmouth-1-0 
   - liblouis-devel 
   - liblouis-doc 
   - liblouis-tools 
@@ -9772,7 +9765,6 @@ unsorted:
   - libmwaw-tools 
   - libmxml1-32bit: [x86_64] 
   - libmygpo-qt-devel 
-  - libmygpo-qt1 
   - libmygpo-qt5-1 
   - libmygpo-qt5-devel 
   - libmypaint-devel 
@@ -9785,7 +9777,6 @@ unsorted:
   - libmysqlcppconn8-1 
   - libmysqlcppconn8-devel 
   - libmysqld-devel 
-  - libmysqld19 
   - libnanomsg5 
   - libnautilus-extension1-32bit: [x86_64] 
   - libnauty-2_6_11 
@@ -10437,7 +10428,6 @@ unsorted:
   - libqca-qt5-devel 
   - libqca-qt5-devel-32bit: [x86_64] 
   - libqca-qt5-plugins-32bit: [x86_64] 
-  - libqca2 
   - libqca2-32bit: [x86_64] 
   - libqca2-devel 
   - libqca2-plugin-cyrus-sasl 
@@ -10462,7 +10452,6 @@ unsorted:
   - libqjack-devel 
   - libqjack0 
   - libqjson-devel 
-  - libqjson0 
   - libqjson0-32bit: [x86_64] 
   - libqmatrixclient-devel 
   - libqmi-devel 
@@ -11233,8 +11222,6 @@ unsorted:
   - libtachyon-0_99b6 
   - libtachyon-devel 
   - libtag-devel 
-  - libtag-doc 
-  - libtag-extras1 
   - libtag1-32bit: [x86_64] 
   - libtag_c0-32bit: [x86_64] 
   - libtaginfo-devel 
@@ -21762,7 +21749,6 @@ unsorted:
   - qsynth-lang 
   - qt4-assistant-adp 
   - qt4-assistant-adp-devel 
-  - qt4-qtscript 
   - qt4-qtscript-doc 
   - qt4-style-fusion 
   - qt5ct