Debian!

68 files changed, 504 insertions, 300 deletions

diff --git a/core/modules/alsa/module.conf b/core/modules/alsa/module.conf
index 228c9d40..9297bc92 100644
--- a/core/modules/alsa/module.conf
+++ b/core/modules/alsa/module.conf
@@ -4,7 +4,7 @@ REQUIRED_BINARIES="
 	alsamixer
 	aplay
 "
-REQUIRED_DIRECTORIES="	/usr/share/alsa
-			/etc/modprobe.d
+REQUIRED_DIRECTORIES="
+	/usr/share/alsa
 "
 
diff --git a/core/modules/alsa/module.conf.debian b/core/modules/alsa/module.conf.debian
index a6ced7fd..ec5c8e79 100644
--- a/core/modules/alsa/module.conf.debian
+++ b/core/modules/alsa/module.conf.debian
@@ -1,11 +1,7 @@
 #!/bin/bash
-REQUIRED_INSTALLED_PACKAGES="
-	alsa-utils
-	alsa-base
-	libasound2
-"
 REQUIRED_CONTENT_PACKAGES="
 	alsa-utils
-	alsa-base
-	libasound2 
+	libasound2
+	libasound2-data
+	libasound2-plugins
 "
diff --git a/core/modules/alsa/module.conf.ubuntu b/core/modules/alsa/module.conf.ubuntu
index 95684832..bae01ed1 100644
--- a/core/modules/alsa/module.conf.ubuntu
+++ b/core/modules/alsa/module.conf.ubuntu
@@ -6,3 +6,7 @@ REQUIRED_CONTENT_PACKAGES="
 	libasound2-data
 	libasound2-plugins
 "
+
+REQUIRED_DIRECTORIES+="
+	/etc/modprobe.d
+"
diff --git a/core/modules/beamergui/module.conf.debian b/core/modules/beamergui/module.conf.debian
index c7c4e2c1..0a8ca142 100644
--- a/core/modules/beamergui/module.conf.debian
+++ b/core/modules/beamergui/module.conf.debian
@@ -1,9 +1,7 @@
 #!/bin/bash
 REQUIRED_INSTALLED_PACKAGES="
-libqt4-dev
-libxrandr-dev
+	libxrandr-dev
 "
 REQUIRED_CONTENT_PACKAGES="
-libqt4-dev
-libxrandr-dev
+	libxrandr-dev
 "
diff --git a/core/modules/brazilian/module.conf.debian b/core/modules/brazilian/module.conf.debian
index 99b9fd71..b49acefe 100644
--- a/core/modules/brazilian/module.conf.debian
+++ b/core/modules/brazilian/module.conf.debian
@@ -1,11 +1,13 @@
 #!/bin/bash
 REQUIRED_INSTALLED_PACKAGES="
-	libX11-data
+				libx11-data
+				language-pack-pt
 "
 REQUIRED_CONTENT_PACKAGES="
-	libX11-data
+				libx11-data
 "
 REQUIRED_DIRECTORIES+="
-	/usr/lib/locale
+	/usr/lib/locale/C.UTF-8
+	/usr/lib/locale/pt_BR.utf8
 "
 
diff --git a/core/modules/cups-sicgs/module.conf.debian b/core/modules/cups-sicgs/module.conf.debian
new file mode 100644
index 00000000..eb34dafd
--- /dev/null
+++ b/core/modules/cups-sicgs/module.conf.debian
@@ -0,0 +1,3 @@
+REQUIRED_INSTALLED_PACKAGES="
+	unzip
+"
diff --git a/core/modules/cups/module.conf.debian b/core/modules/cups/module.conf.debian
index 32a64f1d..2aa8b5ed 100644
--- a/core/modules/cups/module.conf.debian
+++ b/core/modules/cups/module.conf.debian
@@ -1,11 +1,15 @@
 #!/bin/bash
-REQUIRED_INSTALLED_PACKAGES="
-		cups-daemon
-		ghostscript
-		foomatic-filters
-"
 REQUIRED_CONTENT_PACKAGES="
+		cups
 		cups-daemon
+		cups-filters
+		cups-core-drivers
+		cups-filters-core-drivers
 		ghostscript
-		foomatic-filters
+		hplip
+		libgs9-common
+"
+REQUIRED_DIRECTORIES+="
+	/usr/share/color
 "
+
diff --git a/core/modules/dbus/module.conf.debian b/core/modules/dbus/module.conf.debian
index 089e2a02..159cc642 100644
--- a/core/modules/dbus/module.conf.debian
+++ b/core/modules/dbus/module.conf.debian
@@ -1,10 +1,10 @@
 #!/bin/bash
 REQUIRED_CONTENT_PACKAGES="
 			dbus
+			dbus-x11
 "
-REQUIRED_DIRECTORIES+="		
-			/lib/systemd
+REQUIRED_FILES+="
 "
-REQUIRED_FILES="	
-			/etc/default/dbus
+REQUIRED_DIRECTORIES="
+			/usr/share/dbus-1
 "
diff --git a/core/modules/dnbd3/module.conf.debian b/core/modules/dnbd3/module.conf.debian
index f91f1161..9794054b 100644
--- a/core/modules/dnbd3/module.conf.debian
+++ b/core/modules/dnbd3/module.conf.debian
@@ -1,9 +1,13 @@
 #!/bin/bash
 REQUIRED_CONTENT_PACKAGES="
-                                cmake
+	cmake
+	fuse
 "
 
 REQUIRED_INSTALLED_PACKAGES="
-                                cmake
-				zlib1g-dev
+	cmake
+	zlib1g-dev
+	libfuse-dev
+	fuse
+	libjansson-dev
 "
diff --git a/core/modules/dunst/module.conf.debian b/core/modules/dunst/module.conf.debian
new file mode 100644
index 00000000..dac9d844
--- /dev/null
+++ b/core/modules/dunst/module.conf.debian
@@ -0,0 +1,10 @@
+#!/bin/bash
+REQUIRED_INSTALLED_PACKAGES="
+	dunst
+	libnotify-bin
+"
+REQUIRED_CONTENT_PACKAGES="
+	dunst
+	libnotify-bin
+"
+REQUIRED_FILES=""
diff --git a/core/modules/etherwake/module.conf.debian b/core/modules/etherwake/module.conf.debian
new file mode 100644
index 00000000..b6507973
--- /dev/null
+++ b/core/modules/etherwake/module.conf.debian
@@ -0,0 +1,7 @@
+#!/bin/bash
+REQUIRED_INSTALLED_PACKAGES="
+	ethtool
+"
+REQUIRED_CONTENT_PACKAGES="
+	ethtool
+"
diff --git a/core/modules/firefox/module.conf.debian b/core/modules/firefox/module.conf.debian
new file mode 100644
index 00000000..b2251975
--- /dev/null
+++ b/core/modules/firefox/module.conf.debian
@@ -0,0 +1,3 @@
+#!/bin/bash
+REQUIRED_INSTALLED_PACKAGES="firefox"
+REQUIRED_CONTENT_PACKAGES="firefox"
diff --git a/core/modules/gdisk/module.conf.debian b/core/modules/gdisk/module.conf.debian
new file mode 100644
index 00000000..10771637
--- /dev/null
+++ b/core/modules/gdisk/module.conf.debian
@@ -0,0 +1,6 @@
+#!/bin/bash
+REQUIRED_CONTENT_PACKAGES="
+	gdisk
+	xfsprogs
+	e2fsprogs
+"
diff --git a/core/modules/german/module.build b/core/modules/german/module.build
index 8ba140ce..7c0159f5 100644
--- a/core/modules/german/module.build
+++ b/core/modules/german/module.build
@@ -16,6 +16,10 @@ build() {
 		grep -q -E -r '^\s*de_DE\.UTF-8' "/var/lib/locales/supported.d" || echo 'de_DE.UTF-8 UTF-8' >> "/var/lib/locales/supported.d/openslx"
 		locale-gen --no-archive --purge "de_DE.UTF-8" || perror "Could not generate locales (ubuntu style)"
 	fi
+	# Debian's version
+	if ! [ -d /usr/lib/locale/de_DE.utf8 ]; then
+		localedef -f UTF-8 -i de_DE --no-archive /usr/lib/locale/de_DE.utf8 || perror "Could not gen locales"
+	fi
 
 	# Put everything we build or get from the system in build dir
 	local FILELIST="$MODULE_WORK_DIR/list_copy_build"
diff --git a/core/modules/german/module.conf.debian b/core/modules/german/module.conf.debian
index 99b9fd71..6660ca1c 100644
--- a/core/modules/german/module.conf.debian
+++ b/core/modules/german/module.conf.debian
@@ -1,11 +1,11 @@
 #!/bin/bash
 REQUIRED_INSTALLED_PACKAGES="
-	libX11-data
+				libx11-data
 "
 REQUIRED_CONTENT_PACKAGES="
-	libX11-data
+				libx11-data
 "
 REQUIRED_DIRECTORIES+="
-	/usr/lib/locale
+	/usr/lib/locale/de_DE.utf8
 "
 
diff --git a/core/modules/german/module.conf.ubuntu b/core/modules/german/module.conf.ubuntu
index 2eec699e..6660ca1c 100644
--- a/core/modules/german/module.conf.ubuntu
+++ b/core/modules/german/module.conf.ubuntu
@@ -1,7 +1,6 @@
 #!/bin/bash
 REQUIRED_INSTALLED_PACKAGES="
 				libx11-data
-				language-pack-de
 "
 REQUIRED_CONTENT_PACKAGES="
 				libx11-data
diff --git a/core/modules/hardware-stats/module.conf.debian b/core/modules/hardware-stats/module.conf.debian
new file mode 100644
index 00000000..05ce991e
--- /dev/null
+++ b/core/modules/hardware-stats/module.conf.debian
@@ -0,0 +1,13 @@
+#!/bin/bash
+REQUIRED_INSTALLED_PACKAGES="
+	msr-tools
+	dmidecode
+	util-linux
+"
+
+REQUIRED_CONTENT_PACKAGES="
+	msr-tools
+	dmidecode
+	util-linux
+"
+
diff --git a/core/modules/haveged/module.conf.debian b/core/modules/haveged/module.conf.debian
new file mode 100644
index 00000000..0842d080
--- /dev/null
+++ b/core/modules/haveged/module.conf.debian
@@ -0,0 +1,7 @@
+#!/bin/bash
+REQUIRED_CONTENT_PACKAGES="
+	haveged
+"
+REQUIRED_INSTALLED_PACKAGES="
+	haveged
+"
diff --git a/core/modules/iperf/module.conf.debian b/core/modules/iperf/module.conf.debian
new file mode 100644
index 00000000..df1b6d51
--- /dev/null
+++ b/core/modules/iperf/module.conf.debian
@@ -0,0 +1,7 @@
+#!/bin/bash
+REQUIRED_CONTENT_PACKAGES="
+	iperf
+"
+REQUIRED_INSTALLED_PACKAGES="
+	iperf
+"
diff --git a/core/modules/iptables/module.conf.debian b/core/modules/iptables/module.conf.debian
new file mode 100644
index 00000000..01b6d246
--- /dev/null
+++ b/core/modules/iptables/module.conf.debian
@@ -0,0 +1,3 @@
+REQUIRED_INSTALLED_PACKAGES="
+	iptables
+"
diff --git a/core/modules/kdm/module.conf.debian b/core/modules/kdm/module.conf.debian
index 93471036..b9c24215 100644
--- a/core/modules/kdm/module.conf.debian
+++ b/core/modules/kdm/module.conf.debian
@@ -2,7 +2,6 @@
 REQUIRED_INSTALLED_PACKAGES="	
 	kdm
 	kde-workspace-kgreet-plugins
-	ttf-dejavu
 "
 REQUIRED_CONTENT_PACKAGES="	
 	kdm
@@ -22,9 +21,10 @@ REQUIRED_DIRECTORIES+="
 	/etc/kde4/kdm
 "
 # non-standard vars
-REQUIRED_SYSTEM_FILES+="	
-	/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
+REQUIRED_SYSTEM_FILES+="
 	/usr/share/kde4/apps/kdm/pics/shutdown.png
+	/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
+	/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-R.ttf
 	/usr/share/icons/default/index.theme
 "
 
diff --git a/core/modules/kernel-system/module.conf.debian b/core/modules/kernel-system/module.conf.debian
new file mode 100644
index 00000000..0c24a9bd
--- /dev/null
+++ b/core/modules/kernel-system/module.conf.debian
@@ -0,0 +1,5 @@
+#!/bin/bash
+REQUIRED_INSTALLED_PACKAGES="
+	linux-firmware
+	linux-headers-${SYSTEM_KERNEL_LONG}
+"
diff --git a/core/modules/kernel-vanilla/module.conf b/core/modules/kernel-vanilla/module.conf
index ba17be37..d91be99c 100644
--- a/core/modules/kernel-vanilla/module.conf
+++ b/core/modules/kernel-vanilla/module.conf
@@ -2,5 +2,5 @@
 REQUIRED_BINARIES=""
 REQUIRED_LIBRARIES=""
 REQUIRED_DIRECTORIES=""
-REQUIRED_KERNEL="4.19.118"
+REQUIRED_KERNEL="4.19.123"
 REQUIRED_GIT="git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git"
diff --git a/core/modules/kernel-vanilla/module.conf.debian b/core/modules/kernel-vanilla/module.conf.debian
new file mode 100644
index 00000000..849cd691
--- /dev/null
+++ b/core/modules/kernel-vanilla/module.conf.debian
@@ -0,0 +1,6 @@
+REQUIRED_INSTALLED_PACKAGES="
+	bison
+	flex
+	libelf-dev
+	libssl-dev
+"
diff --git a/core/modules/kernel/module.conf.debian b/core/modules/kernel/module.conf.debian
new file mode 100644
index 00000000..a35fbce1
--- /dev/null
+++ b/core/modules/kernel/module.conf.debian
@@ -0,0 +1,3 @@
+#!/bin/bash
+REQUIRED_GIT_BRANCH="master"
+REQUIRED_GIT="git://kernel.ubuntu.com/ubuntu/ubuntu-${SYS_CODENAME}.git"
diff --git a/core/modules/kexec-reboot/module.conf.debian b/core/modules/kexec-reboot/module.conf.debian
new file mode 100644
index 00000000..efc88ea8
--- /dev/null
+++ b/core/modules/kexec-reboot/module.conf.debian
@@ -0,0 +1,3 @@
+REQUIRED_INSTALLED_PACKAGES="
+	kexec-tools
+"
diff --git a/core/modules/kiosk-chromium/module.conf.debian b/core/modules/kiosk-chromium/module.conf.debian
new file mode 100644
index 00000000..708eac72
--- /dev/null
+++ b/core/modules/kiosk-chromium/module.conf.debian
@@ -0,0 +1,9 @@
+#!/bin/bash
+REQUIRED_CONTENT_PACKAGES="
+	jq
+	xbindkeys
+"
+REQUIRED_INSTALLED_PACKAGES="$REQUIRED_CONTENT_PACKAGES"
+REQUIRED_BINARIES=""
+REQUIRED_LIBRARIES=""
+REQUIRED_DIRECTORIES=""
diff --git a/core/modules/kiosk-netpoint/module.conf.debian b/core/modules/kiosk-netpoint/module.conf.debian
new file mode 100644
index 00000000..f69c2445
--- /dev/null
+++ b/core/modules/kiosk-netpoint/module.conf.debian
@@ -0,0 +1,10 @@
+#!/bin/bash
+REQUIRED_CONTENT_PACKAGES="
+	gir1.2-lightdm-1
+	liblightdm-gobject-1-0
+	liblightdm-qt5-3-0
+"
+REQUIRED_INSTALLED_PACKAGES="$REQUIRED_CONTENT_PACKAGES"
+REQUIRED_BINARIES=""
+REQUIRED_LIBRARIES=""
+REQUIRED_DIRECTORIES=""
diff --git a/core/modules/lightdm-greeter-bwlp/module.conf.debian b/core/modules/lightdm-greeter-bwlp/module.conf.debian
new file mode 100644
index 00000000..6aa87ce6
--- /dev/null
+++ b/core/modules/lightdm-greeter-bwlp/module.conf.debian
@@ -0,0 +1,8 @@
+#!/bin/bash
+REQUIRED_INSTALLED_PACKAGES="
+	liblightdm-qt5-3-dev
+"
+
+REQUIRED_CONTENT_PACKAGES="
+	liblightdm-qt5-3-0
+"
diff --git a/core/modules/lightdm/module.conf.debian b/core/modules/lightdm/module.conf.debian
new file mode 100644
index 00000000..e0267f21
--- /dev/null
+++ b/core/modules/lightdm/module.conf.debian
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+REQUIRED_BINARIES="
+	lightdm
+"
+
+REQUIRED_INSTALLED_PACKAGES="
+	lightdm
+"
+
+REQUIRED_CONTENT_PACKAGES="
+	lightdm
+"
diff --git a/core/modules/nvidia-common/module.conf.debian b/core/modules/nvidia-common/module.conf.debian
new file mode 100644
index 00000000..e2e2e4fc
--- /dev/null
+++ b/core/modules/nvidia-common/module.conf.debian
@@ -0,0 +1,12 @@
+#!/bin/bash
+# libvdpau: While nvidia delivers a linvdpau within it's driver package, nvidia
+# itself recommends using a distribution package if available. So, here we go.
+
+REQUIRED_CONTENT_PACKAGES="
+	libvdpau1
+"
+
+REQUIRED_INSTALLED_PACKAGES="
+	libvdpau1
+"
+
diff --git a/core/modules/nvidia-common/module.conf.ubuntu b/core/modules/nvidia-common/module.conf.ubuntu
index 5135d91e..e2e2e4fc 100644
--- a/core/modules/nvidia-common/module.conf.ubuntu
+++ b/core/modules/nvidia-common/module.conf.ubuntu
@@ -9,7 +9,4 @@ REQUIRED_CONTENT_PACKAGES="
 REQUIRED_INSTALLED_PACKAGES="
 	libvdpau1
 "
-REQUIRED_SYSTEM_FILES+="
-	/sbin/ldconfig.real
-"
 
diff --git a/core/modules/nvidia-libs/module.conf.debian b/core/modules/nvidia-libs/module.conf.debian
new file mode 100644
index 00000000..c3a686d7
--- /dev/null
+++ b/core/modules/nvidia-libs/module.conf.debian
@@ -0,0 +1,13 @@
+#!/bin/bash
+# libvdpau: While nvidia delivers a linvdpau within it's driver package, nvidia
+# itself recommends using a distribution package if available. So, here we go.
+
+REQUIRED_CONTENT_PACKAGES="
+	libvdpau1
+"
+
+REQUIRED_INSTALLED_PACKAGES="
+	libvdpau1
+"
+
+
diff --git a/core/modules/pam/module.conf.debian b/core/modules/pam/module.conf.debian
index f0b76a96..8e934bd3 100644
--- a/core/modules/pam/module.conf.debian
+++ b/core/modules/pam/module.conf.debian
@@ -1,6 +1,6 @@
 #!/bin/bash
+
 REQUIRED_INSTALLED_PACKAGES="
-	libpam-ck-connector
 	libpam-cap
 	krb5-user
 	krb5-config
@@ -10,12 +10,13 @@ REQUIRED_INSTALLED_PACKAGES="
 	libnfsidmap2
 	nfs-common
 	libpam0g-dev
-	ncpfs
+	cifs-utils
+	libtool
 "
 REQUIRED_CONTENT_PACKAGES="
 	libpam0g
 	libpam-modules
-	libpam-ck-connector
+	libpam-modules-bin
 	libpam-cap
 	libldap-2.4-2
 	krb5-user
@@ -24,31 +25,18 @@ REQUIRED_CONTENT_PACKAGES="
 	ldap-utils
 	libnfsidmap2
 	nfs-common
-	ncpfs
+	cifs-utils
+	keyutils
 "
 REQUIRED_BINARIES+="
-	nwmsg
-	ncpmount
-	ncpumount
-	mount.ncp
-	mount.ncpfs
+	mount.cifs
 "
 REQUIRED_DIRECTORIES+="
+	$SYS_PAM_MODULES_PATH
 	/lib
 	/usr/lib
 "
 REQUIRED_SYSTEM_FILES+="
 	/etc/pam.conf
 	/etc/default/locale
-	/lib/security
-	/lib/${ARCH_TRIPLET}/security
-	/sbin/mkhomedir_helper
-"
-
-# For Debian 8: Both packages were dropped from official repos. Do not change the
-# order, as these packages will be installed via dpkg and depend on each other.
-REQUIRED_DOWNLOAD_URLS="
-	ftp.acc.umu.se/mirror/cdimage/snapshot/Debian/pool/main/n/ncpfs/libpam-ncp_2.2.6-9_amd64.deb
-	ftp.acc.umu.se/mirror/cdimage/snapshot/Debian/pool/main/n/ncpfs/libncp_2.2.6-9_amd64.deb
-	ftp.acc.umu.se/mirror/cdimage/snapshot/Debian/pool/main/n/ncpfs/ncpfs_2.2.6-9_amd64.deb
 "
diff --git a/core/modules/pam/module.conf.ubuntu b/core/modules/pam/module.conf.ubuntu
deleted file mode 100644
index 40974f10..00000000
--- a/core/modules/pam/module.conf.ubuntu
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-REQUIRED_INSTALLED_PACKAGES="
-	krb5-user
-	krb5-config
-	libpam-krb5
-	libssl-dev
-	ldap-utils
-	libnfsidmap2
-	nfs-common
-	libpam0g-dev
-	cifs-utils
-	libpam-modules-bin
-	keyutils
-"
-REQUIRED_CONTENT_PACKAGES="
-	libpam0g
-	libpam-modules
-	libpam-cap
-	libldap-2.4-2
-	krb5-user
-	krb5-config
-	libpam-krb5
-	ldap-utils
-	libnfsidmap2
-	nfs-common
-	cifs-utils
-	libpam-modules-bin
-	keyutils
-"
-REQUIRED_BINARIES+="
-	nwmsg
-"
-REQUIRED_DIRECTORIES+="
-	$SYS_PAM_MODULES_PATH
-	/lib
-	/usr/lib
-"
-REQUIRED_SYSTEM_FILES+="
-	/etc/pam.conf
-	/etc/default/locale
-"
diff --git a/core/modules/pam/module.conf.ubuntu.18 b/core/modules/pam/module.conf.ubuntu.18
index 06eb5cc2..8e934bd3 100644
--- a/core/modules/pam/module.conf.ubuntu.18
+++ b/core/modules/pam/module.conf.ubuntu.18
@@ -1,5 +1,5 @@
 #!/bin/bash
-# TODO fix and re-add ncp support !
+
 REQUIRED_INSTALLED_PACKAGES="
 	libpam-cap
 	krb5-user
diff --git a/core/modules/polkit/module.conf b/core/modules/polkit/module.conf
index ad313682..b86e1a5c 100644
--- a/core/modules/polkit/module.conf
+++ b/core/modules/polkit/module.conf
@@ -4,7 +4,6 @@ REQUIRED_DIRECTORIES="
 	/etc/polkit-1
 	/usr/bin 
 	/usr/share/polkit-1
-	/etc/dbus-1/system.d
 "
 REQUIRED_FILES="
 	/usr/share/dbus-1/system-services/org.freedesktop.PolicyKit1.service
diff --git a/core/modules/polkit/module.conf.debian b/core/modules/polkit/module.conf.debian
index 732c3dd9..d2dc3a5b 100644
--- a/core/modules/polkit/module.conf.debian
+++ b/core/modules/polkit/module.conf.debian
@@ -1,16 +1,14 @@
 #!/bin/bash
-REQUIRED_INSTALLED_PACKAGES="
-	libmozjs185-1.0
-	policykit-1
-"
+REQUIRED_INSTALLED_PACKAGES=""
+#	libmozjs185-1.0
 REQUIRED_CONTENT_PACKAGES="
-	libmozjs185-1.0
 	policykit-1
 "
 REQUIRED_DIRECTORIES+="
 	/usr/lib/policykit-1
-	/usr/lib/${ARCH_TRIPLET}/polkit-1
+	/usr${ARCH_LIB_DIR}/polkit-1
 	/var/lib/polkit-1
+	/usr/share/dbus-1/system.d
 "
 # Module specific: Root of dirstructs we need directly from system
 REQUIRED_DIR_STRUCT="
diff --git a/core/modules/polkit/module.conf.ubuntu b/core/modules/polkit/module.conf.ubuntu
index 3c40038e..27af83af 100644
--- a/core/modules/polkit/module.conf.ubuntu
+++ b/core/modules/polkit/module.conf.ubuntu
@@ -9,6 +9,7 @@ REQUIRED_DIRECTORIES+="
 	/usr/lib/policykit-1
 	/usr${ARCH_LIB_DIR}/polkit-1
 	/var/lib/polkit-1
+	/etc/dbus-1/system.d
 "
 # Module specific: Root of dirstructs we need directly from system
 REQUIRED_DIR_STRUCT="
diff --git a/core/modules/printergui/module.conf.debian b/core/modules/printergui/module.conf.debian
index 54eb0feb..dc98d2d6 100644
--- a/core/modules/printergui/module.conf.debian
+++ b/core/modules/printergui/module.conf.debian
@@ -1,8 +1,6 @@
 #!/bin/bash
 REQUIRED_INSTALLED_PACKAGES="
 	libcups2-dev
-	libqt4-dev
-"
-REQUIRED_CONTENT_PACKAGES="
-	libcups2-dev
+	libqt5gui5
 "
+
diff --git a/core/modules/pvs2/module.conf.debian b/core/modules/pvs2/module.conf.debian
index dcb25dda..83877b5a 100644
--- a/core/modules/pvs2/module.conf.debian
+++ b/core/modules/pvs2/module.conf.debian
@@ -1,7 +1,12 @@
 #!/bin/bash
 REQUIRED_INSTALLED_PACKAGES="
-libqt4-dev
-libvncserver-dev
+	libxss-dev
+	libqt5x11extras5-dev
+	libvncserver-dev
+	xinput
+	wmctrl
 "
 REQUIRED_CONTENT_PACKAGES="
+	xinput
+	wmctrl
 "
diff --git a/core/modules/qemukvm/module.conf.debian b/core/modules/qemukvm/module.conf.debian
new file mode 100644
index 00000000..4773a871
--- /dev/null
+++ b/core/modules/qemukvm/module.conf.debian
@@ -0,0 +1,15 @@
+#!/bin/bash
+REQUIRED_INSTALLED_PACKAGES="
+		qemu
+		qemu-kvm
+"
+
+REQUIRED_CONTENT_PACKAGES="
+		qemu
+		qemu-kvm
+		qemu-system-common
+		qemu-system-x86
+		qemu-user
+		qemu-utils
+		seabios
+"
diff --git a/core/modules/qt5core/module.conf.debian b/core/modules/qt5core/module.conf.debian
new file mode 100644
index 00000000..56e8cb78
--- /dev/null
+++ b/core/modules/qt5core/module.conf.debian
@@ -0,0 +1,19 @@
+#!/bin/bash
+REQUIRED_INSTALLED_PACKAGES="
+	cmake
+	libqt5gui5
+	libqt5svg5-dev
+	libqt5x11extras5-dev
+	qt5-qmake
+	qtbase5-dev
+	qtbase5-dev-tools
+	qttools5-dev
+	qttools5-dev-tools
+	qttranslations5-l10n
+"
+
+REQUIRED_CONTENT_PACKAGES="
+	libqt5gui5
+	libqt5svg5
+	qttranslations5-l10n
+"
diff --git a/core/modules/rsyslogd/module.conf.debian b/core/modules/rsyslogd/module.conf.debian
index 0063adbf..e897dee2 100644
--- a/core/modules/rsyslogd/module.conf.debian
+++ b/core/modules/rsyslogd/module.conf.debian
@@ -2,3 +2,4 @@
 REQUIRED_CONTENT_PACKAGES="	
 			rsyslog
 "
+
diff --git a/core/modules/run-virt/module.conf.debian b/core/modules/run-virt/module.conf.debian
new file mode 100644
index 00000000..865abfe9
--- /dev/null
+++ b/core/modules/run-virt/module.conf.debian
@@ -0,0 +1,12 @@
+#!/bin/bash
+REQUIRED_INSTALLED_PACKAGES="
+	usbutils
+	mtools
+	xmlstarlet
+"
+REQUIRED_CONTENT_PACKAGES="
+	usbutils
+	mtools
+	xmlstarlet
+"
+
diff --git a/core/modules/samba/module.conf.debian b/core/modules/samba/module.conf.debian
new file mode 100644
index 00000000..546f3dbd
--- /dev/null
+++ b/core/modules/samba/module.conf.debian
@@ -0,0 +1,21 @@
+#!/bin/bash
+REQUIRED_INSTALLED_PACKAGES="
+		samba
+		smbclient
+		winbind
+		krb5-user
+		cifs-utils
+		smbnetfs
+		fuse
+		keyutils
+"
+REQUIRED_CONTENT_PACKAGES="
+		samba
+		smbclient
+		winbind
+		krb5-user
+		cifs-utils
+		smbnetfs
+		fuse
+		keyutils
+"
diff --git a/core/modules/slxbrowser/module.conf.debian b/core/modules/slxbrowser/module.conf.debian
new file mode 100644
index 00000000..edb70374
--- /dev/null
+++ b/core/modules/slxbrowser/module.conf.debian
@@ -0,0 +1,7 @@
+#!/bin/bash
+REQUIRED_INSTALLED_PACKAGES="
+	libqt5webkit5-dev
+"
+REQUIRED_CONTENT_PACKAGES="
+	gstreamer1.0-plugins-base
+"
diff --git a/core/modules/speedcheck/module.conf.debian b/core/modules/speedcheck/module.conf.debian
index 600d3ab3..4c2251ad 100644
--- a/core/modules/speedcheck/module.conf.debian
+++ b/core/modules/speedcheck/module.conf.debian
@@ -1,5 +1,5 @@
 #!/bin/bash
-REQUIRED_INSTALLED_PACKAGES="
-				cmake
-				libqt5gui5
+REQUIRED_INSTALLED_PACKAGES="	
+	cmake
+	libqt5gui5
 "
diff --git a/core/modules/sssd/module.conf.debian b/core/modules/sssd/module.conf.debian
new file mode 100644
index 00000000..cdf9ca36
--- /dev/null
+++ b/core/modules/sssd/module.conf.debian
@@ -0,0 +1,15 @@
+#!/bin/bash
+REQUIRED_INSTALLED_PACKAGES="
+	sssd-common
+	sssd-ldap
+	libldb1
+	libnss-sss
+	libpam-sss
+"
+REQUIRED_CONTENT_PACKAGES="
+	sssd-common
+	sssd-ldap
+	libldb1
+	libnss-sss
+	libpam-sss
+"
diff --git a/core/modules/sudo/module.conf.debian b/core/modules/sudo/module.conf.debian
new file mode 100644
index 00000000..1fda609e
--- /dev/null
+++ b/core/modules/sudo/module.conf.debian
@@ -0,0 +1,4 @@
+#!/bin/bash
+REQUIRED_CONTENT_PACKAGES="
+	sudo
+"
diff --git a/core/modules/swiss/module.conf.debian b/core/modules/swiss/module.conf.debian
index 99b9fd71..e0f6d9d2 100644
--- a/core/modules/swiss/module.conf.debian
+++ b/core/modules/swiss/module.conf.debian
@@ -1,11 +1,18 @@
 #!/bin/bash
 REQUIRED_INSTALLED_PACKAGES="
-	libX11-data
+				libx11-data
+				language-pack-de
+				language-pack-fr
+				language-pack-it
+				language-pack-en
 "
 REQUIRED_CONTENT_PACKAGES="
-	libX11-data
+				libx11-data
 "
 REQUIRED_DIRECTORIES+="
-	/usr/lib/locale
+	/usr/lib/locale/C.UTF-8
+	/usr/lib/locale/de_CH.utf8
+	/usr/lib/locale/fr_CH.utf8
+	/usr/lib/locale/it_CH.utf8
 "
 
diff --git a/core/modules/system-check/module.conf.debian b/core/modules/system-check/module.conf.debian
new file mode 100644
index 00000000..41b87b6d
--- /dev/null
+++ b/core/modules/system-check/module.conf.debian
@@ -0,0 +1,3 @@
+#!/bin/bash
+REQUIRED_INSTALLED_PACKAGES=""
+REQUIRED_CONTENT_PACKAGES=""
diff --git a/core/modules/systemd-distro/module.conf.debian b/core/modules/systemd-distro/module.conf.debian
index 5e349ebc..04752c0b 100644
--- a/core/modules/systemd-distro/module.conf.debian
+++ b/core/modules/systemd-distro/module.conf.debian
@@ -3,7 +3,6 @@ REQUIRED_INSTALLED_PACKAGES="
 			intltool
 			gperf
 			dbus
-			pkg-config
 			libcap-dev
 			libudev-dev
 			libdbus-1-dev
diff --git a/core/modules/systemd/module.conf.debian b/core/modules/systemd/module.conf.debian
index 5e349ebc..c1d329c6 100644
--- a/core/modules/systemd/module.conf.debian
+++ b/core/modules/systemd/module.conf.debian
@@ -1,9 +1,9 @@
 #!/bin/bash
 REQUIRED_INSTALLED_PACKAGES="
 			intltool
+			libtool
 			gperf
 			dbus
-			pkg-config
 			libcap-dev
 			libudev-dev
 			libdbus-1-dev
@@ -11,4 +11,5 @@ REQUIRED_INSTALLED_PACKAGES="
 			libblkid-dev
 			libacl1-dev
 			libpam-dev
+			libmount-dev
 "
diff --git a/core/modules/udisks/module.conf.debian b/core/modules/udisks/module.conf.debian
index ee725406..0a703589 100644
--- a/core/modules/udisks/module.conf.debian
+++ b/core/modules/udisks/module.conf.debian
@@ -1,33 +1,7 @@
 #!/bin/bash
 REQUIRED_INSTALLED_PACKAGES="
-	udisks
+	udisks2
 "
 REQUIRED_CONTENT_PACKAGES="
-	udisks
+	udisks2
 "
-# Override: Only udisks1 is available
-REQUIRED_BINARIES="
-	udisks-helper-linux-md-check
-	udisks-daemon
-	udisks-helper-change-luks-password
-	udisks-helper-create-partition-table
-	udisks-helper-mdadm-expand
-	udisks-helper-drive-benchmark
-	udisks-helper-drive-detach
-	udisks-helper-mkfs
-	udisks-helper-ata-smart-collect
-	udisks-helper-change-filesystem-label
-	udisks-helper-modify-partition
-	udisks-helper-delete-partition
-	udisks-helper-create-partition
-	udisks-helper-fstab-mounter
-	udisks-helper-linux-md-remove-component
-	udisks-helper-ata-smart-selftest
-	udisks-helper-drive-poll
-	udisks-dm-export
-	udisks-lvm-pv-export
-	udisks-part-id
-	udisks-probe-ata-smart
-	udisks-probe-sas-expander
-"
-
diff --git a/core/modules/vbox-src/module.conf.debian b/core/modules/vbox-src/module.conf.debian
new file mode 100644
index 00000000..40719a94
--- /dev/null
+++ b/core/modules/vbox-src/module.conf.debian
@@ -0,0 +1,33 @@
+REQUIRED_INSTALLED_PACKAGES="
+	kbuild
+	iasl
+	makeself
+	genisoimage
+	libcurl4-openssl-dev
+	libcap-dev
+	libdevmapper-dev
+	libqt5opengl5-dev
+	libidl-dev
+	libsdl1.2-dev
+	libxml2-dev
+	libxmu-dev
+	libxcursor-dev
+	libxinerama-dev
+	libxrandr-dev
+	libopus-dev
+	usbutils
+	xsltproc
+"
+# These are required for building 32-bit guest additions on 64-bit systems
+REQUIRED_INSTALLED_PACKAGES_X64_X86="
+	libc6-dev-i386
+	lib32gcc1
+	lib32stdc++6
+	gcc-multilib
+	g++-multilib
+"
+REQUIRED_SYSTEM_FILES="
+	/var/lib/usbutils/usb.ids
+"
+[ "$(uname -m)x" = "x86_64x" ] && REQUIRED_INSTALLED_PACKAGES+="$REQUIRED_INSTALLED_PACKAGES_X64_X86"
+true
diff --git a/core/modules/vbox-src/module.conf.ubuntu b/core/modules/vbox-src/module.conf.ubuntu
index 7d541928..40719a94 100644
--- a/core/modules/vbox-src/module.conf.ubuntu
+++ b/core/modules/vbox-src/module.conf.ubuntu
@@ -2,7 +2,7 @@ REQUIRED_INSTALLED_PACKAGES="
 	kbuild
 	iasl
 	makeself
-	mkisofs
+	genisoimage
 	libcurl4-openssl-dev
 	libcap-dev
 	libdevmapper-dev
diff --git a/core/modules/vmchooser2/module.conf.debian b/core/modules/vmchooser2/module.conf.debian
deleted file mode 100644
index 1e09c702..00000000
--- a/core/modules/vmchooser2/module.conf.debian
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-REQUIRED_INSTALLED_PACKAGES="	
-				cmake
-				libqt4-dev
-"
diff --git a/core/modules/vmware-common/module.conf.debian b/core/modules/vmware-common/module.conf.debian
new file mode 100644
index 00000000..90e88c04
--- /dev/null
+++ b/core/modules/vmware-common/module.conf.debian
@@ -0,0 +1,3 @@
+REQUIRED_INSTALLED_PACKAGES="
+	gtk-update-icon-cache
+"
diff --git a/core/modules/vmware-version-check/module.conf.debian b/core/modules/vmware-version-check/module.conf.debian
new file mode 100644
index 00000000..3bab77c9
--- /dev/null
+++ b/core/modules/vmware-version-check/module.conf.debian
@@ -0,0 +1,4 @@
+#!/bin/bash
+REQUIRED_CONTENT_PACKAGES="
+	msr-tools
+"
diff --git a/core/modules/x11vnc/module.conf.debian b/core/modules/x11vnc/module.conf.debian
new file mode 100644
index 00000000..798e2c3b
--- /dev/null
+++ b/core/modules/x11vnc/module.conf.debian
@@ -0,0 +1,7 @@
+#!/bin/bash
+REQUIRED_INSTALLED_PACKAGES="
+  x11vnc
+"
+REQUIRED_CONTENT_PACKAGES="
+  x11vnc
+"
diff --git a/core/modules/xorg/module.conf.debian b/core/modules/xorg/module.conf.debian
index 8f65ce7a..4fbb0307 100644
--- a/core/modules/xorg/module.conf.debian
+++ b/core/modules/xorg/module.conf.debian
@@ -1,43 +1,83 @@
 #!/bin/bash
 REQUIRED_INSTALLED_PACKAGES="
-	ttf-dejavu
-"
-REQUIRED_CONTENT_PACKAGES="	
-			xserver-xorg
-			xserver-xorg-core
+			xauth
+			fonts-dejavu-core
+			fonts-dejavu-extra
+			ttf-dejavu-core
+			xserver-xorg$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-core$UBUNTU_XORG_PKG_SUFFIX
 			libgl1-mesa-dri
 			libgl1-mesa-glx
+			libglx0
+			libegl1
+			libegl1-mesa
+			libegl-mesa0
 			xkb-data
 			x11-xkb-utils
 			x11-xserver-utils
-			xserver-xorg-input-evdev
-			xserver-xorg-input-mouse
-			xserver-xorg-input-vmmouse
-			xserver-xorg-video-intel
-			xserver-xorg-video-ati
-			xserver-xorg-video-vesa
-			xserver-xorg-video-mga
-			xserver-xorg-video-sisusb
-			xserver-xorg-video-vmware
-			xserver-xorg-video-fbdev
-			xserver-xorg-video-radeon
-			xserver-xorg-video-sisusb
-			xserver-xorg-video-nouveau
-			@xserver-xorg-video-openchrome
-			@xserver-xorg-video-savage
-			@xserver-xorg-video-trident
-			@xserver-xorg-video-mach64
-			@xserver-xorg-video-qxl
-			@xserver-xorg-video-siliconmotion
-			@xserver-xorg-video-cirrus
-			@xserver-xorg-video-r128
-			@xserver-xorg-video-neomagic
-			@xserver-xorg-video-geode
-			@xserver-xorg-video-s3
-			@xserver-xorg-video-tdfx
-			ttf-dejavu
+			x11-utils
+			xdotool
+			libinput10
+			libwacom2
+			xserver-xorg-input-evdev$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-input-synaptics$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-input-wacom$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-input-libinput$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-fbdev$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-amdgpu$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-radeon$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-intel$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-nouveau$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-vesa$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-vmware$UBUNTU_XORG_PKG_SUFFIX
 "
-REQUIRED_DIRECTORIES+="
-			/usr/lib
+REQUIRED_CONTENT_PACKAGES="
+			xterm
+			xauth
+			fonts-dejavu-core
+			fonts-dejavu-extra
+			ttf-dejavu-core
+			xserver-xorg$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-core$UBUNTU_XORG_PKG_SUFFIX
+			libgl1-mesa-dri
+			libgl1-mesa-glx
+			libglx0
+			libglx-mesa0
+			libxcb-glx0
+			@libgbm1
+			libegl1
+			libegl1-mesa
+			libegl-mesa0
+			libgbm1
+			libwayland-client0
+			libwayland-server0
+			xkb-data
+			x11-xkb-utils
+			x11-xserver-utils
+			x11-utils
+			xdotool
+			xserver-xorg-input-libinput$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-input-synaptics$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-input-wacom$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-fbdev$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-amdgpu$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-radeon$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-intel$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-nouveau$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-vesa$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-vmware$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-input-mouse$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-ati$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-openchrome$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-savage$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-trident$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-mach64$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-qxl$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-siliconmotion$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-cirrus$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-r128$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-neomagic$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-geode$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-s3$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-tdfx$UBUNTU_XORG_PKG_SUFFIX
 "
-REQUIRED_FILES=""
diff --git a/core/modules/xorg/module.conf.ubuntu b/core/modules/xorg/module.conf.ubuntu
index 84c84953..4fbb0307 100644
--- a/core/modules/xorg/module.conf.ubuntu
+++ b/core/modules/xorg/module.conf.ubuntu
@@ -1,58 +1,73 @@
 #!/bin/bash
 REQUIRED_INSTALLED_PACKAGES="
+			xauth
 			fonts-dejavu-core
 			fonts-dejavu-extra
 			ttf-dejavu-core
 			xserver-xorg$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-core$UBUNTU_XORG_PKG_SUFFIX
-			libgl1-mesa-dri$UBUNTU_XORG_PKG_SUFFIX
-			libgl1-mesa-glx$UBUNTU_XORG_PKG_SUFFIX
+			libgl1-mesa-dri
+			libgl1-mesa-glx
+			libglx0
+			libegl1
+			libegl1-mesa
+			libegl-mesa0
 			xkb-data
 			x11-xkb-utils
 			x11-xserver-utils
 			x11-utils
 			xdotool
+			libinput10
+			libwacom2
 			xserver-xorg-input-evdev$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-input-synaptics$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-input-vmmouse$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-input-wacom$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-ati$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-input-libinput$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-fbdev$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-amdgpu$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-radeon$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-intel$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-mga$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-nouveau$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-radeon$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-sisusb$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-vesa$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-vmware$UBUNTU_XORG_PKG_SUFFIX
 "
 REQUIRED_CONTENT_PACKAGES="
+			xterm
+			xauth
 			fonts-dejavu-core
 			fonts-dejavu-extra
 			ttf-dejavu-core
 			xserver-xorg$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-core$UBUNTU_XORG_PKG_SUFFIX
-			libgl1-mesa-dri$UBUNTU_XORG_PKG_SUFFIX
-			libgl1-mesa-glx$UBUNTU_XORG_PKG_SUFFIX
+			libgl1-mesa-dri
+			libgl1-mesa-glx
+			libglx0
+			libglx-mesa0
+			libxcb-glx0
+			@libgbm1
+			libegl1
+			libegl1-mesa
+			libegl-mesa0
+			libgbm1
+			libwayland-client0
+			libwayland-server0
 			xkb-data
 			x11-xkb-utils
 			x11-xserver-utils
 			x11-utils
 			xdotool
-			xserver-xorg-input-evdev$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-input-libinput$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-input-synaptics$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-input-vmmouse$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-input-wacom$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-ati$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-fbdev$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-amdgpu$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-video-radeon$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-intel$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-mga$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-nouveau$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-radeon$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-sisusb$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-vesa$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-video-vmware$UBUNTU_XORG_PKG_SUFFIX
 			@xserver-xorg-input-mouse$UBUNTU_XORG_PKG_SUFFIX
+			@xserver-xorg-video-ati$UBUNTU_XORG_PKG_SUFFIX
 			@xserver-xorg-video-openchrome$UBUNTU_XORG_PKG_SUFFIX
 			@xserver-xorg-video-savage$UBUNTU_XORG_PKG_SUFFIX
 			@xserver-xorg-video-trident$UBUNTU_XORG_PKG_SUFFIX
diff --git a/core/modules/xorg/module.conf.ubuntu.18 b/core/modules/xorg/module.conf.ubuntu.18
deleted file mode 100644
index 4fbb0307..00000000
--- a/core/modules/xorg/module.conf.ubuntu.18
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/bash
-REQUIRED_INSTALLED_PACKAGES="
-			xauth
-			fonts-dejavu-core
-			fonts-dejavu-extra
-			ttf-dejavu-core
-			xserver-xorg$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-core$UBUNTU_XORG_PKG_SUFFIX
-			libgl1-mesa-dri
-			libgl1-mesa-glx
-			libglx0
-			libegl1
-			libegl1-mesa
-			libegl-mesa0
-			xkb-data
-			x11-xkb-utils
-			x11-xserver-utils
-			x11-utils
-			xdotool
-			libinput10
-			libwacom2
-			xserver-xorg-input-evdev$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-input-synaptics$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-input-wacom$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-input-libinput$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-fbdev$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-amdgpu$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-radeon$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-intel$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-nouveau$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-vesa$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-vmware$UBUNTU_XORG_PKG_SUFFIX
-"
-REQUIRED_CONTENT_PACKAGES="
-			xterm
-			xauth
-			fonts-dejavu-core
-			fonts-dejavu-extra
-			ttf-dejavu-core
-			xserver-xorg$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-core$UBUNTU_XORG_PKG_SUFFIX
-			libgl1-mesa-dri
-			libgl1-mesa-glx
-			libglx0
-			libglx-mesa0
-			libxcb-glx0
-			@libgbm1
-			libegl1
-			libegl1-mesa
-			libegl-mesa0
-			libgbm1
-			libwayland-client0
-			libwayland-server0
-			xkb-data
-			x11-xkb-utils
-			x11-xserver-utils
-			x11-utils
-			xdotool
-			xserver-xorg-input-libinput$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-input-synaptics$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-input-wacom$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-fbdev$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-amdgpu$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-radeon$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-intel$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-nouveau$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-vesa$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-vmware$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-input-mouse$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-ati$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-openchrome$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-savage$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-trident$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-mach64$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-qxl$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-siliconmotion$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-cirrus$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-r128$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-neomagic$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-geode$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-s3$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-tdfx$UBUNTU_XORG_PKG_SUFFIX
-"
diff --git a/core/modules/xscreensaver/module.conf.debian b/core/modules/xscreensaver/module.conf.debian
new file mode 100644
index 00000000..7c06742c
--- /dev/null
+++ b/core/modules/xscreensaver/module.conf.debian
@@ -0,0 +1,14 @@
+#!/bin/bash
+REQUIRED_INSTALLED_PACKAGES="
+	intltool
+	libglade2-dev
+	libgtk2.0-dev
+	libxxf86vm-dev
+	libxtst-dev
+	libxt-dev
+	libxss-dev
+	libxrandr-dev
+	libxext-dev
+	libpam0g-dev
+"
+REQUIRED_CONFIGURE_OPTIONS="--with-hackdir=/usr/lib/xscreensaver/"
diff --git a/core/rootfs/rootfs-stage32/module.conf b/core/rootfs/rootfs-stage32/module.conf
index f0d5d5a4..1ddad8f3 100644
--- a/core/rootfs/rootfs-stage32/module.conf
+++ b/core/rootfs/rootfs-stage32/module.conf
@@ -56,7 +56,6 @@ REQUIRED_BINARIES="
 "
 REQUIRED_LIBRARIES="
 	libcap
-	libcidn
 	libcom_err
 	libcrypt
 	libnsl
diff --git a/core/rootfs/rootfs-stage32/module.conf.debian b/core/rootfs/rootfs-stage32/module.conf.debian
index 6d05cb6e..a27b3bc9 100644
--- a/core/rootfs/rootfs-stage32/module.conf.debian
+++ b/core/rootfs/rootfs-stage32/module.conf.debian
@@ -4,17 +4,16 @@ REQUIRED_INSTALLED_PACKAGES="
 			squashfs-tools
 			whois
 			xfsprogs
-			firmware-linux-free
-			curl
 			jfsutils
-			libssl-dev
+			curl
+			openssl
+			gawk
+			e2fsprogs
+			util-linux
+			kbd
+			dosfstools
+			strace
 "
 REQUIRED_CONTENT_PACKAGES="
-	
-"
-REQUIRED_DIRECTORIES="
-			/lib/xtables
-"
-REQUIRED_FILES+="
-			/etc/X11/app-defaults/Xvidtune
+			openssl
 "
diff --git a/core/rootfs/rootfs-stage32/module.conf.ubuntu b/core/rootfs/rootfs-stage32/module.conf.ubuntu
index a27b3bc9..1c3c8760 100644
--- a/core/rootfs/rootfs-stage32/module.conf.ubuntu
+++ b/core/rootfs/rootfs-stage32/module.conf.ubuntu
@@ -17,3 +17,6 @@ REQUIRED_INSTALLED_PACKAGES="
 REQUIRED_CONTENT_PACKAGES="
 			openssl
 "
+REQUIRED_LIBRARIES="
+	libcidn
+"