diff --git a/main/postmarketos-ui-plasma-mobile/000-gschema.override b/main/postmarketos-base-ui-plasma/000-gschema.override
similarity index 100%
rename from main/postmarketos-ui-plasma-mobile/000-gschema.override
rename to main/postmarketos-base-ui-plasma/000-gschema.override
diff --git a/main/postmarketos-base-ui-plasma/APKBUILD b/main/postmarketos-base-ui-plasma/APKBUILD
new file mode 100644
index 000000000..11993ac20
--- /dev/null
+++ b/main/postmarketos-base-ui-plasma/APKBUILD
@@ -0,0 +1,100 @@
+# Reference: https://postmarketos.org/uipkg
+# Maintainer: Bart Ribbers <bribbers@disroot.org>
+pkgname=postmarketos-base-ui-plasma
+pkgver=1
+pkgrel=0
+pkgdesc="Meta package for shared configuration for Plasma-based UIs"
+url="https://postmarketos.org"
+arch="noarch !armhf" # armhf is not supported
+license="GPL-3.0-or-later"
+depends="
+	bluedevil
+	breeze
+	dnsmasq
+	elogind
+	elogind-openrc
+	iio-sensor-proxy
+	iio-sensor-proxy-openrc
+	kscreen
+	kwallet-pam
+	kwayland-integration
+	modemmanager
+	pipewire
+	polkit-kde-agent-1
+	postmarketos-base-ui
+	postmarketos-base-ui-networkmanager
+	powerdevil
+	pulseaudio
+	xdg-desktop-portal-kde
+	"
+# Required to launch
+depends="$depends
+	tinydm
+	tinydm-openrc
+	xorg-server
+	"
+_pmb_recommends="
+	breeze-gtk
+	discover
+	font-droid-nonlatin
+	font-noto
+	font-noto-emoji
+	font-noto-extra
+	kaccounts-providers
+	kde-gtk-config
+	maliit-keyboard
+	postmarketos-artwork-wallpapers
+	xdg-user-dirs
+	"
+install="$pkgname.post-install $pkgname.post-upgrade"
+source="
+	000-gschema.override
+	gtk-app-wayland.sh
+	kdeglobals
+	kdewallet.kwl
+	kdewallet.salt
+	kscreenlockerrc
+	kwinrc
+	qtlogging.ini
+	"
+options="!check pmb:gpu-accel"
+
+package() {
+	install -Dm644 \
+		"$srcdir"/kwinrc \
+		-t "$pkgdir"/etc/xdg/
+
+	install -Dm644 \
+		"$srcdir"/kdeglobals \
+		"$srcdir"/kscreenlockerrc \
+		-t "$pkgdir"/etc/xdg
+
+	install -Dm644 \
+		"$srcdir"/qtlogging.ini \
+		-t "$pkgdir"/etc/xdg/QtProject/
+
+	install -Dm755 \
+		"$srcdir"/gtk-app-wayland.sh \
+		-t "$pkgdir"/etc/profile.d/
+
+	install -Dm644 "$srcdir"/000-gschema.override \
+		"$pkgdir"/usr/share/glib-2.0/schemas/000-postmarketos.gschema.override
+
+	# TODO: remove once keyboard input bug is fixed
+	# https://bugs.kde.org/show_bug.cgi?id=435183
+	install -Dm600 -t "$pkgdir"/etc/skel/.local/share/kwalletd \
+		"$srcdir"/kdewallet.kwl \
+		"$srcdir"/kdewallet.salt
+}
+
+
+sha512sums="
+591529f147f161f5e97c979a9ad4b9f3a65e6d3b87a7bdbd020ec928155cfe5fd561cae6582c4b2831b452fe9b0a03168731771b77020fb66e09f81552ba421e  000-gschema.override
+57793bb079c76ba3bdcfca7880aa887de11fe80e7a05557b78435e57feabab70fbaeedc42da3aec6f914c35bba8e8ee9918367516eb45ee247f63f694624f179  gtk-app-wayland.sh
+a1923ecd21ce3c5eacee18f7a64750072ef9cd4aea7b9a0092d23b8445d37d9e70a3ac873c0c50b748e32adc4c3b75169a6737f3aea06ef85bc1fc95a67bb3ce  kdeglobals
+923309f71ee0840ae49d610ab5c11260432f462709eee7148ee5a4703872b9926a3267b16b524162c1560e0798c63fe392a161a57be5c6000bbb1e3f0c947e25  kdewallet.kwl
+f3fdaaaf13e985166b86158d5a60098aa45195ea078a4cab7fbf12d3aa428000af3e46ec011dbdc38a4c00faeac5f9a3b5bc2765a6afdd0f1ee58616e31e7429  kdewallet.salt
+b3aa8ee26c01de103c0c0af23532bf232f7071fdd02c53bd787d78e5974faa5662fc5776ce9be417392214ae73334b0eb0d073fe24f616a0ce99081f30b9158c  kscreenlockerrc
+f483e351781ad879deb3bca81d023098b780f0f95129ec20aa263836f0482f720cd46fee3980b088afde4e6c89bbe126eb7fb673fab65744153a7568ca3c8720  kwinrc
+341f0b866c315f37868ef3e7137cce8b53a0e8e6164e5af71b3e8e2fa68321afbf0652d76124ef84bade1393f701748852ac939aef9daff7e272a0df827780eb  qtlogging.ini
+"
diff --git a/main/postmarketos-ui-plasma-mobile/gtk-app-wayland.sh b/main/postmarketos-base-ui-plasma/gtk-app-wayland.sh
similarity index 100%
rename from main/postmarketos-ui-plasma-mobile/gtk-app-wayland.sh
rename to main/postmarketos-base-ui-plasma/gtk-app-wayland.sh
diff --git a/main/postmarketos-ui-plasma-mobile/kdeglobals b/main/postmarketos-base-ui-plasma/kdeglobals
similarity index 100%
rename from main/postmarketos-ui-plasma-mobile/kdeglobals
rename to main/postmarketos-base-ui-plasma/kdeglobals
diff --git a/main/postmarketos-ui-plasma-mobile/kdewallet.kwl b/main/postmarketos-base-ui-plasma/kdewallet.kwl
similarity index 100%
rename from main/postmarketos-ui-plasma-mobile/kdewallet.kwl
rename to main/postmarketos-base-ui-plasma/kdewallet.kwl
diff --git a/main/postmarketos-ui-plasma-mobile/kdewallet.salt b/main/postmarketos-base-ui-plasma/kdewallet.salt
similarity index 100%
rename from main/postmarketos-ui-plasma-mobile/kdewallet.salt
rename to main/postmarketos-base-ui-plasma/kdewallet.salt
diff --git a/main/postmarketos-ui-plasma-mobile/kscreenlockerrc b/main/postmarketos-base-ui-plasma/kscreenlockerrc
similarity index 100%
rename from main/postmarketos-ui-plasma-mobile/kscreenlockerrc
rename to main/postmarketos-base-ui-plasma/kscreenlockerrc
diff --git a/main/postmarketos-ui-plasma-mobile/kwinrc b/main/postmarketos-base-ui-plasma/kwinrc
similarity index 100%
rename from main/postmarketos-ui-plasma-mobile/kwinrc
rename to main/postmarketos-base-ui-plasma/kwinrc
diff --git a/main/postmarketos-base-ui-plasma/postmarketos-base-ui-plasma.post-install b/main/postmarketos-base-ui-plasma/postmarketos-base-ui-plasma.post-install
new file mode 100644
index 000000000..eb719d26c
--- /dev/null
+++ b/main/postmarketos-base-ui-plasma/postmarketos-base-ui-plasma.post-install
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+rc-update add bluetooth default
+rc-update add elogind default
+rc-update add hfd-service default
+rc-update add iio-sensor-proxy default
+rc-update add networkmanager default
+rc-update add modemmanager default
+rc-update add tinydm default
+rc-update add urfkill default
+
+
+# Migrate from the old ofono setup
+if rc-update del ofono default; then
+	rc-update del ofono-auto-enable default
+	rc-service stop ofono
+	rc-service stop ofono-auto-enable
+
+	rc-service start modemmanager
+fi
+
+tinydm-set-session -s /usr/share/wayland-sessions/plasma-mobile.desktop
+
+glib-compile-schemas /usr/share/glib-2.0/schemas
diff --git a/main/postmarketos-base-ui-plasma/postmarketos-base-ui-plasma.post-upgrade b/main/postmarketos-base-ui-plasma/postmarketos-base-ui-plasma.post-upgrade
new file mode 120000
index 000000000..5891c62c3
--- /dev/null
+++ b/main/postmarketos-base-ui-plasma/postmarketos-base-ui-plasma.post-upgrade
@@ -0,0 +1 @@
+postmarketos-base-ui-plasma.post-install
\ No newline at end of file
diff --git a/main/postmarketos-ui-plasma-mobile/qtlogging.ini b/main/postmarketos-base-ui-plasma/qtlogging.ini
similarity index 100%
rename from main/postmarketos-ui-plasma-mobile/qtlogging.ini
rename to main/postmarketos-base-ui-plasma/qtlogging.ini
diff --git a/main/postmarketos-ui-plasma-bigscreen/APKBUILD b/main/postmarketos-ui-plasma-bigscreen/APKBUILD
index 595248306..70c51669d 100644
--- a/main/postmarketos-ui-plasma-bigscreen/APKBUILD
+++ b/main/postmarketos-ui-plasma-bigscreen/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: https://postmarketos.org/uipkg
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=postmarketos-ui-plasma-bigscreen
-pkgver=0.2
-pkgrel=19
+pkgver=1
+pkgrel=0
 _commit_configs="a8bd93e279c222be6058ef46b065c11e88aa8400"
 pkgdesc="(Wayland) 10-feet variant of Plasma, made for big screen TVs"
 url="https://wiki.postmarketos.org/wiki/Plasma_Bigscreen"
@@ -16,17 +16,8 @@ depends="
 	dnsmasq
 	plasma-bigscreen
 	polkit-kde-agent-1
-	postmarketos-artwork-wallpapers
-	postmarketos-base-ui
-	postmarketos-base-ui-networkmanager
-	pulseaudio
+	postmarketos-base-ui-plasma
 	qt5-qtvirtualkeyboard
-	xdg-desktop-portal-kde
-	"
-# Required to launch
-depends="$depends
-	tinydm
-	tinydm-openrc
 	"
 _pmb_recommends="
 	aura-browser
@@ -35,7 +26,6 @@ _pmb_recommends="
 	plank-player
 	"
 install="$pkgname.post-install $pkgname.post-upgrade"
-subpackages="$pkgname-extras"
 source="$pkgname-$_commit_configs.tar.gz::https://invent.kde.org/plasma-bigscreen/bigscreen-image-settings/-/archive/$_commit_configs/bigscreen-image-settings-$_commit_configs.tar.gz
 	qtlogging.ini
 	nymphcast.desktop
@@ -53,15 +43,6 @@ package() {
 	mv "$srcdir"/bigscreen-image-settings-"$_commit_configs"/etc/skel/.config "$pkgdir"/etc/skel/
 }
 
-extras() {
-	pkgdesc="Meta package for additional Plasma Bigscreen apps"
-	_pmb_recommends="
-		mycroft-plasmoid
-		"
-
-	mkdir -p "$subpkgdir"
-}
-
 sha512sums="
 a3b877e15f06078c4ac6017d2b6ce57902d23d40c0fbbc8e7ad0af8f5b9ddc802e8e353ee4f48a07315dd2d1fd1b34ed3bfc4235649ba27729cbfd67dad3675a  postmarketos-ui-plasma-bigscreen-a8bd93e279c222be6058ef46b065c11e88aa8400.tar.gz
 341f0b866c315f37868ef3e7137cce8b53a0e8e6164e5af71b3e8e2fa68321afbf0652d76124ef84bade1393f701748852ac939aef9daff7e272a0df827780eb  qtlogging.ini
diff --git a/main/postmarketos-ui-plasma-desktop/APKBUILD b/main/postmarketos-ui-plasma-desktop/APKBUILD
index 68ae9ba41..f2c72bf65 100644
--- a/main/postmarketos-ui-plasma-desktop/APKBUILD
+++ b/main/postmarketos-ui-plasma-desktop/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: https://postmarketos.org/uipkg
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=postmarketos-ui-plasma-desktop
-pkgver=2
-pkgrel=14
+pkgver=3
+pkgrel=0
 pkgdesc="(X11/Wayland) KDE Desktop Environment (works well with tablets)"
 url="https://www.kde.org"
 # armhf and riscv64 blocked by plasma
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
 depends="
 	dnsmasq
 	plasma
-	postmarketos-base-ui
+	postmarketos-base-ui-plasma
 	sddm
 	"
 _pmb_recommends="
@@ -26,11 +26,7 @@ _pmb_recommends="
 	kfind
 	kio-extras
 	konsole
-	maliit-keyboard
-	postmarketos-artwork-wallpapers
-	postmarketos-base-ui-networkmanager
 	print-manager
-	qt5-qtvirtualkeyboard
 	spectacle
 	"
 
diff --git a/main/postmarketos-ui-plasma-mobile/APKBUILD b/main/postmarketos-ui-plasma-mobile/APKBUILD
index 21223b1d8..c45712eef 100644
--- a/main/postmarketos-ui-plasma-mobile/APKBUILD
+++ b/main/postmarketos-ui-plasma-mobile/APKBUILD
@@ -1,121 +1,47 @@
 # Reference: https://postmarketos.org/uipkg
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=postmarketos-ui-plasma-mobile
-pkgver=3.9
-pkgrel=3
+pkgver=4
+pkgrel=0
 pkgdesc="(Wayland) Mobile variant of KDE Plasma (does not run without hardware acceleration)"
 url="https://wiki.postmarketos.org/wiki/Plasma_Mobile"
 arch="noarch !armhf !x86" # armhf: pmaports#75, x86: aports#11807
 license="GPL-3.0-or-later"
 depends="
-	bluedevil
-	breeze
 	callaudiod
-	dnsmasq
-	elogind
-	elogind-openrc
 	hfd-service
-	iio-sensor-proxy
-	iio-sensor-proxy-openrc
-	kscreen
-	kwallet-pam
-	kwayland-integration
-	modemmanager
-	pipewire
 	plasma-mobile
-	polkit-kde-agent-1
-	postmarketos-base-ui
-	postmarketos-base-ui-networkmanager
-	powerdevil
-	pulseaudio
-	xdg-desktop-portal-kde
-	"
-# Required to launch
-depends="$depends
-	tinydm
-	tinydm-openrc
-	xorg-server
+	postmarketos-base-ui-plasma
 	"
 _pmb_recommends="
 	angelfish
-	breeze-gtk
-	discover
-	font-droid-nonlatin
-	font-noto
-	font-noto-extra
-	font-noto-emoji
 	index
-	kaccounts-providers
 	kclock
-	kde-gtk-config
-	kirigami-gallery
 	koko
-	kpeoplevcard
 	plasma-dialer
 	plasma-mobile-sounds
 	plasma-phonebook
-	postmarketos-artwork-wallpapers
 	postmarketos-default-camera
 	postprocessd
 	qmlkonsole
 	spacebar
 	ttyescape
-	xdg-user-dirs
 	"
 install="$pkgname.post-install $pkgname.post-upgrade"
 source="
-	000-gschema.override
-	gtk-app-wayland.sh
-	kdeglobals
-	kdewallet.kwl
-	kdewallet.salt
-	kscreenlockerrc
-	kwinrc
 	maliit-plasmamobile.json
 	org.kde.phone.homescreen.js
-	qtlogging.ini
-	unlock-plasma
 	"
 subpackages="$pkgname-extras"
 replaces="plasma-mobile"
 options="!check pmb:gpu-accel"
 
 package() {
-	install -Dm644 \
-		"$srcdir"/kwinrc \
-		-t "$pkgdir"/etc/xdg/
-
-	install -Dm644 \
-		"$srcdir"/kdeglobals \
-		"$srcdir"/kscreenlockerrc \
-		-t "$pkgdir"/etc/xdg
-
-	install -Dm644 \
-		"$srcdir"/qtlogging.ini \
-		-t "$pkgdir"/etc/xdg/QtProject/
-
-	install -Dm755 \
-		"$srcdir"/unlock-plasma \
-		-t "$pkgdir"/usr/bin/
-
-	install -Dm755 \
-		"$srcdir"/gtk-app-wayland.sh \
-		-t "$pkgdir"/etc/profile.d/
-
-	install -Dm644 "$srcdir"/000-gschema.override \
-		"$pkgdir"/usr/share/glib-2.0/schemas/000-postmarketos.gschema.override
-
 	install -Dm644 "$srcdir"/maliit-plasmamobile.json \
 		"$pkgdir"/usr/share/maliit/keyboard2/devices/plasmamobile.json
 
 	install -Dm644 "$srcdir"/org.kde.phone.homescreen.js \
 		"$pkgdir"/usr/share/plasma/look-and-feel/org.kde.plasma.phone/contents/plasmoidsetupscripts/org.kde.phone.homescreen.js
-
-	# TODO: remove once keyboard input bug is fixed
-	# https://bugs.kde.org/show_bug.cgi?id=435183
-	install -Dm600 -t "$pkgdir"/etc/skel/.local/share/kwalletd \
-		"$srcdir"/kdewallet.kwl \
-		"$srcdir"/kdewallet.salt
 }
 
 extras() {
@@ -146,15 +72,6 @@ extras() {
 
 
 sha512sums="
-591529f147f161f5e97c979a9ad4b9f3a65e6d3b87a7bdbd020ec928155cfe5fd561cae6582c4b2831b452fe9b0a03168731771b77020fb66e09f81552ba421e  000-gschema.override
-57793bb079c76ba3bdcfca7880aa887de11fe80e7a05557b78435e57feabab70fbaeedc42da3aec6f914c35bba8e8ee9918367516eb45ee247f63f694624f179  gtk-app-wayland.sh
-a1923ecd21ce3c5eacee18f7a64750072ef9cd4aea7b9a0092d23b8445d37d9e70a3ac873c0c50b748e32adc4c3b75169a6737f3aea06ef85bc1fc95a67bb3ce  kdeglobals
-923309f71ee0840ae49d610ab5c11260432f462709eee7148ee5a4703872b9926a3267b16b524162c1560e0798c63fe392a161a57be5c6000bbb1e3f0c947e25  kdewallet.kwl
-f3fdaaaf13e985166b86158d5a60098aa45195ea078a4cab7fbf12d3aa428000af3e46ec011dbdc38a4c00faeac5f9a3b5bc2765a6afdd0f1ee58616e31e7429  kdewallet.salt
-b3aa8ee26c01de103c0c0af23532bf232f7071fdd02c53bd787d78e5974faa5662fc5776ce9be417392214ae73334b0eb0d073fe24f616a0ce99081f30b9158c  kscreenlockerrc
-f483e351781ad879deb3bca81d023098b780f0f95129ec20aa263836f0482f720cd46fee3980b088afde4e6c89bbe126eb7fb673fab65744153a7568ca3c8720  kwinrc
 70ee87860842057b557a433a9ae7d54653f076a612b3d9de2d413d598806d23ec19390262eaa398cddf39437f1213d14922402a8d978878e5e98f3767ce0b9eb  maliit-plasmamobile.json
 50dbb5e0b1550776ca6fc5b91468412b23d49aa502af77cf7d5d15af11eaf61b1632b205f42eac3274bf28a0b7b278a4d6bfc98c6c12ea29830fd258bad5107d  org.kde.phone.homescreen.js
-341f0b866c315f37868ef3e7137cce8b53a0e8e6164e5af71b3e8e2fa68321afbf0652d76124ef84bade1393f701748852ac939aef9daff7e272a0df827780eb  qtlogging.ini
-e5dcc82c0e58288fd7a8f805e60fa777fab71c68355f085a0e4f25b05526491476fdb6decbc7c0495626d6736a53bfc8e8f34a3231210858998e19cd6fbc89a0  unlock-plasma
 "
diff --git a/main/postmarketos-ui-plasma-mobile/unlock-plasma b/main/postmarketos-ui-plasma-mobile/unlock-plasma
deleted file mode 100644
index f14b0d805..000000000
--- a/main/postmarketos-ui-plasma-mobile/unlock-plasma
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-sudo loginctl unlock-sessions