diff --git a/tools/include/branding/postinst/xmonad.sh b/tools/include/branding/postinst/xmonad.sh
index 048f0dc0f..e8b29991d 100644
--- a/tools/include/branding/postinst/xmonad.sh
+++ b/tools/include/branding/postinst/xmonad.sh
@@ -3,9 +3,25 @@ set +e
 # overwrite stock lightdm greeter configuration
 if [ -d /etc/armbian/lightdm ]; then cp -R /etc/armbian/lightdm /etc/; fi
 
+# xmonad session is provided by gnome-session-flashback
+
 # Disable Pulseaudio timer scheduling which does not work with sndhdmi driver
 if [ -f /etc/pulse/default.pa ]; then sed "s/load-module module-udev-detect$/& tsched=0/g" -i  /etc/pulse/default.pa; fi
 
-# set wallpapper to armbian
-
+# set wallpaper via feh
+mkdir -p /etc/xmonad
+cat > /etc/xmonad/wallpaper.sh <<- 'WALLEOF'
+#!/bin/bash
+feh --bg-scale /usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-dark-3840x2160.jpg
+WALLEOF
+chmod +x /etc/xmonad/wallpaper.sh
 
+# Let NetworkManager coexist with systemd-networkd
+if command -v NetworkManager > /dev/null 2>&1; then
+	mkdir -p /etc/NetworkManager/conf.d
+	cat > /etc/NetworkManager/conf.d/10-armbian-unmanaged.conf <<- NMEOF
+	[keyfile]
+	unmanaged-devices=type:ethernet
+	NMEOF
+	systemctl restart NetworkManager 2>/dev/null || true
+fi
diff --git a/tools/include/branding/skel/.xprofile b/tools/include/branding/skel/.xprofile
new file mode 100644
index 000000000..6704a9a10
--- /dev/null
+++ b/tools/include/branding/skel/.xprofile
@@ -0,0 +1,5 @@
+#!/bin/sh
+feh --bg-scale /usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-dark-3840x2160.jpg &
+xmobar &
+nm-applet &
+dunst &
diff --git a/tools/modules/system/module_desktop_packages.sh b/tools/modules/system/module_desktop_packages.sh
index 05679e7c5..c90532664 100644
--- a/tools/modules/system/module_desktop_packages.sh
+++ b/tools/modules/system/module_desktop_packages.sh
@@ -427,18 +427,21 @@ function module_desktop_packages() {
 			)
 		;;
 		"${de[11]}")
-			# xmonad - Haskell tiling window manager
+			# xmonad - tiling WM via gnome-session-flashback
 			packages+=(
 				"xmonad"
+				"gnome-session-flashback"
 				"xmobar"
 				"lightdm"
 				"slick-greeter"
 				"xserver-xorg"
-				"xterm"
+				"xinit"
 				"dbus-x11"
 				"dmenu"
+				"dmz-cursor-theme"
 				"dunst"
 				"feh"
+				"fonts-ubuntu"
 				"lm-sensors"
 				"network-manager-gnome"
 				"pavucontrol"