diff --git a/main/postmarketos-ui-xfce4/APKBUILD b/main/postmarketos-ui-xfce4/APKBUILD
index cf68acdcd..595215109 100644
--- a/main/postmarketos-ui-xfce4/APKBUILD
+++ b/main/postmarketos-ui-xfce4/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: https://postmarketos.org/uipkg
 # Maintainer: Jakko <jahau@rocketmail.com>
 pkgname=postmarketos-ui-xfce4
-pkgver=0.5.0
-pkgrel=1
+pkgver=0.5.1
+pkgrel=0
 pkgdesc="(X11) Lightweight desktop (stylus recommended)"
 url="https://gitlab.com/postmarketOS/xfce4-phone"
 arch="noarch"
@@ -43,13 +43,17 @@ source="
 	64-lightdm-autologin.conf
 	enable-scrollbars.sh
 	onboard-autostart.desktop
+	xfce4-phone.sh
 	"
 options="!check"
 builddir="$srcdir/xfce4-phone-$pkgver"
 
 package() {
-	install -d -m755 "$pkgdir"/etc/skel
-	cp -a "$builddir"/config "$pkgdir"/etc/skel/.config
+	mkdir -p "$pkgdir"/etc/skel/.config
+	cp -a "$builddir"/config/gtk-3.0 "$pkgdir"/etc/skel/.config/gtk-3.0
+
+	mkdir -p "$pkgdir"/etc/xdg/xfce4-phone
+	cp -a "$builddir"/config/xfce4 "$pkgdir"/etc/xdg/xfce4-phone/xfce4
 
 	install -Dm644 "$srcdir"/10_onboard.gschema.override \
 		"$pkgdir"/usr/share/glib-2.0/schemas/10_onboard.gschema.override
@@ -61,7 +65,10 @@ package() {
 		"$pkgdir"/etc/profile.d/enable-scrollbars.sh
 
 	install -Dm644 "$srcdir"/onboard-autostart.desktop \
-		"$pkgdir"/etc/skel/.config/autostart/onboard-autostart.desktop
+		"$pkgdir"/etc/xdg/xfce4-phone/autostart/onboard-autostart.desktop
+
+	install -Dm644 "$srcdir"/xfce4-phone.sh \
+		"$pkgdir"/etc/profile.d/xfce4-phone.sh
 
 	# Issue pmaports#1418, can be removed after v21.12 became unsupported
 	mkdir -p "$pkgdir"/usr/share/icons/postmarketOS
@@ -69,9 +76,10 @@ package() {
 }
 
 sha512sums="
-6c611e3ba81055f2eef08c7884f73664ce8c33edb93668542f8a8b3cd3086852672651158bd5e05e73c754b68f1e22b3731cc96f3507d9e86b9acff288470bbe  xfce4-phone-0.5.0.tar.gz
+1dd80635d726bac3e0436a7e5f407204d1768ab69a515a42b1affc852ec3dd7780529230c7f7f6626e58c0337c22a14895f6598c69918ef2c31b0eec4353838f  xfce4-phone-0.5.1.tar.gz
 ffcc518ff58d37de302bd101e57bf983800e45899645d476045d0a74096704333a0b513f45e6a5485fdbd80ac1caebce14a760cab6fcc6d5dde0d766ade8b58b  10_onboard.gschema.override
 3841294daffdd3e0da5a7ba155ba8c21e9e5a2f2ba5b3b5ffa3ea6a16486625d3655d03f8c18740fcddfbca673c42a5289ec3b22720cfbbdd56fde8fdc3bf9b0  64-lightdm-autologin.conf
 262cdcf334cfa56872797c960cb8683b79c7b13b0a8179cd002e598576f0e9fe07057fd0fe724e87a6664db4b91b31a8c0cbf026ab137533b07675f838ae57bb  enable-scrollbars.sh
-85a7f157fc237959f2e1a411f494f52a97c683bc656ea3899c7636db3de39ce9cb25b88ff5408fe2c36fe871065830c8581e8bdee385fb1aa94709c189463966  onboard-autostart.desktop
+ce7921f500b603796572bc02fa123e58d58ed1e9efd4d909de8f73c11a3e0bc0893639ce159f0701578b19db764893d021502d1c98cc24eb692e9d48320ff68c  onboard-autostart.desktop
+9ef0891cb1476c693175cf1ef8c64112354c1b2bf80c3cdfff4aabb2b9b9c434ccfa7dbdde3385fb215e94fc6216f3dc898be31b4ce9ad5bdb1c23bbb338d633  xfce4-phone.sh
 "
diff --git a/main/postmarketos-ui-xfce4/onboard-autostart.desktop b/main/postmarketos-ui-xfce4/onboard-autostart.desktop
index 6a072cdf8..1d1e3cb01 100644
--- a/main/postmarketos-ui-xfce4/onboard-autostart.desktop
+++ b/main/postmarketos-ui-xfce4/onboard-autostart.desktop
@@ -1,3 +1,5 @@
+# This custom autostart file omits the 3 secs startup delay
+# implemented in /etc/xdg/autostart/onboard-autostart.desktop
 [Desktop Entry]
 Type=Application
 Name=Onboard
diff --git a/main/postmarketos-ui-xfce4/xfce4-phone.sh b/main/postmarketos-ui-xfce4/xfce4-phone.sh
new file mode 100644
index 000000000..20ee733cc
--- /dev/null
+++ b/main/postmarketos-ui-xfce4/xfce4-phone.sh
@@ -0,0 +1,4 @@
+# shellcheck shell=sh
+# Set primary config directory for postmarketOS Xfce4 configs.
+# The general directory /etc/xdg will be appended later on.
+export XDG_CONFIG_DIRS="/etc/xdg/xfce4-phone"