diff --git a/main/postmarketos-ui-sxmo-de-dwm/APKBUILD b/main/postmarketos-ui-sxmo-de-dwm/APKBUILD
new file mode 100644
index 000000000..4d8b85971
--- /dev/null
+++ b/main/postmarketos-ui-sxmo-de-dwm/APKBUILD
@@ -0,0 +1,56 @@
+# Reference: https://postmarketos.org/uipkg
+# Maintainer: Miles Alan <m@milesalan.com>
+pkgname=postmarketos-ui-sxmo-de-dwm
+pkgver=1.6.0
+pkgrel=0
+pkgdesc="Simple Mobile: Mobile environment based on SXMO and running on dwm"
+url="http://sr.ht/~mil/Sxmo"
+arch="noarch !armhf"
+license="MIT"
+depends="
+	sxmo-common
+
+	autocutsel
+	conky
+	svkbd
+	sxiv
+	sxmo-dmenu
+	sxmo-dwm
+	sxmo-st
+	unclutter-xfixes
+	xcalib
+	xclip
+	xdotool
+	xdpyinfo
+	xinput
+	xprintidle
+	xprop
+	xrandr
+	xrdb
+	xsel
+	xset
+	xsetroot
+	xwininfo
+	"
+install="$pkgname.post-install"
+_pmb_recommends="
+	w3m
+	sfeed
+
+	clickclack
+	feh
+	firefox-esr
+	font-noto
+	font-noto-emoji
+	gnome-icon-theme
+	megapixels-gtk3
+	mobile-config-firefox
+	xcalc
+	"
+provides="postmarketos-ui-sxmo"
+provider_priority=0
+options="!check" # has no tests
+
+package() {
+	mkdir -p "$pkgdir"
+}
diff --git a/main/postmarketos-ui-sxmo-de-dwm/postmarketos-ui-sxmo-de-dwm.post-install b/main/postmarketos-ui-sxmo-de-dwm/postmarketos-ui-sxmo-de-dwm.post-install
new file mode 100644
index 000000000..ad239685f
--- /dev/null
+++ b/main/postmarketos-ui-sxmo-de-dwm/postmarketos-ui-sxmo-de-dwm.post-install
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+tinydm-set-session -f -s /usr/share/xsessions/sxmo.desktop
diff --git a/main/postmarketos-ui-sxmo-de-sway/APKBUILD b/main/postmarketos-ui-sxmo-de-sway/APKBUILD
new file mode 100644
index 000000000..9ab7413ec
--- /dev/null
+++ b/main/postmarketos-ui-sxmo-de-sway/APKBUILD
@@ -0,0 +1,52 @@
+# Reference: https://postmarketos.org/uipkg
+# Maintainer: Miles Alan <m@milesalan.com>
+pkgname=postmarketos-ui-sxmo-de-sway
+pkgver=1.6.0
+pkgrel=0
+pkgdesc="Simple Mobile: Mobile environment based on SXMO and running on sway"
+url="http://sr.ht/~mil/Sxmo"
+arch="noarch !armhf"
+license="MIT"
+depends="
+	sxmo-common
+
+	foot
+	grim
+	mako
+	seatd
+	seatd-openrc
+	slurp
+	swaybg
+	swayidle
+	sxmo-bemenu
+	sxmo-sway
+	wayout
+	wl-clipboard
+	wtype
+	wvkbd
+	xwayland
+	"
+install="$pkgname.post-install $pkgname.pre-deinstall"
+_pmb_groups="
+	seat
+	"
+_pmb_recommends="
+	w3m
+	sfeed
+
+	clickclack
+	firefox-esr
+	font-noto
+	font-noto-emoji
+	gnome-icon-theme
+	imv
+	megapixels
+	mobile-config-firefox
+	"
+provides="postmarketos-ui-sxmo"
+provider_priority=1
+options="!check" # has no tests
+
+package() {
+	mkdir -p "$pkgdir"
+}
diff --git a/main/postmarketos-ui-sxmo-de-sway/postmarketos-ui-sxmo-de-sway.post-install b/main/postmarketos-ui-sxmo-de-sway/postmarketos-ui-sxmo-de-sway.post-install
new file mode 100644
index 000000000..f496b1651
--- /dev/null
+++ b/main/postmarketos-ui-sxmo-de-sway/postmarketos-ui-sxmo-de-sway.post-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+tinydm-set-session -f -s /usr/share/wayland-sessions/swmo.desktop
+
+rc-update add seatd default
diff --git a/main/postmarketos-ui-sxmo-de-sway/postmarketos-ui-sxmo-de-sway.pre-deinstall b/main/postmarketos-ui-sxmo-de-sway/postmarketos-ui-sxmo-de-sway.pre-deinstall
new file mode 100644
index 000000000..c9aae7ff5
--- /dev/null
+++ b/main/postmarketos-ui-sxmo-de-sway/postmarketos-ui-sxmo-de-sway.pre-deinstall
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+rc-update del seatd default
diff --git a/main/postmarketos-ui-sxmo/postmarketos-ui-sxmo.post-upgrade b/main/postmarketos-ui-sxmo/postmarketos-ui-sxmo.post-upgrade
deleted file mode 120000
index a7427d23b..000000000
--- a/main/postmarketos-ui-sxmo/postmarketos-ui-sxmo.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-postmarketos-ui-sxmo.post-install
\ No newline at end of file
diff --git a/main/postmarketos-ui-sxmo/APKBUILD b/main/sxmo-common/APKBUILD
similarity index 72%
rename from main/postmarketos-ui-sxmo/APKBUILD
rename to main/sxmo-common/APKBUILD
index eda12f68a..7e28a3b90 100644
--- a/main/postmarketos-ui-sxmo/APKBUILD
+++ b/main/sxmo-common/APKBUILD
@@ -1,9 +1,9 @@
 # Reference: https://postmarketos.org/uipkg
 # Maintainer: Miles Alan <m@milesalan.com>
-pkgname=postmarketos-ui-sxmo
+pkgname=sxmo-common
 pkgver=1.6.0
-pkgrel=3
-pkgdesc="Simple Mobile: Mobile environment based on SXMO"
+pkgrel=4
+pkgdesc="Simple Mobile: Core package to build custom SXMO desktop environments"
 url="http://sr.ht/~mil/Sxmo"
 arch="noarch !armhf"
 license="MIT"
@@ -42,62 +42,8 @@ depends="
 	v4l-utils
 	vis
 	youtube-dl
-
-	autocutsel
-	conky
-	svkbd
-	sxiv
-	sxmo-dmenu
-	sxmo-dwm
-	sxmo-st
-	unclutter-xfixes
-	xcalib
-	xclip
-	xdotool
-	xdpyinfo
-	xinput
-	xprintidle
-	xprop
-	xrandr
-	xrdb
-	xsel
-	xset
-	xsetroot
-	xwininfo
-
-	foot
-	grim
-	mako
-	seatd
-	seatd-openrc
-	slurp
-	swaybg
-	swayidle
-	sxmo-bemenu
-	sxmo-sway
-	wayout
-	wl-clipboard
-	wtype
-	wvkbd
-	xwayland
 	"
 install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
-_pmb_groups="
-	seat
-	"
-_pmb_recommends="
-	w3m
-	sfeed
-
-	clickclack
-	firefox-esr
-	font-noto
-	font-noto-emoji
-	gnome-icon-theme
-	imv
-	megapixels
-	mobile-config-firefox
-	"
 subpackages="$pkgname-qt_tweaks $pkgname-bluetooth"
 source="
 	sxmo-qt-mobile-controls.sh
@@ -110,9 +56,10 @@ package() {
 }
 
 qt_tweaks() {
-	install_if="$pkgname qt5-qtbase"
+	install_if="$pkgname=$pkgver-r$pkgrel qt5-qtbase"
 	install -Dm755 -t "$subpkgdir"/etc/profile.d/ \
 		"$srcdir"/sxmo-qt-mobile-controls.sh
+	provides="postmarketos-ui-sxmo-qt_tweaks=$pkgver-r$pkgrel"
 }
 
 bluetooth() {
@@ -128,6 +75,7 @@ bluetooth() {
 	install -Dm644 "$srcdir"/postmarketos.conf \
 		"$subpkgdir"/etc/bluetooth/main.conf
 	install="$subpkgname.post-install $subpkgname.pre-deinstall"
+	provides="postmarketos-ui-sxmo-bluetooth=$pkgver-r$pkgrel"
 }
 
 
diff --git a/main/postmarketos-ui-sxmo/postmarketos.conf b/main/sxmo-common/postmarketos.conf
similarity index 100%
rename from main/postmarketos-ui-sxmo/postmarketos.conf
rename to main/sxmo-common/postmarketos.conf
diff --git a/main/postmarketos-ui-sxmo/postmarketos-ui-sxmo-bluetooth.post-install b/main/sxmo-common/sxmo-common-bluetooth.post-install
similarity index 100%
rename from main/postmarketos-ui-sxmo/postmarketos-ui-sxmo-bluetooth.post-install
rename to main/sxmo-common/sxmo-common-bluetooth.post-install
diff --git a/main/postmarketos-ui-sxmo/postmarketos-ui-sxmo-bluetooth.pre-deinstall b/main/sxmo-common/sxmo-common-bluetooth.pre-deinstall
similarity index 100%
rename from main/postmarketos-ui-sxmo/postmarketos-ui-sxmo-bluetooth.pre-deinstall
rename to main/sxmo-common/sxmo-common-bluetooth.pre-deinstall
diff --git a/main/postmarketos-ui-sxmo/postmarketos-ui-sxmo.post-install b/main/sxmo-common/sxmo-common.post-install
similarity index 72%
rename from main/postmarketos-ui-sxmo/postmarketos-ui-sxmo.post-install
rename to main/sxmo-common/sxmo-common.post-install
index 30a48b84c..873a214b5 100644
--- a/main/postmarketos-ui-sxmo/postmarketos-ui-sxmo.post-install
+++ b/main/sxmo-common/sxmo-common.post-install
@@ -6,6 +6,3 @@ rc-update add modemmanager default
 rc-update add tinydm default
 rc-update add networkmanager default
 rc-update add polkit default
-rc-update add seatd default
-
-tinydm-set-session -f -s /usr/share/wayland-sessions/swmo.desktop
diff --git a/main/sxmo-common/sxmo-common.post-upgrade b/main/sxmo-common/sxmo-common.post-upgrade
new file mode 120000
index 000000000..616f0e154
--- /dev/null
+++ b/main/sxmo-common/sxmo-common.post-upgrade
@@ -0,0 +1 @@
+sxmo-common.post-install
\ No newline at end of file
diff --git a/main/postmarketos-ui-sxmo/postmarketos-ui-sxmo.pre-deinstall b/main/sxmo-common/sxmo-common.pre-deinstall
similarity index 100%
rename from main/postmarketos-ui-sxmo/postmarketos-ui-sxmo.pre-deinstall
rename to main/sxmo-common/sxmo-common.pre-deinstall
diff --git a/main/postmarketos-ui-sxmo/sxmo-qt-mobile-controls.sh b/main/sxmo-common/sxmo-qt-mobile-controls.sh
similarity index 100%
rename from main/postmarketos-ui-sxmo/sxmo-qt-mobile-controls.sh
rename to main/sxmo-common/sxmo-qt-mobile-controls.sh