diff --git a/main/postmarketos-ui-sxmo/APKBUILD b/main/postmarketos-ui-sxmo/APKBUILD
index beddd516f..c2e5c57c4 100644
--- a/main/postmarketos-ui-sxmo/APKBUILD
+++ b/main/postmarketos-ui-sxmo/APKBUILD
@@ -1,39 +1,56 @@
 # Maintainer: Miles Alan <m@milesalan.com>
 pkgname=postmarketos-ui-sxmo
-pkgver=1.5.1
-pkgrel=2
-pkgdesc="(X11) Simple X Mobile: Mobile environment based on simple & suckless software (best compatibility on pinephone)"
+pkgver=1.6.0
+pkgrel=0
+pkgdesc="Simple Mobile: Core package to build custom SXMO desktops environments"
 url="http://sr.ht/~mil/Sxmo"
 arch="noarch !armhf"
 license="MIT"
 depends="
+	alsa-utils
+	codemadness-frontends
 	dnsmasq
+	dunst
+	ffmpeg
+	font-fira-mono-nerd
+	font-terminus-nerd
+	geoclue
+	inotify-tools
+	light
+	lisgd
+	mediainfo
+	mmsd-tng
+	mmsd-tng-tools
+	mnc
+	modemmanager
 	modemmanager-openrc
+	mpv
+	ncurses
+	networkmanager
 	networkmanager-openrc
+	pn
 	polkit
 	polkit-openrc
 	postmarketos-base-ui
 	sxmo-utils
 	sxmo-utils-openrc
+	terminus-font
 	tinydm
 	tinydm-openrc
+	tzdata
+	v4l-utils
+	vis
+	youtube-dl
 	"
 install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
-subpackages="$pkgname-qt_tweaks $pkgname-bluetooth"
-_pmb_recommends="
-	feh
-	firefox-esr
-	font-noto
-	font-noto-emoji
-	gnome-icon-theme
-	htop
-	megapixels-gtk3
-	mobile-config-firefox
-	xcalc
-	"
 _pmb_groups="
 	seat
 	"
+_pmb_recommends="
+	w3m
+	sfeed
+	"
+subpackages="$pkgname-qt_tweaks $pkgname-bluetooth $pkgname-dwm $pkgname-sway"
 source="
 	sxmo-qt-mobile-controls.sh
 	postmarketos.conf
@@ -65,6 +82,90 @@ bluetooth() {
 	install="$subpkgname.post-install $subpkgname.pre-deinstall"
 }
 
+dwm() {
+	pkgdesc="Simple Mobile: Mobile environment based on SXMO and running on dwm"
+	depends="
+		postmarketos-ui-sxmo
+
+		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
+	"
+	_pmb_recommends="
+		clickclack
+		feh
+		firefox-esr
+		font-noto
+		font-noto-emoji
+		gnome-icon-theme
+		megapixels-gtk3
+		mobile-config-firefox
+		xcalc
+	"
+	provides="$pkgname-de"
+	provider_priority="0"
+	install="$subpkgname.post-install"
+
+	mkdir -p "$subpkgdir"
+}
+
+sway() {
+	pkgdesc="Simple Mobile: Mobile environment based on SXMO and running on sway"
+	depends="
+		postmarketos-ui-sxmo
+
+		foot
+		grim
+		mako
+		seatd
+		seatd-openrc
+		slurp
+		swaybg
+		swayidle
+		sxmo-bemenu
+		sxmo-sway
+		wayout
+		wl-clipboard
+		wtype
+		wvkbd
+		xwayland
+	"
+	_pmb_recommends="
+		clickclack
+		firefox-esr
+		font-noto
+		font-noto-emoji
+		gnome-icon-theme
+		imv
+		megapixels
+		mobile-config-firefox
+	"
+	provides="$pkgname-de"
+	provider_priority="1"
+	install="$subpkgname.post-install $subpkgname.pre-deinstall"
+
+	mkdir -p "$subpkgdir"
+}
+
+
 sha512sums="
 bf8db527c49fa724e640a90269ba2648a2555f5867b2adbfbd88d1f685261f757339757c09ee08f590c76de4bd3d0c73a47dea9bd340644dd4707e76152cefd1  sxmo-qt-mobile-controls.sh
 cc4e4404b135ce484e0976b243973e39f1137aa9dd5e9297f767b2ea65b719ca82e84cc66cb093950ce330dbf786981ced2e5b0d16350deb5706a08ffccb4606  postmarketos.conf
diff --git a/main/postmarketos-ui-sxmo/postmarketos-ui-sxmo-dwm.post-install b/main/postmarketos-ui-sxmo/postmarketos-ui-sxmo-dwm.post-install
new file mode 100644
index 000000000..ad239685f
--- /dev/null
+++ b/main/postmarketos-ui-sxmo/postmarketos-ui-sxmo-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/postmarketos-ui-sxmo-sway.post-install b/main/postmarketos-ui-sxmo/postmarketos-ui-sxmo-sway.post-install
new file mode 100644
index 000000000..f496b1651
--- /dev/null
+++ b/main/postmarketos-ui-sxmo/postmarketos-ui-sxmo-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/postmarketos-ui-sxmo-sway.pre-deinstall b/main/postmarketos-ui-sxmo/postmarketos-ui-sxmo-sway.pre-deinstall
new file mode 100644
index 000000000..c9aae7ff5
--- /dev/null
+++ b/main/postmarketos-ui-sxmo/postmarketos-ui-sxmo-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-install b/main/postmarketos-ui-sxmo/postmarketos-ui-sxmo.post-install
index f8dd81989..873a214b5 100644
--- a/main/postmarketos-ui-sxmo/postmarketos-ui-sxmo.post-install
+++ b/main/postmarketos-ui-sxmo/postmarketos-ui-sxmo.post-install
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-tinydm-set-session -f -s /usr/share/xsessions/sxmo.desktop
-
 rc-update del xdm default # TODO remove when tinydm is on stable
 rc-update add sxmo-setpermissions default
 rc-update add modemmanager default