diff --git a/dvd.group b/dvd.group
index 0c23e49b..2bcfc61c 100644
--- a/dvd.group
+++ b/dvd.group
@@ -294,6 +294,8 @@
     <package name="cantarell-fonts" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="capi4hylafax" supportstatus="unsupported"/> <!-- reason: dvd:capi4hylafax -->
     <!-- capisuite not found on i586,x86_64-->
+    <package name="catfish" supportstatus="unsupported"/> <!-- reason: dvd:patterns-xfce-xfce -->
+    <package name="catfish-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-xfce-xfce -->
     <package name="ccache" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="cd-discid" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="cdparanoia" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
@@ -662,6 +664,7 @@
     <package name="gedit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="gedit-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="gedit-plugin-devhelp" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+    <package name="gedit-plugin-zeitgeist" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="gedit-plugins" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="gedit-plugins-data" supportstatus="unsupported"/> <!-- reason: dvd:gedit-plugin-bookmarks -->
     <package name="gedit-plugins-lang" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
@@ -3119,6 +3122,7 @@
     <package name="libzapojit-0_0-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libzbar0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libzebra1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-network-network_admin -->
+    <package name="libzeitgeist-2_0-0" supportstatus="unsupported"/> <!-- reason: dvd:gedit-plugin-dashboard -->
     <package name="libzhuyin-1_1-data" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libzhuyin13" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libzhuyin7" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
@@ -3242,8 +3246,8 @@
     <package name="mkcomposecache" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="mkfontdir" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="mkfontscale" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="mlocate" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="mlocate-lang" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+    <package name="mlocate" supportstatus="unsupported"/> <!-- reason: dvd:patterns-xfce-xfce -->
+    <package name="mlocate-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-xfce-xfce -->
     <package name="mlterm" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="mlterm-canna" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="mlterm-ibus" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
@@ -4170,11 +4174,11 @@
     <package name="python3-packaging" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="python3-paramiko" supportstatus="unsupported"/> <!-- reason: dvd:salt-master -->
     <package name="python3-parso" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
-    <package name="python3-pexpect" supportstatus="unsupported"/> <!-- reason: dvd:salt-master -->
+    <package name="python3-pexpect" supportstatus="unsupported"/> <!-- reason: dvd:patterns-xfce-xfce -->
     <package name="python3-pip" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="python3-ply" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="python3-psutil" supportstatus="unsupported"/> <!-- reason: dvd:patterns-xfce-xfce -->
-    <package name="python3-ptyprocess" supportstatus="unsupported"/> <!-- reason: dvd:salt-master -->
+    <package name="python3-ptyprocess" supportstatus="unsupported"/> <!-- reason: dvd:patterns-xfce-xfce -->
     <package name="python3-py" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="python3-pyOpenSSL" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="python3-pyasn1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -5525,6 +5529,7 @@
     <package name="yudit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-technical_writing -->
     <package name="yum-metadata-parser" supportstatus="unsupported"/> <!-- reason: dvd:createrepo -->
     <package name="zd1211-firmware" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
+    <package name="zeitgeist" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="zenity" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="zenity-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="zeromq-tools" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -5572,7 +5577,6 @@
     <package name="liblirc_driver0" supportstatus="unsupported"/> <!-- reason: dvd:liblirc_driver0 -->
     <package name="libpng12-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="libpurple-plugin-pack-extras" supportstatus="unsupported"/> <!-- reason: dvd:libpurple-plugin-pack-extras -->
-    <package name="libzeitgeist-2_0-0" supportstatus="unsupported"/> <!-- reason: dvd:gedit-plugin-dashboard -->
     <package name="lirc-core" supportstatus="unsupported"/> <!-- reason: dvd:lirc-core -->
     <package name="nut-drivers-net" supportstatus="unsupported"/> <!-- reason: dvd:nut-drivers-net -->
     <!-- openafs-client uninstallable: package openafs-client-1.8.2-3.2.i586 requires librokenafs.so.2, but none of the providers can be installed-->
diff --git a/openSUSE-dvd5-dvd-i586.kiwi b/openSUSE-dvd5-dvd-i586.kiwi
index 5b310f3f..7571d341 100644
--- a/openSUSE-dvd5-dvd-i586.kiwi
+++ b/openSUSE-dvd5-dvd-i586.kiwi
@@ -290,6 +290,8 @@
       <repopackage name="canna-libs"/>
       <repopackage name="cantarell-fonts"/>
       <repopackage name="capi4hylafax"/>
+      <repopackage name="catfish"/>
+      <repopackage name="catfish-lang"/>
       <repopackage name="ccache"/>
       <repopackage name="cd-discid"/>
       <repopackage name="cdparanoia"/>
@@ -681,6 +683,7 @@
       <repopackage name="gedit-plugin-terminal" arch="i586,i686"/>
       <repopackage name="gedit-plugin-textsize" arch="i586,i686"/>
       <repopackage name="gedit-plugin-wordcompletion" arch="i586,i686"/>
+      <repopackage name="gedit-plugin-zeitgeist"/>
       <repopackage name="gedit-plugins"/>
       <repopackage name="gedit-plugins-data"/>
       <repopackage name="gedit-plugins-lang"/>
@@ -3147,7 +3150,7 @@
       <repopackage name="libzapojit-0_0-0"/>
       <repopackage name="libzbar0"/>
       <repopackage name="libzebra1"/>
-      <repopackage name="libzeitgeist-2_0-0" arch="i586,i686"/>
+      <repopackage name="libzeitgeist-2_0-0"/>
       <repopackage name="libzhuyin-1_1-data"/>
       <repopackage name="libzhuyin13"/>
       <repopackage name="libzhuyin7"/>
@@ -5605,6 +5608,7 @@
       <repopackage name="yudit"/>
       <repopackage name="yum-metadata-parser"/>
       <repopackage name="zd1211-firmware"/>
+      <repopackage name="zeitgeist"/>
       <repopackage name="zenity"/>
       <repopackage name="zenity-lang"/>
       <repopackage name="zeromq-tools"/>
diff --git a/openSUSE-dvd5-dvd-x86_64.kiwi b/openSUSE-dvd5-dvd-x86_64.kiwi
index ee5efda8..b58e8fe2 100644
--- a/openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-dvd5-dvd-x86_64.kiwi
@@ -297,6 +297,8 @@
       <repopackage name="canna-libs"/>
       <repopackage name="cantarell-fonts"/>
       <repopackage name="capi4hylafax"/>
+      <repopackage name="catfish"/>
+      <repopackage name="catfish-lang"/>
       <repopackage name="ccache"/>
       <repopackage name="cd-discid"/>
       <repopackage name="cdparanoia"/>
@@ -676,6 +678,7 @@
       <repopackage name="gedit"/>
       <repopackage name="gedit-lang"/>
       <repopackage name="gedit-plugin-devhelp"/>
+      <repopackage name="gedit-plugin-zeitgeist"/>
       <repopackage name="gedit-plugins"/>
       <repopackage name="gedit-plugins-data"/>
       <repopackage name="gedit-plugins-lang"/>
@@ -3307,6 +3310,7 @@
       <repopackage name="libzapojit-0_0-0"/>
       <repopackage name="libzbar0"/>
       <repopackage name="libzebra1"/>
+      <repopackage name="libzeitgeist-2_0-0"/>
       <repopackage name="libzhuyin-1_1-data"/>
       <repopackage name="libzhuyin13"/>
       <repopackage name="libzhuyin7"/>
@@ -5796,6 +5800,7 @@
       <repopackage name="yudit"/>
       <repopackage name="yum-metadata-parser"/>
       <repopackage name="zd1211-firmware"/>
+      <repopackage name="zeitgeist"/>
       <repopackage name="zenity"/>
       <repopackage name="zenity-lang"/>
       <repopackage name="zerofree" arch="x86_64"/>
diff --git a/unsorted.yml b/unsorted.yml
index 141e27b4..876c950c 100644
--- a/unsorted.yml
+++ b/unsorted.yml
@@ -1248,8 +1248,6 @@ unsorted:
   - casync: [x86_64] 
   - catatonit: [i586] 
   - catcodec 
-  - catfish 
-  - catfish-lang 
   - cava 
   - cblas-devel 
   - cblas-devel-32bit: [x86_64] 
@@ -3124,7 +3122,6 @@ unsorted:
   - gedit-plugin-textsize: [x86_64] 
   - gedit-plugin-translate 
   - gedit-plugin-wordcompletion: [x86_64] 
-  - gedit-plugin-zeitgeist 
   - gedit-theme-adapta 
   - gedit-theme-plata 
   - geekodoc 
@@ -11441,7 +11438,6 @@ unsorted:
   - libzck1 
   - libzeitgeist-1_0-1 
   - libzeitgeist-1_0-1-32bit: [x86_64] 
-  - libzeitgeist-2_0-0: [x86_64] 
   - libzeitgeist-devel 
   - libzen-devel 
   - libzen0 
@@ -30674,7 +30670,6 @@ unsorted:
   - zchunk 
   - zdbsp 
   - zeal 
-  - zeitgeist 
   - zeitgeist-devel 
   - zerobranestudio 
   - zerofree: [i586]