diff --git a/DVD5-i586.group b/DVD5-i586.group
index 2845de30..0052aaab 100644
--- a/DVD5-i586.group
+++ b/DVD5-i586.group
@@ -482,7 +482,9 @@
     <package name="enscript"/>
     <package name="eog"/>
     <package name="eog-lang"/>
+    <package name="eog-plugin-exif-display"/>
     <package name="eog-plugins"/>
+    <package name="eog-plugins-data"/>
     <package name="eog-plugins-lang"/>
     <package name="epiphany"/>
     <package name="epiphany-branding-openSUSE"/>
@@ -576,6 +578,8 @@
     <package name="fontconfig-devel"/>
     <package name="fonts-KanjiStrokeOrders"/>
     <package name="fonts-config"/>
+    <package name="fortune"/>
+    <package name="fossil"/>
     <package name="fprintd"/>
     <package name="fprintd-lang"/>
     <package name="fprintd-pam"/>
@@ -657,7 +661,25 @@
     <package name="geany-plugins-lang"/>
     <package name="gedit"/>
     <package name="gedit-lang"/>
+    <package name="gedit-plugin-bookmarks"/>
+    <package name="gedit-plugin-bracketcompletion"/>
+    <package name="gedit-plugin-charmap"/>
+    <package name="gedit-plugin-codecomment"/>
+    <package name="gedit-plugin-colorpicker"/>
+    <package name="gedit-plugin-colorschemer"/>
+    <package name="gedit-plugin-commander"/>
+    <package name="gedit-plugin-dashboard"/>
     <package name="gedit-plugin-devhelp"/>
+    <package name="gedit-plugin-drawspaces"/>
+    <package name="gedit-plugin-findinfiles"/>
+    <package name="gedit-plugin-git"/>
+    <package name="gedit-plugin-joinlines"/>
+    <package name="gedit-plugin-multiedit"/>
+    <package name="gedit-plugin-smartspaces"/>
+    <package name="gedit-plugin-synctex"/>
+    <package name="gedit-plugin-terminal"/>
+    <package name="gedit-plugin-textsize"/>
+    <package name="gedit-plugin-wordcompletion"/>
     <package name="gedit-plugins"/>
     <package name="gedit-plugins-data"/>
     <package name="gedit-plugins-lang"/>
@@ -1102,6 +1124,8 @@
     <package name="issue-generator"/>
     <package name="iw"/>
     <package name="jakarta-taglibs-standard"/>
+    <package name="java-10-openjdk"/>
+    <package name="java-10-openjdk-headless"/>
     <package name="java-11-openjdk"/>
     <package name="java-11-openjdk-headless"/>
     <package name="javapackages-tools"/>
@@ -1415,6 +1439,7 @@
     <package name="kruler"/>
     <package name="kruler-lang"/>
     <package name="krusader"/>
+    <package name="krusader-doc"/>
     <package name="kscd"/>
     <package name="kscreen5"/>
     <package name="kscreen5-lang"/>
@@ -2077,6 +2102,7 @@
     <package name="libfreetype6"/>
     <package name="libfribidi0"/>
     <package name="libfstrm0"/>
+    <package name="libftdi1-2"/>
     <package name="libftgl2"/>
     <package name="libfuse2"/>
     <package name="libfwupd2"/>
@@ -2100,6 +2126,7 @@
     <package name="libgda-5_0-4"/>
     <package name="libgda-5_0-4-lang"/>
     <package name="libgda-5_0-bdb"/>
+    <package name="libgda-5_0-sqlcipher"/>
     <package name="libgda-5_0-sqlite"/>
     <package name="libgda-ui-5_0-4"/>
     <package name="libgda-ui-5_0-plugins"/>
@@ -2296,6 +2323,7 @@
     <package name="libiptcdata"/>
     <package name="libiptcdata-lang"/>
     <package name="libiptcdata0"/>
+    <package name="libirrecord0"/>
     <package name="libirs160"/>
     <package name="libisc166"/>
     <package name="libisccc160"/>
@@ -2391,7 +2419,9 @@
     <package name="liblightdm-gobject-1-0"/>
     <package name="liblilv-0-0"/>
     <package name="liblink-grammar5"/>
+    <package name="liblirc0"/>
     <package name="liblirc_client0"/>
+    <package name="liblirc_driver0"/>
     <package name="liblmdb-0_9_22"/>
     <package name="liblockdev1"/>
     <package name="libloudmouth-1-0"/>
@@ -2528,6 +2558,7 @@
     <package name="libopenraw1"/>
     <package name="libopenssl-1_1-devel"/>
     <package name="libopenssl-devel"/>
+    <package name="libopenssl1_0_0"/>
     <package name="libopenssl1_1"/>
     <package name="libopenssl1_1-hmac"/>
     <package name="libopts25"/>
@@ -2636,6 +2667,7 @@
     <package name="libpurple-plugin-mrim"/>
     <package name="libpurple-plugin-mrim-lang"/>
     <package name="libpurple-plugin-pack"/>
+    <package name="libpurple-plugin-pack-extras"/>
     <package name="libpurple-plugin-pack-lang"/>
     <package name="libpurple-plugin-prpltwtr"/>
     <package name="libpurple-plugin-prpltwtr-lang"/>
@@ -3081,6 +3113,7 @@
     <package name="libzapojit-0_0-0"/>
     <package name="libzbar0"/>
     <package name="libzebra1"/>
+    <package name="libzeitgeist-2_0-0"/>
     <package name="libzhuyin-1_1-data"/>
     <package name="libzhuyin13"/>
     <package name="libzhuyin7"/>
@@ -3104,6 +3137,7 @@
     <package name="lightsoff-lang"/>
     <package name="links"/>
     <package name="linux-glibc-devel"/>
+    <package name="lirc-core"/>
     <package name="lklug-fonts"/>
     <package name="lockdev"/>
     <package name="log4j"/>
@@ -3339,6 +3373,13 @@
     <package name="nuoveXT2-icon-theme"/>
     <package name="nut"/>
     <package name="nut-cgi"/>
+    <package name="nut-devel-doc-html"/>
+    <package name="nut-devel-doc-pdf"/>
+    <package name="nut-doc-asciidoc"/>
+    <package name="nut-doc-html"/>
+    <package name="nut-doc-images"/>
+    <package name="nut-doc-pdf"/>
+    <package name="nut-drivers-net"/>
     <package name="obconf"/>
     <package name="obs-service-download_files"/>
     <package name="obs-service-download_url"/>
@@ -3871,6 +3912,7 @@
     <package name="pidgin-plugin-mattermost"/>
     <package name="pidgin-plugin-mrim"/>
     <package name="pidgin-plugin-pack"/>
+    <package name="pidgin-plugin-pack-extras"/>
     <package name="pidgin-plugin-prpltwtr"/>
     <package name="pidgin-plugin-rocketchat"/>
     <package name="pidgin-plugin-sipe"/>
@@ -3989,6 +4031,7 @@
     <package name="pulseaudio-lang"/>
     <package name="pulseaudio-module-bluetooth"/>
     <package name="pulseaudio-module-gsettings"/>
+    <package name="pulseaudio-module-lirc"/>
     <package name="pulseaudio-module-x11"/>
     <package name="pulseaudio-module-zeroconf"/>
     <package name="pulseaudio-utils"/>
@@ -4813,6 +4856,7 @@
     <package name="typelib-1_0-Geoclue-2_0"/>
     <package name="typelib-1_0-GeocodeGlib-1_0"/>
     <package name="typelib-1_0-Gepub-0_6"/>
+    <package name="typelib-1_0-Ggit-1_0"/>
     <package name="typelib-1_0-GjsPrivate-1_0"/>
     <package name="typelib-1_0-GnomeBluetooth-1_0"/>
     <package name="typelib-1_0-GnomeDesktop-3_0"/>
@@ -4831,6 +4875,7 @@
     <package name="typelib-1_0-GtkClutter-1_0"/>
     <package name="typelib-1_0-GtkSource-3_0"/>
     <package name="typelib-1_0-GtkVnc-2_0"/>
+    <package name="typelib-1_0-Gucharmap-2_90"/>
     <package name="typelib-1_0-IBus-1_0"/>
     <package name="typelib-1_0-JavaScriptCore-4_0"/>
     <package name="typelib-1_0-Json-1_0"/>
@@ -4863,6 +4908,7 @@
     <package name="typelib-1_0-WebKit2-4_0"/>
     <package name="typelib-1_0-Wnck-3_0"/>
     <package name="typelib-1_0-Xkl-1_0"/>
+    <package name="typelib-1_0-Zeitgeist-2_0"/>
     <package name="typelib-1_0-Zpj-0_0"/>
     <package name="typelib-1_0-libdazzle-1_0"/>
     <package name="ucode-amd"/>
diff --git a/_service:product_converter:openSUSE-Addon-NonOss-cd-addon-nonoss-i586_x86_64.kiwi b/_service:product_converter:openSUSE-Addon-NonOss-cd-addon-nonoss-i586_x86_64.kiwi
index 1fb6ca8f..f36049a7 100644
--- a/_service:product_converter:openSUSE-Addon-NonOss-cd-addon-nonoss-i586_x86_64.kiwi
+++ b/_service:product_converter:openSUSE-Addon-NonOss-cd-addon-nonoss-i586_x86_64.kiwi
@@ -382,7 +382,7 @@
       <repopackage name="libobjc46" onlyarch="skipit"/>
       <repopackage name="libobjc46-32bit" onlyarch="skipit"/>
       <repopackage name="libopenal1-32bit" arch="x86_64"/>
-      <repopackage name="libopenssl1_0_0"/>
+      <repopackage name="libopenssl1_0_0" arch="x86_64"/>
       <repopackage name="libopenssl1_0_0-steam"/>
       <repopackage name="libopenssl1_0_0-steam-32bit" arch="x86_64"/>
       <repopackage name="libOSMesa-devel"/>
diff --git a/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi b/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
index 920cd3c9..e47f0d66 100644
--- a/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
+++ b/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
@@ -481,7 +481,9 @@
       <repopackage name="enscript" arch="i586,i686"/>
       <repopackage name="eog" arch="i586,i686"/>
       <repopackage name="eog-lang" arch="i586,i686"/>
+      <repopackage name="eog-plugin-exif-display" arch="i586,i686"/>
       <repopackage name="eog-plugins" arch="i586,i686"/>
+      <repopackage name="eog-plugins-data" arch="i586,i686"/>
       <repopackage name="eog-plugins-lang" arch="i586,i686"/>
       <repopackage name="epiphany" arch="i586,i686"/>
       <repopackage name="epiphany-branding-openSUSE" arch="i586,i686"/>
@@ -576,6 +578,8 @@
       <repopackage name="fontconfig-devel" arch="i586,i686"/>
       <repopackage name="fonts-config" arch="i586,i686"/>
       <repopackage name="fonts-KanjiStrokeOrders" arch="i586,i686"/>
+      <repopackage name="fortune" arch="i586,i686"/>
+      <repopackage name="fossil" arch="i586,i686"/>
       <repopackage name="fprintd" arch="i586,i686"/>
       <repopackage name="fprintd-lang" arch="i586,i686"/>
       <repopackage name="fprintd-pam" arch="i586,i686"/>
@@ -657,7 +661,25 @@
       <repopackage name="geany-plugins-lang" arch="i586,i686"/>
       <repopackage name="gedit" arch="i586,i686"/>
       <repopackage name="gedit-lang" arch="i586,i686"/>
+      <repopackage name="gedit-plugin-bookmarks" arch="i586,i686"/>
+      <repopackage name="gedit-plugin-bracketcompletion" arch="i586,i686"/>
+      <repopackage name="gedit-plugin-charmap" arch="i586,i686"/>
+      <repopackage name="gedit-plugin-codecomment" arch="i586,i686"/>
+      <repopackage name="gedit-plugin-colorpicker" arch="i586,i686"/>
+      <repopackage name="gedit-plugin-colorschemer" arch="i586,i686"/>
+      <repopackage name="gedit-plugin-commander" arch="i586,i686"/>
+      <repopackage name="gedit-plugin-dashboard" arch="i586,i686"/>
       <repopackage name="gedit-plugin-devhelp" arch="i586,i686"/>
+      <repopackage name="gedit-plugin-drawspaces" arch="i586,i686"/>
+      <repopackage name="gedit-plugin-findinfiles" arch="i586,i686"/>
+      <repopackage name="gedit-plugin-git" arch="i586,i686"/>
+      <repopackage name="gedit-plugin-joinlines" arch="i586,i686"/>
+      <repopackage name="gedit-plugin-multiedit" arch="i586,i686"/>
+      <repopackage name="gedit-plugin-smartspaces" arch="i586,i686"/>
+      <repopackage name="gedit-plugin-synctex" arch="i586,i686"/>
+      <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-plugins" arch="i586,i686"/>
       <repopackage name="gedit-plugins-data" arch="i586,i686"/>
       <repopackage name="gedit-plugins-lang" arch="i586,i686"/>
@@ -1108,6 +1130,8 @@
       <repopackage name="issue-generator" arch="i586,i686"/>
       <repopackage name="iw" arch="i586,i686"/>
       <repopackage name="jakarta-taglibs-standard" arch="i586,i686"/>
+      <repopackage name="java-10-openjdk" arch="i586,i686"/>
+      <repopackage name="java-10-openjdk-headless" arch="i586,i686"/>
       <repopackage name="java-11-openjdk" arch="i586,i686"/>
       <repopackage name="java-11-openjdk-headless" arch="i586,i686"/>
       <repopackage name="javapackages-tools" arch="i586,i686"/>
@@ -1424,6 +1448,7 @@
       <repopackage name="kruler" arch="i586,i686"/>
       <repopackage name="kruler-lang" arch="i586,i686"/>
       <repopackage name="krusader" arch="i586,i686"/>
+      <repopackage name="krusader-doc" arch="i586,i686"/>
       <repopackage name="kscd" arch="i586,i686"/>
       <repopackage name="kscreen5" arch="i586,i686"/>
       <repopackage name="kscreen5-lang" arch="i586,i686"/>
@@ -1804,6 +1829,7 @@
       <repopackage name="libfreetype6" arch="i586,i686"/>
       <repopackage name="libfribidi0" arch="i586,i686"/>
       <repopackage name="libfstrm0" arch="i586,i686"/>
+      <repopackage name="libftdi1-2" arch="i586,i686"/>
       <repopackage name="libftgl2" arch="i586,i686"/>
       <repopackage name="libfuse2" arch="i586,i686"/>
       <repopackage name="libfwupd2" arch="i586,i686"/>
@@ -1827,6 +1853,7 @@
       <repopackage name="libgda-5_0-4" arch="i586,i686"/>
       <repopackage name="libgda-5_0-4-lang" arch="i586,i686"/>
       <repopackage name="libgda-5_0-bdb" arch="i586,i686"/>
+      <repopackage name="libgda-5_0-sqlcipher" arch="i586,i686"/>
       <repopackage name="libgda-5_0-sqlite" arch="i586,i686"/>
       <repopackage name="libgda-ui-5_0-4" arch="i586,i686"/>
       <repopackage name="libgda-ui-5_0-plugins" arch="i586,i686"/>
@@ -2034,6 +2061,7 @@
       <repopackage name="libiptcdata" arch="i586,i686"/>
       <repopackage name="libiptcdata-lang" arch="i586,i686"/>
       <repopackage name="libiptcdata0" arch="i586,i686"/>
+      <repopackage name="libirrecord0" arch="i586,i686"/>
       <repopackage name="libirs160" arch="i586,i686"/>
       <repopackage name="libisc166" arch="i586,i686"/>
       <repopackage name="libisccc160" arch="i586,i686"/>
@@ -2297,7 +2325,9 @@
       <repopackage name="liblightdm-gobject-1-0" arch="i586,i686"/>
       <repopackage name="liblilv-0-0" arch="i586,i686"/>
       <repopackage name="liblink-grammar5" arch="i586,i686"/>
+      <repopackage name="liblirc0" arch="i586,i686"/>
       <repopackage name="liblirc_client0" arch="i586,i686"/>
+      <repopackage name="liblirc_driver0" arch="i586,i686"/>
       <repopackage name="libLLVM6" arch="i586,i686"/>
       <repopackage name="liblmdb-0_9_22" arch="i586,i686"/>
       <repopackage name="liblockdev1" arch="i586,i686"/>
@@ -2439,6 +2469,7 @@
       <repopackage name="libopenraw1" arch="i586,i686"/>
       <repopackage name="libopenssl-1_1-devel" arch="i586,i686"/>
       <repopackage name="libopenssl-devel" arch="i586,i686"/>
+      <repopackage name="libopenssl1_0_0" arch="i586,i686"/>
       <repopackage name="libopenssl1_1" arch="i586,i686"/>
       <repopackage name="libopenssl1_1-hmac" arch="i586,i686"/>
       <repopackage name="libopts25" arch="i586,i686"/>
@@ -2547,6 +2578,7 @@
       <repopackage name="libpurple-plugin-mrim" arch="i586,i686"/>
       <repopackage name="libpurple-plugin-mrim-lang" arch="i586,i686"/>
       <repopackage name="libpurple-plugin-pack" arch="i586,i686"/>
+      <repopackage name="libpurple-plugin-pack-extras" arch="i586,i686"/>
       <repopackage name="libpurple-plugin-pack-lang" arch="i586,i686"/>
       <repopackage name="libpurple-plugin-prpltwtr" arch="i586,i686"/>
       <repopackage name="libpurple-plugin-prpltwtr-lang" arch="i586,i686"/>
@@ -3090,6 +3122,7 @@
       <repopackage name="libzapojit-0_0-0" arch="i586,i686"/>
       <repopackage name="libzbar0" arch="i586,i686"/>
       <repopackage name="libzebra1" arch="i586,i686"/>
+      <repopackage name="libzeitgeist-2_0-0" arch="i586,i686"/>
       <repopackage name="libzhuyin-1_1-data" arch="i586,i686"/>
       <repopackage name="libzhuyin13" arch="i586,i686"/>
       <repopackage name="libzhuyin7" arch="i586,i686"/>
@@ -3113,6 +3146,7 @@
       <repopackage name="lightsoff-lang" arch="i586,i686"/>
       <repopackage name="links" arch="i586,i686"/>
       <repopackage name="linux-glibc-devel" arch="i586,i686"/>
+      <repopackage name="lirc-core" arch="i586,i686"/>
       <repopackage name="lklug-fonts" arch="i586,i686"/>
       <repopackage name="lockdev" arch="i586,i686"/>
       <repopackage name="log4j" arch="i586,i686"/>
@@ -3384,6 +3418,13 @@
       <repopackage name="nuoveXT2-icon-theme" arch="i586,i686"/>
       <repopackage name="nut" arch="i586,i686"/>
       <repopackage name="nut-cgi" arch="i586,i686"/>
+      <repopackage name="nut-devel-doc-html" arch="i586,i686"/>
+      <repopackage name="nut-devel-doc-pdf" arch="i586,i686"/>
+      <repopackage name="nut-doc-asciidoc" arch="i586,i686"/>
+      <repopackage name="nut-doc-html" arch="i586,i686"/>
+      <repopackage name="nut-doc-images" arch="i586,i686"/>
+      <repopackage name="nut-doc-pdf" arch="i586,i686"/>
+      <repopackage name="nut-drivers-net" arch="i586,i686"/>
       <repopackage name="obconf" arch="i586,i686"/>
       <repopackage name="obs-service-download_files" arch="i586,i686"/>
       <repopackage name="obs-service-download_url" arch="i586,i686"/>
@@ -3926,6 +3967,7 @@
       <repopackage name="pidgin-plugin-mattermost" arch="i586,i686"/>
       <repopackage name="pidgin-plugin-mrim" arch="i586,i686"/>
       <repopackage name="pidgin-plugin-pack" arch="i586,i686"/>
+      <repopackage name="pidgin-plugin-pack-extras" arch="i586,i686"/>
       <repopackage name="pidgin-plugin-prpltwtr" arch="i586,i686"/>
       <repopackage name="pidgin-plugin-rocketchat" arch="i586,i686"/>
       <repopackage name="pidgin-plugin-sipe" arch="i586,i686"/>
@@ -4044,6 +4086,7 @@
       <repopackage name="pulseaudio-lang" arch="i586,i686"/>
       <repopackage name="pulseaudio-module-bluetooth" arch="i586,i686"/>
       <repopackage name="pulseaudio-module-gsettings" arch="i586,i686"/>
+      <repopackage name="pulseaudio-module-lirc" arch="i586,i686"/>
       <repopackage name="pulseaudio-module-x11" arch="i586,i686"/>
       <repopackage name="pulseaudio-module-zeroconf" arch="i586,i686"/>
       <repopackage name="pulseaudio-utils" arch="i586,i686"/>
@@ -4865,6 +4908,7 @@
       <repopackage name="typelib-1_0-Gepub-0_6" arch="i586,i686"/>
       <repopackage name="typelib-1_0-GES-1_0" arch="i586,i686"/>
       <repopackage name="typelib-1_0-GFBGraph-0_2" arch="i586,i686"/>
+      <repopackage name="typelib-1_0-Ggit-1_0" arch="i586,i686"/>
       <repopackage name="typelib-1_0-GjsPrivate-1_0" arch="i586,i686"/>
       <repopackage name="typelib-1_0-GMenu-3_0" arch="i586,i686"/>
       <repopackage name="typelib-1_0-GnomeBluetooth-1_0" arch="i586,i686"/>
@@ -4885,6 +4929,7 @@
       <repopackage name="typelib-1_0-GtkClutter-1_0" arch="i586,i686"/>
       <repopackage name="typelib-1_0-GtkSource-3_0" arch="i586,i686"/>
       <repopackage name="typelib-1_0-GtkVnc-2_0" arch="i586,i686"/>
+      <repopackage name="typelib-1_0-Gucharmap-2_90" arch="i586,i686"/>
       <repopackage name="typelib-1_0-GVnc-1_0" arch="i586,i686"/>
       <repopackage name="typelib-1_0-GWeather-3_0" arch="i586,i686"/>
       <repopackage name="typelib-1_0-IBus-1_0" arch="i586,i686"/>
@@ -4920,6 +4965,7 @@
       <repopackage name="typelib-1_0-WebKit2-4_0" arch="i586,i686"/>
       <repopackage name="typelib-1_0-Wnck-3_0" arch="i586,i686"/>
       <repopackage name="typelib-1_0-Xkl-1_0" arch="i586,i686"/>
+      <repopackage name="typelib-1_0-Zeitgeist-2_0" arch="i586,i686"/>
       <repopackage name="typelib-1_0-Zpj-0_0" arch="i586,i686"/>
       <repopackage name="ucode-amd" arch="i586,i686"/>
       <repopackage name="ucode-intel" arch="i586,i686"/>
diff --git a/openSUSE-Addon-NonOss-Deps-x86_64.group b/openSUSE-Addon-NonOss-Deps-x86_64.group
index ada2419e..53ea42b2 100644
--- a/openSUSE-Addon-NonOss-Deps-x86_64.group
+++ b/openSUSE-Addon-NonOss-Deps-x86_64.group
@@ -34,6 +34,7 @@
     <package name="libnm-glib4-32bit"/>
     <package name="libnm-util2-32bit"/>
     <package name="libopenal1-32bit"/>
+    <package name="libopenssl1_0_0"/>
     <package name="libopenssl1_0_0-steam-32bit"/>
     <package name="libpciaccess0-32bit"/>
     <package name="libpsl5-32bit"/>
diff --git a/openSUSE-Addon-NonOss-Deps.group b/openSUSE-Addon-NonOss-Deps.group
index ade99e30..55c1cc25 100644
--- a/openSUSE-Addon-NonOss-Deps.group
+++ b/openSUSE-Addon-NonOss-Deps.group
@@ -24,7 +24,6 @@
     <package name="libgbm-devel"/>
     <package name="libglut3"/>
     <package name="libglvnd-devel"/>
-    <package name="libopenssl1_0_0"/>
     <package name="libopenssl1_0_0-steam"/>
     <package name="libregina3"/>
     <package name="libvulkan1"/>