diff --git a/dvd.group b/dvd.group
index 23e8190..dc62ddc 100644
--- a/dvd.group
+++ b/dvd.group
@@ -116,7 +116,6 @@
     <package name="anjuta-extras-lang" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="anjuta-lang" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="apache-commons-logging" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
-    <package name="apache-parent" supportstatus="unsupported"/> <!-- reason: dvd:apache-parent -->
     <package name="apache2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-lamp_server -->
     <package name="apache2-doc" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-lamp_server -->
     <package name="apache2-example-pages" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-lamp_server -->
@@ -2002,7 +2001,7 @@
     <package name="libfreebl3-hmac" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libfreecell-solver0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="libfreehand-0_1-1" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
-    <package name="libfreeipmi17" supportstatus="unsupported"/> <!-- reason: dvd:nut -->
+    <package name="libfreeipmi17" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libfreerdp2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libfreetype6" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libfreshclam2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
@@ -2219,7 +2218,6 @@
     <package name="libip6tc2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libipmiconsole2" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libipmidetect0" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="libipmimonitoring6" supportstatus="unsupported"/> <!-- reason: dvd:nut -->
     <package name="libipset13" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libiptcdata" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libiptcdata-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -2525,7 +2523,6 @@
     <package name="libportaudio2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libpostproc55_7" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libpotrace0" supportstatus="unsupported"/> <!-- reason: dvd:inkscape -->
-    <package name="libpowerman0" supportstatus="unsupported"/> <!-- reason: dvd:nut -->
     <package name="libpq5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="libpresage1" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libprocps8" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -2824,7 +2821,6 @@
     <package name="libunwind" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libupnp17" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="libupower-glib3" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="libupsclient1" supportstatus="unsupported"/> <!-- reason: dvd:nut -->
     <package name="liburcu6" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libusb-0_1-4" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="libusb-1_0-0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
@@ -3174,7 +3170,6 @@
     <package name="mpt-firmware" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="mpt-status" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="msr-safe-kmp-default" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="mtd-utils" supportstatus="unsupported"/> <!-- reason: dvd:mtd-utils -->
     <package name="mtdev-devel" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="mtools" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
     <package name="mtr" supportstatus="unsupported"/> <!-- reason: dvd:patterns-network-network_admin -->
@@ -3264,8 +3259,6 @@
     <package name="ntfsprogs" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="ntp-doc" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="numlockx" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="nut" supportstatus="unsupported"/> <!-- reason: dvd:nut -->
-    <package name="nut-cgi" supportstatus="unsupported"/> <!-- reason: dvd:nut-cgi -->
     <package name="nvme-cli" supportstatus="unsupported"/> <!-- reason: dvd:nvme-cli -->
     <package name="ocfs2-tools" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="ofl" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
@@ -4651,7 +4644,7 @@
     <package name="system-user-root" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="system-user-srvGeoClue" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="system-user-tftp" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="system-user-upsd" supportstatus="unsupported"/> <!-- reason: dvd:nut -->
+    <package name="system-user-upsd" supportstatus="unsupported"/> <!-- reason: dvd:system-user-upsd -->
     <package name="system-user-uucp" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
     <package name="system-user-wwwrun" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-lamp_server -->
     <package name="systemd" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
@@ -5104,7 +5097,6 @@
     <package name="xlockmore" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="xmessage" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="xml-commons-apis" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
-    <package name="xml-commons-resolver" supportstatus="unsupported"/> <!-- reason: dvd:xml-commons-resolver -->
     <package name="xmlcharent" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="xmodmap" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="xorg-docs" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
@@ -5360,7 +5352,6 @@
     <package name="gtk2-tools-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="guestfs-data" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="ibus-gtk-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
-    <package name="java-14-openjdk-headless" supportstatus="unsupported"/> <!-- reason: dvd:apache-parent -->
     <package name="krb5-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="ldmtool" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="lib389" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-directory_server -->
diff --git a/openSUSE-dvd5-dvd-i586.kiwi b/openSUSE-dvd5-dvd-i586.kiwi
index ff53c5a..e87a344 100644
--- a/openSUSE-dvd5-dvd-i586.kiwi
+++ b/openSUSE-dvd5-dvd-i586.kiwi
@@ -116,7 +116,6 @@
       <repopackage name="anjuta-extras-lang"/>
       <repopackage name="anjuta-lang"/>
       <repopackage name="apache-commons-logging"/>
-      <repopackage name="apache-parent"/>
       <repopackage name="apache2"/>
       <repopackage name="apache2-doc"/>
       <repopackage name="apache2-example-pages"/>
@@ -1949,7 +1948,6 @@
       <repopackage name="libip6tc2"/>
       <repopackage name="libipmiconsole2"/>
       <repopackage name="libipmidetect0"/>
-      <repopackage name="libipmimonitoring6"/>
       <repopackage name="libipset13"/>
       <repopackage name="libiptcdata"/>
       <repopackage name="libiptcdata-lang"/>
@@ -2429,7 +2427,6 @@
       <repopackage name="libportaudio2"/>
       <repopackage name="libpostproc55_7"/>
       <repopackage name="libpotrace0"/>
-      <repopackage name="libpowerman0"/>
       <repopackage name="libpq5"/>
       <repopackage name="libpresage1"/>
       <repopackage name="libprocps8"/>
@@ -2784,7 +2781,6 @@
       <repopackage name="libunwind"/>
       <repopackage name="libupnp17"/>
       <repopackage name="libupower-glib3"/>
-      <repopackage name="libupsclient1"/>
       <repopackage name="liburcu6"/>
       <repopackage name="libUsageEnvironment3"/>
       <repopackage name="libusb-0_1-4"/>
@@ -3199,7 +3195,6 @@
       <repopackage name="mpt-firmware"/>
       <repopackage name="mpt-status"/>
       <repopackage name="msr-safe-kmp-default"/>
-      <repopackage name="mtd-utils"/>
       <repopackage name="mtdev-devel"/>
       <repopackage name="mtools"/>
       <repopackage name="mtr"/>
@@ -3310,8 +3305,6 @@
       <repopackage name="ntfsprogs"/>
       <repopackage name="ntp-doc"/>
       <repopackage name="numlockx"/>
-      <repopackage name="nut"/>
-      <repopackage name="nut-cgi"/>
       <repopackage name="nvme-cli"/>
       <repopackage name="ocfs2-tools"/>
       <repopackage name="ofl"/>
@@ -5159,7 +5152,6 @@
       <repopackage name="xlockmore"/>
       <repopackage name="xmessage"/>
       <repopackage name="xml-commons-apis"/>
-      <repopackage name="xml-commons-resolver"/>
       <repopackage name="xmlcharent"/>
       <repopackage name="xmodmap"/>
       <repopackage name="xorg-docs"/>
diff --git a/openSUSE-dvd5-dvd-x86_64.kiwi b/openSUSE-dvd5-dvd-x86_64.kiwi
index edf4948..3b2a664 100644
--- a/openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-dvd5-dvd-x86_64.kiwi
@@ -122,7 +122,6 @@
       <repopackage name="anjuta-extras-lang"/>
       <repopackage name="anjuta-lang"/>
       <repopackage name="apache-commons-logging"/>
-      <repopackage name="apache-parent"/>
       <repopackage name="apache2"/>
       <repopackage name="apache2-doc"/>
       <repopackage name="apache2-example-pages"/>
@@ -1074,7 +1073,6 @@
       <repopackage name="iw"/>
       <repopackage name="java-11-openjdk"/>
       <repopackage name="java-11-openjdk-headless"/>
-      <repopackage name="java-14-openjdk-headless" arch="x86_64"/>
       <repopackage name="javapackages-filesystem"/>
       <repopackage name="javapackages-tools"/>
       <repopackage name="jfsutils"/>
@@ -2043,7 +2041,6 @@
       <repopackage name="libip6tc2"/>
       <repopackage name="libipmiconsole2"/>
       <repopackage name="libipmidetect0"/>
-      <repopackage name="libipmimonitoring6"/>
       <repopackage name="libipset13"/>
       <repopackage name="libiptcdata"/>
       <repopackage name="libiptcdata-lang"/>
@@ -2557,7 +2554,6 @@
       <repopackage name="libportaudio2"/>
       <repopackage name="libpostproc55_7"/>
       <repopackage name="libpotrace0"/>
-      <repopackage name="libpowerman0"/>
       <repopackage name="libpq5"/>
       <repopackage name="libpresage1"/>
       <repopackage name="libprocps8"/>
@@ -2941,7 +2937,6 @@
       <repopackage name="libunwind"/>
       <repopackage name="libupnp17"/>
       <repopackage name="libupower-glib3"/>
-      <repopackage name="libupsclient1"/>
       <repopackage name="liburcu6"/>
       <repopackage name="libUsageEnvironment3"/>
       <repopackage name="libusb-0_1-4"/>
@@ -3402,7 +3397,6 @@
       <repopackage name="mpt-firmware"/>
       <repopackage name="mpt-status"/>
       <repopackage name="msr-safe-kmp-default"/>
-      <repopackage name="mtd-utils"/>
       <repopackage name="mtdev-devel"/>
       <repopackage name="mtools"/>
       <repopackage name="mtr"/>
@@ -3516,8 +3510,6 @@
       <repopackage name="numactl" arch="x86_64"/>
       <repopackage name="numad" arch="x86_64"/>
       <repopackage name="numlockx"/>
-      <repopackage name="nut"/>
-      <repopackage name="nut-cgi"/>
       <repopackage name="nvme-cli"/>
       <repopackage name="ocfs2-tools"/>
       <repopackage name="ofl"/>
@@ -5415,7 +5407,6 @@
       <repopackage name="xlockmore"/>
       <repopackage name="xmessage"/>
       <repopackage name="xml-commons-apis"/>
-      <repopackage name="xml-commons-resolver"/>
       <repopackage name="xmlcharent"/>
       <repopackage name="xmlstarlet" arch="x86_64"/>
       <repopackage name="xmodmap"/>
diff --git a/unsorted.yml b/unsorted.yml
index 3d6cbc1..c6e2de9 100644
--- a/unsorted.yml
+++ b/unsorted.yml
@@ -617,6 +617,7 @@ unsorted:
   - apache-ivy 
   - apache-ivy-javadoc 
   - apache-logging-parent 
+  - apache-parent 
   - apache-pdfbox 
   - apache-pdfbox-javadoc 
   - apache-portlet-1_0-api 
@@ -6524,7 +6525,7 @@ unsorted:
   - java-14-openjdk-accessibility 
   - java-14-openjdk-demo 
   - java-14-openjdk-devel 
-  - java-14-openjdk-headless: [i586] 
+  - java-14-openjdk-headless 
   - java-14-openjdk-javadoc 
   - java-14-openjdk-jmods 
   - java-14-openjdk-src 
@@ -10439,6 +10440,7 @@ unsorted:
   - libipa_hbac-devel 
   - libipa_hbac0 
   - libiperf0 
+  - libipmimonitoring6 
   - libipopt0: [x86_64] 
   - libipq-devel 
   - libipq0 
@@ -11691,6 +11693,7 @@ unsorted:
   - libportaudiocpp0 
   - libportmidi0 
   - libpostproc55_7-32bit: [x86_64] 
+  - libpowerman0 
   - libpq5-32bit: [x86_64] 
   - libpqos-devel 
   - libpqos4 
@@ -12948,6 +12951,7 @@ unsorted:
   - libupnp-devel 
   - libupnp17-32bit: [x86_64] 
   - libupower-glib-devel 
+  - libupsclient1 
   - liburcu-devel 
   - liburcu6-32bit: [x86_64] 
   - liburfkill-glib-devel 
@@ -15067,6 +15071,7 @@ unsorted:
   - msv-xmlgen 
   - msv-xsdlib 
   - mt-st 
+  - mtd-utils 
   - mtdev 
   - mtools-doc 
   - mtp-tools 
@@ -15971,6 +15976,8 @@ unsorted:
   - nuoveXT2-icon-theme 
   - nuspell 
   - nuspell-devel 
+  - nut 
+  - nut-cgi 
   - nut-devel 
   - nut-drivers-net 
   - nvdock 
@@ -34982,6 +34989,7 @@ unsorted:
   - xml-commons-apis-bootstrap 
   - xml-commons-apis-javadoc 
   - xml-commons-apis-manual 
+  - xml-commons-resolver 
   - xml-commons-resolver-bootstrap 
   - xml-commons-resolver-javadoc 
   - xml-commons-which-bootstrap