diff --git a/APKBUILD b/APKBUILD
index 07d8e57..5a8dfa9 100644
--- a/APKBUILD
+++ b/APKBUILD
@@ -8,41 +8,49 @@ url="https://git.shadowkat.net/izaya/awesome-mobile"
 arch="noarch"
 license="MPL-2.0"
 depends="
-        dnsmasq
-        lightdm
-        lightdm-gtk-greeter
-        onboard
-        xf86-input-evdev
-        postmarketos-base-ui
-        postmarketos-base-ui-x11
+        bash
+	elogind
 	networkmanager
 	networkmanager-cli
-	networkmanager-openrc
 	networkmanager-elogind
+	networkmanager-openrc
 	networkmanager-tui
 	networkmanager-wifi
 	networkmanager-wwan
+        network-manager-applet
+	polkit-elogind
 	postmarketos-base-ui
+        awesome
+        dnsmasq
+        gnome-console
+        lightdm
+        lightdm-gtk-greeter
+        onboard
+        postmarketos-base-ui
+        postmarketos-base-ui-x11
         pulseaudio
+        xf86-input-evdev
         xinput
         xorg-server
-        gnome-console
-        awesome"
+        xrandr
+        "
 makedepends=""
 checkdepends=""
-install=""
+install="$pkgname.post-install $pkgname.post-upgrade"
 subpackages=""
 options="!check"
 source="
        awesome-mobile.sh
        awesome-mobile.desktop
        65-lightdm-keyboard.conf
+       gtk-settings.ini
        awesome-mobile.tar.gz::https://git.shadowkat.net/izaya/awesome-mobile/archive/master.tar.gz
        awesome-longpress.tar.gz::https://git.shadowkat.net/izaya/awesome-longpress/archive/master.tar.gz
        awesome-navbar.tar.gz::https://git.shadowkat.net/izaya/awesome-navbar/archive/master.tar.gz
        awesome-launcherpopup.tar.gz::https://git.shadowkat.net/izaya/awesome-launcherpopup/archive/master.tar.gz
        awesome-switcherpopup.tar.gz::https://git.shadowkat.net/izaya/awesome-switcherpopup/archive/master.tar.gz
        awesome-powermenu.tar.gz::https://git.shadowkat.net/izaya/awesome-powermenu/archive/master.tar.gz
+       vkbd.tar.gz::https://codeberg.org/izaya/vkbd/archive/main.tar.gz
        "
 builddir="$srcdir/"
 
@@ -55,14 +63,18 @@ package () {
         cp -a "$srcdir/awesome-launcherpopup" "$pkgdir/usr/share/awesome-mobile/awesome-launcherpopup"
         cp -a "$srcdir/awesome-switcherpopup" "$pkgdir/usr/share/awesome-mobile/awesome-switcherpopup"
         cp -a "$srcdir/awesome-powermenu" "$pkgdir/usr/share/awesome-mobile/awesome-powermenu"
+        cp -a "$srcdir/vkbd" "$pkgdir/usr/share/awesome-mobile/vkbd"
         echo "$srcdir/awesome-mobile.desktop" "$pkgdir/usr/share/xsessions/awesome-mobile.desktop"
         install -Dm644 "$srcdir/awesome-mobile.desktop" "$pkgdir/usr/share/xsessions/awesome-mobile.desktop"
         install -Dm644 "$srcdir/65-lightdm-keyboard.conf" "$pkgdir/etc/lightdm/lightdm-gtk-greeter.conf.d/65-lightdm-keyboard.conf"
+        install -Dm644 "$srcdir/gtk-settings.ini" "$pkgdir/etc/skel/.config/gtk-3.0/settings.ini"
+        install -Dm644 "$srcdir/gtk-settings.ini" "$pkgdir/etc/skel/.config/gtk-4.0/settings.ini"
         install -Dm755 "$srcdir/awesome-mobile.sh" "$pkgdir/usr/bin/awesome-mobile.sh"
         find "$pkgdir/usr/share/awesome-mobile" -name README.md -delete
         find "$pkgdir/usr/share/awesome-mobile" -name LICENSE -delete
         find "$pkgdir/usr/share/awesome-mobile" -type f -exec chmod 644 -- {} +
         find "$pkgdir/usr/share/awesome-mobile" -type d -exec chmod 755 -- {} +
+        chmod 755 "$pkgdir/usr/share/awesome-mobile/awesome-powermenu/rotate.lua"
 }
 
 sha512sums="
@@ -75,4 +87,5 @@ ecce7ec21e6fea5e42ea4b40baffe875a5610207b33665502bd3da423173e034e91a198e0ae86e1f
 b455c371d7d9061422491530ab6634e92e4d4599837dcde4eb8ce6f9832dd7c827279c41d891bf6124f3aaf4ee87f5d872ba70c631442139756f17a05120ce2e  awesome-launcherpopup.tar.gz
 21e870c7d2df4d4643720502536a81624a0bc2e8481d86fcff31526cbe744d3cdb8d00d35a16a747845059f2d327123523901bc9e8d75ccd365b2ff79fc18aeb  awesome-switcherpopup.tar.gz
 a038b93beb5d1a081507408a5af5f8f2500cf2ca081bce9e725fd5c75c50179b38ca5b4139ea21803a410251472bbeaf68c7dd5842cdf75fd29f75aac55d3790  awesome-powermenu.tar.gz
+8813fca635a55a37b3c4496ebfc0cfc7b5b660b17707e6c754e88f3ee0937e27433a4e50ee040214b088be41c3b71f2ca0dce183ee0069754772fe73f6563003  vkbd.tar.gz
 "
diff --git a/awesome-mobile.sh b/awesome-mobile.sh
index 3bf4bb1..51668a8 100755
--- a/awesome-mobile.sh
+++ b/awesome-mobile.sh
@@ -1,6 +1,17 @@
 #!/bin/sh
 # This script will check for a user configuration file, and if it exists, run
 # awesome-mobile from there. Otherwise, it runs from /usr/share.
+
+# But first, make sure kgx has a sane font, because otherwise it'll just
+# stretch your proportional font
+cfont="$(gsettings get org.gnome.desktop.interface monospace-font-name | sed -E 's/ [0-9]+//' | sed -E "s/'//g")"
+if [[  "$(fc-list)" != *"$cfont"* ]]; then
+	gsettings set org.gnome.desktop.interface monospace-font-name 'monospace 10'
+fi
+
+# Set GDK_SCALE=2, for nicer touchscreen usage.
+export GDK_SCALE=2
+
 if [ -f ~/.config/awesome-mobile/rc.lua ]; then
  awesome --search ~/.config/awesome-mobile/ --search /usr/share/awesome-mobile/ -c ~/.config/awesome-mobile/rc.lua
 else
diff --git a/gtk-settings.ini b/gtk-settings.ini
new file mode 100644
index 0000000..b64ed13
--- /dev/null
+++ b/gtk-settings.ini
@@ -0,0 +1,2 @@
+[Settings]
+gtk-decoration-layout=appmenu
diff --git a/postmarketos-ui-awesome-mobile.post-install b/postmarketos-ui-awesome-mobile.post-install
new file mode 100644
index 0000000..2c1eedc
--- /dev/null
+++ b/postmarketos-ui-awesome-mobile.post-install
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/65-autologin.conf
+
+rc-update add lightdm default
+rc-update add networkmanager default
diff --git a/postmarketos-ui-awesome-mobile.post-upgrade b/postmarketos-ui-awesome-mobile.post-upgrade
new file mode 120000
index 0000000..df56527
--- /dev/null
+++ b/postmarketos-ui-awesome-mobile.post-upgrade
@@ -0,0 +1 @@
+postmarketos-ui-awesome-mobile.post-install
\ No newline at end of file