248 files changed, 11680 insertions, 8897 deletions

diff --git a/.builds/alpine.yml b/.builds/alpine.yml
index dc5e7c11..59df7737 100644
--- a/.builds/alpine.yml
+++ b/.builds/alpine.yml
@@ -4,22 +4,27 @@ packages:
   - eudev-dev
   - gdk-pixbuf-dev
   - json-c-dev
+  - libdisplay-info-dev
   - libevdev-dev
   - libinput-dev
+  - libseat-dev
   - libxcb-dev
   - libxkbcommon-dev
   - mesa-dev
   - meson
   - pango-dev
+  - pcre2-dev
   - pixman-dev
   - scdoc
   - wayland-dev
   - wayland-protocols
   - xcb-util-image-dev
-  - xorg-server-xwayland
+  - xcb-util-wm-dev
+  - xwayland-dev
+  - hwdata-dev
 sources:
   - https://github.com/swaywm/sway
-  - https://github.com/swaywm/wlroots
+  - https://gitlab.freedesktop.org/wlroots/wlroots.git
 tasks:
   - wlroots: |
       cd wlroots
@@ -28,7 +33,7 @@ tasks:
       sudo ninja -C build install
   - setup: |
       cd sway
-      meson build -Dauto_features=enabled -Dtray=disabled
+      meson build --fatal-meson-warnings -Dauto_features=enabled -Dtray=disabled
   - build: |
       cd sway
       ninja -C build
@@ -36,3 +41,10 @@ tasks:
       cd sway
       meson configure build -Dxwayland=disabled
       ninja -C build
+  - build-static: |
+      cd sway
+      mkdir subprojects
+      ln -s ../../wlroots subprojects/wlroots
+      rm -rf build
+      meson build --fatal-meson-warnings --default-library=static --force-fallback-for=wlroots
+      ninja -C build
diff --git a/.builds/archlinux.yml b/.builds/archlinux.yml
index c0f70186..9972c01a 100644
--- a/.builds/archlinux.yml
+++ b/.builds/archlinux.yml
@@ -3,20 +3,25 @@ packages:
   - cairo
   - gdk-pixbuf2
   - json-c
+  - libdisplay-info
   - libegl
   - libinput
   - libxcb
   - libxkbcommon
   - meson
   - pango
+  - pcre2
   - scdoc
   - wayland
   - wayland-protocols
   - xcb-util-image
+  - xcb-util-wm
   - xorg-xwayland
+  - seatd
+  - hwdata
 sources:
   - https://github.com/swaywm/sway
-  - https://github.com/swaywm/wlroots
+  - https://gitlab.freedesktop.org/wlroots/wlroots.git
 tasks:
   - wlroots: |
       cd wlroots
@@ -25,7 +30,7 @@ tasks:
       sudo ninja -C build install
   - setup: |
       cd sway
-      meson build -Dauto_features=enabled -Dsd-bus-provider=libsystemd
+      meson build --fatal-meson-warnings -Dauto_features=enabled -Dsd-bus-provider=libsystemd
   - build: |
       cd sway
       ninja -C build
diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml
index 273badbc..29c6312a 100644
--- a/.builds/freebsd.yml
+++ b/.builds/freebsd.yml
@@ -4,6 +4,7 @@ packages:
 - devel/json-c
 - devel/libevdev
 - devel/meson
+- devel/pcre2
 - devel/pkgconf
 - graphics/cairo
 - graphics/gdk-pixbuf2
@@ -19,13 +20,17 @@ packages:
 - devel/libudev-devd
 - graphics/libdrm
 - graphics/mesa-libs
+- sysutils/libdisplay-info
+- sysutils/seatd
 - x11/libinput
 - x11/libX11
 - x11/pixman
 - x11/xcb-util-wm
+- x11-servers/xwayland-devel
+- misc/hwdata
 sources:
 - https://github.com/swaywm/sway
-- https://github.com/swaywm/wlroots
+- https://gitlab.freedesktop.org/wlroots/wlroots.git
 tasks:
 - setup: |
     cd sway
@@ -33,7 +38,7 @@ tasks:
     cd subprojects
     ln -s ../../wlroots wlroots
     cd ..
-    meson build -Dtray=enabled -Dsd-bus-provider=basu
+    meson build --fatal-meson-warnings -Dtray=enabled -Dsd-bus-provider=basu
 - build: |
     cd sway
     ninja -C build
diff --git a/.clang-format b/.clang-format
deleted file mode 100644
index 5818da3c..00000000
--- a/.clang-format
+++ /dev/null
@@ -1,16 +0,0 @@
-BasedOnStyle: LLVM
-IndentWidth: 4
-TabWidth: 4
-UseTab: Always
-BreakBeforeBraces: Attach
-AllowShortIfStatementsOnASingleLine: false
-IndentCaseLabels: false
-SortIncludes: false
-ColumnLimit: 80
-AlignAfterOpenBracket: DontAlign
-BinPackParameters: false
-BinPackArguments: false
-ContinuationIndentWidth: 8
-AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortLoopsOnASingleLine: true
-ReflowComments: false
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 156accde..eba606e6 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -6,10 +6,9 @@ labels: 'bug'
 ---
 
 ### Please read the following before submitting:
-- Please do NOT submit bug reports for questions. Ask questions on IRC at #sway on irc.freenode.net.
+- Please do NOT submit bug reports for questions. Ask questions on IRC at #sway on Libera Chat.
 - Proprietary graphics drivers, including nvidia, are not supported. Please use the open source equivalents, such as nouveau, if you would like to use Sway.
-- Problems with the Wayland version of Firefox are likely to be Firefox bugs. Start by submitting your issue to the Firefox Bugzilla and come back here only after they confirm otherwise.
-- Please do NOT submit issues for information from the github wiki. The github wiki is community maintained and therefore may contain outdated information, scripts that don't work or osbolete workarounds.
+- Please do NOT submit issues for information from the github wiki. The github wiki is community maintained and therefore may contain outdated information, scripts that don't work or obsolete workarounds.
   If you fix a script or find outdated information, don't hesitate to adjust the wiki page.
 
 ### Please fill out the following:
@@ -19,6 +18,7 @@ labels: 'bug'
 - **Debug Log:**
   - Run `sway -d 2> ~/sway.log` from a TTY and upload it to a pastebin, such as gist.github.com.
   - This will record information about sway's activity. Please try to keep the reproduction as brief as possible and exit sway.
+  - Attach the **full** file, do not truncate it.
 
 - **Configuration File:**
   - Please try to produce with the default configuration.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index f09cdf5b..0092609b 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
   - name: Questions
-    url: "http://webchat.freenode.net/?channels=sway&uio=d4"
-    about: "Please ask questions on IRC in #sway on irc.freenode.net"
+    url: "https://libera.chat"
+    about: "Please ask questions on IRC in #sway on Libera Chat"
diff --git a/.gitignore b/.gitignore
index 1ec0cb52..167960e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ bin/
 test/
 build/
 build-*/
+.cache/
 .lvimrc
 config-debug
 wayland-*-protocol.*
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..35ee25b0
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+Ronan Pigott <ronan@rjp.ie> <rpigott@berkeley.edu>
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c17afdda..4f043f7a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,9 +1,8 @@
 # Contributing to sway
 
 Contributing just involves sending a pull request. You will probably be more
-successful with your contribution if you visit
-[#sway-devel](https://webchat.freenode.net/?channels=sway-devel) on
-irc.freenode.net upfront and discuss your plans.
+successful with your contribution if you visit #sway-devel on Libera Chat
+upfront and discuss your plans.
 
 Note: rules are made to be broken. Adjust or ignore any/all of these as you see
 fit, but be prepared to justify it to your peers.
diff --git a/README.ar.md b/README.ar.md
new file mode 100644
index 00000000..4f9bf828
--- /dev/null
+++ b/README.ar.md
@@ -0,0 +1,91 @@
+# sway
+
+sway 
+
+هو مدير للمجموعات المركبة لـ[Wayland] متوا�ق مع [i3] -
+
+إقرأ [الأسئلة الشائعة](https://github.com/swaywm/sway/wiki)
+
+ انضم الى [قناة IRC](https://web.libera.chat/gamja/?channels=#sway)
+
+
+## تواقيع الإصدار
+ تٌوقع الإصدارات بـواسطة [E88F5E48] و ت�نشر على [GitHub](https://github.com/swaywm/sway/releases)
+
+## التثبيت
+
+### بإستخدام الحزم
+
+يتو�ر Sway للعديد من التوزيعات، حاول تثبيت حزمة "sway" لتوزيعتك
+### التجميع من المصدر
+إطلع على [ص�حة الويكي هذه](https://github.com/swaywm/sway/wiki/Development-Setup) إذا أردت بناء الـHEAD من sway و wlroots لأغراض ال�حص والتطوير 
+
+تثبيت اللوازم: 
+* meson \*
+* [wlroots]
+* wayland
+* wayland-protocols \*
+* pcre2
+* json-c
+* pango
+* cairo
+* gdk-pixbuf2 (optional: system tray)
+* [scdoc] (optional: man pages) \*
+* git (optional: version info) \*
+
+_\* Compile-time dep_
+
+ن�ذ هذه الأوامر:
+
+    meson build/
+    ninja -C build/
+    sudo ninja -C build/ install
+
+## الإعدادات
+
+إذا كنت بال�عل تستخدم i3، �عليك نسخ إعدادات i3 لديك إلى  `~/.config/sway/config` وسو� تعمل تلقائياً.
+
+و إلا عليك نسخ مل� الإعدادات النموذج إلى `config/sway/config` الموجود عادةً �ي `/etc/sway/config.` 
+
+
+## التشغيل
+
+شغل `sway` بإستخدام أمر TTY. 
+قد يعمل بعض مدراء العرض مع أنهم غير مدعومون من sway 
+(gdm مثلاً يعمل بشكل جيد إلى حد ما)
+
+[en]: https://github.com/swaywm/sway#readme
+[ar]: README.ar.md
+[cs]: README.cs.md
+[de]: README.de.md
+[dk]: README.dk.md
+[es]: README.es.md
+[fr]: README.fr.md
+[ge]: README.ge.md
+[gr]: README.gr.md
+[hi]: README.hi.md
+[hu]: README.hu.md
+[ir]: README.ir.md
+[it]: README.it.md
+[ja]: README.ja.md
+[ko]: README.ko.md
+[nl]: README.nl.md
+[no]: README.no.md
+[pl]: README.pl.md
+[pt]: README.pt.md
+[ro]: README.ro.md
+[ru]: README.ru.md
+[sv]: README.sv.md
+[tr]: README.tr.md
+[uk]: README.uk.md
+[zh-CN]: README.zh-CN.md
+[zh-TW]: README.zh-TW.md
+[i3]: https://i3wm.org/
+[Wayland]: http://wayland.freedesktop.org/
+[FAQ]: https://github.com/swaywm/sway/wiki
+[IRC channel]: https://web.libera.chat/gamja/?channels=#sway
+[E88F5E48]: https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48
+[GitHub releases]: https://github.com/swaywm/sway/releases
+[Development setup]: https://github.com/swaywm/sway/wiki/Development-Setup
+[wlroots]: https://gitlab.freedesktop.org/wlroots/wlroots
+[scdoc]: https://git.sr.ht/~sircmpwn/scdoc
diff --git a/README.cs.md b/README.cs.md
new file mode 100644
index 00000000..41efba54
--- /dev/null
+++ b/README.cs.md
@@ -0,0 +1,89 @@
+# sway
+
+[English][en] - **[Česky][cs]** - [Deutsch][de] - [Dansk][dk] - [Español][es] - [Français][fr] - [Svenska][sv] - [Ελληνικά][gr] - [हिन�दी][hi] - [Magyar][hu] - [�ارسی][ir] - [Italiano][it] - [日本語][ja] - [한국어][ko] - [Nederlands][nl] - [Polski][pl] - [Português][pt] - [Română][ro] - [Ру��кий][ru] - [Türkçe][tr] - [Україн�ька][uk] - [中文-简体][zh-CN] - [中文-�體][zh-TW]
+
+sway je s [i3] kompatibilní [Wayland] kompozitor. Pře�těte si [FAQ]. Připojte se na
+[IRC kanál][IRC channel] \(#sway na irc.libera.chat).
+
+## Podpisy vydání
+
+Vydání jsou podepsána [E88F5E48] a publikována [na GitHubu][GitHub releases].
+
+## Instalace
+
+### Z balí�ků
+
+Sway je dostupný ve spoustě distribucí. Zkuste nainstalovat balí�ek "sway" ve vaší
+distribuci.
+
+### Kompilace ze zdrojových kódů
+
+Podívejte se na [tuto stránku wiki][Development setup], pokud chcete sestavit HEAD
+sway a wlroots pro testování nebo vývoj.
+
+Nainstalujte závislosti:
+
+* meson \*
+* [wlroots]
+* wayland
+* wayland-protocols \*
+* pcre2
+* json-c
+* pango
+* cairo
+* gdk-pixbuf2 (volitelné: oznamovací oblast)
+* [scdoc] (volitelné: manuálové stránky) \*
+* git (volitelné: informace o verzi) \*
+
+_\* Závislost pouze pro sestavení_
+
+Spusťte tyto příkazy:
+
+    meson build/
+    ninja -C build/
+    sudo ninja -C build/ install
+
+## Konfigurace
+
+Pokud již používáte i3, zkopírujte svou konfiguraci i3 do `~/.config/sway/config`
+a ta bude ihned fungovat. Jinak zkopírujte do `~/.config/sway/config` ukázkový
+konfigura�ní soubor. Ten se obvykle nachází v `/etc/sway/config`.
+Pro více informací o konfiguraci spusťte `man 5 sway`.
+
+## Spuštění
+
+Spusťte `sway` z TTY. Některé správce zobrazení mohou fungovat, ale nejsou
+podporovány sway (je známo, že gdm funguje docela dobře).
+
+[en]: https://github.com/swaywm/sway#readme
+[cs]: README.cs.md
+[de]: README.de.md
+[dk]: README.dk.md
+[es]: README.es.md
+[fr]: README.fr.md
+[sv]: README.sv.md
+[gr]: README.gr.md
+[hi]: README.hi.md
+[hu]: README.hu.md
+[ir]: README.ir.md
+[it]: README.it.md
+[ja]: README.ja.md
+[ko]: README.ko.md
+[nl]: README.nl.md
+[pl]: README.pl.md
+[pt]: README.pt.md
+[ro]: README.ro.md
+[ru]: README.ru.md
+[tr]: README.tr.md
+[uk]: README.uk.md
+[zh-CN]: README.zh-CN.md
+[zh-TW]: README.zh-TW.md
+[i3]: https://i3wm.org/
+[Wayland]: http://wayland.freedesktop.org/
+[FAQ]: https://github.com/swaywm/sway/wiki
+[IRC channel]: https://web.libera.chat/gamja/?channels=#sway
+[E88F5E48]: https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48
+[GitHub releases]: https://github.com/swaywm/sway/releases
+[Development setup]: https://github.com/swaywm/sway/wiki/Development-Setup
+[wlroots]: https://gitlab.freedesktop.org/wlroots/wlroots
+[scdoc]: https://git.sr.ht/~sircmpwn/scdoc
diff --git a/README.de.md b/README.de.md
index 24e66a60..68b411d9 100644
--- a/README.de.md
+++ b/README.de.md
@@ -1,30 +1,30 @@
 # Sway
-Sway ist ein [i3](https://i3wm.org/)-kompatibler [Wayland](http://wayland.freedesktop.org/)-Compositor. Lies die [FAQ](https://github.com/swaywm/sway/wiki). Tritt dem [IRC Channel](http://webchat.freenode.net/?channels=sway&uio=d4) bei (#sway on irc.freenode.net; Englisch).
+Sway ist ein [i3](https://i3wm.org/)-kompatibler [Wayland](http://wayland.freedesktop.org/)-Compositor. Lies die [FAQ](https://github.com/swaywm/sway/wiki). Tritt dem [IRC Channel](https://web.libera.chat/gamja/?channels=#sway) bei (#sway on irc.libera.chat; Englisch).
 
 ## Signaturen
-Jedes Release wird mit dem PGP-Schlüssel [B22DA89A](http://pgp.mit.edu/pks/lookup?op=vindex&search=0x52CB6609B22DA89A) signiert und auf GitHub veröffentlicht.
+Jedes Release wird mit dem PGP-Schlüssel [E88F5E48](https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48) signiert und [auf GitHub](https://github.com/swaywm/sway/releases) veröffentlicht.
 
 ## Installation
-### Mit der Paketverwaltung
-Sway kann in vielen Distributionen direkt durch die Paketverwaltung installiert werden. Das Paket sollte "sway" heißen. Falls es kein solches Paket gibt, kannst du im [Wiki](https://github.com/swaywm/sway/wiki/Unsupported-packages) (englisch) nach mehr Informationen bezüglich deiner Distribution suchen.
 
-Falls du sway für deine eigene Distribution als Paket bereitstellen möchtest, solltest du die Entwickler per IRC oder E-Mail (sir@cmpwn.com) kontaktieren.
+### Ãœber die Paketverwaltung
+
+Sway kann in vielen Distributionen direkt durch die Paketverwaltung installiert werden. Versuche einfach das Packet "sway" zu installieren.
 
 ### Quellcode selbst kompilieren
 
 sway benötigt die folgenden Pakete:
 
 * meson\*
-* [wlroots](https://github.com/swaywm/wlroots)
+* [wlroots](https://gitlab.freedesktop.org/wlroots/wlroots)
 * wayland
 * wayland-protocols\*
-* pcre
+* pcre2
 * json-c
 * pango
 * cairo
 * gdk-pixbuf2 (Optional, wird für das Benachrichtigungsfeld (System Tray) benötigt)
-* [scdoc](https://git.sr.ht/~sircmpwn/scdoc)\* (Optional, wird für die Dokumentation (Man Pages) benötigt)
-* git\*
+* [scdoc](https://git.sr.ht/~sircmpwn/scdoc) (Optional, wird für die Dokumentation (Man Pages) benötigt)\*
+* git (Optional: Versionsinfo)\*
 
 _\*Werden nur während des Kompilierens benötigt_
 
@@ -34,12 +34,6 @@ Führe die folgenden Befehle aus:
     ninja -C build
     sudo ninja -C build install
 
-Falls dein System nicht logind benutzt, musst du sway noch die passenden Berechtigungen geben:
-
-    sudo chmod a+s /usr/local/bin/sway
-
-Sway läuft nur in der Startphase mit Root-Rechten.
-
 ## Konfiguration
 
 Falls du von i3 migrierst, kannst du deine Konfigurationsdatei nach `~/.config/sway/config` kopieren und die Einstellungen sollten ohne Weiteres funktionieren. Ansonsten kannst du die Beispielkonfiguration, die normalerweise in `/etc/sway/config` liegt, nach `~/.config/sway/config` kopieren. Die Dokumentation zur Konfigurationsdatei findest du in `man 5 sway`.
diff --git a/README.dk.md b/README.dk.md
index 535000c3..5ce94cde 100644
--- a/README.dk.md
+++ b/README.dk.md
@@ -1,41 +1,43 @@
 # Sway
 
-Sway er en [i3](https://i3wm.org/)-kompatibel [Wayland](http://wayland.freedesktop.org/) compositor.
-Læs [Ofte stillede spørgsmål](https://github.com/swaywm/sway/wiki).
-Deltag på [IRC kanalen](http://webchat.freenode.net/?channels=sway&uio=d4) (#sway på irc.freenode.net).
+Sway er en [i3]-kompatibel [Wayland] compositor. Læs [Ofte stillede spørgsmål].
+Deltag på [IRC kanalen][IRC kanal] \(#sway på irc.libera.chat).
 
 ## Udgivelses Signaturer
 
-Udgivelser er signeret med [B22DA89A](http://pgp.mit.edu/pks/lookup?op=vindex&search=0x52CB6609B22DA89A)
-og publiseret på [GitHub](https://github.com/swaywm/sway/releases).
+Udgivelser er signeret med [E88F5E48] og publiceret [på GitHub][GitHub
+releases].
 
 ## Installation
 
-### Fra Pakker
+### Fra pakker
 
-Sway er tilgængelig i mange distributioner. Prøv at installere pakken "svay". Hvis den ikke er tilgængelig, så tjek [denne wiki-side](https://github.com/swaywm/sway/wiki/Unsupported-packages)
-for information om installation til din(e) distribution(er).
+Sway er tilgængelig i mange distributioner. Prøv at installere "sway" pakken
+fra din.
 
-Hvis du er interesseret i at lave en Sway pakke til din distribution, burde du besøge IRC
-kanalen eller sende en e-mail til sir@cmpwn.com for rådgivning.
+Hvis du er interesseret i at pakke Sway til din distribution, kan du tage forbi
+IRC kanalen eller sende en email til sir@cmpwn.com for rådgivning.
 
 ### Kompilering fra kildekode
 
-Installation afhænger af følgende programmer:
+Se [denne wiki-side][Opsætning til udvikling] hvis du vil bygge HEAD af sway og
+wlroots til test eller udvikling.
+
+Installationsafhængigheder:
 
 * meson \*
-* [wlroots](https://github.com/swaywm/wlroots)
+* [wlroots]
 * wayland
 * wayland-protocols \*
-* pcre
+* pcre2
 * json-c
 * pango
 * cairo
-* gdk-pixbuf2 (valgfrit tillæg: system tray)
-* [scdoc](https://git.sr.ht/~sircmpwn/scdoc) (valgfrit tillæg: man pages) \*
+* gdk-pixbuf2 (valgfrit: system tray)
+* [scdoc] (valgfrit: man pages) \*
 * git \*
 
-_\*Kompiler krav_
+_\*Kompileringsafhængighed_
 
 Kør følgende kommandoer:
 
@@ -43,21 +45,24 @@ Kør følgende kommandoer:
     ninja -C build
     sudo ninja -C build install
 
-På systemer uden 'logind', behøver du at sætte ejerens bruger-id for Sways eksekverbare filer - såkaldt SUID (Set owner User ID):
-
-    sudo chmod a+s /usr/local/bin/sway
-
-Sway vil frasige sig 'root' tilladelser kort efter opstart
-
 ## Konfiguration
 
-Hvis du allerede bruger i3, bør du kopiere din i3-konfiguration til `~/.config/sway/config` og
-det vil bare fungerer. Ellers skal du kopiere eksempel konfigurations filen til
-`~/.config/sway/config`. Den er normalt placeret i `/etc/sway/config`.
-Kør `man 5 sway` for at få oplysninger om konfigurationen.
-
-## Kører
-
-Kør `sway` fra en TTY. Nogle display managers fungerer muligvis, men understøttes ikke af
-Sway (gdm er kendt for at fungere temmelig godt).
-
+Hvis du allerede bruger i3 kan du bare kopiere din i3 konfiguration til
+`~/.config/sway/config`. Ellers skal du kopiere eksempelkonfigurationsfilen til
+`~/.config/sway/config`. Den er normalt placeret i `/etc/sway/config`.  Kør
+`man 5 sway` for at få oplysninger om konfigurationen.
+
+## Eksekvering
+
+Kør `sway` fra en TTY. Nogle display managers kan fungere, men Sway yder ikke
+support til dem (gdm er kendt for at fungere temmelig godt).
+
+[i3]: https://i3wm.org/
+[Wayland]: http://wayland.freedesktop.org/
+[Ofte stillede spørgsmål]: https://github.com/swaywm/sway/wiki
+[IRC kanal]: https://web.libera.chat/gamja/?channels=#sway
+[E88F5E48]: https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48
+[GitHub releases]: https://github.com/swaywm/sway/releases
+[Opsætning til udvikling]: https://github.com/swaywm/sway/wiki/Development-Setup
+[wlroots]: https://gitlab.freedesktop.org/wlroots/wlroots
+[scdoc]: https://git.sr.ht/~sircmpwn/scdoc
diff --git a/README.es.md b/README.es.md
index 53f11f68..1f1657df 100644
--- a/README.es.md
+++ b/README.es.md
@@ -1,12 +1,12 @@
 # sway
 
 sway es un compositor de [Wayland](http://wayland.freedesktop.org/) compatible con [i3](https://i3wm.org/).
-Lea el [FAQ](https://github.com/swaywm/sway/wiki). Únase al [canal de IRC](http://webchat.freenode.net/?channels=sway&uio=d4) (#sway on
-irc.freenode.net).
+Lea el [FAQ](https://github.com/swaywm/sway/wiki). Únase al [canal de IRC](https://web.libera.chat/gamja/?channels=#sway) (#sway on
+irc.libera.chat).
 
 ## Firmas de las versiones
 
-Las distintas versiones están firmadas con [B22DA89A](http://pgp.mit.edu/pks/lookup?op=vindex&search=0x52CB6609B22DA89A)
+Las distintas versiones están firmadas con [E88F5E48](https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48)
 y publicadas [en GitHub](https://github.com/swaywm/sway/releases).
 
 ## Instalación
@@ -25,10 +25,10 @@ escriba un email a sir@cmpwn.com
 Instale las dependencias:
 
 * meson \*
-* [wlroots](https://github.com/swaywm/wlroots)
+* [wlroots](https://gitlab.freedesktop.org/wlroots/wlroots)
 * wayland
 * wayland-protocols \*
-* pcre
+* pcre2
 * json-c
 * pango
 * cairo
@@ -44,12 +44,6 @@ Desde su consola, ejecute las órdenes:
     ninja -C build
     sudo ninja -C build install
 
-En sistemas sin `logind`, necesitará cambiar los permisos del archivo compilado de sway:
-
-    sudo chmod a+s /usr/local/bin/sway
-
-Sway abandonará los permisos de super-usuario al poco de arrancar.
-
 ## Configuración
 
 Si ya utiliza i3, copie su archivo de configuración de i3 a `~/.config/sway/config` y
diff --git a/README.fr.md b/README.fr.md
index a72696d6..7752fc70 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -1,48 +1,49 @@
 # sway
 
-Sway est un compositeur [Wayland](http://wayland.freedesktop.org/) compatible
-avec [i3](https://i3wm.org/), **en cours de développement**.  Lisez la
-[FAQ](https://github.com/swaywm/sway/wiki). Rejoignez le [canal
-IRC](http://webchat.freenode.net/?channels=sway&uio=d4) (#sway sur
-irc.freenode.net).
+Sway est un compositeur [Wayland] compatible avec [i3]. Lisez la
+[FAQ]. Rejoignez le [canal IRC] (#sway sur irc.libera.chat).
 
 ## Aide en français
 
-[abdelq](//github.com/abdelq) fournit du support en français sur IRC et Github, dans le fuseau horaire UTC-4 (EST).
+[abdelq] fournit du support en français sur IRC et Github, dans le fuseau
+horaire UTC-4 (EST).
 
 ## Signatures de nouvelles versions
 
-Les nouvelles versions sont signées avec [B22DA89A](http://pgp.mit.edu/pks/lookup?op=vindex&search=0x52CB6609B22DA89A)
-et publiées [sur GitHub](https://github.com/swaywm/sway/releases).
+Les nouvelles versions sont signées avec [E88F5E48] et publiées
+[sur GitHub][versions GitHub].
 
 ## Installation
 
 ### À partir de paquets
 
-Sway est disponible sur plusieurs distributions. Essayez d'installer le paquet "sway" pour
-la vôtre. Si ce n'est pas disponible, consultez [cette page wiki](https://github.com/swaywm/sway/wiki/Unsupported-packages)
-pour de l'information sur l'installation pour vos distributions.
+Sway est disponible sur beaucoup de distributions. Essayez d'installer le
+paquet "sway" pour la vôtre.
 
-Si vous êtes intéressé à maintenir Sway pour votre distribution, passez par le canal
-IRC ou envoyez un e-mail à sir@cmpwn.com (en anglais seulement) pour des conseils.
+Si vous êtes intéressé à maintenir Sway pour votre distribution, passez sur le
+canal IRC ou envoyez un e-mail à sir@cmpwn.com (en anglais seulement) pour des
+conseils.
 
-### Compilation depuis la source
+### Compilation depuis les sources
+
+Consultez [cette page wiki][Configuration de développement] si vous souhaitez
+compiler la révision HEAD de sway et wlroots pour tester ou développer.
 
 Installez les dépendances :
 
 * meson \*
-* [wlroots](https://github.com/swaywm/wlroots)
+* [wlroots]
 * wayland
 * wayland-protocols \*
-* pcre
+* pcre2
 * json-c
 * pango
 * cairo
-* gdk-pixbuf2 (optionnel: system tray)
-* [scdoc](https://git.sr.ht/~sircmpwn/scdoc) (optionnel: requis pour les pages man) \*
-* git \*
+* gdk-pixbuf2 (optionnel : system tray)
+* [scdoc] (optionnel : requis pour les pages man) \*
+* git (optionnel : information de version) \*
 
-_\*Requis uniquement pour la compilation_
+_\* Requis uniquement pour la compilation_
 
 Exécutez ces commandes :
 
@@ -50,20 +51,27 @@ Exécutez ces commandes :
     ninja -C build
     sudo ninja -C build install
 
-Sur les systèmes sans logind, vous devez suid le binaire de sway :
-
-    sudo chmod a+s /usr/local/bin/sway
-
-Sway se débarassera des permissions *root* peu de temps après le démarrage.
-
 ## Configuration
 
-Si vous utilisez déjà i3, copiez votre configuration i3 à `~/.config/sway/config` et
-cela va fonctionner. Sinon, copiez l'exemple de fichier de configuration à
-`~/.config/sway/config`. Il se trouve généralement dans `/etc/sway/config`.
-Exécutez `man 5 sway` pour l'information sur la configuration.
+Si vous utilisez déjà i3, copiez votre configuration i3 vers
+`~/.config/sway/config` et sway fonctionnera directement. Sinon, copiez
+l'exemple de fichier de configuration vers `~/.config/sway/config`. Il se
+trouve généralement dans `/etc/sway/config`. Exécutez `man 5 sway` pour lire la
+documentation pour la configuration de sway.
 
 ## Exécution
 
-Exécutez `sway` à partir d'un TTY. Certains gestionnaires d'affichage peuvent fonctionner,
-mais ne sont pas supportés par Sway (gdm est réputé pour assez bien fonctionner).
+Exécutez `sway` à partir d'un TTY. Certains gestionnaires d'affichage peuvent
+fonctionner, mais ne sont pas supportés par Sway (gdm est réputé pour assez
+bien fonctionner).
+
+[Wayland]: http://wayland.freedesktop.org/
+[i3]: https://i3wm.org/
+[FAQ]: https://github.com/swaywm/sway/wiki
+[canal IRC]: https://web.libera.chat/gamja/?channels=#sway
+[abdelq]: https://github.com/abdelq
+[E88F5E48]: https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48
+[versions GitHub]: https://github.com/swaywm/sway/releases
+[Configuration de développement]: https://github.com/swaywm/sway/wiki/Development-Setup
+[wlroots]: https://gitlab.freedesktop.org/wlroots/wlroots
+[scdoc]: https://git.sr.ht/~sircmpwn/scdoc
diff --git a/README.ge.md b/README.ge.md
new file mode 100644
index 00000000..bb8b9a34
--- /dev/null
+++ b/README.ge.md
@@ -0,0 +1,61 @@
+# sway
+
+sway �რის [i3]-თ�ვსებ�დი [Wayland]-ის კ�მპ�ზიტ�რი. მეტი ინფ�რმ�ციისთვის იხილეთ 
+[FAQ]. დ�უკ�ვშირდით [IRC �რხს][IRC channel] \(#sway irc.libera.chat-ზე).
+
+## გ�მ�შვების ხელმ�წერები
+
+გ�მ�შვებები ხელმ�წერილი� [E88F5E48]-ით დ� გ�მ�ქვეყნებული� [GitHub-ზე][GitHub releases].
+
+## ინსტ�ლ�ცი�
+
+### რეპ�ზიტ�რიიდ�ნ
+
+Sway �რის ხელმის�წვდ�მი ბევრი დისტრიბუტ�ციისთვის. ც�დეთ "sway" პ�კეტის ინსტ�ლ�ცი� თქვენთვის.
+
+### კ�დის კ�მპილ�ცი�
+
+იხილეთ [ეს ვიკი გვერდი][Development setup] თუ გინდ�თ რ�მ ��წყ�თ sway დ� wlroots ს�ტესტ�დ �ნ დეველ�პმენტისთვის.
+
+დ��ინსტ�ლირეთ დ�მ�კიდებულებები:
+
+* meson \*
+* [wlroots]
+* wayland
+* wayland-protocols \*
+* pcre2
+* json-c
+* pango
+* cairo
+* gdk-pixbuf2 (�სევე �რჩევითი�: system tray)
+* [scdoc] (�სევე �რჩევითი�: man pages) \*
+* git (�სევე �რჩევითი�: version info) \*
+
+_\* Compile-time dep_
+
+გ�უშვით ეს ბრძ�ნებები:
+
+    meson build/
+    ninja -C build/
+    sudo ninja -C build/ install
+
+## კ�ნფიგურ�ცი�
+
+თუ უკვე იყენებთ i3-ს, მ�შინ დ��კ�პირე i3 კ�ნფიგურ�ცი� დ� ჩ�სვი `~/.config/sway/config` 
+დ� უპრ�ბლემ�დ იმუშ�ვებს პირდ�პირ. წინ��ღმდეგ შემთხვევ�ში კ�ნფიგურ�ციის ნიმუში ჩ��კ�პირეთ �ქ: `~/.config/sway/config`. კ�მპიგურ�ციის ნიმუში ხშირ შემთხვევ�ში �რის `/etc/sway/config`.
+გ�უშვი `man 5 sway` კ�ნპიგურ�ცი�ზე ინფ�რმ�ციის მის�ღებ�დ.
+
+## გ�შვებ�
+
+გ�უშვი `sway` TTY-ისთვის. ზ�გიერთმ� ლ�გინ მენეჯერმ� შეიძლებ� იმუშ�ვ�ს, მ�გრ�მ �რ
+�რის მხ�რდ�ჭერილი sway-სგ�ნ (რ�გ�რც წესი კ�რგ�დ მუშ��ბს gdm).
+
+[i3]: https://i3wm.org/
+[Wayland]: http://wayland.freedesktop.org/
+[FAQ]: https://github.com/swaywm/sway/wiki
+[IRC channel]: https://web.libera.chat/gamja/?channels=#sway
+[E88F5E48]: https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48
+[GitHub releases]: https://github.com/swaywm/sway/releases
+[Development setup]: https://github.com/swaywm/sway/wiki/Development-Setup
+[wlroots]: https://gitlab.freedesktop.org/wlroots/wlroots
+[scdoc]: https://git.sr.ht/~sircmpwn/scdoc
diff --git a/README.gr.md b/README.gr.md
new file mode 100644
index 00000000..d697f78e
--- /dev/null
+++ b/README.gr.md
@@ -0,0 +1,67 @@
+# Sway
+
+Το sway ένα [i3]-συμβατό [Wayland] compositor. Διαβάστε το [FAQ]. Μπείτε στο
+[IRC channel] \(#sway on irc.libera.chat).
+
+## Υπογ�αφές δημοσιε�σεων
+
+Οι εκδόσεις είναι υπογε�αμμένες με [E88F5E48] και δημοσιευμένες [στο GitHub][GitHub releases].
+
+## Εγκατάσταση
+
+### Από πακέτα
+
+Το Sway είναι διαθέσιμο σε πολλά distributions. Δοκιμάστε εγκαταστώντας το "sway" package για
+το δικό σας.
+
+Εάν ενδιαφέ�εστε για packaging του sway για το distribution σας, να πάτε στο IRC
+channel ή στείλτε ένα email στο sir@cmpwn.com για συμβουλές.
+
+### Compiling από πηγή
+
+Τσεκά�ετε [αυτό το wiki page][Development setup] εάμα θέλετε να κάνετε build το HEAD του
+sway και wlroots γιά τεστά�ισμα ή development.
+
+Εγκατάσταση των dependencies:
+
+* meson \*
+* [wlroots]
+* wayland
+* wayland-protocols \*
+* pcre2
+* json-c
+* pango
+* cairo
+* gdk-pixbuf2 (π�οαι�ετικό: system tray)
+* [scdoc] (π�οαι�ετικό: man pages) \*
+* git (π�οαι�ετικό: πλη�οφο�ίες εκδώσεων) \*
+
+_\*Compile-time dep_
+
+Τ�έξτε αυτά τα commands:
+
+    meson build/
+    ninja -C build/
+    sudo ninja -C build/ install
+
+## Configuration
+
+Εάν ήδη χ�ησιμοποιήτε το i3, αντιγ�άψτε το i3 config σας στο `~/.config/sway/config` και
+θα δουλέψει out of the box. Αλλιώς, αντιγ�άψτε το sample configuration α�χείο στο
+`~/.config/sway/config`. Το οποίο συνήθως β�ίσκεται στο `/etc/sway/config`.
+Κάντε run `man 5 sway` για πλη�οφο�ίες το� configuration.
+
+## Τ�έχοντας
+
+Τ�έξτε `sway` από ένα TTY. Με�ίκα display managers μπο�εί να δουλέψουν αλλά δέν είναι συμβατά με
+το sway (το gdm γνω�ίζεται να δουλέβει σχετικά καλά).
+
+[i3]: https://i3wm.org/
+[Wayland]: http://wayland.freedesktop.org/
+[FAQ]: https://github.com/swaywm/sway/wiki
+[IRC channel]: https://web.libera.chat/gamja/?channels=#sway
+[E88F5E48]: https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48
+[GitHub releases]: https://github.com/swaywm/sway/releases
+[Development setup]: https://github.com/swaywm/sway/wiki/Development-Setup
+[wlroots]: https://gitlab.freedesktop.org/wlroots/wlroots
+[scdoc]: https://git.sr.ht/~sircmpwn/scdoc
\ No newline at end of file
diff --git a/README.hi.md b/README.hi.md
new file mode 100644
index 00000000..eae5e90a
--- /dev/null
+++ b/README.hi.md
@@ -0,0 +1,63 @@
+# sway
+
+sway �क [i3](https://i3wm.org/)-अन�कूल
+[Wayland](https://wayland.freedesktop.org/) Compositor है।
+[FAQ](https://github.com/swaywm/sway/wiki) पढिये। [IRC
+Channel](https://web.libera.chat/gamja/?channels=#sway)
+(irc.libera.chat पर #sway) में भी ज�डिये।
+
+## रिलीज हस�ताक�षर
+
+रिलीजें
+[E88F5E48](https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48)
+से साइन होतें हैं और [Github पर](https://github.com/swaywm/sway/releases) प�रकाशित होते हैं।
+
+## इंस�टौलेशन
+
+### पैकेजों के द�वारा
+
+Sway कई distributions में उप�लब�ध है। आप अपने में "sway" नामक पैकेज इंस�टौल करके देख
+सकते हैं।
+
+### Source से compile करके
+
+यदि आप परीक�षण और विकास के लि� sway और wlroots के नवीनतम संस�करण बनाना
+चाहते हैं, तो [यह विकी
+पृष�ठ](https://github.com/swaywm/sway/wiki/Development-Setup) देखें।
+
+निर�भरता�ं:
+
+* meson \*
+* [wlroots](https://gitlab.freedesktop.org/wlroots/wlroots)
+* wayland
+* wayland-protocols \*
+* pcre2
+* json-c
+* pango
+* cairo
+* gdk-pixbuf (वैकल�पिक: system tray के लिये)
+* [scdoc](https://git.sr.ht/~sircmpwn/scdoc) (वैकल�पिक: man पृष�ठों के लिये)
+  \*
+* git (वैकल�पिक: संस�करण जानने के लिये)
+
+_\* Compilation के समय आवश�यक_
+
+ये commands चला�ं:
+
+        meson build/
+        ninja -C build/
+        sudo ninja -C build/ install
+
+## Configuration
+
+अगर आप पहले से ही i3 का उपयोग करते हैं तो अपने i3 config को
+`~/.config/sway/config` में copy कर लीजिये और वह बिना किसी परिवर�तन के काम
+करेगा। अन�यथा, नमूने configuration file को `~/.config/sway/config` में copy
+कर लीजिये। यह सामान�यतः `/etc/sway/config` में पाया जाता है। `man 5
+sway` से आप configuration के बारे में जानकारी प�राप�त कर सकते हैं।
+
+## चलाना
+
+आप �क tty से `sway` को चला सकते हैं। क�छ display managers काम करते हैं परन�त� ये
+sway के द�वारा समर�थित नहीं है (gdm के बारे में जाना गया है कि वह सही काम करता
+है)।
diff --git a/README.hu.md b/README.hu.md
new file mode 100644
index 00000000..82ca6785
--- /dev/null
+++ b/README.hu.md
@@ -0,0 +1,70 @@
+# sway
+
+A Sway egy [i3]-kompatibilis [Wayland] kompozitor. Olvasd el a [Gyarkan Ismételt Kérdéseket][FAQ]. Csatlakozz az [IRC csatornához][IRC channel] \(`#sway` az `irc.libera.chat`-en).
+
+## Csomag aláírások
+
+A kiadott csomagok az [E88F5E48] kulccsal vannak aláírva és [GitHub-on][GitHub releases] publikálva.
+
+## Telepítés
+
+### Csomagból
+
+A Sway sok disztribúció csomagkezelőjéből elérhető, próbáld meg a "sway"
+csomagot telepíteni az általad használt eszközzel.
+
+Ha szeretnél csomagot készíteni a saját disztribúciódhoz, ugorj be az IRC
+csatornára, vagy küldj levelet a sir@cmpwn.com címre tanácsokért.
+
+### Fordítás forráskódból
+
+Olvasd el [ezt a wiki oldalt][Development setup], ha szeretnéd tesztelési vagy
+fejlesztési célokból lefordítani az aktuális (HEAD) állapotát a `sway`-nek és a
+`wlroots`-nak.
+
+Telepítsd a függőségeket:
+
+* meson \*
+* [wlroots]
+* wayland
+* wayland-protocols \*
+* pcre2
+* json-c
+* pango
+* cairo
+* gdk-pixbuf2 (opcionális: system tray)
+* [scdoc] (opcionális: man pages) \*
+* git (opcionális: version info) \*
+
+_\*Fordításidejű függőség_
+
+Futtasd ezeket a parancsokat:
+
+    meson build
+    ninja -C build
+    sudo ninja -C build install
+
+## Konfiguráció
+
+Ha előzőleg i3-mat használtál, akkor átmásolhatod az i3 beállításaidat a
+`~/.config/sway/config` file-ba és ugyanúgy működni fognak. Egyéb esetben másold
+le kiindulási alapnak a mintát, ami általában az `etc/sway/config` elérési
+útvonalon található.
+Futtasd a `man 5 sway` parancsot további információért a konfigurációval
+kapcsolatban.
+
+## Futtatás
+
+Futtasd a `sway` parancsot egy TTY felületről. Néhány bejelentkezéskezelő
+(display manager) működhet, de alapvetően nem támogatottak a sway által. (A
+gdm-ről ismeretes, hogy egész jól működik.)
+
+[i3]: https://i3wm.org/
+[Wayland]: http://wayland.freedesktop.org/
+[FAQ]: https://github.com/swaywm/sway/wiki
+[IRC channel]: https://web.libera.chat/gamja/?channels=#sway
+[E88F5E48]: https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48
+[GitHub releases]: https://github.com/swaywm/sway/releases
+[Development setup]: https://github.com/swaywm/sway/wiki/Development-Setup
+[wlroots]: https://gitlab.freedesktop.org/wlroots/wlroots
+[scdoc]: https://git.sr.ht/~sircmpwn/scdoc
diff --git a/README.ir.md b/README.ir.md
new file mode 100644
index 00000000..a485a405
--- /dev/null
+++ b/README.ir.md
@@ -0,0 +1,54 @@
+# sway
+
+&rlm;sway یک کامپوزیتور الهام گر�ته از [i3](https://i3wm.org/) بر روی [Wayland](http://wayland.freedesktop.org/) است. [سوال‌های متداول](https://github.com/swaywm/sway/wiki) را بخوانید. در [کانال
+IRC](http://web.libera.chat/gamja/?channels=sway&uio=d4) عضو شوید (&lrm;#sway&rlm; در
+irc.libera.chat).
+
+برای حمایت از تیم توسعه sway به [ص�حه
+Patreon با نام کاربری SirCmpwn](https://patreon.com/sircmpwn) مراجعه کنید.
+
+## امضای نسخه‌ها
+
+امضای نسخه‌ها با [B22DA89A](http://pgp.mit.edu/pks/lookup?op=vindex&search=0x52CB6609B22DA89A) در [GitHub](https://github.com/swaywm/sway/releases) منتشر می‌شود.
+
+## شیوه نصب
+
+### از بسته‌های رسمی
+
+&rlm;sway در بسته‌های رسمی توزیع‌های مختل� وجود دارد. بسته «sway» را نصب کنید. در صورتی که بسته رسمی وجود نداشت، برای آگاهی بیشتر درباره نصب روی توزیعتان به این [ص�حه راهنما](https://github.com/swaywm/sway/wiki/Unsupported-packages) مراجعه کنید.
+
+اگر به ایجاد بسته sway برای توزیعتان علاقه‌مند هستید، از کانال IRC است�اده کنید یا به sir@cmpwn.com ایمیل بزنید.
+
+### کامپایل کردن کد
+
+چنانچه می‌خواهید آخرین نسخه کد sway و wlroots را برای آزمایش یا توسعه بسازید به این [ص�حه راهنما](https://github.com/swaywm/sway/wiki/Development-Setup) مراجعه کنید.
+
+بسته‌های مورد نیاز:
+
+* meson \*
+* [wlroots](https://gitlab.freedesktop.org/wlroots/wlroots)
+* wayland
+* wayland-protocols \*
+* pcre2
+* json-c
+* pango
+* cairo
+* gdk-pixbuf2 (انتخابی: برای system tray)
+* [scdoc](https://git.sr.ht/~sircmpwn/scdoc) (انتخابی: برای ص�حه‌های راهنما) \*
+* git (انتخابی: برای اطلاع در خصوص نسخه‌ها) \*
+
+_\*نیازمندی‌های زمان کامپایل برنامه_
+
+این �رمان‌ها را اجرا کنید:
+
+    meson build
+    ninja -C build
+    sudo ninja -C build install
+
+### شخصی سازی و تنظیمات
+
+اگر در حال حاضر از i3 است�اده می‌کنید، تنظیمات i3 خودتان را در �ایل ‪`~/.config/sway/config`‬ کپی کنید و بدون نیاز به تغییر کار خواهد کرد. در غیر این‌صورت، �ایل نمونه تنظیمات را است�اده کنید. این �ایل عموما در ‪`/etc/sway/config`‬ قرار دارد. برای آگاهی بیشتر `man 5 sway` را اجرا کنید.
+
+## اجرا
+
+در محیط TTY کا�یست `sway` را اجرا کنید. ممکن است ابزارهای مدیریت نمایشگری نیز برای این کار وجود داشته باشند اما از طر� sway پشتیبانی نمی‌شوند (gdm عملکرد خوبی در این زمینه دارد).
diff --git a/README.it.md b/README.it.md
new file mode 100644
index 00000000..82bb5783
--- /dev/null
+++ b/README.it.md
@@ -0,0 +1,66 @@
+# sway
+
+sway è un compositore di [Wayland] compatibile con [i3]. Leggi le [FAQ].
+Unisciti al [canale di IRC] \(#sway su irc.libera.chat).
+
+## Firma delle versioni
+
+Le versioni sono firmate con la chiave [E88F5E48] e sono pubblicate
+[su GitHub][GitHub releases].
+
+## Installazione
+
+### Da un pacchetto
+
+Sway è disponibile in molte distribuzioni, prova a installare il pacchetto
+"sway" per la tua.
+
+### Compilazione dei sorgenti
+
+Consulta [questa pagina del wiki][Development setup] se vuoi compilare l'HEAD
+di sway e wlroots per testarli o contribuire allo sviluppo.
+
+Installa le dipendenze:
+
+* meson \*
+* [wlroots]
+* wayland
+* wayland-protocols \*
+* pcre
+* json-c
+* pango
+* cairo
+* gdk-pixbuf2 (opzionale: area di notifica)
+* [scdoc] (opzionale: pagine del manuale) \*
+* git (opzionale: informazioni sulla versione) \*
+
+_\* Dipendenza necessaria per la compilazione_
+
+Esegui questi comandi:
+
+    meson build/
+    ninja -C build/
+    sudo ninja -C build/ install
+
+## Configurazione
+
+Se hai già usato i3, copia il tuo file di configurazione in
+`~/.config/sway/config` e sway funzionerà immediatamente. Altrimenti, copia il
+file d'esempio in `~/.config/sway/config`, generalmente è situato in
+`/etc/sway/config`. Consulta `man 5 sway` per ulteriori informazioni sulla
+configurazione.
+
+## Esecuzione
+
+Lancia `sway` da un TTY. Alcuni gestori d'accesso potrebbero funzionare ma non
+sono supportati da sway (gdm funziona abbastanza bene).
+
+[i3]: https://i3wm.org/
+[Wayland]: http://wayland.freedesktop.org/
+[FAQ]: https://github.com/swaywm/sway/wiki
+[canale di IRC]: https://web.libera.chat/gamja/?channels=#sway
+[E88F5E48]: https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48
+[GitHub releases]: https://github.com/swaywm/sway/releases
+[Development setup]: https://github.com/swaywm/sway/wiki/Development-Setup
+[wlroots]: https://gitlab.freedesktop.org/wlroots/wlroots
+[scdoc]: https://git.sr.ht/~sircmpwn/scdoc
diff --git a/README.ja.md b/README.ja.md
index fa28f3da..4e9a9971 100644
--- a/README.ja.md
+++ b/README.ja.md
@@ -2,7 +2,7 @@
 
 Sway�[i3](https://i3wm.org/)互��[Wayland](http://wayland.freedesktop.org/)コン�ジタ��。
 [FAQ](https://github.com/swaywm/sway/wiki)も�����覧����。
-[IRC �ャン�ル](http://webchat.freenode.net/?channels=sway&uio=d4) (irc.freenode.net�#sway)も�り��。
+[IRC �ャン�ル](https://web.libera.chat/gamja/?channels=#sway) (irc.libera.chat�#sway)も�り��。
 
 [![](https://sr.ht/ICd5.png)](https://sr.ht/ICd5.png)
 
@@ -12,7 +12,7 @@ SirCmpwn��日本語��サ�ートをIRC�GitHub�行���。タイ
 
 ## リリース�署�
 
-Sway�リリース�[B22DA89A](http://pgp.mit.edu/pks/lookup?op=vindex&search=0x52CB6609B22DA89A)�署��れ�[GitHub](https://github.com/swaywm/sway/releases)�公開�れ����。
+Sway�リリース�[E88F5E48](https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48)�署��れ�[GitHub](https://github.com/swaywm/sway/releases)�公開�れ����。
 
 ## インストール
 
@@ -27,18 +27,18 @@ Sway�沢山�ディストリビューション��供�れ����。"
 次��存パッケージをインストール������:
 
 * meson \*
-* [wlroots](https://github.com/swaywm/wlroots)
+* [wlroots](https://gitlab.freedesktop.org/wlroots/wlroots)
 * wayland
 * wayland-protocols \*
-* pcre
+* pcre2
 * json-c
 * pango
 * cairo
-* gdk-pixbuf2 (システムイコン�必���)
-* [scdoc](https://git.sr.ht/~sircmpwn/scdoc) (man�必���) \*
-* git \*
+* gdk-pixbuf2 (任�: システムイコン�必���)
+* [scdoc](https://git.sr.ht/~sircmpwn/scdoc) (任�: man�必���) \*
+* git (任�: �ージョン情報�必���) \*
 
-_\*コンパイル�時_
+_\*コンパイル時��存_
 
 次�コマンドを実行������:
 
@@ -46,12 +46,6 @@ _\*コンパイル�時_
     ninja -C build
     sudo ninja -C build install
 
-logindを使用�����システム����イナリ�suidを設定�る必���り��:
-
-    sudo chmod a+s /usr/local/bin/sway
-
-sway�起動後����root許�を�����。
-
 ## 設定
 
 既�i3を使用���る場���i3�設定ファイルを`~/.config/sway/config`�コピー�れ�動���。�����場���サンプル�設定ファイルを`~/.config/sway/config`�コピー������。サンプル�設定ファイル��通常`/etc/sway/config`��り��。`man 5 sway`を実行�る����設定�関�る情報を見る�������。
diff --git a/README.ko.md b/README.ko.md
index 9c3dd323..e086c174 100644
--- a/README.ko.md
+++ b/README.ko.md
@@ -1,11 +1,11 @@
 # sway
 
 sway는 [i3](https://i3wm.org/)-호환 [Wayland](http://wayland.freedesktop.org/) 컴�지터입니다.
-[FAQ](https://github.com/swaywm/sway/wiki)를 �어보세요. [IRC 채�](http://webchat.freenode.net/?channels=sway&uio=d4) (#sway on irc.freenode.net)� 있습니다.
+[FAQ](https://github.com/swaywm/sway/wiki)를 �어보세요. [IRC 채�](https://web.libera.chat/gamja/?channels=#sway) (#sway on irc.libera.chat)� 있습니다.
 
 ## 릴리즈 서명
 
-릴리즈는 [B22DA89A](http://pgp.mit.edu/pks/lookup?op=vindex&search=0x52CB6609B22DA89A)�서 서명�고,
+릴리즈는 [E88F5E48](https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48)�서 서명�고,
 [GitHub�서](https://github.com/swaywm/sway/releases) 공개�고 있습니다.
 
 ## 설치
@@ -24,10 +24,10 @@ IRC 채�� 방문하거나 sir@cmpwn.com으로 �메�� 보내 �담 받
 다� �존 패키지들� 설치해 주세요:
 
 * meson \*
-* [wlroots](https://github.com/swaywm/wlroots)
+* [wlroots](https://gitlab.freedesktop.org/wlroots/wlroots)
 * wayland
 * wayland-protocols \*
-* pcre
+* pcre2
 * json-c
 * pango
 * cairo
@@ -43,12 +43,6 @@ _\*컴파� 떄 필요_
     ninja -C build
     sudo ninja -C build install
 
-logind를 사용하고 있지 않는 시스템�서는, 바�너리� suid를 설정할 필요가 있습니다:
-
-    sudo chmod a+s /usr/local/bin/sway
-    
-Sway는 시작 후� root 권한� drop할 것 입니다.
-
 ## 설정
 
 i3를 �미 사용 중��면, i3 config� `~/.config/sway/config`로 복사하세요.
diff --git a/README.md b/README.md
index 4698afbe..15c7c099 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 # sway
 
-**[English][en]** - [日本語][ja] - [Français][fr] - [Україн�ька][uk] - [Español][es] - [Polski][pl] - [中文-简体][zh-CN] - [Deutsch][de] - [Nederlands][nl] - [Ру��кий][ru] - [中文-�體][zh-TW] - [Português][pt] - [Danish][dk] - [한국어][ko] - [Română][ro]
+**[English][en]** - [عربي][ar] - [Česky][cs] - [Deutsch][de] - [Dansk][dk] - [Español][es] - [Français][fr] - [ქ�რთული][ge] - [Ελληνικά][gr] - [हिन�दी][hi] - [Magyar][hu] - [�ارسی][ir] - [Italiano][it] - [日本語][ja] - [한국어][ko] - [Nederlands][nl] - [Norsk][no] - [Polski][pl] - [Português][pt] - [Română][ro] - [Ру��кий][ru] - [Svenska][sv] - [Türkçe][tr] - [Україн�ька][uk] - [中文-简体][zh-CN] - [中文-�體][zh-TW]
 
 sway is an [i3]-compatible [Wayland] compositor. Read the [FAQ]. Join the
-[IRC channel] \(#sway on irc.freenode.net).
+[IRC channel] \(#sway on irc.libera.chat).
 
 ## Release Signatures
 
@@ -16,9 +16,6 @@ Releases are signed with [E88F5E48] and published [on GitHub][GitHub releases].
 Sway is available in many distributions. Try installing the "sway" package for
 yours.
 
-If you're interested in packaging sway for your distribution, stop by the IRC
-channel or shoot an email to sir@cmpwn.com for advice.
-
 ### Compiling from Source
 
 Check out [this wiki page][Development setup] if you want to build the HEAD of
@@ -30,27 +27,22 @@ Install dependencies:
 * [wlroots]
 * wayland
 * wayland-protocols \*
-* pcre
+* pcre2
 * json-c
 * pango
 * cairo
-* gdk-pixbuf2 (optional: system tray)
+* gdk-pixbuf2 (optional: additional image formats for system tray)
+* [swaybg] (optional: wallpaper)
 * [scdoc] (optional: man pages) \*
 * git (optional: version info) \*
 
-_\*Compile-time dep_
+_\* Compile-time dep_
 
 Run these commands:
 
-    meson build
-    ninja -C build
-    sudo ninja -C build install
-
-On systems without logind, you need to suid the sway binary:
-
-    sudo chmod a+s /usr/local/bin/sway
-
-Sway will drop root permissions shortly after startup.
+    meson build/
+    ninja -C build/
+    sudo ninja -C build/ install
 
 ## Configuration
 
@@ -65,26 +57,38 @@ Run `sway` from a TTY. Some display managers may work but are not supported by
 sway (gdm is known to work fairly well).
 
 [en]: https://github.com/swaywm/sway#readme
-[ja]: https://github.com/swaywm/sway/blob/master/README.ja.md
-[fr]: https://github.com/swaywm/sway/blob/master/README.fr.md
-[uk]: https://github.com/swaywm/sway/blob/master/README.uk.md
-[es]: https://github.com/swaywm/sway/blob/master/README.es.md
-[pl]: https://github.com/swaywm/sway/blob/master/README.pl.md
-[zh-CN]: https://github.com/swaywm/sway/blob/master/README.zh-CN.md
-[de]: https://github.com/swaywm/sway/blob/master/README.de.md
-[nl]: https://github.com/swaywm/sway/blob/master/README.nl.md
-[ru]: https://github.com/swaywm/sway/blob/master/README.ru.md
-[zh-TW]: https://github.com/swaywm/sway/blob/master/README.zh-TW.md
-[pt]: https://github.com/swaywm/sway/blob/master/README.pt.md
-[dk]: https://github.com/swaywm/sway/blob/master/README.dk.md
-[ko]: https://github.com/swaywm/sway/blob/master/README.ko.md
-[ro]: https://github.com/swaywm/sway/blob/master/README.ro.md
+[ar]: README.ar.md
+[cs]: README.cs.md
+[de]: README.de.md
+[dk]: README.dk.md
+[es]: README.es.md
+[fr]: README.fr.md
+[ge]: README.ge.md
+[gr]: README.gr.md
+[hi]: README.hi.md
+[hu]: README.hu.md
+[ir]: README.ir.md
+[it]: README.it.md
+[ja]: README.ja.md
+[ko]: README.ko.md
+[nl]: README.nl.md
+[no]: README.no.md
+[pl]: README.pl.md
+[pt]: README.pt.md
+[ro]: README.ro.md
+[ru]: README.ru.md
+[sv]: README.sv.md
+[tr]: README.tr.md
+[uk]: README.uk.md
+[zh-CN]: README.zh-CN.md
+[zh-TW]: README.zh-TW.md
 [i3]: https://i3wm.org/
 [Wayland]: http://wayland.freedesktop.org/
 [FAQ]: https://github.com/swaywm/sway/wiki
-[IRC channel]: http://webchat.freenode.net/?channels=sway&uio=d4
+[IRC channel]: https://web.libera.chat/gamja/?channels=#sway
 [E88F5E48]: https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48
 [GitHub releases]: https://github.com/swaywm/sway/releases
 [Development setup]: https://github.com/swaywm/sway/wiki/Development-Setup
-[wlroots]: https://github.com/swaywm/wlroots
+[wlroots]: https://gitlab.freedesktop.org/wlroots/wlroots
+[swaybg]: https://github.com/swaywm/swaybg/
 [scdoc]: https://git.sr.ht/~sircmpwn/scdoc
diff --git a/README.nl.md b/README.nl.md
index 86ebe398..bf1ea975 100644
--- a/README.nl.md
+++ b/README.nl.md
@@ -2,12 +2,12 @@
 
 Sway is een [i3](https://i3wm.org/)-compatibele [Wayland](http://wayland.freedesktop.org/) compositor.
 Lees de [FAQ](https://github.com/swaywm/sway/wiki). Word lid van het [IRC
-kanaal](http://webchat.freenode.net/?channels=sway&uio=d4) (#sway op
-irc.freenode.net).
+kanaal](https://web.libera.chat/gamja/?channels=#sway) (#sway op
+irc.libera.chat).
 
 ## Releasehandtekeningen
 
-Releases worden ondertekend met [B22DA89A](http://pgp.mit.edu/pks/lookup?op=vindex&search=0x52CB6609B22DA89A)
+Releases worden ondertekend met [E88F5E48](https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48)
 en gepubliceerd [op GitHub](https://github.com/swaywm/sway/releases).
 
 ## Installatie
@@ -25,10 +25,10 @@ kanaal of stuur een e-mail naar sir@cmpwn.com voor advies.
 Afhankelijkheden installeren:
 
 * meson \*
-* [wlroots](https://github.com/swaywm/wlroots)
+* [wlroots](https://gitlab.freedesktop.org/wlroots/wlroots)
 * wayland
 * wayland-protocols \*
-* pcre
+* pcre2
 * json-c
 * pango
 * cairo
@@ -44,12 +44,6 @@ Voer deze opdrachten uit:
     ninja -C build
     sudo ninja -C build install
 
-Op systemen zonder logind, moet je bij het binaire bestand het suid bit instellen:
-
-    sudo chmod a+s /usr/local/bin/sway
-
-Sway zal root-rechten kort na het opstarten loslaten.
-
 ## Configuratie
 
 Als je al i3 gebruikt, kopieer dan je i3-configuratie naar `~/.config/sway/config` en
diff --git a/README.no.md b/README.no.md
new file mode 100644
index 00000000..35d6e320
--- /dev/null
+++ b/README.no.md
@@ -0,0 +1,68 @@
+# Sway
+
+Sway er en [i3]-kompatibel [Wayland] compositor. Les [Ofte stilte spørsmål].
+Delta på [IRC kanalen][IRC kanal] \(#sway på irc.libera.chat).
+
+## Utgivelses Signaturer
+
+Utgivelser er signert med [E88F5E48] og publisert [på GitHub][GitHub
+releases].
+
+## Installasjon
+
+### Fra system pakker
+
+Sway er tilgjengelig i mange distribusjoner. Prøv å installere "sway" pakken
+fra din distro sine repoer.
+
+Er du interessert i å pakke Sway for din distribusjon kan du ta turen innom
+IRC-kanalen eller send en e-post til sir@cmpwn.com for råd.
+
+### Kompilering fra kildekode
+
+Se [denne wiki-siden][Oppsetting for utvikling] hvis du vil bygge fra HEAD grenen av sway og
+wlroots for testing eller utvikling.
+
+Installasjonsavhengigheter:
+
+* meson \*
+* [wlroots]
+* wayland
+* wayland-protocols \*
+* pcre2
+* json-c
+* pango
+* cairo
+* gdk-pixbuf2 (valgfritt: system tray)
+* [scdoc] (valgfritt: man pages) \*
+* git \*
+
+_\*Kompileringsavhengigheter_
+
+Kjør følgende kommandoer:
+
+    meson build
+    ninja -C build
+    sudo ninja -C build install
+
+## Konfigurasjon
+
+Hvis du allerede bruker i3 kan du bare kopiere din i3 konfigurasjon til
+`~/.config/sway/config`. Ellers skal du kopiere eksempel konfigurasjonsfilen til
+`~/.config/sway/config`. Eksempel filen er normalt plasert i `/etc/sway/config`.  Kjør
+`man 5 sway` for å få oplysninger om konfigurasjonen.
+
+## Utførelse
+
+Kjør `sway` fra en TTY. Noen display managers kan fungere, men Sway har ikke
+støtte for dem (gdm er kjent for å fungere ganske bra).
+
+[i3]: https://i3wm.org/
+[Wayland]: http://wayland.freedesktop.org/
+[Ofte stilte spørsmål]: https://github.com/swaywm/sway/wiki
+[IRC kanal]: https://web.libera.chat/gamja/?channels=#sway
+[E88F5E48]: https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48
+[GitHub releases]: https://github.com/swaywm/sway/releases
+[Oppsetting for utvikling]: https://github.com/swaywm/sway/wiki/Development-Setup
+[wlroots]: https://gitlab.freedesktop.org/wlroots/wlroots
+[scdoc]: https://git.sr.ht/~sircmpwn/scdoc
diff --git a/README.pl.md b/README.pl.md
index b63b8567..65b3c3a1 100644
--- a/README.pl.md
+++ b/README.pl.md
@@ -1,12 +1,12 @@
 # sway
 
 sway jest kompozytorem [Wayland](http://wayland.freedesktop.org/) kompatybilnym z [i3](https://i3wm.org/).
-Przeczytaj [FAQ](https://github.com/swaywm/sway/wiki). Dołącz do [kanału IRC](http://webchat.freenode.net/?channels=sway&uio=d4)
-(#sway na irc.freenode.net).
+Przeczytaj [FAQ](https://github.com/swaywm/sway/wiki). Dołącz do [kanału IRC](https://web.libera.chat/gamja/?channels=#sway)
+(#sway na irc.libera.chat).
 
 ## Podpisy cyfrowe wydań
 
-Wydania sÄ… podpisywane przy pomocy klucza [B22DA89A](http://pgp.mit.edu/pks/lookup?op=vindex&search=0x52CB6609B22DA89A)
+Wydania sÄ… podpisywane przy pomocy klucza [E88F5E48](https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48)
 i publikowane [na GitHubie](https://github.com/swaywm/sway/releases).
 
 ## Instalacja
@@ -25,10 +25,10 @@ adres sir@cmpwn.com w celu uzyskania wskazówek.
 Zainstaluj zależności:
 
 * meson \*
-* [wlroots](https://github.com/swaywm/wlroots)
+* [wlroots](https://gitlab.freedesktop.org/wlroots/wlroots)
 * wayland
 * wayland-protocols \*
-* pcre
+* pcre2
 * json-c
 * pango
 * cairo
@@ -44,12 +44,6 @@ Wykonaj następujące polecenia:
     ninja -C build
     sudo ninja -C build install
 
-Na systemach bez logind należy wykonać polecenie suid na pliku wykonywalnym sway:
-
-    sudo chmod a+s /usr/local/bin/sway
-
-Sway pozbędzie się uprawnień roota tuż po wystartowaniu.
-
 ## Konfiguracja
 
 Jeśli już korzystasz z i3, skopiuj swoją konfigurację i3 do katalogu `~/.config/sway/config` i
diff --git a/README.pt.md b/README.pt.md
index ad7cab65..c1611a31 100644
--- a/README.pt.md
+++ b/README.pt.md
@@ -2,12 +2,12 @@
 
 O sway é um compositor do [Wayland](http://wayland.freedesktop.org/) compatível com o [i3](https://i3wm.org/).
 Leia o [FAQ](https://github.com/swaywm/sway/wiki). Junte-se ao [canal do    
-IRC](http://webchat.freenode.net/?channels=sway&uio=d4) (#sway em
-irc.freenode.net).
+IRC](https://web.libera.chat/gamja/?channels=#sway) (#sway em
+irc.libera.chat).
 
 ## Assinatura das versões
 
-As versões são assinadas com [B22DA89A](http://pgp.mit.edu/pks/lookup?op=vindex&search=0x52CB6609B22DA89A)
+As versões são assinadas com [E88F5E48](https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48)
 e publicadas [no GitHub](https://github.com/swaywm/sway/releases).
 
 ## Instalação
@@ -27,10 +27,10 @@ Verifique [essa página da wiki](https://github.com/swaywm/sway/wiki/Development
 Instale as dependências:
 
 * meson \*
-* [wlroots](https://github.com/swaywm/wlroots)
+* [wlroots](https://gitlab.freedesktop.org/wlroots/wlroots)
 * wayland
 * wayland-protocols \*
-* pcre
+* pcre2
 * json-c
 * pango
 * cairo
@@ -46,12 +46,6 @@ Execute esses comandos:
     ninja -C build
     sudo ninja -C build install
 
-Em sistemas sem logind, você precisa preparar o binário do sway:
-
-    sudo chmod a+s /usr/local/bin/sway
-
-O sway perderá as privilégios de de root logo após o início do sistema.
-
 ## Configuração
 
 Se você já utiliza o i3, então copie os seus arquivos de configuração para `~/.config/sway/config` e
diff --git a/README.ro.md b/README.ro.md
index dd895b56..a3559a8b 100644
--- a/README.ro.md
+++ b/README.ro.md
@@ -1,11 +1,11 @@
 # sway
 
 sway este un compositor pentru [Wayland](http://wayland.freedesktop.org/) compatibil cu [i3](https://i3wm.org/).
-Citiți [FAQ](https://github.com/swaywm/sway/wiki)-ul. Connectați-vă la canalul nostru [IRC](http://webchat.freenode.net/?channels=sway&uio=d4) (#sway pe irc.freenode.net).
+Citiți [FAQ](https://github.com/swaywm/sway/wiki)-ul. Connectați-vă la canalul nostru [IRC](https://web.libera.chat/gamja/?channels=#sway) (#sway pe irc.libera.chat).
 
 ## Semnarea digitală
 
-Noile versiuni sunt semnate cu [B22DA89A](http://pgp.mit.edu/pks/lookup?op=vindex&search=0x52CB6609B22DA89A)
+Noile versiuni sunt semnate cu [E88F5E48](https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48)
 și postate [pe GitHub](https://github.com/swaywm/sway/releases).
 
 ## Instalare
@@ -22,10 +22,10 @@ Dacă sunteți interesați in a crea pachete pentru distribuția voastră, infor
 Dependențe pentru instalare:
 
 * meson \*
-* [wlroots](https://github.com/swaywm/wlroots)
+* [wlroots](https://gitlab.freedesktop.org/wlroots/wlroots)
 * wayland
 * wayland-protocols \*
-* pcre
+* pcre2
 * json-c
 * pango
 * cairo
@@ -43,14 +43,6 @@ Rulați aceste comenzi:
     sudo ninja -C build install
 ```
 
-Pe sisteme fără logind, trebuie să folosiți următoarea comandă pentru a marca binarul de Sway ca suid:
-
-```
-    sudo chmod a+s /usr/local/bin/sway
-```
-
-Imediat după pornire, Sway va renunța la permisiunile de root.
-
 ## Configurare
 
 Dacă folosiți deja i3, copiați fișierul de configurare din i3 în `~/.config/sway/config`, și va funcționa fără a necesita nici o modificare. In caz contrar, copiați exemplul de configurare (disponibil de obicei în `/etc/sway/config`) în `~/.config/sway/config`.
diff --git a/README.ru.md b/README.ru.md
index a870ec89..edc0eda7 100644
--- a/README.ru.md
+++ b/README.ru.md
@@ -1,42 +1,41 @@
 # sway
 
-sway - �то [i3](https://i3wm.org/)-�овме�тимый композитор [Wayland](http://wayland.freedesktop.org/).
-Больше информации в [FAQ](https://github.com/swaywm/sway/wiki). При�оедин�йте�ь к
-[IRC-каналу](http://webchat.freenode.net/?channels=sway&uio=d4) (#sway на
-irc.freenode.net).
+sway - �то [i3]-�овме�тимый композитор [Wayland].
+Больше информации в [FAQ]. При�оедин�йте�ь к
+[IRC-каналу][IRC channel] (#sway на
+irc.libera.chat).
 
 ## Подпи�и релизов
 
-Релизы подпи�ывают�� ключом [B22DA89A](http://pgp.mit.edu/pks/lookup?op=vindex&search=0x52CB6609B22DA89A)
-и публикуют�� [на GitHub](https://github.com/swaywm/sway/releases).
+Релизы подпи�ывают�� ключом [E88F5E48] и публикуют�� [на GitHub][GitHub releases].
 
 ## У�тановка
 
 ### Из репозиториев
 
-sway до�тупен во многих ди�трибутивах. Попробуйте у�тановить пакет "sway".
-Е�ли он вдруг недо�тупен, проверьте [�ту �траницу на wiki](https://github.com/swaywm/sway/wiki/Unsupported-packages)
-дл� получени� информации о подробно�т�х у�тановки дл� вашего
-ди�трибутива.
+Sway до�тупен во многих ди�трибутивах. Попробуйте у�тановить пакет "sway".
 
-Е�ли вы заинтере�ованы поддерживать sway в вашем ди�трибутиве, загл�ните в наш IRC-канал
-или обратите�ь на sir@cmpwn.com за �оветом.
+Е�ли ва� интере�ует �оздание пакета sway дл� вашего ди�трибутива, зайдите на [IRC-канал][IRC channel]
+или отправьте пи�ьмо на sir@cmpwn.com за �оветом.
 
 ### Сборка из и�ходников
 
+По�етите [�ту �траницу на вики][Development setup], е�ли вы хотите по�троить по�леднюю вер�ию
+sway и wlroots дл� те�тировани� или разработки. 
+
 У�тановите зави�имо�ти:
 
 * meson \*
-* [wlroots](https://github.com/swaywm/wlroots)
+* [wlroots]
 * wayland
 * wayland-protocols \*
-* pcre
+* pcre2
 * json-c
 * pango
 * cairo
-* gdk-pixbuf2 (необ�зательно: дл� работы тре�)
-* [scdoc](https://git.sr.ht/~sircmpwn/scdoc) (необ�зательно: дл� �борки man-�траниц) \*
-* git \*
+* gdk-pixbuf2 (опционально: дл� работы тре�)
+* [scdoc] (опционально: дл� man-�траниц) \*
+* git (опционально: дл� информации о вер�ии) \*
 
 _\*Зави�имо�ти дл� �борки_
 
@@ -46,12 +45,6 @@ _\*Зави�имо�ти дл� �борки_
     ninja -C build
     sudo ninja -C build install
 
-�а �и�темах без logind вам понадобит�� добавить suid к файлу программы sway:
-
-    sudo chmod a+s /usr/local/bin/sway
-
-sway �бро�ит root-права при запу�ке.
-
 ## �а�тройка
 
 Е�ли вы уже и�пользуете i3, �копируйте ваш конфигурационный файл i3 в `~/.config/sway/config`, и
@@ -63,3 +56,13 @@ sway �бро�ит root-права при запу�ке.
 
 Выполните команду `sway` пр�мо из TTY. �екоторые ди�плейные менеджеры могут работать, но они не поддерживают�� �о �тороны
 sway (gdm работает довольно неплохо).
+
+[i3]: https://i3wm.org/
+[Wayland]: http://wayland.freedesktop.org/
+[FAQ]: https://github.com/swaywm/sway/wiki
+[IRC channel]: https://web.libera.chat/gamja/?channels=#sway
+[E88F5E48]: https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48
+[GitHub releases]: https://github.com/swaywm/sway/releases
+[Development setup]: https://github.com/swaywm/sway/wiki/Development-Setup
+[wlroots]: https://gitlab.freedesktop.org/wlroots/wlroots
+[scdoc]: https://git.sr.ht/~sircmpwn/scdoc
diff --git a/README.sv.md b/README.sv.md
new file mode 100644
index 00000000..c50ca068
--- /dev/null
+++ b/README.sv.md
@@ -0,0 +1,83 @@
+# sway
+
+[English][en] - [Deutsch][de] - [Dansk][dk] - [Español][es] - [Français][fr] - **[Svenska][sv]** - [Ελληνικά][gr] - [Magyar][hu] - [�ارسی][ir] - [Italiano][it] - [日本語][ja] - [한국어][ko] - [Nederlands][nl] - [Polski][pl] - [Português][pt] - [Română][ro] - [Ру��кий][ru] - [Türkçe][tr] - [Україн�ька][uk] - [中文-简体][zh-CN] - [中文-�體][zh-TW]
+
+sway är en [i3]-kompatibel [Wayland] compositor. Läs våran [FAQ]-sida. Gå med i vår
+[IRC-kanal] \(#sway på irc.libera.chat).
+
+## Utgåvosignaturer
+
+Utgåvor är signerade med [E88F5E48] och publicerade på [GitHub][GitHub releases].
+
+## Installering
+
+### Med pakethanterare
+
+Sway är tillgänglig i många distributioner. Prova att installera "sway" med din distributions pakethanterare.
+
+### Genom att kompilera från källkod
+
+Kolla in [denna wiki-sida][Development setup] om du vill bygga sway och wlroots HEAD för testning eller utveckling.
+
+Installera paket som sway behöver:
+
+* meson \*
+* [wlroots]
+* wayland
+* wayland-protocols \*
+* pcre2
+* json-c
+* pango
+* cairo
+* gdk-pixbuf2 (valbar: systembricka)
+* [scdoc] (valbar: manualer) \*
+* git (valbar: versioninfo) \*
+
+_\* Krav för kompilering_
+
+Kör dessa kommandon:
+
+    meson build/
+    ninja -C build/
+    sudo ninja -C build/ install
+
+## Konfiguration
+
+Ifall du redan använder i3 så kan du kopiera din konfigurationsfil till `~/.config/sway/config` och det kommer då att fungera som det ska.
+Kopiera annars exemplarkonfigurationsfilen till `~/.config/sway/config`. Den ligger oftast i `/etc/sway/config`.
+Kör `man 5 sway` för mer information kring konfigurationen.
+
+## Att köra sway
+
+Kör `sway` från en TTY. Vissa inloggningahanterare kan fungera men inte vara stödda av sway (gdm ska fungera hyfsat bra).
+
+[en]: https://github.com/swaywm/sway#readme
+[de]: README.de.md
+[dk]: README.dk.md
+[es]: README.es.md
+[fr]: README.fr.md
+[sv]: README.sv.md
+[gr]: README.gr.md
+[hu]: README.hu.md
+[ir]: README.ir.md
+[it]: README.it.md
+[ja]: README.ja.md
+[ko]: README.ko.md
+[nl]: README.nl.md
+[pl]: README.pl.md
+[pt]: README.pt.md
+[ro]: README.ro.md
+[ru]: README.ru.md
+[tr]: README.tr.md
+[uk]: README.uk.md
+[zh-CN]: README.zh-CN.md
+[zh-TW]: README.zh-TW.md
+[i3]: https://i3wm.org/
+[Wayland]: http://wayland.freedesktop.org/
+[FAQ]: https://github.com/swaywm/sway/wiki
+[IRC-kanal]: https://web.libera.chat/gamja/?channels=#sway
+[E88F5E48]: https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48
+[GitHub releases]: https://github.com/swaywm/sway/releases
+[Development setup]: https://github.com/swaywm/sway/wiki/Development-Setup
+[wlroots]: https://gitlab.freedesktop.org/wlroots/wlroots
+[scdoc]: https://git.sr.ht/~sircmpwn/scdoc
diff --git a/README.tr.md b/README.tr.md
new file mode 100644
index 00000000..40de1474
--- /dev/null
+++ b/README.tr.md
@@ -0,0 +1,62 @@
+# sway
+
+
+Sway, [i3]-uyumlu bir [Wayland] dizgicisidir. [SSS][FAQ]'yi okuyun. 
+[IRC kanalı][IRC channel]na katılın \(irc.libera.chat'te #sway (İngilizce)).
+
+## Sürüm imzaları
+
+Sürümler [E88F5E48] ile imzalandı ve [GitHub][GitHub releases]'da yayınlandı.
+
+## Kurulum
+
+### Paketler ile
+
+Sway birçok dağıtımda mevcuttur. Sizinki için "sway" paketini yüklemeyi deneyin.
+
+Dağıtımınız için sway'i paketlemekle ilgileniyorsanız, IRC kanalına uğrayın veya tavsiye için sir@cmpwn.com adresine bir e-posta gönderin.
+
+### Kaynak koddan derleme
+
+Test veya geliştirme için sway ve wlroots'un HEAD'ini oluşturmak istiyorsanız [bu wiki sayfası][Development setup]na göz atın.
+
+Aşağıdaki bağımlılıkları yükleyin:
+
+* meson \*
+* [wlroots]
+* wayland
+* wayland-protocols \*
+* pcre2
+* json-c
+* pango
+* cairo
+* gdk-pixbuf2 (isteğe bağlı: system tray)
+* [scdoc] (isteğe bağlı: man pages) \*
+* git (isteğe bağlı: version info) \*
+
+_\*Derleme-anı bağımlılıkları_
+
+Şu komutları çalıştırın:
+
+    meson build
+    ninja -C build
+    sudo ninja -C build install
+
+## Yapılandırma
+
+Zaten i3 kullanıyorsanız, i3 yapılandırmanızı `~/.config/sway/config` konumuna kopyalayın ve kutudan çıktığı gibi çalışacaktır. Aksi takdirde, örnek yapılandırma dosyasını `~/.config/sway/config` konumuna kopyalayın. Genellikle `/etc/sway/config` konumunda bulunur.
+Yapılandırma hakkında bilgi almak için `man 5 sway` komutunu çalıştırın.
+
+## Çalıştırma
+
+TTY'den `sway` çalıştırın. Bazı  görüntü yöneticileriyle(display manager) çalışabilir ama Sway tarafından desteklenmez. (gdm'nin oldukça iyi çalıştığı bilinmektedir.)
+
+[i3]: https://i3wm.org/
+[Wayland]: http://wayland.freedesktop.org/
+[FAQ]: https://github.com/swaywm/sway/wiki
+[IRC channel]: https://web.libera.chat/gamja/?channels=#sway
+[E88F5E48]: https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48
+[GitHub releases]: https://github.com/swaywm/sway/releases
+[Development setup]: https://github.com/swaywm/sway/wiki/Development-Setup
+[wlroots]: https://gitlab.freedesktop.org/wlroots/wlroots
+[scdoc]: https://git.sr.ht/~sircmpwn/scdoc
diff --git a/README.uk.md b/README.uk.md
index 95047cb8..33359cff 100644
--- a/README.uk.md
+++ b/README.uk.md
@@ -2,8 +2,8 @@
 
 Sway це �умі�ний з [i3](https://i3wm.org/) композитор [Wayland](http://wayland.freedesktop.org/).
 Ознайомте�ь з [ЧаПами](https://github.com/swaywm/sway/wiki). Приєднуйте�ь до [�пільноти в
-IRC](http://webchat.freenode.net/?channels=sway&uio=d4) (#sway на
-irc.freenode.net).
+IRC](https://web.libera.chat/gamja/?channels=#sway) (#sway на
+irc.libera.chat).
 
 ## Підтримка україн�ькою мовою
 
@@ -15,7 +15,7 @@ Hummer12007 у IRC-Ñ�пільноті. Будьте терплÑ�чі, вам оÐ
 
 ## Підпи�и випу�ків
 
-Випу�ки підпи�ані ключем [B22DA89A](http://pgp.mit.edu/pks/lookup?op=vindex&search=0x52CB6609B22DA89A)
+Випу�ки підпи�ані ключем [E88F5E48](https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48)
 та публікують�� на �торінці [GitHub](https://github.com/swaywm/sway/releases).
 
 ## В�тановленн�
@@ -36,10 +36,10 @@ Sway до�тупний у багатьох ди�трибутивах Linux (а
 В�тановіть залежно�ті:
 
 * meson \*
-* [wlroots](https://github.com/swaywm/wlroots)
+* [wlroots](https://gitlab.freedesktop.org/wlroots/wlroots)
 * wayland
 * wayland-protocols \*
-* pcre
+* pcre2
 * json-c
 * pango
 * cairo
@@ -55,12 +55,6 @@ _\*Лише дл� компіл�ції_
     ninja -C build
     sudo ninja -C build install
 
-�а �и�темах без logind, необхідно в�тановити біт SUID на виконуваний файл sway:
-
-    sudo chmod a+s /usr/local/bin/sway
-
-Sway втратить права до�тупу root незабаром пі�л� запу�ку.
-
 ## �алаштуванн�
 
 Якщо ви вже викори�товуєте i3, �копіюйте �вій файл налаштувань
diff --git a/README.zh-CN.md b/README.zh-CN.md
index 9a3337ce..a6f4518a 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -1,63 +1,50 @@
 # sway
 
-sway 是和 [i3](https://i3wm.org/) 兼容的 [Wayland](http://wayland.freedesktop.org/) compositor.
-阅读 [FAQ](https://github.com/swaywm/sway/wiki). 加入 [IRC
-频�](http://webchat.freenode.net/?channels=sway&uio=d4) (#sway on
-irc.freenode.net).
+sway 是和 [i3](https://i3wm.org/) 兼容的 [Wayland](http://wayland.freedesktop.org/) compositor。
+ [查看FAQ](https://github.com/swaywm/sway/wiki)/ [加入IRC频�](https://web.libera.chat/gamja/?channels=#sway) (#sway on irc.libera.chat)
 
-## �布签�
+## �行签�
 
-�布是以 [B22DA89A](http://pgp.mit.edu/pks/lookup?op=vindex&search=0x52CB6609B22DA89A) 签�
-并�布在 [GitHub](https://github.com/swaywm/sway/releases).
+�个�行版都以 [E88F5E48](https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48) 的密钥签�并�布在 [GitHub](https://github.com/swaywm/sway/releases)上。
 
 ## 安装
 
-### 从软件包中
+### 从包管�器安装
 
-Sway 在很多�行版中�用. �试在你的�行版中安装 "sway" 包.
-如果这��用, 请到 [此 wiki 页](https://github.com/swaywm/sway/wiki/Unsupported-packages)
-检查针对你的�行版关于安装的信�.
+Sway 在很多�行版中�用。请�试在你的�行版中安装 `sway` 。
 
-如果你有兴趣给你的�行版打包 sway, �下�到 IRC 频�或者�邮件至 sir@cmpwn.com 获�建议.
+### 从��编译
 
-### 从�代�编译
+如果想�构建最新版sway和wlroots用以测试和开�，请查看 [此wiki页�](https://github.com/swaywm/sway/wiki/Development-Setup)
 
-安装�赖:
+安装如下�赖:
 
 * meson \*
-* [wlroots](https://github.com/swaywm/wlroots)
+* [wlroots](https://gitlab.freedesktop.org/wlroots/wlroots)
 * wayland
 * wayland-protocols \*
-* pcre
+* pcre2
 * json-c
 * pango
 * cairo
 * gdk-pixbuf2 (�选的: system tray)
-* [scdoc](https://git.sr.ht/~sircmpwn/scdoc) (�选的: man pages) \*
+* [scdoc](https://git.sr.ht/~sircmpwn/scdoc) (�选: man pages) \*
 * git \*
 
 _\*编译时�赖_
 
-�行这些命令:
+�行如下命令:
 
-    meson build
-    ninja -C build
-    sudo ninja -C build install
-
-在没有 logind 的系统上, 你需�给 sway 二进制设置 suid:
-
-    sudo chmod a+s /usr/local/bin/sway
-
-Sway 将会在�动�尽快丢掉 root ��.
+    meson build/
+    ninja -C build/
+    sudo ninja -C build/ install
 
 ## �置
 
-如果你已�在使用 i3, 接下��制你的 i3 �置到 `~/.config/sway/config`
-它�以直接工作. 或者, �制样本�置文件到
-`~/.config/sway/config`. 它通常�于 `/etc/sway/config`.
-�行 `man 5 sway` 获�关于�置的信�.
+如果你已�在使用i3，直接�制i3�置文件到 `~/.config/sway/config`，这是开箱�用的。或者，你�以�制�置样例到`~/.config/sway/config`。它通常�于 `/etc/sway/config`。
+�行 `man 5 sway` 获�关于�置的更多信�。
 
 ## �行
 
-从 TTY 中�行 `sway` . �些显示管�器�能会工作但并�被 sway 支�
-(已知的 gdm 工作得�常好).
+从 TTY 中�行 `sway`。 �些显示管�器（Display Manager）也许�以工作但�被 sway 支�。
+(已知 gdm 工作得�常好)。
diff --git a/README.zh-TW.md b/README.zh-TW.md
index 13a9d2f4..2de2f63f 100644
--- a/README.zh-TW.md
+++ b/README.zh-TW.md
@@ -2,12 +2,12 @@
 
 sway 是一個與 [i3](https://i3wm.org/) 相容的 [Wayland](http://wayland.freedesktop.org/) compositor。
 閱讀 [FAQ](https://github.com/swaywm/sway/wiki)。 加入 [IRC
-頻�](http://webchat.freenode.net/?channels=sway&uio=d4) (#sway on
-irc.freenode.net)
+頻�](https://web.libera.chat/gamja/?channels=#sway) (#sway on
+irc.libera.chat)
 
 ## 發行簽章
 
-所有發行的版本都會以 [B22DA89A](http://pgp.mit.edu/pks/lookup?op=vindex&search=0x52CB6609B22DA89A) 簽署
+所有發行的版本都會以 [E88F5E48](https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48) 簽署
 並發佈於 [GitHub](https://github.com/swaywm/sway/releases)
 
 ## 安�
@@ -25,10 +25,10 @@ Sway 在許多發行版都有æ��供。請自己嘗試於你的發行版安è£� ã€
 相�套件:
 
 * meson \*
-* [wlroots](https://github.com/swaywm/wlroots)
+* [wlroots](https://gitlab.freedesktop.org/wlroots/wlroots)
 * wayland
 * wayland-protocols \*
-* pcre
+* pcre2
 * json-c
 * pango
 * cairo
@@ -44,12 +44,6 @@ _\*編譯時相�_
     ninja -C build
     sudo ninja -C build install
 
-在沒有 logind 的系統上，你需�為 sway 的執行檔加上 suid。
-
-    sudo chmod a+s /usr/local/bin/sway
-
-Sway 在啟動�久後就會放棄 root 權�。
-
 ## 設定檔
 
 如果你已經在使用 i3，你�以直接將你的 i3 設定檔複製到 `~/.config/sway/config` 然後就能直接使用。
diff --git a/client/pool-buffer.c b/client/pool-buffer.c
index fd500c49..3546b897 100644
--- a/client/pool-buffer.c
+++ b/client/pool-buffer.c
@@ -1,50 +1,43 @@
 #define _POSIX_C_SOURCE 200809
 #include <assert.h>
-#include <cairo/cairo.h>
+#include <cairo.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <pango/pangocairo.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/mman.h>
+#include <time.h>
 #include <unistd.h>
 #include <wayland-client.h>
 #include "config.h"
 #include "pool-buffer.h"
 #include "util.h"
 
-static int create_pool_file(size_t size, char **name) {
-        static const char template[] = "sway-client-XXXXXX";
-        const char *path = getenv("XDG_RUNTIME_DIR");
-        if (path == NULL) {
-                fprintf(stderr, "XDG_RUNTIME_DIR is not set\n");
-                return -1;
-        }
-
-        size_t name_size = strlen(template) + 1 + strlen(path) + 1;
-        *name = malloc(name_size);
-        if (*name == NULL) {
-                fprintf(stderr, "allocation failed\n");
-                return -1;
-        }
-        snprintf(*name, name_size, "%s/%s", path, template);
-
-        int fd = mkstemp(*name);
-        if (fd < 0) {
-                return -1;
-        }
-
-        if (!sway_set_cloexec(fd, true)) {
-                close(fd);
-                return -1;
-        }
+static int anonymous_shm_open(void) {
+        int retries = 100;
+
+        do {
+                // try a probably-unique name
+                struct timespec ts;
+                clock_gettime(CLOCK_MONOTONIC, &ts);
+                pid_t pid = getpid();
+                char name[50];
+                snprintf(name, sizeof(name), "/sway-%x-%x",
+                        (unsigned int)pid, (unsigned int)ts.tv_nsec);
+
+                // shm_open guarantees that O_CLOEXEC is set
+                int fd = shm_open(name, O_RDWR | O_CREAT | O_EXCL, 0600);
+                if (fd >= 0) {
+                        shm_unlink(name);
+                        return fd;
+                }
 
-        if (ftruncate(fd, size) < 0) {
-                close(fd);
-                return -1;
-        }
+                --retries;
+        } while (retries > 0 && errno == EEXIST);
 
-        return fd;
+        return -1;
 }
 
 static void buffer_release(void *data, struct wl_buffer *wl_buffer) {
@@ -62,17 +55,20 @@ static struct pool_buffer *create_buffer(struct wl_shm *shm,
         uint32_t stride = width * 4;
         size_t size = stride * height;
 
-        char *name;
-        int fd = create_pool_file(size, &name);
-        assert(fd != -1);
+        int fd = anonymous_shm_open();
+        if (fd == -1) {
+                return NULL;
+        }
+        if (ftruncate(fd, size) < 0) {
+                close(fd);
+                return NULL;
+        }
         void *data = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
         struct wl_shm_pool *pool = wl_shm_create_pool(shm, fd, size);
         buf->buffer = wl_shm_pool_create_buffer(pool, 0,
                         width, height, stride, format);
         wl_shm_pool_destroy(pool);
         close(fd);
-        unlink(name);
-        free(name);
 
         buf->size = size;
         buf->width = width;
diff --git a/common/cairo.c b/common/cairo.c
index 403dcf49..7c59d48c 100644
--- a/common/cairo.c
+++ b/common/cairo.c
@@ -1,6 +1,6 @@
 #include <stdint.h>
-#include <cairo/cairo.h>
-#include "cairo.h"
+#include <cairo.h>
+#include "cairo_util.h"
 
 void cairo_set_source_u32(cairo_t *cairo, uint32_t color) {
         cairo_set_source_rgba(cairo,
diff --git a/common/gesture.c b/common/gesture.c
new file mode 100644
index 00000000..58170443
--- /dev/null
+++ b/common/gesture.c
@@ -0,0 +1,333 @@
+#define _POSIX_C_SOURCE 200809L
+#include "gesture.h"
+
+#include <math.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "list.h"
+#include "log.h"
+#include "stringop.h"
+
+const uint8_t GESTURE_FINGERS_ANY = 0;
+
+char *gesture_parse(const char *input, struct gesture *output) {
+        // Clear output in case of failure
+        output->type = GESTURE_TYPE_NONE;
+        output->fingers = GESTURE_FINGERS_ANY;
+        output->directions = GESTURE_DIRECTION_NONE;
+
+        // Split input type, fingers and directions
+        list_t *split = split_string(input, ":");
+        if (split->length < 1 || split->length > 3) {
+                return format_str(
+                                "expected <gesture>[:<fingers>][:direction], got %s",
+                                input);
+        }
+
+        // Parse gesture type
+        if (strcmp(split->items[0], "hold") == 0) {
+                output->type = GESTURE_TYPE_HOLD;
+        } else if (strcmp(split->items[0], "pinch") == 0) {
+                output->type = GESTURE_TYPE_PINCH;
+        } else if (strcmp(split->items[0], "swipe") == 0) {
+                output->type = GESTURE_TYPE_SWIPE;
+        } else {
+                return format_str("expected hold|pinch|swipe, got %s",
+                                (const char *)split->items[0]);
+        }
+
+        // Parse optional arguments
+        if (split->length > 1) {
+                char *next = split->items[1];
+
+                // Try to parse as finger count (1-9)
+                if (strlen(next) == 1 && '1' <= next[0] && next[0] <= '9') {
+                        output->fingers = atoi(next);
+
+                        // Move to next if available
+                        next = split->length == 3 ? split->items[2] : NULL;
+                } else if (split->length == 3) {
+                        // Fail here if argument can only be finger count
+                        return format_str("expected 1-9, got %s", next);
+                }
+
+                // If there is an argument left, try to parse as direction
+                if (next) {
+                        list_t *directions = split_string(next, "+");
+
+                        for (int i = 0; i < directions->length; ++i) {
+                                const char *item = directions->items[i];
+                                if (strcmp(item, "any") == 0) {
+                                        continue;
+                                } else if (strcmp(item, "up") == 0) {
+                                        output->directions |= GESTURE_DIRECTION_UP;
+                                } else if (strcmp(item, "down") == 0) {
+                                        output->directions |= GESTURE_DIRECTION_DOWN;
+                                } else if (strcmp(item, "left") == 0) {
+                                        output->directions |= GESTURE_DIRECTION_LEFT;
+                                } else if (strcmp(item, "right") == 0) {
+                                        output->directions |= GESTURE_DIRECTION_RIGHT;
+                                } else if (strcmp(item, "inward") == 0) {
+                                        output->directions |= GESTURE_DIRECTION_INWARD;
+                                } else if (strcmp(item, "outward") == 0) {
+                                        output->directions |= GESTURE_DIRECTION_OUTWARD;
+                                } else if (strcmp(item, "clockwise") == 0) {
+                                        output->directions |= GESTURE_DIRECTION_CLOCKWISE;
+                                } else if (strcmp(item, "counterclockwise") == 0) {
+                                        output->directions |= GESTURE_DIRECTION_COUNTERCLOCKWISE;
+                                } else {
+                                        return format_str("expected direction, got %s", item);
+                                }
+                        }
+                        list_free_items_and_destroy(directions);
+                }
+        } // if optional args
+
+        list_free_items_and_destroy(split);
+
+        return NULL;
+}
+
+const char *gesture_type_string(enum gesture_type type) {
+        switch (type) {
+        case GESTURE_TYPE_NONE:
+                return "none";
+        case GESTURE_TYPE_HOLD:
+                return "hold";
+        case GESTURE_TYPE_PINCH:
+                return "pinch";
+        case GESTURE_TYPE_SWIPE:
+                return "swipe";
+        }
+
+        return NULL;
+}
+
+const char *gesture_direction_string(enum gesture_direction direction) {
+        switch (direction) {
+        case GESTURE_DIRECTION_NONE:
+                return "none";
+        case GESTURE_DIRECTION_UP:
+                return "up";
+        case GESTURE_DIRECTION_DOWN:
+                return "down";
+        case GESTURE_DIRECTION_LEFT:
+                return "left";
+        case GESTURE_DIRECTION_RIGHT:
+                return "right";
+        case GESTURE_DIRECTION_INWARD:
+                return "inward";
+        case GESTURE_DIRECTION_OUTWARD:
+                return "outward";
+        case GESTURE_DIRECTION_CLOCKWISE:
+                return "clockwise";
+        case GESTURE_DIRECTION_COUNTERCLOCKWISE:
+                return "counterclockwise";
+        }
+
+        return NULL;
+}
+
+// Helper to turn combination of directions flags into string representation.
+static char *gesture_directions_to_string(uint32_t directions) {
+        char *result = NULL;
+
+        for (uint8_t bit = 0; bit < 32; bit++) {
+                uint32_t masked = directions & (1 << bit);
+                if (masked) {
+                        const char *name = gesture_direction_string(masked);
+
+                        if (!name) {
+                                name = "unknown";
+                        }
+
+                        if (!result) {
+                                result = strdup(name);
+                        } else {
+                                char *new = format_str("%s+%s", result, name);
+                                free(result);
+                                result = new;
+                        }
+                }
+        }
+
+        if(!result) {
+                return strdup("any");
+        }
+
+        return result;
+}
+
+char *gesture_to_string(struct gesture *gesture) {
+        char *directions = gesture_directions_to_string(gesture->directions);
+        char *result = format_str("%s:%u:%s",
+                gesture_type_string(gesture->type),
+                gesture->fingers, directions);
+        free(directions);
+        return result;
+}
+
+bool gesture_check(struct gesture *target, enum gesture_type type, uint8_t fingers) {
+        // Check that gesture type matches
+        if (target->type != type) {
+                return false;
+        }
+
+        // Check that finger count matches
+        if (target->fingers != GESTURE_FINGERS_ANY && target->fingers != fingers) {
+                return false;
+        }
+
+        return true;
+}
+
+bool gesture_match(struct gesture *target, struct gesture *to_match, bool exact) {
+        // Check type and fingers
+        if (!gesture_check(target, to_match->type, to_match->fingers)) {
+                return false;
+        }
+
+        // Enforce exact matches ...
+        if (exact && target->directions != to_match->directions) {
+                return false;
+        }
+
+        // ... or ensure all target directions are matched
+        return (target->directions & to_match->directions) == target->directions;
+}
+
+bool gesture_equal(struct gesture *a, struct gesture *b) {
+        return a->type == b->type
+                && a->fingers == b->fingers
+                && a->directions == b->directions;
+}
+
+// Return count of set bits in directions bit field.
+static uint8_t gesture_directions_count(uint32_t directions) {
+        uint8_t count = 0;
+        for (; directions; directions >>= 1) {
+                count += directions & 1;
+        }
+        return count;
+}
+
+// Compare direction bit count of two direction.
+static int8_t gesture_directions_compare(uint32_t a, uint32_t b) {
+        return gesture_directions_count(a) - gesture_directions_count(b);
+}
+
+// Compare two direction based on their direction bit count
+int8_t gesture_compare(struct gesture *a, struct gesture *b) {
+        return gesture_directions_compare(a->directions, b->directions);
+}
+
+void gesture_tracker_begin(struct gesture_tracker *tracker,
+                enum gesture_type type, uint8_t fingers) {
+        tracker->type = type;
+        tracker->fingers = fingers;
+
+        tracker->dx = 0.0;
+        tracker->dy = 0.0;
+        tracker->scale = 1.0;
+        tracker->rotation = 0.0;
+
+        sway_log(SWAY_DEBUG, "begin tracking %s:%u:? gesture",
+                gesture_type_string(type), fingers);
+}
+
+bool gesture_tracker_check(struct gesture_tracker *tracker, enum gesture_type type) {
+        return tracker->type == type;
+}
+
+void gesture_tracker_update(struct gesture_tracker *tracker,
+                double dx, double dy, double scale, double rotation) {
+        if (tracker->type == GESTURE_TYPE_HOLD) {
+                sway_assert(false, "hold does not update.");
+                return;
+        }
+
+        tracker->dx += dx;
+        tracker->dy += dy;
+
+        if (tracker->type == GESTURE_TYPE_PINCH) {
+                tracker->scale = scale;
+                tracker->rotation += rotation;
+        }
+
+        sway_log(SWAY_DEBUG, "update tracking %s:%u:? gesture: %f %f %f %f",
+                        gesture_type_string(tracker->type),
+                        tracker->fingers,
+                        tracker->dx, tracker->dy,
+                        tracker->scale, tracker->rotation);
+}
+
+void gesture_tracker_cancel(struct gesture_tracker *tracker) {
+        sway_log(SWAY_DEBUG, "cancel tracking %s:%u:? gesture",
+                        gesture_type_string(tracker->type), tracker->fingers);
+
+        tracker->type = GESTURE_TYPE_NONE;
+}
+
+struct gesture *gesture_tracker_end(struct gesture_tracker *tracker) {
+        struct gesture *result = calloc(1, sizeof(struct gesture));
+
+        // Ignore gesture under some threshold
+        // TODO: Make configurable
+        const double min_rotation = 5;
+        const double min_scale_delta = 0.1;
+
+        // Determine direction
+        switch(tracker->type) {
+        // Gestures with scale and rotation
+        case GESTURE_TYPE_PINCH:
+                if (tracker->rotation > min_rotation) {
+                        result->directions |= GESTURE_DIRECTION_CLOCKWISE;
+                }
+                if (tracker->rotation < -min_rotation) {
+                        result->directions |= GESTURE_DIRECTION_COUNTERCLOCKWISE;
+                }
+
+                if (tracker->scale > (1.0 + min_scale_delta)) {
+                        result->directions |= GESTURE_DIRECTION_OUTWARD;
+                }
+                if (tracker->scale < (1.0 - min_scale_delta)) {
+                        result->directions |= GESTURE_DIRECTION_INWARD;
+                }
+                __attribute__ ((fallthrough));
+        // Gestures with dx and dy
+        case GESTURE_TYPE_SWIPE:
+                if (fabs(tracker->dx) > fabs(tracker->dy)) {
+                        if (tracker->dx > 0) {
+                                result->directions |= GESTURE_DIRECTION_RIGHT;
+                        } else {
+                                result->directions |= GESTURE_DIRECTION_LEFT;
+                        }
+                } else {
+                        if (tracker->dy > 0) {
+                                result->directions |= GESTURE_DIRECTION_DOWN;
+                        } else {
+                                result->directions |= GESTURE_DIRECTION_UP;
+                        }
+                }
+        // Gesture without any direction
+        case GESTURE_TYPE_HOLD:
+                break;
+        // Not tracking any gesture
+        case GESTURE_TYPE_NONE:
+                sway_assert(false, "Not tracking any gesture.");
+                return result;
+        }
+
+        result->type = tracker->type;
+        result->fingers = tracker->fingers;
+
+        char *description = gesture_to_string(result);
+        sway_log(SWAY_DEBUG, "end tracking gesture: %s", description);
+        free(description);
+
+        tracker->type = GESTURE_TYPE_NONE;
+
+        return result;
+}
diff --git a/common/meson.build b/common/meson.build
index c653dd72..c0ce1f68 100644
--- a/common/meson.build
+++ b/common/meson.build
@@ -1,8 +1,8 @@
 lib_sway_common = static_library(
         'sway-common',
         files(
-                'background-image.c',
                 'cairo.c',
+                'gesture.c',
                 'ipc-client.c',
                 'log.c',
                 'loop.c',
@@ -13,7 +13,6 @@ lib_sway_common = static_library(
         ),
         dependencies: [
                 cairo,
-                gdk_pixbuf,
                 pango,
                 pangocairo,
                 wayland_client.partial_dependency(compile_args: true)
diff --git a/common/pango.c b/common/pango.c
index fc3d0688..288569b3 100644
--- a/common/pango.c
+++ b/common/pango.c
@@ -1,4 +1,4 @@
-#include <cairo/cairo.h>
+#include <cairo.h>
 #include <pango/pangocairo.h>
 #include <stdarg.h>
 #include <stdbool.h>
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "cairo.h"
+#include "cairo_util.h"
 #include "log.h"
 #include "stringop.h"
 
@@ -50,7 +50,7 @@ size_t escape_markup_text(const char *src, char *dest) {
         return length;
 }
 
-PangoLayout *get_pango_layout(cairo_t *cairo, const char *font,
+PangoLayout *get_pango_layout(cairo_t *cairo, const PangoFontDescription *desc,
                 const char *text, double scale, bool markup) {
         PangoLayout *layout = pango_cairo_create_layout(cairo);
         PangoAttrList *attrs;
@@ -73,60 +73,59 @@ PangoLayout *get_pango_layout(cairo_t *cairo, const char *font,
         }
 
         pango_attr_list_insert(attrs, pango_attr_scale_new(scale));
-        PangoFontDescription *desc = pango_font_description_from_string(font);
         pango_layout_set_font_description(layout, desc);
         pango_layout_set_single_paragraph_mode(layout, 1);
         pango_layout_set_attributes(layout, attrs);
         pango_attr_list_unref(attrs);
-        pango_font_description_free(desc);
         return layout;
 }
 
-void get_text_size(cairo_t *cairo, const char *font, int *width, int *height,
+void get_text_size(cairo_t *cairo, const PangoFontDescription *desc, int *width, int *height,
                 int *baseline, double scale, bool markup, const char *fmt, ...) {
         va_list args;
         va_start(args, fmt);
-        // Add one since vsnprintf excludes null terminator.
-        int length = vsnprintf(NULL, 0, fmt, args) + 1;
+        char *buf = vformat_str(fmt, args);
         va_end(args);
-
-        char *buf = malloc(length);
         if (buf == NULL) {
-                sway_log(SWAY_ERROR, "Failed to allocate memory");
                 return;
         }
-        va_start(args, fmt);
-        vsnprintf(buf, length, fmt, args);
-        va_end(args);
 
-        PangoLayout *layout = get_pango_layout(cairo, font, buf, scale, markup);
+        PangoLayout *layout = get_pango_layout(cairo, desc, buf, scale, markup);
         pango_cairo_update_layout(cairo, layout);
         pango_layout_get_pixel_size(layout, width, height);
         if (baseline) {
                 *baseline = pango_layout_get_baseline(layout) / PANGO_SCALE;
         }
         g_object_unref(layout);
+
         free(buf);
 }
 
-void pango_printf(cairo_t *cairo, const char *font,
+void get_text_metrics(const PangoFontDescription *description, int *height, int *baseline) {
+        cairo_t *cairo = cairo_create(NULL);
+        PangoContext *pango = pango_cairo_create_context(cairo);
+        // When passing NULL as a language, pango uses the current locale.
+        PangoFontMetrics *metrics = pango_context_get_metrics(pango, description, NULL);
+
+        *baseline = pango_font_metrics_get_ascent(metrics) / PANGO_SCALE;
+        *height = *baseline + pango_font_metrics_get_descent(metrics) / PANGO_SCALE;
+
+        pango_font_metrics_unref(metrics);
+        g_object_unref(pango);
+        cairo_destroy(cairo);
+}
+
+void render_text(cairo_t *cairo, const PangoFontDescription *desc,
                 double scale, bool markup, const char *fmt, ...) {
         va_list args;
         va_start(args, fmt);
-        // Add one since vsnprintf excludes null terminator.
-        int length = vsnprintf(NULL, 0, fmt, args) + 1;
+        char *buf = vformat_str(fmt, args);
         va_end(args);
-
-        char *buf = malloc(length);
         if (buf == NULL) {
-                sway_log(SWAY_ERROR, "Failed to allocate memory");
                 return;
         }
-        va_start(args, fmt);
-        vsnprintf(buf, length, fmt, args);
-        va_end(args);
 
-        PangoLayout *layout = get_pango_layout(cairo, font, buf, scale, markup);
+        PangoLayout *layout = get_pango_layout(cairo, desc, buf, scale, markup);
         cairo_font_options_t *fo = cairo_font_options_create();
         cairo_get_font_options(cairo, fo);
         pango_cairo_context_set_font_options(pango_layout_get_context(layout), fo);
@@ -134,5 +133,6 @@ void pango_printf(cairo_t *cairo, const char *font,
         pango_cairo_update_layout(cairo, layout);
         pango_cairo_show_layout(cairo, layout);
         g_object_unref(layout);
+
         free(buf);
 }
diff --git a/common/stringop.c b/common/stringop.c
index 7fb3fe12..c503143a 100644
--- a/common/stringop.c
+++ b/common/stringop.c
@@ -1,5 +1,6 @@
 #define _POSIX_C_SOURCE 200809L
 #include <ctype.h>
+#include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -328,3 +329,35 @@ bool expand_path(char **path) {
         wordfree(&p);
         return true;
 }
+
+char *vformat_str(const char *fmt, va_list args) {
+        char *str = NULL;
+        va_list args_copy;
+        va_copy(args_copy, args);
+
+        int len = vsnprintf(NULL, 0, fmt, args);
+        if (len < 0) {
+                sway_log_errno(SWAY_ERROR, "vsnprintf(\"%s\") failed", fmt);
+                goto out;
+        }
+
+        str = malloc(len + 1);
+        if (str == NULL) {
+                sway_log_errno(SWAY_ERROR, "malloc() failed");
+                goto out;
+        }
+
+        vsnprintf(str, len + 1, fmt, args_copy);
+
+out:
+        va_end(args_copy);
+        return str;
+}
+
+char *format_str(const char *fmt, ...) {
+        va_list args;
+        va_start(args, fmt);
+        char *str = vformat_str(fmt, args);
+        va_end(args);
+        return str;
+}
diff --git a/common/util.c b/common/util.c
index 5ea94f48..5d4c0673 100644
--- a/common/util.c
+++ b/common/util.c
@@ -10,12 +10,6 @@
 #include "log.h"
 #include "util.h"
 
-uint32_t get_current_time_msec(void) {
-        struct timespec now;
-        clock_gettime(CLOCK_MONOTONIC, &now);
-        return now.tv_sec * 1000 + now.tv_nsec / 1000000;
-}
-
 int wrap(int i, int max) {
         return ((i % max) + max) % max;
 }
@@ -86,6 +80,12 @@ enum movement_unit parse_movement_unit(const char *unit) {
 
 int parse_movement_amount(int argc, char **argv,
                 struct movement_amount *amount) {
+        if (!sway_assert(argc > 0, "Expected args in parse_movement_amount")) {
+                amount->amount = 0;
+                amount->unit = MOVEMENT_UNIT_INVALID;
+                return 0;
+        }
+
         char *err;
         amount->amount = (int)strtol(argv[0], &err, 10);
         if (*err) {
diff --git a/completions/bash/sway b/completions/bash/sway
index edd752cd..01b20073 100644
--- a/completions/bash/sway
+++ b/completions/bash/sway
@@ -2,7 +2,7 @@
 
 _sway()
 {
-  local cur prev
+  local cur prev short long
   _get_comp_words_by_ref cur prev
 
   short=(
diff --git a/completions/bash/swaybar b/completions/bash/swaybar
index 1e085c65..3709d4f9 100644
--- a/completions/bash/swaybar
+++ b/completions/bash/swaybar
@@ -2,7 +2,7 @@
 
 _swaybar()
 {
-  local cur prev
+  local cur prev short long
   _get_comp_words_by_ref cur prev
 
   short=(
diff --git a/completions/bash/swaymsg b/completions/bash/swaymsg
index f865e4e1..30457751 100644
--- a/completions/bash/swaymsg
+++ b/completions/bash/swaymsg
@@ -2,7 +2,7 @@
 
 _swaymsg()
 {
-  local cur prev
+  local cur prev types short long
   _get_comp_words_by_ref cur prev
 
   types=(
diff --git a/completions/meson.build b/completions/meson.build
new file mode 100644
index 00000000..6bca9391
--- /dev/null
+++ b/completions/meson.build
@@ -0,0 +1,57 @@
+if get_option('zsh-completions')
+        zsh_files = files(
+                'zsh/_sway',
+                'zsh/_swaymsg',
+        )
+        zsh_install_dir = join_paths(datadir, 'zsh', 'site-functions')
+
+        install_data(zsh_files, install_dir: zsh_install_dir)
+endif
+
+if get_option('bash-completions')
+        bash_comp = dependency('bash-completion', required: false)
+
+        bash_files = files(
+                'bash/sway',
+                'bash/swaymsg',
+        )
+
+        if get_option('swaybar')
+                bash_files += files('bash/swaybar')
+        endif
+
+        if bash_comp.found()
+                bash_install_dir = bash_comp.get_variable(
+                        pkgconfig: 'completionsdir',
+                        pkgconfig_define: ['datadir', datadir]
+                )
+        else
+                bash_install_dir = join_paths(datadir, 'bash-completion', 'completions')
+        endif
+
+        install_data(bash_files, install_dir: bash_install_dir)
+endif
+
+if get_option('fish-completions')
+        fish_comp = dependency('fish', required: false)
+
+        fish_files = files(
+                'fish/sway.fish',
+                'fish/swaymsg.fish',
+        )
+
+        if get_option('swaynag')
+                fish_files += files('fish/swaynag.fish')
+        endif
+
+        if fish_comp.found()
+                fish_install_dir = fish_comp.get_variable(
+                        pkgconfig: 'completionsdir',
+                        pkgconfig_define: ['datadir', datadir]
+                )
+        else
+                fish_install_dir = join_paths(datadir, 'fish', 'vendor_completions.d')
+        endif
+
+        install_data(fish_files, install_dir: fish_install_dir)
+endif
diff --git a/config.in b/config.in
index 08703bef..a5173165 100644
--- a/config.in
+++ b/config.in
@@ -14,11 +14,11 @@ set $down j
 set $up k
 set $right l
 # Your preferred terminal emulator
-set $term alacritty
+set $term foot
 # Your preferred application launcher
 # Note: pass the final command to swaymsg so that the resulting window can be opened
 # on the original workspace that the command was run on.
-set $menu dmenu_path | dmenu | xargs swaymsg exec --
+set $menu dmenu_path | wmenu | xargs swaymsg exec --
 
 ### Output configuration
 #
@@ -37,7 +37,7 @@ output * bg @datadir@/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
 #
 # exec swayidle -w \
 #          timeout 300 'swaylock -f -c 000000' \
-#          timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
+#          timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \
 #          before-sleep 'swaylock -f -c 000000'
 #
 # This will lock your screen after 300 seconds of inactivity, then turn off
@@ -82,7 +82,7 @@ output * bg @datadir@/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
     bindsym $mod+Shift+c reload
 
     # Exit sway (logs you out of your Wayland session)
-    bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'
+    bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'
 #
 # Moving around:
 #
@@ -205,7 +205,7 @@ bar {
 
     # When the status_command prints a new line to stdout, swaybar updates.
     # The default just shows the current date and time.
-    status_command while date +'%Y-%m-%d %l:%M:%S %p'; do sleep 1; done
+    status_command while date +'%Y-%m-%d %X'; do sleep 1; done
 
     colors {
         statusline #ffffff
diff --git a/contrib/_incr_version b/contrib/_incr_version
deleted file mode 100755
index a4fa2654..00000000
--- a/contrib/_incr_version
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh -eu
-old_version="$1"
-new_version="$2"
-
-if [ "$new_version" != "${new_version#v}" ]
-then
-        echo "Error: The new version shouldn't be prefixed with a \"v\"." >&2
-        exit 1
-fi
-
-sed -i meson.build -e "s/^      version: .*#release_version/    version: '$new_version', #release_version/g"
-
-printf "Minimum wlroots version? "
-read wlr_version_min
-printf "Maximum wlroots version? "
-read wlr_version_max
-
-sed -i meson.build -e "s/wlroots_version =.*/wlroots_version = ['>=$wlr_version_min', '<$wlr_version_max']/"
-
-git add meson.build
-git commit -m "Update version to $new_version"
diff --git a/contrib/autoname-workspaces.py b/contrib/autoname-workspaces.py
deleted file mode 100755
index 297d91b2..00000000
--- a/contrib/autoname-workspaces.py
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/usr/bin/python
-
-# This script requires i3ipc-python package (install it from a system package manager
-# or pip).
-# It adds icons to the workspace name for each open window.
-# Set your keybindings like this: set $workspace1 workspace number 1
-# Add your icons to WINDOW_ICONS.
-# Based on https://github.com/maximbaz/dotfiles/blob/master/bin/i3-autoname-workspaces
-
-import argparse
-import i3ipc
-import logging
-import re
-import signal
-import sys
-
-WINDOW_ICONS = {
-    "firefox": "",
-}
-
-DEFAULT_ICON = "�"
-
-
-def icon_for_window(window):
-    app_id = window.app_id
-    if app_id is not None and len(app_id) > 0:
-        app_id = app_id.lower()
-        if app_id in WINDOW_ICONS:
-            return WINDOW_ICONS[app_id]
-        logging.info("No icon available for window with app_id: %s" % str(app_id))
-    else:
-        # xwayland support
-        class_name = window.window_class
-        if len(class_name) > 0:
-            class_name = class_name.lower()
-            if class_name in WINDOW_ICONS:
-                return WINDOW_ICONS[class_name]
-            logging.info(
-                "No icon available for window with class_name: %s" % str(class_name)
-            )
-    return DEFAULT_ICON
-
-
-def rename_workspaces(ipc):
-    for workspace in ipc.get_tree().workspaces():
-        name_parts = parse_workspace_name(workspace.name)
-        icon_tuple = ()
-        for w in workspace:
-            if w.app_id is not None or w.window_class is not None:
-                icon = icon_for_window(w)
-                if not ARGUMENTS.duplicates and icon in icon_tuple:
-                    continue
-                icon_tuple += (icon,)
-        name_parts["icons"] = "  ".join(icon_tuple) + " "
-        new_name = construct_workspace_name(name_parts)
-        ipc.command('rename workspace "%s" to "%s"' % (workspace.name, new_name))
-
-
-def undo_window_renaming(ipc):
-    for workspace in ipc.get_tree().workspaces():
-        name_parts = parse_workspace_name(workspace.name)
-        name_parts["icons"] = None
-        new_name = construct_workspace_name(name_parts)
-        ipc.command('rename workspace "%s" to "%s"' % (workspace.name, new_name))
-    ipc.main_quit()
-    sys.exit(0)
-
-
-def parse_workspace_name(name):
-    return re.match(
-        "(?P<num>[0-9]+):?(?P<shortname>\w+)? ?(?P<icons>.+)?", name
-    ).groupdict()
-
-
-def construct_workspace_name(parts):
-    new_name = str(parts["num"])
-    if parts["shortname"] or parts["icons"]:
-        new_name += ":"
-
-        if parts["shortname"]:
-            new_name += parts["shortname"]
-
-        if parts["icons"]:
-            new_name += " " + parts["icons"]
-
-    return new_name
-
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(
-        description="This script automatically changes the workspace name in sway depending on your open applications."
-    )
-    parser.add_argument(
-        "--duplicates",
-        "-d",
-        action="store_true",
-        help="Set it when you want an icon for each instance of the same application per workspace.",
-    )
-    parser.add_argument(
-        "--logfile",
-        "-l",
-        type=str,
-        default="/tmp/sway-autoname-workspaces.log",
-        help="Path for the logfile.",
-    )
-    args = parser.parse_args()
-    global ARGUMENTS
-    ARGUMENTS = args
-
-    logging.basicConfig(
-        level=logging.INFO,
-        filename=ARGUMENTS.logfile,
-        filemode="w",
-        format="%(message)s",
-    )
-
-    ipc = i3ipc.Connection()
-
-    for sig in [signal.SIGINT, signal.SIGTERM]:
-        signal.signal(sig, lambda signal, frame: undo_window_renaming(ipc))
-
-    def window_event_handler(ipc, e):
-        if e.change in ["new", "close", "move"]:
-            rename_workspaces(ipc)
-
-    ipc.on("window", window_event_handler)
-
-    rename_workspaces(ipc)
-
-    ipc.main()
diff --git a/contrib/grimshot b/contrib/grimshot
deleted file mode 100755
index 461a5eef..00000000
--- a/contrib/grimshot
+++ /dev/null
@@ -1,154 +0,0 @@
-#!/bin/sh
-
-## Grimshot: a helper for screenshots within sway
-## Requirements:
-##  - `grim`: screenshot utility for wayland
-##  - `slurp`: to select an area
-##  - `swaymsg`: to read properties of current window
-##  - `wl-copy`: clipboard utility
-##  - `jq`: json utility to parse swaymsg output
-##  - `notify-send`: to show notifications
-## Those are needed to be installed, if unsure, run `grimshot check`
-##
-## See `man 1 grimshot` or `grimshot usage` for further details.
-
-getTargetDirectory() {
-  test -f ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs && \
-    . ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs
-
-  echo ${XDG_SCREENSHOTS_DIR:-${XDG_PICTURES_DIR:-$HOME}}
-}
-
-if [ "$1" = "--notify" ]; then
-  NOTIFY=yes
-  shift 1
-else
-  NOTIFY=no
-fi
-
-ACTION=${1:-usage}
-SUBJECT=${2:-screen}
-FILE=${3:-$(getTargetDirectory)/$(date -Ins).png}
-
-if [ "$ACTION" != "save" ] && [ "$ACTION" != "copy" ] && [ "$ACTION" != "check" ]; then
-  echo "Usage:"
-  echo "  grimshot [--notify] (copy|save) [active|screen|output|area|window] [FILE]"
-  echo "  grimshot check"
-  echo "  grimshot usage"
-  echo ""
-  echo "Commands:"
-  echo "  copy: Copy the screenshot data into the clipboard."
-  echo "  save: Save the screenshot to a regular file."
-  echo "  check: Verify if required tools are installed and exit."
-  echo "  usage: Show this message and exit."
-  echo ""
-  echo "Targets:"
-  echo "  active: Currently active window."
-  echo "  screen: All visible outputs."
-  echo "  output: Currently active output."
-  echo "  area: Manually select a region."
-  echo "  window: Manually select a window."
-  exit
-fi
-
-notify() {
-  notify-send -t 3000 -a grimshot "$@"
-}
-notifyOk() {
-  [ "$NOTIFY" = "no" ] && return
-
-  TITLE=${2:-"Screenshot"}
-  MESSAGE=${1:-"OK"}
-  notify "$TITLE" "$MESSAGE"
-}
-notifyError() {
-  if [ $NOTIFY = "yes" ]; then
-    TITLE=${2:-"Screenshot"}
-    MESSAGE=${1:-"Error taking screenshot with grim"}
-    notify -u critical "$TITLE" "$MESSAGE"
-  else
-    echo $1
-  fi
-}
-
-die() {
-  MSG=${1:-Bye}
-  notifyError "Error: $MSG"
-  exit 2
-}
-
-check() {
-  COMMAND=$1
-  if command -v "$COMMAND" > /dev/null 2>&1; then
-    RESULT="OK"
-  else
-    RESULT="NOT FOUND"
-  fi
-  echo "   $COMMAND: $RESULT"
-}
-
-takeScreenshot() {
-  FILE=$1
-  GEOM=$2
-  OUTPUT=$3
-  if [ ! -z "$OUTPUT" ]; then
-    grim -o "$OUTPUT" "$FILE" || die "Unable to invoke grim"
-  elif [ -z "$GEOM" ]; then
-    grim "$FILE" || die "Unable to invoke grim"
-  else
-    grim -g "$GEOM" "$FILE" || die "Unable to invoke grim"
-  fi
-}
-
-if [ "$ACTION" = "check" ] ; then
-  echo "Checking if required tools are installed. If something is missing, install it to your system and make it available in PATH..."
-  check grim
-  check slurp
-  check swaymsg
-  check wl-copy
-  check jq
-  check notify-send
-  exit
-elif [ "$SUBJECT" = "area" ] ; then
-  GEOM=$(slurp -d)
-  # Check if user exited slurp without selecting the area
-  if [ -z "$GEOM" ]; then
-    exit
-  fi
-  WHAT="Area"
-elif [ "$SUBJECT" = "active" ] ; then
-  FOCUSED=$(swaymsg -t get_tree | jq -r 'recurse(.nodes[]?, .floating_nodes[]?) | select(.focused)')
-  GEOM=$(echo "$FOCUSED" | jq -r '.rect | "\(.x),\(.y) \(.width)x\(.height)"')
-  APP_ID=$(echo "$FOCUSED" | jq -r '.app_id')
-  WHAT="$APP_ID window"
-elif [ "$SUBJECT" = "screen" ] ; then
-  GEOM=""
-  WHAT="Screen"
-elif [ "$SUBJECT" = "output" ] ; then
-  GEOM=""
-  OUTPUT=$(swaymsg -t get_outputs | jq -r '.[] | select(.focused)' | jq -r '.name')
-  WHAT="$OUTPUT"
-elif [ "$SUBJECT" = "window" ] ; then
-  GEOM=$(swaymsg -t get_tree | jq -r '.. | select(.pid? and .visible?) | .rect | "\(.x),\(.y) \(.width)x\(.height)"' | slurp)
-  # Check if user exited slurp without selecting the area
-  if [ -z "$GEOM" ]; then
-   exit
-  fi
-  WHAT="Window"
-else
-  die "Unknown subject to take a screen shot from" "$SUBJECT"
-fi
-
-if [ "$ACTION" = "copy" ] ; then
-  takeScreenshot - "$GEOM" "$OUTPUT" | wl-copy --type image/png || die "Clipboard error"
-  notifyOk "$WHAT copied to buffer"
-else
-  if takeScreenshot "$FILE" "$GEOM" "$OUTPUT"; then
-    TITLE="Screenshot of $SUBJECT"
-    MESSAGE=$(basename "$FILE")
-    notifyOk "$MESSAGE" "$TITLE"
-    echo $FILE
-  else
-    notifyError "Error taking screenshot with grim"
-  fi
-fi
diff --git a/contrib/grimshot.1 b/contrib/grimshot.1
deleted file mode 100644
index f6c8a377..00000000
--- a/contrib/grimshot.1
+++ /dev/null
@@ -1,103 +0,0 @@
-.\" Generated by scdoc 1.11.1
-.\" Complete documentation for this program is not available as a GNU info page
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.nh
-.ad l
-.\" Begin generated content:
-.TH "grimshot" "1" "2020-12-20"
-.P
-.SH NAME
-.P
-grimshot - a helper for screenshots within sway
-.P
-.SH SYNOPSIS
-.P
-\fBgrimshot\fR [--notify] (copy|save) [TARGET] [FILE]
-.br
-\fBgrimshot\fR check
-.br
-\fBgrimshot\fR usage
-.P
-.SH OPTIONS
-.P
-\fB--notify\fR
-.RS 4
-Show notifications to the user that a screenshot has been taken.\&
-.P
-.RE
-\fBsave\fR
-.RS 4
-Save the screenshot into a regular file.\& Grimshot will write images
-files to \fBXDG_SCREENSHOTS_DIR\fR if this is set (or defined
-in \fBuser-dirs.\&dir\fR), or otherwise fall back to \fBXDG_PICTURES_DIR\fR.\&
-.P
-.RE
-\fBcopy\fR
-.RS 4
-Copy the screenshot data (as image/png) into the clipboard.\&
-.P
-.RE
-.SH DESCRIPTION
-.P
-Grimshot is an easy-to-use screenshot utility for sway.\& It provides a
-convenient interface over grim, slurp and jq, and supports storing the
-screenshot either directly to the clipboard using wl-copy or to a file.\&
-.P
-.SH EXAMPLES
-.P
-An example usage pattern is to add these bindings to your sway config:
-.P
-.nf
-.RS 4
-# Screenshots:
-# Super+P: Current window
-# Super+Shift+p: Select area
-# Super+Alt+p Current output
-# Super+Ctrl+p Select a window
-
-bindsym Mod4+p       exec grimshot save active
-bindsym Mod4+Shift+p exec grimshot save area
-bindsym Mod4+Mod1+p  exec grimshot save output
-bindsym Mod4+Ctrl+p  exec grimshot save window
-.fi
-.RE
-.P
-.SH TARGETS
-.P
-grimshot can capture the following named targets:
-.P
-\fIactive\fR
-.RS 4
-Captures the currently active window.\&
-.P
-.RE
-\fIscreen\fR
-.RS 4
-Captures the entire screen.\& This includes all visible outputs.\&
-.P
-.RE
-\fIarea\fR
-.RS 4
-Allows manually selecting a rectangular region, and captures that.\&
-.P
-.RE
-\fIwindow\fR
-.RS 4
-Allows manually selecting a single window (by clicking on it), and
-captures it.\&
-.P
-.RE
-\fIoutput\fR
-.RS 4
-Captures the currently active output.\&
-.P
-.RE
-.SH OUTPUT
-.P
-Grimshot will print the filename of the captured screenshot to stdout if called
-with the \fIsave\fR subcommand.\&
-.P
-.SH SEE ALSO
-.P
-\fBgrim\fR(1)
diff --git a/contrib/grimshot.1.scd b/contrib/grimshot.1.scd
deleted file mode 100644
index 4ab58532..00000000
--- a/contrib/grimshot.1.scd
+++ /dev/null
@@ -1,76 +0,0 @@
-grimshot(1)
-
-# NAME
-
-grimshot - a helper for screenshots within sway
-
-# SYNOPSIS
-
-*grimshot* [--notify] (copy|save) [TARGET] [FILE]++
-*grimshot* check++
-*grimshot* usage
-
-# OPTIONS
-
-*--notify*
-        Show notifications to the user that a screenshot has been taken.
-
-*save*
-        Save the screenshot into a regular file. Grimshot will write images
-        files to *XDG_SCREENSHOTS_DIR* if this is set (or defined
-        in *user-dirs.dir*), or otherwise fall back to *XDG_PICTURES_DIR*.
-
-*copy*
-        Copy the screenshot data (as image/png) into the clipboard.
-
-# DESCRIPTION
-
-Grimshot is an easy-to-use screenshot utility for sway. It provides a
-convenient interface over grim, slurp and jq, and supports storing the
-screenshot either directly to the clipboard using wl-copy or to a file.
-
-# EXAMPLES
-
-An example usage pattern is to add these bindings to your sway config:
-
-```
-# Screenshots:
-# Super+P: Current window
-# Super+Shift+p: Select area
-# Super+Alt+p Current output
-# Super+Ctrl+p Select a window
-
-bindsym Mod4+p       exec grimshot save active
-bindsym Mod4+Shift+p exec grimshot save area
-bindsym Mod4+Mod1+p  exec grimshot save output
-bindsym Mod4+Ctrl+p  exec grimshot save window
-```
-
-# TARGETS
-
-grimshot can capture the following named targets:
-
-_active_
-        Captures the currently active window.
-
-_screen_
-        Captures the entire screen. This includes all visible outputs.
-
-_area_
-        Allows manually selecting a rectangular region, and captures that.
-
-_window_
-        Allows manually selecting a single window (by clicking on it), and
-        captures it.
-
-_output_
-        Captures the currently active output.
-
-# OUTPUT
-
-Grimshot will print the filename of the captured screenshot to stdout if called
-with the _save_ subcommand.
-
-# SEE ALSO
-
-*grim*(1)
diff --git a/contrib/inactive-windows-transparency.py b/contrib/inactive-windows-transparency.py
deleted file mode 100755
index 77b1f221..00000000
--- a/contrib/inactive-windows-transparency.py
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/python
-
-# This script requires i3ipc-python package (install it from a system package manager
-# or pip).
-# It makes inactive windows transparent. Use `transparency_val` variable to control
-# transparency strength in range of 0…1 or use the command line argument -o.
-
-import argparse
-import i3ipc
-import signal
-import sys
-from functools import partial
-
-def on_window_focus(inactive_opacity, ipc, event):
-    global prev_focused
-    global prev_workspace
-
-    focused = event.container
-    workspace = ipc.get_tree().find_focused().workspace().num
-
-    if focused.id != prev_focused.id:  # https://github.com/swaywm/sway/issues/2859
-        focused.command("opacity 1")
-        if workspace == prev_workspace:
-            prev_focused.command("opacity " + inactive_opacity)
-        prev_focused = focused
-        prev_workspace = workspace
-
-
-def remove_opacity(ipc):
-    for workspace in ipc.get_tree().workspaces():
-        for w in workspace:
-            w.command("opacity 1")
-    ipc.main_quit()
-    sys.exit(0)
-
-
-if __name__ == "__main__":
-    transparency_val = "0.80"
-
-    parser = argparse.ArgumentParser(
-        description="This script allows you to set the transparency of unfocused windows in sway."
-    )
-    parser.add_argument(
-        "--opacity",
-        "-o",
-        type=str,
-        default=transparency_val,
-        help="set opacity value in range 0...1",
-    )
-    args = parser.parse_args()
-
-    ipc = i3ipc.Connection()
-    prev_focused = None
-    prev_workspace = ipc.get_tree().find_focused().workspace().num
-
-    for window in ipc.get_tree():
-        if window.focused:
-            prev_focused = window
-        else:
-            window.command("opacity " + args.opacity)
-    for sig in [signal.SIGINT, signal.SIGTERM]:
-        signal.signal(sig, lambda signal, frame: remove_opacity(ipc))
-    ipc.on("window::focus", partial(on_window_focus, args.opacity))
-    ipc.main()
\ No newline at end of file
diff --git a/include/background-image.h b/include/background-image.h
deleted file mode 100644
index 15935ffd..00000000
--- a/include/background-image.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _SWAY_BACKGROUND_IMAGE_H
-#define _SWAY_BACKGROUND_IMAGE_H
-#include "cairo.h"
-
-enum background_mode {
-        BACKGROUND_MODE_STRETCH,
-        BACKGROUND_MODE_FILL,
-        BACKGROUND_MODE_FIT,
-        BACKGROUND_MODE_CENTER,
-        BACKGROUND_MODE_TILE,
-        BACKGROUND_MODE_SOLID_COLOR,
-        BACKGROUND_MODE_INVALID,
-};
-
-enum background_mode parse_background_mode(const char *mode);
-cairo_surface_t *load_background_image(const char *path);
-void render_background_image(cairo_t *cairo, cairo_surface_t *image,
-                enum background_mode mode, int buffer_width, int buffer_height);
-
-#endif
diff --git a/include/cairo.h b/include/cairo_util.h
index c1275db2..dc049c6d 100644
--- a/include/cairo.h
+++ b/include/cairo_util.h
@@ -1,8 +1,8 @@
-#ifndef _SWAY_CAIRO_H
-#define _SWAY_CAIRO_H
+#ifndef _SWAY_CAIRO_UTIL_H
+#define _SWAY_CAIRO_UTIL_H
 #include "config.h"
 #include <stdint.h>
-#include <cairo/cairo.h>
+#include <cairo.h>
 #include <wayland-client-protocol.h>
 
 void cairo_set_source_u32(cairo_t *cairo, uint32_t color);
diff --git a/include/gesture.h b/include/gesture.h
new file mode 100644
index 00000000..9c6b0f91
--- /dev/null
+++ b/include/gesture.h
@@ -0,0 +1,104 @@
+#ifndef _SWAY_GESTURE_H
+#define _SWAY_GESTURE_H
+
+#include <stdbool.h>
+#include <stdint.h>
+
+/**
+ * A gesture type used in binding.
+ */
+enum gesture_type {
+        GESTURE_TYPE_NONE = 0,
+        GESTURE_TYPE_HOLD,
+        GESTURE_TYPE_PINCH,
+        GESTURE_TYPE_SWIPE,
+};
+
+// Turns single type enum value to constant string representation.
+const char *gesture_type_string(enum gesture_type direction);
+
+// Value to use to accept any finger count
+extern const uint8_t GESTURE_FINGERS_ANY;
+
+/**
+ * A gesture direction used in binding.
+ */
+enum gesture_direction {
+        GESTURE_DIRECTION_NONE = 0,
+        // Directions based on delta x and y
+        GESTURE_DIRECTION_UP = 1 << 0,
+        GESTURE_DIRECTION_DOWN = 1 << 1,
+        GESTURE_DIRECTION_LEFT = 1 << 2,
+        GESTURE_DIRECTION_RIGHT = 1 << 3,
+        // Directions based on scale
+        GESTURE_DIRECTION_INWARD = 1 << 4,
+        GESTURE_DIRECTION_OUTWARD = 1 << 5,
+        // Directions based on rotation
+        GESTURE_DIRECTION_CLOCKWISE = 1 << 6,
+        GESTURE_DIRECTION_COUNTERCLOCKWISE = 1 << 7,
+};
+
+// Turns single direction enum value to constant string representation.
+const char *gesture_direction_string(enum gesture_direction direction);
+
+/**
+ * Struct representing a pointer gesture
+ */
+struct gesture {
+        enum gesture_type type;
+        uint8_t fingers;
+        uint32_t directions;
+};
+
+/**
+ * Parses gesture from <gesture>[:<fingers>][:<directions>] string.
+ *
+ * Return NULL on success, otherwise error message string
+ */
+char *gesture_parse(const char *input, struct gesture *output);
+
+// Turns gesture into string representation
+char *gesture_to_string(struct gesture *gesture);
+
+// Check if gesture is of certain type and finger count.
+bool gesture_check(struct gesture *target,
+                enum gesture_type type, uint8_t fingers);
+
+// Check if a gesture target/binding is match by other gesture/input
+bool gesture_match(struct gesture *target,
+                struct gesture *to_match, bool exact);
+
+// Returns true if gesture are exactly the same
+bool gesture_equal(struct gesture *a, struct gesture *b);
+
+// Compare distance between two matched target gestures.
+int8_t gesture_compare(struct gesture *a, struct gesture *b);
+
+// Small helper struct to track gestures over time
+struct gesture_tracker {
+        enum gesture_type type;
+        uint8_t fingers;
+        double dx, dy;
+        double scale;
+        double rotation;
+};
+
+// Begin gesture tracking
+void gesture_tracker_begin(struct gesture_tracker *tracker,
+                enum gesture_type type, uint8_t fingers);
+
+// Check if the provides type is currently being tracked
+bool gesture_tracker_check(struct gesture_tracker *tracker,
+                enum gesture_type type);
+
+// Update gesture track with new data point
+void gesture_tracker_update(struct gesture_tracker *tracker, double dx,
+                double dy, double scale, double rotation);
+
+// Reset tracker
+void gesture_tracker_cancel(struct gesture_tracker *tracker);
+
+// Reset tracker and return gesture tracked
+struct gesture *gesture_tracker_end(struct gesture_tracker *tracker);
+
+#endif
diff --git a/include/ipc-client.h b/include/ipc-client.h
index d3895023..9c5712d7 100644
--- a/include/ipc-client.h
+++ b/include/ipc-client.h
@@ -1,6 +1,9 @@
 #ifndef _SWAY_IPC_CLIENT_H
 #define _SWAY_IPC_CLIENT_H
 
+// arbitrary number, it's probably sufficient, higher number = more memory usage
+#define JSON_MAX_DEPTH 512
+
 #include <stdbool.h>
 #include <stdint.h>
 #include <sys/time.h>
diff --git a/include/pango.h b/include/pango.h
index 6ab83c16..228e39cf 100644
--- a/include/pango.h
+++ b/include/pango.h
@@ -3,8 +3,9 @@
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <cairo/cairo.h>
+#include <cairo.h>
 #include <pango/pangocairo.h>
+#include "stringop.h"
 
 /**
  * Utility function which escape characters a & < > ' ".
@@ -13,11 +14,12 @@
  * escaped string to dest if provided.
  */
 size_t escape_markup_text(const char *src, char *dest);
-PangoLayout *get_pango_layout(cairo_t *cairo, const char *font,
+PangoLayout *get_pango_layout(cairo_t *cairo, const PangoFontDescription *desc,
                 const char *text, double scale, bool markup);
-void get_text_size(cairo_t *cairo, const char *font, int *width, int *height,
-                int *baseline, double scale, bool markup, const char *fmt, ...);
-void pango_printf(cairo_t *cairo, const char *font,
-                double scale, bool markup, const char *fmt, ...);
+void get_text_size(cairo_t *cairo, const PangoFontDescription *desc, int *width, int *height,
+                int *baseline, double scale, bool markup, const char *fmt, ...) _SWAY_ATTRIB_PRINTF(8, 9);
+void get_text_metrics(const PangoFontDescription *desc, int *height, int *baseline);
+void render_text(cairo_t *cairo, PangoFontDescription *desc,
+                double scale, bool markup, const char *fmt, ...) _SWAY_ATTRIB_PRINTF(5, 6);
 
 #endif
diff --git a/include/pool-buffer.h b/include/pool-buffer.h
index 54f5be06..b7a95afe 100644
--- a/include/pool-buffer.h
+++ b/include/pool-buffer.h
@@ -1,6 +1,6 @@
 #ifndef _SWAY_BUFFERS_H
 #define _SWAY_BUFFERS_H
-#include <cairo/cairo.h>
+#include <cairo.h>
 #include <pango/pangocairo.h>
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/include/stringop.h b/include/stringop.h
index 8d7089e9..19a50f23 100644
--- a/include/stringop.h
+++ b/include/stringop.h
@@ -2,8 +2,15 @@
 #define _SWAY_STRINGOP_H
 
 #include <stdbool.h>
+#include <stddef.h>
 #include "list.h"
 
+#ifdef __GNUC__
+#define _SWAY_ATTRIB_PRINTF(start, end) __attribute__((format(printf, start, end)))
+#else
+#define _SWAY_ATTRIB_PRINTF(start, end)
+#endif
+
 void strip_whitespace(char *str);
 void strip_quotes(char *str);
 
@@ -30,4 +37,7 @@ char *argsep(char **stringp, const char *delim, char *matched_delim);
 // Expand a path using shell replacements such as $HOME and ~
 bool expand_path(char **path);
 
+char *vformat_str(const char *fmt, va_list args) _SWAY_ATTRIB_PRINTF(1, 0);
+char *format_str(const char *fmt, ...) _SWAY_ATTRIB_PRINTF(1, 2);
+
 #endif
diff --git a/include/sway/commands.h b/include/sway/commands.h
index 964b3661..27058587 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -3,13 +3,14 @@
 
 #include <wlr/util/edges.h>
 #include "config.h"
+#include "stringop.h"
 
 struct sway_container;
 
 typedef struct cmd_results *sway_cmd(int argc, char **argv);
 
 struct cmd_handler {
-        char *command;
+        const char *command;
         sway_cmd *handle;
 };
 
@@ -46,8 +47,8 @@ enum expected_args {
 struct cmd_results *checkarg(int argc, const char *name,
                 enum expected_args type, int val);
 
-struct cmd_handler *find_handler(char *line, struct cmd_handler *cmd_handlers,
-                size_t handlers_size);
+const struct cmd_handler *find_handler(const char *line,
+                const struct cmd_handler *cmd_handlers, size_t handlers_size);
 
 /**
  * Parse and executes a command.
@@ -68,7 +69,7 @@ struct cmd_results *config_command(char *command, char **new_block);
  * Parse and handle a sub command
  */
 struct cmd_results *config_subcommand(char **argv, int argc,
-                struct cmd_handler *handlers, size_t handlers_size);
+                const struct cmd_handler *handlers, size_t handlers_size);
 /*
  * Parses a command policy rule.
  */
@@ -76,7 +77,7 @@ struct cmd_results *config_commands_command(char *exec);
 /**
  * Allocates a cmd_results object.
  */
-struct cmd_results *cmd_results_new(enum cmd_status status, const char *error, ...);
+struct cmd_results *cmd_results_new(enum cmd_status status, const char *error, ...) _SWAY_ATTRIB_PRINTF(2, 3);
 /**
  * Frees a cmd_results object.
  */
@@ -106,12 +107,14 @@ sway_cmd cmd_exec_process;
 sway_cmd cmd_assign;
 sway_cmd cmd_bar;
 sway_cmd cmd_bindcode;
+sway_cmd cmd_bindgesture;
 sway_cmd cmd_bindswitch;
 sway_cmd cmd_bindsym;
 sway_cmd cmd_border;
 sway_cmd cmd_client_noop;
 sway_cmd cmd_client_focused;
 sway_cmd cmd_client_focused_inactive;
+sway_cmd cmd_client_focused_tab_title;
 sway_cmd cmd_client_unfocused;
 sway_cmd cmd_client_urgent;
 sway_cmd cmd_client_placeholder;
@@ -157,12 +160,11 @@ sway_cmd cmd_new_float;
 sway_cmd cmd_new_window;
 sway_cmd cmd_nop;
 sway_cmd cmd_opacity;
-sway_cmd cmd_new_float;
-sway_cmd cmd_new_window;
 sway_cmd cmd_no_focus;
 sway_cmd cmd_output;
 sway_cmd cmd_permit;
 sway_cmd cmd_popup_during_fullscreen;
+sway_cmd cmd_primary_selection;
 sway_cmd cmd_reject;
 sway_cmd cmd_reload;
 sway_cmd cmd_rename;
@@ -190,6 +192,7 @@ sway_cmd cmd_titlebar_border_thickness;
 sway_cmd cmd_titlebar_padding;
 sway_cmd cmd_unbindcode;
 sway_cmd cmd_unbindswitch;
+sway_cmd cmd_unbindgesture;
 sway_cmd cmd_unbindsym;
 sway_cmd cmd_unmark;
 sway_cmd cmd_urgent;
@@ -249,6 +252,7 @@ sway_cmd input_cmd_click_method;
 sway_cmd input_cmd_drag;
 sway_cmd input_cmd_drag_lock;
 sway_cmd input_cmd_dwt;
+sway_cmd input_cmd_dwtp;
 sway_cmd input_cmd_events;
 sway_cmd input_cmd_left_handed;
 sway_cmd input_cmd_map_from_region;
@@ -257,10 +261,12 @@ sway_cmd input_cmd_map_to_region;
 sway_cmd input_cmd_middle_emulation;
 sway_cmd input_cmd_natural_scroll;
 sway_cmd input_cmd_pointer_accel;
+sway_cmd input_cmd_rotation_angle;
 sway_cmd input_cmd_scroll_factor;
 sway_cmd input_cmd_repeat_delay;
 sway_cmd input_cmd_repeat_rate;
 sway_cmd input_cmd_scroll_button;
+sway_cmd input_cmd_scroll_button_lock;
 sway_cmd input_cmd_scroll_method;
 sway_cmd input_cmd_tap;
 sway_cmd input_cmd_tap_button_map;
@@ -282,12 +288,16 @@ sway_cmd output_cmd_dpms;
 sway_cmd output_cmd_enable;
 sway_cmd output_cmd_max_render_time;
 sway_cmd output_cmd_mode;
+sway_cmd output_cmd_modeline;
 sway_cmd output_cmd_position;
+sway_cmd output_cmd_power;
+sway_cmd output_cmd_render_bit_depth;
 sway_cmd output_cmd_scale;
 sway_cmd output_cmd_scale_filter;
 sway_cmd output_cmd_subpixel;
 sway_cmd output_cmd_toggle;
 sway_cmd output_cmd_transform;
+sway_cmd output_cmd_unplug;
 
 sway_cmd seat_cmd_attach;
 sway_cmd seat_cmd_cursor;
diff --git a/include/sway/config.h b/include/sway/config.h
index 59f22ae2..f9da1967 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -5,16 +5,20 @@
 #include <string.h>
 #include <time.h>
 #include <wlr/interfaces/wlr_switch.h>
-#include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_tablet_tool.h>
+#include <wlr/util/box.h>
 #include <xkbcommon/xkbcommon.h>
+#include <xf86drmMode.h>
 #include "../include/config.h"
+#include "gesture.h"
 #include "list.h"
+#include "stringop.h"
 #include "swaynag.h"
 #include "tree/container.h"
 #include "sway/input/tablet.h"
 #include "sway/tree/root.h"
 #include "wlr-layer-shell-unstable-v1-protocol.h"
+#include <pango/pangocairo.h>
 
 // TODO: Refactor this shit
 
@@ -31,7 +35,8 @@ enum binding_input_type {
         BINDING_KEYSYM,
         BINDING_MOUSECODE,
         BINDING_MOUSESYM,
-        BINDING_SWITCH
+        BINDING_SWITCH, // dummy, only used to call seat_execute_command
+        BINDING_GESTURE // dummy, only used to call seat_execute_command
 };
 
 enum binding_flags {
@@ -44,10 +49,11 @@ enum binding_flags {
         BINDING_RELOAD = 1 << 6, // switch only; (re)trigger binding on reload
         BINDING_INHIBITED = 1 << 7, // keyboard only: ignore shortcut inhibitor
         BINDING_NOREPEAT = 1 << 8, // keyboard only; do not trigger when repeating a held key
+        BINDING_EXACT = 1 << 9, // gesture only; only trigger on exact match
 };
 
 /**
- * A key binding and an associated command.
+ * A key (or mouse) binding and an associated command.
  */
 struct sway_binding {
         enum binding_input_type type;
@@ -61,12 +67,10 @@ struct sway_binding {
         char *command;
 };
 
-/**
- * A mouse binding and an associated command.
- */
-struct sway_mouse_binding {
-        uint32_t button;
-        char *command;
+enum sway_switch_trigger {
+        SWAY_SWITCH_TRIGGER_OFF,
+        SWAY_SWITCH_TRIGGER_ON,
+        SWAY_SWITCH_TRIGGER_TOGGLE,
 };
 
 /**
@@ -74,12 +78,22 @@ struct sway_mouse_binding {
  */
 struct sway_switch_binding {
         enum wlr_switch_type type;
-        enum wlr_switch_state state;
+        enum sway_switch_trigger trigger;
         uint32_t flags;
         char *command;
 };
 
 /**
+ * A gesture binding and an associated command.
+ */
+struct sway_gesture_binding {
+        char *input;
+        uint32_t flags;
+        struct gesture gesture;
+        char *command;
+};
+
+/**
  * Focus on window activation.
  */
 enum sway_fowa {
@@ -98,6 +112,7 @@ struct sway_mode {
         list_t *keycode_bindings;
         list_t *mouse_bindings;
         list_t *switch_bindings;
+        list_t *gesture_bindings;
         bool pango;
 };
 
@@ -136,14 +151,17 @@ struct input_config {
         int drag;
         int drag_lock;
         int dwt;
+        int dwtp;
         int left_handed;
         int middle_emulation;
         int natural_scroll;
         float pointer_accel;
+        float rotation_angle;
         float scroll_factor;
         int repeat_delay;
         int repeat_rate;
         int scroll_button;
+        int scroll_button_lock;
         int scroll_method;
         int send_events;
         int tap;
@@ -233,12 +251,6 @@ struct seat_config {
         } xcursor_theme;
 };
 
-enum config_dpms {
-        DPMS_IGNORE,
-        DPMS_ON,
-        DPMS_OFF,
-};
-
 enum scale_filter_mode {
         SCALE_FILTER_DEFAULT, // the default is currently smart
         SCALE_FILTER_LINEAR,
@@ -246,6 +258,12 @@ enum scale_filter_mode {
         SCALE_FILTER_SMART,
 };
 
+enum render_bit_depth {
+        RENDER_BIT_DEPTH_DEFAULT, // the default is currently 8
+        RENDER_BIT_DEPTH_8,
+        RENDER_BIT_DEPTH_10,
+};
+
 /**
  * Size and position configuration for a particular output.
  *
@@ -254,9 +272,11 @@ enum scale_filter_mode {
 struct output_config {
         char *name;
         int enabled;
+        int power;
         int width, height;
         float refresh_rate;
         int custom_mode;
+        drmModeModeInfo drm_mode;
         int x, y;
         float scale;
         enum scale_filter_mode scale_filter;
@@ -264,11 +284,11 @@ struct output_config {
         enum wl_output_subpixel subpixel;
         int max_render_time; // In milliseconds
         int adaptive_sync;
+        enum render_bit_depth render_bit_depth;
 
         char *background;
         char *background_option;
         char *background_fallback;
-        enum config_dpms dpms_state;
 };
 
 /**
@@ -281,6 +301,12 @@ struct side_gaps {
         int left;
 };
 
+enum smart_gaps_mode {
+        SMART_GAPS_OFF,
+        SMART_GAPS_ON,
+        SMART_GAPS_INVERSE_OUTER,
+};
+
 /**
  * Stores configuration for a workspace, regardless of whether the workspace
  * exists.
@@ -292,6 +318,12 @@ struct workspace_config {
         struct side_gaps gaps_outer;
 };
 
+enum pango_markup_config {
+        PANGO_MARKUP_DISABLED = false,
+        PANGO_MARKUP_ENABLED = true,
+        PANGO_MARKUP_DEFAULT // The default is font dependent ("pango:" prefix)
+};
+
 struct bar_config {
         char *swaybar_command;
         struct wl_client *client;
@@ -323,7 +355,7 @@ struct bar_config {
         char *position;
         list_t *bindings;
         char *status_command;
-        bool pango_markup;
+        enum pango_markup_config pango_markup;
         char *font;
         int height; // -1 not defined
         bool workspace_buttons;
@@ -410,14 +442,6 @@ enum sway_popup_during_fullscreen {
         POPUP_LEAVE,
 };
 
-enum command_context {
-        CONTEXT_CONFIG = 1 << 0,
-        CONTEXT_BINDING = 1 << 1,
-        CONTEXT_IPC = 1 << 2,
-        CONTEXT_CRITERIA = 1 << 3,
-        CONTEXT_ALL = 0xFFFFFFFF,
-};
-
 enum focus_follows_mouse_mode {
         FOLLOWS_NO,
         FOLLOWS_YES,
@@ -479,9 +503,10 @@ struct sway_config {
         char *floating_scroll_right_cmd;
         enum sway_container_layout default_orientation;
         enum sway_container_layout default_layout;
-        char *font;
-        size_t font_height;
-        size_t font_baseline;
+        char *font; // Used for IPC.
+        PangoFontDescription *font_description; // Used internally for rendering and validating.
+        int font_height;
+        int font_baseline;
         bool pango_markup;
         int titlebar_border_thickness;
         int titlebar_h_padding;
@@ -508,11 +533,12 @@ struct sway_config {
         bool auto_back_and_forth;
         bool show_marks;
         enum alignment title_align;
+        bool primary_selection;
 
         bool tiling_drag;
         int tiling_drag_threshold;
 
-        bool smart_gaps;
+        enum smart_gaps_mode smart_gaps;
         int gaps_inner;
         struct side_gaps gaps_outer;
 
@@ -535,12 +561,15 @@ struct sway_config {
         struct {
                 struct border_colors focused;
                 struct border_colors focused_inactive;
+                struct border_colors focused_tab_title;
                 struct border_colors unfocused;
                 struct border_colors urgent;
                 struct border_colors placeholder;
                 float background[4];
         } border_colors;
 
+        bool has_focused_tab_title;
+
         // floating view
         int32_t floating_maximum_width;
         int32_t floating_maximum_height;
@@ -559,7 +588,7 @@ struct sway_config {
                 struct sway_node *node;
                 struct sway_container *container;
                 struct sway_workspace *workspace;
-                bool using_criteria;
+                bool node_overridden; // True if the node is selected by means other than focus
                 struct {
                         int argc;
                         char **argv;
@@ -598,7 +627,7 @@ void run_deferred_bindings(void);
 /**
  * Adds a warning entry to the swaynag instance used for errors.
  */
-void config_add_swaynag_warning(char *fmt, ...);
+void config_add_swaynag_warning(char *fmt, ...) _SWAY_ATTRIB_PRINTF(1, 2);
 
 /**
  * Free config struct
@@ -675,6 +704,8 @@ void free_sway_binding(struct sway_binding *sb);
 
 void free_switch_binding(struct sway_switch_binding *binding);
 
+void free_gesture_binding(struct sway_gesture_binding *binding);
+
 void seat_execute_command(struct sway_seat *seat, struct sway_binding *binding);
 
 void load_swaybar(struct bar_config *bar);
@@ -690,14 +721,13 @@ void free_bar_binding(struct bar_binding *binding);
 void free_workspace_config(struct workspace_config *wsc);
 
 /**
- * Updates the value of config->font_height based on the max title height
- * reported by each container. If recalculate is true, the containers will
- * recalculate their heights before reporting.
+ * Updates the value of config->font_height based on the metrics for title's
+ * font as reported by pango.
  *
  * If the height has changed, all containers will be rearranged to take on the
  * new size.
  */
-void config_update_font_height(bool recalculate);
+void config_update_font_height(void);
 
 /**
  * Convert bindsym into bindcode using the first configured layout.
diff --git a/include/sway/criteria.h b/include/sway/criteria.h
index ad8610cd..8da345ea 100644
--- a/include/sway/criteria.h
+++ b/include/sway/criteria.h
@@ -1,7 +1,8 @@
 #ifndef _SWAY_CRITERIA_H
 #define _SWAY_CRITERIA_H
 
-#include <pcre.h>
+#define PCRE2_CODE_UNIT_WIDTH 8
+#include <pcre2.h>
 #include "config.h"
 #include "list.h"
 #include "tree/view.h"
@@ -15,13 +16,13 @@ enum criteria_type {
 };
 
 enum pattern_type {
-        PATTERN_PCRE,
+        PATTERN_PCRE2,
         PATTERN_FOCUSED,
 };
 
 struct pattern {
         enum pattern_type match_type;
-        pcre *regex;
+        pcre2_code *regex;
 };
 
 struct criteria {
@@ -42,6 +43,7 @@ struct criteria {
         struct pattern *window_role;
         enum atom_name window_type;
 #endif
+        bool all;
         bool floating;
         bool tiling;
         char urgent; // 'l' for latest or 'o' for oldest
diff --git a/include/sway/desktop.h b/include/sway/desktop.h
deleted file mode 100644
index c969a76b..00000000
--- a/include/sway/desktop.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <wlr/types/wlr_surface.h>
-
-struct sway_container;
-struct sway_view;
-
-void desktop_damage_surface(struct wlr_surface *surface, double lx, double ly,
-        bool whole);
-
-void desktop_damage_whole_container(struct sway_container *con);
-
-void desktop_damage_box(struct wlr_box *box);
-
-void desktop_damage_view(struct sway_view *view);
diff --git a/include/sway/desktop/idle_inhibit_v1.h b/include/sway/desktop/idle_inhibit_v1.h
index 0adafdb9..84cc666d 100644
--- a/include/sway/desktop/idle_inhibit_v1.h
+++ b/include/sway/desktop/idle_inhibit_v1.h
@@ -1,8 +1,6 @@
 #ifndef _SWAY_DESKTOP_IDLE_INHIBIT_V1_H
 #define _SWAY_DESKTOP_IDLE_INHIBIT_V1_H
 #include <wlr/types/wlr_idle_inhibit_v1.h>
-#include <wlr/types/wlr_idle.h>
-#include "sway/server.h"
 
 enum sway_idle_inhibit_mode {
         INHIBIT_IDLE_APPLICATION,  // Application set inhibitor (when visible)
@@ -16,12 +14,10 @@ struct sway_idle_inhibit_manager_v1 {
         struct wlr_idle_inhibit_manager_v1 *wlr_manager;
         struct wl_listener new_idle_inhibitor_v1;
         struct wl_list inhibitors;
-
-        struct wlr_idle *idle;
 };
 
 struct sway_idle_inhibitor_v1 {
-        struct sway_idle_inhibit_manager_v1 *manager;
+        struct wlr_idle_inhibitor_v1 *wlr_inhibitor;
         struct sway_view *view;
         enum sway_idle_inhibit_mode mode;
 
@@ -32,8 +28,7 @@ struct sway_idle_inhibitor_v1 {
 bool sway_idle_inhibit_v1_is_active(
         struct sway_idle_inhibitor_v1 *inhibitor);
 
-void sway_idle_inhibit_v1_check_active(
-        struct sway_idle_inhibit_manager_v1 *manager);
+void sway_idle_inhibit_v1_check_active(void);
 
 void sway_idle_inhibit_v1_user_inhibitor_register(struct sway_view *view,
                 enum sway_idle_inhibit_mode mode);
@@ -47,6 +42,6 @@ struct sway_idle_inhibitor_v1 *sway_idle_inhibit_v1_application_inhibitor_for_vi
 void sway_idle_inhibit_v1_user_inhibitor_destroy(
                 struct sway_idle_inhibitor_v1 *inhibitor);
 
-struct sway_idle_inhibit_manager_v1 *sway_idle_inhibit_manager_v1_create(
-        struct wl_display *wl_display, struct wlr_idle *idle);
+bool sway_idle_inhibit_manager_v1_init(void);
+
 #endif
diff --git a/include/sway/desktop/launcher.h b/include/sway/desktop/launcher.h
new file mode 100644
index 00000000..b7716e82
--- /dev/null
+++ b/include/sway/desktop/launcher.h
@@ -0,0 +1,36 @@
+#ifndef _SWAY_LAUNCHER_H
+#define _SWAY_LAUNCHER_H
+
+#include <stdlib.h>
+#include <wayland-server-core.h>
+
+struct launcher_ctx {
+        pid_t pid;
+        char *fallback_name;
+        struct wlr_xdg_activation_token_v1 *token;
+        struct wl_listener token_destroy;
+
+        bool activated;
+
+        struct sway_node *node;
+        struct wl_listener node_destroy;
+
+        struct wl_list link; // sway_server::pending_launcher_ctxs
+};
+
+struct launcher_ctx *launcher_ctx_find_pid(pid_t pid);
+
+struct sway_workspace *launcher_ctx_get_workspace(struct launcher_ctx *ctx);
+
+void launcher_ctx_consume(struct launcher_ctx *ctx);
+
+void launcher_ctx_destroy(struct launcher_ctx *ctx);
+
+struct launcher_ctx *launcher_ctx_create_internal(void);
+
+struct launcher_ctx *launcher_ctx_create(
+        struct wlr_xdg_activation_token_v1 *token, struct sway_node *node);
+
+const char *launcher_ctx_get_token_name(struct launcher_ctx *ctx);
+
+#endif
diff --git a/include/sway/desktop/transaction.h b/include/sway/desktop/transaction.h
index 175489c5..17d41fa3 100644
--- a/include/sway/desktop/transaction.h
+++ b/include/sway/desktop/transaction.h
@@ -1,6 +1,7 @@
 #ifndef _SWAY_TRANSACTION_H
 #define _SWAY_TRANSACTION_H
 #include <stdint.h>
+#include <stdbool.h>
 
 /**
  * Transactions enable us to perform atomic layout updates.
@@ -28,12 +29,21 @@ struct sway_view;
  */
 void transaction_commit_dirty(void);
 
+/*
+ * Same as transaction_commit_dirty, but signalling that this is a
+ * client-initiated change has already taken effect.
+ */
+void transaction_commit_dirty_client(void);
+
 /**
  * Notify the transaction system that a view is ready for the new layout.
  *
  * When all views in the transaction are ready, the layout will be applied.
+ *
+ * A success boolean is returned denoting that this part of the transaction is
+ * ready.
  */
-void transaction_notify_view_ready_by_serial(struct sway_view *view,
+bool transaction_notify_view_ready_by_serial(struct sway_view *view,
                 uint32_t serial);
 
 /**
@@ -41,14 +51,11 @@ void transaction_notify_view_ready_by_serial(struct sway_view *view,
  * identifying the instruction by geometry rather than by serial.
  *
  * This is used by xwayland views, as they don't have serials.
+ *
+ * A success boolean is returned denoting that this part of the transaction is
+ * ready.
  */
-void transaction_notify_view_ready_by_geometry(struct sway_view *view,
+bool transaction_notify_view_ready_by_geometry(struct sway_view *view,
                 double x, double y, int width, int height);
 
-/**
- * Unconditionally notify the transaction system that a view is ready for the
- * new layout.
- */
-void transaction_notify_view_ready_immediately(struct sway_view *view);
-
 #endif
diff --git a/include/sway/input/cursor.h b/include/sway/input/cursor.h
index 6a38190b..1e21c66f 100644
--- a/include/sway/input/cursor.h
+++ b/include/sway/input/cursor.h
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <wlr/types/wlr_pointer_constraints_v1.h>
 #include <wlr/types/wlr_pointer_gestures_v1.h>
-#include <wlr/types/wlr_surface.h>
+#include <wlr/types/wlr_compositor.h>
 #include "sway/input/seat.h"
 #include "config.h"
 
@@ -35,7 +35,8 @@ struct sway_cursor {
         pixman_region32_t confine; // invalid if active_constraint == NULL
         bool active_confine_requires_warp;
 
-        struct wlr_pointer_gestures_v1 *pointer_gestures;
+        struct wl_listener hold_begin;
+        struct wl_listener hold_end;
         struct wl_listener pinch_begin;
         struct wl_listener pinch_update;
         struct wl_listener pinch_end;
@@ -51,8 +52,11 @@ struct sway_cursor {
 
         struct wl_listener touch_down;
         struct wl_listener touch_up;
+        struct wl_listener touch_cancel;
         struct wl_listener touch_motion;
+        struct wl_listener touch_frame;
         bool simulating_pointer_from_touch;
+        bool pointer_touch_up;
         int32_t pointer_touch_id;
 
         struct wl_listener tool_axis;
@@ -60,6 +64,7 @@ struct sway_cursor {
         struct wl_listener tool_proximity;
         struct wl_listener tool_button;
         bool simulating_pointer_from_tool_tip;
+        bool simulating_pointer_from_tool_button;
         uint32_t tool_buttons;
 
         struct wl_listener request_set_cursor;
@@ -103,12 +108,16 @@ void cursor_unhide(struct sway_cursor *cursor);
 int cursor_get_timeout(struct sway_cursor *cursor);
 void cursor_notify_key_press(struct sway_cursor *cursor);
 
+void pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
+                struct wlr_input_device *device, double dx, double dy,
+                double dx_unaccel, double dy_unaccel);
+
 void dispatch_cursor_button(struct sway_cursor *cursor,
         struct wlr_input_device *device, uint32_t time_msec, uint32_t button,
         enum wlr_button_state state);
 
 void dispatch_cursor_axis(struct sway_cursor *cursor,
-                struct wlr_event_pointer_axis *event);
+                struct wlr_pointer_axis_event *event);
 
 void cursor_set_image(struct sway_cursor *cursor, const char *image,
         struct wl_client *client);
@@ -136,4 +145,6 @@ uint32_t get_mouse_button(const char *name, char **error);
 
 const char *get_mouse_button_name(uint32_t button);
 
+void handle_request_set_cursor_shape(struct wl_listener *listener, void *data);
+
 #endif
diff --git a/include/sway/input/input-manager.h b/include/sway/input/input-manager.h
index c9bd08f0..145edd4b 100644
--- a/include/sway/input/input-manager.h
+++ b/include/sway/input/input-manager.h
@@ -1,7 +1,6 @@
 #ifndef _SWAY_INPUT_INPUT_MANAGER_H
 #define _SWAY_INPUT_INPUT_MANAGER_H
 #include <libinput.h>
-#include <wlr/types/wlr_input_inhibitor.h>
 #include <wlr/types/wlr_keyboard_shortcuts_inhibit_v1.h>
 #include <wlr/types/wlr_virtual_keyboard_v1.h>
 #include <wlr/types/wlr_virtual_pointer_v1.h>
@@ -21,10 +20,10 @@ struct sway_input_manager {
         struct wl_list devices;
         struct wl_list seats;
 
-        struct wlr_input_inhibit_manager *inhibit;
         struct wlr_keyboard_shortcuts_inhibit_manager_v1 *keyboard_shortcuts_inhibit;
         struct wlr_virtual_keyboard_manager_v1 *virtual_keyboard;
         struct wlr_virtual_pointer_manager_v1 *virtual_pointer;
+        struct wlr_pointer_gestures_v1 *pointer_gestures;
 
         struct wl_listener new_input;
         struct wl_listener inhibit_activate;
@@ -44,7 +43,7 @@ void input_manager_configure_xcursor(void);
 
 void input_manager_apply_input_config(struct input_config *input_config);
 
-void input_manager_configure_all_inputs(void);
+void input_manager_configure_all_input_mappings(void);
 
 void input_manager_reset_input(struct sway_input_device *input_device);
 
diff --git a/include/sway/input/keyboard.h b/include/sway/input/keyboard.h
index 2c61e5a7..571d9e6f 100644
--- a/include/sway/input/keyboard.h
+++ b/include/sway/input/keyboard.h
@@ -50,6 +50,7 @@ struct sway_shortcut_state {
 
 struct sway_keyboard {
         struct sway_seat_device *seat_device;
+        struct wlr_keyboard *wlr;
 
         struct xkb_keymap *keymap;
         xkb_layout_index_t effective_layout;
diff --git a/include/sway/input/libinput.h b/include/sway/input/libinput.h
index de019976..1f84a8e3 100644
--- a/include/sway/input/libinput.h
+++ b/include/sway/input/libinput.h
@@ -2,8 +2,13 @@
 #define _SWAY_INPUT_LIBINPUT_H
 #include "sway/input/input-manager.h"
 
-void sway_input_configure_libinput_device(struct sway_input_device *device);
+bool sway_input_configure_libinput_device(struct sway_input_device *device);
+
+void sway_input_configure_libinput_device_send_events(
+        struct sway_input_device *device);
 
 void sway_input_reset_libinput_device(struct sway_input_device *device);
 
+bool sway_libinput_device_is_builtin(struct sway_input_device *device);
+
 #endif
diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
index 4118df66..e5aa8478 100644
--- a/include/sway/input/seat.h
+++ b/include/sway/input/seat.h
@@ -3,7 +3,9 @@
 
 #include <wlr/types/wlr_keyboard_shortcuts_inhibit_v1.h>
 #include <wlr/types/wlr_layer_shell_v1.h>
+#include <wlr/types/wlr_scene.h>
 #include <wlr/types/wlr_seat.h>
+#include <wlr/types/wlr_touch.h>
 #include <wlr/util/edges.h>
 #include "sway/config.h"
 #include "sway/input/input-manager.h"
@@ -18,16 +20,38 @@ struct sway_seatop_impl {
                         enum wlr_button_state state);
         void (*pointer_motion)(struct sway_seat *seat, uint32_t time_msec);
         void (*pointer_axis)(struct sway_seat *seat,
-                        struct wlr_event_pointer_axis *event);
+                        struct wlr_pointer_axis_event *event);
+        void (*hold_begin)(struct sway_seat *seat,
+                        struct wlr_pointer_hold_begin_event *event);
+        void (*hold_end)(struct sway_seat *seat,
+                        struct wlr_pointer_hold_end_event *event);
+        void (*pinch_begin)(struct sway_seat *seat,
+                        struct wlr_pointer_pinch_begin_event *event);
+        void (*pinch_update)(struct sway_seat *seat,
+                        struct wlr_pointer_pinch_update_event *event);
+        void (*pinch_end)(struct sway_seat *seat,
+                        struct wlr_pointer_pinch_end_event *event);
+        void (*swipe_begin)(struct sway_seat *seat,
+                        struct wlr_pointer_swipe_begin_event *event);
+        void (*swipe_update)(struct sway_seat *seat,
+                        struct wlr_pointer_swipe_update_event *event);
+        void (*swipe_end)(struct sway_seat *seat,
+                        struct wlr_pointer_swipe_end_event *event);
         void (*rebase)(struct sway_seat *seat, uint32_t time_msec);
+        void (*touch_motion)(struct sway_seat *seat,
+                        struct wlr_touch_motion_event *event, double lx, double ly);
+        void (*touch_up)(struct sway_seat *seat,
+                        struct wlr_touch_up_event *event);
+        void (*touch_down)(struct sway_seat *seat,
+                        struct wlr_touch_down_event *event, double lx, double ly);
+        void (*touch_cancel)(struct sway_seat *seat,
+                        struct wlr_touch_cancel_event *event);
         void (*tablet_tool_motion)(struct sway_seat *seat,
                         struct sway_tablet_tool *tool, uint32_t time_msec);
         void (*tablet_tool_tip)(struct sway_seat *seat, struct sway_tablet_tool *tool,
                         uint32_t time_msec, enum wlr_tablet_tool_tip_state state);
         void (*end)(struct sway_seat *seat);
         void (*unref)(struct sway_seat *seat, struct sway_container *con);
-        void (*render)(struct sway_seat *seat, struct sway_output *output,
-                        pixman_region32_t *damage);
         bool allow_set_cursor;
 };
 
@@ -50,19 +74,6 @@ struct sway_seat_node {
         struct wl_listener destroy;
 };
 
-struct sway_drag_icon {
-        struct sway_seat *seat;
-        struct wlr_drag_icon *wlr_drag_icon;
-        struct wl_list link; // sway_root::drag_icons
-
-        double x, y; // in layout-local coordinates
-
-        struct wl_listener surface_commit;
-        struct wl_listener map;
-        struct wl_listener unmap;
-        struct wl_listener destroy;
-};
-
 struct sway_drag {
         struct sway_seat *seat;
         struct wlr_drag *wlr_drag;
@@ -73,16 +84,23 @@ struct sway_seat {
         struct wlr_seat *wlr_seat;
         struct sway_cursor *cursor;
 
+        // Seat scene tree structure
+        // - scene_tree
+        //   - drag icons
+        //     - drag icon 1
+        //     - drag icon 2
+        //   - seatop specific stuff
+        struct wlr_scene_tree *scene_tree;
+        struct wlr_scene_tree *drag_icons;
+
         bool has_focus;
         struct wl_list focus_stack; // list of containers in focus order
         struct sway_workspace *workspace;
         char *prev_workspace_name; // for workspace back_and_forth
 
-        // If the focused layer is set, views cannot receive keyboard focus
         struct wlr_layer_surface_v1 *focused_layer;
-
-        // If exclusive_client is set, no other clients will receive input events
-        struct wl_client *exclusive_client;
+        // If the exclusive layer is set, views cannot receive keyboard focus
+        bool has_exclusive_layer;
 
         // Last touch point
         int32_t touch_id;
@@ -141,6 +159,9 @@ void seat_add_device(struct sway_seat *seat,
 void seat_configure_device(struct sway_seat *seat,
                 struct sway_input_device *device);
 
+void seat_configure_device_mapping(struct sway_seat *seat,
+                struct sway_input_device *input_device);
+
 void seat_reset_device(struct sway_seat *seat,
                 struct sway_input_device *input_device);
 
@@ -171,8 +192,7 @@ void seat_set_focus_surface(struct sway_seat *seat,
 void seat_set_focus_layer(struct sway_seat *seat,
                 struct wlr_layer_surface_v1 *layer);
 
-void seat_set_exclusive_client(struct sway_seat *seat,
-                struct wl_client *client);
+void seat_unfocus_unless_client(struct sway_seat *seat, struct wl_client *client);
 
 struct sway_node *seat_get_focus(struct sway_seat *seat);
 
@@ -231,7 +251,7 @@ void seat_idle_notify_activity(struct sway_seat *seat,
 
 bool seat_is_input_allowed(struct sway_seat *seat, struct wlr_surface *surface);
 
-void drag_icon_update_position(struct sway_drag_icon *icon);
+void drag_icons_update_position(struct sway_seat *seat);
 
 enum wlr_edges find_resize_edge(struct sway_container *cont,
                 struct wlr_surface *surface, struct sway_cursor *cursor);
@@ -239,7 +259,13 @@ enum wlr_edges find_resize_edge(struct sway_container *cont,
 void seatop_begin_default(struct sway_seat *seat);
 
 void seatop_begin_down(struct sway_seat *seat, struct sway_container *con,
-                uint32_t time_msec, int sx, int sy);
+                double sx, double sy);
+
+void seatop_begin_down_on_surface(struct sway_seat *seat,
+                struct wlr_surface *surface, double sx, double sy);
+
+void seatop_begin_touch_down(struct sway_seat *seat, struct wlr_surface *surface,
+                struct wlr_touch_down_event *event, double sx, double sy, double lx, double ly);
 
 void seatop_begin_move_floating(struct sway_seat *seat,
                 struct sway_container *con);
@@ -271,7 +297,7 @@ void seatop_button(struct sway_seat *seat, uint32_t time_msec,
 void seatop_pointer_motion(struct sway_seat *seat, uint32_t time_msec);
 
 void seatop_pointer_axis(struct sway_seat *seat,
-                struct wlr_event_pointer_axis *event);
+                struct wlr_pointer_axis_event *event);
 
 void seatop_tablet_tool_tip(struct sway_seat *seat,
                 struct sway_tablet_tool *tool, uint32_t time_msec,
@@ -280,6 +306,37 @@ void seatop_tablet_tool_tip(struct sway_seat *seat,
 void seatop_tablet_tool_motion(struct sway_seat *seat,
                 struct sway_tablet_tool *tool, uint32_t time_msec);
 
+void seatop_hold_begin(struct sway_seat *seat,
+                struct wlr_pointer_hold_begin_event *event);
+void seatop_hold_end(struct sway_seat *seat,
+                struct wlr_pointer_hold_end_event *event);
+
+void seatop_pinch_begin(struct sway_seat *seat,
+                struct wlr_pointer_pinch_begin_event *event);
+void seatop_pinch_update(struct sway_seat *seat,
+                struct wlr_pointer_pinch_update_event *event);
+void seatop_pinch_end(struct sway_seat *seat,
+                struct wlr_pointer_pinch_end_event *event);
+
+void seatop_swipe_begin(struct sway_seat *seat,
+                struct wlr_pointer_swipe_begin_event *event);
+void seatop_swipe_update(struct sway_seat *seat,
+                struct wlr_pointer_swipe_update_event *event);
+void seatop_swipe_end(struct sway_seat *seat,
+                struct wlr_pointer_swipe_end_event *event);
+
+void seatop_touch_motion(struct sway_seat *seat,
+                struct wlr_touch_motion_event *event, double lx, double ly);
+
+void seatop_touch_up(struct sway_seat *seat,
+                struct wlr_touch_up_event *event);
+
+void seatop_touch_down(struct sway_seat *seat,
+                struct wlr_touch_down_event *event, double lx, double ly);
+
+void seatop_touch_cancel(struct sway_seat *seat,
+                struct wlr_touch_cancel_event *event);
+
 void seatop_rebase(struct sway_seat *seat, uint32_t time_msec);
 
 /**
@@ -294,13 +351,6 @@ void seatop_end(struct sway_seat *seat);
  */
 void seatop_unref(struct sway_seat *seat, struct sway_container *con);
 
-/**
- * Instructs a seatop to render anything that it needs to render
- * (eg. dropzone for move-tiling)
- */
-void seatop_render(struct sway_seat *seat, struct sway_output *output,
-                pixman_region32_t *damage);
-
 bool seatop_allows_set_cursor(struct sway_seat *seat);
 
 /**
diff --git a/include/sway/input/switch.h b/include/sway/input/switch.h
index 213b471d..de6787b7 100644
--- a/include/sway/input/switch.h
+++ b/include/sway/input/switch.h
@@ -5,6 +5,7 @@
 
 struct sway_switch {
         struct sway_seat_device *seat_device;
+        struct wlr_switch *wlr;
         enum wlr_switch_state state;
         enum wlr_switch_type type;
 
diff --git a/include/sway/input/tablet.h b/include/sway/input/tablet.h
index d7e4c242..2fa5db6d 100644
--- a/include/sway/input/tablet.h
+++ b/include/sway/input/tablet.h
@@ -32,6 +32,7 @@ struct sway_tablet_pad {
         struct wl_list link;
         struct sway_seat_device *seat_device;
         struct sway_tablet *tablet;
+        struct wlr_tablet_pad *wlr;
         struct wlr_tablet_v2_tablet_pad *tablet_v2_pad;
 
         struct wl_listener attach;
@@ -62,7 +63,7 @@ void sway_configure_tablet_pad(struct sway_tablet_pad *tablet_pad);
 
 void sway_tablet_pad_destroy(struct sway_tablet_pad *tablet_pad);
 
-void sway_tablet_pad_notify_enter(struct sway_tablet_pad *tablet_pad,
+void sway_tablet_pad_set_focus(struct sway_tablet_pad *tablet_pad,
                 struct wlr_surface *surface);
 
 #endif
diff --git a/include/sway/input/text_input.h b/include/sway/input/text_input.h
index 6cf9bdb3..214e61d1 100644
--- a/include/sway/input/text_input.h
+++ b/include/sway/input/text_input.h
@@ -3,13 +3,12 @@
 
 #include <wlr/types/wlr_text_input_v3.h>
 #include <wlr/types/wlr_input_method_v2.h>
-#include <wlr/types/wlr_surface.h>
-#include "sway/input/seat.h"
+#include <wlr/types/wlr_compositor.h>
 
 /**
  * The relay structure manages the relationship between text-input and
  * input_method interfaces on a given seat. Multiple text-input interfaces may
- * be bound to a relay, but at most one will be focused (reveiving events) at
+ * be bound to a relay, but at most one will be focused (receiving events) at
  * a time. At most one input-method interface may be bound to the seat. The
  * relay manages life cycle of both sides. When both sides are present and
  * focused, the relay passes messages between them.
@@ -28,7 +27,10 @@ struct sway_input_method_relay {
 
         struct wl_listener input_method_new;
         struct wl_listener input_method_commit;
+        struct wl_listener input_method_grab_keyboard;
         struct wl_listener input_method_destroy;
+
+        struct wl_listener input_method_keyboard_grab_destroy;
 };
 
 struct sway_text_input {
diff --git a/include/sway/ipc-json.h b/include/sway/ipc-json.h
index 6f4ade1a..bc9f4985 100644
--- a/include/sway/ipc-json.h
+++ b/include/sway/ipc-json.h
@@ -1,6 +1,7 @@
 #ifndef _SWAY_IPC_JSON_H
 #define _SWAY_IPC_JSON_H
 #include <json.h>
+#include "sway/output.h"
 #include "sway/tree/container.h"
 #include "sway/input/input-manager.h"
 
@@ -9,6 +10,7 @@ json_object *ipc_json_get_version(void);
 json_object *ipc_json_get_binding_mode(void);
 
 json_object *ipc_json_describe_disabled_output(struct sway_output *o);
+json_object *ipc_json_describe_non_desktop_output(struct sway_output_non_desktop *o);
 json_object *ipc_json_describe_node(struct sway_node *node);
 json_object *ipc_json_describe_node_recursive(struct sway_node *node);
 json_object *ipc_json_describe_input(struct sway_input_device *device);
diff --git a/include/sway/ipc-server.h b/include/sway/ipc-server.h
index bc4f781a..d4c00942 100644
--- a/include/sway/ipc-server.h
+++ b/include/sway/ipc-server.h
@@ -21,5 +21,6 @@ void ipc_event_mode(const char *mode, bool pango);
 void ipc_event_shutdown(const char *reason);
 void ipc_event_binding(struct sway_binding *binding);
 void ipc_event_input(const char *change, struct sway_input_device *device);
+void ipc_event_output(void);
 
 #endif
diff --git a/include/sway/layers.h b/include/sway/layers.h
index 457634c2..a7afb900 100644
--- a/include/sway/layers.h
+++ b/include/sway/layers.h
@@ -1,59 +1,41 @@
 #ifndef _SWAY_LAYERS_H
 #define _SWAY_LAYERS_H
 #include <stdbool.h>
-#include <wlr/types/wlr_box.h>
-#include <wlr/types/wlr_surface.h>
+#include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_layer_shell_v1.h>
 
-enum layer_parent {
-        LAYER_PARENT_LAYER,
-        LAYER_PARENT_POPUP,
-};
-
 struct sway_layer_surface {
-        struct wlr_layer_surface_v1 *layer_surface;
-        struct wl_list link;
-
-        struct wl_listener destroy;
         struct wl_listener map;
         struct wl_listener unmap;
         struct wl_listener surface_commit;
         struct wl_listener output_destroy;
+        struct wl_listener node_destroy;
         struct wl_listener new_popup;
-        struct wl_listener new_subsurface;
 
-        struct wlr_box geo;
-        enum zwlr_layer_shell_v1_layer layer;
+        bool mapped;
+
+        struct sway_output *output;
+        struct wlr_scene_layer_surface_v1 *scene;
+        struct wlr_scene_tree *tree;
+        struct wlr_scene_tree *popups;
+        struct wlr_layer_surface_v1 *layer_surface;
 };
 
 struct sway_layer_popup {
         struct wlr_xdg_popup *wlr_popup;
-        enum layer_parent parent_type;
-        union {
-                struct sway_layer_surface *parent_layer;
-                struct sway_layer_popup *parent_popup;
-        };
-        struct wl_listener map;
-        struct wl_listener unmap;
-        struct wl_listener destroy;
-        struct wl_listener commit;
-        struct wl_listener new_popup;
-};
+        struct wlr_scene_tree *scene;
+        struct sway_layer_surface *toplevel;
 
-struct sway_layer_subsurface {
-        struct wlr_subsurface *wlr_subsurface;
-        struct sway_layer_surface *layer_surface;
-
-        struct wl_listener map;
-        struct wl_listener unmap;
         struct wl_listener destroy;
+        struct wl_listener new_popup;
         struct wl_listener commit;
 };
 
 struct sway_output;
-void arrange_layers(struct sway_output *output);
 
-struct sway_layer_surface *layer_from_wlr_layer_surface_v1(
-        struct wlr_layer_surface_v1 *layer_surface);
+struct wlr_layer_surface_v1 *toplevel_layer_surface_from_surface(
+                struct wlr_surface *surface);
+
+void arrange_layers(struct sway_output *output);
 
 #endif
diff --git a/include/sway/output.h b/include/sway/output.h
index 96986700..30595f54 100644
--- a/include/sway/output.h
+++ b/include/sway/output.h
@@ -3,8 +3,9 @@
 #include <time.h>
 #include <unistd.h>
 #include <wayland-server-core.h>
-#include <wlr/types/wlr_box.h>
+#include <wlr/types/wlr_damage_ring.h>
 #include <wlr/types/wlr_output.h>
+#include <wlr/types/wlr_scene.h>
 #include "config.h"
 #include "sway/tree/node.h"
 #include "sway/tree/view.h"
@@ -19,43 +20,63 @@ struct sway_output_state {
 
 struct sway_output {
         struct sway_node node;
+
+        struct {
+                struct wlr_scene_tree *shell_background;
+                struct wlr_scene_tree *shell_bottom;
+                struct wlr_scene_tree *tiling;
+                struct wlr_scene_tree *fullscreen;
+                struct wlr_scene_tree *shell_top;
+                struct wlr_scene_tree *shell_overlay;
+                struct wlr_scene_tree *session_lock;
+        } layers;
+
+        // when a container is fullscreen, in case the fullscreen surface is
+        // translucent (can see behind) we must make sure that the background is a
+        // solid color in order to conform to the wayland protocol. This rect
+        // ensures that when looking through a surface, all that will be seen
+        // is black.
+        struct wlr_scene_rect *fullscreen_background;
+
         struct wlr_output *wlr_output;
+        struct wlr_scene_output *scene_output;
         struct sway_server *server;
         struct wl_list link;
 
-        struct wl_list layers[4]; // sway_layer_surface::link
         struct wlr_box usable_area;
 
-        struct timespec last_frame;
-        struct wlr_output_damage *damage;
-
         int lx, ly; // layout coords
         int width, height; // transformed buffer size
         enum wl_output_subpixel detected_subpixel;
         enum scale_filter_mode scale_filter;
-        // last applied mode when the output is DPMS'ed
-        struct wlr_output_mode *current_mode;
 
         bool enabling, enabled;
         list_t *workspaces;
 
         struct sway_output_state current;
 
+        struct wl_listener layout_destroy;
         struct wl_listener destroy;
         struct wl_listener commit;
-        struct wl_listener mode;
         struct wl_listener present;
-        struct wl_listener damage_destroy;
-        struct wl_listener damage_frame;
+        struct wl_listener frame;
+        struct wl_listener request_state;
 
         struct {
-                struct wl_signal destroy;
+                struct wl_signal disable;
         } events;
 
         struct timespec last_presentation;
         uint32_t refresh_nsec;
         int max_render_time; // In milliseconds
         struct wl_event_source *repaint_timer;
+        bool gamma_lut_changed;
+};
+
+struct sway_output_non_desktop {
+        struct wlr_output *wlr_output;
+
+        struct wl_listener destroy;
 };
 
 struct sway_output *output_create(struct wlr_output *wlr_output);
@@ -72,22 +93,12 @@ struct sway_output *output_get_in_direction(struct sway_output *reference,
 void output_add_workspace(struct sway_output *output,
                 struct sway_workspace *workspace);
 
-typedef void (*sway_surface_iterator_func_t)(struct sway_output *output, struct sway_view *view,
-        struct wlr_surface *surface, struct wlr_box *box, float rotation,
+typedef void (*sway_surface_iterator_func_t)(struct sway_output *output,
+        struct sway_view *view, struct wlr_surface *surface, struct wlr_box *box,
         void *user_data);
 
-void output_damage_whole(struct sway_output *output);
-
-void output_damage_surface(struct sway_output *output, double ox, double oy,
-        struct wlr_surface *surface, bool whole);
-
-void output_damage_from_view(struct sway_output *output,
-        struct sway_view *view);
-
-void output_damage_box(struct sway_output *output, struct wlr_box *box);
-
-void output_damage_whole_container(struct sway_output *output,
-        struct sway_container *con);
+bool output_match_name_or_id(struct sway_output *output,
+        const char *name_or_id);
 
 // this ONLY includes the enabled outputs
 struct sway_output *output_by_name_or_id(const char *name_or_id);
@@ -101,47 +112,8 @@ void output_enable(struct sway_output *output);
 
 void output_disable(struct sway_output *output);
 
-bool output_has_opaque_overlay_layer_surface(struct sway_output *output);
-
 struct sway_workspace *output_get_active_workspace(struct sway_output *output);
 
-void output_render(struct sway_output *output, struct timespec *when,
-        pixman_region32_t *damage);
-
-void output_surface_for_each_surface(struct sway_output *output,
-                struct wlr_surface *surface, double ox, double oy,
-                sway_surface_iterator_func_t iterator, void *user_data);
-
-void output_view_for_each_surface(struct sway_output *output,
-        struct sway_view *view, sway_surface_iterator_func_t iterator,
-        void *user_data);
-
-void output_view_for_each_popup_surface(struct sway_output *output,
-                struct sway_view *view, sway_surface_iterator_func_t iterator,
-                void *user_data);
-
-void output_layer_for_each_surface(struct sway_output *output,
-        struct wl_list *layer_surfaces, sway_surface_iterator_func_t iterator,
-        void *user_data);
-
-void output_layer_for_each_toplevel_surface(struct sway_output *output,
-        struct wl_list *layer_surfaces, sway_surface_iterator_func_t iterator,
-        void *user_data);
-
-void output_layer_for_each_popup_surface(struct sway_output *output,
-        struct wl_list *layer_surfaces, sway_surface_iterator_func_t iterator,
-        void *user_data);
-
-#if HAVE_XWAYLAND
-void output_unmanaged_for_each_surface(struct sway_output *output,
-        struct wl_list *unmanaged, sway_surface_iterator_func_t iterator,
-        void *user_data);
-#endif
-
-void output_drag_icons_for_each_surface(struct sway_output *output,
-        struct wl_list *drag_icons, sway_surface_iterator_func_t iterator,
-        void *user_data);
-
 void output_for_each_workspace(struct sway_output *output,
                 void (*f)(struct sway_workspace *ws, void *data), void *data);
 
@@ -159,18 +131,12 @@ void output_get_box(struct sway_output *output, struct wlr_box *box);
 enum sway_container_layout output_get_default_layout(
                 struct sway_output *output);
 
-void render_rect(struct sway_output *output,
-                pixman_region32_t *output_damage, const struct wlr_box *_box,
-                float color[static 4]);
-
-void premultiply_alpha(float color[4], float opacity);
-
-void scale_box(struct wlr_box *box, float scale);
-
 enum wlr_direction opposite_direction(enum wlr_direction d);
 
 void handle_output_layout_change(struct wl_listener *listener, void *data);
 
+void handle_gamma_control_set_gamma(struct wl_listener *listener, void *data);
+
 void handle_output_manager_apply(struct wl_listener *listener, void *data);
 
 void handle_output_manager_test(struct wl_listener *listener, void *data);
@@ -178,4 +144,6 @@ void handle_output_manager_test(struct wl_listener *listener, void *data);
 void handle_output_power_manager_set_mode(struct wl_listener *listener,
         void *data);
 
+struct sway_output_non_desktop *output_non_desktop_create(struct wlr_output *wlr_output);
+
 #endif
diff --git a/include/sway/scene_descriptor.h b/include/sway/scene_descriptor.h
new file mode 100644
index 00000000..2649d7c2
--- /dev/null
+++ b/include/sway/scene_descriptor.h
@@ -0,0 +1,33 @@
+/**
+ * Across a wayland compositor, there are multiple shells: It can be
+ * a toplevel, or a layer_shell, or even something more meta like a drag
+ * icon or highlight indicators when dragging windows around.
+ *
+ * This object lets us store values that represent these modes of operation
+ * and keep track of what object is being represented.
+ */
+#ifndef _SWAY_SCENE_DESCRIPTOR_H
+#define _SWAY_SCENE_DESCRIPTOR_H
+#include <wlr/types/wlr_scene.h>
+
+enum sway_scene_descriptor_type {
+        SWAY_SCENE_DESC_BUFFER_TIMER,
+        SWAY_SCENE_DESC_NON_INTERACTIVE,
+        SWAY_SCENE_DESC_CONTAINER,
+        SWAY_SCENE_DESC_VIEW,
+        SWAY_SCENE_DESC_LAYER_SHELL,
+        SWAY_SCENE_DESC_XWAYLAND_UNMANAGED,
+        SWAY_SCENE_DESC_POPUP,
+        SWAY_SCENE_DESC_DRAG_ICON,
+};
+
+bool scene_descriptor_assign(struct wlr_scene_node *node,
+        enum sway_scene_descriptor_type type, void *data);
+
+void *scene_descriptor_try_get(struct wlr_scene_node *node,
+        enum sway_scene_descriptor_type type);
+
+void scene_descriptor_destroy(struct wlr_scene_node *node,
+        enum sway_scene_descriptor_type type);
+
+#endif
diff --git a/include/sway/server.h b/include/sway/server.h
index 0f5e3ab2..adb62cda 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -3,38 +3,59 @@
 #include <stdbool.h>
 #include <wayland-server-core.h>
 #include <wlr/backend.h>
-#include <wlr/backend/session.h>
+#include <wlr/render/allocator.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_data_device.h>
 #include <wlr/types/wlr_input_method_v2.h>
 #include <wlr/types/wlr_foreign_toplevel_management_v1.h>
+#include <wlr/types/wlr_drm_lease_v1.h>
 #include <wlr/types/wlr_layer_shell_v1.h>
 #include <wlr/types/wlr_output_management_v1.h>
 #include <wlr/types/wlr_output_power_management_v1.h>
 #include <wlr/types/wlr_presentation_time.h>
 #include <wlr/types/wlr_relative_pointer_v1.h>
+#include <wlr/types/wlr_session_lock_v1.h>
 #include <wlr/types/wlr_server_decoration.h>
 #include <wlr/types/wlr_text_input_v3.h>
 #include <wlr/types/wlr_xdg_shell.h>
 #include "config.h"
 #include "list.h"
+#include "sway/desktop/idle_inhibit_v1.h"
 #if HAVE_XWAYLAND
 #include "sway/xwayland.h"
 #endif
 
+struct sway_transaction;
+
+struct sway_session_lock {
+        struct wlr_session_lock_v1 *lock;
+        struct wlr_surface *focused;
+        bool abandoned;
+
+        struct wl_list outputs; // struct sway_session_lock_output
+
+        // invalid if the session is abandoned
+        struct wl_listener new_surface;
+        struct wl_listener unlock;
+        struct wl_listener destroy;
+};
+
 struct sway_server {
         struct wl_display *wl_display;
         struct wl_event_loop *wl_event_loop;
         const char *socket;
 
         struct wlr_backend *backend;
-        struct wlr_backend *noop_backend;
+        struct wlr_session *session;
         // secondary headless backend used for creating virtual outputs on-the-fly
         struct wlr_backend *headless_backend;
+        struct wlr_renderer *renderer;
+        struct wlr_allocator *allocator;
 
         struct wlr_compositor *compositor;
-        struct wl_listener compositor_new_surface;
+
+        struct wlr_linux_dmabuf_v1 *linux_dmabuf_v1;
 
         struct wlr_data_device_manager *data_device_manager;
 
@@ -43,14 +64,14 @@ struct sway_server {
         struct wl_listener new_output;
         struct wl_listener output_layout_change;
 
-        struct wlr_idle *idle;
-        struct sway_idle_inhibit_manager_v1 *idle_inhibit_manager_v1;
+        struct wlr_idle_notifier_v1 *idle_notifier_v1;
+        struct sway_idle_inhibit_manager_v1 idle_inhibit_manager_v1;
 
         struct wlr_layer_shell_v1 *layer_shell;
         struct wl_listener layer_shell_surface;
 
         struct wlr_xdg_shell *xdg_shell;
-        struct wl_listener xdg_shell_surface;
+        struct wl_listener xdg_shell_toplevel;
 
         struct wlr_tablet_manager_v2 *tablet_v2;
 
@@ -70,7 +91,8 @@ struct sway_server {
         struct wl_listener xdg_decoration;
         struct wl_list xdg_decorations; // sway_xdg_decoration::link
 
-        struct wlr_presentation *presentation;
+        struct wlr_drm_lease_v1_manager *drm_lease_manager;
+        struct wl_listener drm_lease_request;
 
         struct wlr_pointer_constraints_v1 *pointer_constraints;
         struct wl_listener pointer_constraint;
@@ -79,14 +101,52 @@ struct sway_server {
         struct wl_listener output_manager_apply;
         struct wl_listener output_manager_test;
 
+        struct wlr_gamma_control_manager_v1 *gamma_control_manager_v1;
+        struct wl_listener gamma_control_set_gamma;
+
+        struct {
+                struct sway_session_lock *lock;
+                struct wlr_session_lock_manager_v1 *manager;
+
+                struct wl_listener new_lock;
+                struct wl_listener manager_destroy;
+        } session_lock;
+
         struct wlr_output_power_manager_v1 *output_power_manager_v1;
         struct wl_listener output_power_manager_set_mode;
         struct wlr_input_method_manager_v2 *input_method;
         struct wlr_text_input_manager_v3 *text_input;
         struct wlr_foreign_toplevel_manager_v1 *foreign_toplevel_manager;
+        struct wlr_content_type_manager_v1 *content_type_manager_v1;
+        struct wlr_data_control_manager_v1 *data_control_manager_v1;
+        struct wlr_screencopy_manager_v1 *screencopy_manager_v1;
+        struct wlr_export_dmabuf_manager_v1 *export_dmabuf_manager_v1;
+        struct wlr_security_context_manager_v1 *security_context_manager_v1;
+
+        struct wlr_xdg_activation_v1 *xdg_activation_v1;
+        struct wl_listener xdg_activation_v1_request_activate;
+        struct wl_listener xdg_activation_v1_new_token;
 
+        struct wl_listener request_set_cursor_shape;
+
+        struct wl_list pending_launcher_ctxs; // launcher_ctx::link
+
+        // The timeout for transactions, after which a transaction is applied
+        // regardless of readiness.
         size_t txn_timeout_ms;
-        list_t *transactions;
+
+        // Stores a transaction after it has been committed, but is waiting for
+        // views to ack the new dimensions before being applied. A queued
+        // transaction is frozen and must not have new instructions added to it.
+        struct sway_transaction *queued_transaction;
+
+        // Stores a pending transaction that will be committed once the existing
+        // queued transaction is applied and freed. The pending transaction can be
+        // updated with new instructions as needed.
+        struct sway_transaction *pending_transaction;
+
+        // Stores the nodes that have been marked as "dirty" and will be put into
+        // the pending transaction.
         list_t *dirty_nodes;
 };
 
@@ -96,34 +156,41 @@ struct sway_debug {
         bool noatomic;         // Ignore atomic layout updates
         bool txn_timings;      // Log verbose messages about transactions
         bool txn_wait;         // Always wait for the timeout before applying
-
-        enum {
-                DAMAGE_DEFAULT,    // Default behaviour
-                DAMAGE_HIGHLIGHT,  // Highlight regions of the screen being damaged
-                DAMAGE_RERENDER,   // Render the full output when any damage occurs
-        } damage;
+        bool legacy_wl_drm;    // Enable the legacy wl_drm interface
 };
 
 extern struct sway_debug debug;
 
-/* Prepares an unprivileged server_init by performing all privileged operations in advance */
-bool server_privileged_prepare(struct sway_server *server);
+extern bool allow_unsupported_gpu;
+
 bool server_init(struct sway_server *server);
 void server_fini(struct sway_server *server);
 bool server_start(struct sway_server *server);
 void server_run(struct sway_server *server);
 
-void handle_compositor_new_surface(struct wl_listener *listener, void *data);
+void restore_nofile_limit(void);
+
 void handle_new_output(struct wl_listener *listener, void *data);
 
 void handle_idle_inhibitor_v1(struct wl_listener *listener, void *data);
 void handle_layer_shell_surface(struct wl_listener *listener, void *data);
-void handle_xdg_shell_surface(struct wl_listener *listener, void *data);
+void sway_session_lock_init(void);
+void sway_session_lock_add_output(struct sway_session_lock *lock,
+        struct sway_output *output);
+bool sway_session_lock_has_surface(struct sway_session_lock *lock,
+        struct wlr_surface *surface);
+void handle_xdg_shell_toplevel(struct wl_listener *listener, void *data);
 #if HAVE_XWAYLAND
 void handle_xwayland_surface(struct wl_listener *listener, void *data);
 #endif
 void handle_server_decoration(struct wl_listener *listener, void *data);
 void handle_xdg_decoration(struct wl_listener *listener, void *data);
 void handle_pointer_constraint(struct wl_listener *listener, void *data);
+void xdg_activation_v1_handle_request_activate(struct wl_listener *listener,
+        void *data);
+void xdg_activation_v1_handle_new_token(struct wl_listener *listener,
+        void *data);
+
+void set_rr_scheduling(void);
 
 #endif
diff --git a/include/sway/surface.h b/include/sway/surface.h
deleted file mode 100644
index 4da96c02..00000000
--- a/include/sway/surface.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef _SWAY_SURFACE_H
-#define _SWAY_SURFACE_H
-#include <wlr/types/wlr_surface.h>
-
-struct sway_surface {
-        struct wlr_surface *wlr_surface;
-
-        struct wl_listener destroy;
-
-        /**
-         * This timer can be used for issuing delayed frame done callbacks (for
-         * example, to improve presentation latency). Its handler is set to a
-         * function that issues a frame done callback to this surface.
-         */
-        struct wl_event_source *frame_done_timer;
-};
-
-#endif
diff --git a/include/sway/sway_text_node.h b/include/sway/sway_text_node.h
new file mode 100644
index 00000000..0d4209bb
--- /dev/null
+++ b/include/sway/sway_text_node.h
@@ -0,0 +1,28 @@
+#ifndef _SWAY_BUFFER_H
+#define _SWAY_BUFFER_H
+#include <wlr/types/wlr_scene.h>
+
+struct sway_text_node {
+        int width;
+        int max_width;
+        int height;
+        int baseline;
+        bool pango_markup;
+        float color[4];
+        float background[4];
+
+        struct wlr_scene_node *node;
+};
+
+struct sway_text_node *sway_text_node_create(struct wlr_scene_tree *parent,
+                char *text, float color[4], bool pango_markup);
+
+void sway_text_node_set_color(struct sway_text_node *node, float color[4]);
+
+void sway_text_node_set_text(struct sway_text_node *node, char *text);
+
+void sway_text_node_set_max_width(struct sway_text_node *node, int max_width);
+
+void sway_text_node_set_background(struct sway_text_node *node, float background[4]);
+
+#endif
diff --git a/include/sway/swaynag.h b/include/sway/swaynag.h
index 74d9ea18..03bd52c3 100644
--- a/include/sway/swaynag.h
+++ b/include/sway/swaynag.h
@@ -1,6 +1,7 @@
 #ifndef _SWAY_SWAYNAG_H
 #define _SWAY_SWAYNAG_H
 #include <wayland-server-core.h>
+#include "stringop.h"
 
 struct swaynag_instance {
         struct wl_client *client;
@@ -21,7 +22,7 @@ bool swaynag_spawn(const char *swaynag_command,
 // Write a log message to swaynag->fd[1]. This will fail when swaynag->detailed
 // is false.
 void swaynag_log(const char *swaynag_command, struct swaynag_instance *swaynag,
-                const char *fmt, ...);
+                const char *fmt, ...) _SWAY_ATTRIB_PRINTF(3, 4);
 
 // If swaynag->detailed, close swaynag->fd[1] so swaynag displays
 void swaynag_show(struct swaynag_instance *swaynag);
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 7e9df59f..93f6bfbb 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -2,8 +2,8 @@
 #define _SWAY_CONTAINER_H
 #include <stdint.h>
 #include <sys/types.h>
-#include <wlr/types/wlr_box.h>
-#include <wlr/types/wlr_surface.h>
+#include <wlr/types/wlr_compositor.h>
+#include <wlr/types/wlr_scene.h>
 #include "list.h"
 #include "sway/tree/node.h"
 
@@ -46,9 +46,9 @@ struct sway_container_state {
 
         enum sway_fullscreen_mode fullscreen_mode;
 
-        struct sway_workspace *workspace;
-        struct sway_container *parent;
-        list_t *children;
+        struct sway_workspace *workspace; // NULL when hidden in the scratchpad
+        struct sway_container *parent;    // NULL if container in root of workspace
+        list_t *children;                 // struct sway_container
 
         struct sway_container *focused_inactive_child;
         bool focused;
@@ -60,6 +60,7 @@ struct sway_container_state {
         bool border_left;
         bool border_right;
 
+        // These are in layout coordinates.
         double content_x, content_y;
         double content_width, content_height;
 };
@@ -68,14 +69,40 @@ struct sway_container {
         struct sway_node node;
         struct sway_view *view;
 
-        // The pending state is the main container properties, and the current state is in the below struct.
-        // This means most places of the code can refer to the main variables (pending state) and it'll just work.
+        struct wlr_scene_tree *scene_tree;
+
+        struct {
+                struct wlr_scene_tree *tree;
+
+                struct wlr_scene_tree *border;
+                struct wlr_scene_tree *background;
+
+                struct sway_text_node *title_text;
+                struct sway_text_node *marks_text;
+        } title_bar;
+
+        struct {
+                struct wlr_scene_tree *tree;
+
+                struct wlr_scene_rect *top;
+                struct wlr_scene_rect *bottom;
+                struct wlr_scene_rect *left;
+                struct wlr_scene_rect *right;
+        } border;
+
+        struct wlr_scene_tree *content_tree;
+        struct wlr_scene_buffer *output_handler;
+
+        struct wl_listener output_enter;
+        struct wl_listener output_leave;
+
         struct sway_container_state current;
+        struct sway_container_state pending;
 
         char *title;           // The view's title (unformatted)
         char *formatted_title; // The title displayed in the title bar
+        int title_width;
 
-        enum sway_container_layout layout;
         enum sway_container_layout prev_split_layout;
 
         // Whether stickiness has been enabled on this container. Use
@@ -86,11 +113,13 @@ struct sway_container {
         // For C_ROOT, this has no meaning
         // For other types, this is the position in layout coordinates
         // Includes borders
-        double x, y;
-        double width, height;
         double saved_x, saved_y;
         double saved_width, saved_height;
 
+        // Used when the view changes to CSD unexpectedly. This will be a non-B_CSD
+        // border which we use to restore when the view returns to SSD.
+        enum sway_container_border saved_border;
+
         // The share of the space of parent container this container occupies
         double width_fraction;
         double height_fraction;
@@ -100,55 +129,19 @@ struct sway_container {
         double child_total_width;
         double child_total_height;
 
-        // These are in layout coordinates.
-        double content_x, content_y;
-        int content_width, content_height;
-
-        // In most cases this is the same as the content x and y, but if the view
-        // refuses to resize to the content dimensions then it can be smaller.
-        // These are in layout coordinates.
-        double surface_x, surface_y;
-
-        enum sway_fullscreen_mode fullscreen_mode;
-
-        enum sway_container_border border;
-
-        // Used when the view changes to CSD unexpectedly. This will be a non-B_CSD
-        // border which we use to restore when the view returns to SSD.
-        enum sway_container_border saved_border;
-
-        int border_thickness;
-        bool border_top;
-        bool border_bottom;
-        bool border_left;
-        bool border_right;
-
-        struct sway_workspace *workspace; // NULL when hidden in the scratchpad
-        struct sway_container *parent;    // NULL if container in root of workspace
-        list_t *children;                 // struct sway_container
-
-        // Outputs currently being intersected
-        list_t *outputs; // struct sway_output
-
         // Indicates that the container is a scratchpad container.
         // Both hidden and visible scratchpad containers have scratchpad=true.
         // Hidden scratchpad containers have a NULL parent.
         bool scratchpad;
 
-        float alpha;
+        // Stores last output size and position for adjusting coordinates of
+        // scratchpad windows.
+        // Unused for non-scratchpad windows.
+        struct wlr_box transform;
 
-        struct wlr_texture *title_focused;
-        struct wlr_texture *title_focused_inactive;
-        struct wlr_texture *title_unfocused;
-        struct wlr_texture *title_urgent;
-        size_t title_height;
-        size_t title_baseline;
+        float alpha;
 
         list_t *marks; // char *
-        struct wlr_texture *marks_focused;
-        struct wlr_texture *marks_focused_inactive;
-        struct wlr_texture *marks_unfocused;
-        struct wlr_texture *marks_urgent;
 
         struct {
                 struct wl_signal destroy;
@@ -168,23 +161,15 @@ void container_begin_destroy(struct sway_container *con);
 struct sway_container *container_find_child(struct sway_container *container,
                 bool (*test)(struct sway_container *view, void *data), void *data);
 
-/**
- * Find a container at the given coordinates. Returns the surface and
- * surface-local coordinates of the given layout coordinates if the container
- * is a view and the view contains a surface at those coordinates.
- */
-struct sway_container *container_at(struct sway_workspace *workspace,
-                double lx, double ly, struct wlr_surface **surface,
-                double *sx, double *sy);
-
-struct sway_container *tiling_container_at(
-                struct sway_node *parent, double lx, double ly,
-                struct wlr_surface **surface, double *sx, double *sy);
-
 void container_for_each_child(struct sway_container *container,
                 void (*f)(struct sway_container *container, void *data), void *data);
 
 /**
+ * Returns the fullscreen container obstructing this container if it exists.
+ */
+struct sway_container *container_obstructing_fullscreen_container(struct sway_container *container);
+
+/**
  * Returns true if the given container is an ancestor of this container.
  */
 bool container_has_ancestor(struct sway_container *container,
@@ -192,18 +177,13 @@ bool container_has_ancestor(struct sway_container *container,
 
 void container_update_textures_recursive(struct sway_container *con);
 
-void container_damage_whole(struct sway_container *container);
-
 void container_reap_empty(struct sway_container *con);
 
 struct sway_container *container_flatten(struct sway_container *container);
 
-void container_update_title_textures(struct sway_container *container);
+void container_update_title_bar(struct sway_container *container);
 
-/**
- * Calculate the container's title_height property.
- */
-void container_calculate_title_height(struct sway_container *container);
+void container_update_marks(struct sway_container *container);
 
 size_t container_build_representation(enum sway_container_layout layout,
                 list_t *children, char *buffer);
@@ -218,6 +198,9 @@ size_t container_titlebar_height(void);
 void floating_calculate_constraints(int *min_width, int *max_width,
                 int *min_height, int *max_height);
 
+void floating_fix_coordinates(struct sway_container *con,
+                struct wlr_box *old, struct wlr_box *new);
+
 void container_floating_resize_and_center(struct sway_container *con);
 
 void container_floating_set_default_size(struct sway_container *con);
@@ -231,6 +214,8 @@ void container_set_geometry_from_content(struct sway_container *con);
 /**
  * Determine if the given container is itself floating.
  * This will return false for any descendants of a floating container.
+ *
+ * Uses pending container state.
  */
 bool container_is_floating(struct sway_container *container);
 
@@ -296,25 +281,12 @@ bool container_is_floating_or_child(struct sway_container *container);
  */
 bool container_is_fullscreen_or_child(struct sway_container *container);
 
-/**
- * Return the output which will be used for scale purposes.
- * This is the most recently entered output.
- */
-struct sway_output *container_get_effective_output(struct sway_container *con);
-
-void container_discover_outputs(struct sway_container *con);
-
 enum sway_container_layout container_parent_layout(struct sway_container *con);
 
-enum sway_container_layout container_current_parent_layout(
-                struct sway_container *con);
-
 list_t *container_get_siblings(struct sway_container *container);
 
 int container_sibling_index(struct sway_container *child);
 
-list_t *container_get_current_siblings(struct sway_container *container);
-
 void container_handle_fullscreen_reparent(struct sway_container *con);
 
 void container_add_child(struct sway_container *parent,
@@ -362,8 +334,6 @@ bool container_has_mark(struct sway_container *container, char *mark);
 
 void container_add_mark(struct sway_container *container, char *mark);
 
-void container_update_marks_textures(struct sway_container *container);
-
 void container_raise_floating(struct sway_container *con);
 
 bool container_is_scratchpad_hidden(struct sway_container *con);
@@ -378,7 +348,7 @@ bool container_is_sticky_or_child(struct sway_container *con);
  * This will destroy pairs of redundant H/V splits
  * e.g. H[V[H[app app]] app] -> H[app app app]
  * The middle "V[H[" are eliminated by a call to container_squash
- * on the V[ con. It's grandchildren are added to it's parent.
+ * on the V[ con. It's grandchildren are added to its parent.
  *
  * This function is roughly equivalent to i3's tree_flatten here:
  * https://github.com/i3/i3/blob/1f0c628cde40cf87371481041b7197344e0417c6/src/tree.c#L651
@@ -387,4 +357,10 @@ bool container_is_sticky_or_child(struct sway_container *con);
  */
 int container_squash(struct sway_container *con);
 
+void container_arrange_title_bar(struct sway_container *con);
+
+void container_update(struct sway_container *con);
+
+void container_update_itself_and_parents(struct sway_container *con);
+
 #endif
diff --git a/include/sway/tree/node.h b/include/sway/tree/node.h
index 470ee3b5..e2dbcdf0 100644
--- a/include/sway/tree/node.h
+++ b/include/sway/tree/node.h
@@ -1,6 +1,8 @@
 #ifndef _SWAY_NODE_H
 #define _SWAY_NODE_H
+#include <wayland-server-core.h>
 #include <stdbool.h>
+#include <wlr/types/wlr_scene.h>
 #include "list.h"
 
 #define MIN_SANE_W 100
@@ -74,4 +76,15 @@ list_t *node_get_children(struct sway_node *node);
 
 bool node_has_ancestor(struct sway_node *node, struct sway_node *ancestor);
 
+// when destroying a sway tree, it's not known which order the tree will be
+// destroyed. To prevent freeing of scene_nodes recursing up the tree,
+// let's use this helper function to disown them to the staging node.
+void scene_node_disown_children(struct wlr_scene_tree *tree);
+
+// a helper function used to allocate tree nodes. If an allocation failure
+// occurs a flag is flipped that can be checked later to destroy a parent
+// of this scene node preventing memory leaks.
+struct wlr_scene_tree *alloc_scene_tree(struct wlr_scene_tree *parent,
+                bool *failed);
+
 #endif
diff --git a/include/sway/tree/root.h b/include/sway/tree/root.h
index e8f4d573..15df0f55 100644
--- a/include/sway/tree/root.h
+++ b/include/sway/tree/root.h
@@ -3,6 +3,7 @@
 #include <wayland-server-core.h>
 #include <wayland-util.h>
 #include <wlr/types/wlr_output_layout.h>
+#include <wlr/types/wlr_scene.h>
 #include <wlr/render/wlr_texture.h>
 #include "sway/tree/container.h"
 #include "sway/tree/node.h"
@@ -16,10 +17,44 @@ struct sway_root {
         struct wlr_output_layout *output_layout;
 
         struct wl_listener output_layout_change;
+
+        // scene node layout:
+        // - root
+        //      - staging
+        //      - layer shell stuff
+        //      - tiling
+        //      - floating
+        //      - fullscreen stuff
+        //      - seat stuff
+        //      - ext_session_lock
+        struct wlr_scene *root_scene;
+
+        // since wlr_scene nodes can't be orphaned and must always
+        // have a parent, use this staging scene_tree so that a
+        // node always have a valid parent. Nothing in this
+        // staging node will be visible.
+        struct wlr_scene_tree *staging;
+
+        // tree containing all layers the compositor will render. Cursor handling
+        // will end up iterating this tree.
+        struct wlr_scene_tree *layer_tree;
+
+        struct {
+                struct wlr_scene_tree *shell_background;
+                struct wlr_scene_tree *shell_bottom;
+                struct wlr_scene_tree *tiling;
+                struct wlr_scene_tree *floating;
+                struct wlr_scene_tree *shell_top;
+                struct wlr_scene_tree *fullscreen;
+                struct wlr_scene_tree *fullscreen_global;
 #if HAVE_XWAYLAND
-        struct wl_list xwayland_unmanaged; // sway_xwayland_unmanaged::link
+                struct wlr_scene_tree *unmanaged;
 #endif
-        struct wl_list drag_icons; // sway_drag_icon::link
+                struct wlr_scene_tree *shell_overlay;
+                struct wlr_scene_tree *popup;
+                struct wlr_scene_tree *seat;
+                struct wlr_scene_tree *session_lock;
+        } layers;
 
         // Includes disabled outputs
         struct wl_list all_outputs; // sway_output::link
@@ -28,10 +63,11 @@ struct sway_root {
         double width, height;
 
         list_t *outputs; // struct sway_output
+        list_t *non_desktop_outputs; // struct sway_output_non_desktop
         list_t *scratchpad; // struct sway_container
 
         // For when there's no connected outputs
-        struct sway_output *noop_output;
+        struct sway_output *fallback_output;
 
         struct sway_container *fullscreen_global;
 
@@ -40,7 +76,7 @@ struct sway_root {
         } events;
 };
 
-struct sway_root *root_create(void);
+struct sway_root *root_create(struct wl_display *display);
 
 void root_destroy(struct sway_root *root);
 
@@ -68,12 +104,6 @@ void root_scratchpad_show(struct sway_container *con);
  */
 void root_scratchpad_hide(struct sway_container *con);
 
-struct sway_workspace *root_workspace_for_pid(pid_t pid);
-
-void root_record_workspace_pid(pid_t pid);
-
-void root_remove_workspace_pid(pid_t pid);
-
 void root_for_each_workspace(void (*f)(struct sway_workspace *ws, void *data),
                 void *data);
 
@@ -91,6 +121,4 @@ struct sway_container *root_find_container(
 
 void root_get_box(struct sway_root *root, struct wlr_box *box);
 
-void root_rename_pid_workspaces(const char *old_name, const char *new_name);
-
 #endif
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index e071e6c9..3e5a9bfe 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -1,8 +1,9 @@
 #ifndef _SWAY_VIEW_H
 #define _SWAY_VIEW_H
 #include <wayland-server-core.h>
-#include <wlr/types/wlr_surface.h>
-#include "config.h"
+#include <wlr/types/wlr_compositor.h>
+#include <wlr/types/wlr_scene.h>
+#include "sway/config.h"
 #if HAVE_XWAYLAND
 #include <wlr/xwayland.h>
 #endif
@@ -45,10 +46,6 @@ struct sway_view_impl {
         void (*set_fullscreen)(struct sway_view *view, bool fullscreen);
         void (*set_resizing)(struct sway_view *view, bool resizing);
         bool (*wants_floating)(struct sway_view *view);
-        void (*for_each_surface)(struct sway_view *view,
-                wlr_surface_iterator_func_t iterator, void *user_data);
-        void (*for_each_popup_surface)(struct sway_view *view,
-                wlr_surface_iterator_func_t iterator, void *user_data);
         bool (*is_transient_for)(struct sway_view *child,
                         struct sway_view *ancestor);
         void (*close)(struct sway_view *view);
@@ -56,24 +53,20 @@ struct sway_view_impl {
         void (*destroy)(struct sway_view *view);
 };
 
-struct sway_saved_buffer {
-        struct wlr_client_buffer *buffer;
-        int x, y;
-        int width, height;
-        enum wl_output_transform transform;
-        struct wlr_fbox source_box;
-        struct wl_list link; // sway_view::saved_buffers
-};
-
 struct sway_view {
         enum sway_view_type type;
         const struct sway_view_impl *impl;
 
+        struct wlr_scene_tree *scene_tree;
+        struct wlr_scene_tree *content_tree;
+        struct wlr_scene_tree *saved_surface_tree;
+
         struct sway_container *container; // NULL if unmapped and transactions finished
         struct wlr_surface *surface; // NULL for unmapped views
         struct sway_xdg_decoration *xdg_decoration;
 
         pid_t pid;
+        struct launcher_ctx *ctx;
 
         // The size the view would want to be if it weren't tiled.
         // Used when changing a view from tiled to floating.
@@ -87,16 +80,10 @@ struct sway_view {
         bool allow_request_urgent;
         struct wl_event_source *urgent_timer;
 
-        struct wl_list saved_buffers; // sway_saved_buffer::link
-
         // The geometry for whatever the client is committing, regardless of
         // transaction state. Updated on every commit.
         struct wlr_box geometry;
 
-        // The "old" geometry during a transaction. Used to damage the old location
-        // when a transaction is applied.
-        struct wlr_box saved_geometry;
-
         struct wlr_foreign_toplevel_handle_v1 *foreign_toplevel;
         struct wl_listener foreign_activate_request;
         struct wl_listener foreign_fullscreen_request;
@@ -108,19 +95,16 @@ struct sway_view {
         list_t *executed_criteria; // struct criteria *
 
         union {
-                struct wlr_xdg_surface *wlr_xdg_surface;
+                struct wlr_xdg_toplevel *wlr_xdg_toplevel;
 #if HAVE_XWAYLAND
                 struct wlr_xwayland_surface *wlr_xwayland_surface;
 #endif
-                struct wlr_wl_shell_surface *wlr_wl_shell_surface;
         };
 
         struct {
                 struct wl_signal unmap;
         } events;
 
-        struct wl_listener surface_new_subsurface;
-
         int max_render_time; // In milliseconds
 
         enum seat_config_shortcuts_inhibit shortcuts_inhibit;
@@ -145,6 +129,8 @@ struct sway_xdg_shell_view {
 struct sway_xwayland_view {
         struct sway_view view;
 
+        struct wlr_scene_tree *surface_tree;
+
         struct wl_listener commit;
         struct wl_listener request_move;
         struct wl_listener request_resize;
@@ -156,70 +142,46 @@ struct sway_xwayland_view {
         struct wl_listener set_title;
         struct wl_listener set_class;
         struct wl_listener set_role;
+        struct wl_listener set_startup_id;
         struct wl_listener set_window_type;
         struct wl_listener set_hints;
         struct wl_listener set_decorations;
+        struct wl_listener associate;
+        struct wl_listener dissociate;
         struct wl_listener map;
         struct wl_listener unmap;
         struct wl_listener destroy;
         struct wl_listener override_redirect;
+
+        struct wl_listener surface_tree_destroy;
 };
 
 struct sway_xwayland_unmanaged {
         struct wlr_xwayland_surface *wlr_xwayland_surface;
-        struct wl_list link;
 
-        int lx, ly;
+        struct wlr_scene_surface *surface_scene;
 
+        struct wl_listener request_activate;
         struct wl_listener request_configure;
         struct wl_listener request_fullscreen;
-        struct wl_listener commit;
         struct wl_listener set_geometry;
+        struct wl_listener associate;
+        struct wl_listener dissociate;
         struct wl_listener map;
         struct wl_listener unmap;
         struct wl_listener destroy;
         struct wl_listener override_redirect;
 };
 #endif
-struct sway_view_child;
-
-struct sway_view_child_impl {
-        void (*get_root_coords)(struct sway_view_child *child, int *sx, int *sy);
-        void (*destroy)(struct sway_view_child *child);
-};
-
-/**
- * A view child is a surface in the view tree, such as a subsurface or a popup.
- */
-struct sway_view_child {
-        const struct sway_view_child_impl *impl;
-        struct wl_list link;
-
-        struct sway_view *view;
-        struct sway_view_child *parent;
-        struct wl_list children; // sway_view_child::link
-        struct wlr_surface *surface;
-        bool mapped;
-
-        struct wl_listener surface_commit;
-        struct wl_listener surface_new_subsurface;
-        struct wl_listener surface_map;
-        struct wl_listener surface_unmap;
-        struct wl_listener surface_destroy;
-        struct wl_listener view_unmap;
-};
-
-struct sway_subsurface {
-        struct sway_view_child child;
-
-        struct wl_listener destroy;
-};
 
 struct sway_xdg_popup {
-        struct sway_view_child child;
+        struct sway_view *view;
 
-        struct wlr_xdg_surface *wlr_xdg_surface;
+        struct wlr_scene_tree *scene_tree;
+        struct wlr_scene_tree *xdg_surface_tree;
+        struct wlr_xdg_popup *wlr_xdg_popup;
 
+        struct wl_listener surface_commit;
         struct wl_listener new_popup;
         struct wl_listener destroy;
 };
@@ -269,7 +231,7 @@ void view_set_activated(struct sway_view *view, bool activated);
 /**
  * Called when the view requests to be focused.
  */
-void view_request_activate(struct sway_view *view);
+void view_request_activate(struct sway_view *view, struct sway_seat *seat);
 
 /**
  * If possible, instructs the client to change their decoration mode.
@@ -288,42 +250,31 @@ void view_close(struct sway_view *view);
 
 void view_close_popups(struct sway_view *view);
 
-void view_damage_from(struct sway_view *view);
-
-/**
- * Iterate all surfaces of a view (toplevels + popups).
- */
-void view_for_each_surface(struct sway_view *view,
-        wlr_surface_iterator_func_t iterator, void *user_data);
-
-/**
- * Iterate all popup surfaces of a view.
- */
-void view_for_each_popup_surface(struct sway_view *view,
-        wlr_surface_iterator_func_t iterator, void *user_data);
-
 // view implementation
 
-void view_init(struct sway_view *view, enum sway_view_type type,
+bool view_init(struct sway_view *view, enum sway_view_type type,
         const struct sway_view_impl *impl);
 
 void view_destroy(struct sway_view *view);
 
 void view_begin_destroy(struct sway_view *view);
 
+/**
+ * Map a view, ie. make it visible in the tree.
+ *
+ * `fullscreen` should be set to true (and optionally `fullscreen_output`
+ * should be populated) if the view should be made fullscreen immediately.
+ *
+ * `decoration` should be set to true if the client prefers CSD. The client's
+ * preference may be ignored.
+ */
 void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
         bool fullscreen, struct wlr_output *fullscreen_output, bool decoration);
 
 void view_unmap(struct sway_view *view);
 
-void view_update_size(struct sway_view *view, int width, int height);
-
-void view_child_init(struct sway_view_child *child,
-        const struct sway_view_child_impl *impl, struct sway_view *view,
-        struct wlr_surface *surface);
-
-void view_child_destroy(struct sway_view_child *child);
-
+void view_update_size(struct sway_view *view);
+void view_center_and_clip_surface(struct sway_view *view);
 
 struct sway_view *view_from_wlr_xdg_surface(
         struct wlr_xdg_surface *xdg_surface);
@@ -362,4 +313,8 @@ void view_save_buffer(struct sway_view *view);
 
 bool view_is_transient_for(struct sway_view *child, struct sway_view *ancestor);
 
+void view_assign_ctx(struct sway_view *view, struct launcher_ctx *ctx);
+
+void view_send_frame_done(struct sway_view *view);
+
 #endif
diff --git a/include/sway/tree/workspace.h b/include/sway/tree/workspace.h
index fdd92f64..58bde20c 100644
--- a/include/sway/tree/workspace.h
+++ b/include/sway/tree/workspace.h
@@ -2,6 +2,8 @@
 #define _SWAY_WORKSPACE_H
 
 #include <stdbool.h>
+#include <wlr/types/wlr_scene.h>
+#include "sway/config.h"
 #include "sway/tree/container.h"
 #include "sway/tree/node.h"
 
@@ -22,6 +24,12 @@ struct sway_workspace_state {
 
 struct sway_workspace {
         struct sway_node node;
+
+        struct {
+                struct wlr_scene_tree *tiling;
+                struct wlr_scene_tree *fullscreen;
+        } layers;
+
         struct sway_container *fullscreen;
 
         char *name;
@@ -60,20 +68,20 @@ void workspace_consider_destroy(struct sway_workspace *ws);
 
 char *workspace_next_name(const char *output_name);
 
-bool workspace_switch(struct sway_workspace *workspace,
-                bool no_auto_back_and_forth);
+struct sway_workspace *workspace_auto_back_and_forth(
+                struct sway_workspace *workspace);
+
+bool workspace_switch(struct sway_workspace *workspace);
 
 struct sway_workspace *workspace_by_number(const char* name);
 
 struct sway_workspace *workspace_by_name(const char*);
 
-struct sway_workspace *workspace_output_next(
-                struct sway_workspace *current, bool create);
+struct sway_workspace *workspace_output_next(struct sway_workspace *current);
 
 struct sway_workspace *workspace_next(struct sway_workspace *current);
 
-struct sway_workspace *workspace_output_prev(
-                struct sway_workspace *current, bool create);
+struct sway_workspace *workspace_output_prev(struct sway_workspace *current);
 
 struct sway_workspace *workspace_prev(struct sway_workspace *current);
 
diff --git a/include/sway/xdg_decoration.h b/include/sway/xdg_decoration.h
index 8bef4c6d..2388ebcb 100644
--- a/include/sway/xdg_decoration.h
+++ b/include/sway/xdg_decoration.h
@@ -16,4 +16,6 @@ struct sway_xdg_decoration {
 struct sway_xdg_decoration *xdg_decoration_from_surface(
         struct wlr_surface *surface);
 
+void set_xdg_decoration_mode(struct sway_xdg_decoration *deco);
+
 #endif
diff --git a/include/swaybar/bar.h b/include/swaybar/bar.h
index 545a66a8..197d2190 100644
--- a/include/swaybar/bar.h
+++ b/include/swaybar/bar.h
@@ -4,6 +4,7 @@
 #include "config.h"
 #include "input.h"
 #include "pool-buffer.h"
+#include "cursor-shape-v1-client-protocol.h"
 #include "wlr-layer-shell-unstable-v1-client-protocol.h"
 #include "xdg-output-unstable-v1-client-protocol.h"
 
@@ -30,6 +31,7 @@ struct swaybar {
         struct wl_compositor *compositor;
         struct zwlr_layer_shell_v1 *layer_shell;
         struct zxdg_output_manager_v1 *xdg_output_manager;
+        struct wp_cursor_shape_manager_v1 *cursor_shape_manager;
         struct wl_shm *shm;
 
         struct swaybar_config *config;
@@ -58,7 +60,6 @@ struct swaybar_output {
         struct zxdg_output_v1 *xdg_output;
         struct wl_surface *surface;
         struct zwlr_layer_surface_v1 *layer_surface;
-        struct wl_region *input_region;
         uint32_t wl_name;
 
         struct wl_list workspaces; // swaybar_workspace::link
diff --git a/include/swaybar/config.h b/include/swaybar/config.h
index 4cacd21a..361acd99 100644
--- a/include/swaybar/config.h
+++ b/include/swaybar/config.h
@@ -6,6 +6,7 @@
 #include "../include/config.h"
 #include "list.h"
 #include "util.h"
+#include <pango/pangocairo.h>
 
 struct box_colors {
         uint32_t border;
@@ -28,7 +29,7 @@ struct swaybar_config {
         char *status_command;
         bool pango_markup;
         uint32_t position; // zwlr_layer_surface_v1_anchor
-        char *font;
+        PangoFontDescription *font_description;
         char *sep_symbol;
         char *mode;
         char *hidden_state;
diff --git a/include/swaybar/i3bar.h b/include/swaybar/i3bar.h
index df8cdd09..dced2a6c 100644
--- a/include/swaybar/i3bar.h
+++ b/include/swaybar/i3bar.h
@@ -19,6 +19,7 @@ struct i3bar_block {
         // Airblader features
         uint32_t background;
         uint32_t border;
+        bool border_set;
         int border_top;
         int border_bottom;
         int border_left;
@@ -29,6 +30,6 @@ void i3bar_block_unref(struct i3bar_block *block);
 bool i3bar_handle_readable(struct status_line *status);
 enum hotspot_event_handling i3bar_block_send_click(struct status_line *status,
                 struct i3bar_block *block, double x, double y, double rx, double ry,
-                double w, double h, int scale, uint32_t button);
+                double w, double h, int scale, uint32_t button, bool released);
 
 #endif
diff --git a/include/swaybar/image.h b/include/swaybar/image.h
new file mode 100644
index 00000000..53a210dd
--- /dev/null
+++ b/include/swaybar/image.h
@@ -0,0 +1,7 @@
+#ifndef _SWAYBAR_IMAGE_H
+#define _SWAYBAR_IMAGE_H
+#include <cairo.h>
+
+cairo_surface_t *load_image(const char *path);
+
+#endif
diff --git a/include/swaybar/input.h b/include/swaybar/input.h
index e8735d88..8ea88a69 100644
--- a/include/swaybar/input.h
+++ b/include/swaybar/input.h
@@ -49,7 +49,7 @@ struct swaybar_hotspot {
         int x, y, width, height;
         enum hotspot_event_handling (*callback)(struct swaybar_output *output,
                 struct swaybar_hotspot *hotspot, double x, double y, uint32_t button,
-                void *data);
+                bool released, void *data);
         void (*destroy)(void *data);
         void *data;
 };
diff --git a/include/swaybar/tray/item.h b/include/swaybar/tray/item.h
index c02a5582..73937a0c 100644
--- a/include/swaybar/tray/item.h
+++ b/include/swaybar/tray/item.h
@@ -4,6 +4,7 @@
 #include <cairo.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include <wayland-util.h>
 #include "swaybar/tray/tray.h"
 #include "list.h"
 
diff --git a/include/swaynag/swaynag.h b/include/swaynag/swaynag.h
index 9e39e716..fb9e9c21 100644
--- a/include/swaynag/swaynag.h
+++ b/include/swaynag/swaynag.h
@@ -4,8 +4,9 @@
 #include <strings.h>
 #include "list.h"
 #include "pool-buffer.h"
+#include "cursor-shape-v1-client-protocol.h"
+
 #include "swaynag/types.h"
-#include "xdg-output-unstable-v1-client-protocol.h"
 
 #define SWAYNAG_MAX_HEIGHT 500
 
@@ -59,6 +60,7 @@ struct swaynag_button {
 struct swaynag_details {
         bool visible;
         char *message;
+        char *details_text;
 
         int x;
         int y;
@@ -75,18 +77,17 @@ struct swaynag_details {
 
 struct swaynag {
         bool run_display;
-        int querying_outputs;
 
         struct wl_display *display;
         struct wl_compositor *compositor;
         struct wl_seat *seat;
         struct wl_shm *shm;
-        struct zxdg_output_manager_v1 *xdg_output_manager;
         struct wl_list outputs;  // swaynag_output::link
         struct wl_list seats;  // swaynag_seat::link
         struct swaynag_output *output;
         struct zwlr_layer_shell_v1 *layer_shell;
         struct zwlr_layer_surface_v1 *layer_surface;
+        struct wp_cursor_shape_manager_v1 *cursor_shape_manager;
         struct wl_surface *surface;
 
         uint32_t width;
diff --git a/include/swaynag/types.h b/include/swaynag/types.h
index 24da9418..9c3c50db 100644
--- a/include/swaynag/types.h
+++ b/include/swaynag/types.h
@@ -1,12 +1,17 @@
 #ifndef _SWAYNAG_TYPES_H
 #define _SWAYNAG_TYPES_H
 
+#include <stdint.h>
+#include <pango/pangocairo.h>
+#include "list.h"
+
 struct swaynag_type {
         char *name;
 
-        char *font;
+        PangoFontDescription *font_description;
         char *output;
         uint32_t anchors;
+        int32_t layer; // enum zwlr_layer_shell_v1_layer or -1 if unset
 
         // Colors
         uint32_t button_text;
diff --git a/include/util.h b/include/util.h
index c80da1cb..f887d489 100644
--- a/include/util.h
+++ b/include/util.h
@@ -30,12 +30,6 @@ int parse_movement_amount(int argc, char **argv,
                 struct movement_amount *amount);
 
 /**
- * Get the current time, in milliseconds.
- */
-
-uint32_t get_current_time_msec(void);
-
-/**
  * Wrap i into the range [0, max]
  */
 int wrap(int i, int max);
diff --git a/meson.build b/meson.build
index 38a55678..f8bf4f80 100644
--- a/meson.build
+++ b/meson.build
@@ -1,9 +1,9 @@
 project(
         'sway',
         'c',
-        version: '1.5', #release_version
+        version: '1.10-dev',
         license: 'MIT',
-        meson_version: '>=0.53.0',
+        meson_version: '>=0.60.0',
         default_options: [
                 'c_std=c11',
                 'warning_level=2',
@@ -18,6 +18,7 @@ add_project_arguments(
                 '-Wno-unused-parameter',
                 '-Wno-unused-result',
                 '-Wno-missing-braces',
+                '-Wno-format-zero-length',
                 '-Wundef',
                 '-Wvla',
         ],
@@ -35,79 +36,65 @@ if is_freebsd
         add_project_arguments('-D_C11_SOURCE', language: 'c')
 endif
 
-jsonc          = dependency('json-c', version: '>=0.13')
-pcre           = dependency('libpcre')
-wayland_server = dependency('wayland-server')
-wayland_client = dependency('wayland-client')
-wayland_cursor = dependency('wayland-cursor')
-wayland_egl    = dependency('wayland-egl')
-wayland_protos = dependency('wayland-protocols', version: '>=1.14')
-xkbcommon      = dependency('xkbcommon')
-cairo          = dependency('cairo')
-pango          = dependency('pango')
-pangocairo     = dependency('pangocairo')
-gdk_pixbuf     = dependency('gdk-pixbuf-2.0', required: get_option('gdk-pixbuf'))
-pixman         = dependency('pixman-1')
-glesv2         = dependency('glesv2')
-libevdev       = dependency('libevdev')
-libinput       = dependency('libinput', version: '>=1.6.0')
-xcb            = dependency('xcb', required: get_option('xwayland'))
-bash_comp      = dependency('bash-completion', required: false)
-fish_comp      = dependency('fish', required: false)
-math           = cc.find_library('m')
-rt             = cc.find_library('rt')
-
-# Try first to find wlroots as a subproject, then as a system dependency
-wlroots_version = ['>=0.12.0', '<0.13.0']
-wlroots_proj = subproject(
+# Execute the wlroots subproject, if any
+wlroots_version = ['>=0.18.0', '<0.19.0']
+subproject(
         'wlroots',
         default_options: ['examples=false'],
         required: false,
         version: wlroots_version,
 )
+wlroots = dependency('wlroots', version: wlroots_version)
 wlroots_features = {
         'xwayland': false,
-        'systemd': false,
-        'elogind': false,
-        'libseat': false,
+        'libinput_backend': false,
+        'session': false,
 }
-if wlroots_proj.found()
-        wlroots = wlroots_proj.get_variable('wlroots')
-        wlroots_conf = wlroots_proj.get_variable('conf_data')
-        foreach name, _ : wlroots_features
-                has = wlroots_conf.get('WLR_HAS_' + name.to_upper()) == 1
-                wlroots_features += { name: has }
-        endforeach
-else
-        wlroots = dependency('wlroots', version: wlroots_version)
-        foreach name, _ : wlroots_features
-                has = cc.get_define('WLR_HAS_' + name.to_upper(), prefix: '#include <wlr/config.h>', dependencies: wlroots) == '1'
-                wlroots_features += { name: has }
-        endforeach
-endif
+foreach name, _ : wlroots_features
+        var_name = 'have_' + name.underscorify()
+        have = wlroots.get_variable(pkgconfig: var_name, internal: var_name) == 'true'
+        wlroots_features += { name: have }
+endforeach
 
 if get_option('xwayland').enabled() and not wlroots_features['xwayland']
         error('Cannot enable Xwayland in sway: wlroots has been built without Xwayland support')
 endif
-have_xwayland = xcb.found() and wlroots_features['xwayland']
+
+null_dep = dependency('', required: false)
+
+jsonc = dependency('json-c', version: '>=0.13')
+pcre2 = dependency('libpcre2-8')
+wayland_server = dependency('wayland-server', version: '>=1.21.0')
+wayland_client = dependency('wayland-client')
+wayland_cursor = dependency('wayland-cursor')
+wayland_protos = dependency('wayland-protocols', version: '>=1.24')
+xkbcommon = dependency('xkbcommon', version: '>=1.5.0')
+cairo = dependency('cairo')
+pango = dependency('pango')
+pangocairo = dependency('pangocairo')
+gdk_pixbuf = dependency('gdk-pixbuf-2.0', required: get_option('gdk-pixbuf'))
+pixman = dependency('pixman-1')
+libevdev = dependency('libevdev')
+libinput = wlroots_features['libinput_backend'] ? dependency('libinput', version: '>=1.21.0') : null_dep
+xcb = dependency('xcb', required: get_option('xwayland'))
+drm = dependency('libdrm')
+libudev = wlroots_features['libinput_backend'] ? dependency('libudev') : null_dep
+math = cc.find_library('m')
+rt = cc.find_library('rt')
+xcb_icccm = dependency('xcb-icccm', required: get_option('xwayland'))
+threads = dependency('threads') # for pthread_setschedparam
+
+have_xwayland = xcb.found() and xcb_icccm.found() and wlroots_features['xwayland']
 
 if get_option('sd-bus-provider') == 'auto'
         if not get_option('tray').disabled()
                 assert(get_option('auto_features').auto(), 'sd-bus-provider must not be set to auto since auto_features != auto')
         endif
-        sdbus = dependency('libsystemd',
+        sdbus = dependency(['libsystemd', 'libelogind'],
                 required: false,
                 version: '>=239',
-                not_found_message: 'libsystemd not found, trying libelogind',
         )
         if not sdbus.found()
-                sdbus = dependency('libelogind',
-                        required: false,
-                        version: '>=239',
-                        not_found_message: 'libelogind not found, trying basu',
-                )
-        endif
-        if not sdbus.found()
                 sdbus = dependency('basu', required: false)
         endif
 else
@@ -128,11 +115,15 @@ conf_data.set10('HAVE_LIBSYSTEMD', sdbus.found() and sdbus.name() == 'libsystemd
 conf_data.set10('HAVE_LIBELOGIND', sdbus.found() and sdbus.name() == 'libelogind')
 conf_data.set10('HAVE_BASU', sdbus.found() and sdbus.name() == 'basu')
 conf_data.set10('HAVE_TRAY', have_tray)
+conf_data.set10('HAVE_LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM', cc.has_header_symbol(
+        'libinput.h',
+        'LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM',
+        dependencies: libinput,
+))
 
 scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_option('man-pages'))
 if scdoc.found()
-        scdoc_prog = find_program(scdoc.get_pkgconfig_variable('scdoc'), native: true)
-        sh = find_program('sh', native: true)
+        scdoc_prog = find_program(scdoc.get_variable(pkgconfig: 'scdoc'), native: true)
         mandir = get_option('mandir')
         man_files = [
                 'sway/sway.1.scd',
@@ -143,9 +134,15 @@ if scdoc.found()
                 'sway/sway-output.5.scd',
                 'swaybar/swaybar-protocol.7.scd',
                 'swaymsg/swaymsg.1.scd',
-                'swaynag/swaynag.1.scd',
-                'swaynag/swaynag.5.scd',
         ]
+
+        if get_option('swaynag')
+                man_files += [
+                        'swaynag/swaynag.1.scd',
+                        'swaynag/swaynag.5.scd',
+                ]
+        endif
+
         foreach filename : man_files
                 topic = filename.split('.')[-3].split('/')[-1]
                 section = filename.split('.')[-2]
@@ -155,10 +152,10 @@ if scdoc.found()
                         output,
                         input: filename,
                         output: output,
-                        command: [
-                                sh, '-c', '@0@ < @INPUT@ > @1@'.format(scdoc_prog.path(), output)
-                        ],
+                        command: scdoc_prog,
                         install: true,
+                        feed: true,
+                        capture: true,
                         install_dir: '@0@/man@1@'.format(mandir, section)
                 )
         endforeach
@@ -169,8 +166,8 @@ add_project_arguments('-DSYSCONFDIR="/@0@"'.format(join_paths(prefix, sysconfdir
 version = '"@0@"'.format(meson.project_version())
 git = find_program('git', native: true, required: false)
 if git.found()
-        git_commit = run_command([git, 'rev-parse', '--short', 'HEAD'])
-        git_branch = run_command([git, 'rev-parse', '--abbrev-ref', 'HEAD'])
+        git_commit = run_command([git, 'rev-parse', '--short', 'HEAD'], check: false)
+        git_branch = run_command([git, 'rev-parse', '--abbrev-ref', 'HEAD'], check: false)
         if git_commit.returncode() == 0 and git_branch.returncode() == 0
                 version = '"@0@-@1@ (" __DATE__ ", branch \'@2@\')"'.format(
                         meson.project_version(),
@@ -183,7 +180,7 @@ add_project_arguments('-DSWAY_VERSION=@0@'.format(version), language: 'c')
 
 # Compute the relative path used by compiler invocations.
 source_root = meson.current_source_dir().split('/')
-build_root = meson.build_root().split('/')
+build_root = meson.global_build_root().split('/')
 relative_dir_parts = []
 i = 0
 in_prefix = true
@@ -227,9 +224,15 @@ subdir('common')
 subdir('sway')
 subdir('swaymsg')
 
-subdir('client')
-subdir('swaybar')
-subdir('swaynag')
+if get_option('swaybar') or get_option('swaynag')
+        subdir('client')
+endif
+if get_option('swaybar')
+        subdir('swaybar')
+endif
+if get_option('swaynag')
+        subdir('swaynag')
+endif
 
 config = configuration_data()
 config.set('datadir', join_paths(prefix, datadir))
@@ -264,61 +267,11 @@ if get_option('default-wallpaper')
         install_data(wallpaper_files, install_dir: wallpaper_install_dir)
 endif
 
-if get_option('zsh-completions')
-        zsh_files = files(
-                'completions/zsh/_sway',
-                'completions/zsh/_swaymsg',
-        )
-        zsh_install_dir = join_paths(datadir, 'zsh', 'site-functions')
-
-        install_data(zsh_files, install_dir: zsh_install_dir)
-endif
-
-if get_option('bash-completions')
-        bash_files = files(
-                'completions/bash/sway',
-                'completions/bash/swaybar',
-                'completions/bash/swaymsg',
-        )
-        if bash_comp.found()
-                bash_install_dir = bash_comp.get_pkgconfig_variable(
-                        'completionsdir',
-                        define_variable: ['datadir', datadir]
-                )
-        else
-                bash_install_dir = join_paths(datadir, 'bash-completion', 'completions')
-        endif
-
-        install_data(bash_files, install_dir: bash_install_dir)
-endif
-
-if get_option('fish-completions')
-        fish_files = files(
-                'completions/fish/sway.fish',
-                'completions/fish/swaymsg.fish',
-                'completions/fish/swaynag.fish',
-        )
-        if fish_comp.found()
-                fish_install_dir = fish_comp.get_pkgconfig_variable(
-                        'completionsdir',
-                        define_variable: ['datadir', datadir]
-                )
-        else
-                fish_install_dir = join_paths(datadir, 'fish', 'vendor_completions.d')
-        endif
-
-        install_data(fish_files, install_dir: fish_install_dir)
-endif
+subdir('completions')
 
 summary({
         'xwayland': have_xwayland,
         'gdk-pixbuf': gdk_pixbuf.found(),
-        'sd-bus': sdbus.found(),
         'tray': have_tray,
         'man-pages': scdoc.found(),
 }, bool_yn: true)
-
-if not wlroots_features['systemd'] and not wlroots_features['elogind'] and not wlroots_features['libseat']
-        warning('The sway binary must be setuid when compiled without (e)logind or libseat')
-        warning('You must do this manually post-install: chmod a+s /path/to/sway')
-endif
diff --git a/meson_options.txt b/meson_options.txt
index e36900b6..8d0d6509 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -2,8 +2,10 @@ option('default-wallpaper', type: 'boolean', value: true, description: 'Install
 option('zsh-completions', type: 'boolean', value: true, description: 'Install zsh shell completions.')
 option('bash-completions', type: 'boolean', value: true, description: 'Install bash shell completions.')
 option('fish-completions', type: 'boolean', value: true, description: 'Install fish shell completions.')
+option('swaybar', type: 'boolean', value: true, description: 'Enable support for swaybar')
+option('swaynag', type: 'boolean', value: true, description: 'Enable support for swaynag')
 option('xwayland', type: 'feature', value: 'auto', description: 'Enable support for X11 applications')
 option('tray', type: 'feature', value: 'auto', description: 'Enable support for swaybar tray')
-option('gdk-pixbuf', type: 'feature', value: 'auto', description: 'Enable support for more image formats in swaybg')
+option('gdk-pixbuf', type: 'feature', value: 'auto', description: 'Enable support for more image formats in swaybar tray')
 option('man-pages', type: 'feature', value: 'auto', description: 'Generate and install man pages')
 option('sd-bus-provider', type: 'combo', choices: ['auto', 'libsystemd', 'libelogind', 'basu'], value: 'auto', description: 'Provider of the sd-bus library')
diff --git a/protocols/meson.build b/protocols/meson.build
index 124e9777..81edb584 100644
--- a/protocols/meson.build
+++ b/protocols/meson.build
@@ -1,80 +1,43 @@
-wl_protocol_dir = wayland_protos.get_pkgconfig_variable('pkgdatadir')
+wl_protocol_dir = wayland_protos.get_variable('pkgdatadir')
 
-wayland_scanner_dep = dependency('wayland-scanner', required: false, native: true)
-if wayland_scanner_dep.found()
-        wayland_scanner = find_program(
-                wayland_scanner_dep.get_pkgconfig_variable('wayland_scanner'),
-                native: true,
-        )
-else
-        wayland_scanner = find_program('wayland-scanner', native: true)
-endif
+wayland_scanner_dep = dependency('wayland-scanner', native: true)
+wayland_scanner = find_program(
+        wayland_scanner_dep.get_variable('wayland_scanner'),
+        native: true,
+)
 
 protocols = [
-        [wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'],
-        [wl_protocol_dir, 'unstable/xdg-output/xdg-output-unstable-v1.xml'],
-        [wl_protocol_dir, 'unstable/pointer-constraints/pointer-constraints-unstable-v1.xml'],
-        [wl_protocol_dir, 'unstable/tablet/tablet-unstable-v2.xml'],
-        ['wlr-layer-shell-unstable-v1.xml'],
-        ['idle.xml'],
-        ['wlr-input-inhibitor-unstable-v1.xml'],
-        ['wlr-output-power-management-unstable-v1.xml'],
-]
-
-client_protocols = [
-        [wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'],
-        [wl_protocol_dir, 'unstable/xdg-output/xdg-output-unstable-v1.xml'],
-        ['wlr-layer-shell-unstable-v1.xml'],
-        ['wlr-input-inhibitor-unstable-v1.xml'],
+        wl_protocol_dir / 'stable/xdg-shell/xdg-shell.xml',
+        wl_protocol_dir / 'unstable/xdg-output/xdg-output-unstable-v1.xml',
+        wl_protocol_dir / 'unstable/pointer-constraints/pointer-constraints-unstable-v1.xml',
+        wl_protocol_dir / 'unstable/tablet/tablet-unstable-v2.xml',
+        wl_protocol_dir / 'unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml',
+        wl_protocol_dir / 'staging/content-type/content-type-v1.xml',
+        wl_protocol_dir / 'staging/cursor-shape/cursor-shape-v1.xml',
+        'wlr-layer-shell-unstable-v1.xml',
+        'idle.xml',
+        'wlr-output-power-management-unstable-v1.xml',
 ]
 
 wl_protos_src = []
-wl_protos_headers = []
 
-foreach p : protocols
-        xml = join_paths(p)
+foreach xml : protocols
         wl_protos_src += custom_target(
-                xml.underscorify() + '_server_c',
+                xml.underscorify() + '_c',
                 input: xml,
                 output: '@BASENAME@-protocol.c',
                 command: [wayland_scanner, 'private-code', '@INPUT@', '@OUTPUT@'],
         )
-        wl_protos_headers += custom_target(
+        wl_protos_src += custom_target(
                 xml.underscorify() + '_server_h',
                 input: xml,
                 output: '@BASENAME@-protocol.h',
                 command: [wayland_scanner, 'server-header', '@INPUT@', '@OUTPUT@'],
         )
-endforeach
-
-foreach p : client_protocols
-        xml = join_paths(p)
-        wl_protos_headers += custom_target(
+        wl_protos_src += custom_target(
                 xml.underscorify() + '_client_h',
                 input: xml,
                 output: '@BASENAME@-client-protocol.h',
                 command: [wayland_scanner, 'client-header', '@INPUT@', '@OUTPUT@'],
         )
 endforeach
-
-lib_client_protos = static_library(
-        'client_protos',
-        wl_protos_src + wl_protos_headers,
-        dependencies: wayland_client.partial_dependency(compile_args: true),
-)
-
-client_protos = declare_dependency(
-        link_with: lib_client_protos,
-        sources: wl_protos_headers,
-)
-
-lib_server_protos = static_library(
-        'server_protos',
-        wl_protos_src + wl_protos_headers,
-        dependencies: wayland_server.partial_dependency(compile_args: true),
-)
-
-server_protos = declare_dependency(
-        link_with: lib_server_protos,
-        sources: wl_protos_headers,
-)
diff --git a/protocols/wlr-input-inhibitor-unstable-v1.xml b/protocols/wlr-input-inhibitor-unstable-v1.xml
deleted file mode 100644
index b62d1bb4..00000000
--- a/protocols/wlr-input-inhibitor-unstable-v1.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<protocol name="wlr_input_inhibit_unstable_v1">
-  <copyright>
-    Copyright © 2018 Drew DeVault
-
-    Permission to use, copy, modify, distribute, and sell this
-    software and its documentation for any purpose is hereby granted
-    without fee, provided that the above copyright notice appear in
-    all copies and that both that copyright notice and this permission
-    notice appear in supporting documentation, and that the name of
-    the copyright holders not be used in advertising or publicity
-    pertaining to distribution of the software without specific,
-    written prior permission.  The copyright holders make no
-    representations about the suitability of this software for any
-    purpose.  It is provided "as is" without express or implied
-    warranty.
-
-    THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-    SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-    FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-    SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-    ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-    THIS SOFTWARE.
-  </copyright>
-
-  <interface name="zwlr_input_inhibit_manager_v1" version="1">
-    <description summary="inhibits input events to other clients">
-      Clients can use this interface to prevent input events from being sent to
-      any surfaces but its own, which is useful for example in lock screen
-      software. It is assumed that access to this interface will be locked down
-      to whitelisted clients by the compositor.
-    </description>
-
-    <request name="get_inhibitor">
-      <description summary="inhibit input to other clients">
-        Activates the input inhibitor. As long as the inhibitor is active, the
-        compositor will not send input events to other clients.
-      </description>
-      <arg name="id" type="new_id" interface="zwlr_input_inhibitor_v1"/>
-    </request>
-
-    <enum name="error">
-      <entry name="already_inhibited" value="0" summary="an input inhibitor is already in use on the compositor"/>
-    </enum>
-  </interface>
-
-  <interface name="zwlr_input_inhibitor_v1" version="1">
-    <description summary="inhibits input to other clients">
-      While this resource exists, input to clients other than the owner of the
-      inhibitor resource will not receive input events. The client that owns
-      this resource will receive all input events normally. The compositor will
-      also disable all of its own input processing (such as keyboard shortcuts)
-      while the inhibitor is active.
-
-      The compositor may continue to send input events to selected clients,
-      such as an on-screen keyboard (via the input-method protocol).
-    </description>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy the input inhibitor object">
-        Destroy the inhibitor and allow other clients to receive input.
-      </description>
-    </request>
-  </interface>
-</protocol>
diff --git a/sway/commands.c b/sway/commands.c
index fe1e98b5..55eda183 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -42,15 +42,17 @@ struct cmd_results *checkarg(int argc, const char *name, enum expected_args type
 }
 
 /* Keep alphabetized */
-static struct cmd_handler handlers[] = {
+static const struct cmd_handler handlers[] = {
         { "assign", cmd_assign },
         { "bar", cmd_bar },
         { "bindcode", cmd_bindcode },
+        { "bindgesture", cmd_bindgesture },
         { "bindswitch", cmd_bindswitch },
         { "bindsym", cmd_bindsym },
         { "client.background", cmd_client_noop },
         { "client.focused", cmd_client_focused },
         { "client.focused_inactive", cmd_client_focused_inactive },
+        { "client.focused_tab_title", cmd_client_focused_tab_title },
         { "client.placeholder", cmd_client_noop },
         { "client.unfocused", cmd_client_unfocused },
         { "client.urgent", cmd_client_urgent },
@@ -80,6 +82,7 @@ static struct cmd_handler handlers[] = {
         { "no_focus", cmd_no_focus },
         { "output", cmd_output },
         { "popup_during_fullscreen", cmd_popup_during_fullscreen },
+        { "primary_selection", cmd_primary_selection },
         { "seat", cmd_seat },
         { "set", cmd_set },
         { "show_marks", cmd_show_marks },
@@ -91,6 +94,7 @@ static struct cmd_handler handlers[] = {
         { "titlebar_border_thickness", cmd_titlebar_border_thickness },
         { "titlebar_padding", cmd_titlebar_padding },
         { "unbindcode", cmd_unbindcode },
+        { "unbindgesture", cmd_unbindgesture },
         { "unbindswitch", cmd_unbindswitch },
         { "unbindsym", cmd_unbindsym },
         { "workspace", cmd_workspace },
@@ -98,7 +102,7 @@ static struct cmd_handler handlers[] = {
 };
 
 /* Config-time only commands. Keep alphabetized */
-static struct cmd_handler config_handlers[] = {
+static const struct cmd_handler config_handlers[] = {
         { "default_orientation", cmd_default_orientation },
         { "include", cmd_include },
         { "swaybg_command", cmd_swaybg_command },
@@ -108,7 +112,7 @@ static struct cmd_handler config_handlers[] = {
 };
 
 /* Runtime-only commands. Keep alphabetized */
-static struct cmd_handler command_handlers[] = {
+static const struct cmd_handler command_handlers[] = {
         { "border", cmd_border },
         { "create_output", cmd_create_output },
         { "exit", cmd_exit },
@@ -144,22 +148,22 @@ static int handler_compare(const void *_a, const void *_b) {
         return strcasecmp(a->command, b->command);
 }
 
-struct cmd_handler *find_handler(char *line, struct cmd_handler *handlers,
-                size_t handlers_size) {
+const struct cmd_handler *find_handler(const char *line,
+                const struct cmd_handler *handlers, size_t handlers_size) {
         if (!handlers || !handlers_size) {
                 return NULL;
         }
-        struct cmd_handler query = { .command = line };
+        const struct cmd_handler query = { .command = line };
         return bsearch(&query, handlers,
                         handlers_size / sizeof(struct cmd_handler),
                         sizeof(struct cmd_handler), handler_compare);
 }
 
-static struct cmd_handler *find_handler_ex(char *line,
-                struct cmd_handler *config_handlers, size_t config_handlers_size,
-                struct cmd_handler *command_handlers, size_t command_handlers_size,
-                struct cmd_handler *handlers, size_t handlers_size) {
-        struct cmd_handler *handler = NULL;
+static const struct cmd_handler *find_handler_ex(char *line,
+                const struct cmd_handler *config_handlers, size_t config_handlers_size,
+                const struct cmd_handler *command_handlers, size_t command_handlers_size,
+                const struct cmd_handler *handlers, size_t handlers_size) {
+        const struct cmd_handler *handler = NULL;
         if (config->reading) {
                 handler = find_handler(line, config_handlers, config_handlers_size);
         } else if (config->active) {
@@ -168,16 +172,17 @@ static struct cmd_handler *find_handler_ex(char *line,
         return handler ? handler : find_handler(line, handlers, handlers_size);
 }
 
-static struct cmd_handler *find_core_handler(char *line) {
+static const struct cmd_handler *find_core_handler(char *line) {
         return find_handler_ex(line, config_handlers, sizeof(config_handlers),
                         command_handlers, sizeof(command_handlers),
                         handlers, sizeof(handlers));
 }
 
-static void set_config_node(struct sway_node *node) {
+static void set_config_node(struct sway_node *node, bool node_overridden) {
         config->handler_context.node = node;
         config->handler_context.container = NULL;
         config->handler_context.workspace = NULL;
+        config->handler_context.node_overridden = node_overridden;
 
         if (node == NULL) {
                 return;
@@ -186,7 +191,7 @@ static void set_config_node(struct sway_node *node) {
         switch (node->type) {
         case N_CONTAINER:
                 config->handler_context.container = node->sway_container;
-                config->handler_context.workspace = node->sway_container->workspace;
+                config->handler_context.workspace = node->sway_container->pending.workspace;
                 break;
         case N_WORKSPACE:
                 config->handler_context.workspace = node->sway_workspace;
@@ -202,6 +207,7 @@ list_t *execute_command(char *_exec, struct sway_seat *seat,
         char *cmd;
         char matched_delim = ';';
         list_t *containers = NULL;
+        bool using_criteria = false;
 
         if (seat == NULL) {
                 // passing a NULL seat means we just pick the default seat
@@ -225,7 +231,7 @@ list_t *execute_command(char *_exec, struct sway_seat *seat,
                 for (; isspace(*head); ++head) {}
                 // Extract criteria (valid for this command list only).
                 if (matched_delim == ';') {
-                        config->handler_context.using_criteria = false;
+                        using_criteria = false;
                         if (*head == '[') {
                                 char *error = NULL;
                                 struct criteria *criteria = criteria_parse(head, &error);
@@ -239,7 +245,7 @@ list_t *execute_command(char *_exec, struct sway_seat *seat,
                                 containers = criteria_get_containers(criteria);
                                 head += strlen(criteria->raw);
                                 criteria_destroy(criteria);
-                                config->handler_context.using_criteria = true;
+                                using_criteria = true;
                                 // Skip leading whitespace
                                 for (; isspace(*head); ++head) {}
                         }
@@ -265,7 +271,7 @@ list_t *execute_command(char *_exec, struct sway_seat *seat,
                                 }
                         }
                 }
-                struct cmd_handler *handler = find_core_handler(argv[0]);
+                const struct cmd_handler *handler = find_core_handler(argv[0]);
                 if (!handler) {
                         list_add(res_list, cmd_results_new(CMD_INVALID,
                                         "Unknown/invalid command '%s'", argv[0]));
@@ -278,11 +284,14 @@ list_t *execute_command(char *_exec, struct sway_seat *seat,
                         argv[i] = do_var_replacement(argv[i]);
                 }
 
-                if (!config->handler_context.using_criteria) {
-                        // The container or workspace which this command will run on.
-                        struct sway_node *node = con ? &con->node :
-                                        seat_get_focus_inactive(seat, &root->node);
-                        set_config_node(node);
+
+                if (!using_criteria) {
+                        if (con) {
+                                set_config_node(&con->node, true);
+                        } else {
+                                set_config_node(seat_get_focus_inactive(seat, &root->node),
+                                                false);
+                        }
                         struct cmd_results *res = handler->handle(argc-1, argv+1);
                         list_add(res_list, res);
                         if (res->status == CMD_INVALID) {
@@ -296,7 +305,7 @@ list_t *execute_command(char *_exec, struct sway_seat *seat,
                         struct cmd_results *fail_res = NULL;
                         for (int i = 0; i < containers->length; ++i) {
                                 struct sway_container *container = containers->items[i];
-                                set_config_node(&container->node);
+                                set_config_node(&container->node, true);
                                 struct cmd_results *res = handler->handle(argc-1, argv+1);
                                 if (res->status == CMD_SUCCESS) {
                                         free_cmd_results(res);
@@ -370,12 +379,15 @@ struct cmd_results *config_command(char *exec, char **new_block) {
 
         // Determine the command handler
         sway_log(SWAY_INFO, "Config command: %s", exec);
-        struct cmd_handler *handler = find_core_handler(argv[0]);
+        const struct cmd_handler *handler = find_core_handler(argv[0]);
         if (!handler || !handler->handle) {
-                const char *error = handler
-                        ? "Command '%s' is shimmed, but unimplemented"
-                        : "Unknown/invalid command '%s'";
-                results = cmd_results_new(CMD_INVALID, error, argv[0]);
+                if (handler) {
+                        results = cmd_results_new(CMD_INVALID,
+                                "Command '%s' is shimmed, but unimplemented", argv[0]);
+                } else {
+                        results = cmd_results_new(CMD_INVALID,
+                                "Unknown/invalid command '%s'", argv[0]);
+                }
                 goto cleanup;
         }
 
@@ -401,6 +413,7 @@ struct cmd_results *config_command(char *exec, char **new_block) {
                                 && handler->handle != cmd_bindsym
                                 && handler->handle != cmd_bindcode
                                 && handler->handle != cmd_bindswitch
+                                && handler->handle != cmd_bindgesture
                                 && handler->handle != cmd_set
                                 && handler->handle != cmd_for_window
                                 && (*argv[i] == '\"' || *argv[i] == '\'')) {
@@ -418,12 +431,12 @@ cleanup:
 }
 
 struct cmd_results *config_subcommand(char **argv, int argc,
-                struct cmd_handler *handlers, size_t handlers_size) {
+                const struct cmd_handler *handlers, size_t handlers_size) {
         char *command = join_args(argv, argc);
         sway_log(SWAY_DEBUG, "Subcommand: %s", command);
         free(command);
 
-        struct cmd_handler *handler = find_handler(argv[0], handlers,
+        const struct cmd_handler *handler = find_handler(argv[0], handlers,
                         handlers_size);
         if (!handler) {
                 return cmd_results_new(CMD_INVALID,
@@ -453,41 +466,13 @@ struct cmd_results *config_commands_command(char *exec) {
                 goto cleanup;
         }
 
-        struct cmd_handler *handler = find_handler(cmd, NULL, 0);
+        const struct cmd_handler *handler = find_handler(cmd, NULL, 0);
         if (!handler && strcmp(cmd, "*") != 0) {
                 results = cmd_results_new(CMD_INVALID,
                         "Unknown/invalid command '%s'", cmd);
                 goto cleanup;
         }
 
-        enum command_context context = 0;
-
-        struct {
-                char *name;
-                enum command_context context;
-        } context_names[] = {
-                { "config", CONTEXT_CONFIG },
-                { "binding", CONTEXT_BINDING },
-                { "ipc", CONTEXT_IPC },
-                { "criteria", CONTEXT_CRITERIA },
-                { "all", CONTEXT_ALL },
-        };
-
-        for (int i = 1; i < argc; ++i) {
-                size_t j;
-                for (j = 0; j < sizeof(context_names) / sizeof(context_names[0]); ++j) {
-                        if (strcmp(context_names[j].name, argv[i]) == 0) {
-                                break;
-                        }
-                }
-                if (j == sizeof(context_names) / sizeof(context_names[0])) {
-                        results = cmd_results_new(CMD_INVALID,
-                                        "Invalid command context %s", argv[i]);
-                        goto cleanup;
-                }
-                context |= context_names[j].context;
-        }
-
         results = cmd_results_new(CMD_SUCCESS, NULL);
 
 cleanup:
@@ -504,14 +489,10 @@ struct cmd_results *cmd_results_new(enum cmd_status status,
         }
         results->status = status;
         if (format) {
-                char *error = malloc(256);
                 va_list args;
                 va_start(args, format);
-                if (error) {
-                        vsnprintf(error, 256, format, args);
-                }
+                results->error = vformat_str(format, args);
                 va_end(args);
-                results->error = error;
         } else {
                 results->error = NULL;
         }
diff --git a/sway/commands/assign.c b/sway/commands/assign.c
index 976bc3cc..f7d911f7 100644
--- a/sway/commands/assign.c
+++ b/sway/commands/assign.c
@@ -17,7 +17,7 @@ struct cmd_results *cmd_assign(int argc, char **argv) {
         char *err_str = NULL;
         struct criteria *criteria = criteria_parse(argv[0], &err_str);
         if (!criteria) {
-                error = cmd_results_new(CMD_INVALID, err_str);
+                error = cmd_results_new(CMD_INVALID, "%s", err_str);
                 free(err_str);
                 return error;
         }
diff --git a/sway/commands/bar.c b/sway/commands/bar.c
index d42b7fc2..22756acb 100644
--- a/sway/commands/bar.c
+++ b/sway/commands/bar.c
@@ -8,7 +8,7 @@
 #include "log.h"
 
 // Must be in alphabetical order for bsearch
-static struct cmd_handler bar_handlers[] = {
+static const struct cmd_handler bar_handlers[] = {
         { "bindcode", bar_cmd_bindcode },
         { "binding_mode_indicator", bar_cmd_binding_mode_indicator },
         { "bindsym", bar_cmd_bindsym },
@@ -41,7 +41,7 @@ static struct cmd_handler bar_handlers[] = {
 };
 
 // Must be in alphabetical order for bsearch
-static struct cmd_handler bar_config_handlers[] = {
+static const struct cmd_handler bar_config_handlers[] = {
         { "id", bar_cmd_id },
         { "swaybar_command", bar_cmd_swaybar_command },
 };
@@ -73,12 +73,10 @@ struct cmd_results *cmd_bar(int argc, char **argv) {
                 }
                 ++argv; --argc;
         } else if (config->reading && !config->current_bar) {
-                int len = snprintf(NULL, 0, "bar-%d", config->bars->length) + 1;
-                id = malloc(len * sizeof(char));
+                id = format_str("bar-%d", config->bars->length);
                 if (!id) {
                         return cmd_results_new(CMD_FAILURE, "Unable to allocate bar id");
                 }
-                snprintf(id, len, "bar-%d", config->bars->length);
         } else if (!config->reading && strcmp(argv[0], "mode") != 0 &&
                         strcmp(argv[0], "hidden_state") != 0) {
                 if (is_subcommand(argv[0])) {
@@ -116,6 +114,7 @@ struct cmd_results *cmd_bar(int argc, char **argv) {
         if (res && res->status != CMD_SUCCESS) {
                 if (id) {
                         free_bar_config(config->current_bar);
+                        config->current_bar = NULL;
                         id = NULL;
                 }
                 return res;
diff --git a/sway/commands/bar/bind.c b/sway/commands/bar/bind.c
index b4b5bc45..8a837e3f 100644
--- a/sway/commands/bar/bind.c
+++ b/sway/commands/bar/bind.c
@@ -96,7 +96,7 @@ static struct cmd_results *bar_cmd_bind(int argc, char **argv, bool code,
         }
         if (message) {
                 free_bar_binding(binding);
-                error = cmd_results_new(CMD_INVALID, message);
+                error = cmd_results_new(CMD_INVALID, "%s", message);
                 free(message);
                 return error;
         } else if (!binding->button) {
diff --git a/sway/commands/bar/colors.c b/sway/commands/bar/colors.c
index 2d5b22bf..275fa3c6 100644
--- a/sway/commands/bar/colors.c
+++ b/sway/commands/bar/colors.c
@@ -4,7 +4,7 @@
 #include "util.h"
 
 // Must be in alphabetical order for bsearch
-static struct cmd_handler bar_colors_handlers[] = {
+static const struct cmd_handler bar_colors_handlers[] = {
         { "active_workspace", bar_colors_cmd_active_workspace },
         { "background", bar_colors_cmd_background },
         { "binding_mode", bar_colors_cmd_binding_mode },
diff --git a/sway/commands/bar/font.c b/sway/commands/bar/font.c
index 62987f3e..891c87af 100644
--- a/sway/commands/bar/font.c
+++ b/sway/commands/bar/font.c
@@ -11,7 +11,20 @@ struct cmd_results *bar_cmd_font(int argc, char **argv) {
         }
         char *font = join_args(argv, argc);
         free(config->current_bar->font);
-        config->current_bar->font = font;
+
+        if (strncmp(font, "pango:", 6) == 0) {
+                if (config->current_bar->pango_markup == PANGO_MARKUP_DEFAULT) {
+                        config->current_bar->pango_markup = true;
+                }
+                config->current_bar->font = strdup(font + 6);
+        } else {
+                if (config->current_bar->pango_markup == PANGO_MARKUP_DEFAULT) {
+                        config->current_bar->pango_markup = false;
+                }
+                config->current_bar->font = strdup(font);
+        }
+
+        free(font);
         sway_log(SWAY_DEBUG, "Settings font '%s' for bar: %s",
                         config->current_bar->font, config->current_bar->id);
         return cmd_results_new(CMD_SUCCESS, NULL);
diff --git a/sway/commands/bar/hidden_state.c b/sway/commands/bar/hidden_state.c
index 1f08a5d2..8b661e3a 100644
--- a/sway/commands/bar/hidden_state.c
+++ b/sway/commands/bar/hidden_state.c
@@ -54,7 +54,7 @@ struct cmd_results *bar_cmd_hidden_state(int argc, char **argv) {
         }
 
         const char *state = argv[0];
-        if (config->reading) {
+        if (config->current_bar) {
                 error = bar_set_hidden_state(config->current_bar, state);
         } else {
                 const char *id = argc == 2 ? argv[1] : NULL;
diff --git a/sway/commands/bar/mode.c b/sway/commands/bar/mode.c
index 8b3fb275..7c2f423b 100644
--- a/sway/commands/bar/mode.c
+++ b/sway/commands/bar/mode.c
@@ -58,7 +58,7 @@ struct cmd_results *bar_cmd_mode(int argc, char **argv) {
         }
 
         const char *mode = argv[0];
-        if (config->reading) {
+        if (config->current_bar) {
                 error = bar_set_mode(config->current_bar, mode);
         } else {
                 const char *id = argc == 2 ? argv[1] : NULL;
diff --git a/sway/commands/bar/tray_bind.c b/sway/commands/bar/tray_bind.c
index 243834ba..3dc9bc4c 100644
--- a/sway/commands/bar/tray_bind.c
+++ b/sway/commands/bar/tray_bind.c
@@ -26,7 +26,7 @@ static struct cmd_results *tray_bind(int argc, char **argv, bool code) {
         }
         if (message) {
                 free(binding);
-                error = cmd_results_new(CMD_INVALID, message);
+                error = cmd_results_new(CMD_INVALID, "%s", message);
                 free(message);
                 return error;
         } else if (!binding->button) {
diff --git a/sway/commands/bind.c b/sway/commands/bind.c
index f6e58d99..979e178f 100644
--- a/sway/commands/bind.c
+++ b/sway/commands/bind.c
@@ -8,6 +8,7 @@
 #include <wlr/types/wlr_cursor.h>
 #include "sway/commands.h"
 #include "sway/config.h"
+#include "sway/desktop/transaction.h"
 #include "sway/input/cursor.h"
 #include "sway/input/keyboard.h"
 #include "sway/ipc-server.h"
@@ -46,7 +47,7 @@ static bool binding_switch_compare(struct sway_switch_binding *binding_a,
         if (binding_a->type != binding_b->type) {
                 return false;
         }
-        if (binding_a->state != binding_b->state) {
+        if (binding_a->trigger != binding_b->trigger) {
                 return false;
         }
         if ((binding_a->flags & BINDING_LOCKED) !=
@@ -126,7 +127,7 @@ static struct cmd_results *identify_key(const char* name, bool first_key,
                 if (!button) {
                         if (message) {
                                 struct cmd_results *error =
-                                        cmd_results_new(CMD_INVALID, message);
+                                        cmd_results_new(CMD_INVALID, "%s", message);
                                 free(message);
                                 return error;
                         } else {
@@ -142,7 +143,7 @@ static struct cmd_results *identify_key(const char* name, bool first_key,
                 if (!button) {
                         if (message) {
                                 struct cmd_results *error =
-                                        cmd_results_new(CMD_INVALID, message);
+                                        cmd_results_new(CMD_INVALID, "%s", message);
                                 free(message);
                                 return error;
                         } else {
@@ -181,7 +182,7 @@ static struct cmd_results *identify_key(const char* name, bool first_key,
                         uint32_t button = get_mouse_bindsym(name, &message);
                         if (message) {
                                 struct cmd_results *error =
-                                        cmd_results_new(CMD_INVALID, message);
+                                        cmd_results_new(CMD_INVALID, "%s", message);
                                 free(message);
                                 return error;
                         } else if (button) {
@@ -371,6 +372,7 @@ static struct cmd_results *cmd_bindsym_or_bindcode(int argc, char **argv,
                                         strlen("--input-device=")) == 0) {
                         free(binding->input);
                         binding->input = strdup(argv[0] + strlen("--input-device="));
+                        strip_quotes(binding->input);
                 } else if (strcmp("--no-warn", argv[0]) == 0) {
                         warn = false;
                 } else if (strcmp("--no-repeat", argv[0]) == 0) {
@@ -537,7 +539,7 @@ struct cmd_results *cmd_bind_or_unbind_switch(int argc, char **argv,
                 free_switch_binding(binding);
                 return cmd_results_new(CMD_FAILURE,
                                 "Invalid %s command (expected binding with the form "
-                                "<switch>:<state>)", bindtype, argc);
+                                "<switch>:<state>)", bindtype);
         }
         if (strcmp(split->items[0], "tablet") == 0) {
                 binding->type = WLR_SWITCH_TYPE_TABLET_MODE;
@@ -547,20 +549,21 @@ struct cmd_results *cmd_bind_or_unbind_switch(int argc, char **argv,
                 free_switch_binding(binding);
                 return cmd_results_new(CMD_FAILURE,
                                 "Invalid %s command (expected switch binding: "
-                                "unknown switch %s)", bindtype, split->items[0]);
+                                "unknown switch %s)", bindtype,
+                                (const char *)split->items[0]);
         }
         if (strcmp(split->items[1], "on") == 0) {
-                binding->state = WLR_SWITCH_STATE_ON;
+                binding->trigger = SWAY_SWITCH_TRIGGER_ON;
         } else if (strcmp(split->items[1], "off") == 0) {
-                binding->state = WLR_SWITCH_STATE_OFF;
+                binding->trigger = SWAY_SWITCH_TRIGGER_OFF;
         } else if (strcmp(split->items[1], "toggle") == 0) {
-                binding->state = WLR_SWITCH_STATE_TOGGLE;
+                binding->trigger = SWAY_SWITCH_TRIGGER_TOGGLE;
         } else {
                 free_switch_binding(binding);
                 return cmd_results_new(CMD_FAILURE,
                                 "Invalid %s command "
-                                "(expected switch state: unknown state %d)",
-                                bindtype, split->items[0]);
+                                "(expected switch state: unknown state %s)",
+                                bindtype, (const char *)split->items[1]);
         }
         list_free_items_and_destroy(split);
 
@@ -642,6 +645,8 @@ void seat_execute_command(struct sway_seat *seat, struct sway_binding *binding)
         if (success) {
                 ipc_event_binding(binding);
         }
+
+        transaction_commit_dirty();
 }
 
 /**
diff --git a/sway/commands/border.c b/sway/commands/border.c
index 647663ac..7818fc96 100644
--- a/sway/commands/border.c
+++ b/sway/commands/border.c
@@ -19,11 +19,11 @@ static void set_border(struct sway_container *con,
                         view_set_csd_from_server(con->view, false);
                 } else if (!con->view->using_csd && new_border == B_CSD) {
                         view_set_csd_from_server(con->view, true);
-                        con->saved_border = con->border;
+                        con->saved_border = con->pending.border;
                 }
         }
         if (new_border != B_CSD || container_is_floating(con)) {
-                con->border = new_border;
+                con->pending.border = new_border;
         }
         if (con->view) {
                 con->view->using_csd = new_border == B_CSD;
@@ -35,7 +35,7 @@ static void border_toggle(struct sway_container *con) {
                 set_border(con, B_NONE);
                 return;
         }
-        switch (con->border) {
+        switch (con->pending.border) {
         case B_NONE:
                 set_border(con, B_PIXEL);
                 break;
@@ -88,7 +88,7 @@ struct cmd_results *cmd_border(int argc, char **argv) {
                                 "or 'border pixel <px>'");
         }
         if (argc == 2) {
-                container->border_thickness = atoi(argv[1]);
+                container->pending.border_thickness = atoi(argv[1]);
         }
 
         if (container_is_floating(container)) {
diff --git a/sway/commands/client.c b/sway/commands/client.c
index dd0694df..fd2ac7a8 100644
--- a/sway/commands/client.c
+++ b/sway/commands/client.c
@@ -5,9 +5,8 @@
 #include "sway/tree/container.h"
 #include "util.h"
 
-static void rebuild_textures_iterator(struct sway_container *con, void *data) {
-        container_update_marks_textures(con);
-        container_update_title_textures(con);
+static void container_update_iterator(struct sway_container *con, void *data) {
+        container_update(con);
 }
 
 static struct cmd_results *handle_command(int argc, char **argv, char *cmd_name,
@@ -18,6 +17,12 @@ static struct cmd_results *handle_command(int argc, char **argv, char *cmd_name,
                 return error;
         }
 
+        if (argc > 3 && strcmp(cmd_name, "client.focused_tab_title") == 0) {
+                sway_log(SWAY_ERROR,
+                                "Warning: indicator and child_border colors have no effect for %s",
+                                cmd_name);
+        }
+
         struct border_colors colors = {0};
         const char *ind_hex = argc > 3 ? argv[3] : default_indicator;
         const char *child_hex = argc > 4 ? argv[4] : argv[1];  // def to background
@@ -45,12 +50,7 @@ static struct cmd_results *handle_command(int argc, char **argv, char *cmd_name,
         memcpy(class, &colors, sizeof(struct border_colors));
 
         if (config->active) {
-                root_for_each_container(rebuild_textures_iterator, NULL);
-
-                for (int i = 0; i < root->outputs->length; ++i) {
-                        struct sway_output *output = root->outputs->items[i];
-                        output_damage_whole(output);
-                }
+                root_for_each_container(container_update_iterator, NULL);
         }
 
         return cmd_results_new(CMD_SUCCESS, NULL);
@@ -80,3 +80,13 @@ struct cmd_results *cmd_client_noop(int argc, char **argv) {
         sway_log(SWAY_INFO, "Warning: %s is ignored by sway", argv[-1]);
         return cmd_results_new(CMD_SUCCESS, NULL);
 }
+
+struct cmd_results *cmd_client_focused_tab_title(int argc, char **argv) {
+        struct cmd_results *result =  handle_command(argc, argv,
+                        "client.focused_tab_title",
+                        &config->border_colors.focused_tab_title, "#2e9ef4ff");
+        if (result && result->status == CMD_SUCCESS) {
+                config->has_focused_tab_title = true;
+        }
+        return result;
+}
diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c
index 39e48a44..8fca1909 100644
--- a/sway/commands/exec_always.c
+++ b/sway/commands/exec_always.c
@@ -7,6 +7,8 @@
 #include <signal.h>
 #include "sway/commands.h"
 #include "sway/config.h"
+#include "sway/server.h"
+#include "sway/desktop/launcher.h"
 #include "sway/tree/container.h"
 #include "sway/tree/root.h"
 #include "sway/tree/workspace.h"
@@ -24,11 +26,22 @@ struct cmd_results *cmd_exec_validate(int argc, char **argv) {
         return error;
 }
 
+static void export_xdga_token(struct launcher_ctx *ctx) {
+        const char *token = launcher_ctx_get_token_name(ctx);
+        setenv("XDG_ACTIVATION_TOKEN", token, 1);
+}
+
+static void export_startup_id(struct launcher_ctx *ctx) {
+        const char *token = launcher_ctx_get_token_name(ctx);
+        setenv("DESKTOP_STARTUP_ID", token, 1);
+}
+
 struct cmd_results *cmd_exec_process(int argc, char **argv) {
         struct cmd_results *error = NULL;
-        char *tmp = NULL;
+        char *cmd = NULL;
+        bool no_startup_id = false;
         if (strcmp(argv[0], "--no-startup-id") == 0) {
-                sway_log(SWAY_INFO, "exec switch '--no-startup-id' not supported, ignored.");
+                no_startup_id = true;
                 --argc; ++argv;
                 if ((error = checkarg(argc, argv[-1], EXPECTED_AT_LEAST, 1))) {
                         return error;
@@ -36,17 +49,12 @@ struct cmd_results *cmd_exec_process(int argc, char **argv) {
         }
 
         if (argc == 1 && (argv[0][0] == '\'' || argv[0][0] == '"')) {
-                tmp = strdup(argv[0]);
-                strip_quotes(tmp);
+                cmd = strdup(argv[0]);
+                strip_quotes(cmd);
         } else {
-                tmp = join_args(argv, argc);
+                cmd = join_args(argv, argc);
         }
 
-        // Put argument into cmd array
-        char cmd[4096];
-        strncpy(cmd, tmp, sizeof(cmd) - 1);
-        cmd[sizeof(cmd) - 1] = 0;
-        free(tmp);
         sway_log(SWAY_DEBUG, "Executing %s", cmd);
 
         int fd[2];
@@ -55,18 +63,28 @@ struct cmd_results *cmd_exec_process(int argc, char **argv) {
         }
 
         pid_t pid, child;
+        struct launcher_ctx *ctx = launcher_ctx_create_internal();
         // Fork process
         if ((pid = fork()) == 0) {
                 // Fork child process again
+                restore_nofile_limit();
                 setsid();
                 sigset_t set;
                 sigemptyset(&set);
                 sigprocmask(SIG_SETMASK, &set, NULL);
+                signal(SIGPIPE, SIG_DFL);
                 close(fd[0]);
                 if ((child = fork()) == 0) {
                         close(fd[1]);
-                        execl("/bin/sh", "/bin/sh", "-c", cmd, (void *)NULL);
-                        _exit(0);
+                        if (ctx) {
+                                export_xdga_token(ctx);
+                        }
+                        if (ctx && !no_startup_id) {
+                                export_startup_id(ctx);
+                        }
+                        execlp("sh", "sh", "-c", cmd, (void *)NULL);
+                        sway_log_errno(SWAY_ERROR, "execlp failed");
+                        _exit(1);
                 }
                 ssize_t s = 0;
                 while ((size_t)s < sizeof(pid_t)) {
@@ -75,10 +93,12 @@ struct cmd_results *cmd_exec_process(int argc, char **argv) {
                 close(fd[1]);
                 _exit(0); // Close child process
         } else if (pid < 0) {
+                free(cmd);
                 close(fd[0]);
                 close(fd[1]);
                 return cmd_results_new(CMD_FAILURE, "fork() failed");
         }
+        free(cmd);
         close(fd[1]); // close write
         ssize_t s = 0;
         while ((size_t)s < sizeof(pid_t)) {
@@ -89,8 +109,12 @@ struct cmd_results *cmd_exec_process(int argc, char **argv) {
         waitpid(pid, NULL, 0);
         if (child > 0) {
                 sway_log(SWAY_DEBUG, "Child process created with pid %d", child);
-                root_record_workspace_pid(child);
+                if (ctx != NULL) {
+                        sway_log(SWAY_DEBUG, "Recording workspace for process %d", child);
+                        ctx->pid = child;
+                }
         } else {
+                launcher_ctx_destroy(ctx);
                 return cmd_results_new(CMD_FAILURE, "Second fork() failed");
         }
 
diff --git a/sway/commands/floating.c b/sway/commands/floating.c
index ce123345..74f6522c 100644
--- a/sway/commands/floating.c
+++ b/sway/commands/floating.c
@@ -40,8 +40,8 @@ struct cmd_results *cmd_floating(int argc, char **argv) {
         // If the container is in a floating split container,
         // operate on the split container instead of the child.
         if (container_is_floating_or_child(container)) {
-                while (container->parent) {
-                        container = container->parent;
+                while (container->pending.parent) {
+                        container = container->pending.parent;
                 }
         }
 
@@ -51,8 +51,8 @@ struct cmd_results *cmd_floating(int argc, char **argv) {
         container_set_floating(container, wants_floating);
 
         // Floating containers in the scratchpad should be ignored
-        if (container->workspace) {
-                arrange_workspace(container->workspace);
+        if (container->pending.workspace) {
+                arrange_workspace(container->pending.workspace);
         }
 
         return cmd_results_new(CMD_SUCCESS, NULL);
diff --git a/sway/commands/floating_minmax_size.c b/sway/commands/floating_minmax_size.c
index 3a1d606a..e8c24ace 100644
--- a/sway/commands/floating_minmax_size.c
+++ b/sway/commands/floating_minmax_size.c
@@ -23,16 +23,16 @@ static struct cmd_results *handle_command(int argc, char **argv, char *cmd_name,
         char *err;
         int width = (int)strtol(argv[0], &err, 10);
         if (*err) {
-                return cmd_results_new(CMD_INVALID, cmd_name, usage);
+                return cmd_results_new(CMD_INVALID, "%s", usage);
         }
 
         if (strcmp(argv[1], "x") != 0) {
-                return cmd_results_new(CMD_INVALID, cmd_name, usage);
+                return cmd_results_new(CMD_INVALID, "%s", usage);
         }
 
         int height = (int)strtol(argv[2], &err, 10);
         if (*err) {
-                return cmd_results_new(CMD_INVALID, cmd_name, usage);
+                return cmd_results_new(CMD_INVALID, "%s", usage);
         }
 
         *config_width = width;
diff --git a/sway/commands/focus.c b/sway/commands/focus.c
index 79b7aed5..facd82de 100644
--- a/sway/commands/focus.c
+++ b/sway/commands/focus.c
@@ -54,7 +54,7 @@ static bool get_direction_from_next_prev(struct sway_container *container,
         } else {
                 return false;
         }
-         
+
         return true;
 }
 
@@ -141,9 +141,9 @@ static struct sway_node *node_get_in_direction_tiling(
         struct sway_container *wrap_candidate = NULL;
         struct sway_container *current = container;
         while (current) {
-                if (current->fullscreen_mode == FULLSCREEN_WORKSPACE) {
+                if (current->pending.fullscreen_mode == FULLSCREEN_WORKSPACE) {
                         // Fullscreen container with a direction - go straight to outputs
-                        struct sway_output *output = current->workspace->output;
+                        struct sway_output *output = current->pending.workspace->output;
                         struct sway_output *new_output =
                                 output_get_in_direction(output, dir);
                         if (!new_output) {
@@ -151,7 +151,7 @@ static struct sway_node *node_get_in_direction_tiling(
                         }
                         return get_node_in_output_direction(new_output, dir);
                 }
-                if (current->fullscreen_mode == FULLSCREEN_GLOBAL) {
+                if (current->pending.fullscreen_mode == FULLSCREEN_GLOBAL) {
                         return NULL;
                 }
 
@@ -202,11 +202,11 @@ static struct sway_node *node_get_in_direction_tiling(
                         }
                 }
 
-                current = current->parent;
+                current = current->pending.parent;
         }
 
         // Check a different output
-        struct sway_output *output = container->workspace->output;
+        struct sway_output *output = container->pending.workspace->output;
         struct sway_output *new_output = output_get_in_direction(output, dir);
         if ((config->focus_wrapping != WRAP_WORKSPACE ||
                                 container->node.type == N_WORKSPACE) && new_output) {
@@ -226,23 +226,23 @@ static struct sway_node *node_get_in_direction_tiling(
 static struct sway_node *node_get_in_direction_floating(
                 struct sway_container *con, struct sway_seat *seat,
                 enum wlr_direction dir) {
-        double ref_lx = con->x + con->width / 2;
-        double ref_ly = con->y + con->height / 2;
+        double ref_lx = con->pending.x + con->pending.width / 2;
+        double ref_ly = con->pending.y + con->pending.height / 2;
         double closest_distance = DBL_MAX;
         struct sway_container *closest_con = NULL;
 
-        if (!con->workspace) {
+        if (!con->pending.workspace) {
                 return NULL;
         }
 
-        for (int i = 0; i < con->workspace->floating->length; i++) {
-                struct sway_container *floater = con->workspace->floating->items[i];
+        for (int i = 0; i < con->pending.workspace->floating->length; i++) {
+                struct sway_container *floater = con->pending.workspace->floating->items[i];
                 if (floater == con) {
                         continue;
                 }
                 float distance = dir == WLR_DIRECTION_LEFT || dir == WLR_DIRECTION_RIGHT
-                        ? (floater->x + floater->width / 2) - ref_lx
-                        : (floater->y + floater->height / 2) - ref_ly;
+                        ? (floater->pending.x + floater->pending.width / 2) - ref_lx
+                        : (floater->pending.y + floater->pending.height / 2) - ref_ly;
                 if (dir == WLR_DIRECTION_LEFT || dir == WLR_DIRECTION_UP) {
                         distance = -distance;
                 }
@@ -267,6 +267,11 @@ static struct cmd_results *focus_mode(struct sway_workspace *ws,
                 new_focus = seat_get_focus_inactive_tiling(seat, ws);
         }
         if (new_focus) {
+                struct sway_container *new_focus_view =
+                        seat_get_focus_inactive_view(seat, &new_focus->node);
+                if (new_focus_view) {
+                        new_focus = new_focus_view;
+                }
                 seat_set_focus_container(seat, new_focus);
 
                 // If we're on the floating layer and the floating container area
@@ -280,7 +285,7 @@ static struct cmd_results *focus_mode(struct sway_workspace *ws,
                 }
         } else {
                 return cmd_results_new(CMD_FAILURE,
-                                "Failed to find a %s container in workspace",
+                                "Failed to find a %s container in workspace.",
                                 floating ? "floating" : "tiling");
         }
         return cmd_results_new(CMD_SUCCESS, NULL);
@@ -290,7 +295,7 @@ static struct cmd_results *focus_output(struct sway_seat *seat,
                 int argc, char **argv) {
         if (!argc) {
                 return cmd_results_new(CMD_INVALID,
-                        "Expected 'focus output <direction|name>'");
+                        "Expected 'focus output <direction|name>'.");
         }
         char *identifier = join_args(argv, argc);
         struct sway_output *output = output_by_name_or_id(identifier);
@@ -300,13 +305,13 @@ static struct cmd_results *focus_output(struct sway_seat *seat,
                 if (!parse_direction(identifier, &direction)) {
                         free(identifier);
                         return cmd_results_new(CMD_INVALID,
-                                "There is no output with that name");
+                                "There is no output with that name.");
                 }
                 struct sway_workspace *ws = seat_get_focused_workspace(seat);
                 if (!ws) {
                         free(identifier);
                         return cmd_results_new(CMD_FAILURE,
-                                "No focused workspace to base directions off of");
+                                "No focused workspace to base directions off of.");
                 }
                 output = output_get_in_direction(ws->output, direction);
 
@@ -334,7 +339,7 @@ static struct cmd_results *focus_output(struct sway_seat *seat,
 static struct cmd_results *focus_parent(void) {
         struct sway_seat *seat = config->handler_context.seat;
         struct sway_container *con = config->handler_context.container;
-        if (!con || con->fullscreen_mode) {
+        if (!con || con->pending.fullscreen_mode) {
                 return cmd_results_new(CMD_SUCCESS, NULL);
         }
         struct sway_node *parent = node_get_parent(&con->node);
@@ -370,13 +375,24 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
         struct sway_seat *seat = config->handler_context.seat;
         if (node->type < N_WORKSPACE) {
                 return cmd_results_new(CMD_FAILURE,
-                        "Command 'focus' cannot be used above the workspace level");
+                        "Command 'focus' cannot be used above the workspace level.");
         }
 
-        if (argc == 0 && container) {
+        if (argc == 0) {
+                if (!container) {
+                        return cmd_results_new(CMD_FAILURE, "No container to focus was specified.");
+                }
+
                 if (container_is_scratchpad_hidden_or_child(container)) {
                         root_scratchpad_show(container);
                 }
+                // if we are switching to a container under a fullscreen window, we first
+                // need to exit fullscreen so that the newly focused container becomes visible
+                struct sway_container *obstructing = container_obstructing_fullscreen_container(container);
+                if (obstructing) {
+                        container_fullscreen_disable(obstructing);
+                        arrange_root();
+                }
                 seat_set_focus_container(seat, container);
                 seat_consider_warp_to_focus(seat);
                 container_raise_floating(container);
@@ -439,7 +455,8 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
                 return cmd_results_new(CMD_FAILURE, "");
         }
         struct sway_node *next_focus = NULL;
-        if (container_is_floating(container)) {
+        if (container_is_floating(container) &&
+                        container->pending.fullscreen_mode == FULLSCREEN_NONE) {
                 next_focus = node_get_in_direction_floating(container, seat, direction);
         } else {
                 next_focus = node_get_in_direction_tiling(container, seat, direction, descend);
diff --git a/sway/commands/font.c b/sway/commands/font.c
index c54365b5..74bb6b9f 100644
--- a/sway/commands/font.c
+++ b/sway/commands/font.c
@@ -4,6 +4,7 @@
 #include "sway/config.h"
 #include "log.h"
 #include "stringop.h"
+#include <pango/pangocairo.h>
 
 struct cmd_results *cmd_font(int argc, char **argv) {
         struct cmd_results *error = NULL;
@@ -16,12 +17,34 @@ struct cmd_results *cmd_font(int argc, char **argv) {
         if (strncmp(font, "pango:", 6) == 0) {
                 config->pango_markup = true;
                 config->font = strdup(font + 6);
+                free(font);
         } else {
                 config->pango_markup = false;
-                config->font = strdup(font);
+                config->font = font;
         }
 
-        free(font);
-        config_update_font_height(true);
+        // Parse the font early so we can reject it if it's not valid for pango.
+        // Also avoids re-parsing each time we render text.
+        PangoFontDescription *font_description = pango_font_description_from_string(config->font);
+
+        const char *family = pango_font_description_get_family(font_description);
+        if (family == NULL) {
+                pango_font_description_free(font_description);
+                return cmd_results_new(CMD_FAILURE, "Invalid font family.");
+        }
+
+        const gint size = pango_font_description_get_size(font_description);
+        if (size == 0) {
+                pango_font_description_free(font_description);
+                return cmd_results_new(CMD_FAILURE, "Invalid font size.");
+        }
+
+        if (config->font_description != NULL) {
+                pango_font_description_free(config->font_description);
+        }
+
+        config->font_description = font_description;
+        config_update_font_height();
+
         return cmd_results_new(CMD_SUCCESS, NULL);
 }
diff --git a/sway/commands/for_window.c b/sway/commands/for_window.c
index ee9f4647..905e6776 100644
--- a/sway/commands/for_window.c
+++ b/sway/commands/for_window.c
@@ -14,7 +14,7 @@ struct cmd_results *cmd_for_window(int argc, char **argv) {
         char *err_str = NULL;
         struct criteria *criteria = criteria_parse(argv[0], &err_str);
         if (!criteria) {
-                error = cmd_results_new(CMD_INVALID, err_str);
+                error = cmd_results_new(CMD_INVALID, "%s", err_str);
                 free(err_str);
                 return error;
         }
diff --git a/sway/commands/fullscreen.c b/sway/commands/fullscreen.c
index 3392a7f7..21c1e9a0 100644
--- a/sway/commands/fullscreen.c
+++ b/sway/commands/fullscreen.c
@@ -18,30 +18,19 @@ struct cmd_results *cmd_fullscreen(int argc, char **argv) {
                 return cmd_results_new(CMD_FAILURE,
                                 "Can't run this command while there's no outputs connected.");
         }
-        struct sway_node *node = config->handler_context.node;
         struct sway_container *container = config->handler_context.container;
-        struct sway_workspace *workspace = config->handler_context.workspace;
-        if (node->type == N_WORKSPACE && workspace->tiling->length == 0) {
-                return cmd_results_new(CMD_FAILURE,
-                                "Can't fullscreen an empty workspace");
-        }
 
-        // If in the scratchpad, operate on the highest container
-        if (container && !container->workspace) {
-                while (container->parent) {
-                        container = container->parent;
-                }
-        }
-
-        bool is_fullscreen = false;
-        for (struct sway_container *curr = container; curr; curr = curr->parent) {
-                if (curr->fullscreen_mode != FULLSCREEN_NONE) {
-                        container = curr;
-                        is_fullscreen = true;
-                        break;
+        if (!container) {
+                // If the focus is not a container, do nothing successfully
+                return cmd_results_new(CMD_SUCCESS, NULL);
+        } else if (!container->pending.workspace) {
+                // If in the scratchpad, operate on the highest container
+                while (container->pending.parent) {
+                        container = container->pending.parent;
                 }
         }
 
+        bool is_fullscreen = container->pending.fullscreen_mode != FULLSCREEN_NONE;
         bool global = false;
         bool enable = !is_fullscreen;
 
@@ -57,13 +46,6 @@ struct cmd_results *cmd_fullscreen(int argc, char **argv) {
                 global = strcasecmp(argv[1], "global") == 0;
         }
 
-        if (enable && node->type == N_WORKSPACE) {
-                // Wrap the workspace's children in a container so we can fullscreen it
-                container = workspace_wrap_children(workspace);
-                workspace->layout = L_HORIZ;
-                seat_set_focus_container(config->handler_context.seat, container);
-        }
-
         enum sway_fullscreen_mode mode = FULLSCREEN_NONE;
         if (enable) {
                 mode = global ? FULLSCREEN_GLOBAL : FULLSCREEN_WORKSPACE;
diff --git a/sway/commands/gaps.c b/sway/commands/gaps.c
index 021df843..1deeb56e 100644
--- a/sway/commands/gaps.c
+++ b/sway/commands/gaps.c
@@ -11,7 +11,8 @@
 enum gaps_op {
         GAPS_OP_SET,
         GAPS_OP_ADD,
-        GAPS_OP_SUBTRACT
+        GAPS_OP_SUBTRACT,
+        GAPS_OP_TOGGLE
 };
 
 struct gaps_data {
@@ -102,6 +103,9 @@ static void apply_gaps_op(int *prop, enum gaps_op op, int amount) {
         case GAPS_OP_SUBTRACT:
                 *prop -= amount;
                 break;
+        case GAPS_OP_TOGGLE:
+                *prop = *prop ? 0 : amount;
+                break;
         }
 }
 
@@ -133,9 +137,9 @@ static void configure_gaps(struct sway_workspace *ws, void *_data) {
 }
 
 // gaps inner|outer|horizontal|vertical|top|right|bottom|left current|all
-// set|plus|minus <px>
+// set|plus|minus|toggle <px>
 static const char expected_runtime[] = "'gaps inner|outer|horizontal|vertical|"
-        "top|right|bottom|left current|all set|plus|minus <px>'";
+        "top|right|bottom|left current|all set|plus|minus|toggle <px>'";
 static struct cmd_results *gaps_set_runtime(int argc, char **argv) {
         struct cmd_results *error = checkarg(argc, "gaps", EXPECTED_EQUAL_TO, 4);
         if (error) {
@@ -180,6 +184,8 @@ static struct cmd_results *gaps_set_runtime(int argc, char **argv) {
                 data.operation = GAPS_OP_ADD;
         } else if (strcasecmp(argv[2], "minus") == 0) {
                 data.operation = GAPS_OP_SUBTRACT;
+        } else if (strcasecmp(argv[2], "toggle") == 0) {
+                data.operation = GAPS_OP_TOGGLE;
         } else {
                 return cmd_results_new(CMD_INVALID, "Expected %s", expected_runtime);
         }
@@ -200,7 +206,7 @@ static struct cmd_results *gaps_set_runtime(int argc, char **argv) {
 }
 
 // gaps inner|outer|<dir>|<side> <px> - sets defaults for workspaces
-// gaps inner|outer|<dir>|<side> current|all set|plus|minus <px> - runtime only
+// gaps inner|outer|<dir>|<side> current|all set|plus|minus|toggle <px> - runtime only
 // <dir> = horizontal|vertical
 // <side> = top|right|bottom|left
 struct cmd_results *cmd_gaps(int argc, char **argv) {
diff --git a/sway/commands/gesture.c b/sway/commands/gesture.c
new file mode 100644
index 00000000..d4442cc3
--- /dev/null
+++ b/sway/commands/gesture.c
@@ -0,0 +1,166 @@
+#define _POSIX_C_SOURCE 200809L
+#include "sway/config.h"
+
+#include "gesture.h"
+#include "log.h"
+#include "stringop.h"
+#include "sway/commands.h"
+
+void free_gesture_binding(struct sway_gesture_binding *binding) {
+        if (!binding) {
+                return;
+        }
+        free(binding->input);
+        free(binding->command);
+        free(binding);
+}
+
+/**
+ * Returns true if the bindings have the same gesture type, direction, etc
+ */
+static bool binding_gesture_equal(struct sway_gesture_binding *binding_a,
+                                                                  struct sway_gesture_binding *binding_b) {
+        if (strcmp(binding_a->input, binding_b->input) != 0) {
+                return false;
+        }
+
+        if (!gesture_equal(&binding_a->gesture, &binding_b->gesture)) {
+                return false;
+        }
+
+        if ((binding_a->flags & BINDING_EXACT) !=
+                (binding_b->flags & BINDING_EXACT)) {
+                return false;
+        }
+        return true;
+}
+
+/**
+ * Add gesture binding to config
+ */
+static struct cmd_results *gesture_binding_add(
+                struct sway_gesture_binding *binding,
+                const char *gesturecombo, bool warn) {
+        list_t *mode_bindings = config->current_mode->gesture_bindings;
+        // overwrite the binding if it already exists
+        bool overwritten = false;
+        for (int i = 0; i < mode_bindings->length; ++i) {
+                struct sway_gesture_binding *config_binding = mode_bindings->items[i];
+                if (binding_gesture_equal(binding, config_binding)) {
+                        sway_log(SWAY_INFO, "Overwriting binding '%s' to `%s` from `%s`",
+                                        gesturecombo, binding->command, config_binding->command);
+                        if (warn) {
+                                config_add_swaynag_warning("Overwriting binding"
+                                                "'%s' to `%s` from `%s`",
+                                                gesturecombo, binding->command,
+                                                config_binding->command);
+                        }
+                        free_gesture_binding(config_binding);
+                        mode_bindings->items[i] = binding;
+                        overwritten = true;
+                }
+        }
+
+        if (!overwritten) {
+                list_add(mode_bindings, binding);
+                sway_log(SWAY_DEBUG, "bindgesture - Bound %s to command `%s`",
+                                gesturecombo, binding->command);
+        }
+
+        return cmd_results_new(CMD_SUCCESS, NULL);
+}
+
+/**
+ * Remove gesture binding from config
+ */
+static struct cmd_results *gesture_binding_remove(
+                struct sway_gesture_binding *binding, const char *gesturecombo) {
+        list_t *mode_bindings = config->current_mode->gesture_bindings;
+        for (int i = 0; i < mode_bindings->length; ++i) {
+                struct sway_gesture_binding *config_binding = mode_bindings->items[i];
+                if (binding_gesture_equal(binding, config_binding)) {
+                        free_gesture_binding(config_binding);
+                        free_gesture_binding(binding);
+                        list_del(mode_bindings, i);
+                        sway_log(SWAY_DEBUG, "unbindgesture - Unbound %s gesture",
+                                        gesturecombo);
+                        return cmd_results_new(CMD_SUCCESS, NULL);
+                }
+        }
+
+        free_gesture_binding(binding);
+        return cmd_results_new(CMD_FAILURE, "Could not find gesture binding `%s`",
+                        gesturecombo);
+}
+
+/**
+ * Parse and execute bindgesture or unbindgesture command.
+ */
+static struct cmd_results *cmd_bind_or_unbind_gesture(int argc, char **argv, bool unbind) {
+        int minargs = 2;
+        char *bindtype = "bindgesture";
+        if (unbind) {
+                minargs--;
+                bindtype = "unbindgesture";
+        }
+
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, bindtype, EXPECTED_AT_LEAST, minargs))) {
+                return error;
+        }
+        struct sway_gesture_binding *binding = calloc(1, sizeof(struct sway_gesture_binding));
+        if (!binding) {
+                return cmd_results_new(CMD_FAILURE, "Unable to allocate binding");
+        }
+        binding->input = strdup("*");
+
+        bool warn = true;
+
+        // Handle flags
+        while (argc > 0) {
+                if (strcmp("--exact", argv[0]) == 0) {
+                        binding->flags |= BINDING_EXACT;
+                } else if (strcmp("--no-warn", argv[0]) == 0) {
+                        warn = false;
+                } else if (strncmp("--input-device=", argv[0],
+                                        strlen("--input-device=")) == 0) {
+                        free(binding->input);
+                        binding->input = strdup(argv[0] + strlen("--input-device="));
+                } else {
+                        break;
+                }
+                argv++;
+                argc--;
+        }
+
+        if (argc < minargs) {
+                free(binding);
+                return cmd_results_new(CMD_FAILURE,
+                                "Invalid %s command (expected at least %d "
+                                "non-option arguments, got %d)", bindtype, minargs, argc);
+        }
+
+        char* errmsg = NULL;
+        if ((errmsg = gesture_parse(argv[0], &binding->gesture))) {
+                free(binding);
+                struct cmd_results *final = cmd_results_new(CMD_FAILURE,
+                                "Invalid %s command (%s)",
+                                bindtype, errmsg);
+                free(errmsg);
+                return final;
+        }
+
+        if (unbind) {
+                return gesture_binding_remove(binding, argv[0]);
+        }
+        binding->command = join_args(argv + 1, argc - 1);
+        return gesture_binding_add(binding, argv[0], warn);
+}
+
+struct cmd_results *cmd_bindgesture(int argc, char **argv) {
+        return cmd_bind_or_unbind_gesture(argc, argv, false);
+}
+
+struct cmd_results *cmd_unbindgesture(int argc, char **argv) {
+        return cmd_bind_or_unbind_gesture(argc, argv, true);
+}
diff --git a/sway/commands/hide_edge_borders.c b/sway/commands/hide_edge_borders.c
index 9a1d8445..43bd6dc8 100644
--- a/sway/commands/hide_edge_borders.c
+++ b/sway/commands/hide_edge_borders.c
@@ -20,7 +20,7 @@ struct cmd_results *cmd_hide_edge_borders(int argc, char **argv) {
         }
 
         if (!argc) {
-                return cmd_results_new(CMD_INVALID, expected_syntax);
+                return cmd_results_new(CMD_INVALID, "%s", expected_syntax);
         }
 
         if (strcmp(argv[0], "none") == 0) {
@@ -38,7 +38,7 @@ struct cmd_results *cmd_hide_edge_borders(int argc, char **argv) {
                 config->hide_edge_borders = E_NONE;
                 config->hide_edge_borders_smart = ESMART_NO_GAPS;
         } else {
-                return cmd_results_new(CMD_INVALID, expected_syntax);
+                return cmd_results_new(CMD_INVALID, "%s", expected_syntax);
         }
         config->hide_lone_tab = hide_lone_tab;
 
diff --git a/sway/commands/inhibit_idle.c b/sway/commands/inhibit_idle.c
index aebc2bf9..6125736a 100644
--- a/sway/commands/inhibit_idle.c
+++ b/sway/commands/inhibit_idle.c
@@ -41,7 +41,7 @@ struct cmd_results *cmd_inhibit_idle(int argc, char **argv) {
                         sway_idle_inhibit_v1_user_inhibitor_destroy(inhibitor);
                 } else {
                         inhibitor->mode = mode;
-                        sway_idle_inhibit_v1_check_active(server.idle_inhibit_manager_v1);
+                        sway_idle_inhibit_v1_check_active();
                 }
         } else if (!clear) {
                 sway_idle_inhibit_v1_user_inhibitor_register(con->view, mode);
diff --git a/sway/commands/input.c b/sway/commands/input.c
index c9bb8e06..306c40f7 100644
--- a/sway/commands/input.c
+++ b/sway/commands/input.c
@@ -7,13 +7,14 @@
 #include "stringop.h"
 
 // must be in order for the bsearch
-static struct cmd_handler input_handlers[] = {
+static const struct cmd_handler input_handlers[] = {
         { "accel_profile", input_cmd_accel_profile },
         { "calibration_matrix", input_cmd_calibration_matrix },
         { "click_method", input_cmd_click_method },
         { "drag", input_cmd_drag },
         { "drag_lock", input_cmd_drag_lock },
         { "dwt", input_cmd_dwt },
+        { "dwtp", input_cmd_dwtp },
         { "events", input_cmd_events },
         { "left_handed", input_cmd_left_handed },
         { "map_from_region", input_cmd_map_from_region },
@@ -24,7 +25,9 @@ static struct cmd_handler input_handlers[] = {
         { "pointer_accel", input_cmd_pointer_accel },
         { "repeat_delay", input_cmd_repeat_delay },
         { "repeat_rate", input_cmd_repeat_rate },
+        { "rotation_angle", input_cmd_rotation_angle },
         { "scroll_button", input_cmd_scroll_button },
+        { "scroll_button_lock", input_cmd_scroll_button_lock },
         { "scroll_factor", input_cmd_scroll_factor },
         { "scroll_method", input_cmd_scroll_method },
         { "tap", input_cmd_tap },
@@ -40,7 +43,7 @@ static struct cmd_handler input_handlers[] = {
 };
 
 // must be in order for the bsearch
-static struct cmd_handler input_config_handlers[] = {
+static const struct cmd_handler input_config_handlers[] = {
         { "xkb_capslock", input_cmd_xkb_capslock },
         { "xkb_numlock", input_cmd_xkb_numlock },
 };
diff --git a/sway/commands/input/dwtp.c b/sway/commands/input/dwtp.c
new file mode 100644
index 00000000..232e2b26
--- /dev/null
+++ b/sway/commands/input/dwtp.c
@@ -0,0 +1,25 @@
+#include <string.h>
+#include <strings.h>
+#include "sway/config.h"
+#include "sway/commands.h"
+#include "sway/input/input-manager.h"
+#include "util.h"
+
+struct cmd_results *input_cmd_dwtp(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "dwtp", EXPECTED_AT_LEAST, 1))) {
+                return error;
+        }
+        struct input_config *ic = config->handler_context.input_config;
+        if (!ic) {
+                return cmd_results_new(CMD_FAILURE, "No input device defined.");
+        }
+
+        if (parse_boolean(argv[0], true)) {
+                ic->dwtp = LIBINPUT_CONFIG_DWTP_ENABLED;
+        } else {
+                ic->dwtp = LIBINPUT_CONFIG_DWTP_DISABLED;
+        }
+
+        return cmd_results_new(CMD_SUCCESS, NULL);
+}
diff --git a/sway/commands/input/events.c b/sway/commands/input/events.c
index 9405181a..08d99bf0 100644
--- a/sway/commands/input/events.c
+++ b/sway/commands/input/events.c
@@ -1,14 +1,19 @@
 #include <limits.h>
 #include <string.h>
 #include <strings.h>
-#include <wlr/backend/libinput.h>
+#include <wlr/config.h>
 #include "sway/config.h"
 #include "sway/commands.h"
 #include "sway/input/input-manager.h"
 #include "log.h"
 
+#if WLR_HAS_LIBINPUT_BACKEND
+#include <wlr/backend/libinput.h>
+#endif
+
 static void toggle_supported_send_events_for_device(struct input_config *ic,
                 struct sway_input_device *input_device) {
+#if WLR_HAS_LIBINPUT_BACKEND
         struct wlr_input_device *wlr_device = input_device->wlr_device;
         if (!wlr_input_device_is_libinput(wlr_device)) {
                 return;
@@ -41,6 +46,7 @@ static void toggle_supported_send_events_for_device(struct input_config *ic,
         }
 
         ic->send_events = mode;
+#endif
 }
 
 static int mode_for_name(const char *name) {
@@ -56,6 +62,7 @@ static int mode_for_name(const char *name) {
 
 static void toggle_select_send_events_for_device(struct input_config *ic,
                 struct sway_input_device *input_device, int argc, char **argv) {
+#if WLR_HAS_LIBINPUT_BACKEND
         if (!wlr_input_device_is_libinput(input_device->wlr_device)) {
                 return;
         }
@@ -72,6 +79,7 @@ static void toggle_select_send_events_for_device(struct input_config *ic,
                 }
         }
         ic->send_events = mode_for_name(argv[index % argc]);
+#endif
 }
 
 static void toggle_send_events(int argc, char **argv) {
diff --git a/sway/commands/input/map_from_region.c b/sway/commands/input/map_from_region.c
index de00b714..4400e111 100644
--- a/sway/commands/input/map_from_region.c
+++ b/sway/commands/input/map_from_region.c
@@ -11,11 +11,21 @@ static bool parse_coords(const char *str, double *x, double *y, bool *mm) {
         *mm = false;
 
         char *end;
-        *x = strtod(str, &end);
-        if (end[0] != 'x') {
-                return false;
+
+        // Check for "0x" prefix to avoid strtod treating the string as hex
+        if (str[0] == '0' && str[1] == 'x') {
+                if (strlen(str) < 3) {
+                        return false;
+                }
+                *x = 0;
+                end = (char *)str + 2;
+        } else {
+                *x = strtod(str, &end);
+                if (end[0] != 'x') {
+                        return false;
+                }
+                ++end;
         }
-        ++end;
 
         *y = strtod(end, &end);
         if (end[0] == 'm') {
diff --git a/sway/commands/input/map_to_region.c b/sway/commands/input/map_to_region.c
index e85495e5..ad535db2 100644
--- a/sway/commands/input/map_to_region.c
+++ b/sway/commands/input/map_to_region.c
@@ -1,7 +1,6 @@
 #define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <string.h>
-#include <wlr/types/wlr_box.h>
 #include "sway/commands.h"
 #include "sway/config.h"
 
@@ -50,5 +49,5 @@ struct cmd_results *input_cmd_map_to_region(int argc, char **argv) {
 error:
         free(ic->mapped_to_region);
         ic->mapped_to_region = NULL;
-        return cmd_results_new(CMD_FAILURE, errstr);
+        return cmd_results_new(CMD_FAILURE, "%s", errstr);
 }
diff --git a/sway/commands/input/rotation_angle.c b/sway/commands/input/rotation_angle.c
new file mode 100644
index 00000000..5e278fff
--- /dev/null
+++ b/sway/commands/input/rotation_angle.c
@@ -0,0 +1,29 @@
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+#include "sway/config.h"
+#include "sway/commands.h"
+#include "sway/input/input-manager.h"
+#include "util.h"
+
+struct cmd_results *input_cmd_rotation_angle(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "rotation_angle", EXPECTED_AT_LEAST, 1))) {
+                return error;
+        }
+        struct input_config *ic = config->handler_context.input_config;
+        if (!ic) {
+                return cmd_results_new(CMD_FAILURE, "No input device defined.");
+        }
+
+        float rotation_angle = parse_float(argv[0]);
+        if (isnan(rotation_angle)) {
+                return cmd_results_new(CMD_INVALID,
+                        "Invalid rotation_angle; expected float.");
+        } if (rotation_angle < 0 || rotation_angle > 360) {
+                return cmd_results_new(CMD_INVALID, "Input out of range [0, 360)");
+        }
+        ic->rotation_angle = rotation_angle;
+
+        return cmd_results_new(CMD_SUCCESS, NULL);
+}
diff --git a/sway/commands/input/scroll_button.c b/sway/commands/input/scroll_button.c
index 6b331419..81f69a6d 100644
--- a/sway/commands/input/scroll_button.c
+++ b/sway/commands/input/scroll_button.c
@@ -21,7 +21,7 @@ struct cmd_results *input_cmd_scroll_button(int argc, char **argv) {
         char *message = NULL;
         uint32_t button = get_mouse_button(*argv, &message);
         if (message) {
-                error = cmd_results_new(CMD_INVALID, message);
+                error = cmd_results_new(CMD_INVALID, "%s", message);
                 free(message);
                 return error;
         } else if (button == SWAY_SCROLL_UP || button == SWAY_SCROLL_DOWN
diff --git a/sway/commands/input/scroll_button_lock.c b/sway/commands/input/scroll_button_lock.c
new file mode 100644
index 00000000..f96b6514
--- /dev/null
+++ b/sway/commands/input/scroll_button_lock.c
@@ -0,0 +1,26 @@
+#include <libinput.h>
+#include <string.h>
+#include <strings.h>
+#include "sway/config.h"
+#include "sway/commands.h"
+#include "sway/input/input-manager.h"
+#include "util.h"
+
+struct cmd_results *input_cmd_scroll_button_lock(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "scroll_button_lock", EXPECTED_AT_LEAST, 1))) {
+                return error;
+        }
+        struct input_config *ic = config->handler_context.input_config;
+        if (!ic) {
+                return cmd_results_new(CMD_FAILURE, "No input device defined.");
+        }
+
+        if (parse_boolean(argv[0], true)) {
+                ic->scroll_button_lock = LIBINPUT_CONFIG_SCROLL_BUTTON_LOCK_ENABLED;
+        } else {
+                ic->scroll_button_lock = LIBINPUT_CONFIG_SCROLL_BUTTON_LOCK_DISABLED;
+        }
+
+        return cmd_results_new(CMD_SUCCESS, NULL);
+}
diff --git a/sway/commands/input/xkb_switch_layout.c b/sway/commands/input/xkb_switch_layout.c
index d6548a68..3cce4ec8 100644
--- a/sway/commands/input/xkb_switch_layout.c
+++ b/sway/commands/input/xkb_switch_layout.c
@@ -1,10 +1,16 @@
 #define _POSIX_C_SOURCE 200809L
 #include <assert.h>
+#include <wlr/interfaces/wlr_keyboard.h>
 #include "sway/config.h"
 #include "sway/commands.h"
 #include "sway/input/input-manager.h"
 #include "log.h"
 
+struct xkb_switch_layout_action {
+        struct wlr_keyboard *keyboard;
+        xkb_layout_index_t layout;
+};
+
 static void switch_layout(struct wlr_keyboard *kbd, xkb_layout_index_t idx) {
         xkb_layout_index_t num_layouts = xkb_keymap_num_layouts(kbd->keymap);
         if (idx >= num_layouts) {
@@ -28,10 +34,10 @@ static xkb_layout_index_t get_current_layout_index(struct wlr_keyboard *kbd) {
         return layout_idx;
 }
 
-static void switch_layout_relative(struct wlr_keyboard *kbd, int dir) {
+static xkb_layout_index_t get_layout_relative(struct wlr_keyboard *kbd, int dir) {
         xkb_layout_index_t num_layouts = xkb_keymap_num_layouts(kbd->keymap);
         xkb_layout_index_t idx = get_current_layout_index(kbd);
-        switch_layout(kbd, (idx + num_layouts + dir) % num_layouts);
+        return (idx + num_layouts + dir) % num_layouts;
 }
 
 struct cmd_results *input_cmd_xkb_switch_layout(int argc, char **argv) {
@@ -66,6 +72,18 @@ struct cmd_results *input_cmd_xkb_switch_layout(int argc, char **argv) {
                 relative = 0;
         }
 
+        struct xkb_switch_layout_action *actions = calloc(
+                wl_list_length(&server.input->devices),
+                sizeof(struct xkb_switch_layout_action));
+        size_t actions_len = 0;
+
+        if (!actions) {
+                return cmd_results_new(CMD_FAILURE, "Unable to allocate actions");
+        }
+
+        /* Calculate new indexes first because switching a layout in one
+           keyboard may result in a change on other keyboards as well because
+           of keyboard groups. */
         struct sway_input_device *dev;
         wl_list_for_each(dev, &server.input->devices, link) {
                 if (strcmp(ic->identifier, "*") != 0 &&
@@ -76,12 +94,22 @@ struct cmd_results *input_cmd_xkb_switch_layout(int argc, char **argv) {
                 if (dev->wlr_device->type != WLR_INPUT_DEVICE_KEYBOARD) {
                         continue;
                 }
+
+                struct xkb_switch_layout_action *action =
+                        &actions[actions_len++];
+
+                action->keyboard = wlr_keyboard_from_input_device(dev->wlr_device);
                 if (relative) {
-                        switch_layout_relative(dev->wlr_device->keyboard, relative);
+                        action->layout = get_layout_relative(action->keyboard, relative);
                 } else {
-                        switch_layout(dev->wlr_device->keyboard, layout);
+                        action->layout = layout;
                 }
         }
 
+        for (size_t i = 0; i < actions_len; i++) {
+                switch_layout(actions[i].keyboard, actions[i].layout);
+        }
+        free(actions);
+
         return cmd_results_new(CMD_SUCCESS, NULL);
 }
diff --git a/sway/commands/layout.c b/sway/commands/layout.c
index f2af183b..12ce4839 100644
--- a/sway/commands/layout.c
+++ b/sway/commands/layout.c
@@ -133,7 +133,7 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
 
         // Operate on parent container, like i3.
         if (container) {
-                container = container->parent;
+                container = container->pending.parent;
         }
 
         // We could be working with a container OR a workspace. These are different
@@ -142,10 +142,10 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
         enum sway_container_layout new_layout = L_NONE;
         enum sway_container_layout old_layout = L_NONE;
         if (container) {
-                old_layout = container->layout;
+                old_layout = container->pending.layout;
                 new_layout = get_layout(argc, argv,
-                                container->layout, container->prev_split_layout,
-                                container->workspace->output);
+                                container->pending.layout, container->prev_split_layout,
+                                container->pending.workspace->output);
         } else {
                 old_layout = workspace->layout;
                 new_layout = get_layout(argc, argv,
@@ -153,20 +153,20 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
                                 workspace->output);
         }
         if (new_layout == L_NONE) {
-                return cmd_results_new(CMD_INVALID, expected_syntax);
+                return cmd_results_new(CMD_INVALID, "%s", expected_syntax);
         }
         if (new_layout != old_layout) {
                 if (container) {
                         if (old_layout != L_TABBED && old_layout != L_STACKED) {
                                 container->prev_split_layout = old_layout;
                         }
-                        container->layout = new_layout;
+                        container->pending.layout = new_layout;
                         container_update_representation(container);
                 } else if (config->handler_context.container) {
                         // i3 avoids changing workspace layouts with a new container
                         // https://github.com/i3/i3/blob/3cd1c45eba6de073bc4300eebb4e1cc1a0c4479a/src/con.c#L1817
                         container = workspace_wrap_children(workspace);
-                        container->layout = new_layout;
+                        container->pending.layout = new_layout;
                         container_update_representation(container);
                 } else {
                         if (old_layout != L_TABBED && old_layout != L_STACKED) {
diff --git a/sway/commands/mark.c b/sway/commands/mark.c
index aa5f185c..30cf458c 100644
--- a/sway/commands/mark.c
+++ b/sway/commands/mark.c
@@ -59,7 +59,7 @@ struct cmd_results *cmd_mark(int argc, char **argv) {
         }
 
         free(mark);
-        container_update_marks_textures(container);
+        container_update_marks(container);
         if (container->view) {
                 view_execute_criteria(container->view);
         }
diff --git a/sway/commands/mode.c b/sway/commands/mode.c
index a5871dab..7263efcb 100644
--- a/sway/commands/mode.c
+++ b/sway/commands/mode.c
@@ -9,12 +9,14 @@
 #include "stringop.h"
 
 // Must be in order for the bsearch
-static struct cmd_handler mode_handlers[] = {
+static const struct cmd_handler mode_handlers[] = {
         { "bindcode", cmd_bindcode },
+        { "bindgesture", cmd_bindgesture },
         { "bindswitch", cmd_bindswitch },
         { "bindsym", cmd_bindsym },
         { "set", cmd_set },
         { "unbindcode", cmd_unbindcode },
+        { "unbindgesture", cmd_unbindgesture },
         { "unbindswitch", cmd_unbindswitch },
         { "unbindsym", cmd_unbindsym },
 };
@@ -59,6 +61,7 @@ struct cmd_results *cmd_mode(int argc, char **argv) {
                 mode->keycode_bindings = create_list();
                 mode->mouse_bindings = create_list();
                 mode->switch_bindings = create_list();
+                mode->gesture_bindings = create_list();
                 mode->pango = pango;
                 list_add(config->modes, mode);
         }
diff --git a/sway/commands/move.c b/sway/commands/move.c
index f8f89f18..69ed06c0 100644
--- a/sway/commands/move.c
+++ b/sway/commands/move.c
@@ -113,8 +113,8 @@ static void container_move_to_container_from_direction(
                 struct sway_container *container, struct sway_container *destination,
                 enum wlr_direction move_dir) {
         if (destination->view) {
-                if (destination->parent == container->parent &&
-                                destination->workspace == container->workspace) {
+                if (destination->pending.parent == container->pending.parent &&
+                                destination->pending.workspace == container->pending.workspace) {
                         sway_log(SWAY_DEBUG, "Swapping siblings");
                         list_t *siblings = container_get_siblings(container);
                         int container_index = list_find(siblings, container);
@@ -126,28 +126,28 @@ static void container_move_to_container_from_direction(
                         int offset =
                                 move_dir == WLR_DIRECTION_LEFT || move_dir == WLR_DIRECTION_UP;
                         int index = container_sibling_index(destination) + offset;
-                        if (destination->parent) {
-                                container_insert_child(destination->parent, container, index);
+                        if (destination->pending.parent) {
+                                container_insert_child(destination->pending.parent, container, index);
                         } else {
-                                workspace_insert_tiling(destination->workspace,
+                                workspace_insert_tiling(destination->pending.workspace,
                                                 container, index);
                         }
-                        container->width = container->height = 0;
+                        container->pending.width = container->pending.height = 0;
                         container->width_fraction = container->height_fraction = 0;
-                        workspace_squash(destination->workspace);
+                        workspace_squash(destination->pending.workspace);
                 }
                 return;
         }
 
-        if (is_parallel(destination->layout, move_dir)) {
+        if (is_parallel(destination->pending.layout, move_dir)) {
                 sway_log(SWAY_DEBUG, "Reparenting container (parallel)");
                 int index =
                         move_dir == WLR_DIRECTION_RIGHT || move_dir == WLR_DIRECTION_DOWN ?
-                        0 : destination->children->length;
+                        0 : destination->pending.children->length;
                 container_insert_child(destination, container, index);
-                container->width = container->height = 0;
+                container->pending.width = container->pending.height = 0;
                 container->width_fraction = container->height_fraction = 0;
-                workspace_squash(destination->workspace);
+                workspace_squash(destination->pending.workspace);
                 return;
         }
 
@@ -168,7 +168,7 @@ static void container_move_to_container_from_direction(
 static void container_move_to_workspace_from_direction(
                 struct sway_container *container, struct sway_workspace *workspace,
                 enum wlr_direction move_dir) {
-        container->width = container->height = 0;
+        container->pending.width = container->pending.height = 0;
         container->width_fraction = container->height_fraction = 0;
 
         if (is_parallel(workspace->layout, move_dir)) {
@@ -188,8 +188,8 @@ static void container_move_to_workspace_from_direction(
                 workspace_add_tiling(workspace, container);
                 return;
         }
-        while (focus_inactive->parent) {
-                focus_inactive = focus_inactive->parent;
+        while (focus_inactive->pending.parent) {
+                focus_inactive = focus_inactive->pending.parent;
         }
         container_move_to_container_from_direction(container, focus_inactive,
                         move_dir);
@@ -197,25 +197,33 @@ static void container_move_to_workspace_from_direction(
 
 static void container_move_to_workspace(struct sway_container *container,
                 struct sway_workspace *workspace) {
-        if (container->workspace == workspace) {
+        if (container->pending.workspace == workspace) {
                 return;
         }
-        struct sway_workspace *old_workspace = container->workspace;
+        struct sway_workspace *old_workspace = container->pending.workspace;
         if (container_is_floating(container)) {
-                struct sway_output *old_output = container->workspace->output;
+                struct sway_output *old_output = container->pending.workspace->output;
                 container_detach(container);
                 workspace_add_floating(workspace, container);
                 container_handle_fullscreen_reparent(container);
-                // If changing output, center it within the workspace
-                if (old_output != workspace->output && !container->fullscreen_mode) {
-                        container_floating_move_to_center(container);
+                // If changing output, adjust the coordinates of the window.
+                if (old_output != workspace->output && !container->pending.fullscreen_mode) {
+                        struct wlr_box workspace_box, old_workspace_box;
+                        workspace_get_box(workspace, &workspace_box);
+                        workspace_get_box(old_workspace, &old_workspace_box);
+                        floating_fix_coordinates(container, &old_workspace_box, &workspace_box);
+                        if (container->scratchpad && workspace->output) {
+                                struct wlr_box output_box;
+                                output_get_box(workspace->output, &output_box);
+                                container->transform = workspace_box;
+                        }
                 }
         } else {
                 container_detach(container);
-                if (workspace_is_empty(workspace) && container->children) {
+                if (workspace_is_empty(workspace) && container->pending.children) {
                         workspace_unwrap_children(workspace, container);
                 } else {
-                        container->width = container->height = 0;
+                        container->pending.width = container->pending.height = 0;
                         container->width_fraction = container->height_fraction = 0;
                         workspace_add_tiling(workspace, container);
                 }
@@ -237,13 +245,13 @@ static void container_move_to_container(struct sway_container *container,
                 return;
         }
         if (container_is_floating(container)) {
-                container_move_to_workspace(container, destination->workspace);
+                container_move_to_workspace(container, destination->pending.workspace);
                 return;
         }
-        struct sway_workspace *old_workspace = container->workspace;
+        struct sway_workspace *old_workspace = container->pending.workspace;
 
         container_detach(container);
-        container->width = container->height = 0;
+        container->pending.width = container->pending.height = 0;
         container->width_fraction = container->height_fraction = 0;
 
         if (destination->view) {
@@ -256,12 +264,12 @@ static void container_move_to_container(struct sway_container *container,
                 ipc_event_window(container, "move");
         }
 
-        if (destination->workspace) {
-                workspace_focus_fullscreen(destination->workspace);
-                workspace_detect_urgent(destination->workspace);
+        if (destination->pending.workspace) {
+                workspace_focus_fullscreen(destination->pending.workspace);
+                workspace_detect_urgent(destination->pending.workspace);
         }
 
-        if (old_workspace && old_workspace != destination->workspace) {
+        if (old_workspace && old_workspace != destination->pending.workspace) {
                 workspace_detect_urgent(old_workspace);
         }
 }
@@ -275,7 +283,7 @@ static bool container_move_to_next_output(struct sway_container *container,
                 if (!sway_assert(ws, "Expected output to have a workspace")) {
                         return false;
                 }
-                switch (container->fullscreen_mode) {
+                switch (container->pending.fullscreen_mode) {
                 case FULLSCREEN_NONE:
                         container_move_to_workspace_from_direction(container, ws, move_dir);
                         return true;
@@ -293,12 +301,12 @@ static bool container_move_to_next_output(struct sway_container *container,
 static bool container_move_in_direction(struct sway_container *container,
                 enum wlr_direction move_dir) {
         // If moving a fullscreen view, only consider outputs
-        switch (container->fullscreen_mode) {
+        switch (container->pending.fullscreen_mode) {
         case FULLSCREEN_NONE:
                 break;
         case FULLSCREEN_WORKSPACE:
                 return container_move_to_next_output(container,
-                                container->workspace->output, move_dir);
+                                container->pending.workspace->output, move_dir);
         case FULLSCREEN_GLOBAL:
                 return false;
         }
@@ -317,26 +325,26 @@ static bool container_move_in_direction(struct sway_container *container,
         while (!ancestor) {
                 // Don't allow containers to move out of their
                 // fullscreen or floating parent
-                if (current->fullscreen_mode || container_is_floating(current)) {
+                if (current->pending.fullscreen_mode || container_is_floating(current)) {
                         return false;
                 }
 
                 enum sway_container_layout parent_layout = container_parent_layout(current);
                 if (!is_parallel(parent_layout, move_dir)) {
-                        if (!current->parent) {
+                        if (!current->pending.parent) {
                                 // No parallel parent, so we reorient the workspace
-                                current = workspace_wrap_children(current->workspace);
-                                current->workspace->layout =
+                                current = workspace_wrap_children(current->pending.workspace);
+                                current->pending.workspace->layout =
                                         move_dir == WLR_DIRECTION_LEFT ||
                                         move_dir == WLR_DIRECTION_RIGHT ?
                                         L_HORIZ : L_VERT;
-                                container->height = container->width = 0;
+                                container->pending.height = container->pending.width = 0;
                                 container->height_fraction = container->width_fraction = 0;
-                                workspace_update_representation(current->workspace);
+                                workspace_update_representation(current->pending.workspace);
                                 wrapped = true;
                         } else {
                                 // Keep looking for a parallel parent
-                                current = current->parent;
+                                current = current->pending.parent;
                         }
                         continue;
                 }
@@ -356,14 +364,14 @@ static bool container_move_in_direction(struct sway_container *container,
                                 container_move_to_container_from_direction(container,
                                                 target, move_dir);
                                 return true;
-                        } else if (!container->parent) {
+                        } else if (!container->pending.parent) {
                                 // Container is at workspace level so we move it to the
                                 // next workspace if possible
                                 return container_move_to_next_output(container,
-                                                current->workspace->output, move_dir);
+                                                current->pending.workspace->output, move_dir);
                         } else {
                                 // Container has escaped its immediate parallel parent
-                                current = current->parent;
+                                current = current->pending.parent;
                                 continue;
                         }
                 }
@@ -377,31 +385,31 @@ static bool container_move_in_direction(struct sway_container *container,
                 container_move_to_container_from_direction(container,
                                 target, move_dir);
                 return true;
-        } else if (!wrapped && !container->parent->parent &&
-                        container->parent->children->length == 1) {
+        } else if (!wrapped && !container->pending.parent->pending.parent &&
+                        container->pending.parent->pending.children->length == 1) {
                 // Treat singleton children as if they are at workspace level like i3
                 // https://github.com/i3/i3/blob/1d9160f2d247dbaa83fb62f02fd7041dec767fc2/src/move.c#L367
                 return container_move_to_next_output(container,
-                                ancestor->workspace->output, move_dir);
+                                ancestor->pending.workspace->output, move_dir);
         } else {
                 // Container will be promoted
-                struct sway_container *old_parent = container->parent;
-                if (ancestor->parent) {
+                struct sway_container *old_parent = container->pending.parent;
+                if (ancestor->pending.parent) {
                         // Container will move in with its parent
-                        container_insert_child(ancestor->parent, container,
+                        container_insert_child(ancestor->pending.parent, container,
                                         index + (offs < 0 ? 0 : 1));
                 } else {
                         // Container will move to workspace level,
                         // may be re-split by workspace_layout
-                        workspace_insert_tiling(ancestor->workspace, container,
+                        workspace_insert_tiling(ancestor->pending.workspace, container,
                                         index + (offs < 0 ? 0 : 1));
                 }
-                ancestor->height = ancestor->width = 0;
+                ancestor->pending.height = ancestor->pending.width = 0;
                 ancestor->height_fraction = ancestor->width_fraction = 0;
                 if (old_parent) {
                         container_reap_empty(old_parent);
                 }
-                workspace_squash(container->workspace);
+                workspace_squash(container->pending.workspace);
                 return true;
         }
 }
@@ -427,14 +435,14 @@ static struct cmd_results *cmd_move_container(bool no_auto_back_and_forth,
                 container = workspace_wrap_children(workspace);
         }
 
-        if (container->fullscreen_mode == FULLSCREEN_GLOBAL) {
+        if (container->pending.fullscreen_mode == FULLSCREEN_GLOBAL) {
                 return cmd_results_new(CMD_FAILURE,
                                 "Can't move fullscreen global container");
         }
 
         struct sway_seat *seat = config->handler_context.seat;
-        struct sway_container *old_parent = container->parent;
-        struct sway_workspace *old_ws = container->workspace;
+        struct sway_container *old_parent = container->pending.parent;
+        struct sway_workspace *old_ws = container->pending.workspace;
         struct sway_output *old_output = old_ws ? old_ws->output : NULL;
         struct sway_node *destination = NULL;
 
@@ -462,7 +470,7 @@ static struct cmd_results *cmd_move_container(bool no_auto_back_and_forth,
                         if (strcasecmp(argv[1], "number") == 0) {
                                 // move [window|container] [to] "workspace number x"
                                 if (argc < 3) {
-                                        return cmd_results_new(CMD_INVALID, expected_syntax);
+                                        return cmd_results_new(CMD_INVALID, "%s", expected_syntax);
                                 }
                                 if (!isdigit(argv[2][0])) {
                                         return cmd_results_new(CMD_INVALID,
@@ -508,7 +516,7 @@ static struct cmd_results *cmd_move_container(bool no_auto_back_and_forth,
                 destination = dst ? &dst->node : &ws->node;
         } else if (strcasecmp(argv[0], "output") == 0) {
                 struct sway_output *new_output = output_in_direction(argv[1],
-                                old_output, container->x, container->y);
+                                old_output, container->pending.x, container->pending.y);
                 if (!new_output) {
                         return cmd_results_new(CMD_FAILURE,
                                 "Can't find output with name/direction '%s'", argv[1]);
@@ -522,7 +530,7 @@ static struct cmd_results *cmd_move_container(bool no_auto_back_and_forth,
                 }
                 destination = &dest_con->node;
         } else {
-                return cmd_results_new(CMD_INVALID, expected_syntax);
+                return cmd_results_new(CMD_INVALID, "%s", expected_syntax);
         }
 
         if (destination->type == N_CONTAINER &&
@@ -686,6 +694,9 @@ static struct cmd_results *cmd_move_workspace(int argc, char **argv) {
         arrange_output(old_output);
         arrange_output(new_output);
 
+        struct sway_seat *seat = config->handler_context.seat;
+        seat_consider_warp_to_focus(seat);
+
         return cmd_results_new(CMD_SUCCESS, NULL);
 }
 
@@ -706,12 +717,12 @@ static struct cmd_results *cmd_move_in_direction(
                                 "Cannot move workspaces in a direction");
         }
         if (container_is_floating(container)) {
-                if (container->fullscreen_mode) {
+                if (container->pending.fullscreen_mode) {
                         return cmd_results_new(CMD_FAILURE,
                                         "Cannot move fullscreen floating container");
                 }
-                double lx = container->x;
-                double ly = container->y;
+                double lx = container->pending.x;
+                double ly = container->pending.y;
                 switch (direction) {
                 case WLR_DIRECTION_LEFT:
                         lx -= move_amt;
@@ -729,8 +740,8 @@ static struct cmd_results *cmd_move_in_direction(
                 container_floating_move_to(container, lx, ly);
                 return cmd_results_new(CMD_SUCCESS, NULL);
         }
-        struct sway_workspace *old_ws = container->workspace;
-        struct sway_container *old_parent = container->parent;
+        struct sway_workspace *old_ws = container->pending.workspace;
+        struct sway_container *old_parent = container->pending.parent;
 
         if (!container_move_in_direction(container, direction)) {
                 // Container didn't move
@@ -744,7 +755,7 @@ static struct cmd_results *cmd_move_in_direction(
                 workspace_consider_destroy(old_ws);
         }
 
-        struct sway_workspace *new_ws = container->workspace;
+        struct sway_workspace *new_ws = container->pending.workspace;
 
         if (root->fullscreen_global) {
                 arrange_root();
@@ -781,22 +792,22 @@ static struct cmd_results *cmd_move_to_position_pointer(
         }
         struct wlr_cursor *cursor = seat->cursor->cursor;
         /* Determine where to put the window. */
-        double lx = cursor->x - container->width / 2;
-        double ly = cursor->y - container->height / 2;
+        double lx = cursor->x - container->pending.width / 2;
+        double ly = cursor->y - container->pending.height / 2;
 
         /* Correct target coordinates to be in bounds (on screen). */
         struct wlr_output *output = wlr_output_layout_output_at(
                         root->output_layout, cursor->x, cursor->y);
         if (output) {
-                struct wlr_box *box =
-                                wlr_output_layout_get_box(root->output_layout, output);
-                lx = fmax(lx, box->x);
-                ly = fmax(ly, box->y);
-                if (lx + container->width > box->x + box->width) {
-                        lx = box->x + box->width - container->width;
+                struct wlr_box box;
+                wlr_output_layout_get_box(root->output_layout, output, &box);
+                lx = fmax(lx, box.x);
+                ly = fmax(ly, box.y);
+                if (lx + container->pending.width > box.x + box.width) {
+                        lx = box.x + box.width - container->pending.width;
                 }
-                if (ly + container->height > box->y + box->height) {
-                        ly = box->y + box->height - container->height;
+                if (ly + container->pending.height > box.y + box.height) {
+                        ly = box.y + box.height - container->pending.height;
                 }
         }
 
@@ -818,7 +829,7 @@ static struct cmd_results *cmd_move_to_position(int argc, char **argv) {
         }
 
         if (!argc) {
-                return cmd_results_new(CMD_INVALID, expected_position_syntax);
+                return cmd_results_new(CMD_INVALID, "%s", expected_position_syntax);
         }
 
         bool absolute = false;
@@ -828,41 +839,41 @@ static struct cmd_results *cmd_move_to_position(int argc, char **argv) {
                 ++argv;
         }
         if (!argc) {
-                return cmd_results_new(CMD_INVALID, expected_position_syntax);
+                return cmd_results_new(CMD_INVALID, "%s", expected_position_syntax);
         }
         if (strcmp(argv[0], "position") == 0) {
                 --argc;
                 ++argv;
         }
         if (!argc) {
-                return cmd_results_new(CMD_INVALID, expected_position_syntax);
+                return cmd_results_new(CMD_INVALID, "%s", expected_position_syntax);
         }
         if (strcmp(argv[0], "cursor") == 0 || strcmp(argv[0], "mouse") == 0 ||
                         strcmp(argv[0], "pointer") == 0) {
                 if (absolute) {
-                        return cmd_results_new(CMD_INVALID, expected_position_syntax);
+                        return cmd_results_new(CMD_INVALID, "%s", expected_position_syntax);
                 }
                 return cmd_move_to_position_pointer(container);
         } else if (strcmp(argv[0], "center") == 0) {
                 double lx, ly;
                 if (absolute) {
-                        lx = root->x + (root->width - container->width) / 2;
-                        ly = root->y + (root->height - container->height) / 2;
+                        lx = root->x + (root->width - container->pending.width) / 2;
+                        ly = root->y + (root->height - container->pending.height) / 2;
                 } else {
-                        struct sway_workspace *ws = container->workspace;
+                        struct sway_workspace *ws = container->pending.workspace;
                         if (!ws) {
                                 struct sway_seat *seat = config->handler_context.seat;
                                 ws = seat_get_focused_workspace(seat);
                         }
-                        lx = ws->x + (ws->width - container->width) / 2;
-                        ly = ws->y + (ws->height - container->height) / 2;
+                        lx = ws->x + (ws->width - container->pending.width) / 2;
+                        ly = ws->y + (ws->height - container->pending.height) / 2;
                 }
                 container_floating_move_to(container, lx, ly);
                 return cmd_results_new(CMD_SUCCESS, NULL);
         }
 
         if (argc < 2) {
-                return cmd_results_new(CMD_FAILURE, expected_position_syntax);
+                return cmd_results_new(CMD_FAILURE, "%s", expected_position_syntax);
         }
 
         struct movement_amount lx = { .amount = 0, .unit = MOVEMENT_UNIT_INVALID };
@@ -874,19 +885,23 @@ static struct cmd_results *cmd_move_to_position(int argc, char **argv) {
                 return cmd_results_new(CMD_INVALID, "Invalid x position specified");
         }
 
+        if (argc < 1) {
+                return cmd_results_new(CMD_FAILURE, "%s", expected_position_syntax);
+        }
+
         struct movement_amount ly = { .amount = 0, .unit = MOVEMENT_UNIT_INVALID };
         // Y direction
         num_consumed_args = parse_movement_amount(argc, argv, &ly);
         argc -= num_consumed_args;
         argv += num_consumed_args;
         if (argc > 0) {
-                return cmd_results_new(CMD_INVALID, expected_position_syntax);
+                return cmd_results_new(CMD_INVALID, "%s", expected_position_syntax);
         }
         if (ly.unit == MOVEMENT_UNIT_INVALID) {
                 return cmd_results_new(CMD_INVALID, "Invalid y position specified");
         }
 
-        struct sway_workspace *ws = container->workspace;
+        struct sway_workspace *ws = container->pending.workspace;
         if (!ws) {
                 struct sway_seat *seat = config->handler_context.seat;
                 ws = seat_get_focused_workspace(seat);
@@ -960,14 +975,14 @@ static struct cmd_results *cmd_move_to_scratchpad(void) {
         // If the container is in a floating split container,
         // operate on the split container instead of the child.
         if (container_is_floating_or_child(con)) {
-                while (con->parent) {
-                        con = con->parent;
+                while (con->pending.parent) {
+                        con = con->pending.parent;
                 }
         }
 
         if (!con->scratchpad) {
                 root_scratchpad_add_container(con, NULL);
-        } else if (con->workspace) {
+        } else if (con->pending.workspace) {
                 root_scratchpad_hide(con);
         }
         return cmd_results_new(CMD_SUCCESS, NULL);
@@ -1026,13 +1041,13 @@ struct cmd_results *cmd_move(int argc, char **argv) {
         }
 
         if (!argc) {
-                return cmd_results_new(CMD_INVALID, expected_full_syntax);
+                return cmd_results_new(CMD_INVALID, "%s", expected_full_syntax);
         }
 
         // Only `move [window|container] [to] workspace` supports
         // `--no-auto-back-and-forth` so treat others as invalid syntax
         if (no_auto_back_and_forth && strcasecmp(argv[0], "workspace") != 0) {
-                return cmd_results_new(CMD_INVALID, expected_full_syntax);
+                return cmd_results_new(CMD_INVALID, "%s", expected_full_syntax);
         }
 
         if (strcasecmp(argv[0], "workspace") == 0 ||
@@ -1046,5 +1061,5 @@ struct cmd_results *cmd_move(int argc, char **argv) {
                         strcasecmp(argv[1], "position") == 0)) {
                 return cmd_move_to_position(argc, argv);
         }
-        return cmd_results_new(CMD_INVALID, expected_full_syntax);
+        return cmd_results_new(CMD_INVALID, "%s", expected_full_syntax);
 }
diff --git a/sway/commands/no_focus.c b/sway/commands/no_focus.c
index 2001e04f..ccfdec82 100644
--- a/sway/commands/no_focus.c
+++ b/sway/commands/no_focus.c
@@ -13,7 +13,7 @@ struct cmd_results *cmd_no_focus(int argc, char **argv) {
         char *err_str = NULL;
         struct criteria *criteria = criteria_parse(argv[0], &err_str);
         if (!criteria) {
-                error = cmd_results_new(CMD_INVALID, err_str);
+                error = cmd_results_new(CMD_INVALID, "%s", err_str);
                 free(err_str);
                 return error;
         }
diff --git a/sway/commands/opacity.c b/sway/commands/opacity.c
index 96e6228e..610cecc6 100644
--- a/sway/commands/opacity.c
+++ b/sway/commands/opacity.c
@@ -37,6 +37,7 @@ struct cmd_results *cmd_opacity(int argc, char **argv) {
         }
 
         con->alpha = val;
-        container_damage_whole(con);
+        container_update(con);
+
         return cmd_results_new(CMD_SUCCESS, NULL);
 }
diff --git a/sway/commands/output.c b/sway/commands/output.c
index 5186a2ba..df32c673 100644
--- a/sway/commands/output.c
+++ b/sway/commands/output.c
@@ -6,7 +6,7 @@
 #include "log.h"
 
 // must be in order for the bsearch
-static struct cmd_handler output_handlers[] = {
+static const struct cmd_handler output_handlers[] = {
         { "adaptive_sync", output_cmd_adaptive_sync },
         { "background", output_cmd_background },
         { "bg", output_cmd_background },
@@ -15,8 +15,11 @@ static struct cmd_handler output_handlers[] = {
         { "enable", output_cmd_enable },
         { "max_render_time", output_cmd_max_render_time },
         { "mode", output_cmd_mode },
+        { "modeline", output_cmd_modeline },
         { "pos", output_cmd_position },
         { "position", output_cmd_position },
+        { "power", output_cmd_power },
+        { "render_bit_depth", output_cmd_render_bit_depth },
         { "res", output_cmd_mode },
         { "resolution", output_cmd_mode },
         { "scale", output_cmd_scale },
@@ -24,6 +27,7 @@ static struct cmd_handler output_handlers[] = {
         { "subpixel", output_cmd_subpixel },
         { "toggle", output_cmd_toggle },
         { "transform", output_cmd_transform },
+        { "unplug", output_cmd_unplug },
 };
 
 struct cmd_results *cmd_output(int argc, char **argv) {
@@ -32,9 +36,9 @@ struct cmd_results *cmd_output(int argc, char **argv) {
                 return error;
         }
 
-        // The NOOP-1 output is a dummy output used when there's no outputs
+        // The HEADLESS-1 output is a dummy output used when there's no outputs
         // connected. It should never be configured.
-        if (strcasecmp(argv[0], root->noop_output->wlr_output->name) == 0) {
+        if (strcasecmp(argv[0], root->fallback_output->wlr_output->name) == 0) {
                 return cmd_results_new(CMD_FAILURE,
                                 "Refusing to configure the no op output");
         }
@@ -51,7 +55,7 @@ struct cmd_results *cmd_output(int argc, char **argv) {
                 if (!sway_output) {
                         return cmd_results_new(CMD_FAILURE, "Unknown output");
                 }
-                if (sway_output == root->noop_output) {
+                if (sway_output == root->fallback_output) {
                         return cmd_results_new(CMD_FAILURE,
                                         "Refusing to configure the no op output");
                 }
diff --git a/sway/commands/output/background.c b/sway/commands/output/background.c
index 68ee9fe1..d691295f 100644
--- a/sway/commands/output/background.c
+++ b/sway/commands/output/background.c
@@ -102,19 +102,19 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
                         }
 
                         char *conf_path = dirname(conf);
-                        char *rel_path = src;
-                        src = malloc(strlen(conf_path) + strlen(src) + 2);
-                        if (!src) {
-                                free(rel_path);
+                        char *real_src = malloc(strlen(conf_path) + strlen(src) + 2);
+                        if (!real_src) {
+                                free(src);
                                 free(conf);
                                 sway_log(SWAY_ERROR, "Unable to allocate memory");
                                 return cmd_results_new(CMD_FAILURE,
                                                 "Unable to allocate resources");
                         }
 
-                        sprintf(src, "%s/%s", conf_path, rel_path);
-                        free(rel_path);
+                        snprintf(real_src, strlen(conf_path) + strlen(src) + 2, "%s/%s", conf_path, src);
+                        free(src);
                         free(conf);
+                        src = real_src;
                 }
 
                 bool can_access = access(src, F_OK) != -1;
@@ -123,7 +123,10 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
                                         src);
                         config_add_swaynag_warning("Unable to access background file '%s'",
                                         src);
+                        struct cmd_results *result = cmd_results_new(CMD_FAILURE,
+                                        "unable to access background file '%s'", src);
                         free(src);
+                        return result;
                 } else {
                         output->background = src;
                         output->background_option = strdup(mode);
diff --git a/sway/commands/output/dpms.c b/sway/commands/output/dpms.c
index 9d75a80e..c7adbd58 100644
--- a/sway/commands/output/dpms.c
+++ b/sway/commands/output/dpms.c
@@ -1,22 +1,8 @@
+#include "log.h"
 #include "sway/commands.h"
-#include "sway/config.h"
-#include "util.h"
 
 struct cmd_results *output_cmd_dpms(int argc, char **argv) {
-        if (!config->handler_context.output_config) {
-                return cmd_results_new(CMD_FAILURE, "Missing output config");
-        }
-        if (!argc) {
-                return cmd_results_new(CMD_INVALID, "Missing dpms argument.");
-        }
-
-        if (parse_boolean(argv[0], true)) {
-                config->handler_context.output_config->dpms_state = DPMS_ON;
-        } else {
-                config->handler_context.output_config->dpms_state = DPMS_OFF;
-        }
-
-        config->handler_context.leftovers.argc = argc - 1;
-        config->handler_context.leftovers.argv = argv + 1;
-        return NULL;
+        sway_log(SWAY_INFO, "The \"output dpms\" command is deprecated, "
+                "use \"output power\" instead");
+        return output_cmd_power(argc, argv);
 }
diff --git a/sway/commands/output/mode.c b/sway/commands/output/mode.c
index 5b710713..019d625a 100644
--- a/sway/commands/output/mode.c
+++ b/sway/commands/output/mode.c
@@ -20,6 +20,9 @@ struct cmd_results *output_cmd_mode(int argc, char **argv) {
                 output->custom_mode = 0;
         }
 
+        // Reset custom modeline, if any
+        output->drm_mode.type = 0;
+
         char *end;
         output->width = strtol(*argv, &end, 10);
         if (*end) {
@@ -58,3 +61,58 @@ struct cmd_results *output_cmd_mode(int argc, char **argv) {
         return NULL;
 }
 
+static bool parse_modeline(char **argv, drmModeModeInfo *mode) {
+        mode->type = DRM_MODE_TYPE_USERDEF;
+        mode->clock = strtof(argv[0], NULL) * 1000;
+        mode->hdisplay = strtol(argv[1], NULL, 10);
+        mode->hsync_start = strtol(argv[2], NULL, 10);
+        mode->hsync_end = strtol(argv[3], NULL, 10);
+        mode->htotal = strtol(argv[4], NULL, 10);
+        mode->vdisplay = strtol(argv[5], NULL, 10);
+        mode->vsync_start = strtol(argv[6], NULL, 10);
+        mode->vsync_end = strtol(argv[7], NULL, 10);
+        mode->vtotal = strtol(argv[8], NULL, 10);
+
+        mode->vrefresh = mode->clock * 1000.0 * 1000.0
+                / mode->htotal / mode->vtotal;
+        if (strcasecmp(argv[9], "+hsync") == 0) {
+                mode->flags |= DRM_MODE_FLAG_PHSYNC;
+        } else if (strcasecmp(argv[9], "-hsync") == 0) {
+                mode->flags |= DRM_MODE_FLAG_NHSYNC;
+        } else {
+                return false;
+        }
+
+        if (strcasecmp(argv[10], "+vsync") == 0) {
+                mode->flags |= DRM_MODE_FLAG_PVSYNC;
+        } else if (strcasecmp(argv[10], "-vsync") == 0) {
+                mode->flags |= DRM_MODE_FLAG_NVSYNC;
+        } else {
+                return false;
+        }
+
+        snprintf(mode->name, sizeof(mode->name), "%dx%d@%d",
+                 mode->hdisplay, mode->vdisplay, mode->vrefresh / 1000);
+
+        return true;
+}
+
+struct cmd_results *output_cmd_modeline(int argc, char **argv) {
+        if (!config->handler_context.output_config) {
+                return cmd_results_new(CMD_FAILURE, "Missing output config");
+        }
+        if (!argc) {
+                return cmd_results_new(CMD_INVALID, "Missing modeline argument.");
+        }
+
+        struct output_config *output = config->handler_context.output_config;
+
+        if (argc != 11 || !parse_modeline(argv, &output->drm_mode)) {
+                return cmd_results_new(CMD_INVALID, "Invalid modeline");
+        }
+
+        config->handler_context.leftovers.argc = argc - 12;
+        config->handler_context.leftovers.argv = argv + 12;
+        return NULL;
+}
+
diff --git a/sway/commands/output/power.c b/sway/commands/output/power.c
new file mode 100644
index 00000000..e6ae2852
--- /dev/null
+++ b/sway/commands/output/power.c
@@ -0,0 +1,43 @@
+#include <strings.h>
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/output.h"
+#include "util.h"
+
+struct cmd_results *output_cmd_power(int argc, char **argv) {
+        if (!config->handler_context.output_config) {
+                return cmd_results_new(CMD_FAILURE, "Missing output config");
+        }
+        if (argc == 0) {
+                return cmd_results_new(CMD_INVALID, "Missing power argument");
+        }
+
+        bool current = true;
+        if (strcasecmp(argv[0], "toggle") == 0) {
+                const char *oc_name = config->handler_context.output_config->name;
+                if (strcmp(oc_name, "*") == 0) {
+                        return cmd_results_new(CMD_INVALID,
+                                "Cannot apply toggle to all outputs");
+                }
+
+                struct sway_output *sway_output = all_output_by_name_or_id(oc_name);
+                if (!sway_output || !sway_output->wlr_output) {
+                        return cmd_results_new(CMD_FAILURE,
+                                "Cannot apply toggle to unknown output %s", oc_name);
+                }
+
+                if (sway_output->enabled && !sway_output->wlr_output->enabled) {
+                        current = false;
+                }
+        }
+
+        if (parse_boolean(argv[0], current)) {
+                config->handler_context.output_config->power = 1;
+        } else {
+                config->handler_context.output_config->power = 0;
+        }
+
+        config->handler_context.leftovers.argc = argc - 1;
+        config->handler_context.leftovers.argv = argv + 1;
+        return NULL;
+}
diff --git a/sway/commands/output/render_bit_depth.c b/sway/commands/output/render_bit_depth.c
new file mode 100644
index 00000000..c419321e
--- /dev/null
+++ b/sway/commands/output/render_bit_depth.c
@@ -0,0 +1,29 @@
+#include <drm_fourcc.h>
+#include <strings.h>
+#include "sway/commands.h"
+#include "sway/config.h"
+
+struct cmd_results *output_cmd_render_bit_depth(int argc, char **argv) {
+        if (!config->handler_context.output_config) {
+                return cmd_results_new(CMD_FAILURE, "Missing output config");
+        }
+        if (!argc) {
+                return cmd_results_new(CMD_INVALID, "Missing bit depth argument.");
+        }
+
+        if (strcmp(*argv, "8") == 0) {
+                config->handler_context.output_config->render_bit_depth =
+                        RENDER_BIT_DEPTH_8;
+        } else if (strcmp(*argv, "10") == 0) {
+                config->handler_context.output_config->render_bit_depth =
+                        RENDER_BIT_DEPTH_10;
+        } else {
+                return cmd_results_new(CMD_INVALID,
+                        "Invalid bit depth. Must be a value in (8|10).");
+        }
+
+        config->handler_context.leftovers.argc = argc - 1;
+        config->handler_context.leftovers.argv = argv + 1;
+        return NULL;
+}
+
diff --git a/sway/commands/output/transform.c b/sway/commands/output/transform.c
index f4fcc8c9..8db71bb3 100644
--- a/sway/commands/output/transform.c
+++ b/sway/commands/output/transform.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <wlr/util/transform.h>
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "log.h"
diff --git a/sway/commands/output/unplug.c b/sway/commands/output/unplug.c
new file mode 100644
index 00000000..dfef626f
--- /dev/null
+++ b/sway/commands/output/unplug.c
@@ -0,0 +1,54 @@
+#include <strings.h>
+#include <wlr/config.h>
+#include <wlr/backend/headless.h>
+#include <wlr/backend/wayland.h>
+#if WLR_HAS_X11_BACKEND
+#include <wlr/backend/x11.h>
+#endif
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/output.h"
+
+static bool is_backend_allowed(struct wlr_backend *backend) {
+        if (wlr_backend_is_headless(backend)) {
+                return true;
+        }
+        if (wlr_backend_is_wl(backend)) {
+                return true;
+        }
+#if WLR_HAS_X11_BACKEND
+        if (wlr_backend_is_x11(backend)) {
+                return true;
+        }
+#endif
+        return false;
+}
+
+/**
+ * This command is intended for developer use only.
+ */
+struct cmd_results *output_cmd_unplug(int argc, char **argv) {
+        if (!config->handler_context.output_config) {
+                return cmd_results_new(CMD_FAILURE, "Missing output config");
+        }
+
+        const char *oc_name = config->handler_context.output_config->name;
+        if (strcmp(oc_name, "*") == 0) {
+                return cmd_results_new(CMD_INVALID, "Won't unplug all outputs");
+        }
+
+        struct sway_output *sway_output = all_output_by_name_or_id(oc_name);
+        if (!sway_output) {
+                return cmd_results_new(CMD_INVALID,
+                        "Cannot unplug unknown output %s", oc_name);
+        }
+
+        if (!is_backend_allowed(sway_output->wlr_output->backend)) {
+                return cmd_results_new(CMD_INVALID,
+                        "Can only unplug outputs with headless, wayland or x11 backend");
+        }
+
+        wlr_output_destroy(sway_output->wlr_output);
+
+        return cmd_results_new(CMD_SUCCESS, NULL);
+}
diff --git a/sway/commands/primary_selection.c b/sway/commands/primary_selection.c
new file mode 100644
index 00000000..585b079d
--- /dev/null
+++ b/sway/commands/primary_selection.c
@@ -0,0 +1,23 @@
+#include <string.h>
+#include <strings.h>
+#include "sway/config.h"
+#include "sway/commands.h"
+#include "util.h"
+
+struct cmd_results *cmd_primary_selection(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "primary_selection", EXPECTED_EQUAL_TO, 1))) {
+                return error;
+        }
+
+        bool primary_selection = parse_boolean(argv[0], true);
+
+        if (config->reloading && config->primary_selection != primary_selection) {
+                return cmd_results_new(CMD_FAILURE,
+                                "primary_selection can only be enabled/disabled at launch");
+        }
+
+        config->primary_selection = parse_boolean(argv[0], true);
+
+        return cmd_results_new(CMD_SUCCESS, NULL);
+}
diff --git a/sway/commands/reload.c b/sway/commands/reload.c
index 3c994d54..82967ca7 100644
--- a/sway/commands/reload.c
+++ b/sway/commands/reload.c
@@ -9,9 +9,8 @@
 #include "list.h"
 #include "log.h"
 
-static void rebuild_textures_iterator(struct sway_container *con, void *data) {
-        container_update_marks_textures(con);
-        container_update_title_textures(con);
+static void title_bar_update_iterator(struct sway_container *con, void *data) {
+        container_update_title_bar(con);
 }
 
 static void do_reload(void *data) {
@@ -48,8 +47,7 @@ static void do_reload(void *data) {
         }
         list_free_items_and_destroy(bar_ids);
 
-        config_update_font_height(true);
-        root_for_each_container(rebuild_textures_iterator, NULL);
+        root_for_each_container(title_bar_update_iterator, NULL);
 
         arrange_root();
 }
diff --git a/sway/commands/rename.c b/sway/commands/rename.c
index 3b855fdf..0d36cc21 100644
--- a/sway/commands/rename.c
+++ b/sway/commands/rename.c
@@ -7,6 +7,7 @@
 #include "sway/config.h"
 #include "sway/ipc-server.h"
 #include "sway/output.h"
+#include "sway/desktop/launcher.h"
 #include "sway/tree/container.h"
 #include "sway/tree/workspace.h"
 #include "sway/tree/root.h"
@@ -25,7 +26,7 @@ struct cmd_results *cmd_rename(int argc, char **argv) {
                                 "Can't run this command while there's no outputs connected.");
         }
         if (strcasecmp(argv[0], "workspace") != 0) {
-                return cmd_results_new(CMD_INVALID, expected_syntax);
+                return cmd_results_new(CMD_INVALID, "%s", expected_syntax);
         }
 
         int argn = 1;
@@ -64,7 +65,7 @@ struct cmd_results *cmd_rename(int argc, char **argv) {
         ++argn; // move past "to"
 
         if (argn >= argc) {
-                return cmd_results_new(CMD_INVALID, expected_syntax);
+                return cmd_results_new(CMD_INVALID, "%s", expected_syntax);
         }
 
         char *new_name = join_args(argv + argn, argc - argn);
@@ -91,8 +92,6 @@ struct cmd_results *cmd_rename(int argc, char **argv) {
 
         sway_log(SWAY_DEBUG, "renaming workspace '%s' to '%s'", workspace->name, new_name);
 
-        root_rename_pid_workspaces(workspace->name, new_name);
-
         free(workspace->name);
         workspace->name = new_name;
 
diff --git a/sway/commands/resize.c b/sway/commands/resize.c
index ca36e858..32b746ea 100644
--- a/sway/commands/resize.c
+++ b/sway/commands/resize.c
@@ -57,7 +57,7 @@ struct sway_container *container_find_resize_parent(struct sway_container *con,
                                 (allow_last || index < siblings->length - 1)) {
                         return con;
                 }
-                con = con->parent;
+                con = con->pending.parent;
         }
 
         return NULL;
@@ -75,6 +75,10 @@ void container_resize_tiled(struct sway_container *con,
                 return;
         }
 
+        if (container_is_scratchpad_hidden_or_child(con)) {
+                return;
+        }
+
         // For HORIZONTAL or VERTICAL, we are growing in two directions so select
         // both adjacent siblings. For RIGHT or DOWN, just select the next sibling.
         // For LEFT or UP, convert it to a RIGHT or DOWN resize and reassign con to
@@ -115,13 +119,13 @@ void container_resize_tiled(struct sway_container *con,
         int sibling_amount = prev ? ceil((double)amount / 2.0) : amount;
 
         if (is_horizontal(axis)) {
-                if (con->width + amount < MIN_SANE_W) {
+                if (con->pending.width + amount < MIN_SANE_W) {
                         return;
                 }
-                if (next->width - sibling_amount < MIN_SANE_W) {
+                if (next->pending.width - sibling_amount < MIN_SANE_W) {
                         return;
                 }
-                if (prev && prev->width - sibling_amount < MIN_SANE_W) {
+                if (prev && prev->pending.width - sibling_amount < MIN_SANE_W) {
                         return;
                 }
                 if (con->child_total_width <= 0) {
@@ -133,7 +137,7 @@ void container_resize_tiled(struct sway_container *con,
                 list_t *siblings = container_get_siblings(con);
                 for (int i = 0; i < siblings->length; ++i) {
                         struct sway_container *con = siblings->items[i];
-                        con->width_fraction = con->width / con->child_total_width;
+                        con->width_fraction = con->pending.width / con->child_total_width;
                 }
 
                 double amount_fraction = (double)amount / con->child_total_width;
@@ -146,13 +150,13 @@ void container_resize_tiled(struct sway_container *con,
                         prev->width_fraction -= sibling_amount_fraction;
                 }
         } else {
-                if (con->height + amount < MIN_SANE_H) {
+                if (con->pending.height + amount < MIN_SANE_H) {
                         return;
                 }
-                if (next->height - sibling_amount < MIN_SANE_H) {
+                if (next->pending.height - sibling_amount < MIN_SANE_H) {
                         return;
                 }
-                if (prev && prev->height - sibling_amount < MIN_SANE_H) {
+                if (prev && prev->pending.height - sibling_amount < MIN_SANE_H) {
                         return;
                 }
                 if (con->child_total_height <= 0) {
@@ -164,7 +168,7 @@ void container_resize_tiled(struct sway_container *con,
                 list_t *siblings = container_get_siblings(con);
                 for (int i = 0; i < siblings->length; ++i) {
                         struct sway_container *con = siblings->items[i];
-                        con->height_fraction = con->height / con->child_total_height;
+                        con->height_fraction = con->pending.height / con->child_total_height;
                 }
 
                 double amount_fraction = (double)amount / con->child_total_height;
@@ -178,10 +182,10 @@ void container_resize_tiled(struct sway_container *con,
                 }
         }
 
-        if (con->parent) {
-                arrange_container(con->parent);
+        if (con->pending.parent) {
+                arrange_container(con->pending.parent);
         } else {
-                arrange_workspace(con->workspace);
+                arrange_workspace(con->pending.workspace);
         }
 }
 
@@ -203,15 +207,15 @@ static struct cmd_results *resize_adjust_floating(uint32_t axis,
         int min_width, max_width, min_height, max_height;
         floating_calculate_constraints(&min_width, &max_width,
                         &min_height, &max_height);
-        if (con->width + grow_width < min_width) {
-                grow_width = min_width - con->width;
-        } else if (con->width + grow_width > max_width) {
-                grow_width = max_width - con->width;
+        if (con->pending.width + grow_width < min_width) {
+                grow_width = min_width - con->pending.width;
+        } else if (con->pending.width + grow_width > max_width) {
+                grow_width = max_width - con->pending.width;
         }
-        if (con->height + grow_height < min_height) {
-                grow_height = min_height - con->height;
-        } else if (con->height + grow_height > max_height) {
-                grow_height = max_height - con->height;
+        if (con->pending.height + grow_height < min_height) {
+                grow_height = min_height - con->pending.height;
+        } else if (con->pending.height + grow_height > max_height) {
+                grow_height = max_height - con->pending.height;
         }
         int grow_x = 0, grow_y = 0;
 
@@ -227,15 +231,15 @@ static struct cmd_results *resize_adjust_floating(uint32_t axis,
         if (grow_width == 0 && grow_height == 0) {
                 return cmd_results_new(CMD_INVALID, "Cannot resize any further");
         }
-        con->x += grow_x;
-        con->y += grow_y;
-        con->width += grow_width;
-        con->height += grow_height;
+        con->pending.x += grow_x;
+        con->pending.y += grow_y;
+        con->pending.width += grow_width;
+        con->pending.height += grow_height;
 
-        con->content_x += grow_x;
-        con->content_y += grow_y;
-        con->content_width += grow_width;
-        con->content_height += grow_height;
+        con->pending.content_x += grow_x;
+        con->pending.content_y += grow_y;
+        con->pending.content_width += grow_width;
+        con->pending.content_height += grow_height;
 
         arrange_container(con);
 
@@ -249,16 +253,35 @@ static struct cmd_results *resize_adjust_tiled(uint32_t axis,
                 struct movement_amount *amount) {
         struct sway_container *current = config->handler_context.container;
 
+        if (container_is_scratchpad_hidden_or_child(current)) {
+                return cmd_results_new(CMD_FAILURE, "Cannot resize a hidden scratchpad container");
+        }
+
         if (amount->unit == MOVEMENT_UNIT_DEFAULT) {
                 amount->unit = MOVEMENT_UNIT_PPT;
         }
         if (amount->unit == MOVEMENT_UNIT_PPT) {
+        struct sway_container *parent = current->pending.parent;
                 float pct = amount->amount / 100.0f;
 
                 if (is_horizontal(axis)) {
-                        amount->amount = (float)current->width * pct;
+            while (parent && parent->pending.layout != L_HORIZ) {
+                parent = parent->pending.parent;
+            }
+            if (parent) {
+                amount->amount = (float)parent->pending.width * pct;
+            } else {
+                amount->amount = (float)current->pending.workspace->width * pct;
+            }
                 } else {
-                        amount->amount = (float)current->height * pct;
+            while (parent && parent->pending.layout != L_VERT) {
+                parent = parent->pending.parent;
+            }
+            if (parent) {
+                amount->amount = (float)parent->pending.height * pct;
+            } else {
+                amount->amount = (float)current->pending.workspace->height * pct;
+            }
                 }
         }
 
@@ -277,24 +300,29 @@ static struct cmd_results *resize_adjust_tiled(uint32_t axis,
  */
 static struct cmd_results *resize_set_tiled(struct sway_container *con,
                 struct movement_amount *width, struct movement_amount *height) {
+
+        if (container_is_scratchpad_hidden_or_child(con)) {
+                return cmd_results_new(CMD_FAILURE, "Cannot resize a hidden scratchpad container");
+        }
+
         if (width->amount) {
                 if (width->unit == MOVEMENT_UNIT_PPT ||
                                 width->unit == MOVEMENT_UNIT_DEFAULT) {
                         // Convert to px
-                        struct sway_container *parent = con->parent;
-                        while (parent && parent->layout != L_HORIZ) {
-                                parent = parent->parent;
+                        struct sway_container *parent = con->pending.parent;
+                        while (parent && parent->pending.layout != L_HORIZ) {
+                                parent = parent->pending.parent;
                         }
                         if (parent) {
-                                width->amount = parent->width * width->amount / 100;
+                                width->amount = parent->pending.width * width->amount / 100;
                         } else {
-                                width->amount = con->workspace->width * width->amount / 100;
+                                width->amount = con->pending.workspace->width * width->amount / 100;
                         }
                         width->unit = MOVEMENT_UNIT_PX;
                 }
                 if (width->unit == MOVEMENT_UNIT_PX) {
                         container_resize_tiled(con, AXIS_HORIZONTAL,
-                                        width->amount - con->width);
+                                        width->amount - con->pending.width);
                 }
         }
 
@@ -302,20 +330,20 @@ static struct cmd_results *resize_set_tiled(struct sway_container *con,
                 if (height->unit == MOVEMENT_UNIT_PPT ||
                                 height->unit == MOVEMENT_UNIT_DEFAULT) {
                         // Convert to px
-                        struct sway_container *parent = con->parent;
-                        while (parent && parent->layout != L_VERT) {
-                                parent = parent->parent;
+                        struct sway_container *parent = con->pending.parent;
+                        while (parent && parent->pending.layout != L_VERT) {
+                                parent = parent->pending.parent;
                         }
                         if (parent) {
-                                height->amount = parent->height * height->amount / 100;
+                                height->amount = parent->pending.height * height->amount / 100;
                         } else {
-                                height->amount = con->workspace->height * height->amount / 100;
+                                height->amount = con->pending.workspace->height * height->amount / 100;
                         }
                         height->unit = MOVEMENT_UNIT_PX;
                 }
                 if (height->unit == MOVEMENT_UNIT_PX) {
                         container_resize_tiled(con, AXIS_VERTICAL,
-                                        height->amount - con->height);
+                                        height->amount - con->pending.height);
                 }
         }
 
@@ -339,15 +367,15 @@ static struct cmd_results *resize_set_floating(struct sway_container *con,
                                                 "Cannot resize a hidden scratchpad container by ppt");
                         }
                         // Convert to px
-                        width->amount = con->workspace->width * width->amount / 100;
+                        width->amount = con->pending.workspace->width * width->amount / 100;
                         width->unit = MOVEMENT_UNIT_PX;
                         // Falls through
                 case MOVEMENT_UNIT_PX:
                 case MOVEMENT_UNIT_DEFAULT:
                         width->amount = fmax(min_width, fmin(width->amount, max_width));
-                        grow_width = width->amount - con->width;
-                        con->x -= grow_width / 2;
-                        con->width = width->amount;
+                        grow_width = width->amount - con->pending.width;
+                        con->pending.x -= grow_width / 2;
+                        con->pending.width = width->amount;
                         break;
                 case MOVEMENT_UNIT_INVALID:
                         sway_assert(false, "invalid width unit");
@@ -363,15 +391,15 @@ static struct cmd_results *resize_set_floating(struct sway_container *con,
                                                 "Cannot resize a hidden scratchpad container by ppt");
                         }
                         // Convert to px
-                        height->amount = con->workspace->height * height->amount / 100;
+                        height->amount = con->pending.workspace->height * height->amount / 100;
                         height->unit = MOVEMENT_UNIT_PX;
                         // Falls through
                 case MOVEMENT_UNIT_PX:
                 case MOVEMENT_UNIT_DEFAULT:
                         height->amount = fmax(min_height, fmin(height->amount, max_height));
-                        grow_height = height->amount - con->height;
-                        con->y -= grow_height / 2;
-                        con->height = height->amount;
+                        grow_height = height->amount - con->pending.height;
+                        con->pending.y -= grow_height / 2;
+                        con->pending.height = height->amount;
                         break;
                 case MOVEMENT_UNIT_INVALID:
                         sway_assert(false, "invalid height unit");
@@ -379,10 +407,10 @@ static struct cmd_results *resize_set_floating(struct sway_container *con,
                 }
         }
 
-        con->content_x -= grow_width / 2;
-        con->content_y -= grow_height / 2;
-        con->content_width += grow_width;
-        con->content_height += grow_height;
+        con->pending.content_x -= grow_width / 2;
+        con->pending.content_y -= grow_height / 2;
+        con->pending.content_width += grow_width;
+        con->pending.content_height += grow_height;
 
         arrange_container(con);
 
@@ -415,7 +443,7 @@ static struct cmd_results *cmd_resize_set(int argc, char **argv) {
                 argc -= num_consumed_args;
                 argv += num_consumed_args;
                 if (width.unit == MOVEMENT_UNIT_INVALID) {
-                        return cmd_results_new(CMD_INVALID, usage);
+                        return cmd_results_new(CMD_INVALID, "%s", usage);
                 }
         }
 
@@ -427,20 +455,20 @@ static struct cmd_results *cmd_resize_set(int argc, char **argv) {
                 }
                 int num_consumed_args = parse_movement_amount(argc, argv, &height);
                 if (argc > num_consumed_args) {
-                        return cmd_results_new(CMD_INVALID, usage);
+                        return cmd_results_new(CMD_INVALID, "%s", usage);
                 }
                 if (width.unit == MOVEMENT_UNIT_INVALID) {
-                        return cmd_results_new(CMD_INVALID, usage);
+                        return cmd_results_new(CMD_INVALID, "%s", usage);
                 }
         }
 
         // If 0, don't resize that dimension
         struct sway_container *con = config->handler_context.container;
         if (width.amount <= 0) {
-                width.amount = con->width;
+                width.amount = con->pending.width;
         }
         if (height.amount <= 0) {
-                height.amount = con->height;
+                height.amount = con->pending.height;
         }
 
         if (container_is_floating(con)) {
@@ -462,7 +490,7 @@ static struct cmd_results *cmd_resize_adjust(int argc, char **argv,
                 "[<amount> px|ppt [or <amount> px|ppt]]'";
         uint32_t axis = parse_resize_axis(*argv);
         if (axis == WLR_EDGE_NONE) {
-                return cmd_results_new(CMD_INVALID, usage);
+                return cmd_results_new(CMD_INVALID, "%s", usage);
         }
         --argc; ++argv;
 
@@ -473,7 +501,7 @@ static struct cmd_results *cmd_resize_adjust(int argc, char **argv,
                 argc -= num_consumed_args;
                 argv += num_consumed_args;
                 if (first_amount.unit == MOVEMENT_UNIT_INVALID) {
-                        return cmd_results_new(CMD_INVALID, usage);
+                        return cmd_results_new(CMD_INVALID, "%s", usage);
                 }
         } else {
                 first_amount.amount = 10;
@@ -483,7 +511,7 @@ static struct cmd_results *cmd_resize_adjust(int argc, char **argv,
         // "or"
         if (argc) {
                 if (strcmp(*argv, "or") != 0) {
-                        return cmd_results_new(CMD_INVALID, usage);
+                        return cmd_results_new(CMD_INVALID, "%s", usage);
                 }
                 --argc; ++argv;
         }
@@ -493,10 +521,10 @@ static struct cmd_results *cmd_resize_adjust(int argc, char **argv,
         if (argc) {
                 int num_consumed_args = parse_movement_amount(argc, argv, &second_amount);
                 if (argc > num_consumed_args) {
-                        return cmd_results_new(CMD_INVALID, usage);
+                        return cmd_results_new(CMD_INVALID, "%s", usage);
                 }
                 if (second_amount.unit == MOVEMENT_UNIT_INVALID) {
-                        return cmd_results_new(CMD_INVALID, usage);
+                        return cmd_results_new(CMD_INVALID, "%s", usage);
                 }
         } else {
                 second_amount.amount = 0;
@@ -566,5 +594,5 @@ struct cmd_results *cmd_resize(int argc, char **argv) {
         const char usage[] = "Expected 'resize <shrink|grow> "
                 "<width|height|up|down|left|right> [<amount>] [px|ppt]'";
 
-        return cmd_results_new(CMD_INVALID, usage);
+        return cmd_results_new(CMD_INVALID, "%s", usage);
 }
diff --git a/sway/commands/scratchpad.c b/sway/commands/scratchpad.c
index 34871bc6..c995f2f0 100644
--- a/sway/commands/scratchpad.c
+++ b/sway/commands/scratchpad.c
@@ -21,8 +21,8 @@ static void scratchpad_toggle_auto(void) {
         // If the focus is in a floating split container,
         // operate on the split container instead of the child.
         if (focus && container_is_floating_or_child(focus)) {
-                while (focus->parent) {
-                        focus = focus->parent;
+                while (focus->pending.parent) {
+                        focus = focus->pending.parent;
                 }
         }
 
@@ -52,7 +52,7 @@ static void scratchpad_toggle_auto(void) {
         // In this case we move it to the current workspace.
         for (int i = 0; i < root->scratchpad->length; ++i) {
                 struct sway_container *con = root->scratchpad->items[i];
-                if (con->parent) {
+                if (con->pending.parent) {
                         sway_log(SWAY_DEBUG,
                                         "Moving a visible scratchpad window (%s) to this workspace",
                                         con->title);
@@ -80,7 +80,7 @@ static void scratchpad_toggle_container(struct sway_container *con) {
         struct sway_seat *seat = input_manager_current_seat();
         struct sway_workspace *ws = seat_get_focused_workspace(seat);
         // Check if it matches a currently visible scratchpad window and hide it.
-        if (con->workspace && ws == con->workspace) {
+        if (con->pending.workspace && ws == con->pending.workspace) {
                 root_scratchpad_hide(con);
                 return;
         }
@@ -105,21 +105,22 @@ struct cmd_results *cmd_scratchpad(int argc, char **argv) {
                 return cmd_results_new(CMD_INVALID, "Scratchpad is empty");
         }
 
-        if (config->handler_context.using_criteria) {
+        if (config->handler_context.node_overridden) {
                 struct sway_container *con = config->handler_context.container;
 
                 // If the container is in a floating split container,
                 // operate on the split container instead of the child.
-                if (container_is_floating_or_child(con)) {
-                        while (con->parent) {
-                                con = con->parent;
+                if (con && container_is_floating_or_child(con)) {
+                        while (con->pending.parent) {
+                                con = con->pending.parent;
                         }
                 }
 
                 // If using criteria, this command is executed for every container which
                 // matches the criteria. If this container isn't in the scratchpad,
-                // we'll just silently return a success.
-                if (!con->scratchpad) {
+                // we'll just silently return a success. The same is true if the
+                // overridden node is not a container.
+                if (!con || !con->scratchpad) {
                         return cmd_results_new(CMD_SUCCESS, NULL);
                 }
                 scratchpad_toggle_container(con);
diff --git a/sway/commands/seat.c b/sway/commands/seat.c
index 84c6ba53..2d197b69 100644
--- a/sway/commands/seat.c
+++ b/sway/commands/seat.c
@@ -8,13 +8,13 @@
 
 // must be in order for the bsearch
 // these handlers perform actions on the seat
-static struct cmd_handler seat_action_handlers[] = {
+static const struct cmd_handler seat_action_handlers[] = {
         { "cursor", seat_cmd_cursor },
 };
 
 // must be in order for the bsearch
 // these handlers alter the seat config
-static struct cmd_handler seat_handlers[] = {
+static const struct cmd_handler seat_handlers[] = {
         { "attach", seat_cmd_attach },
         { "fallback", seat_cmd_fallback },
         { "hide_cursor", seat_cmd_hide_cursor },
diff --git a/sway/commands/seat/attach.c b/sway/commands/seat/attach.c
index 7615eef9..00bfdab6 100644
--- a/sway/commands/seat/attach.c
+++ b/sway/commands/seat/attach.c
@@ -12,7 +12,7 @@ struct cmd_results *seat_cmd_attach(int argc, char **argv) {
         if (!config->handler_context.seat_config) {
                 return cmd_results_new(CMD_FAILURE, "No seat defined");
         }
-        if (config->reading) {
+        if (!config->active) {
                 return cmd_results_new(CMD_DEFER, NULL);
         }
 
diff --git a/sway/commands/seat/cursor.c b/sway/commands/seat/cursor.c
index 749235eb..5a8a3bc8 100644
--- a/sway/commands/seat/cursor.c
+++ b/sway/commands/seat/cursor.c
@@ -18,7 +18,7 @@ static struct cmd_results *handle_command(struct sway_cursor *cursor,
                 int argc, char **argv) {
         if (strcasecmp(argv[0], "move") == 0) {
                 if (argc < 3) {
-                        return cmd_results_new(CMD_INVALID, expected_syntax);
+                        return cmd_results_new(CMD_INVALID, "%s", expected_syntax);
                 }
                 int delta_x = strtol(argv[1], NULL, 10);
                 int delta_y = strtol(argv[2], NULL, 10);
@@ -27,7 +27,7 @@ static struct cmd_results *handle_command(struct sway_cursor *cursor,
                 wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat);
         } else if (strcasecmp(argv[0], "set") == 0) {
                 if (argc < 3) {
-                        return cmd_results_new(CMD_INVALID, expected_syntax);
+                        return cmd_results_new(CMD_INVALID, "%s", expected_syntax);
                 }
                 // map absolute coords (0..1,0..1) to root container coords
                 float x = strtof(argv[1], NULL) / root->width;
@@ -37,7 +37,7 @@ static struct cmd_results *handle_command(struct sway_cursor *cursor,
                 wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat);
         } else {
                 if (argc < 2) {
-                        return cmd_results_new(CMD_INVALID, expected_syntax);
+                        return cmd_results_new(CMD_INVALID, "%s", expected_syntax);
                 }
                 struct cmd_results *error = NULL;
                 if ((error = press_or_release(cursor, argv[0], argv[1]))) {
@@ -92,14 +92,14 @@ static struct cmd_results *press_or_release(struct sway_cursor *cursor,
         } else if (strcasecmp(action, "release") == 0) {
                 state = WLR_BUTTON_RELEASED;
         } else {
-                return cmd_results_new(CMD_INVALID, expected_syntax);
+                return cmd_results_new(CMD_INVALID, "%s", expected_syntax);
         }
 
         char *message = NULL;
         button = get_mouse_button(button_str, &message);
         if (message) {
                 struct cmd_results *error =
-                        cmd_results_new(CMD_INVALID, message);
+                        cmd_results_new(CMD_INVALID, "%s", message);
                 free(message);
                 return error;
         } else if (button == SWAY_SCROLL_UP || button == SWAY_SCROLL_DOWN
@@ -111,8 +111,8 @@ static struct cmd_results *press_or_release(struct sway_cursor *cursor,
                         : WLR_AXIS_ORIENTATION_HORIZONTAL;
                 double delta = (button == SWAY_SCROLL_UP || button == SWAY_SCROLL_LEFT)
                         ? -1 : 1;
-                struct wlr_event_pointer_axis event = {
-                        .device = NULL,
+                struct wlr_pointer_axis_event event = {
+                        .pointer = NULL,
                         .time_msec = 0,
                         .source = WLR_AXIS_SOURCE_WHEEL,
                         .orientation = orientation,
diff --git a/sway/commands/seat/idle.c b/sway/commands/seat/idle.c
index 82428f2c..62b94db2 100644
--- a/sway/commands/seat/idle.c
+++ b/sway/commands/seat/idle.c
@@ -3,6 +3,7 @@
 #include <string.h>
 #include <strings.h>
 #include <stdint.h>
+#include "log.h"
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/input/seat.h"
@@ -69,5 +70,10 @@ struct cmd_results *seat_cmd_idle_wake(int argc, char **argv) {
                 return cmd_results_new(CMD_FAILURE, "Invalid idle source");
         }
         config->handler_context.seat_config->idle_wake_sources = sources;
+        sway_log(SWAY_INFO, "Warning: seat idle_wake is deprecated");
+        if (config->reading) {
+                config_add_swaynag_warning("seat idle_wake is deprecated. "
+                        "Only seat idle_inhibit is supported.");
+        }
         return cmd_results_new(CMD_SUCCESS, NULL);
 }
diff --git a/sway/commands/show_marks.c b/sway/commands/show_marks.c
index 0d373b80..fecb5ade 100644
--- a/sway/commands/show_marks.c
+++ b/sway/commands/show_marks.c
@@ -10,8 +10,8 @@
 #include "stringop.h"
 #include "util.h"
 
-static void rebuild_marks_iterator(struct sway_container *con, void *data) {
-        container_update_marks_textures(con);
+static void title_bar_update_iterator(struct sway_container *con, void *data) {
+        container_update_marks(con);
 }
 
 struct cmd_results *cmd_show_marks(int argc, char **argv) {
@@ -23,12 +23,7 @@ struct cmd_results *cmd_show_marks(int argc, char **argv) {
         config->show_marks = parse_boolean(argv[0], config->show_marks);
 
         if (config->show_marks) {
-                root_for_each_container(rebuild_marks_iterator, NULL);
-        }
-
-        for (int i = 0; i < root->outputs->length; ++i) {
-                struct sway_output *output = root->outputs->items[i];
-                output_damage_whole(output);
+                root_for_each_container(title_bar_update_iterator, NULL);
         }
 
         return cmd_results_new(CMD_SUCCESS, NULL);
diff --git a/sway/commands/smart_gaps.c b/sway/commands/smart_gaps.c
index b27f9ccd..a6d165dc 100644
--- a/sway/commands/smart_gaps.c
+++ b/sway/commands/smart_gaps.c
@@ -15,7 +15,12 @@ struct cmd_results *cmd_smart_gaps(int argc, char **argv) {
                 return error;
         }
 
-        config->smart_gaps = parse_boolean(argv[0], config->smart_gaps);
+        if (strcmp(argv[0], "inverse_outer") == 0) {
+                config->smart_gaps = SMART_GAPS_INVERSE_OUTER;
+        } else {
+                config->smart_gaps = parse_boolean(argv[0], config->smart_gaps)
+                        ? SMART_GAPS_ON : SMART_GAPS_OFF;
+        }
 
         arrange_root();
 
diff --git a/sway/commands/split.c b/sway/commands/split.c
index 782bab02..500a497d 100644
--- a/sway/commands/split.c
+++ b/sway/commands/split.c
@@ -14,7 +14,7 @@ static struct cmd_results *do_split(int layout) {
         struct sway_workspace *ws = config->handler_context.workspace;
         if (con) {
                 if (container_is_scratchpad_hidden_or_child(con) &&
-                                con->fullscreen_mode != FULLSCREEN_GLOBAL) {
+                                con->pending.fullscreen_mode != FULLSCREEN_GLOBAL) {
                         return cmd_results_new(CMD_FAILURE,
                                         "Cannot split a hidden scratchpad container");
                 }
@@ -32,6 +32,24 @@ static struct cmd_results *do_split(int layout) {
         return cmd_results_new(CMD_SUCCESS, NULL);
 }
 
+static struct cmd_results *do_unsplit(void) {
+        struct sway_container *con = config->handler_context.container;
+        struct sway_workspace *ws = config->handler_context.workspace;
+
+        if (con && con->pending.parent && con->pending.parent->pending.children->length == 1) {
+                container_flatten(con->pending.parent);
+        } else {
+                return cmd_results_new(CMD_FAILURE, "Can only flatten a child container with no siblings");
+        }
+
+        if (root->fullscreen_global) {
+                arrange_root();
+        } else {
+                arrange_workspace(ws);
+        }
+        return cmd_results_new(CMD_SUCCESS, NULL);
+}
+
 struct cmd_results *cmd_split(int argc, char **argv) {
         struct cmd_results *error = NULL;
         if ((error = checkarg(argc, "split", EXPECTED_EQUAL_TO, 1))) {
@@ -55,6 +73,9 @@ struct cmd_results *cmd_split(int argc, char **argv) {
                 } else {
                         return do_split(L_VERT);
                 }
+        } else if (strcasecmp(argv[0], "n") == 0 ||
+                        strcasecmp(argv[0], "none") == 0) {
+                return do_unsplit();
         } else {
                 return cmd_results_new(CMD_FAILURE,
                         "Invalid split command (expected either horizontal or vertical).");
diff --git a/sway/commands/sticky.c b/sway/commands/sticky.c
index 3c93a276..9b09a0f9 100644
--- a/sway/commands/sticky.c
+++ b/sway/commands/sticky.c
@@ -29,14 +29,14 @@ struct cmd_results *cmd_sticky(int argc, char **argv) {
                         !container_is_scratchpad_hidden(container)) {
                 // move container to active workspace
                 struct sway_workspace *active_workspace =
-                        output_get_active_workspace(container->workspace->output);
+                        output_get_active_workspace(container->pending.workspace->output);
                 if (!sway_assert(active_workspace,
                                         "Expected output to have a workspace")) {
                         return cmd_results_new(CMD_FAILURE,
                                         "Expected output to have a workspace");
                 }
-                if (container->workspace != active_workspace) {
-                        struct sway_workspace *old_workspace = container->workspace;
+                if (container->pending.workspace != active_workspace) {
+                        struct sway_workspace *old_workspace = container->pending.workspace;
                         container_detach(container);
                         workspace_add_floating(active_workspace, container);
                         container_handle_fullscreen_reparent(container);
diff --git a/sway/commands/swap.c b/sway/commands/swap.c
index a7f9691b..d44eb006 100644
--- a/sway/commands/swap.c
+++ b/sway/commands/swap.c
@@ -5,6 +5,7 @@
 #include "sway/commands.h"
 #include "sway/output.h"
 #include "sway/tree/arrange.h"
+#include "sway/tree/container.h"
 #include "sway/tree/root.h"
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
@@ -13,180 +14,6 @@
 static const char expected_syntax[] =
         "Expected 'swap container with id|con_id|mark <arg>'";
 
-static void swap_places(struct sway_container *con1,
-                struct sway_container *con2) {
-        struct sway_container *temp = malloc(sizeof(struct sway_container));
-        temp->x = con1->x;
-        temp->y = con1->y;
-        temp->width = con1->width;
-        temp->height = con1->height;
-        temp->width_fraction = con1->width_fraction;
-        temp->height_fraction = con1->height_fraction;
-        temp->parent = con1->parent;
-        temp->workspace = con1->workspace;
-        bool temp_floating = container_is_floating(con1);
-
-        con1->x = con2->x;
-        con1->y = con2->y;
-        con1->width = con2->width;
-        con1->height = con2->height;
-        con1->width_fraction = con2->width_fraction;
-        con1->height_fraction = con2->height_fraction;
-
-        con2->x = temp->x;
-        con2->y = temp->y;
-        con2->width = temp->width;
-        con2->height = temp->height;
-        con2->width_fraction = temp->width_fraction;
-        con2->height_fraction = temp->height_fraction;
-
-        int temp_index = container_sibling_index(con1);
-        if (con2->parent) {
-                container_insert_child(con2->parent, con1,
-                                container_sibling_index(con2));
-        } else if (container_is_floating(con2)) {
-                workspace_add_floating(con2->workspace, con1);
-        } else {
-                workspace_insert_tiling(con2->workspace, con1,
-                                container_sibling_index(con2));
-        }
-        if (temp->parent) {
-                container_insert_child(temp->parent, con2, temp_index);
-        } else if (temp_floating) {
-                workspace_add_floating(temp->workspace, con2);
-        } else {
-                workspace_insert_tiling(temp->workspace, con2, temp_index);
-        }
-
-        free(temp);
-}
-
-static void swap_focus(struct sway_container *con1,
-                struct sway_container *con2, struct sway_seat *seat,
-                struct sway_container *focus) {
-        if (focus == con1 || focus == con2) {
-                struct sway_workspace *ws1 = con1->workspace;
-                struct sway_workspace *ws2 = con2->workspace;
-                enum sway_container_layout layout1 = container_parent_layout(con1);
-                enum sway_container_layout layout2 = container_parent_layout(con2);
-                if (focus == con1 && (layout2 == L_TABBED || layout2 == L_STACKED)) {
-                        if (workspace_is_visible(ws2)) {
-                                seat_set_focus(seat, &con2->node);
-                        }
-                        seat_set_focus_container(seat, ws1 != ws2 ? con2 : con1);
-                } else if (focus == con2 && (layout1 == L_TABBED
-                                        || layout1 == L_STACKED)) {
-                        if (workspace_is_visible(ws1)) {
-                                seat_set_focus(seat, &con1->node);
-                        }
-                        seat_set_focus_container(seat, ws1 != ws2 ? con1 : con2);
-                } else if (ws1 != ws2) {
-                        seat_set_focus_container(seat, focus == con1 ? con2 : con1);
-                } else {
-                        seat_set_focus_container(seat, focus);
-                }
-        } else {
-                seat_set_focus_container(seat, focus);
-        }
-
-        if (root->fullscreen_global) {
-                seat_set_focus(seat,
-                                seat_get_focus_inactive(seat, &root->fullscreen_global->node));
-        }
-}
-
-void container_swap(struct sway_container *con1, struct sway_container *con2) {
-        if (!sway_assert(con1 && con2, "Cannot swap with nothing")) {
-                return;
-        }
-        if (!sway_assert(!container_has_ancestor(con1, con2)
-                                && !container_has_ancestor(con2, con1),
-                                "Cannot swap ancestor and descendant")) {
-                return;
-        }
-
-        sway_log(SWAY_DEBUG, "Swapping containers %zu and %zu",
-                        con1->node.id, con2->node.id);
-
-        bool scratch1 = con1->scratchpad;
-        bool hidden1 = container_is_scratchpad_hidden(con1);
-        bool scratch2 = con2->scratchpad;
-        bool hidden2 = container_is_scratchpad_hidden(con2);
-        if (scratch1) {
-                if (hidden1) {
-                        root_scratchpad_show(con1);
-                }
-                root_scratchpad_remove_container(con1);
-        }
-        if (scratch2) {
-                if (hidden2) {
-                        root_scratchpad_show(con2);
-                }
-                root_scratchpad_remove_container(con2);
-        }
-
-        enum sway_fullscreen_mode fs1 = con1->fullscreen_mode;
-        enum sway_fullscreen_mode fs2 = con2->fullscreen_mode;
-        if (fs1) {
-                container_fullscreen_disable(con1);
-        }
-        if (fs2) {
-                container_fullscreen_disable(con2);
-        }
-
-        struct sway_seat *seat = config->handler_context.seat;
-        struct sway_container *focus = seat_get_focused_container(seat);
-        struct sway_workspace *vis1 =
-                output_get_active_workspace(con1->workspace->output);
-        struct sway_workspace *vis2 =
-                output_get_active_workspace(con2->workspace->output);
-        if (!sway_assert(vis1 && vis2, "con1 or con2 are on an output without a"
-                                "workspace. This should not happen")) {
-                return;
-        }
-
-        char *stored_prev_name = NULL;
-        if (seat->prev_workspace_name) {
-                stored_prev_name = strdup(seat->prev_workspace_name);
-        }
-
-        swap_places(con1, con2);
-
-        if (!workspace_is_visible(vis1)) {
-                seat_set_focus(seat, seat_get_focus_inactive(seat, &vis1->node));
-        }
-        if (!workspace_is_visible(vis2)) {
-                seat_set_focus(seat, seat_get_focus_inactive(seat, &vis2->node));
-        }
-
-        swap_focus(con1, con2, seat, focus);
-
-        if (stored_prev_name) {
-                free(seat->prev_workspace_name);
-                seat->prev_workspace_name = stored_prev_name;
-        }
-
-        if (scratch1) {
-                root_scratchpad_add_container(con2, NULL);
-                if (!hidden1) {
-                        root_scratchpad_show(con2);
-                }
-        }
-        if (scratch2) {
-                root_scratchpad_add_container(con1, NULL);
-                if (!hidden2) {
-                        root_scratchpad_show(con1);
-                }
-        }
-
-        if (fs1) {
-                container_set_fullscreen(con2, fs1);
-        }
-        if (fs2) {
-                container_set_fullscreen(con1, fs2);
-        }
-}
-
 static bool test_con_id(struct sway_container *container, void *data) {
         size_t *con_id = data;
         return container->node.id == *con_id;
@@ -219,7 +46,7 @@ struct cmd_results *cmd_swap(int argc, char **argv) {
         }
 
         if (strcasecmp(argv[0], "container") || strcasecmp(argv[1], "with")) {
-                return cmd_results_new(CMD_INVALID, expected_syntax);
+                return cmd_results_new(CMD_INVALID, "%s", expected_syntax);
         }
 
         struct sway_container *current = config->handler_context.container;
@@ -238,7 +65,7 @@ struct cmd_results *cmd_swap(int argc, char **argv) {
                 other = root_find_container(test_mark, value);
         } else {
                 free(value);
-                return cmd_results_new(CMD_INVALID, expected_syntax);
+                return cmd_results_new(CMD_INVALID, "%s", expected_syntax);
         }
 
         if (!other) {
@@ -247,6 +74,9 @@ struct cmd_results *cmd_swap(int argc, char **argv) {
         } else if (!current) {
                 error = cmd_results_new(CMD_FAILURE,
                                 "Can only swap with containers and views");
+        } else if (current == other) {
+                error = cmd_results_new(CMD_FAILURE,
+                                "Cannot swap a container with itself");
         } else if (container_has_ancestor(current, other)
                         || container_has_ancestor(other, current)) {
                 error = cmd_results_new(CMD_FAILURE,
diff --git a/sway/commands/title_align.c b/sway/commands/title_align.c
index c30355de..be298a29 100644
--- a/sway/commands/title_align.c
+++ b/sway/commands/title_align.c
@@ -4,6 +4,10 @@
 #include "sway/tree/container.h"
 #include "sway/tree/root.h"
 
+static void arrange_title_bar_iterator(struct sway_container *con, void *data) {
+        container_arrange_title_bar(con);
+}
+
 struct cmd_results *cmd_title_align(int argc, char **argv) {
         struct cmd_results *error = NULL;
         if ((error = checkarg(argc, "title_align", EXPECTED_AT_LEAST, 1))) {
@@ -21,10 +25,7 @@ struct cmd_results *cmd_title_align(int argc, char **argv) {
                                 "Expected 'title_align left|center|right'");
         }
 
-        for (int i = 0; i < root->outputs->length; ++i) {
-                struct sway_output *output = root->outputs->items[i];
-                output_damage_whole(output);
-        }
+        root_for_each_container(arrange_title_bar_iterator, NULL);
 
         return cmd_results_new(CMD_SUCCESS, NULL);
 }
diff --git a/sway/commands/title_format.c b/sway/commands/title_format.c
index 9d312470..a2446b7e 100644
--- a/sway/commands/title_format.c
+++ b/sway/commands/title_format.c
@@ -23,6 +23,5 @@ struct cmd_results *cmd_title_format(int argc, char **argv) {
         }
         view->title_format = format;
         view_update_title(view, true);
-        config_update_font_height(true);
         return cmd_results_new(CMD_SUCCESS, NULL);
 }
diff --git a/sway/commands/titlebar_border_thickness.c b/sway/commands/titlebar_border_thickness.c
index 7c27c163..fa3db3c5 100644
--- a/sway/commands/titlebar_border_thickness.c
+++ b/sway/commands/titlebar_border_thickness.c
@@ -27,7 +27,6 @@ struct cmd_results *cmd_titlebar_border_thickness(int argc, char **argv) {
                                         "Expected output to have a workspace");
                 }
                 arrange_workspace(ws);
-                output_damage_whole(output);
         }
 
         return cmd_results_new(CMD_SUCCESS, NULL);
diff --git a/sway/commands/titlebar_padding.c b/sway/commands/titlebar_padding.c
index 29ce59ff..6999f7a2 100644
--- a/sway/commands/titlebar_padding.c
+++ b/sway/commands/titlebar_padding.c
@@ -33,7 +33,6 @@ struct cmd_results *cmd_titlebar_padding(int argc, char **argv) {
         for (int i = 0; i < root->outputs->length; ++i) {
                 struct sway_output *output = root->outputs->items[i];
                 arrange_workspace(output_get_active_workspace(output));
-                output_damage_whole(output);
         }
 
         return cmd_results_new(CMD_SUCCESS, NULL);
diff --git a/sway/commands/unmark.c b/sway/commands/unmark.c
index cedfcfb2..c3a6ac4b 100644
--- a/sway/commands/unmark.c
+++ b/sway/commands/unmark.c
@@ -8,9 +8,13 @@
 #include "log.h"
 #include "stringop.h"
 
-static void remove_all_marks_iterator(struct sway_container *con, void *data) {
+static void remove_mark(struct sway_container *con) {
         container_clear_marks(con);
-        container_update_marks_textures(con);
+        container_update_marks(con);
+}
+
+static void remove_all_marks_iterator(struct sway_container *con, void *data) {
+        remove_mark(con);
 }
 
 // unmark                  Remove all marks from all views
@@ -21,7 +25,7 @@ static void remove_all_marks_iterator(struct sway_container *con, void *data) {
 struct cmd_results *cmd_unmark(int argc, char **argv) {
         // Determine the container
         struct sway_container *con = NULL;
-        if (config->handler_context.using_criteria) {
+        if (config->handler_context.node_overridden) {
                 con = config->handler_context.container;
         }
 
@@ -38,8 +42,7 @@ struct cmd_results *cmd_unmark(int argc, char **argv) {
                 }
         } else if (con && !mark) {
                 // Clear all marks from the given container
-                container_clear_marks(con);
-                container_update_marks_textures(con);
+                remove_mark(con);
         } else if (!con && mark) {
                 // Remove mark from whichever container has it
                 container_find_and_unmark(mark);
diff --git a/sway/commands/workspace.c b/sway/commands/workspace.c
index 2858a284..8536929e 100644
--- a/sway/commands/workspace.c
+++ b/sway/commands/workspace.c
@@ -61,7 +61,7 @@ static struct cmd_results *cmd_workspace_gaps(int argc, char **argv,
         const char expected[] = "Expected 'workspace <name> gaps "
                 "inner|outer|horizontal|vertical|top|right|bottom|left <px>'";
         if (gaps_location == 0) {
-                return cmd_results_new(CMD_INVALID, expected);
+                return cmd_results_new(CMD_INVALID, "%s", expected);
         }
         struct cmd_results *error = NULL;
         if ((error = checkarg(argc, "workspace", EXPECTED_EQUAL_TO,
@@ -79,7 +79,7 @@ static struct cmd_results *cmd_workspace_gaps(int argc, char **argv,
         char *end;
         int amount = strtol(argv[gaps_location + 2], &end, 10);
         if (strlen(end)) {
-                return cmd_results_new(CMD_FAILURE, expected);
+                return cmd_results_new(CMD_FAILURE, "%s", expected);
         }
 
         bool valid = false;
@@ -110,7 +110,7 @@ static struct cmd_results *cmd_workspace_gaps(int argc, char **argv,
                 }
         }
         if (!valid) {
-                return cmd_results_new(CMD_INVALID, expected);
+                return cmd_results_new(CMD_INVALID, "%s", expected);
         }
 
         // Prevent invalid gaps configurations.
@@ -158,6 +158,10 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
                         return cmd_results_new(CMD_FAILURE,
                                         "Unable to allocate workspace output");
                 }
+                if (output_location + 1 < argc) {
+                        list_free_items_and_destroy(wsc->outputs);
+                        wsc->outputs = create_list();
+                }
                 for (int i = output_location + 1; i < argc; ++i) {
                         list_add(wsc->outputs, strdup(argv[i]));
                 }
@@ -174,25 +178,20 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
                 }
 
                 if (root->fullscreen_global) {
-                        return cmd_results_new(CMD_FAILURE, "workspace",
+                        return cmd_results_new(CMD_FAILURE,
                                 "Can't switch workspaces while fullscreen global");
                 }
 
-                bool no_auto_back_and_forth = false;
+                bool auto_back_and_forth = true;
                 while (strcasecmp(argv[0], "--no-auto-back-and-forth") == 0) {
-                        no_auto_back_and_forth = true;
+                        auto_back_and_forth = false;
                         if ((error = checkarg(--argc, "workspace", EXPECTED_AT_LEAST, 1))) {
                                 return error;
                         }
                         ++argv;
                 }
 
-                bool create = argc > 1 && strcasecmp(argv[1], "--create") == 0;
                 struct sway_seat *seat = config->handler_context.seat;
-                struct sway_workspace *current = seat_get_focused_workspace(seat);
-                if (!current) {
-                        return cmd_results_new(CMD_FAILURE, "No workspace to switch from");
-                }
 
                 struct sway_workspace *ws = NULL;
                 if (strcasecmp(argv[0], "number") == 0) {
@@ -209,14 +208,15 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
                                 ws = workspace_create(NULL, name);
                                 free(name);
                         }
+                        if (ws && auto_back_and_forth) {
+                                ws = workspace_auto_back_and_forth(ws);
+                        }
                 } else if (strcasecmp(argv[0], "next") == 0 ||
                                 strcasecmp(argv[0], "prev") == 0 ||
+                                strcasecmp(argv[0], "next_on_output") == 0 ||
+                                strcasecmp(argv[0], "prev_on_output") == 0 ||
                                 strcasecmp(argv[0], "current") == 0) {
                         ws = workspace_by_name(argv[0]);
-                } else if (strcasecmp(argv[0], "next_on_output") == 0) {
-                        ws = workspace_output_next(current, create);
-                } else if (strcasecmp(argv[0], "prev_on_output") == 0) {
-                        ws = workspace_output_prev(current, create);
                 } else if (strcasecmp(argv[0], "back_and_forth") == 0) {
                         if (!seat->prev_workspace_name) {
                                 return cmd_results_new(CMD_INVALID,
@@ -231,11 +231,14 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
                                 ws = workspace_create(NULL, name);
                         }
                         free(name);
+                        if (ws && auto_back_and_forth) {
+                                ws = workspace_auto_back_and_forth(ws);
+                        }
                 }
                 if (!ws) {
                         return cmd_results_new(CMD_FAILURE, "No workspace to switch to");
                 }
-                workspace_switch(ws, no_auto_back_and_forth);
+                workspace_switch(ws);
                 seat_consider_warp_to_focus(seat);
         }
         return cmd_results_new(CMD_SUCCESS, NULL);
diff --git a/sway/config.c b/sway/config.c
index 6e665434..4b51dc73 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -26,7 +26,7 @@
 #include "sway/tree/arrange.h"
 #include "sway/tree/root.h"
 #include "sway/tree/workspace.h"
-#include "cairo.h"
+#include "cairo_util.h"
 #include "pango.h"
 #include "stringop.h"
 #include "list.h"
@@ -37,7 +37,7 @@ struct sway_config *config = NULL;
 
 static struct xkb_state *keysym_translation_state_create(
                 struct xkb_rule_names rules) {
-        struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
+        struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_SECURE_GETENV);
         struct xkb_keymap *xkb_keymap = xkb_keymap_new_from_names(
                 context,
                 &rules,
@@ -82,6 +82,12 @@ static void free_mode(struct sway_mode *mode) {
                 }
                 list_free(mode->switch_bindings);
         }
+        if (mode->gesture_bindings) {
+                for (int i = 0; i < mode->gesture_bindings->length; i++) {
+                        free_gesture_binding(mode->gesture_bindings->items[i]);
+                }
+                list_free(mode->gesture_bindings);
+        }
         free(mode);
 }
 
@@ -222,6 +228,7 @@ static void config_defaults(struct sway_config *config) {
         if (!(config->current_mode->keycode_bindings = create_list())) goto cleanup;
         if (!(config->current_mode->mouse_bindings = create_list())) goto cleanup;
         if (!(config->current_mode->switch_bindings = create_list())) goto cleanup;
+        if (!(config->current_mode->gesture_bindings = create_list())) goto cleanup;
         list_add(config->modes, config->current_mode);
 
         config->floating_mod = 0;
@@ -236,7 +243,7 @@ static void config_defaults(struct sway_config *config) {
         config->default_layout = L_NONE;
         config->default_orientation = L_NONE;
         if (!(config->font = strdup("monospace 10"))) goto cleanup;
-        config->font_height = 17; // height of monospace 10
+        config->font_description = pango_font_description_from_string(config->font);
         config->urgent_timeout = 500;
         config->focus_on_window_activation = FOWA_URGENT;
         config->popup_during_fullscreen = POPUP_SMART;
@@ -266,8 +273,9 @@ static void config_defaults(struct sway_config *config) {
         config->title_align = ALIGN_LEFT;
         config->tiling_drag = true;
         config->tiling_drag_threshold = 9;
+        config->primary_selection = true;
 
-        config->smart_gaps = false;
+        config->smart_gaps = SMART_GAPS_OFF;
         config->gaps_inner = 0;
         config->gaps_outer.top = 0;
         config->gaps_outer.right = 0;
@@ -291,6 +299,8 @@ static void config_defaults(struct sway_config *config) {
         config->hide_edge_borders_smart = ESMART_OFF;
         config->hide_lone_tab = false;
 
+        config->has_focused_tab_title = false;
+
         // border colors
         color_to_rgba(config->border_colors.focused.border, 0x4C7899FF);
         color_to_rgba(config->border_colors.focused.background, 0x285577FF);
@@ -338,35 +348,62 @@ static bool file_exists(const char *path) {
         return path && access(path, R_OK) != -1;
 }
 
+static char *config_path(const char *prefix, const char *config_folder) {
+        if (!prefix || !prefix[0] || !config_folder || !config_folder[0]) {
+                return NULL;
+        }
+
+        const char *filename = "config";
+
+        size_t size = 3 + strlen(prefix) + strlen(config_folder) + strlen(filename);
+        char *path = calloc(size, sizeof(char));
+        snprintf(path, size, "%s/%s/%s", prefix, config_folder, filename);
+        return path;
+}
+
 static char *get_config_path(void) {
-        static const char *config_paths[] = {
-                "$HOME/.sway/config",
-                "$XDG_CONFIG_HOME/sway/config",
-                "$HOME/.i3/config",
-                "$XDG_CONFIG_HOME/i3/config",
-                SYSCONFDIR "/sway/config",
-                SYSCONFDIR "/i3/config",
+        char *path = NULL;
+        const char *home = getenv("HOME");
+        char *config_home_fallback = NULL;
+
+        const char *config_home = getenv("XDG_CONFIG_HOME");
+        if ((config_home == NULL || config_home[0] == '\0') && home != NULL) {
+                size_t size_fallback = 1 + strlen(home) + strlen("/.config");
+                config_home_fallback = calloc(size_fallback, sizeof(char));
+                if (config_home_fallback != NULL)
+                        snprintf(config_home_fallback, size_fallback, "%s/.config", home);
+                config_home = config_home_fallback;
+        }
+
+        struct config_path {
+                const char *prefix;
+                const char *config_folder;
         };
 
-        char *config_home = getenv("XDG_CONFIG_HOME");
-        if (!config_home || !*config_home) {
-                config_paths[1] = "$HOME/.config/sway/config";
-                config_paths[3] = "$HOME/.config/i3/config";
-        }
+        struct config_path config_paths[] = {
+                { .prefix = home, .config_folder = ".sway"},
+                { .prefix = config_home, .config_folder = "sway"},
+                { .prefix = home, .config_folder = ".i3"},
+                { .prefix = config_home, .config_folder = "i3"},
+                { .prefix = SYSCONFDIR, .config_folder = "sway"},
+                { .prefix = SYSCONFDIR, .config_folder = "i3"}
+        };
 
-        for (size_t i = 0; i < sizeof(config_paths) / sizeof(char *); ++i) {
-                wordexp_t p;
-                if (wordexp(config_paths[i], &p, WRDE_UNDEF) == 0) {
-                        char *path = strdup(p.we_wordv[0]);
-                        wordfree(&p);
-                        if (file_exists(path)) {
-                                return path;
-                        }
-                        free(path);
+        size_t num_config_paths = sizeof(config_paths)/sizeof(config_paths[0]);
+        for (size_t i = 0; i < num_config_paths; i++) {
+                path = config_path(config_paths[i].prefix, config_paths[i].config_folder);
+                if (!path) {
+                        continue;
                 }
+                if (file_exists(path)) {
+                        break;
+                }
+                free(path);
+                path = NULL;
         }
 
-        return NULL;
+        free(config_home_fallback);
+        return path;
 }
 
 static bool load_config(const char *path, struct sway_config *config,
@@ -514,6 +551,9 @@ bool load_main_config(const char *file, bool is_active, bool validating) {
                 return success;
         }
 
+        // Only really necessary if not explicitly `font` is set in the config.
+        config_update_font_height();
+
         if (is_active && !validating) {
                 input_manager_verify_fallback_seat();
 
@@ -884,23 +924,18 @@ void config_add_swaynag_warning(char *fmt, ...) {
         if (config->reading && !config->validating) {
                 va_list args;
                 va_start(args, fmt);
-                size_t length = vsnprintf(NULL, 0, fmt, args) + 1;
+                char *str = vformat_str(fmt, args);
                 va_end(args);
-
-                char *temp = malloc(length + 1);
-                if (!temp) {
-                        sway_log(SWAY_ERROR, "Failed to allocate buffer for warning.");
+                if (str == NULL) {
                         return;
                 }
 
-                va_start(args, fmt);
-                vsnprintf(temp, length, fmt, args);
-                va_end(args);
-
                 swaynag_log(config->swaynag_command, &config->swaynag_config_errors,
                         "Warning on line %i (%s) '%s': %s",
                         config->current_config_line_number, config->current_config_path,
-                        config->current_config_line, temp);
+                        config->current_config_line, str);
+
+                free(str);
         }
 }
 
@@ -940,7 +975,7 @@ char *do_var_replacement(char *str) {
                                 int offset = find - str;
                                 strncpy(newptr, str, offset);
                                 newptr += offset;
-                                strncpy(newptr, var->value, vvlen);
+                                memcpy(newptr, var->value, vvlen);
                                 newptr += vvlen;
                                 strcpy(newptr, find + vnlen);
                                 free(str);
@@ -964,31 +999,11 @@ int workspace_output_cmp_workspace(const void *a, const void *b) {
         return lenient_strcmp(wsa->workspace, wsb->workspace);
 }
 
-static void find_font_height_iterator(struct sway_container *con, void *data) {
-        size_t amount_below_baseline = con->title_height - con->title_baseline;
-        size_t extended_height = config->font_baseline + amount_below_baseline;
-        if (extended_height > config->font_height) {
-                config->font_height = extended_height;
-        }
-}
-
-static void find_baseline_iterator(struct sway_container *con, void *data) {
-        bool *recalculate = data;
-        if (*recalculate) {
-                container_calculate_title_height(con);
-        }
-        if (con->title_baseline > config->font_baseline) {
-                config->font_baseline = con->title_baseline;
-        }
-}
 
-void config_update_font_height(bool recalculate) {
-        size_t prev_max_height = config->font_height;
-        config->font_height = 0;
-        config->font_baseline = 0;
+void config_update_font_height(void) {
+        int prev_max_height = config->font_height;
 
-        root_for_each_container(find_baseline_iterator, &recalculate);
-        root_for_each_container(find_font_height_iterator, NULL);
+        get_text_metrics(config->font_description, &config->font_height, &config->font_baseline);
 
         if (config->font_height != prev_max_height) {
                 arrange_root();
diff --git a/sway/config/bar.c b/sway/config/bar.c
index 767534a6..a8389244 100644
--- a/sway/config/bar.c
+++ b/sway/config/bar.c
@@ -91,7 +91,7 @@ struct bar_config *default_bar_config(void) {
         }
         bar->outputs = NULL;
         bar->position = strdup("bottom");
-        bar->pango_markup = false;
+        bar->pango_markup = PANGO_MARKUP_DEFAULT;
         bar->swaybar_command = NULL;
         bar->font = NULL;
         bar->height = 0;
@@ -217,6 +217,9 @@ static void invoke_swaybar(struct bar_config *bar) {
                 sigset_t set;
                 sigemptyset(&set);
                 sigprocmask(SIG_SETMASK, &set, NULL);
+                signal(SIGPIPE, SIG_DFL);
+
+                restore_nofile_limit();
 
                 pid = fork();
                 if (pid < 0) {
@@ -253,7 +256,6 @@ static void invoke_swaybar(struct bar_config *bar) {
         }
 
         sway_log(SWAY_DEBUG, "Spawned swaybar %s", bar->id);
-        return;
 }
 
 void load_swaybar(struct bar_config *bar) {
diff --git a/sway/config/input.c b/sway/config/input.c
index a998e170..44c2be28 100644
--- a/sway/config/input.c
+++ b/sway/config/input.c
@@ -25,14 +25,17 @@ struct input_config *new_input_config(const char* identifier) {
         input->drag = INT_MIN;
         input->drag_lock = INT_MIN;
         input->dwt = INT_MIN;
+        input->dwtp = INT_MIN;
         input->send_events = INT_MIN;
         input->click_method = INT_MIN;
         input->middle_emulation = INT_MIN;
         input->natural_scroll = INT_MIN;
         input->accel_profile = INT_MIN;
+        input->rotation_angle = FLT_MIN;
         input->pointer_accel = FLT_MIN;
         input->scroll_factor = FLT_MIN;
         input->scroll_button = INT_MIN;
+        input->scroll_button_lock = INT_MIN;
         input->scroll_method = INT_MIN;
         input->left_handed = INT_MIN;
         input->repeat_delay = INT_MIN;
@@ -61,6 +64,9 @@ void merge_input_config(struct input_config *dst, struct input_config *src) {
         if (src->dwt != INT_MIN) {
                 dst->dwt = src->dwt;
         }
+        if (src->dwtp != INT_MIN) {
+                dst->dwtp = src->dwtp;
+        }
         if (src->left_handed != INT_MIN) {
                 dst->left_handed = src->left_handed;
         }
@@ -70,6 +76,9 @@ void merge_input_config(struct input_config *dst, struct input_config *src) {
         if (src->natural_scroll != INT_MIN) {
                 dst->natural_scroll = src->natural_scroll;
         }
+        if (src->rotation_angle != FLT_MIN) {
+                dst->rotation_angle = src->rotation_angle;
+        }
         if (src->pointer_accel != FLT_MIN) {
                 dst->pointer_accel = src->pointer_accel;
         }
@@ -88,6 +97,9 @@ void merge_input_config(struct input_config *dst, struct input_config *src) {
         if (src->scroll_button != INT_MIN) {
                 dst->scroll_button = src->scroll_button;
         }
+        if (src->scroll_button_lock != INT_MIN) {
+                dst->scroll_button_lock = src->scroll_button_lock;
+        }
         if (src->send_events != INT_MIN) {
                 dst->send_events = src->send_events;
         }
diff --git a/sway/config/output.c b/sway/config/output.c
index c9ec6745..1a5215fe 100644
--- a/sway/config/output.c
+++ b/sway/config/output.c
@@ -1,10 +1,12 @@
 #define _POSIX_C_SOURCE 200809L
 #include <assert.h>
+#include <drm_fourcc.h>
 #include <stdbool.h>
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
 #include <unistd.h>
+#include <wlr/config.h>
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_output.h>
@@ -15,6 +17,10 @@
 #include "log.h"
 #include "util.h"
 
+#if WLR_HAS_DRM_BACKEND
+#include <wlr/backend/drm.h>
+#endif
+
 int output_name_cmp(const void *item, const void *data) {
         const struct output_config *output = item;
         const char *name = data;
@@ -25,8 +31,10 @@ int output_name_cmp(const void *item, const void *data) {
 void output_get_identifier(char *identifier, size_t len,
                 struct sway_output *output) {
         struct wlr_output *wlr_output = output->wlr_output;
-        snprintf(identifier, len, "%s %s %s", wlr_output->make, wlr_output->model,
-                wlr_output->serial);
+        snprintf(identifier, len, "%s %s %s",
+                wlr_output->make ? wlr_output->make : "Unknown",
+                wlr_output->model ? wlr_output->model : "Unknown",
+                wlr_output->serial ? wlr_output->serial : "Unknown");
 }
 
 const char *sway_output_scale_filter_to_string(enum scale_filter_mode scale_filter) {
@@ -58,6 +66,7 @@ struct output_config *new_output_config(const char *name) {
         oc->width = oc->height = -1;
         oc->refresh_rate = -1;
         oc->custom_mode = -1;
+        oc->drm_mode.type = -1;
         oc->x = oc->y = -1;
         oc->scale = -1;
         oc->scale_filter = SCALE_FILTER_DEFAULT;
@@ -65,6 +74,8 @@ struct output_config *new_output_config(const char *name) {
         oc->subpixel = WL_OUTPUT_SUBPIXEL_UNKNOWN;
         oc->max_render_time = -1;
         oc->adaptive_sync = -1;
+        oc->render_bit_depth = RENDER_BIT_DEPTH_DEFAULT;
+        oc->power = -1;
         return oc;
 }
 
@@ -99,6 +110,9 @@ void merge_output_config(struct output_config *dst, struct output_config *src) {
         if (src->custom_mode != -1) {
                 dst->custom_mode = src->custom_mode;
         }
+        if (src->drm_mode.type != (uint32_t) -1) {
+                memcpy(&dst->drm_mode, &src->drm_mode, sizeof(src->drm_mode));
+        }
         if (src->transform != -1) {
                 dst->transform = src->transform;
         }
@@ -108,6 +122,9 @@ void merge_output_config(struct output_config *dst, struct output_config *src) {
         if (src->adaptive_sync != -1) {
                 dst->adaptive_sync = src->adaptive_sync;
         }
+        if (src->render_bit_depth != RENDER_BIT_DEPTH_DEFAULT) {
+                dst->render_bit_depth = src->render_bit_depth;
+        }
         if (src->background) {
                 free(dst->background);
                 dst->background = strdup(src->background);
@@ -120,8 +137,8 @@ void merge_output_config(struct output_config *dst, struct output_config *src) {
                 free(dst->background_fallback);
                 dst->background_fallback = strdup(src->background_fallback);
         }
-        if (src->dpms_state != 0) {
-                dst->dpms_state = src->dpms_state;
+        if (src->power != -1) {
+                dst->power = src->power;
         }
 }
 
@@ -136,25 +153,16 @@ static void merge_wildcard_on_all(struct output_config *wildcard) {
 }
 
 static void merge_id_on_name(struct output_config *oc) {
-        char *id_on_name = NULL;
-        char id[128];
-        char *name = NULL;
-        struct sway_output *output;
-        wl_list_for_each(output, &root->all_outputs, link) {
-                name = output->wlr_output->name;
-                output_get_identifier(id, sizeof(id), output);
-                if (strcmp(name, oc->name) == 0 || strcmp(id, oc->name) == 0) {
-                        size_t length = snprintf(NULL, 0, "%s on %s", id, name) + 1;
-                        id_on_name = malloc(length);
-                        if (!id_on_name) {
-                                sway_log(SWAY_ERROR, "Failed to allocate id on name string");
-                                return;
-                        }
-                        snprintf(id_on_name, length, "%s on %s", id, name);
-                        break;
-                }
+        struct sway_output *output = all_output_by_name_or_id(oc->name);
+        if (output == NULL) {
+                return;
         }
 
+        const char *name = output->wlr_output->name;
+        char id[128];
+        output_get_identifier(id, sizeof(id), output);
+
+        char *id_on_name = format_str("%s on %s", id, name);
         if (!id_on_name) {
                 return;
         }
@@ -180,11 +188,11 @@ static void merge_id_on_name(struct output_config *oc) {
                         list_add(config->output_configs, ion_oc);
                         sway_log(SWAY_DEBUG, "Generated id on name output config \"%s\""
                                 " (enabled: %d) (%dx%d@%fHz position %d,%d scale %f "
-                                "transform %d) (bg %s %s) (dpms %d) (max render time: %d)",
+                                "transform %d) (bg %s %s) (power %d) (max render time: %d)",
                                 ion_oc->name, ion_oc->enabled, ion_oc->width, ion_oc->height,
                                 ion_oc->refresh_rate, ion_oc->x, ion_oc->y, ion_oc->scale,
                                 ion_oc->transform, ion_oc->background,
-                                ion_oc->background_option, ion_oc->dpms_state,
+                                ion_oc->background_option, ion_oc->power,
                                 ion_oc->max_render_time);
                 }
         }
@@ -225,50 +233,74 @@ struct output_config *store_output_config(struct output_config *oc) {
         }
 
         sway_log(SWAY_DEBUG, "Config stored for output %s (enabled: %d) (%dx%d@%fHz "
-                "position %d,%d scale %f subpixel %s transform %d) (bg %s %s) (dpms %d) "
+                "position %d,%d scale %f subpixel %s transform %d) (bg %s %s) (power %d) "
                 "(max render time: %d)",
                 oc->name, oc->enabled, oc->width, oc->height, oc->refresh_rate,
                 oc->x, oc->y, oc->scale, sway_wl_output_subpixel_to_string(oc->subpixel),
-                oc->transform, oc->background, oc->background_option, oc->dpms_state,
+                oc->transform, oc->background, oc->background_option, oc->power,
                 oc->max_render_time);
 
         return oc;
 }
 
-static void set_mode(struct wlr_output *output, int width, int height,
-                float refresh_rate, bool custom) {
+static void set_mode(struct wlr_output *output, struct wlr_output_state *pending,
+                int width, int height, float refresh_rate, bool custom) {
         // Not all floating point integers can be represented exactly
         // as (int)(1000 * mHz / 1000.f)
         // round() the result to avoid any error
-        int mhz = (int)round(refresh_rate * 1000);
+        int mhz = (int)roundf(refresh_rate * 1000);
+        // If no target refresh rate is given, match highest available
+        mhz = mhz <= 0 ? INT_MAX : mhz;
 
         if (wl_list_empty(&output->modes) || custom) {
                 sway_log(SWAY_DEBUG, "Assigning custom mode to %s", output->name);
-                wlr_output_set_custom_mode(output, width, height,
+                wlr_output_state_set_custom_mode(pending, width, height,
                         refresh_rate > 0 ? mhz : 0);
                 return;
         }
 
         struct wlr_output_mode *mode, *best = NULL;
+        int best_diff_mhz = INT_MAX;
         wl_list_for_each(mode, &output->modes, link) {
                 if (mode->width == width && mode->height == height) {
-                        if (mode->refresh == mhz) {
-                                best = mode;
-                                break;
-                        }
-                        if (best == NULL || mode->refresh > best->refresh) {
+                        int diff_mhz = abs(mode->refresh - mhz);
+                        if (diff_mhz < best_diff_mhz) {
+                                best_diff_mhz = diff_mhz;
                                 best = mode;
+                                if (best_diff_mhz == 0) {
+                                        break;
+                                }
                         }
                 }
         }
-        if (!best) {
-                sway_log(SWAY_ERROR, "Configured mode for %s not available", output->name);
-                sway_log(SWAY_INFO, "Picking preferred mode instead");
-                best = wlr_output_preferred_mode(output);
+        if (best) {
+                sway_log(SWAY_INFO, "Assigning configured mode (%dx%d@%.3fHz) to %s",
+                        best->width, best->height, best->refresh / 1000.f, output->name);
         } else {
-                sway_log(SWAY_DEBUG, "Assigning configured mode to %s", output->name);
+                best = wlr_output_preferred_mode(output);
+                sway_log(SWAY_INFO, "Configured mode (%dx%d@%.3fHz) not available, "
+                        "applying preferred mode (%dx%d@%.3fHz)",
+                        width, height, refresh_rate,
+                        best->width, best->height, best->refresh / 1000.f);
         }
-        wlr_output_set_mode(output, best);
+        wlr_output_state_set_mode(pending, best);
+}
+
+static void set_modeline(struct wlr_output *output,
+                struct wlr_output_state *pending, drmModeModeInfo *drm_mode) {
+#if WLR_HAS_DRM_BACKEND
+        if (!wlr_output_is_drm(output)) {
+                sway_log(SWAY_ERROR, "Modeline can only be set to DRM output");
+                return;
+        }
+        sway_log(SWAY_DEBUG, "Assigning custom modeline to %s", output->name);
+        struct wlr_output_mode *mode = wlr_drm_connector_add_mode(output, drm_mode);
+        if (mode) {
+                wlr_output_state_set_mode(pending, mode);
+        }
+#else
+        sway_log(SWAY_ERROR, "Modeline can only be set to DRM output");
+#endif
 }
 
 /* Some manufacturers hardcode the aspect-ratio of the output in the physical
@@ -289,23 +321,24 @@ static bool phys_size_is_aspect_ratio(struct wlr_output *output) {
 // 1 inch = 25.4 mm
 #define MM_PER_INCH 25.4
 
-static int compute_default_scale(struct wlr_output *output) {
+static int compute_default_scale(struct wlr_output *output,
+                struct wlr_output_state *pending) {
         struct wlr_box box = { .width = output->width, .height = output->height };
-        if (output->pending.committed & WLR_OUTPUT_STATE_MODE) {
-                switch (output->pending.mode_type) {
+        if (pending->committed & WLR_OUTPUT_STATE_MODE) {
+                switch (pending->mode_type) {
                 case WLR_OUTPUT_STATE_MODE_FIXED:
-                        box.width = output->pending.mode->width;
-                        box.height = output->pending.mode->height;
+                        box.width = pending->mode->width;
+                        box.height = pending->mode->height;
                         break;
                 case WLR_OUTPUT_STATE_MODE_CUSTOM:
-                        box.width = output->pending.custom_mode.width;
-                        box.height = output->pending.custom_mode.height;
+                        box.width = pending->custom_mode.width;
+                        box.height = pending->custom_mode.height;
                         break;
                 }
         }
         enum wl_output_transform transform = output->transform;
-        if (output->pending.committed & WLR_OUTPUT_STATE_TRANSFORM) {
-                transform = output->pending.transform;
+        if (pending->committed & WLR_OUTPUT_STATE_TRANSFORM) {
+                transform = pending->transform;
         }
         wlr_box_transform(&box, &box, transform, box.width, box.height);
 
@@ -334,42 +367,90 @@ static int compute_default_scale(struct wlr_output *output) {
         return 2;
 }
 
+/* Lists of formats to try, in order, when a specific render bit depth has
+ * been asked for. The second to last format in each list should always
+ * be XRGB8888, as a reliable backup in case the others are not available;
+ * the last should be DRM_FORMAT_INVALID, to indicate the end of the list. */
+static const uint32_t *bit_depth_preferences[] = {
+        [RENDER_BIT_DEPTH_8] = (const uint32_t []){
+                DRM_FORMAT_XRGB8888,
+                DRM_FORMAT_INVALID,
+        },
+        [RENDER_BIT_DEPTH_10] = (const uint32_t []){
+                DRM_FORMAT_XRGB2101010,
+                DRM_FORMAT_XBGR2101010,
+                DRM_FORMAT_XRGB8888,
+                DRM_FORMAT_INVALID,
+        },
+};
+
 static void queue_output_config(struct output_config *oc,
-                struct sway_output *output) {
-        if (output == root->noop_output) {
+                struct sway_output *output, struct wlr_output_state *pending) {
+        if (output == root->fallback_output) {
                 return;
         }
 
         struct wlr_output *wlr_output = output->wlr_output;
 
-        if (oc && (!oc->enabled || oc->dpms_state == DPMS_OFF)) {
+        if (oc && (!oc->enabled || oc->power == 0)) {
                 sway_log(SWAY_DEBUG, "Turning off output %s", wlr_output->name);
-                wlr_output_enable(wlr_output, false);
+                wlr_output_state_set_enabled(pending, false);
                 return;
         }
 
         sway_log(SWAY_DEBUG, "Turning on output %s", wlr_output->name);
-        wlr_output_enable(wlr_output, true);
+        wlr_output_state_set_enabled(pending, true);
 
-        if (oc && oc->width > 0 && oc->height > 0) {
+        if (oc && oc->drm_mode.type != 0 && oc->drm_mode.type != (uint32_t) -1) {
+                sway_log(SWAY_DEBUG, "Set %s modeline",
+                        wlr_output->name);
+                set_modeline(wlr_output, pending, &oc->drm_mode);
+        } else if (oc && oc->width > 0 && oc->height > 0) {
                 sway_log(SWAY_DEBUG, "Set %s mode to %dx%d (%f Hz)",
                         wlr_output->name, oc->width, oc->height, oc->refresh_rate);
-                set_mode(wlr_output, oc->width, oc->height,
+                set_mode(wlr_output, pending, oc->width, oc->height,
                         oc->refresh_rate, oc->custom_mode == 1);
         } else if (!wl_list_empty(&wlr_output->modes)) {
-                struct wlr_output_mode *mode = wlr_output_preferred_mode(wlr_output);
-                wlr_output_set_mode(wlr_output, mode);
+                sway_log(SWAY_DEBUG, "Set preferred mode");
+                struct wlr_output_mode *preferred_mode =
+                        wlr_output_preferred_mode(wlr_output);
+                wlr_output_state_set_mode(pending, preferred_mode);
+
+                if (!wlr_output_test_state(wlr_output, pending)) {
+                        sway_log(SWAY_DEBUG, "Preferred mode rejected, "
+                                "falling back to another mode");
+                        struct wlr_output_mode *mode;
+                        wl_list_for_each(mode, &wlr_output->modes, link) {
+                                if (mode == preferred_mode) {
+                                        continue;
+                                }
+
+                                wlr_output_state_set_mode(pending, mode);
+                                if (wlr_output_test_state(wlr_output, pending)) {
+                                        break;
+                                }
+                        }
+                }
         }
 
         if (oc && (oc->subpixel != WL_OUTPUT_SUBPIXEL_UNKNOWN || config->reloading)) {
                 sway_log(SWAY_DEBUG, "Set %s subpixel to %s", oc->name,
                         sway_wl_output_subpixel_to_string(oc->subpixel));
-                wlr_output_set_subpixel(wlr_output, oc->subpixel);
+                wlr_output_state_set_subpixel(pending, oc->subpixel);
         }
 
+        enum wl_output_transform tr = WL_OUTPUT_TRANSFORM_NORMAL;
         if (oc && oc->transform >= 0) {
-                sway_log(SWAY_DEBUG, "Set %s transform to %d", oc->name, oc->transform);
-                wlr_output_set_transform(wlr_output, oc->transform);
+                tr = oc->transform;
+#if WLR_HAS_DRM_BACKEND
+        } else if (wlr_output_is_drm(wlr_output)) {
+                tr = wlr_drm_connector_get_panel_orientation(wlr_output);
+                sway_log(SWAY_DEBUG, "Auto-detected output transform: %d", tr);
+#endif
+        }
+        if (wlr_output->transform != tr) {
+                sway_log(SWAY_DEBUG, "Set %s transform to %d", oc->name, tr);
+                wlr_output_state_set_transform(pending, tr);
         }
 
         // Apply the scale last before the commit, because the scale auto-detection
@@ -377,24 +458,54 @@ static void queue_output_config(struct output_config *oc,
         float scale;
         if (oc && oc->scale > 0) {
                 scale = oc->scale;
+
+                // The factional-scale-v1 protocol uses increments of 120ths to send
+                // the scale factor to the client. Adjust the scale so that we use the
+                // same value as the clients'.
+                float adjusted_scale = round(scale * 120) / 120;
+                if (scale != adjusted_scale) {
+                        sway_log(SWAY_INFO, "Adjusting output scale from %f to %f",
+                                scale, adjusted_scale);
+                        scale = adjusted_scale;
+                }
         } else {
-                scale = compute_default_scale(wlr_output);
+                scale = compute_default_scale(wlr_output, pending);
                 sway_log(SWAY_DEBUG, "Auto-detected output scale: %f", scale);
         }
         if (scale != wlr_output->scale) {
                 sway_log(SWAY_DEBUG, "Set %s scale to %f", wlr_output->name, scale);
-                wlr_output_set_scale(wlr_output, scale);
+                wlr_output_state_set_scale(pending, scale);
         }
 
         if (oc && oc->adaptive_sync != -1) {
                 sway_log(SWAY_DEBUG, "Set %s adaptive sync to %d", wlr_output->name,
                         oc->adaptive_sync);
-                wlr_output_enable_adaptive_sync(wlr_output, oc->adaptive_sync == 1);
+                wlr_output_state_set_adaptive_sync_enabled(pending, oc->adaptive_sync == 1);
+                if (oc->adaptive_sync == 1 && !wlr_output_test_state(wlr_output, pending)) {
+                        sway_log(SWAY_DEBUG, "Adaptive sync failed, ignoring");
+                        wlr_output_state_set_adaptive_sync_enabled(pending, false);
+                }
+        }
+
+        if (oc && oc->render_bit_depth != RENDER_BIT_DEPTH_DEFAULT) {
+                const uint32_t *fmts = bit_depth_preferences[oc->render_bit_depth];
+                assert(fmts);
+
+                for (size_t i = 0; fmts[i] != DRM_FORMAT_INVALID; i++) {
+                        wlr_output_state_set_render_format(pending, fmts[i]);
+                        if (wlr_output_test_state(wlr_output, pending)) {
+                                break;
+                        }
+
+                        sway_log(SWAY_DEBUG, "Preferred output format 0x%08x "
+                                "failed to work, falling back to next in "
+                                "list, 0x%08x", fmts[i], fmts[i + 1]);
+                }
         }
 }
 
 bool apply_output_config(struct output_config *oc, struct sway_output *output) {
-        if (output == root->noop_output) {
+        if (output == root->fallback_output) {
                 return false;
         }
 
@@ -403,14 +514,11 @@ bool apply_output_config(struct output_config *oc, struct sway_output *output) {
         // Flag to prevent the output mode event handler from calling us
         output->enabling = (!oc || oc->enabled);
 
-        queue_output_config(oc, output);
-
-        if (!oc || oc->dpms_state != DPMS_OFF) {
-                output->current_mode = wlr_output->pending.mode;
-        }
+        struct wlr_output_state pending = {0};
+        queue_output_config(oc, output, &pending);
 
         sway_log(SWAY_DEBUG, "Committing output %s", wlr_output->name);
-        if (!wlr_output_commit(wlr_output)) {
+        if (!wlr_output_commit_state(wlr_output, &pending)) {
                 // Failed to commit output changes, maybe the output is missing a CRTC.
                 // Leave the output disabled for now and try again when the output gets
                 // the mode we asked for.
@@ -430,10 +538,6 @@ bool apply_output_config(struct output_config *oc, struct sway_output *output) {
                 return true;
         }
 
-        if (config->reloading) {
-                output_damage_whole(output);
-        }
-
         if (oc) {
                 enum scale_filter_mode scale_filter_old = output->scale_filter;
                 switch (oc->scale_filter) {
@@ -450,6 +554,7 @@ bool apply_output_config(struct output_config *oc, struct sway_output *output) {
                 if (scale_filter_old != output->scale_filter) {
                         sway_log(SWAY_DEBUG, "Set %s scale_filter to %s", oc->name,
                                 sway_output_scale_filter_to_string(output->scale_filter));
+                        wlr_damage_ring_add_whole(&output->scene_output->damage_ring);
                 }
         }
 
@@ -462,12 +567,12 @@ bool apply_output_config(struct output_config *oc, struct sway_output *output) {
         }
 
         // Update output->{lx, ly, width, height}
-        struct wlr_box *output_box =
-                wlr_output_layout_get_box(root->output_layout, wlr_output);
-        output->lx = output_box->x;
-        output->ly = output_box->y;
-        output->width = output_box->width;
-        output->height = output_box->height;
+        struct wlr_box output_box;
+        wlr_output_layout_get_box(root->output_layout, wlr_output, &output_box);
+        output->lx = output_box.x;
+        output->ly = output_box.y;
+        output->width = output_box.width;
+        output->height = output_box.height;
 
         if (!output->enabled) {
                 output_enable(output);
@@ -482,24 +587,26 @@ bool apply_output_config(struct output_config *oc, struct sway_output *output) {
         // Reconfigure all devices, since input config may have been applied before
         // this output came online, and some config items (like map_to_output) are
         // dependent on an output being present.
-        input_manager_configure_all_inputs();
+        input_manager_configure_all_input_mappings();
+        // Reconfigure the cursor images, since the scale may have changed.
+        input_manager_configure_xcursor();
         return true;
 }
 
 bool test_output_config(struct output_config *oc, struct sway_output *output) {
-        if (output == root->noop_output) {
+        if (output == root->fallback_output) {
                 return false;
         }
 
-        queue_output_config(oc, output);
-        bool ok = wlr_output_test(output->wlr_output);
-        wlr_output_rollback(output->wlr_output);
-        return ok;
+        struct wlr_output_state pending = {0};
+        queue_output_config(oc, output, &pending);
+        return wlr_output_test_state(output->wlr_output, &pending);
 }
 
 static void default_output_config(struct output_config *oc,
                 struct wlr_output *wlr_output) {
         oc->enabled = 1;
+        oc->power = 1;
         struct wlr_output_mode *mode = wlr_output_preferred_mode(wlr_output);
         if (mode != NULL) {
                 oc->width = mode->width;
@@ -512,7 +619,6 @@ static void default_output_config(struct output_config *oc,
         struct sway_output *output = wlr_output->data;
         oc->subpixel = output->detected_subpixel;
         oc->transform = WL_OUTPUT_TRANSFORM_NORMAL;
-        oc->dpms_state = DPMS_ON;
         oc->max_render_time = 0;
 }
 
@@ -524,9 +630,7 @@ static struct output_config *get_output_config(char *identifier,
         struct output_config *oc_name = NULL;
         struct output_config *oc_id = NULL;
 
-        size_t length = snprintf(NULL, 0, "%s on %s", identifier, name) + 1;
-        char *id_on_name = malloc(length);
-        snprintf(id_on_name, length, "%s on %s", identifier, name);
+        char *id_on_name = format_str("%s on %s", identifier, name);
         int i = list_seq_find(config->output_configs, output_name_cmp, id_on_name);
         if (i >= 0) {
                 oc_id_on_name = config->output_configs->items[i];
@@ -567,10 +671,10 @@ static struct output_config *get_output_config(char *identifier,
 
                 sway_log(SWAY_DEBUG, "Generated output config \"%s\" (enabled: %d)"
                         " (%dx%d@%fHz position %d,%d scale %f transform %d) (bg %s %s)"
-                        " (dpms %d) (max render time: %d)", result->name, result->enabled,
+                        " (power %d) (max render time: %d)", result->name, result->enabled,
                         result->width, result->height, result->refresh_rate,
                         result->x, result->y, result->scale, result->transform,
-                        result->background, result->background_option, result->dpms_state,
+                        result->background, result->background_option, result->power,
                         result->max_render_time);
         } else if (oc_name) {
                 // No identifier config, just return a copy of the name config
@@ -613,12 +717,11 @@ void apply_output_config_to_outputs(struct output_config *oc) {
         // this is during startup then there will be no container and config
         // will be applied during normal "new output" event from wlroots.
         bool wildcard = strcmp(oc->name, "*") == 0;
-        char id[128];
         struct sway_output *sway_output, *tmp;
         wl_list_for_each_safe(sway_output, tmp, &root->all_outputs, link) {
-                char *name = sway_output->wlr_output->name;
-                output_get_identifier(id, sizeof(id), sway_output);
-                if (wildcard || !strcmp(name, oc->name) || !strcmp(id, oc->name)) {
+                if (output_match_name_or_id(sway_output, oc->name)) {
+                        char id[128];
+                        output_get_identifier(id, sizeof(id), sway_output);
                         struct output_config *current = get_output_config(id, sway_output);
                         if (!current) {
                                 // No stored output config matched, apply oc directly
@@ -702,6 +805,8 @@ static bool _spawn_swaybg(char **command) {
                 sway_log_errno(SWAY_ERROR, "fork failed");
                 return false;
         } else if (pid == 0) {
+                restore_nofile_limit();
+
                 pid = fork();
                 if (pid < 0) {
                         sway_log_errno(SWAY_ERROR, "fork failed");
diff --git a/sway/config/seat.c b/sway/config/seat.c
index 84260aa3..6d5d91ae 100644
--- a/sway/config/seat.c
+++ b/sway/config/seat.c
@@ -99,7 +99,6 @@ static void seat_attachment_config_free(
                 struct seat_attachment_config *attachment) {
         free(attachment->identifier);
         free(attachment);
-        return;
 }
 
 static struct seat_attachment_config *seat_attachment_config_copy(
diff --git a/sway/criteria.c b/sway/criteria.c
index 409160c5..78ea8b8a 100644
--- a/sway/criteria.c
+++ b/sway/criteria.c
@@ -3,7 +3,8 @@
 #include <stdio.h>
 #include <stdbool.h>
 #include <strings.h>
-#include <pcre.h>
+#define PCRE2_CODE_UNIT_WIDTH 8
+#include <pcre2.h>
 #include "sway/criteria.h"
 #include "sway/tree/container.h"
 #include "sway/config.h"
@@ -18,6 +19,7 @@
 bool criteria_is_empty(struct criteria *criteria) {
         return !criteria->title
                 && !criteria->shell
+                && !criteria->all
                 && !criteria->app_id
                 && !criteria->con_mark
                 && !criteria->con_id
@@ -40,17 +42,19 @@ bool criteria_is_empty(struct criteria *criteria) {
 char *error = NULL;
 
 // Returns error string on failure or NULL otherwise.
-static bool generate_regex(pcre **regex, char *value) {
-        const char *reg_err;
-        int offset;
-
-        *regex = pcre_compile(value, PCRE_UTF8 | PCRE_UCP, &reg_err, &offset, NULL);
+static bool generate_regex(pcre2_code **regex, char *value) {
+        int errorcode;
+        PCRE2_SIZE offset;
 
+        *regex = pcre2_compile((PCRE2_SPTR)value, PCRE2_ZERO_TERMINATED, PCRE2_UTF | PCRE2_UCP, &errorcode, &offset, NULL);
         if (!*regex) {
+                PCRE2_UCHAR buffer[256];
+                pcre2_get_error_message(errorcode, buffer, sizeof(buffer));
+
                 const char *fmt = "Regex compilation for '%s' failed: %s";
-                int len = strlen(fmt) + strlen(value) + strlen(reg_err) - 3;
+                int len = strlen(fmt) + strlen(value) + strlen((char*) buffer) - 3;
                 error = malloc(len);
-                snprintf(error, len, fmt, value, reg_err);
+                snprintf(error, len, fmt, value, buffer);
                 return false;
         }
 
@@ -66,7 +70,7 @@ static bool pattern_create(struct pattern **pattern, char *value) {
         if (strcmp(value, "__focused__") == 0) {
                 (*pattern)->match_type = PATTERN_FOCUSED;
         } else {
-                (*pattern)->match_type = PATTERN_PCRE;
+                (*pattern)->match_type = PATTERN_PCRE2;
                 if (!generate_regex(&(*pattern)->regex, value)) {
                         return false;
                 };
@@ -77,7 +81,7 @@ static bool pattern_create(struct pattern **pattern, char *value) {
 static void pattern_destroy(struct pattern *pattern) {
         if (pattern) {
                 if (pattern->regex) {
-                        pcre_free(pattern->regex);
+                        pcre2_code_free(pattern->regex);
                 }
                 free(pattern);
         }
@@ -93,14 +97,18 @@ void criteria_destroy(struct criteria *criteria) {
         pattern_destroy(criteria->window_role);
 #endif
         pattern_destroy(criteria->con_mark);
-        free(criteria->workspace);
+        pattern_destroy(criteria->workspace);
+        free(criteria->target);
         free(criteria->cmdlist);
         free(criteria->raw);
         free(criteria);
 }
 
-static int regex_cmp(const char *item, const pcre *regex) {
-        return pcre_exec(regex, NULL, item, strlen(item), 0, 0, NULL, 0);
+static int regex_cmp(const char *item, const pcre2_code *regex) {
+        pcre2_match_data *match_data = pcre2_match_data_create_from_pattern(regex, NULL);
+        int result = pcre2_match(regex, (PCRE2_SPTR)item, strlen(item), 0, 0, match_data, NULL);
+        pcre2_match_data_free(match_data);
+        return result;
 }
 
 #if HAVE_XWAYLAND
@@ -155,7 +163,7 @@ static bool criteria_matches_container(struct criteria *criteria,
                 bool exists = false;
                 struct sway_container *con = container;
                 for (int i = 0; i < con->marks->length; ++i) {
-                        if (regex_cmp(con->marks->items[i], criteria->con_mark->regex) == 0) {
+                        if (regex_cmp(con->marks->items[i], criteria->con_mark->regex) >= 0) {
                                 exists = true;
                                 break;
                         }
@@ -183,7 +191,7 @@ static bool criteria_matches_view(struct criteria *criteria,
         if (criteria->title) {
                 const char *title = view_get_title(view);
                 if (!title) {
-                        return false;
+                        title = "";
                 }
 
                 switch (criteria->title->match_type) {
@@ -192,8 +200,8 @@ static bool criteria_matches_view(struct criteria *criteria,
                                 return false;
                         }
                         break;
-                case PATTERN_PCRE:
-                        if (regex_cmp(title, criteria->title->regex) != 0) {
+                case PATTERN_PCRE2:
+                        if (regex_cmp(title, criteria->title->regex) < 0) {
                                 return false;
                         }
                         break;
@@ -203,7 +211,7 @@ static bool criteria_matches_view(struct criteria *criteria,
         if (criteria->shell) {
                 const char *shell = view_get_shell(view);
                 if (!shell) {
-                        return false;
+                        shell = "";
                 }
 
                 switch (criteria->shell->match_type) {
@@ -212,8 +220,8 @@ static bool criteria_matches_view(struct criteria *criteria,
                                 return false;
                         }
                         break;
-                case PATTERN_PCRE:
-                        if (regex_cmp(shell, criteria->shell->regex) != 0) {
+                case PATTERN_PCRE2:
+                        if (regex_cmp(shell, criteria->shell->regex) < 0) {
                                 return false;
                         }
                         break;
@@ -223,7 +231,7 @@ static bool criteria_matches_view(struct criteria *criteria,
         if (criteria->app_id) {
                 const char *app_id = view_get_app_id(view);
                 if (!app_id) {
-                        return false;
+                        app_id = "";
                 }
 
                 switch (criteria->app_id->match_type) {
@@ -232,8 +240,8 @@ static bool criteria_matches_view(struct criteria *criteria,
                                 return false;
                         }
                         break;
-                case PATTERN_PCRE:
-                        if (regex_cmp(app_id, criteria->app_id->regex) != 0) {
+                case PATTERN_PCRE2:
+                        if (regex_cmp(app_id, criteria->app_id->regex) < 0) {
                                 return false;
                         }
                         break;
@@ -255,7 +263,7 @@ static bool criteria_matches_view(struct criteria *criteria,
         if (criteria->class) {
                 const char *class = view_get_class(view);
                 if (!class) {
-                        return false;
+                        class = "";
                 }
 
                 switch (criteria->class->match_type) {
@@ -264,8 +272,8 @@ static bool criteria_matches_view(struct criteria *criteria,
                                 return false;
                         }
                         break;
-                case PATTERN_PCRE:
-                        if (regex_cmp(class, criteria->class->regex) != 0) {
+                case PATTERN_PCRE2:
+                        if (regex_cmp(class, criteria->class->regex) < 0) {
                                 return false;
                         }
                         break;
@@ -275,17 +283,17 @@ static bool criteria_matches_view(struct criteria *criteria,
         if (criteria->instance) {
                 const char *instance = view_get_instance(view);
                 if (!instance) {
-                        return false;
+                        instance = "";
                 }
 
                 switch (criteria->instance->match_type) {
                 case PATTERN_FOCUSED:
-                        if (focused && strcmp(instance, view_get_instance(focused))) {
+                        if (focused && lenient_strcmp(instance, view_get_instance(focused))) {
                                 return false;
                         }
                         break;
-                case PATTERN_PCRE:
-                        if (regex_cmp(instance, criteria->instance->regex) != 0) {
+                case PATTERN_PCRE2:
+                        if (regex_cmp(instance, criteria->instance->regex) < 0) {
                                 return false;
                         }
                         break;
@@ -295,17 +303,17 @@ static bool criteria_matches_view(struct criteria *criteria,
         if (criteria->window_role) {
                 const char *window_role = view_get_window_role(view);
                 if (!window_role) {
-                        return false;
+                        window_role = "";
                 }
 
                 switch (criteria->window_role->match_type) {
                 case PATTERN_FOCUSED:
-                        if (focused && strcmp(window_role, view_get_window_role(focused))) {
+                        if (focused && lenient_strcmp(window_role, view_get_window_role(focused))) {
                                 return false;
                         }
                         break;
-                case PATTERN_PCRE:
-                        if (regex_cmp(window_role, criteria->window_role->regex) != 0) {
+                case PATTERN_PCRE2:
+                        if (regex_cmp(window_role, criteria->window_role->regex) < 0) {
                                 return false;
                         }
                         break;
@@ -351,7 +359,7 @@ static bool criteria_matches_view(struct criteria *criteria,
         }
 
         if (criteria->workspace) {
-                struct sway_workspace *ws = view->container->workspace;
+                struct sway_workspace *ws = view->container->pending.workspace;
                 if (!ws) {
                         return false;
                 }
@@ -359,12 +367,12 @@ static bool criteria_matches_view(struct criteria *criteria,
                 switch (criteria->workspace->match_type) {
                 case PATTERN_FOCUSED:
                         if (focused &&
-                                        strcmp(ws->name, focused->container->workspace->name)) {
+                                        strcmp(ws->name, focused->container->pending.workspace->name)) {
                                 return false;
                         }
                         break;
-                case PATTERN_PCRE:
-                        if (regex_cmp(ws->name, criteria->workspace->regex) != 0) {
+                case PATTERN_PCRE2:
+                        if (regex_cmp(ws->name, criteria->workspace->regex) < 0) {
                                 return false;
                         }
                         break;
@@ -449,6 +457,7 @@ static enum atom_name parse_window_type(const char *type) {
 #endif
 
 enum criteria_token {
+        T_ALL,
         T_APP_ID,
         T_CON_ID,
         T_CON_MARK,
@@ -471,7 +480,9 @@ enum criteria_token {
 };
 
 static enum criteria_token token_from_name(char *name) {
-        if (strcmp(name, "app_id") == 0) {
+        if (strcmp(name, "all") == 0) {
+                return T_ALL;
+        } else if (strcmp(name, "app_id") == 0) {
                 return T_APP_ID;
         } else if (strcmp(name, "con_id") == 0) {
                 return T_CON_ID;
@@ -517,8 +528,8 @@ static bool parse_token(struct criteria *criteria, char *name, char *value) {
                 return false;
         }
 
-        // Require value, unless token is floating or tiled
-        if (!value && token != T_FLOATING && token != T_TILING) {
+        // Require value, unless token is all, floating or tiled
+        if (!value && token != T_ALL && token != T_FLOATING && token != T_TILING) {
                 const char *fmt = "Token '%s' requires a value";
                 int len = strlen(fmt) + strlen(name) - 1;
                 error = malloc(len);
@@ -528,6 +539,9 @@ static bool parse_token(struct criteria *criteria, char *name, char *value) {
 
         char *endptr = NULL;
         switch (token) {
+        case T_ALL:
+                criteria->all = true;
+                break;
         case T_TITLE:
                 pattern_create(&criteria->title, value);
                 break;
@@ -676,7 +690,7 @@ struct criteria *criteria_parse(char *raw, char **error_arg) {
                 }
                 name = calloc(head - namestart + 1, 1);
                 if (head != namestart) {
-                        strncpy(name, namestart, head - namestart);
+                        memcpy(name, namestart, head - namestart);
                 }
                 // Parse token value
                 skip_spaces(&head);
@@ -703,7 +717,7 @@ struct criteria *criteria_parse(char *raw, char **error_arg) {
                                 }
                         }
                         value = calloc(head - valuestart + 1, 1);
-                        strncpy(value, valuestart, head - valuestart);
+                        memcpy(value, valuestart, head - valuestart);
                         if (in_quotes) {
                                 ++head;
                                 in_quotes = false;
@@ -734,7 +748,7 @@ struct criteria *criteria_parse(char *raw, char **error_arg) {
         ++head;
         int len = head - raw;
         criteria->raw = calloc(len + 1, 1);
-        strncpy(criteria->raw, raw, len);
+        memcpy(criteria->raw, raw, len);
         return criteria;
 
 cleanup:
diff --git a/sway/desktop/desktop.c b/sway/desktop/desktop.c
deleted file mode 100644
index ec45d80a..00000000
--- a/sway/desktop/desktop.c
+++ /dev/null
@@ -1,39 +0,0 @@
-#include "sway/tree/container.h"
-#include "sway/desktop.h"
-#include "sway/output.h"
-
-void desktop_damage_surface(struct wlr_surface *surface, double lx, double ly,
-                bool whole) {
-        for (int i = 0; i < root->outputs->length; ++i) {
-                struct sway_output *output = root->outputs->items[i];
-                struct wlr_box *output_box = wlr_output_layout_get_box(
-                        root->output_layout, output->wlr_output);
-                output_damage_surface(output, lx - output_box->x,
-                        ly - output_box->y, surface, whole);
-        }
-}
-
-void desktop_damage_whole_container(struct sway_container *con) {
-        for (int i = 0; i < root->outputs->length; ++i) {
-                struct sway_output *output = root->outputs->items[i];
-                output_damage_whole_container(output, con);
-        }
-}
-
-void desktop_damage_box(struct wlr_box *box) {
-        for (int i = 0; i < root->outputs->length; ++i) {
-                struct sway_output *output = root->outputs->items[i];
-                output_damage_box(output, box);
-        }
-}
-
-void desktop_damage_view(struct sway_view *view) {
-        desktop_damage_whole_container(view->container);
-        struct wlr_box box = {
-                .x = view->container->current.content_x - view->geometry.x,
-                .y = view->container->current.content_y - view->geometry.y,
-                .width = view->surface->current.width,
-                .height = view->surface->current.height,
-        };
-        desktop_damage_box(&box);
-}
diff --git a/sway/desktop/idle_inhibit_v1.c b/sway/desktop/idle_inhibit_v1.c
index a5cfd5b2..f3af7aa1 100644
--- a/sway/desktop/idle_inhibit_v1.c
+++ b/sway/desktop/idle_inhibit_v1.c
@@ -1,5 +1,5 @@
 #include <stdlib.h>
-#include <wlr/types/wlr_idle.h>
+#include <wlr/types/wlr_idle_notify_v1.h>
 #include "log.h"
 #include "sway/desktop/idle_inhibit_v1.h"
 #include "sway/input/seat.h"
@@ -11,7 +11,7 @@
 static void destroy_inhibitor(struct sway_idle_inhibitor_v1 *inhibitor) {
         wl_list_remove(&inhibitor->link);
         wl_list_remove(&inhibitor->destroy.link);
-        sway_idle_inhibit_v1_check_active(inhibitor->manager);
+        sway_idle_inhibit_v1_check_active();
         free(inhibitor);
 }
 
@@ -34,43 +34,43 @@ void handle_idle_inhibitor_v1(struct wl_listener *listener, void *data) {
                 return;
         }
 
-        inhibitor->manager = manager;
         inhibitor->mode = INHIBIT_IDLE_APPLICATION;
-        inhibitor->view = view_from_wlr_surface(wlr_inhibitor->surface);
+        inhibitor->wlr_inhibitor = wlr_inhibitor;
         wl_list_insert(&manager->inhibitors, &inhibitor->link);
 
         inhibitor->destroy.notify = handle_destroy;
         wl_signal_add(&wlr_inhibitor->events.destroy, &inhibitor->destroy);
 
-        sway_idle_inhibit_v1_check_active(manager);
+        sway_idle_inhibit_v1_check_active();
 }
 
 void sway_idle_inhibit_v1_user_inhibitor_register(struct sway_view *view,
                 enum sway_idle_inhibit_mode mode) {
+        struct sway_idle_inhibit_manager_v1 *manager = &server.idle_inhibit_manager_v1;
+
         struct sway_idle_inhibitor_v1 *inhibitor =
                 calloc(1, sizeof(struct sway_idle_inhibitor_v1));
         if (!inhibitor) {
                 return;
         }
 
-        inhibitor->manager = server.idle_inhibit_manager_v1;
         inhibitor->mode = mode;
         inhibitor->view = view;
-        wl_list_insert(&inhibitor->manager->inhibitors, &inhibitor->link);
+        wl_list_insert(&manager->inhibitors, &inhibitor->link);
 
         inhibitor->destroy.notify = handle_destroy;
         wl_signal_add(&view->events.unmap, &inhibitor->destroy);
 
-        sway_idle_inhibit_v1_check_active(inhibitor->manager);
+        sway_idle_inhibit_v1_check_active();
 }
 
 struct sway_idle_inhibitor_v1 *sway_idle_inhibit_v1_user_inhibitor_for_view(
                 struct sway_view *view) {
+        struct sway_idle_inhibit_manager_v1 *manager = &server.idle_inhibit_manager_v1;
         struct sway_idle_inhibitor_v1 *inhibitor;
-        wl_list_for_each(inhibitor, &server.idle_inhibit_manager_v1->inhibitors,
-                        link) {
-                if (inhibitor->view == view &&
-                                inhibitor->mode != INHIBIT_IDLE_APPLICATION) {
+        wl_list_for_each(inhibitor, &manager->inhibitors, link) {
+                if (inhibitor->mode != INHIBIT_IDLE_APPLICATION &&
+                                inhibitor->view == view) {
                         return inhibitor;
                 }
         }
@@ -79,11 +79,11 @@ struct sway_idle_inhibitor_v1 *sway_idle_inhibit_v1_user_inhibitor_for_view(
 
 struct sway_idle_inhibitor_v1 *sway_idle_inhibit_v1_application_inhibitor_for_view(
                 struct sway_view *view) {
+        struct sway_idle_inhibit_manager_v1 *manager = &server.idle_inhibit_manager_v1;
         struct sway_idle_inhibitor_v1 *inhibitor;
-        wl_list_for_each(inhibitor, &server.idle_inhibit_manager_v1->inhibitors,
-                        link) {
-                if (inhibitor->view == view &&
-                                inhibitor->mode == INHIBIT_IDLE_APPLICATION) {
+        wl_list_for_each(inhibitor, &manager->inhibitors, link) {
+                if (inhibitor->mode == INHIBIT_IDLE_APPLICATION &&
+                                view_from_wlr_surface(inhibitor->wlr_inhibitor->surface) == view) {
                         return inhibitor;
                 }
         }
@@ -104,10 +104,10 @@ void sway_idle_inhibit_v1_user_inhibitor_destroy(
 
 bool sway_idle_inhibit_v1_is_active(struct sway_idle_inhibitor_v1 *inhibitor) {
         switch (inhibitor->mode) {
-        case INHIBIT_IDLE_APPLICATION:
+        case INHIBIT_IDLE_APPLICATION:;
                 // If there is no view associated with the inhibitor, assume visible
-                return !inhibitor->view || !inhibitor->view->container ||
-                        view_is_visible(inhibitor->view);
+                struct sway_view *view = view_from_wlr_surface(inhibitor->wlr_inhibitor->surface);
+                return !view || !view->container || view_is_visible(view);
         case INHIBIT_IDLE_FOCUS:;
                 struct sway_seat *seat = NULL;
                 wl_list_for_each(seat, &server.input->seats, link) {
@@ -130,8 +130,8 @@ bool sway_idle_inhibit_v1_is_active(struct sway_idle_inhibitor_v1 *inhibitor) {
         return false;
 }
 
-void sway_idle_inhibit_v1_check_active(
-                struct sway_idle_inhibit_manager_v1 *manager) {
+void sway_idle_inhibit_v1_check_active(void) {
+        struct sway_idle_inhibit_manager_v1 *manager = &server.idle_inhibit_manager_v1;
         struct sway_idle_inhibitor_v1 *inhibitor;
         bool inhibited = false;
         wl_list_for_each(inhibitor, &manager->inhibitors, link) {
@@ -139,27 +139,21 @@ void sway_idle_inhibit_v1_check_active(
                         break;
                 }
         }
-        wlr_idle_set_enabled(manager->idle, NULL, !inhibited);
+        wlr_idle_notifier_v1_set_inhibited(server.idle_notifier_v1, inhibited);
 }
 
-struct sway_idle_inhibit_manager_v1 *sway_idle_inhibit_manager_v1_create(
-                struct wl_display *wl_display, struct wlr_idle *idle) {
-        struct sway_idle_inhibit_manager_v1 *manager =
-                calloc(1, sizeof(struct sway_idle_inhibit_manager_v1));
-        if (!manager) {
-                return NULL;
-        }
+bool sway_idle_inhibit_manager_v1_init(void) {
+        struct sway_idle_inhibit_manager_v1 *manager = &server.idle_inhibit_manager_v1;
 
-        manager->wlr_manager = wlr_idle_inhibit_v1_create(wl_display);
+        manager->wlr_manager = wlr_idle_inhibit_v1_create(server.wl_display);
         if (!manager->wlr_manager) {
-                free(manager);
-                return NULL;
+                return false;
         }
-        manager->idle = idle;
+
         wl_signal_add(&manager->wlr_manager->events.new_inhibitor,
                 &manager->new_idle_inhibitor_v1);
         manager->new_idle_inhibitor_v1.notify = handle_idle_inhibitor_v1;
         wl_list_init(&manager->inhibitors);
 
-        return manager;
+        return true;
 }
diff --git a/sway/desktop/launcher.c b/sway/desktop/launcher.c
new file mode 100644
index 00000000..00a7e38a
--- /dev/null
+++ b/sway/desktop/launcher.c
@@ -0,0 +1,255 @@
+#define _POSIX_C_SOURCE 200809L
+#include <stdlib.h>
+#include <string.h>
+#include <wlr/types/wlr_xdg_activation_v1.h>
+#include "sway/input/seat.h"
+#include "sway/output.h"
+#include "sway/desktop/launcher.h"
+#include "sway/tree/node.h"
+#include "sway/tree/container.h"
+#include "sway/tree/workspace.h"
+#include "sway/tree/root.h"
+#include "log.h"
+
+/**
+ * Get the pid of a parent process given the pid of a child process.
+ *
+ * Returns the parent pid or NULL if the parent pid cannot be determined.
+ */
+static pid_t get_parent_pid(pid_t child) {
+        pid_t parent = -1;
+        char file_name[100];
+        char *buffer = NULL;
+        const char *sep = " ";
+        FILE *stat = NULL;
+        size_t buf_size = 0;
+
+        snprintf(file_name, sizeof(file_name), "/proc/%d/stat", child);
+
+        if ((stat = fopen(file_name, "r"))) {
+                if (getline(&buffer, &buf_size, stat) != -1) {
+                        strtok(buffer, sep); // pid
+                        strtok(NULL, sep);   // executable name
+                        strtok(NULL, sep);   // state
+                        char *token = strtok(NULL, sep);   // parent pid
+                        parent = strtol(token, NULL, 10);
+                }
+                free(buffer);
+                fclose(stat);
+        }
+
+        if (parent) {
+                return (parent == child) ? -1 : parent;
+        }
+
+        return -1;
+}
+
+void launcher_ctx_consume(struct launcher_ctx *ctx) {
+        // The view is now responsible for destroying this ctx
+        wl_list_remove(&ctx->token_destroy.link);
+        wl_list_init(&ctx->token_destroy.link);
+
+        if (!ctx->activated) {
+                // An unactivated token hasn't been destroyed yet
+                wlr_xdg_activation_token_v1_destroy(ctx->token);
+        }
+        ctx->token = NULL;
+
+        // Prevent additional matches
+        wl_list_remove(&ctx->link);
+        wl_list_init(&ctx->link);
+}
+
+void launcher_ctx_destroy(struct launcher_ctx *ctx) {
+        if (ctx == NULL) {
+                return;
+        }
+        wl_list_remove(&ctx->node_destroy.link);
+        wl_list_remove(&ctx->token_destroy.link);
+        wl_list_remove(&ctx->link);
+        wlr_xdg_activation_token_v1_destroy(ctx->token);
+        free(ctx->fallback_name);
+        free(ctx);
+}
+
+struct launcher_ctx *launcher_ctx_find_pid(pid_t pid) {
+        if (wl_list_empty(&server.pending_launcher_ctxs)) {
+                return NULL;
+        }
+
+        struct launcher_ctx *ctx = NULL;
+        sway_log(SWAY_DEBUG, "Looking up workspace for pid %d", pid);
+
+        do {
+                struct launcher_ctx *_ctx = NULL;
+                wl_list_for_each(_ctx, &server.pending_launcher_ctxs, link) {
+                        if (pid == _ctx->pid) {
+                                ctx = _ctx;
+                                sway_log(SWAY_DEBUG,
+                                        "found %s match for pid %d: %s",
+                                        node_type_to_str(ctx->node->type), pid, node_get_name(ctx->node));
+                                break;
+                        }
+                }
+                pid = get_parent_pid(pid);
+        } while (pid > 1);
+
+        return ctx;
+}
+
+struct sway_workspace *launcher_ctx_get_workspace(
+                struct launcher_ctx *ctx) {
+        struct sway_workspace *ws = NULL;
+        struct sway_output *output = NULL;
+
+        switch (ctx->node->type) {
+        case N_CONTAINER:
+                // Unimplemented
+                // TODO: add container matching?
+                ws = ctx->node->sway_container->pending.workspace;
+                break;
+        case N_WORKSPACE:
+                ws = ctx->node->sway_workspace;
+                break;
+        case N_OUTPUT:
+                output = ctx->node->sway_output;
+                ws = workspace_by_name(ctx->fallback_name);
+                if (!ws) {
+                        sway_log(SWAY_DEBUG,
+                                        "Creating workspace %s for pid %d because it disappeared",
+                                        ctx->fallback_name, ctx->pid);
+                        if (!output->enabled) {
+                                sway_log(SWAY_DEBUG,
+                                                "Workspace output %s is disabled, trying another one",
+                                                output->wlr_output->name);
+                                output = NULL;
+                        }
+                        ws = workspace_create(output, ctx->fallback_name);
+                }
+                break;
+        case N_ROOT:
+                ws = workspace_create(NULL, ctx->fallback_name);
+                break;
+        }
+
+        return ws;
+}
+
+static void ctx_handle_node_destroy(struct wl_listener *listener, void *data) {
+        struct launcher_ctx *ctx = wl_container_of(listener, ctx, node_destroy);
+        switch (ctx->node->type) {
+        case N_CONTAINER:
+                // Unimplemented
+                break;
+        case N_WORKSPACE:;
+                struct sway_workspace *ws = ctx->node->sway_workspace;
+                wl_list_remove(&ctx->node_destroy.link);
+                wl_list_init(&ctx->node_destroy.link);
+                // We want to save this ws name to recreate later, hopefully on the
+                // same output
+                free(ctx->fallback_name);
+                ctx->fallback_name = strdup(ws->name);
+                if (!ws->output || ws->output->node.destroying) {
+                        // If the output is being destroyed it would be pointless to track
+                        // If the output is being disabled, we'll find out if it's still
+                        // disabled when we try to match it.
+                        ctx->node = &root->node;
+                        break;
+                }
+                ctx->node = &ws->output->node;
+                wl_signal_add(&ctx->node->events.destroy, &ctx->node_destroy);
+                break;
+        case N_OUTPUT:
+                wl_list_remove(&ctx->node_destroy.link);
+                wl_list_init(&ctx->node_destroy.link);
+                // We'll make the ws ctx->name somewhere else
+                ctx->node = &root->node;
+                break;
+        case N_ROOT:
+                // Unreachable
+                break;
+        }
+}
+
+static void token_handle_destroy(struct wl_listener *listener, void *data) {
+        struct launcher_ctx *ctx = wl_container_of(listener, ctx, token_destroy);
+        ctx->token = NULL;
+        launcher_ctx_destroy(ctx);
+}
+
+struct launcher_ctx *launcher_ctx_create(struct wlr_xdg_activation_token_v1 *token,
+                struct sway_node *node) {
+        struct launcher_ctx *ctx = calloc(1, sizeof(struct launcher_ctx));
+
+        const char *fallback_name = NULL;
+        struct sway_workspace *ws = NULL;
+        switch (node->type) {
+        case N_CONTAINER:
+                // Unimplemented
+                free(ctx);
+                return NULL;
+        case N_WORKSPACE:
+                ws = node->sway_workspace;
+                fallback_name = ws->name;
+                break;
+        case N_OUTPUT:;
+                struct sway_output *output = node->sway_output;
+                ws = output_get_active_workspace(output);
+                fallback_name = ws ? ws->name : NULL;
+                break;
+        case N_ROOT:
+                // Unimplemented
+                free(ctx);
+                return NULL;
+        }
+
+        if (!fallback_name) {
+                // TODO: implement a better fallback.
+                free(ctx);
+                return NULL;
+        }
+
+        ctx->fallback_name = strdup(fallback_name);
+        ctx->token = token;
+        ctx->node = node;
+
+        ctx->node_destroy.notify = ctx_handle_node_destroy;
+        wl_signal_add(&ctx->node->events.destroy, &ctx->node_destroy);
+
+        ctx->token_destroy.notify = token_handle_destroy;
+        wl_signal_add(&token->events.destroy, &ctx->token_destroy);
+
+        wl_list_init(&ctx->link);
+        wl_list_insert(&server.pending_launcher_ctxs, &ctx->link);
+
+        token->data = ctx;
+        return ctx;
+}
+
+// Creates a context with a new token for the internal launcher
+struct launcher_ctx *launcher_ctx_create_internal(void) {
+        struct sway_seat *seat = input_manager_current_seat();
+        struct sway_workspace *ws = seat_get_focused_workspace(seat);
+        if (!ws) {
+                sway_log(SWAY_DEBUG, "Failed to create launch context. No workspace.");
+                return NULL;
+        }
+
+        struct wlr_xdg_activation_token_v1 *token =
+                wlr_xdg_activation_token_v1_create(server.xdg_activation_v1);
+        token->seat = seat->wlr_seat;
+
+        struct launcher_ctx *ctx = launcher_ctx_create(token, &ws->node);
+        if (!ctx) {
+                wlr_xdg_activation_token_v1_destroy(token);
+                return NULL;
+        }
+
+        return ctx;
+}
+
+const char *launcher_ctx_get_token_name(struct launcher_ctx *ctx) {
+        const char *token = wlr_xdg_activation_token_v1_get_name(ctx->token);
+        return token;
+}
diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c
index d4ca4fb4..c71abce7 100644
--- a/sway/desktop/layer_shell.c
+++ b/sway/desktop/layer_shell.c
@@ -2,11 +2,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wayland-server-core.h>
-#include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_layer_shell_v1.h>
-#include <wlr/types/wlr_output_damage.h>
 #include <wlr/types/wlr_output.h>
+#include <wlr/types/wlr_subcompositor.h>
 #include "log.h"
+#include "sway/scene_descriptor.h"
 #include "sway/desktop/transaction.h"
 #include "sway/input/cursor.h"
 #include "sway/input/input-manager.h"
@@ -16,156 +16,57 @@
 #include "sway/server.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/workspace.h"
+#include <wlr/types/wlr_scene.h>
+
+struct wlr_layer_surface_v1 *toplevel_layer_surface_from_surface(
+                struct wlr_surface *surface) {
+        struct wlr_layer_surface_v1 *layer;
+        do {
+                if (!surface) {
+                        return NULL;
+                }
+                // Topmost layer surface
+                if ((layer = wlr_layer_surface_v1_try_from_wlr_surface(surface))) {
+                        return layer;
+                }
+                // Layer subsurface
+                if (wlr_subsurface_try_from_wlr_surface(surface)) {
+                        surface = wlr_surface_get_root_surface(surface);
+                        continue;
+                }
 
-static void apply_exclusive(struct wlr_box *usable_area,
-                uint32_t anchor, int32_t exclusive,
-                int32_t margin_top, int32_t margin_right,
-                int32_t margin_bottom, int32_t margin_left) {
-        if (exclusive <= 0) {
-                return;
-        }
-        struct {
-                uint32_t singular_anchor;
-                uint32_t anchor_triplet;
-                int *positive_axis;
-                int *negative_axis;
-                int margin;
-        } edges[] = {
-                // Top
-                {
-                        .singular_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP,
-                        .anchor_triplet =
-                                ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
-                                ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT |
-                                ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP,
-                        .positive_axis = &usable_area->y,
-                        .negative_axis = &usable_area->height,
-                        .margin = margin_top,
-                },
-                // Bottom
-                {
-                        .singular_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM,
-                        .anchor_triplet =
-                                ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
-                                ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT |
-                                ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM,
-                        .positive_axis = NULL,
-                        .negative_axis = &usable_area->height,
-                        .margin = margin_bottom,
-                },
-                // Left
-                {
-                        .singular_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT,
-                        .anchor_triplet =
-                                ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
-                                ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP |
-                                ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM,
-                        .positive_axis = &usable_area->x,
-                        .negative_axis = &usable_area->width,
-                        .margin = margin_left,
-                },
-                // Right
-                {
-                        .singular_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT,
-                        .anchor_triplet =
-                                ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT |
-                                ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP |
-                                ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM,
-                        .positive_axis = NULL,
-                        .negative_axis = &usable_area->width,
-                        .margin = margin_right,
-                },
-        };
-        for (size_t i = 0; i < sizeof(edges) / sizeof(edges[0]); ++i) {
-                if ((anchor  == edges[i].singular_anchor || anchor == edges[i].anchor_triplet)
-                                && exclusive + edges[i].margin > 0) {
-                        if (edges[i].positive_axis) {
-                                *edges[i].positive_axis += exclusive + edges[i].margin;
+                // Layer surface popup
+                struct wlr_xdg_surface *xdg_surface = NULL;
+                if ((xdg_surface = wlr_xdg_surface_try_from_wlr_surface(surface)) &&
+                                xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP && xdg_surface->popup != NULL) {
+                        if (!xdg_surface->popup->parent) {
+                                return NULL;
                         }
-                        if (edges[i].negative_axis) {
-                                *edges[i].negative_axis -= exclusive + edges[i].margin;
-                        }
-                        break;
+                        surface = wlr_surface_get_root_surface(xdg_surface->popup->parent);
+                        continue;
                 }
-        }
+
+                // Return early if the surface is not a layer/xdg_popup/sub surface
+                return NULL;
+        } while (true);
 }
 
-static void arrange_layer(struct sway_output *output, struct wl_list *list,
-                struct wlr_box *usable_area, bool exclusive) {
-        struct sway_layer_surface *sway_layer;
-        struct wlr_box full_area = { 0 };
-        wlr_output_effective_resolution(output->wlr_output,
-                        &full_area.width, &full_area.height);
-        wl_list_for_each(sway_layer, list, link) {
-                struct wlr_layer_surface_v1 *layer = sway_layer->layer_surface;
-                struct wlr_layer_surface_v1_state *state = &layer->current;
-                if (exclusive != (state->exclusive_zone > 0)) {
+static void arrange_surface(struct sway_output *output, const struct wlr_box *full_area,
+                struct wlr_box *usable_area, struct wlr_scene_tree *tree) {
+        struct wlr_scene_node *node;
+        wl_list_for_each(node, &tree->children, link) {
+                struct sway_layer_surface *surface = scene_descriptor_try_get(node,
+                        SWAY_SCENE_DESC_LAYER_SHELL);
+                // surface could be null during destruction
+                if (!surface) {
                         continue;
                 }
-                struct wlr_box bounds;
-                if (state->exclusive_zone == -1) {
-                        bounds = full_area;
-                } else {
-                        bounds = *usable_area;
-                }
-                struct wlr_box box = {
-                        .width = state->desired_width,
-                        .height = state->desired_height
-                };
-                // Horizontal axis
-                const uint32_t both_horiz = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT
-                        | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
-                if ((state->anchor & both_horiz) && box.width == 0) {
-                        box.x = bounds.x;
-                        box.width = bounds.width;
-                } else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT)) {
-                        box.x = bounds.x;
-                } else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT)) {
-                        box.x = bounds.x + (bounds.width - box.width);
-                } else {
-                        box.x = bounds.x + ((bounds.width / 2) - (box.width / 2));
-                }
-                // Vertical axis
-                const uint32_t both_vert = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP
-                        | ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
-                if ((state->anchor & both_vert) && box.height == 0) {
-                        box.y = bounds.y;
-                        box.height = bounds.height;
-                } else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP)) {
-                        box.y = bounds.y;
-                } else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM)) {
-                        box.y = bounds.y + (bounds.height - box.height);
-                } else {
-                        box.y = bounds.y + ((bounds.height / 2) - (box.height / 2));
-                }
-                // Margin
-                if ((state->anchor & both_horiz) == both_horiz) {
-                        box.x += state->margin.left;
-                        box.width -= state->margin.left + state->margin.right;
-                } else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT)) {
-                        box.x += state->margin.left;
-                } else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT)) {
-                        box.x -= state->margin.right;
-                }
-                if ((state->anchor & both_vert) == both_vert) {
-                        box.y += state->margin.top;
-                        box.height -= state->margin.top + state->margin.bottom;
-                } else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP)) {
-                        box.y += state->margin.top;
-                } else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM)) {
-                        box.y -= state->margin.bottom;
-                }
-                if (box.width < 0 || box.height < 0) {
-                        // TODO: Bubble up a protocol error?
-                        wlr_layer_surface_v1_close(layer);
+
+                if (!surface->scene->layer_surface->initialized) {
                         continue;
                 }
-                // Apply
-                sway_layer->geo = box;
-                apply_exclusive(usable_area, state->anchor, state->exclusive_zone,
-                                state->margin.top, state->margin.right,
-                                state->margin.bottom, state->margin.left);
-                wlr_layer_surface_v1_configure(layer, box.width, box.height);
+
+                wlr_scene_layer_surface_v1_configure(surface->scene, full_area, usable_area);
         }
 }
 
@@ -173,81 +74,81 @@ void arrange_layers(struct sway_output *output) {
         struct wlr_box usable_area = { 0 };
         wlr_output_effective_resolution(output->wlr_output,
                         &usable_area.width, &usable_area.height);
+        const struct wlr_box full_area = usable_area;
+
+        arrange_surface(output, &full_area, &usable_area, output->layers.shell_background);
+        arrange_surface(output, &full_area, &usable_area, output->layers.shell_bottom);
+        arrange_surface(output, &full_area, &usable_area, output->layers.shell_top);
+        arrange_surface(output, &full_area, &usable_area, output->layers.shell_overlay);
 
-        // Arrange exclusive surfaces from top->bottom
-        arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY],
-                        &usable_area, true);
-        arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP],
-                        &usable_area, true);
-        arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM],
-                        &usable_area, true);
-        arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND],
-                        &usable_area, true);
-
-        if (memcmp(&usable_area, &output->usable_area,
-                                sizeof(struct wlr_box)) != 0) {
+        if (!wlr_box_equal(&usable_area, &output->usable_area)) {
                 sway_log(SWAY_DEBUG, "Usable area changed, rearranging output");
-                memcpy(&output->usable_area, &usable_area, sizeof(struct wlr_box));
+                output->usable_area = usable_area;
                 arrange_output(output);
         }
+}
 
-        // Arrange non-exlusive surfaces from top->bottom
-        arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY],
-                        &usable_area, false);
-        arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP],
-                        &usable_area, false);
-        arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM],
-                        &usable_area, false);
-        arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND],
-                        &usable_area, false);
-
-        // Find topmost keyboard interactive layer, if such a layer exists
-        uint32_t layers_above_shell[] = {
-                ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY,
-                ZWLR_LAYER_SHELL_V1_LAYER_TOP,
-        };
-        size_t nlayers = sizeof(layers_above_shell) / sizeof(layers_above_shell[0]);
-        struct sway_layer_surface *layer, *topmost = NULL;
-        for (size_t i = 0; i < nlayers; ++i) {
-                wl_list_for_each_reverse(layer,
-                                &output->layers[layers_above_shell[i]], link) {
-                        if (layer->layer_surface->current.keyboard_interactive &&
-                                        layer->layer_surface->mapped) {
-                                topmost = layer;
-                                break;
-                        }
-                }
-                if (topmost != NULL) {
-                        break;
-                }
+static struct wlr_scene_tree *sway_layer_get_scene(struct sway_output *output,
+                enum zwlr_layer_shell_v1_layer type) {
+        switch (type) {
+        case ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND:
+                return output->layers.shell_background;
+        case ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM:
+                return output->layers.shell_bottom;
+        case ZWLR_LAYER_SHELL_V1_LAYER_TOP:
+                return output->layers.shell_top;
+        case ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY:
+                return output->layers.shell_overlay;
         }
 
-        struct sway_seat *seat;
-        wl_list_for_each(seat, &server.input->seats, link) {
-                if (topmost != NULL) {
-                        seat_set_focus_layer(seat, topmost->layer_surface);
-                } else if (seat->focused_layer &&
-                                !seat->focused_layer->current.keyboard_interactive) {
-                        seat_set_focus_layer(seat, NULL);
-                }
+        sway_assert(false, "unreachable");
+        return NULL;
+}
+
+static struct sway_layer_surface *sway_layer_surface_create(
+                struct wlr_scene_layer_surface_v1 *scene) {
+        struct sway_layer_surface *surface = calloc(1, sizeof(*surface));
+        if (!surface) {
+                sway_log(SWAY_ERROR, "Could not allocate a scene_layer surface");
+                return NULL;
+        }
+
+        struct wlr_scene_tree *popups = wlr_scene_tree_create(root->layers.popup);
+        if (!popups) {
+                sway_log(SWAY_ERROR, "Could not allocate a scene_layer popup node");
+                free(surface);
+                return NULL;
         }
+
+        surface->tree = scene->tree;
+        surface->scene = scene;
+        surface->layer_surface = scene->layer_surface;
+        surface->popups = popups;
+
+        return surface;
 }
 
 static struct sway_layer_surface *find_mapped_layer_by_client(
-                struct wl_client *client, struct wlr_output *ignore_output) {
+                struct wl_client *client, struct sway_output *ignore_output) {
         for (int i = 0; i < root->outputs->length; ++i) {
                 struct sway_output *output = root->outputs->items[i];
-                if (output->wlr_output == ignore_output) {
+                if (output == ignore_output) {
                         continue;
                 }
                 // For now we'll only check the overlay layer
-                struct sway_layer_surface *lsurface;
-                wl_list_for_each(lsurface,
-                                &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY], link) {
-                        struct wl_resource *resource = lsurface->layer_surface->resource;
+                struct wlr_scene_node *node;
+                wl_list_for_each (node, &output->layers.shell_overlay->children, link) {
+                        struct sway_layer_surface *surface = scene_descriptor_try_get(node,
+                                SWAY_SCENE_DESC_LAYER_SHELL);
+                        if (!surface) {
+                                continue;
+                        }
+
+                        struct wlr_layer_surface_v1 *layer_surface = surface->layer_surface;
+                        struct wl_resource *resource = layer_surface->resource;
                         if (wl_resource_get_client(resource) == client
-                                        && lsurface->layer_surface->mapped) {
-                                return lsurface;
+                                        && layer_surface->surface->mapped) {
+                                return surface;
                         }
                 }
         }
@@ -255,280 +156,144 @@ static struct sway_layer_surface *find_mapped_layer_by_client(
 }
 
 static void handle_output_destroy(struct wl_listener *listener, void *data) {
-        struct sway_layer_surface *sway_layer =
-                wl_container_of(listener, sway_layer, output_destroy);
-        // Determine if this layer is being used by an exclusive client. If it is,
-        // try and find another layer owned by this client to pass focus to.
-        struct sway_seat *seat = input_manager_get_default_seat();
-        struct wl_client *client =
-                wl_resource_get_client(sway_layer->layer_surface->resource);
-        bool set_focus = seat->exclusive_client == client;
-
-        wl_list_remove(&sway_layer->output_destroy.link);
-        wl_list_remove(&sway_layer->link);
-        wl_list_init(&sway_layer->link);
-
-        if (set_focus) {
-                struct sway_layer_surface *layer =
-                        find_mapped_layer_by_client(client, sway_layer->layer_surface->output);
-                if (layer) {
-                        seat_set_focus_layer(seat, layer->layer_surface);
-                }
-        }
+        struct sway_layer_surface *layer =
+                wl_container_of(listener, layer, output_destroy);
 
-        sway_layer->layer_surface->output = NULL;
-        wlr_layer_surface_v1_close(sway_layer->layer_surface);
+        layer->output = NULL;
+        wlr_scene_node_destroy(&layer->scene->tree->node);
 }
 
-static void handle_surface_commit(struct wl_listener *listener, void *data) {
+static void handle_node_destroy(struct wl_listener *listener, void *data) {
         struct sway_layer_surface *layer =
-                wl_container_of(listener, layer, surface_commit);
-        struct wlr_layer_surface_v1 *layer_surface = layer->layer_surface;
-        struct wlr_output *wlr_output = layer_surface->output;
-        if (wlr_output == NULL) {
-                return;
-        }
-
-        struct sway_output *output = wlr_output->data;
-        struct wlr_box old_geo = layer->geo;
-        arrange_layers(output);
-
-        bool geo_changed =
-                memcmp(&old_geo, &layer->geo, sizeof(struct wlr_box)) != 0;
-        bool layer_changed = layer->layer != layer_surface->current.layer;
-        if (layer_changed) {
-                wl_list_remove(&layer->link);
-                wl_list_insert(&output->layers[layer_surface->current.layer],
-                        &layer->link);
-                layer->layer = layer_surface->current.layer;
-        }
-        if (geo_changed || layer_changed) {
-                output_damage_surface(output, old_geo.x, old_geo.y,
-                        layer_surface->surface, true);
-                output_damage_surface(output, layer->geo.x, layer->geo.y,
-                        layer_surface->surface, true);
-        } else {
-                output_damage_surface(output, layer->geo.x, layer->geo.y,
-                        layer_surface->surface, false);
-        }
+                wl_container_of(listener, layer, node_destroy);
 
-        transaction_commit_dirty();
-}
+        // destroy the scene descriptor straight away if it exists, otherwise
+        // we will try to reflow still considering the destroyed node.
+        scene_descriptor_destroy(&layer->tree->node, SWAY_SCENE_DESC_LAYER_SHELL);
 
-static void unmap(struct sway_layer_surface *sway_layer) {
-        struct sway_seat *seat;
-        wl_list_for_each(seat, &server.input->seats, link) {
-                if (seat->focused_layer == sway_layer->layer_surface) {
-                        seat_set_focus_layer(seat, NULL);
+        // Determine if this layer is being used by an exclusive client. If it is,
+        // try and find another layer owned by this client to pass focus to.
+        struct sway_seat *seat = input_manager_get_default_seat();
+        struct wl_client *client =
+                wl_resource_get_client(layer->layer_surface->resource);
+        if (!server.session_lock.lock) {
+                struct sway_layer_surface *consider_layer =
+                        find_mapped_layer_by_client(client, layer->output);
+                if (consider_layer) {
+                        seat_set_focus_layer(seat, consider_layer->layer_surface);
                 }
         }
 
-        cursor_rebase_all();
-
-        struct wlr_output *wlr_output = sway_layer->layer_surface->output;
-        if (wlr_output == NULL) {
-                return;
+        if (layer->output) {
+                arrange_layers(layer->output);
+                transaction_commit_dirty();
         }
-        struct sway_output *output = wlr_output->data;
-        if (output == NULL) {
-                return;
-        }
-        output_damage_surface(output, sway_layer->geo.x, sway_layer->geo.y,
-                sway_layer->layer_surface->surface, true);
-}
 
-static void handle_destroy(struct wl_listener *listener, void *data) {
-        struct sway_layer_surface *sway_layer =
-                wl_container_of(listener, sway_layer, destroy);
-        sway_log(SWAY_DEBUG, "Layer surface destroyed (%s)",
-                sway_layer->layer_surface->namespace);
-        if (sway_layer->layer_surface->mapped) {
-                unmap(sway_layer);
-        }
-        wl_list_remove(&sway_layer->link);
-        wl_list_remove(&sway_layer->destroy.link);
-        wl_list_remove(&sway_layer->map.link);
-        wl_list_remove(&sway_layer->unmap.link);
-        wl_list_remove(&sway_layer->surface_commit.link);
-        wl_list_remove(&sway_layer->new_popup.link);
-        wl_list_remove(&sway_layer->new_subsurface.link);
-        if (sway_layer->layer_surface->output != NULL) {
-                struct sway_output *output = sway_layer->layer_surface->output->data;
-                if (output != NULL) {
-                        arrange_layers(output);
-                        transaction_commit_dirty();
-                }
-                wl_list_remove(&sway_layer->output_destroy.link);
-                sway_layer->layer_surface->output = NULL;
-        }
-        free(sway_layer);
-}
+        wlr_scene_node_destroy(&layer->popups->node);
 
-static void handle_map(struct wl_listener *listener, void *data) {
-        struct sway_layer_surface *sway_layer = wl_container_of(listener,
-                        sway_layer, map);
-        struct sway_output *output = sway_layer->layer_surface->output->data;
-        output_damage_surface(output, sway_layer->geo.x, sway_layer->geo.y,
-                sway_layer->layer_surface->surface, true);
-        wlr_surface_send_enter(sway_layer->layer_surface->surface,
-                sway_layer->layer_surface->output);
-        cursor_rebase_all();
-}
+        wl_list_remove(&layer->map.link);
+        wl_list_remove(&layer->unmap.link);
+        wl_list_remove(&layer->surface_commit.link);
+        wl_list_remove(&layer->node_destroy.link);
+        wl_list_remove(&layer->output_destroy.link);
 
-static void handle_unmap(struct wl_listener *listener, void *data) {
-        struct sway_layer_surface *sway_layer = wl_container_of(
-                        listener, sway_layer, unmap);
-        unmap(sway_layer);
+        free(layer);
 }
 
-static void subsurface_damage(struct sway_layer_subsurface *subsurface,
-                bool whole) {
-        struct sway_layer_surface *layer = subsurface->layer_surface;
-        struct wlr_output *wlr_output = layer->layer_surface->output;
-        if (!wlr_output) {
+static void handle_surface_commit(struct wl_listener *listener, void *data) {
+        struct sway_layer_surface *surface =
+                wl_container_of(listener, surface, surface_commit);
+
+        struct wlr_layer_surface_v1 *layer_surface = surface->layer_surface;
+        if (!layer_surface->initialized) {
                 return;
         }
-        struct sway_output *output = wlr_output->data;
-        int ox = subsurface->wlr_subsurface->current.x + layer->geo.x;
-        int oy = subsurface->wlr_subsurface->current.y + layer->geo.y;
-        output_damage_surface(
-                        output, ox, oy, subsurface->wlr_subsurface->surface, whole);
-}
-
-static void subsurface_handle_unmap(struct wl_listener *listener, void *data) {
-        struct sway_layer_subsurface *subsurface =
-                        wl_container_of(listener, subsurface, unmap);
-        subsurface_damage(subsurface, true);
-}
 
-static void subsurface_handle_map(struct wl_listener *listener, void *data) {
-        struct sway_layer_subsurface *subsurface =
-                        wl_container_of(listener, subsurface, map);
-        subsurface_damage(subsurface, true);
-}
-
-static void subsurface_handle_commit(struct wl_listener *listener, void *data) {
-        struct sway_layer_subsurface *subsurface =
-                        wl_container_of(listener, subsurface, commit);
-        subsurface_damage(subsurface, false);
-}
-
-static void subsurface_handle_destroy(struct wl_listener *listener,
-                void *data) {
-        struct sway_layer_subsurface *subsurface =
-                        wl_container_of(listener, subsurface, destroy);
-
-        wl_list_remove(&subsurface->map.link);
-        wl_list_remove(&subsurface->unmap.link);
-        wl_list_remove(&subsurface->destroy.link);
-        wl_list_remove(&subsurface->commit.link);
-        free(subsurface);
-}
-
-static struct sway_layer_subsurface *create_subsurface(
-                struct wlr_subsurface *wlr_subsurface,
-                struct sway_layer_surface *layer_surface) {
-        struct sway_layer_subsurface *subsurface =
-                        calloc(1, sizeof(struct sway_layer_surface));
-        if (subsurface == NULL) {
-                return NULL;
+        uint32_t committed = layer_surface->current.committed;
+        if (committed & WLR_LAYER_SURFACE_V1_STATE_LAYER) {
+                enum zwlr_layer_shell_v1_layer layer_type = layer_surface->current.layer;
+                struct wlr_scene_tree *output_layer = sway_layer_get_scene(
+                        surface->output, layer_type);
+                wlr_scene_node_reparent(&surface->scene->tree->node, output_layer);
         }
 
-        subsurface->wlr_subsurface = wlr_subsurface;
-        subsurface->layer_surface = layer_surface;
-
-        subsurface->map.notify = subsurface_handle_map;
-        wl_signal_add(&wlr_subsurface->events.map, &subsurface->map);
-        subsurface->unmap.notify = subsurface_handle_unmap;
-        wl_signal_add(&wlr_subsurface->events.unmap, &subsurface->unmap);
-        subsurface->destroy.notify = subsurface_handle_destroy;
-        wl_signal_add(&wlr_subsurface->events.destroy, &subsurface->destroy);
-        subsurface->commit.notify = subsurface_handle_commit;
-        wl_signal_add(&wlr_subsurface->surface->events.commit, &subsurface->commit);
-
-        return subsurface;
-}
-
-static void handle_new_subsurface(struct wl_listener *listener, void *data) {
-        struct sway_layer_surface *sway_layer_surface =
-                        wl_container_of(listener, sway_layer_surface, new_subsurface);
-        struct wlr_subsurface *wlr_subsurface = data;
-        create_subsurface(wlr_subsurface, sway_layer_surface);
-}
-
-
-static struct sway_layer_surface *popup_get_layer(
-                struct sway_layer_popup *popup) {
-        while (popup->parent_type == LAYER_PARENT_POPUP) {
-                popup = popup->parent_popup;
+        if (layer_surface->initial_commit || committed || layer_surface->surface->mapped != surface->mapped) {
+                surface->mapped = layer_surface->surface->mapped;
+                arrange_layers(surface->output);
+                transaction_commit_dirty();
         }
-        return popup->parent_layer;
+
+        int lx, ly;
+        wlr_scene_node_coords(&surface->scene->tree->node, &lx, &ly);
+        wlr_scene_node_set_position(&surface->popups->node, lx, ly);
 }
 
-static void popup_damage(struct sway_layer_popup *layer_popup, bool whole) {
-        struct wlr_xdg_popup *popup = layer_popup->wlr_popup;
-        struct wlr_surface *surface = popup->base->surface;
-        int popup_sx = popup->geometry.x - popup->base->geometry.x;
-        int popup_sy = popup->geometry.y - popup->base->geometry.y;
-        int ox = popup_sx, oy = popup_sy;
-        struct sway_layer_surface *layer;
-        while (true) {
-                if (layer_popup->parent_type == LAYER_PARENT_POPUP) {
-                        layer_popup = layer_popup->parent_popup;
-                        ox += layer_popup->wlr_popup->geometry.x;
-                        oy += layer_popup->wlr_popup->geometry.y;
-                } else {
-                        layer = layer_popup->parent_layer;
-                        ox += layer->geo.x;
-                        oy += layer->geo.y;
-                        break;
+static void handle_map(struct wl_listener *listener, void *data) {
+        struct sway_layer_surface *surface = wl_container_of(listener,
+                        surface, map);
+
+        struct wlr_layer_surface_v1 *layer_surface =
+                                surface->scene->layer_surface;
+
+        // focus on new surface
+        if (layer_surface->current.keyboard_interactive &&
+                        (layer_surface->current.layer == ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY ||
+                        layer_surface->current.layer == ZWLR_LAYER_SHELL_V1_LAYER_TOP)) {
+                struct sway_seat *seat;
+                wl_list_for_each(seat, &server.input->seats, link) {
+                        // but only if the currently focused layer has a lower precedence
+                        if (!seat->focused_layer ||
+                                        seat->focused_layer->current.layer >= layer_surface->current.layer) {
+                                seat_set_focus_layer(seat, layer_surface);
+                        }
                 }
+                arrange_layers(surface->output);
         }
-        struct wlr_output *wlr_output = layer->layer_surface->output;
-        struct sway_output *output = wlr_output->data;
-        output_damage_surface(output, ox, oy, surface, whole);
-}
 
-static void popup_handle_map(struct wl_listener *listener, void *data) {
-        struct sway_layer_popup *popup = wl_container_of(listener, popup, map);
-        struct sway_layer_surface *layer = popup_get_layer(popup);
-        struct wlr_output *wlr_output = layer->layer_surface->output;
-        wlr_surface_send_enter(popup->wlr_popup->base->surface, wlr_output);
-        popup_damage(popup, true);
+        cursor_rebase_all();
 }
 
-static void popup_handle_unmap(struct wl_listener *listener, void *data) {
-        struct sway_layer_popup *popup = wl_container_of(listener, popup, unmap);
-        popup_damage(popup, true);
-}
+static void handle_unmap(struct wl_listener *listener, void *data) {
+        struct sway_layer_surface *surface = wl_container_of(
+                        listener, surface, unmap);
+        struct sway_seat *seat;
+        wl_list_for_each(seat, &server.input->seats, link) {
+                if (seat->focused_layer == surface->layer_surface) {
+                        seat_set_focus_layer(seat, NULL);
+                }
+        }
 
-static void popup_handle_commit(struct wl_listener *listener, void *data) {
-        struct sway_layer_popup *popup = wl_container_of(listener, popup, commit);
-        popup_damage(popup, false);
+        cursor_rebase_all();
 }
 
 static void popup_handle_destroy(struct wl_listener *listener, void *data) {
         struct sway_layer_popup *popup =
                 wl_container_of(listener, popup, destroy);
 
-        wl_list_remove(&popup->map.link);
-        wl_list_remove(&popup->unmap.link);
         wl_list_remove(&popup->destroy.link);
+        wl_list_remove(&popup->new_popup.link);
         wl_list_remove(&popup->commit.link);
         free(popup);
 }
 
 static void popup_unconstrain(struct sway_layer_popup *popup) {
-        struct sway_layer_surface *layer = popup_get_layer(popup);
         struct wlr_xdg_popup *wlr_popup = popup->wlr_popup;
+        struct sway_output *output = popup->toplevel->output;
 
-        struct sway_output *output = layer->layer_surface->output->data;
+        // if a client tries to create a popup while we are in the process of destroying
+        // its output, don't crash.
+        if (!output) {
+                return;
+        }
+
+        int lx, ly;
+        wlr_scene_node_coords(&popup->toplevel->scene->tree->node, &lx, &ly);
 
         // the output box expressed in the coordinate system of the toplevel parent
         // of the popup
         struct wlr_box output_toplevel_sx_box = {
-                .x = -layer->geo.x,
-                .y = -layer->geo.y,
+                .x = output->lx - lx,
+                .y = output->ly - ly,
                 .width = output->width,
                 .height = output->height,
         };
@@ -536,32 +301,38 @@ static void popup_unconstrain(struct sway_layer_popup *popup) {
         wlr_xdg_popup_unconstrain_from_box(wlr_popup, &output_toplevel_sx_box);
 }
 
+static void popup_handle_commit(struct wl_listener *listener, void *data) {
+        struct sway_layer_popup *popup = wl_container_of(listener, popup, commit);
+        if (popup->wlr_popup->base->initial_commit) {
+                popup_unconstrain(popup);
+        }
+}
+
 static void popup_handle_new_popup(struct wl_listener *listener, void *data);
 
 static struct sway_layer_popup *create_popup(struct wlr_xdg_popup *wlr_popup,
-                enum layer_parent parent_type, void *parent) {
-        struct sway_layer_popup *popup =
-                calloc(1, sizeof(struct sway_layer_popup));
+                struct sway_layer_surface *toplevel, struct wlr_scene_tree *parent) {
+        struct sway_layer_popup *popup = calloc(1, sizeof(*popup));
         if (popup == NULL) {
                 return NULL;
         }
 
+        popup->toplevel = toplevel;
         popup->wlr_popup = wlr_popup;
-        popup->parent_type = parent_type;
-        popup->parent_layer = parent;
+        popup->scene = wlr_scene_xdg_surface_create(parent,
+                wlr_popup->base);
+
+        if (!popup->scene) {
+                free(popup);
+                return NULL;
+        }
 
-        popup->map.notify = popup_handle_map;
-        wl_signal_add(&wlr_popup->base->events.map, &popup->map);
-        popup->unmap.notify = popup_handle_unmap;
-        wl_signal_add(&wlr_popup->base->events.unmap, &popup->unmap);
         popup->destroy.notify = popup_handle_destroy;
         wl_signal_add(&wlr_popup->base->events.destroy, &popup->destroy);
-        popup->commit.notify = popup_handle_commit;
-        wl_signal_add(&wlr_popup->base->surface->events.commit, &popup->commit);
         popup->new_popup.notify = popup_handle_new_popup;
         wl_signal_add(&wlr_popup->base->events.new_popup, &popup->new_popup);
-
-        popup_unconstrain(popup);
+        popup->commit.notify = popup_handle_commit;
+        wl_signal_add(&wlr_popup->base->surface->events.commit, &popup->commit);
 
         return popup;
 }
@@ -570,19 +341,14 @@ static void popup_handle_new_popup(struct wl_listener *listener, void *data) {
         struct sway_layer_popup *sway_layer_popup =
                 wl_container_of(listener, sway_layer_popup, new_popup);
         struct wlr_xdg_popup *wlr_popup = data;
-        create_popup(wlr_popup, LAYER_PARENT_POPUP, sway_layer_popup);
+        create_popup(wlr_popup, sway_layer_popup->toplevel, sway_layer_popup->scene);
 }
 
 static void handle_new_popup(struct wl_listener *listener, void *data) {
         struct sway_layer_surface *sway_layer_surface =
                 wl_container_of(listener, sway_layer_surface, new_popup);
         struct wlr_xdg_popup *wlr_popup = data;
-        create_popup(wlr_popup, LAYER_PARENT_LAYER, sway_layer_surface);
-}
-
-struct sway_layer_surface *layer_from_wlr_layer_surface_v1(
-                struct wlr_layer_surface_v1 *layer_surface) {
-        return layer_surface->data;
+        create_popup(wlr_popup, sway_layer_surface, sway_layer_surface->popups);
 }
 
 void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
@@ -590,14 +356,14 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
         sway_log(SWAY_DEBUG, "new layer surface: namespace %s layer %d anchor %" PRIu32
                         " size %" PRIu32 "x%" PRIu32 " margin %" PRIu32 ",%" PRIu32 ",%" PRIu32 ",%" PRIu32 ",",
                 layer_surface->namespace,
-                layer_surface->client_pending.layer,
-                layer_surface->client_pending.anchor,
-                layer_surface->client_pending.desired_width,
-                layer_surface->client_pending.desired_height,
-                layer_surface->client_pending.margin.top,
-                layer_surface->client_pending.margin.right,
-                layer_surface->client_pending.margin.bottom,
-                layer_surface->client_pending.margin.left);
+                layer_surface->pending.layer,
+                layer_surface->pending.anchor,
+                layer_surface->pending.desired_width,
+                layer_surface->pending.desired_height,
+                layer_surface->pending.margin.top,
+                layer_surface->pending.margin.right,
+                layer_surface->pending.margin.bottom,
+                layer_surface->pending.margin.left);
 
         if (!layer_surface->output) {
                 // Assign last active output
@@ -609,12 +375,12 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
                                 output = ws->output;
                         }
                 }
-                if (!output || output == root->noop_output) {
+                if (!output || output == root->fallback_output) {
                         if (!root->outputs->length) {
                                 sway_log(SWAY_ERROR,
                                                 "no output to auto-assign layer surface '%s' to",
                                                 layer_surface->namespace);
-                                wlr_layer_surface_v1_close(layer_surface);
+                                wlr_layer_surface_v1_destroy(layer_surface);
                                 return;
                         }
                         output = root->outputs->items[0];
@@ -622,42 +388,51 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
                 layer_surface->output = output->wlr_output;
         }
 
-        struct sway_layer_surface *sway_layer =
-                calloc(1, sizeof(struct sway_layer_surface));
-        if (!sway_layer) {
+        struct sway_output *output = layer_surface->output->data;
+
+        enum zwlr_layer_shell_v1_layer layer_type = layer_surface->pending.layer;
+        struct wlr_scene_tree *output_layer = sway_layer_get_scene(
+                output, layer_type);
+        struct wlr_scene_layer_surface_v1 *scene_surface =
+                wlr_scene_layer_surface_v1_create(output_layer, layer_surface);
+        if (!scene_surface) {
+                sway_log(SWAY_ERROR, "Could not allocate a layer_surface_v1");
                 return;
         }
 
-        sway_layer->surface_commit.notify = handle_surface_commit;
-        wl_signal_add(&layer_surface->surface->events.commit,
-                &sway_layer->surface_commit);
-
-        sway_layer->destroy.notify = handle_destroy;
-        wl_signal_add(&layer_surface->events.destroy, &sway_layer->destroy);
-        sway_layer->map.notify = handle_map;
-        wl_signal_add(&layer_surface->events.map, &sway_layer->map);
-        sway_layer->unmap.notify = handle_unmap;
-        wl_signal_add(&layer_surface->events.unmap, &sway_layer->unmap);
-        sway_layer->new_popup.notify = handle_new_popup;
-        wl_signal_add(&layer_surface->events.new_popup, &sway_layer->new_popup);
-        sway_layer->new_subsurface.notify = handle_new_subsurface;
-        wl_signal_add(&layer_surface->surface->events.new_subsurface,
-                        &sway_layer->new_subsurface);
-
-        sway_layer->layer_surface = layer_surface;
-        layer_surface->data = sway_layer;
+        struct sway_layer_surface *surface =
+                sway_layer_surface_create(scene_surface);
+        if (!surface) {
+                wlr_layer_surface_v1_destroy(layer_surface);
 
-        struct sway_output *output = layer_surface->output->data;
-        sway_layer->output_destroy.notify = handle_output_destroy;
-        wl_signal_add(&output->events.destroy, &sway_layer->output_destroy);
-
-        wl_list_insert(&output->layers[layer_surface->client_pending.layer],
-                        &sway_layer->link);
-
-        // Temporarily set the layer's current state to client_pending
-        // So that we can easily arrange it
-        struct wlr_layer_surface_v1_state old_state = layer_surface->current;
-        layer_surface->current = layer_surface->client_pending;
-        arrange_layers(output);
-        layer_surface->current = old_state;
+                sway_log(SWAY_ERROR, "Could not allocate a sway_layer_surface");
+                return;
+        }
+
+        if (!scene_descriptor_assign(&scene_surface->tree->node,
+                        SWAY_SCENE_DESC_LAYER_SHELL, surface)) {
+                sway_log(SWAY_ERROR, "Failed to allocate a layer surface descriptor");
+                // destroying the layer_surface will also destroy its corresponding
+                // scene node
+                wlr_layer_surface_v1_destroy(layer_surface);
+                return;
+        }
+
+        surface->output = output;
+
+        surface->surface_commit.notify = handle_surface_commit;
+        wl_signal_add(&layer_surface->surface->events.commit,
+                &surface->surface_commit);
+        surface->map.notify = handle_map;
+        wl_signal_add(&layer_surface->surface->events.map, &surface->map);
+        surface->unmap.notify = handle_unmap;
+        wl_signal_add(&layer_surface->surface->events.unmap, &surface->unmap);
+        surface->new_popup.notify = handle_new_popup;
+        wl_signal_add(&layer_surface->events.new_popup, &surface->new_popup);
+
+        surface->output_destroy.notify = handle_output_destroy;
+        wl_signal_add(&output->events.disable, &surface->output_destroy);
+
+        surface->node_destroy.notify = handle_node_destroy;
+        wl_signal_add(&scene_surface->tree->node.events.destroy, &surface->node_destroy);
 }
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 5edc8f96..9c4baafd 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -4,39 +4,57 @@
 #include <strings.h>
 #include <time.h>
 #include <wayland-server-core.h>
+#include <wlr/config.h>
+#include <wlr/backend/headless.h>
+#include <wlr/render/swapchain.h>
 #include <wlr/render/wlr_renderer.h>
-#include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_buffer.h>
+#include <wlr/types/wlr_gamma_control_v1.h>
 #include <wlr/types/wlr_matrix.h>
-#include <wlr/types/wlr_output_damage.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_presentation_time.h>
-#include <wlr/types/wlr_surface.h>
+#include <wlr/types/wlr_compositor.h>
 #include <wlr/util/region.h>
+#include <wlr/util/transform.h>
 #include "config.h"
 #include "log.h"
 #include "sway/config.h"
 #include "sway/desktop/transaction.h"
 #include "sway/input/input-manager.h"
 #include "sway/input/seat.h"
+#include "sway/ipc-server.h"
 #include "sway/layers.h"
 #include "sway/output.h"
+#include "sway/scene_descriptor.h"
 #include "sway/server.h"
-#include "sway/surface.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/container.h"
 #include "sway/tree/root.h"
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
 
+#if WLR_HAS_DRM_BACKEND
+#include <wlr/backend/drm.h>
+#include <wlr/types/wlr_drm_lease_v1.h>
+#endif
+
+bool output_match_name_or_id(struct sway_output *output,
+                const char *name_or_id) {
+        if (strcmp(name_or_id, "*") == 0) {
+                return true;
+        }
+
+        char identifier[128];
+        output_get_identifier(identifier, sizeof(identifier), output);
+        return strcasecmp(identifier, name_or_id) == 0
+                || strcasecmp(output->wlr_output->name, name_or_id) == 0;
+}
+
 struct sway_output *output_by_name_or_id(const char *name_or_id) {
         for (int i = 0; i < root->outputs->length; ++i) {
                 struct sway_output *output = root->outputs->items[i];
-                char identifier[128];
-                output_get_identifier(identifier, sizeof(identifier), output);
-                if (strcasecmp(identifier, name_or_id) == 0
-                                || strcasecmp(output->wlr_output->name, name_or_id) == 0) {
+                if (output_match_name_or_id(output, name_or_id)) {
                         return output;
                 }
         }
@@ -46,583 +64,209 @@ struct sway_output *output_by_name_or_id(const char *name_or_id) {
 struct sway_output *all_output_by_name_or_id(const char *name_or_id) {
         struct sway_output *output;
         wl_list_for_each(output, &root->all_outputs, link) {
-                char identifier[128];
-                output_get_identifier(identifier, sizeof(identifier), output);
-                if (strcasecmp(identifier, name_or_id) == 0
-                                || strcasecmp(output->wlr_output->name, name_or_id) == 0) {
+                if (output_match_name_or_id(output, name_or_id)) {
                         return output;
                 }
         }
         return NULL;
 }
 
-/**
- * Rotate a child's position relative to a parent. The parent size is (pw, ph),
- * the child position is (*sx, *sy) and its size is (sw, sh).
- */
-static void rotate_child_position(double *sx, double *sy, double sw, double sh,
-                double pw, double ph, float rotation) {
-        if (rotation == 0.0f) {
-                return;
-        }
 
-        // Coordinates relative to the center of the subsurface
-        double ox = *sx - pw/2 + sw/2,
-                oy = *sy - ph/2 + sh/2;
-        // Rotated coordinates
-        double rx = cos(-rotation)*ox - sin(-rotation)*oy,
-                ry = cos(-rotation)*oy + sin(-rotation)*ox;
-        *sx = rx + pw/2 - sw/2;
-        *sy = ry + ph/2 - sh/2;
+struct sway_workspace *output_get_active_workspace(struct sway_output *output) {
+        struct sway_seat *seat = input_manager_current_seat();
+        struct sway_node *focus = seat_get_active_tiling_child(seat, &output->node);
+        if (!focus) {
+                if (!output->workspaces->length) {
+                        return NULL;
+                }
+                return output->workspaces->items[0];
+        }
+        return focus->sway_workspace;
 }
 
-struct surface_iterator_data {
-        sway_surface_iterator_func_t user_iterator;
-        void *user_data;
-
+struct send_frame_done_data {
+        struct timespec when;
+        int msec_until_refresh;
         struct sway_output *output;
-        struct sway_view *view;
-        double ox, oy;
-        int width, height;
-        float rotation;
 };
 
-static bool get_surface_box(struct surface_iterator_data *data,
-                struct wlr_surface *surface, int sx, int sy,
-                struct wlr_box *surface_box) {
-        struct sway_output *output = data->output;
-
-        if (!wlr_surface_has_buffer(surface)) {
-                return false;
-        }
-
-        int sw = surface->current.width;
-        int sh = surface->current.height;
-
-        double _sx = sx + surface->sx;
-        double _sy = sy + surface->sy;
-        rotate_child_position(&_sx, &_sy, sw, sh, data->width, data->height,
-                data->rotation);
-
-        struct wlr_box box = {
-                .x = data->ox + _sx,
-                .y = data->oy + _sy,
-                .width = sw,
-                .height = sh,
-        };
-        if (surface_box != NULL) {
-                memcpy(surface_box, &box, sizeof(struct wlr_box));
-        }
-
-        struct wlr_box rotated_box;
-        wlr_box_rotated_bounds(&rotated_box, &box, data->rotation);
-
-        struct wlr_box output_box = {
-                .width = output->width,
-                .height = output->height,
-        };
-
-        struct wlr_box intersection;
-        return wlr_box_intersection(&intersection, &output_box, &rotated_box);
-}
-
-static void output_for_each_surface_iterator(struct wlr_surface *surface,
-                int sx, int sy, void *_data) {
-        struct surface_iterator_data *data = _data;
-
-        struct wlr_box box;
-        bool intersects = get_surface_box(data, surface, sx, sy, &box);
-        if (!intersects) {
-                return;
-        }
-
-        data->user_iterator(data->output, data->view, surface, &box, data->rotation,
-                data->user_data);
-}
+struct buffer_timer {
+        struct wl_listener destroy;
+        struct wl_event_source *frame_done_timer;
+};
 
-void output_surface_for_each_surface(struct sway_output *output,
-                struct wlr_surface *surface, double ox, double oy,
-                sway_surface_iterator_func_t iterator, void *user_data) {
-        struct surface_iterator_data data = {
-                .user_iterator = iterator,
-                .user_data = user_data,
-                .output = output,
-                .view = NULL,
-                .ox = ox,
-                .oy = oy,
-                .width = surface->current.width,
-                .height = surface->current.height,
-                .rotation = 0,
-        };
-
-        wlr_surface_for_each_surface(surface,
-                output_for_each_surface_iterator, &data);
-}
+static int handle_buffer_timer(void *data) {
+        struct wlr_scene_buffer *buffer = data;
 
-void output_view_for_each_surface(struct sway_output *output,
-                struct sway_view *view, sway_surface_iterator_func_t iterator,
-                void *user_data) {
-        struct surface_iterator_data data = {
-                .user_iterator = iterator,
-                .user_data = user_data,
-                .output = output,
-                .view = view,
-                .ox = view->container->surface_x - output->lx
-                        - view->geometry.x,
-                .oy = view->container->surface_y - output->ly
-                        - view->geometry.y,
-                .width = view->container->current.content_width,
-                .height = view->container->current.content_height,
-                .rotation = 0, // TODO
-        };
-
-        view_for_each_surface(view, output_for_each_surface_iterator, &data);
+        struct timespec now;
+        clock_gettime(CLOCK_MONOTONIC, &now);
+        wlr_scene_buffer_send_frame_done(buffer, &now);
+        return 0;
 }
 
-void output_view_for_each_popup_surface(struct sway_output *output,
-                struct sway_view *view, sway_surface_iterator_func_t iterator,
-                void *user_data) {
-        struct surface_iterator_data data = {
-                .user_iterator = iterator,
-                .user_data = user_data,
-                .output = output,
-                .view = view,
-                .ox = view->container->surface_x - output->lx
-                        - view->geometry.x,
-                .oy = view->container->surface_y - output->ly
-                        - view->geometry.y,
-                .width = view->container->current.content_width,
-                .height = view->container->current.content_height,
-                .rotation = 0, // TODO
-        };
-
-        view_for_each_popup_surface(view, output_for_each_surface_iterator, &data);
-}
+static void handle_buffer_timer_destroy(struct wl_listener *listener,
+                void *data) {
+        struct buffer_timer *timer = wl_container_of(listener, timer, destroy);
 
-void output_layer_for_each_surface(struct sway_output *output,
-                struct wl_list *layer_surfaces, sway_surface_iterator_func_t iterator,
-                void *user_data) {
-        struct sway_layer_surface *layer_surface;
-        wl_list_for_each(layer_surface, layer_surfaces, link) {
-                struct wlr_layer_surface_v1 *wlr_layer_surface_v1 =
-                        layer_surface->layer_surface;
-                output_surface_for_each_surface(output, wlr_layer_surface_v1->surface,
-                        layer_surface->geo.x, layer_surface->geo.y, iterator,
-                        user_data);
-
-                struct wlr_xdg_popup *state;
-                wl_list_for_each(state, &wlr_layer_surface_v1->popups, link) {
-                        struct wlr_xdg_surface *popup = state->base;
-                        if (!popup->configured) {
-                                continue;
-                        }
-
-                        double popup_sx, popup_sy;
-                        popup_sx = layer_surface->geo.x +
-                                popup->popup->geometry.x - popup->geometry.x;
-                        popup_sy = layer_surface->geo.y +
-                                popup->popup->geometry.y - popup->geometry.y;
-
-                        struct wlr_surface *surface = popup->surface;
-
-                        struct surface_iterator_data data = {
-                                .user_iterator = iterator,
-                                .user_data = user_data,
-                                .output = output,
-                                .view = NULL,
-                                .ox = popup_sx,
-                                .oy = popup_sy,
-                                .width = surface->current.width,
-                                .height = surface->current.height,
-                                .rotation = 0,
-                        };
-
-                        wlr_xdg_surface_for_each_surface(
-                                        popup, output_for_each_surface_iterator, &data);
-                }
-        }
+        wl_list_remove(&timer->destroy.link);
+        wl_event_source_remove(timer->frame_done_timer);
+        free(timer);
 }
 
-void output_layer_for_each_toplevel_surface(struct sway_output *output,
-                struct wl_list *layer_surfaces, sway_surface_iterator_func_t iterator,
-                void *user_data) {
-        struct sway_layer_surface *layer_surface;
-        wl_list_for_each(layer_surface, layer_surfaces, link) {
-                struct wlr_layer_surface_v1 *wlr_layer_surface_v1 =
-                        layer_surface->layer_surface;
-                output_surface_for_each_surface(output, wlr_layer_surface_v1->surface,
-                        layer_surface->geo.x, layer_surface->geo.y, iterator,
-                        user_data);
+static struct buffer_timer *buffer_timer_get_or_create(struct wlr_scene_buffer *buffer) {
+        struct buffer_timer *timer =
+                scene_descriptor_try_get(&buffer->node, SWAY_SCENE_DESC_BUFFER_TIMER);
+        if (timer) {
+                return timer;
         }
-}
 
-
-void output_layer_for_each_popup_surface(struct sway_output *output,
-                struct wl_list *layer_surfaces, sway_surface_iterator_func_t iterator,
-                void *user_data) {
-        struct sway_layer_surface *layer_surface;
-        wl_list_for_each(layer_surface, layer_surfaces, link) {
-                struct wlr_layer_surface_v1 *wlr_layer_surface_v1 =
-                        layer_surface->layer_surface;
-
-                struct wlr_xdg_popup *state;
-                wl_list_for_each(state, &wlr_layer_surface_v1->popups, link) {
-                        struct wlr_xdg_surface *popup = state->base;
-                        if (!popup->configured) {
-                                continue;
-                        }
-
-                        double popup_sx, popup_sy;
-                        popup_sx = layer_surface->geo.x +
-                                popup->popup->geometry.x - popup->geometry.x;
-                        popup_sy = layer_surface->geo.y +
-                                popup->popup->geometry.y - popup->geometry.y;
-
-                        struct wlr_surface *surface = popup->surface;
-
-                        struct surface_iterator_data data = {
-                                .user_iterator = iterator,
-                                .user_data = user_data,
-                                .output = output,
-                                .view = NULL,
-                                .ox = popup_sx,
-                                .oy = popup_sy,
-                                .width = surface->current.width,
-                                .height = surface->current.height,
-                                .rotation = 0,
-                        };
-
-                        wlr_xdg_surface_for_each_surface(
-                                        popup, output_for_each_surface_iterator, &data);
-                }
+        timer = calloc(1, sizeof(struct buffer_timer));
+        if (!timer) {
+                return NULL;
         }
-}
 
-#if HAVE_XWAYLAND
-void output_unmanaged_for_each_surface(struct sway_output *output,
-                struct wl_list *unmanaged, sway_surface_iterator_func_t iterator,
-                void *user_data) {
-        struct sway_xwayland_unmanaged *unmanaged_surface;
-        wl_list_for_each(unmanaged_surface, unmanaged, link) {
-                struct wlr_xwayland_surface *xsurface =
-                        unmanaged_surface->wlr_xwayland_surface;
-                double ox = unmanaged_surface->lx - output->lx;
-                double oy = unmanaged_surface->ly - output->ly;
-
-                output_surface_for_each_surface(output, xsurface->surface, ox, oy,
-                        iterator, user_data);
+        timer->frame_done_timer = wl_event_loop_add_timer(server.wl_event_loop,
+                handle_buffer_timer, buffer);
+        if (!timer->frame_done_timer) {
+                free(timer);
+                return NULL;
         }
-}
-#endif
 
-void output_drag_icons_for_each_surface(struct sway_output *output,
-                struct wl_list *drag_icons, sway_surface_iterator_func_t iterator,
-                void *user_data) {
-        struct sway_drag_icon *drag_icon;
-        wl_list_for_each(drag_icon, drag_icons, link) {
-                double ox = drag_icon->x - output->lx;
-                double oy = drag_icon->y - output->ly;
-
-                if (drag_icon->wlr_drag_icon->mapped) {
-                        output_surface_for_each_surface(output,
-                                drag_icon->wlr_drag_icon->surface, ox, oy,
-                                iterator, user_data);
-                }
-        }
-}
+        scene_descriptor_assign(&buffer->node, SWAY_SCENE_DESC_BUFFER_TIMER, timer);
 
-static void for_each_surface_container_iterator(struct sway_container *con,
-                void *_data) {
-        if (!con->view || !view_is_visible(con->view)) {
-                return;
-        }
+        timer->destroy.notify = handle_buffer_timer_destroy;
+        wl_signal_add(&buffer->node.events.destroy, &timer->destroy);
 
-        struct surface_iterator_data *data = _data;
-        output_view_for_each_surface(data->output, con->view,
-                data->user_iterator, data->user_data);
+        return timer;
 }
 
-static void output_for_each_surface(struct sway_output *output,
-                sway_surface_iterator_func_t iterator, void *user_data) {
-        if (output_has_opaque_overlay_layer_surface(output)) {
-                goto overlay;
-        }
+static void send_frame_done_iterator(struct wlr_scene_buffer *buffer,
+                int x, int y, void *user_data) {
+        struct send_frame_done_data *data = user_data;
+        struct sway_output *output = data->output;
+        int view_max_render_time = 0;
 
-        struct surface_iterator_data data = {
-                .user_iterator = iterator,
-                .user_data = user_data,
-                .output = output,
-                .view = NULL,
-        };
-
-        struct sway_workspace *workspace = output_get_active_workspace(output);
-        struct sway_container *fullscreen_con = root->fullscreen_global;
-        if (!fullscreen_con) {
-                if (!workspace) {
-                        return;
-                }
-                fullscreen_con = workspace->current.fullscreen;
-        }
-        if (fullscreen_con) {
-                for_each_surface_container_iterator(fullscreen_con, &data);
-                container_for_each_child(fullscreen_con,
-                        for_each_surface_container_iterator, &data);
-
-                // TODO: Show transient containers for fullscreen global
-                if (fullscreen_con == workspace->current.fullscreen) {
-                        for (int i = 0; i < workspace->current.floating->length; ++i) {
-                                struct sway_container *floater =
-                                        workspace->current.floating->items[i];
-                                if (container_is_transient_for(floater, fullscreen_con)) {
-                                        for_each_surface_container_iterator(floater, &data);
-                                }
-                        }
-                }
-#if HAVE_XWAYLAND
-                output_unmanaged_for_each_surface(output, &root->xwayland_unmanaged,
-                        iterator, user_data);
-#endif
-        } else {
-                output_layer_for_each_surface(output,
-                        &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND],
-                        iterator, user_data);
-                output_layer_for_each_surface(output,
-                        &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM],
-                        iterator, user_data);
-
-                workspace_for_each_container(workspace,
-                        for_each_surface_container_iterator, &data);
-
-#if HAVE_XWAYLAND
-                output_unmanaged_for_each_surface(output, &root->xwayland_unmanaged,
-                        iterator, user_data);
-#endif
-                output_layer_for_each_surface(output,
-                        &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP],
-                        iterator, user_data);
+        if (buffer->primary_output != data->output->scene_output) {
+                return;
         }
 
-overlay:
-        output_layer_for_each_surface(output,
-                &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY],
-                iterator, user_data);
-        output_drag_icons_for_each_surface(output, &root->drag_icons,
-                iterator, user_data);
-}
-
-static int scale_length(int length, int offset, float scale) {
-        return round((offset + length) * scale) - round(offset * scale);
-}
-
-void scale_box(struct wlr_box *box, float scale) {
-        box->width = scale_length(box->width, box->x, scale);
-        box->height = scale_length(box->height, box->y, scale);
-        box->x = round(box->x * scale);
-        box->y = round(box->y * scale);
-}
-
-struct sway_workspace *output_get_active_workspace(struct sway_output *output) {
-        struct sway_seat *seat = input_manager_current_seat();
-        struct sway_node *focus = seat_get_active_tiling_child(seat, &output->node);
-        if (!focus) {
-                if (!output->workspaces->length) {
-                        return NULL;
+        struct wlr_scene_node *current = &buffer->node;
+        while (true) {
+                struct sway_view *view = scene_descriptor_try_get(current,
+                        SWAY_SCENE_DESC_VIEW);
+                if (view) {
+                        view_max_render_time = view->max_render_time;
+                        break;
                 }
-                return output->workspaces->items[0];
-        }
-        return focus->sway_workspace;
-}
 
-bool output_has_opaque_overlay_layer_surface(struct sway_output *output) {
-        struct sway_layer_surface *sway_layer_surface;
-        wl_list_for_each(sway_layer_surface,
-                        &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY], link) {
-                struct wlr_surface *wlr_surface = sway_layer_surface->layer_surface->surface;
-                pixman_box32_t output_box = {
-                        .x2 = output->width,
-                        .y2 = output->height,
-                };
-                pixman_region32_t surface_opaque_box;
-                pixman_region32_init(&surface_opaque_box);
-                pixman_region32_copy(&surface_opaque_box, &wlr_surface->opaque_region);
-                pixman_region32_translate(&surface_opaque_box,
-                        sway_layer_surface->geo.x, sway_layer_surface->geo.y);
-                pixman_region_overlap_t contains =
-                        pixman_region32_contains_rectangle(&surface_opaque_box, &output_box);
-                pixman_region32_fini(&surface_opaque_box);
-
-                if (contains == PIXMAN_REGION_IN) {
-                        return true;
+                if (!current->parent) {
+                        break;
                 }
-        }
-        return false;
-}
 
-struct send_frame_done_data {
-        struct timespec when;
-        int msec_until_refresh;
-};
-
-static void send_frame_done_iterator(struct sway_output *output, struct sway_view *view,
-                struct wlr_surface *surface, struct wlr_box *box, float rotation,
-                void *user_data) {
-        int view_max_render_time = 0;
-        if (view != NULL) {
-                view_max_render_time = view->max_render_time;
+                current = &current->parent->node;
         }
 
-        struct send_frame_done_data *data = user_data;
-
         int delay = data->msec_until_refresh - output->max_render_time
                         - view_max_render_time;
 
-        if (output->max_render_time == 0 || view_max_render_time == 0 || delay < 1) {
-                wlr_surface_send_frame_done(surface, &data->when);
-        } else {
-                struct sway_surface *sway_surface = surface->data;
-                wl_event_source_timer_update(sway_surface->frame_done_timer, delay);
-        }
-}
-
-static void send_frame_done(struct sway_output *output, struct send_frame_done_data *data) {
-        output_for_each_surface(output, send_frame_done_iterator, data);
-}
-
-static void count_surface_iterator(struct sway_output *output, struct sway_view *view,
-                struct wlr_surface *surface, struct wlr_box *_box, float rotation,
-                void *data) {
-        size_t *n = data;
-        (*n)++;
-}
-
-static bool scan_out_fullscreen_view(struct sway_output *output,
-                struct sway_view *view) {
-        struct wlr_output *wlr_output = output->wlr_output;
-        struct sway_workspace *workspace = output->current.active_workspace;
-        if (!sway_assert(workspace, "Expected an active workspace")) {
-                return false;
-        }
+        struct buffer_timer *timer = NULL;
 
-        if (!wl_list_empty(&view->saved_buffers)) {
-                return false;
+        if (output->max_render_time != 0 && view_max_render_time != 0 && delay > 0) {
+                timer = buffer_timer_get_or_create(buffer);
         }
 
-        for (int i = 0; i < workspace->current.floating->length; ++i) {
-                struct sway_container *floater =
-                        workspace->current.floating->items[i];
-                if (container_is_transient_for(floater, view->container)) {
-                        return false;
-                }
+        if (timer) {
+                wl_event_source_timer_update(timer->frame_done_timer, delay);
+        } else {
+                wlr_scene_buffer_send_frame_done(buffer, &data->when);
         }
+}
 
-#if HAVE_XWAYLAND
-        if (!wl_list_empty(&root->xwayland_unmanaged)) {
-                return false;
+static enum wlr_scale_filter_mode get_scale_filter(struct sway_output *output) {
+        switch (output->scale_filter) {
+        case SCALE_FILTER_LINEAR:
+                return WLR_SCALE_FILTER_BILINEAR;
+        case SCALE_FILTER_NEAREST:
+                return WLR_SCALE_FILTER_NEAREST;
+        default:
+                abort(); // unreachable
         }
-#endif
+}
 
-        if (!wl_list_empty(&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY])) {
-                return false;
-        }
-        if (!wl_list_empty(&root->drag_icons)) {
-                return false;
+static void output_configure_scene(struct sway_output *output,
+                struct wlr_scene_node *node, float opacity) {
+        if (!node->enabled) {
+                return;
         }
 
-        struct wlr_surface *surface = view->surface;
-        if (surface == NULL) {
-                return false;
-        }
-        size_t n_surfaces = 0;
-        output_view_for_each_surface(output, view,
-                count_surface_iterator, &n_surfaces);
-        if (n_surfaces != 1) {
-                return false;
+        struct sway_container *con =
+                scene_descriptor_try_get(node, SWAY_SCENE_DESC_CONTAINER);
+        if (con) {
+                opacity = con->alpha;
         }
 
-        if (surface->buffer == NULL) {
-                return false;
-        }
+        if (node->type == WLR_SCENE_NODE_BUFFER) {
+                struct wlr_scene_buffer *buffer = wlr_scene_buffer_from_node(node);
 
-        if ((float)surface->current.scale != wlr_output->scale ||
-                        surface->current.transform != wlr_output->transform) {
-                return false;
-        }
+                // hack: don't call the scene setter because that will damage all outputs
+                // We don't want to damage outputs that aren't our current output that
+                // we're configuring
+                buffer->filter_mode = get_scale_filter(output);
 
-        wlr_output_attach_buffer(wlr_output, &surface->buffer->base);
-        if (!wlr_output_test(wlr_output)) {
-                return false;
+                wlr_scene_buffer_set_opacity(buffer, opacity);
+        } else if (node->type == WLR_SCENE_NODE_TREE) {
+                struct wlr_scene_tree *tree = wlr_scene_tree_from_node(node);
+                struct wlr_scene_node *node;
+                wl_list_for_each(node, &tree->children, link) {
+                        output_configure_scene(output, node, opacity);
+                }
         }
-
-        wlr_presentation_surface_sampled_on_output(server.presentation, surface,
-                wlr_output);
-
-        return wlr_output_commit(wlr_output);
 }
 
 static int output_repaint_timer_handler(void *data) {
         struct sway_output *output = data;
-        if (output->wlr_output == NULL) {
-                return 0;
-        }
-
-        output->wlr_output->frame_pending = false;
 
-        struct sway_workspace *workspace = output->current.active_workspace;
-        if (workspace == NULL) {
+        if (!output->enabled) {
                 return 0;
         }
 
-        struct sway_container *fullscreen_con = root->fullscreen_global;
-        if (!fullscreen_con) {
-                fullscreen_con = workspace->current.fullscreen;
-        }
+        output->wlr_output->frame_pending = false;
 
-        if (fullscreen_con && fullscreen_con->view) {
-                // Try to scan-out the fullscreen view
-                static bool last_scanned_out = false;
-                bool scanned_out =
-                        scan_out_fullscreen_view(output, fullscreen_con->view);
+        output_configure_scene(output, &root->root_scene->tree.node, 1.0f);
 
-                if (scanned_out && !last_scanned_out) {
-                        sway_log(SWAY_DEBUG, "Scanning out fullscreen view on %s",
-                                output->wlr_output->name);
+        if (output->gamma_lut_changed) {
+                struct wlr_output_state pending;
+                wlr_output_state_init(&pending);
+                if (!wlr_scene_output_build_state(output->scene_output, &pending, NULL)) {
+                        return 0;
                 }
-                if (last_scanned_out && !scanned_out) {
-                        sway_log(SWAY_DEBUG, "Stopping fullscreen view scan out on %s",
-                                output->wlr_output->name);
+
+                output->gamma_lut_changed = false;
+                struct wlr_gamma_control_v1 *gamma_control =
+                        wlr_gamma_control_manager_v1_get_control(
+                        server.gamma_control_manager_v1, output->wlr_output);
+                if (!wlr_gamma_control_v1_apply(gamma_control, &pending)) {
+                        wlr_output_state_finish(&pending);
+                        return 0;
                 }
-                last_scanned_out = scanned_out;
 
-                if (scanned_out) {
+                if (!wlr_output_commit_state(output->wlr_output, &pending)) {
+                        wlr_gamma_control_v1_send_failed_and_destroy(gamma_control);
+                        wlr_output_state_finish(&pending);
                         return 0;
                 }
-        }
 
-        bool needs_frame;
-        pixman_region32_t damage;
-        pixman_region32_init(&damage);
-        if (!wlr_output_damage_attach_render(output->damage,
-                        &needs_frame, &damage)) {
+                wlr_output_state_finish(&pending);
                 return 0;
         }
 
-        if (needs_frame) {
-                struct timespec now;
-                clock_gettime(CLOCK_MONOTONIC, &now);
-
-                output_render(output, &now, &damage);
-        } else {
-                wlr_output_rollback(output->wlr_output);
-        }
-
-        pixman_region32_fini(&damage);
-
+        wlr_scene_output_commit(output->scene_output, NULL);
         return 0;
 }
 
-static void damage_handle_frame(struct wl_listener *listener, void *user_data) {
+static void handle_frame(struct wl_listener *listener, void *user_data) {
         struct sway_output *output =
-                wl_container_of(listener, output, damage_frame);
+                wl_container_of(listener, output, frame);
         if (!output->enabled || !output->wlr_output->enabled) {
                 return;
         }
@@ -633,9 +277,7 @@ static void damage_handle_frame(struct wl_listener *listener, void *user_data) {
 
         if (output->max_render_time != 0) {
                 struct timespec now;
-                clockid_t presentation_clock
-                        = wlr_backend_get_presentation_clock(server.backend);
-                clock_gettime(presentation_clock, &now);
+                clock_gettime(CLOCK_MONOTONIC, &now);
 
                 const long NSEC_IN_SECONDS = 1000000000;
                 struct timespec predicted_refresh = output->last_presentation;
@@ -682,124 +324,8 @@ static void damage_handle_frame(struct wl_listener *listener, void *user_data) {
         struct send_frame_done_data data = {0};
         clock_gettime(CLOCK_MONOTONIC, &data.when);
         data.msec_until_refresh = msec_until_refresh;
-        send_frame_done(output, &data);
-}
-
-void output_damage_whole(struct sway_output *output) {
-        // The output can exist with no wlr_output if it's just been disconnected
-        // and the transaction to evacuate it has't completed yet.
-        if (output && output->wlr_output && output->damage) {
-                wlr_output_damage_add_whole(output->damage);
-        }
-}
-
-static void damage_surface_iterator(struct sway_output *output, struct sway_view *view,
-                struct wlr_surface *surface, struct wlr_box *_box, float rotation,
-                void *_data) {
-        bool *data = _data;
-        bool whole = *data;
-
-        struct wlr_box box = *_box;
-        scale_box(&box, output->wlr_output->scale);
-
-        int center_x = box.x + box.width/2;
-        int center_y = box.y + box.height/2;
-
-        if (pixman_region32_not_empty(&surface->buffer_damage)) {
-                pixman_region32_t damage;
-                pixman_region32_init(&damage);
-                wlr_surface_get_effective_damage(surface, &damage);
-                wlr_region_scale(&damage, &damage, output->wlr_output->scale);
-                if (ceil(output->wlr_output->scale) > surface->current.scale) {
-                        // When scaling up a surface, it'll become blurry so we need to
-                        // expand the damage region
-                        wlr_region_expand(&damage, &damage,
-                                ceil(output->wlr_output->scale) - surface->current.scale);
-                }
-                pixman_region32_translate(&damage, box.x, box.y);
-                wlr_region_rotated_bounds(&damage, &damage, rotation,
-                        center_x, center_y);
-                wlr_output_damage_add(output->damage, &damage);
-                pixman_region32_fini(&damage);
-        }
-
-        if (whole) {
-                wlr_box_rotated_bounds(&box, &box, rotation);
-                wlr_output_damage_add_box(output->damage, &box);
-        }
-
-        if (!wl_list_empty(&surface->current.frame_callback_list)) {
-                wlr_output_schedule_frame(output->wlr_output);
-        }
-}
-
-void output_damage_surface(struct sway_output *output, double ox, double oy,
-                struct wlr_surface *surface, bool whole) {
-        output_surface_for_each_surface(output, surface, ox, oy,
-                damage_surface_iterator, &whole);
-}
-
-void output_damage_from_view(struct sway_output *output,
-                struct sway_view *view) {
-        if (!view_is_visible(view)) {
-                return;
-        }
-        bool whole = false;
-        output_view_for_each_surface(output, view, damage_surface_iterator, &whole);
-}
-
-// Expecting an unscaled box in layout coordinates
-void output_damage_box(struct sway_output *output, struct wlr_box *_box) {
-        struct wlr_box box;
-        memcpy(&box, _box, sizeof(struct wlr_box));
-        box.x -= output->lx;
-        box.y -= output->ly;
-        scale_box(&box, output->wlr_output->scale);
-        wlr_output_damage_add_box(output->damage, &box);
-}
-
-static void damage_child_views_iterator(struct sway_container *con,
-                void *data) {
-        if (!con->view || !view_is_visible(con->view)) {
-                return;
-        }
-        struct sway_output *output = data;
-        bool whole = true;
-        output_view_for_each_surface(output, con->view, damage_surface_iterator,
-                        &whole);
-}
-
-void output_damage_whole_container(struct sway_output *output,
-                struct sway_container *con) {
-        // Pad the box by 1px, because the width is a double and might be a fraction
-        struct wlr_box box = {
-                .x = con->current.x - output->lx - 1,
-                .y = con->current.y - output->ly - 1,
-                .width = con->current.width + 2,
-                .height = con->current.height + 2,
-        };
-        scale_box(&box, output->wlr_output->scale);
-        wlr_output_damage_add_box(output->damage, &box);
-        // Damage subsurfaces as well, which may extend outside the box
-        if (con->view) {
-                damage_child_views_iterator(con, output);
-        } else {
-                container_for_each_child(con, damage_child_views_iterator, output);
-        }
-}
-
-static void damage_handle_destroy(struct wl_listener *listener, void *data) {
-        struct sway_output *output =
-                wl_container_of(listener, output, damage_destroy);
-        if (!output->enabled) {
-                return;
-        }
-        output_disable(output);
-
-        wl_list_remove(&output->damage_destroy.link);
-        wl_list_remove(&output->damage_frame.link);
-
-        transaction_commit_dirty();
+        data.output = output;
+        wlr_scene_output_for_each_buffer(output->scene_output, send_frame_done_iterator, &data);
 }
 
 static void update_output_manager_config(struct sway_server *server) {
@@ -808,73 +334,61 @@ static void update_output_manager_config(struct sway_server *server) {
 
         struct sway_output *output;
         wl_list_for_each(output, &root->all_outputs, link) {
-                if (output == root->noop_output) {
+                if (output == root->fallback_output) {
                         continue;
                 }
                 struct wlr_output_configuration_head_v1 *config_head =
                         wlr_output_configuration_head_v1_create(config, output->wlr_output);
-                struct wlr_box *output_box = wlr_output_layout_get_box(
-                        root->output_layout, output->wlr_output);
-                // We mark the output enabled even if it is switched off by DPMS
-                config_head->state.enabled = output->enabled;
-                config_head->state.mode = output->current_mode;
-                if (output_box) {
-                        config_head->state.x = output_box->x;
-                        config_head->state.y = output_box->y;
-                }
+                struct wlr_box output_box;
+                wlr_output_layout_get_box(root->output_layout,
+                        output->wlr_output, &output_box);
+                // We mark the output enabled when it's switched off but not disabled
+                config_head->state.enabled = !wlr_box_empty(&output_box);
+                config_head->state.x = output_box.x;
+                config_head->state.y = output_box.y;
         }
 
         wlr_output_manager_v1_set_configuration(server->output_manager_v1, config);
+
+        ipc_event_output();
 }
 
-static void handle_destroy(struct wl_listener *listener, void *data) {
-        struct sway_output *output = wl_container_of(listener, output, destroy);
+static void begin_destroy(struct sway_output *output) {
         struct sway_server *server = output->server;
-        wl_signal_emit(&output->events.destroy, output);
 
         if (output->enabled) {
                 output_disable(output);
         }
+
         output_begin_destroy(output);
 
+        wl_list_remove(&output->link);
+
+        wl_list_remove(&output->layout_destroy.link);
         wl_list_remove(&output->destroy.link);
         wl_list_remove(&output->commit.link);
-        wl_list_remove(&output->mode.link);
         wl_list_remove(&output->present.link);
+        wl_list_remove(&output->frame.link);
+        wl_list_remove(&output->request_state.link);
+
+        wlr_scene_output_destroy(output->scene_output);
+        output->scene_output = NULL;
+        output->wlr_output->data = NULL;
+        output->wlr_output = NULL;
 
         transaction_commit_dirty();
 
         update_output_manager_config(server);
 }
 
-static void handle_mode(struct wl_listener *listener, void *data) {
-        struct sway_output *output = wl_container_of(listener, output, mode);
-        if (!output->enabled && !output->enabling) {
-                struct output_config *oc = find_output_config(output);
-                if (output->wlr_output->current_mode != NULL &&
-                                (!oc || oc->enabled)) {
-                        // We want to enable this output, but it didn't work last time,
-                        // possibly because we hadn't enough CRTCs. Try again now that the
-                        // output has a mode.
-                        sway_log(SWAY_DEBUG, "Output %s has gained a CRTC, "
-                                "trying to enable it", output->wlr_output->name);
-                        apply_output_config(oc, output);
-                }
-                return;
-        }
-        if (!output->enabled) {
-                return;
-        }
-        arrange_layers(output);
-        arrange_output(output);
-        transaction_commit_dirty();
-
-        update_output_manager_config(output->server);
+static void handle_destroy(struct wl_listener *listener, void *data) {
+        struct sway_output *output = wl_container_of(listener, output, destroy);
+        begin_destroy(output);
 }
 
-static void update_textures(struct sway_container *con, void *data) {
-        container_update_title_textures(con);
-        container_update_marks_textures(con);
+static void handle_layout_destroy(struct wl_listener *listener, void *data) {
+        struct sway_output *output = wl_container_of(listener, output, layout_destroy);
+        begin_destroy(output);
 }
 
 static void handle_commit(struct wl_listener *listener, void *data) {
@@ -885,24 +399,28 @@ static void handle_commit(struct wl_listener *listener, void *data) {
                 return;
         }
 
-        if (event->committed & WLR_OUTPUT_STATE_SCALE) {
-                output_for_each_container(output, update_textures, NULL);
-        }
-
-        if (event->committed & (WLR_OUTPUT_STATE_TRANSFORM | WLR_OUTPUT_STATE_SCALE)) {
+        if (event->state->committed & (
+                        WLR_OUTPUT_STATE_MODE |
+                        WLR_OUTPUT_STATE_TRANSFORM |
+                        WLR_OUTPUT_STATE_SCALE)) {
                 arrange_layers(output);
                 arrange_output(output);
                 transaction_commit_dirty();
 
                 update_output_manager_config(output->server);
         }
+
+        // Next time the output is enabled, try to re-apply the gamma LUT
+        if ((event->state->committed & WLR_OUTPUT_STATE_ENABLED) && !output->wlr_output->enabled) {
+                output->gamma_lut_changed = true;
+        }
 }
 
 static void handle_present(struct wl_listener *listener, void *data) {
         struct sway_output *output = wl_container_of(listener, output, present);
         struct wlr_output_event_present *output_event = data;
 
-        if (!output->enabled) {
+        if (!output->enabled || !output_event->presented) {
                 return;
         }
 
@@ -910,34 +428,90 @@ static void handle_present(struct wl_listener *listener, void *data) {
         output->refresh_nsec = output_event->refresh;
 }
 
+static void handle_request_state(struct wl_listener *listener, void *data) {
+        struct sway_output *output =
+                wl_container_of(listener, output, request_state);
+        const struct wlr_output_event_request_state *event = data;
+        wlr_output_commit_state(output->wlr_output, event->state);
+}
+
+static unsigned int last_headless_num = 0;
+
 void handle_new_output(struct wl_listener *listener, void *data) {
         struct sway_server *server = wl_container_of(listener, server, new_output);
         struct wlr_output *wlr_output = data;
-        sway_log(SWAY_DEBUG, "New output %p: %s", wlr_output, wlr_output->name);
+
+        if (wlr_output == root->fallback_output->wlr_output) {
+                return;
+        }
+
+        if (wlr_output_is_headless(wlr_output)) {
+                char name[64];
+                snprintf(name, sizeof(name), "HEADLESS-%u", ++last_headless_num);
+                wlr_output_set_name(wlr_output, name);
+        }
+
+        sway_log(SWAY_DEBUG, "New output %p: %s (non-desktop: %d)",
+                        wlr_output, wlr_output->name, wlr_output->non_desktop);
+
+        if (wlr_output->non_desktop) {
+                sway_log(SWAY_DEBUG, "Not configuring non-desktop output");
+                struct sway_output_non_desktop *non_desktop = output_non_desktop_create(wlr_output);
+#if WLR_HAS_DRM_BACKEND
+                if (server->drm_lease_manager) {
+                        wlr_drm_lease_v1_manager_offer_output(server->drm_lease_manager,
+                                        wlr_output);
+                }
+#endif
+                list_add(root->non_desktop_outputs, non_desktop);
+                return;
+        }
+
+        if (!wlr_output_init_render(wlr_output, server->allocator,
+                        server->renderer)) {
+                sway_log(SWAY_ERROR, "Failed to init output render");
+                return;
+        }
+
+        // Create the scene output here so we're not accidentally creating one for
+        // the fallback output
+        struct wlr_scene_output *scene_output =
+                wlr_scene_output_create(root->root_scene, wlr_output);
+        if (!scene_output) {
+                sway_log(SWAY_ERROR, "Failed to create a scene output");
+                return;
+        }
 
         struct sway_output *output = output_create(wlr_output);
         if (!output) {
+                sway_log(SWAY_ERROR, "Failed to create a sway output");
+                wlr_scene_output_destroy(scene_output);
                 return;
         }
+
         output->server = server;
-        output->damage = wlr_output_damage_create(wlr_output);
+        output->scene_output = scene_output;
 
+        wl_signal_add(&root->output_layout->events.destroy, &output->layout_destroy);
+        output->layout_destroy.notify = handle_layout_destroy;
         wl_signal_add(&wlr_output->events.destroy, &output->destroy);
         output->destroy.notify = handle_destroy;
         wl_signal_add(&wlr_output->events.commit, &output->commit);
         output->commit.notify = handle_commit;
-        wl_signal_add(&wlr_output->events.mode, &output->mode);
-        output->mode.notify = handle_mode;
         wl_signal_add(&wlr_output->events.present, &output->present);
         output->present.notify = handle_present;
-        wl_signal_add(&output->damage->events.frame, &output->damage_frame);
-        output->damage_frame.notify = damage_handle_frame;
-        wl_signal_add(&output->damage->events.destroy, &output->damage_destroy);
-        output->damage_destroy.notify = damage_handle_destroy;
+        wl_signal_add(&wlr_output->events.frame, &output->frame);
+        output->frame.notify = handle_frame;
+        wl_signal_add(&wlr_output->events.request_state, &output->request_state);
+        output->request_state.notify = handle_request_state;
 
         output->repaint_timer = wl_event_loop_add_timer(server->wl_event_loop,
                 output_repaint_timer_handler, output);
 
+        if (server->session_lock.lock) {
+                sway_session_lock_add_output(server->session_lock.lock, output);
+        }
+
         struct output_config *oc = find_output_config(output);
         apply_output_config(oc, output);
         free_output_config(oc);
@@ -954,6 +528,21 @@ void handle_output_layout_change(struct wl_listener *listener,
         update_output_manager_config(server);
 }
 
+void handle_gamma_control_set_gamma(struct wl_listener *listener, void *data) {
+        struct sway_server *server =
+                wl_container_of(listener, server, gamma_control_set_gamma);
+        const struct wlr_gamma_control_manager_v1_set_gamma_event *event = data;
+
+        struct sway_output *output = event->output->data;
+
+        if(!output) {
+                return;
+        }
+
+        output->gamma_lut_changed = true;
+        wlr_output_schedule_frame(output->wlr_output);
+}
+
 static void output_manager_apply(struct sway_server *server,
                 struct wlr_output_configuration_v1 *config, bool test_only) {
         // TODO: perform atomic tests on the whole backend atomically
@@ -1002,6 +591,7 @@ static void output_manager_apply(struct sway_server *server,
                 oc->y = config_head->state.y;
                 oc->transform = config_head->state.transform;
                 oc->scale = config_head->state.scale;
+                oc->adaptive_sync = config_head->state.adaptive_sync_enabled;
 
                 if (test_only) {
                         ok &= test_output_config(oc, output);
@@ -1047,10 +637,10 @@ void handle_output_power_manager_set_mode(struct wl_listener *listener,
         struct output_config *oc = new_output_config(output->wlr_output->name);
         switch (event->mode) {
         case ZWLR_OUTPUT_POWER_V1_MODE_OFF:
-                oc->dpms_state = DPMS_OFF;
+                oc->power = 0;
                 break;
         case ZWLR_OUTPUT_POWER_V1_MODE_ON:
-                oc->dpms_state = DPMS_ON;
+                oc->power = 1;
                 break;
         }
         oc = store_output_config(oc);
diff --git a/sway/desktop/render.c b/sway/desktop/render.c
deleted file mode 100644
index bd85282c..00000000
--- a/sway/desktop/render.c
+++ /dev/null
@@ -1,1125 +0,0 @@
-#define _POSIX_C_SOURCE 200809L
-#include <assert.h>
-#include <GLES2/gl2.h>
-#include <stdlib.h>
-#include <strings.h>
-#include <time.h>
-#include <wayland-server-core.h>
-#include <wlr/render/gles2.h>
-#include <wlr/render/wlr_renderer.h>
-#include <wlr/types/wlr_box.h>
-#include <wlr/types/wlr_buffer.h>
-#include <wlr/types/wlr_matrix.h>
-#include <wlr/types/wlr_output_damage.h>
-#include <wlr/types/wlr_output_layout.h>
-#include <wlr/types/wlr_output.h>
-#include <wlr/types/wlr_surface.h>
-#include <wlr/util/region.h>
-#include "log.h"
-#include "config.h"
-#include "sway/config.h"
-#include "sway/input/input-manager.h"
-#include "sway/input/seat.h"
-#include "sway/layers.h"
-#include "sway/output.h"
-#include "sway/server.h"
-#include "sway/tree/arrange.h"
-#include "sway/tree/container.h"
-#include "sway/tree/root.h"
-#include "sway/tree/view.h"
-#include "sway/tree/workspace.h"
-
-struct render_data {
-        pixman_region32_t *damage;
-        float alpha;
-};
-
-/**
- * Apply scale to a width or height.
- *
- * One does not simply multiply the width by the scale. We allow fractional
- * scaling, which means the resulting scaled width might be a decimal.
- * So we round it.
- *
- * But even this can produce undesirable results depending on the X or Y offset
- * of the box. For example, with a scale of 1.5, a box with width=1 should not
- * scale to 2px if its X coordinate is 1, because the X coordinate would have
- * scaled to 2px.
- */
-static int scale_length(int length, int offset, float scale) {
-        return round((offset + length) * scale) - round(offset * scale);
-}
-
-static void scissor_output(struct wlr_output *wlr_output,
-                pixman_box32_t *rect) {
-        struct wlr_renderer *renderer = wlr_backend_get_renderer(wlr_output->backend);
-        assert(renderer);
-
-        struct wlr_box box = {
-                .x = rect->x1,
-                .y = rect->y1,
-                .width = rect->x2 - rect->x1,
-                .height = rect->y2 - rect->y1,
-        };
-
-        int ow, oh;
-        wlr_output_transformed_resolution(wlr_output, &ow, &oh);
-
-        enum wl_output_transform transform =
-                wlr_output_transform_invert(wlr_output->transform);
-        wlr_box_transform(&box, &box, transform, ow, oh);
-
-        wlr_renderer_scissor(renderer, &box);
-}
-
-static void set_scale_filter(struct wlr_output *wlr_output,
-                struct wlr_texture *texture, enum scale_filter_mode scale_filter) {
-        if (!wlr_texture_is_gles2(texture)) {
-                return;
-        }
-
-        struct wlr_gles2_texture_attribs attribs;
-        wlr_gles2_texture_get_attribs(texture, &attribs);
-
-        glBindTexture(attribs.target, attribs.tex);
-
-        switch (scale_filter) {
-        case SCALE_FILTER_LINEAR:
-                glTexParameteri(attribs.target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-                break;
-        case SCALE_FILTER_NEAREST:
-                glTexParameteri(attribs.target, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-                break;
-        case SCALE_FILTER_DEFAULT:
-        case SCALE_FILTER_SMART:
-                assert(false); // unreachable
-        }
-}
-
-static void render_texture(struct wlr_output *wlr_output,
-                pixman_region32_t *output_damage, struct wlr_texture *texture,
-                const struct wlr_fbox *src_box, const struct wlr_box *dst_box,
-                const float matrix[static 9], float alpha) {
-        struct wlr_renderer *renderer =
-                wlr_backend_get_renderer(wlr_output->backend);
-        struct sway_output *output = wlr_output->data;
-
-        struct wlr_gles2_texture_attribs attribs;
-        wlr_gles2_texture_get_attribs(texture, &attribs);
-
-        pixman_region32_t damage;
-        pixman_region32_init(&damage);
-        pixman_region32_union_rect(&damage, &damage, dst_box->x, dst_box->y,
-                dst_box->width, dst_box->height);
-        pixman_region32_intersect(&damage, &damage, output_damage);
-        bool damaged = pixman_region32_not_empty(&damage);
-        if (!damaged) {
-                goto damage_finish;
-        }
-
-        int nrects;
-        pixman_box32_t *rects = pixman_region32_rectangles(&damage, &nrects);
-        for (int i = 0; i < nrects; ++i) {
-                scissor_output(wlr_output, &rects[i]);
-                set_scale_filter(wlr_output, texture, output->scale_filter);
-                if (src_box != NULL) {
-                        wlr_render_subtexture_with_matrix(renderer, texture, src_box, matrix, alpha);
-                } else {
-                        wlr_render_texture_with_matrix(renderer, texture, matrix, alpha);
-                }
-        }
-
-damage_finish:
-        pixman_region32_fini(&damage);
-}
-
-static void render_surface_iterator(struct sway_output *output, struct sway_view *view,
-                struct wlr_surface *surface, struct wlr_box *_box, float rotation,
-                void *_data) {
-        struct render_data *data = _data;
-        struct wlr_output *wlr_output = output->wlr_output;
-        pixman_region32_t *output_damage = data->damage;
-        float alpha = data->alpha;
-
-        struct wlr_texture *texture = wlr_surface_get_texture(surface);
-        if (!texture) {
-                return;
-        }
-
-        struct wlr_fbox src_box;
-        wlr_surface_get_buffer_source_box(surface, &src_box);
-
-        struct wlr_box dst_box = *_box;
-        scale_box(&dst_box, wlr_output->scale);
-
-        float matrix[9];
-        enum wl_output_transform transform =
-                wlr_output_transform_invert(surface->current.transform);
-        wlr_matrix_project_box(matrix, &dst_box, transform, rotation,
-                wlr_output->transform_matrix);
-
-        render_texture(wlr_output, output_damage, texture,
-                &src_box, &dst_box, matrix, alpha);
-
-        wlr_presentation_surface_sampled_on_output(server.presentation, surface,
-                wlr_output);
-}
-
-static void render_layer_toplevel(struct sway_output *output,
-                pixman_region32_t *damage, struct wl_list *layer_surfaces) {
-        struct render_data data = {
-                .damage = damage,
-                .alpha = 1.0f,
-        };
-        output_layer_for_each_toplevel_surface(output, layer_surfaces,
-                render_surface_iterator, &data);
-}
-
-static void render_layer_popups(struct sway_output *output,
-                pixman_region32_t *damage, struct wl_list *layer_surfaces) {
-        struct render_data data = {
-                .damage = damage,
-                .alpha = 1.0f,
-        };
-        output_layer_for_each_popup_surface(output, layer_surfaces,
-                render_surface_iterator, &data);
-}
-
-#if HAVE_XWAYLAND
-static void render_unmanaged(struct sway_output *output,
-                pixman_region32_t *damage, struct wl_list *unmanaged) {
-        struct render_data data = {
-                .damage = damage,
-                .alpha = 1.0f,
-        };
-        output_unmanaged_for_each_surface(output, unmanaged,
-                render_surface_iterator, &data);
-}
-#endif
-
-static void render_drag_icons(struct sway_output *output,
-                pixman_region32_t *damage, struct wl_list *drag_icons) {
-        struct render_data data = {
-                .damage = damage,
-                .alpha = 1.0f,
-        };
-        output_drag_icons_for_each_surface(output, drag_icons,
-                render_surface_iterator, &data);
-}
-
-// _box.x and .y are expected to be layout-local
-// _box.width and .height are expected to be output-buffer-local
-void render_rect(struct sway_output *output,
-                pixman_region32_t *output_damage, const struct wlr_box *_box,
-                float color[static 4]) {
-        struct wlr_output *wlr_output = output->wlr_output;
-        struct wlr_renderer *renderer =
-                wlr_backend_get_renderer(wlr_output->backend);
-
-        struct wlr_box box;
-        memcpy(&box, _box, sizeof(struct wlr_box));
-        box.x -= output->lx * wlr_output->scale;
-        box.y -= output->ly * wlr_output->scale;
-
-        pixman_region32_t damage;
-        pixman_region32_init(&damage);
-        pixman_region32_union_rect(&damage, &damage, box.x, box.y,
-                box.width, box.height);
-        pixman_region32_intersect(&damage, &damage, output_damage);
-        bool damaged = pixman_region32_not_empty(&damage);
-        if (!damaged) {
-                goto damage_finish;
-        }
-
-        int nrects;
-        pixman_box32_t *rects = pixman_region32_rectangles(&damage, &nrects);
-        for (int i = 0; i < nrects; ++i) {
-                scissor_output(wlr_output, &rects[i]);
-                wlr_render_rect(renderer, &box, color,
-                        wlr_output->transform_matrix);
-        }
-
-damage_finish:
-        pixman_region32_fini(&damage);
-}
-
-void premultiply_alpha(float color[4], float opacity) {
-        color[3] *= opacity;
-        color[0] *= color[3];
-        color[1] *= color[3];
-        color[2] *= color[3];
-}
-
-static void render_view_toplevels(struct sway_view *view,
-                struct sway_output *output, pixman_region32_t *damage, float alpha) {
-        struct render_data data = {
-                .damage = damage,
-                .alpha = alpha,
-        };
-        // Render all toplevels without descending into popups
-        double ox = view->container->surface_x -
-                output->lx - view->geometry.x;
-        double oy = view->container->surface_y -
-                output->ly - view->geometry.y;
-        output_surface_for_each_surface(output, view->surface, ox, oy,
-                        render_surface_iterator, &data);
-}
-
-static void render_view_popups(struct sway_view *view,
-                struct sway_output *output, pixman_region32_t *damage, float alpha) {
-        struct render_data data = {
-                .damage = damage,
-                .alpha = alpha,
-        };
-        output_view_for_each_popup_surface(output, view,
-                render_surface_iterator, &data);
-}
-
-static void render_saved_view(struct sway_view *view,
-                struct sway_output *output, pixman_region32_t *damage, float alpha) {
-        struct wlr_output *wlr_output = output->wlr_output;
-
-        if (wl_list_empty(&view->saved_buffers)) {
-                return;
-        }
-        struct sway_saved_buffer *saved_buf;
-        wl_list_for_each(saved_buf, &view->saved_buffers, link) {
-                if (!saved_buf->buffer->texture) {
-                        continue;
-                }
-
-                struct wlr_box box = {
-                        .x = view->container->surface_x - output->lx -
-                                view->saved_geometry.x + saved_buf->x,
-                        .y = view->container->surface_y - output->ly -
-                                view->saved_geometry.y + saved_buf->y,
-                        .width = saved_buf->width,
-                        .height = saved_buf->height,
-                };
-
-                struct wlr_box output_box = {
-                        .width = output->width,
-                        .height = output->height,
-                };
-
-                struct wlr_box intersection;
-                bool intersects = wlr_box_intersection(&intersection, &output_box, &box);
-                if (!intersects) {
-                        continue;
-                }
-
-                scale_box(&box, wlr_output->scale);
-
-                float matrix[9];
-                enum wl_output_transform transform = wlr_output_transform_invert(saved_buf->transform);
-                wlr_matrix_project_box(matrix, &box, transform, 0,
-                        wlr_output->transform_matrix);
-
-                render_texture(wlr_output, damage, saved_buf->buffer->texture,
-                        &saved_buf->source_box, &box, matrix, alpha);
-        }
-
-        // FIXME: we should set the surface that this saved buffer originates from
-        // as sampled here.
-        // https://github.com/swaywm/sway/pull/4465#discussion_r321082059
-}
-
-/**
- * Render a view's surface and left/bottom/right borders.
- */
-static void render_view(struct sway_output *output, pixman_region32_t *damage,
-                struct sway_container *con, struct border_colors *colors) {
-        struct sway_view *view = con->view;
-        if (!wl_list_empty(&view->saved_buffers)) {
-                render_saved_view(view, output, damage, view->container->alpha);
-        } else if (view->surface) {
-                render_view_toplevels(view, output, damage, view->container->alpha);
-        }
-
-        if (con->current.border == B_NONE || con->current.border == B_CSD) {
-                return;
-        }
-
-        struct wlr_box box;
-        float output_scale = output->wlr_output->scale;
-        float color[4];
-        struct sway_container_state *state = &con->current;
-
-        if (state->border_left) {
-                memcpy(&color, colors->child_border, sizeof(float) * 4);
-                premultiply_alpha(color, con->alpha);
-                box.x = state->x;
-                box.y = state->content_y;
-                box.width = state->border_thickness;
-                box.height = state->content_height;
-                scale_box(&box, output_scale);
-                render_rect(output, damage, &box, color);
-        }
-
-        list_t *siblings = container_get_current_siblings(con);
-        enum sway_container_layout layout =
-                container_current_parent_layout(con);
-
-        if (state->border_right) {
-                if (!container_is_floating(con) && siblings->length == 1 && layout == L_HORIZ) {
-                        memcpy(&color, colors->indicator, sizeof(float) * 4);
-                } else {
-                        memcpy(&color, colors->child_border, sizeof(float) * 4);
-                }
-                premultiply_alpha(color, con->alpha);
-                box.x = state->content_x + state->content_width;
-                box.y = state->content_y;
-                box.width = state->border_thickness;
-                box.height = state->content_height;
-                scale_box(&box, output_scale);
-                render_rect(output, damage, &box, color);
-        }
-
-        if (state->border_bottom) {
-                if (!container_is_floating(con) && siblings->length == 1 && layout == L_VERT) {
-                        memcpy(&color, colors->indicator, sizeof(float) * 4);
-                } else {
-                        memcpy(&color, colors->child_border, sizeof(float) * 4);
-                }
-                premultiply_alpha(color, con->alpha);
-                box.x = state->x;
-                box.y = state->content_y + state->content_height;
-                box.width = state->width;
-                box.height = state->border_thickness;
-                scale_box(&box, output_scale);
-                render_rect(output, damage, &box, color);
-        }
-}
-
-/**
- * Render a titlebar.
- *
- * Care must be taken not to render over the same pixel multiple times,
- * otherwise the colors will be incorrect when using opacity.
- *
- * The height is: 1px border, 3px padding, font height, 3px padding, 1px border
- * The left side is: 1px border, 2px padding, title
- */
-static void render_titlebar(struct sway_output *output,
-                pixman_region32_t *output_damage, struct sway_container *con,
-                int x, int y, int width,
-                struct border_colors *colors, struct wlr_texture *title_texture,
-                struct wlr_texture *marks_texture) {
-        struct wlr_box box;
-        float color[4];
-        float output_scale = output->wlr_output->scale;
-        double output_x = output->lx;
-        double output_y = output->ly;
-        int titlebar_border_thickness = config->titlebar_border_thickness;
-        int titlebar_h_padding = config->titlebar_h_padding;
-        int titlebar_v_padding = config->titlebar_v_padding;
-        enum alignment title_align = config->title_align;
-
-        // Single pixel bar above title
-        memcpy(&color, colors->border, sizeof(float) * 4);
-        premultiply_alpha(color, con->alpha);
-        box.x = x;
-        box.y = y;
-        box.width = width;
-        box.height = titlebar_border_thickness;
-        scale_box(&box, output_scale);
-        render_rect(output, output_damage, &box, color);
-
-        // Single pixel bar below title
-        box.x = x;
-        box.y = y + container_titlebar_height() - titlebar_border_thickness;
-        box.width = width;
-        box.height = titlebar_border_thickness;
-        scale_box(&box, output_scale);
-        render_rect(output, output_damage, &box, color);
-
-        // Single pixel left edge
-        box.x = x;
-        box.y = y + titlebar_border_thickness;
-        box.width = titlebar_border_thickness;
-        box.height = container_titlebar_height() - titlebar_border_thickness * 2;
-        scale_box(&box, output_scale);
-        render_rect(output, output_damage, &box, color);
-
-        // Single pixel right edge
-        box.x = x + width - titlebar_border_thickness;
-        box.y = y + titlebar_border_thickness;
-        box.width = titlebar_border_thickness;
-        box.height = container_titlebar_height() - titlebar_border_thickness * 2;
-        scale_box(&box, output_scale);
-        render_rect(output, output_damage, &box, color);
-
-        int inner_x = x - output_x + titlebar_h_padding;
-        int bg_y = y + titlebar_border_thickness;
-        size_t inner_width = width - titlebar_h_padding * 2;
-
-        // output-buffer local
-        int ob_inner_x = round(inner_x * output_scale);
-        int ob_inner_width = scale_length(inner_width, inner_x, output_scale);
-        int ob_bg_height = scale_length(
-                        (titlebar_v_padding - titlebar_border_thickness) * 2 +
-                        config->font_height, bg_y, output_scale);
-
-        // Marks
-        int ob_marks_x = 0; // output-buffer-local
-        int ob_marks_width = 0; // output-buffer-local
-        if (config->show_marks && marks_texture) {
-                struct wlr_box texture_box;
-                wlr_texture_get_size(marks_texture,
-                        &texture_box.width, &texture_box.height);
-                ob_marks_width = texture_box.width;
-
-                // The marks texture might be shorter than the config->font_height, in
-                // which case we need to pad it as evenly as possible above and below.
-                int ob_padding_total = ob_bg_height - texture_box.height;
-                int ob_padding_above = floor(ob_padding_total / 2.0);
-                int ob_padding_below = ceil(ob_padding_total / 2.0);
-
-                // Render texture. If the title is on the right, the marks will be on
-                // the left. Otherwise, they will be on the right.
-                if (title_align == ALIGN_RIGHT || texture_box.width > ob_inner_width) {
-                        texture_box.x = ob_inner_x;
-                } else {
-                        texture_box.x = ob_inner_x + ob_inner_width - texture_box.width;
-                }
-                ob_marks_x = texture_box.x;
-
-                texture_box.y = round((bg_y - output_y) * output_scale) +
-                        ob_padding_above;
-
-                float matrix[9];
-                wlr_matrix_project_box(matrix, &texture_box,
-                        WL_OUTPUT_TRANSFORM_NORMAL,
-                        0.0, output->wlr_output->transform_matrix);
-
-                if (ob_inner_width < texture_box.width) {
-                        texture_box.width = ob_inner_width;
-                }
-                render_texture(output->wlr_output, output_damage, marks_texture,
-                        NULL, &texture_box, matrix, con->alpha);
-
-                // Padding above
-                memcpy(&color, colors->background, sizeof(float) * 4);
-                premultiply_alpha(color, con->alpha);
-                box.x = texture_box.x + round(output_x * output_scale);
-                box.y = round((y + titlebar_border_thickness) * output_scale);
-                box.width = texture_box.width;
-                box.height = ob_padding_above;
-                render_rect(output, output_damage, &box, color);
-
-                // Padding below
-                box.y += ob_padding_above + texture_box.height;
-                box.height = ob_padding_below;
-                render_rect(output, output_damage, &box, color);
-        }
-
-        // Title text
-        int ob_title_x = 0;  // output-buffer-local
-        int ob_title_width = 0; // output-buffer-local
-        if (title_texture) {
-                struct wlr_box texture_box;
-                wlr_texture_get_size(title_texture,
-                        &texture_box.width, &texture_box.height);
-                ob_title_width = texture_box.width;
-
-                // The title texture might be shorter than the config->font_height,
-                // in which case we need to pad it above and below.
-                int ob_padding_above = round((config->font_baseline -
-                                        con->title_baseline + titlebar_v_padding -
-                                        titlebar_border_thickness) * output_scale);
-                int ob_padding_below = ob_bg_height - ob_padding_above -
-                        texture_box.height;
-
-                // Render texture
-                if (texture_box.width > ob_inner_width - ob_marks_width) {
-                        texture_box.x = (title_align == ALIGN_RIGHT && ob_marks_width)
-                                ? ob_marks_x + ob_marks_width : ob_inner_x;
-                } else if (title_align == ALIGN_LEFT) {
-                        texture_box.x = ob_inner_x;
-                } else if (title_align == ALIGN_CENTER) {
-                        // If there are marks visible, center between the edge and marks.
-                        // Otherwise, center in the inner area.
-                        if (ob_marks_width) {
-                                texture_box.x = (ob_inner_x + ob_marks_x) / 2
-                                        - texture_box.width / 2;
-                        } else {
-                                texture_box.x = ob_inner_x + ob_inner_width / 2
-                                        - texture_box.width / 2;
-                        }
-                } else {
-                        texture_box.x = ob_inner_x + ob_inner_width - texture_box.width;
-                }
-                ob_title_x = texture_box.x;
-
-                texture_box.y =
-                        round((bg_y - output_y) * output_scale) + ob_padding_above;
-
-                float matrix[9];
-                wlr_matrix_project_box(matrix, &texture_box,
-                        WL_OUTPUT_TRANSFORM_NORMAL,
-                        0.0, output->wlr_output->transform_matrix);
-
-                if (ob_inner_width - ob_marks_width < texture_box.width) {
-                        texture_box.width = ob_inner_width - ob_marks_width;
-                }
-
-                render_texture(output->wlr_output, output_damage, title_texture,
-                        NULL, &texture_box, matrix, con->alpha);
-
-                // Padding above
-                memcpy(&color, colors->background, sizeof(float) * 4);
-                premultiply_alpha(color, con->alpha);
-                box.x = texture_box.x + round(output_x * output_scale);
-                box.y = round((y + titlebar_border_thickness) * output_scale);
-                box.width = texture_box.width;
-                box.height = ob_padding_above;
-                render_rect(output, output_damage, &box, color);
-
-                // Padding below
-                box.y += ob_padding_above + texture_box.height;
-                box.height = ob_padding_below;
-                render_rect(output, output_damage, &box, color);
-        }
-
-        // Determine the left + right extends of the textures (output-buffer local)
-        int ob_left_x, ob_left_width, ob_right_x, ob_right_width;
-        if (ob_title_width == 0 && ob_marks_width == 0) {
-                ob_left_x = ob_inner_x;
-                ob_left_width = 0;
-                ob_right_x = ob_inner_x;
-                ob_right_width = 0;
-        } else if (ob_title_x < ob_marks_x) {
-                ob_left_x = ob_title_x;
-                ob_left_width = ob_title_width;
-                ob_right_x = ob_marks_x;
-                ob_right_width = ob_marks_width;
-        } else {
-                ob_left_x = ob_marks_x;
-                ob_left_width = ob_marks_width;
-                ob_right_x = ob_title_x;
-                ob_right_width = ob_title_width;
-        }
-        if (ob_left_x < ob_inner_x) {
-                ob_left_x = ob_inner_x;
-        } else if (ob_left_x + ob_left_width > ob_right_x + ob_right_width) {
-                ob_right_x = ob_left_x;
-                ob_right_width = ob_left_width;
-        }
-
-        // Filler between title and marks
-        box.width = ob_right_x - ob_left_x - ob_left_width;
-        if (box.width > 0) {
-                box.x = ob_left_x + ob_left_width + round(output_x * output_scale);
-                box.y = round(bg_y * output_scale);
-                box.height = ob_bg_height;
-                render_rect(output, output_damage, &box, color);
-        }
-
-        // Padding on left side
-        box.x = x + titlebar_border_thickness;
-        box.y = y + titlebar_border_thickness;
-        box.width = titlebar_h_padding - titlebar_border_thickness;
-        box.height = (titlebar_v_padding - titlebar_border_thickness) * 2 +
-                config->font_height;
-        scale_box(&box, output_scale);
-        int left_x = ob_left_x + round(output_x * output_scale);
-        if (box.x + box.width < left_x) {
-                box.width += left_x - box.x - box.width;
-        }
-        render_rect(output, output_damage, &box, color);
-
-        // Padding on right side
-        box.x = x + width - titlebar_h_padding;
-        box.y = y + titlebar_border_thickness;
-        box.width = titlebar_h_padding - titlebar_border_thickness;
-        box.height = (titlebar_v_padding - titlebar_border_thickness) * 2 +
-                config->font_height;
-        scale_box(&box, output_scale);
-        int right_rx = ob_right_x + ob_right_width + round(output_x * output_scale);
-        if (right_rx < box.x) {
-                box.width += box.x - right_rx;
-                box.x = right_rx;
-        }
-        render_rect(output, output_damage, &box, color);
-}
-
-/**
- * Render the top border line for a view using "border pixel".
- */
-static void render_top_border(struct sway_output *output,
-                pixman_region32_t *output_damage, struct sway_container *con,
-                struct border_colors *colors) {
-        struct sway_container_state *state = &con->current;
-        if (!state->border_top) {
-                return;
-        }
-        struct wlr_box box;
-        float color[4];
-        float output_scale = output->wlr_output->scale;
-
-        // Child border - top edge
-        memcpy(&color, colors->child_border, sizeof(float) * 4);
-        premultiply_alpha(color, con->alpha);
-        box.x = state->x;
-        box.y = state->y;
-        box.width = state->width;
-        box.height = state->border_thickness;
-        scale_box(&box, output_scale);
-        render_rect(output, output_damage, &box, color);
-}
-
-struct parent_data {
-        enum sway_container_layout layout;
-        struct wlr_box box;
-        list_t *children;
-        bool focused;
-        struct sway_container *active_child;
-};
-
-static void render_container(struct sway_output *output,
-        pixman_region32_t *damage, struct sway_container *con, bool parent_focused);
-
-/**
- * Render a container's children using a L_HORIZ or L_VERT layout.
- *
- * Wrap child views in borders and leave child containers borderless because
- * they'll apply their own borders to their children.
- */
-static void render_containers_linear(struct sway_output *output,
-                pixman_region32_t *damage, struct parent_data *parent) {
-        for (int i = 0; i < parent->children->length; ++i) {
-                struct sway_container *child = parent->children->items[i];
-
-                if (child->view) {
-                        struct sway_view *view = child->view;
-                        struct border_colors *colors;
-                        struct wlr_texture *title_texture;
-                        struct wlr_texture *marks_texture;
-                        struct sway_container_state *state = &child->current;
-
-                        if (view_is_urgent(view)) {
-                                colors = &config->border_colors.urgent;
-                                title_texture = child->title_urgent;
-                                marks_texture = child->marks_urgent;
-                        } else if (state->focused || parent->focused) {
-                                colors = &config->border_colors.focused;
-                                title_texture = child->title_focused;
-                                marks_texture = child->marks_focused;
-                        } else if (child == parent->active_child) {
-                                colors = &config->border_colors.focused_inactive;
-                                title_texture = child->title_focused_inactive;
-                                marks_texture = child->marks_focused_inactive;
-                        } else {
-                                colors = &config->border_colors.unfocused;
-                                title_texture = child->title_unfocused;
-                                marks_texture = child->marks_unfocused;
-                        }
-
-                        if (state->border == B_NORMAL) {
-                                render_titlebar(output, damage, child, state->x,
-                                                state->y, state->width, colors,
-                                                title_texture, marks_texture);
-                        } else if (state->border == B_PIXEL) {
-                                render_top_border(output, damage, child, colors);
-                        }
-                        render_view(output, damage, child, colors);
-                } else {
-                        render_container(output, damage, child,
-                                        parent->focused || child->current.focused);
-                }
-        }
-}
-
-/**
- * Render a container's children using the L_TABBED layout.
- */
-static void render_containers_tabbed(struct sway_output *output,
-                pixman_region32_t *damage, struct parent_data *parent) {
-        if (!parent->children->length) {
-                return;
-        }
-        struct sway_container *current = parent->active_child;
-        struct border_colors *current_colors = &config->border_colors.unfocused;
-        int tab_width = parent->box.width / parent->children->length;
-
-        // Render tabs
-        for (int i = 0; i < parent->children->length; ++i) {
-                struct sway_container *child = parent->children->items[i];
-                struct sway_view *view = child->view;
-                struct sway_container_state *cstate = &child->current;
-                struct border_colors *colors;
-                struct wlr_texture *title_texture;
-                struct wlr_texture *marks_texture;
-                bool urgent = view ?
-                        view_is_urgent(view) : container_has_urgent_child(child);
-
-                if (urgent) {
-                        colors = &config->border_colors.urgent;
-                        title_texture = child->title_urgent;
-                        marks_texture = child->marks_urgent;
-                } else if (cstate->focused || parent->focused) {
-                        colors = &config->border_colors.focused;
-                        title_texture = child->title_focused;
-                        marks_texture = child->marks_focused;
-                } else if (child == parent->active_child) {
-                        colors = &config->border_colors.focused_inactive;
-                        title_texture = child->title_focused_inactive;
-                        marks_texture = child->marks_focused_inactive;
-                } else {
-                        colors = &config->border_colors.unfocused;
-                        title_texture = child->title_unfocused;
-                        marks_texture = child->marks_unfocused;
-                }
-
-                int x = cstate->x + tab_width * i;
-
-                // Make last tab use the remaining width of the parent
-                if (i == parent->children->length - 1) {
-                        tab_width = parent->box.width - tab_width * i;
-                }
-
-                render_titlebar(output, damage, child, x, parent->box.y, tab_width,
-                                colors, title_texture, marks_texture);
-
-                if (child == current) {
-                        current_colors = colors;
-                }
-        }
-
-        // Render surface and left/right/bottom borders
-        if (current->view) {
-                render_view(output, damage, current, current_colors);
-        } else {
-                render_container(output, damage, current,
-                                parent->focused || current->current.focused);
-        }
-}
-
-/**
- * Render a container's children using the L_STACKED layout.
- */
-static void render_containers_stacked(struct sway_output *output,
-                pixman_region32_t *damage, struct parent_data *parent) {
-        if (!parent->children->length) {
-                return;
-        }
-        struct sway_container *current = parent->active_child;
-        struct border_colors *current_colors = &config->border_colors.unfocused;
-        size_t titlebar_height = container_titlebar_height();
-
-        // Render titles
-        for (int i = 0; i < parent->children->length; ++i) {
-                struct sway_container *child = parent->children->items[i];
-                struct sway_view *view = child->view;
-                struct sway_container_state *cstate = &child->current;
-                struct border_colors *colors;
-                struct wlr_texture *title_texture;
-                struct wlr_texture *marks_texture;
-                bool urgent = view ?
-                        view_is_urgent(view) : container_has_urgent_child(child);
-
-                if (urgent) {
-                        colors = &config->border_colors.urgent;
-                        title_texture = child->title_urgent;
-                        marks_texture = child->marks_urgent;
-                } else if (cstate->focused || parent->focused) {
-                        colors = &config->border_colors.focused;
-                        title_texture = child->title_focused;
-                        marks_texture = child->marks_focused;
-                } else if (child == parent->active_child) {
-                        colors = &config->border_colors.focused_inactive;
-                        title_texture = child->title_focused_inactive;
-                        marks_texture = child->marks_focused_inactive;
-                } else {
-                        colors = &config->border_colors.unfocused;
-                        title_texture = child->title_unfocused;
-                        marks_texture = child->marks_unfocused;
-                }
-
-                int y = parent->box.y + titlebar_height * i;
-                render_titlebar(output, damage, child, parent->box.x, y,
-                                parent->box.width, colors, title_texture, marks_texture);
-
-                if (child == current) {
-                        current_colors = colors;
-                }
-        }
-
-        // Render surface and left/right/bottom borders
-        if (current->view) {
-                render_view(output, damage, current, current_colors);
-        } else {
-                render_container(output, damage, current,
-                                parent->focused || current->current.focused);
-        }
-}
-
-static void render_containers(struct sway_output *output,
-                pixman_region32_t *damage, struct parent_data *parent) {
-        if (config->hide_lone_tab && parent->children->length == 1) {
-                struct sway_container *child = parent->children->items[0];
-                if (child->view) {
-                        render_containers_linear(output,damage, parent);
-                        return;
-                }
-        }
-
-        switch (parent->layout) {
-        case L_NONE:
-        case L_HORIZ:
-        case L_VERT:
-                render_containers_linear(output, damage, parent);
-                break;
-        case L_STACKED:
-                render_containers_stacked(output, damage, parent);
-                break;
-        case L_TABBED:
-                render_containers_tabbed(output, damage, parent);
-                break;
-        }
-}
-
-static void render_container(struct sway_output *output,
-                pixman_region32_t *damage, struct sway_container *con, bool focused) {
-        struct parent_data data = {
-                .layout = con->current.layout,
-                .box = {
-                        .x = con->current.x,
-                        .y = con->current.y,
-                        .width = con->current.width,
-                        .height = con->current.height,
-                },
-                .children = con->current.children,
-                .focused = focused,
-                .active_child = con->current.focused_inactive_child,
-        };
-        render_containers(output, damage, &data);
-}
-
-static void render_workspace(struct sway_output *output,
-                pixman_region32_t *damage, struct sway_workspace *ws, bool focused) {
-        struct parent_data data = {
-                .layout = ws->current.layout,
-                .box = {
-                        .x = ws->current.x,
-                        .y = ws->current.y,
-                        .width = ws->current.width,
-                        .height = ws->current.height,
-                },
-                .children = ws->current.tiling,
-                .focused = focused,
-                .active_child = ws->current.focused_inactive_child,
-        };
-        render_containers(output, damage, &data);
-}
-
-static void render_floating_container(struct sway_output *soutput,
-                pixman_region32_t *damage, struct sway_container *con) {
-        if (con->view) {
-                struct sway_view *view = con->view;
-                struct border_colors *colors;
-                struct wlr_texture *title_texture;
-                struct wlr_texture *marks_texture;
-
-                if (view_is_urgent(view)) {
-                        colors = &config->border_colors.urgent;
-                        title_texture = con->title_urgent;
-                        marks_texture = con->marks_urgent;
-                } else if (con->current.focused) {
-                        colors = &config->border_colors.focused;
-                        title_texture = con->title_focused;
-                        marks_texture = con->marks_focused;
-                } else {
-                        colors = &config->border_colors.unfocused;
-                        title_texture = con->title_unfocused;
-                        marks_texture = con->marks_unfocused;
-                }
-
-                if (con->current.border == B_NORMAL) {
-                        render_titlebar(soutput, damage, con, con->current.x,
-                                        con->current.y, con->current.width, colors,
-                                        title_texture, marks_texture);
-                } else if (con->current.border == B_PIXEL) {
-                        render_top_border(soutput, damage, con, colors);
-                }
-                render_view(soutput, damage, con, colors);
-        } else {
-                render_container(soutput, damage, con, con->current.focused);
-        }
-}
-
-static void render_floating(struct sway_output *soutput,
-                pixman_region32_t *damage) {
-        for (int i = 0; i < root->outputs->length; ++i) {
-                struct sway_output *output = root->outputs->items[i];
-                for (int j = 0; j < output->current.workspaces->length; ++j) {
-                        struct sway_workspace *ws = output->current.workspaces->items[j];
-                        if (!workspace_is_visible(ws)) {
-                                continue;
-                        }
-                        for (int k = 0; k < ws->current.floating->length; ++k) {
-                                struct sway_container *floater = ws->current.floating->items[k];
-                                if (floater->fullscreen_mode != FULLSCREEN_NONE) {
-                                        continue;
-                                }
-                                render_floating_container(soutput, damage, floater);
-                        }
-                }
-        }
-}
-
-static void render_seatops(struct sway_output *output,
-                pixman_region32_t *damage) {
-        struct sway_seat *seat;
-        wl_list_for_each(seat, &server.input->seats, link) {
-                seatop_render(seat, output, damage);
-        }
-}
-
-void output_render(struct sway_output *output, struct timespec *when,
-                pixman_region32_t *damage) {
-        struct wlr_output *wlr_output = output->wlr_output;
-
-        struct wlr_renderer *renderer =
-                wlr_backend_get_renderer(wlr_output->backend);
-        if (!sway_assert(renderer != NULL,
-                        "expected the output backend to have a renderer")) {
-                return;
-        }
-
-        struct sway_workspace *workspace = output->current.active_workspace;
-        if (workspace == NULL) {
-                return;
-        }
-
-        struct sway_container *fullscreen_con = root->fullscreen_global;
-        if (!fullscreen_con) {
-                fullscreen_con = workspace->current.fullscreen;
-        }
-
-        wlr_renderer_begin(renderer, wlr_output->width, wlr_output->height);
-
-        if (!pixman_region32_not_empty(damage)) {
-                // Output isn't damaged but needs buffer swap
-                goto renderer_end;
-        }
-
-        if (debug.damage == DAMAGE_HIGHLIGHT) {
-                wlr_renderer_clear(renderer, (float[]){1, 1, 0, 1});
-        } else if (debug.damage == DAMAGE_RERENDER) {
-                int width, height;
-                wlr_output_transformed_resolution(wlr_output, &width, &height);
-                pixman_region32_union_rect(damage, damage, 0, 0, width, height);
-        }
-
-        if (output_has_opaque_overlay_layer_surface(output)) {
-                goto render_overlay;
-        }
-
-        if (fullscreen_con) {
-                float clear_color[] = {0.0f, 0.0f, 0.0f, 1.0f};
-
-                int nrects;
-                pixman_box32_t *rects = pixman_region32_rectangles(damage, &nrects);
-                for (int i = 0; i < nrects; ++i) {
-                        scissor_output(wlr_output, &rects[i]);
-                        wlr_renderer_clear(renderer, clear_color);
-                }
-
-                if (fullscreen_con->view) {
-                        if (!wl_list_empty(&fullscreen_con->view->saved_buffers)) {
-                                render_saved_view(fullscreen_con->view, output, damage, 1.0f);
-                        } else if (fullscreen_con->view->surface) {
-                                render_view_toplevels(fullscreen_con->view,
-                                                output, damage, 1.0f);
-                        }
-                } else {
-                        render_container(output, damage, fullscreen_con,
-                                        fullscreen_con->current.focused);
-                }
-
-                for (int i = 0; i < workspace->current.floating->length; ++i) {
-                        struct sway_container *floater =
-                                workspace->current.floating->items[i];
-                        if (container_is_transient_for(floater, fullscreen_con)) {
-                                render_floating_container(output, damage, floater);
-                        }
-                }
-#if HAVE_XWAYLAND
-                render_unmanaged(output, damage, &root->xwayland_unmanaged);
-#endif
-        } else {
-                float clear_color[] = {0.25f, 0.25f, 0.25f, 1.0f};
-
-                int nrects;
-                pixman_box32_t *rects = pixman_region32_rectangles(damage, &nrects);
-                for (int i = 0; i < nrects; ++i) {
-                        scissor_output(wlr_output, &rects[i]);
-                        wlr_renderer_clear(renderer, clear_color);
-                }
-
-                render_layer_toplevel(output, damage,
-                        &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND]);
-                render_layer_toplevel(output, damage,
-                        &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM]);
-
-                render_workspace(output, damage, workspace, workspace->current.focused);
-                render_floating(output, damage);
-#if HAVE_XWAYLAND
-                render_unmanaged(output, damage, &root->xwayland_unmanaged);
-#endif
-                render_layer_toplevel(output, damage,
-                        &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP]);
-
-                render_layer_popups(output, damage,
-                        &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND]);
-                render_layer_popups(output, damage,
-                        &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM]);
-                render_layer_popups(output, damage,
-                        &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP]);
-        }
-
-        render_seatops(output, damage);
-
-        struct sway_seat *seat = input_manager_current_seat();
-        struct sway_container *focus = seat_get_focused_container(seat);
-        if (focus && focus->view) {
-                render_view_popups(focus->view, output, damage, focus->alpha);
-        }
-
-render_overlay:
-        render_layer_toplevel(output, damage,
-                &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY]);
-        render_layer_popups(output, damage,
-                &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY]);
-        render_drag_icons(output, damage, &root->drag_icons);
-
-renderer_end:
-        wlr_renderer_scissor(renderer, NULL);
-        wlr_output_render_software_cursors(wlr_output, damage);
-        wlr_renderer_end(renderer);
-
-        int width, height;
-        wlr_output_transformed_resolution(wlr_output, &width, &height);
-
-        pixman_region32_t frame_damage;
-        pixman_region32_init(&frame_damage);
-
-        enum wl_output_transform transform =
-                wlr_output_transform_invert(wlr_output->transform);
-        wlr_region_transform(&frame_damage, &output->damage->current,
-                transform, width, height);
-
-        if (debug.damage == DAMAGE_HIGHLIGHT) {
-                pixman_region32_union_rect(&frame_damage, &frame_damage,
-                        0, 0, wlr_output->width, wlr_output->height);
-        }
-
-        wlr_output_set_damage(wlr_output, &frame_damage);
-        pixman_region32_fini(&frame_damage);
-
-        if (!wlr_output_commit(wlr_output)) {
-                return;
-        }
-        output->last_frame = *when;
-}
diff --git a/sway/desktop/surface.c b/sway/desktop/surface.c
deleted file mode 100644
index 767b2045..00000000
--- a/sway/desktop/surface.c
+++ /dev/null
@@ -1,46 +0,0 @@
-#define _POSIX_C_SOURCE 200112L
-#include <stdlib.h>
-#include <time.h>
-#include <wlr/types/wlr_surface.h>
-#include "sway/server.h"
-#include "sway/surface.h"
-
-static void handle_destroy(struct wl_listener *listener, void *data) {
-        struct sway_surface *surface = wl_container_of(listener, surface, destroy);
-
-        surface->wlr_surface->data = NULL;
-        wl_list_remove(&surface->destroy.link);
-
-        if (surface->frame_done_timer) {
-                wl_event_source_remove(surface->frame_done_timer);
-        }
-
-        free(surface);
-}
-
-static int surface_frame_done_timer_handler(void *data) {
-        struct sway_surface *surface = data;
-
-        struct timespec now;
-        clock_gettime(CLOCK_MONOTONIC, &now);
-        wlr_surface_send_frame_done(surface->wlr_surface, &now);
-
-        return 0;
-}
-
-void handle_compositor_new_surface(struct wl_listener *listener, void *data) {
-        struct wlr_surface *wlr_surface = data;
-
-        struct sway_surface *surface = calloc(1, sizeof(struct sway_surface));
-        surface->wlr_surface = wlr_surface;
-        wlr_surface->data = surface;
-
-        surface->destroy.notify = handle_destroy;
-        wl_signal_add(&wlr_surface->events.destroy, &surface->destroy);
-
-        surface->frame_done_timer = wl_event_loop_add_timer(server.wl_event_loop,
-                surface_frame_done_timer_handler, surface);
-        if (!surface->frame_done_timer) {
-                wl_resource_post_no_memory(wlr_surface->resource);
-        }
-}
diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c
index eac38991..acc3e3f9 100644
--- a/sway/desktop/transaction.c
+++ b/sway/desktop/transaction.c
@@ -5,7 +5,7 @@
 #include <time.h>
 #include <wlr/types/wlr_buffer.h>
 #include "sway/config.h"
-#include "sway/desktop.h"
+#include "sway/scene_descriptor.h"
 #include "sway/desktop/idle_inhibit_v1.h"
 #include "sway/desktop/transaction.h"
 #include "sway/input/cursor.h"
@@ -35,6 +35,8 @@ struct sway_transaction_instruction {
                 struct sway_container_state container_state;
         };
         uint32_t serial;
+        bool server_request;
+        bool waiting;
 };
 
 static struct sway_transaction *transaction_create(void) {
@@ -86,7 +88,11 @@ static void transaction_destroy(struct sway_transaction *transaction) {
 static void copy_output_state(struct sway_output *output,
                 struct sway_transaction_instruction *instruction) {
         struct sway_output_state *state = &instruction->output_state;
-        state->workspaces = create_list();
+        if (state->workspaces) {
+                state->workspaces->length = 0;
+        } else {
+                state->workspaces = create_list();
+        }
         list_cat(state->workspaces, output->workspaces);
 
         state->active_workspace = output_get_active_workspace(output);
@@ -104,8 +110,16 @@ static void copy_workspace_state(struct sway_workspace *ws,
         state->layout = ws->layout;
 
         state->output = ws->output;
-        state->floating = create_list();
-        state->tiling = create_list();
+        if (state->floating) {
+                state->floating->length = 0;
+        } else {
+                state->floating = create_list();
+        }
+        if (state->tiling) {
+                state->tiling->length = 0;
+        } else {
+                state->tiling = create_list();
+        }
         list_cat(state->floating, ws->floating);
         list_cat(state->tiling, ws->tiling);
 
@@ -115,8 +129,8 @@ static void copy_workspace_state(struct sway_workspace *ws,
         // Set focused_inactive_child to the direct tiling child
         struct sway_container *focus = seat_get_focus_inactive_tiling(seat, ws);
         if (focus) {
-                while (focus->parent) {
-                        focus = focus->parent;
+                while (focus->pending.parent) {
+                        focus = focus->pending.parent;
                 }
         }
         state->focused_inactive_child = focus;
@@ -126,28 +140,19 @@ static void copy_container_state(struct sway_container *container,
                 struct sway_transaction_instruction *instruction) {
         struct sway_container_state *state = &instruction->container_state;
 
-        state->layout = container->layout;
-        state->x = container->x;
-        state->y = container->y;
-        state->width = container->width;
-        state->height = container->height;
-        state->fullscreen_mode = container->fullscreen_mode;
-        state->parent = container->parent;
-        state->workspace = container->workspace;
-        state->border = container->border;
-        state->border_thickness = container->border_thickness;
-        state->border_top = container->border_top;
-        state->border_left = container->border_left;
-        state->border_right = container->border_right;
-        state->border_bottom = container->border_bottom;
-        state->content_x = container->content_x;
-        state->content_y = container->content_y;
-        state->content_width = container->content_width;
-        state->content_height = container->content_height;
+        if (state->children) {
+                list_free(state->children);
+        }
+
+        memcpy(state, &container->pending, sizeof(struct sway_container_state));
 
         if (!container->view) {
+                // We store a copy of the child list to avoid having it mutated after
+                // we copy the state.
                 state->children = create_list();
-                list_cat(state->children, container->children);
+                list_cat(state->children, container->pending.children);
+        } else {
+                state->children = NULL;
         }
 
         struct sway_seat *seat = input_manager_current_seat();
@@ -161,14 +166,36 @@ static void copy_container_state(struct sway_container *container,
 }
 
 static void transaction_add_node(struct sway_transaction *transaction,
-                struct sway_node *node) {
-        struct sway_transaction_instruction *instruction =
-                calloc(1, sizeof(struct sway_transaction_instruction));
-        if (!sway_assert(instruction, "Unable to allocate instruction")) {
-                return;
+                struct sway_node *node, bool server_request) {
+        struct sway_transaction_instruction *instruction = NULL;
+
+        // Check if we have an instruction for this node already, in which case we
+        // update that instead of creating a new one.
+        if (node->ntxnrefs > 0) {
+                for (int idx = 0; idx < transaction->instructions->length; idx++) {
+                        struct sway_transaction_instruction *other =
+                                transaction->instructions->items[idx];
+                        if (other->node == node) {
+                                instruction = other;
+                                break;
+                        }
+                }
+        }
+
+        if (!instruction) {
+                instruction = calloc(1, sizeof(struct sway_transaction_instruction));
+                if (!sway_assert(instruction, "Unable to allocate instruction")) {
+                        return;
+                }
+                instruction->transaction = transaction;
+                instruction->node = node;
+                instruction->server_request = server_request;
+
+                list_add(transaction->instructions, instruction);
+                node->ntxnrefs++;
+        } else if (server_request) {
+                instruction->server_request = true;
         }
-        instruction->transaction = transaction;
-        instruction->node = node;
 
         switch (node->type) {
         case N_ROOT:
@@ -183,46 +210,24 @@ static void transaction_add_node(struct sway_transaction *transaction,
                 copy_container_state(node->sway_container, instruction);
                 break;
         }
-
-        list_add(transaction->instructions, instruction);
-        node->ntxnrefs++;
 }
 
 static void apply_output_state(struct sway_output *output,
                 struct sway_output_state *state) {
-        output_damage_whole(output);
         list_free(output->current.workspaces);
         memcpy(&output->current, state, sizeof(struct sway_output_state));
-        output_damage_whole(output);
 }
 
 static void apply_workspace_state(struct sway_workspace *ws,
                 struct sway_workspace_state *state) {
-        output_damage_whole(ws->current.output);
         list_free(ws->current.floating);
         list_free(ws->current.tiling);
         memcpy(&ws->current, state, sizeof(struct sway_workspace_state));
-        output_damage_whole(ws->current.output);
 }
 
 static void apply_container_state(struct sway_container *container,
                 struct sway_container_state *state) {
         struct sway_view *view = container->view;
-        // Damage the old location
-        desktop_damage_whole_container(container);
-        if (view && !wl_list_empty(&view->saved_buffers)) {
-                struct sway_saved_buffer *saved_buf;
-                wl_list_for_each(saved_buf, &view->saved_buffers, link) {
-                        struct wlr_box box = {
-                                .x = container->current.content_x - view->saved_geometry.x + saved_buf->x,
-                                .y = container->current.content_y - view->saved_geometry.y + saved_buf->y,
-                                .width = saved_buf->width,
-                                .height = saved_buf->height,
-                        };
-                        desktop_damage_box(&box);
-                }
-        }
-
         // There are separate children lists for each instruction state, the
         // container's current state and the container's pending state
         // (ie. con->children). The list itself needs to be freed here.
@@ -232,46 +237,449 @@ static void apply_container_state(struct sway_container *container,
 
         memcpy(&container->current, state, sizeof(struct sway_container_state));
 
-        if (view && !wl_list_empty(&view->saved_buffers)) {
-                if (!container->node.destroying || container->node.ntxnrefs == 1) {
-                        view_remove_saved_buffer(view);
+        if (view) {
+                if (view->saved_surface_tree) {
+                        if (!container->node.destroying || container->node.ntxnrefs == 1) {
+                                view_remove_saved_buffer(view);
+                        }
+                }
+
+                // If the view hasn't responded to the configure, center it within
+                // the container. This is important for fullscreen views which
+                // refuse to resize to the size of the output.
+                if (view->surface) {
+                        view_center_and_clip_surface(view);
+                }
+        }
+}
+
+static void arrange_title_bar(struct sway_container *con,
+                int x, int y, int width, int height) {
+        container_update(con);
+
+        bool has_title_bar = height > 0;
+        wlr_scene_node_set_enabled(&con->title_bar.tree->node, has_title_bar);
+        if (!has_title_bar) {
+                return;
+        }
+
+        wlr_scene_node_set_position(&con->title_bar.tree->node, x, y);
+
+        con->title_width = width;
+        container_arrange_title_bar(con);
+}
+
+static void disable_container(struct sway_container *con) {
+        if (con->view) {
+                wlr_scene_node_reparent(&con->view->scene_tree->node, con->content_tree);
+        } else {
+                for (int i = 0; i < con->current.children->length; i++) {
+                        struct sway_container *child = con->current.children->items[i];
+
+                        wlr_scene_node_reparent(&child->scene_tree->node, con->content_tree);
+
+                        disable_container(child);
+                }
+        }
+}
+
+static void arrange_container(struct sway_container *con,
+                int width, int height, bool title_bar, int gaps);
+
+static void arrange_children(enum sway_container_layout layout, list_t *children,
+                struct sway_container *active, struct wlr_scene_tree *content,
+                int width, int height, int gaps) {
+        int title_bar_height = container_titlebar_height();
+
+        if (layout == L_TABBED) {
+                struct sway_container *first = children->length == 1 ?
+                        ((struct sway_container *)children->items[0]) : NULL;
+                if (config->hide_lone_tab && first && first->view &&
+                                first->current.border != B_NORMAL) {
+                        title_bar_height = 0;
+                }
+
+                double w = (double) width / children->length;
+                int title_offset = 0;
+                for (int i = 0; i < children->length; i++) {
+                        struct sway_container *child = children->items[i];
+                        bool activated = child == active;
+                        int next_title_offset = round(w * i + w);
+
+                        arrange_title_bar(child, title_offset, -title_bar_height,
+                                next_title_offset - title_offset, title_bar_height);
+                        wlr_scene_node_set_enabled(&child->border.tree->node, activated);
+                        wlr_scene_node_set_position(&child->scene_tree->node, 0, title_bar_height);
+                        wlr_scene_node_reparent(&child->scene_tree->node, content);
+
+                        if (activated) {
+                                arrange_container(child, width, height - title_bar_height,
+                                        false, 0);
+                        } else {
+                                disable_container(child);
+                        }
+
+                        title_offset = next_title_offset;
                 }
+        } else if (layout == L_STACKED) {
+                struct sway_container *first = children->length == 1 ?
+                        ((struct sway_container *)children->items[0]) : NULL;
+                if (config->hide_lone_tab && first && first->view &&
+                                first->current.border != B_NORMAL) {
+                        title_bar_height = 0;
+                }
+
+                int title_height = title_bar_height * children->length;
+
+                int y = 0;
+                for (int i = 0; i < children->length; i++) {
+                        struct sway_container *child = children->items[i];
+                        bool activated = child == active;
+
+                        arrange_title_bar(child, 0, y - title_height, width, title_bar_height);
+                        wlr_scene_node_set_enabled(&child->border.tree->node, activated);
+                        wlr_scene_node_set_position(&child->scene_tree->node, 0, title_height);
+                        wlr_scene_node_reparent(&child->scene_tree->node, content);
+
+                        if (activated) {
+                                arrange_container(child, width, height - title_height,
+                                        false, 0);
+                        } else {
+                                disable_container(child);
+                        }
+
+                        y += title_bar_height;
+                }
+        } else if (layout == L_VERT) {
+                int off = 0;
+                for (int i = 0; i < children->length; i++) {
+                        struct sway_container *child = children->items[i];
+                        int cheight = child->current.height;
+
+                        wlr_scene_node_set_enabled(&child->border.tree->node, true);
+                        wlr_scene_node_set_position(&child->scene_tree->node, 0, off);
+                        wlr_scene_node_reparent(&child->scene_tree->node, content);
+                        arrange_container(child, width, cheight, true, gaps);
+                        off += cheight + gaps;
+                }
+        } else if (layout == L_HORIZ) {
+                int off = 0;
+                for (int i = 0; i < children->length; i++) {
+                        struct sway_container *child = children->items[i];
+                        int cwidth = child->current.width;
+
+                        wlr_scene_node_set_enabled(&child->border.tree->node, true);
+                        wlr_scene_node_set_position(&child->scene_tree->node, off, 0);
+                        wlr_scene_node_reparent(&child->scene_tree->node, content);
+                        arrange_container(child, cwidth, height, true, gaps);
+                        off += cwidth + gaps;
+                }
+        } else {
+                sway_assert(false, "unreachable");
+        }
+}
+
+static void arrange_container(struct sway_container *con,
+                int width, int height, bool title_bar, int gaps) {
+        // this container might have previously been in the scratchpad,
+        // make sure it's enabled for viewing
+        wlr_scene_node_set_enabled(&con->scene_tree->node, true);
+
+        if (con->output_handler) {
+                wlr_scene_buffer_set_dest_size(con->output_handler, width, height);
+        }
+
+        if (con->view) {
+                int border_top = container_titlebar_height();
+                int border_width = con->current.border_thickness;
+
+                if (title_bar && con->current.border != B_NORMAL) {
+                        wlr_scene_node_set_enabled(&con->title_bar.tree->node, false);
+                        wlr_scene_node_set_enabled(&con->border.top->node, true);
+                } else {
+                        wlr_scene_node_set_enabled(&con->border.top->node, false);
+                }
+
+                if (con->current.border == B_NORMAL) {
+                        if (title_bar) {
+                                arrange_title_bar(con, 0, 0, width, border_top);
+                        } else {
+                                border_top = 0;
+                                // should be handled by the parent container
+                        }
+                } else if (con->current.border == B_PIXEL) {
+                        container_update(con);
+                        border_top = title_bar && con->current.border_top ? border_width : 0;
+                } else if (con->current.border == B_NONE) {
+                        container_update(con);
+                        border_top = 0;
+                        border_width = 0;
+                } else if (con->current.border == B_CSD) {
+                        border_top = 0;
+                        border_width = 0;
+                } else {
+                        sway_assert(false, "unreachable");
+                }
+
+                int border_bottom = con->current.border_bottom ? border_width : 0;
+                int border_left = con->current.border_left ? border_width : 0;
+                int border_right = con->current.border_right ? border_width : 0;
+
+                wlr_scene_rect_set_size(con->border.top, width, border_top);
+                wlr_scene_rect_set_size(con->border.bottom, width, border_bottom);
+                wlr_scene_rect_set_size(con->border.left,
+                        border_left, height - border_top - border_bottom);
+                wlr_scene_rect_set_size(con->border.right,
+                        border_right, height - border_top - border_bottom);
+
+                wlr_scene_node_set_position(&con->border.top->node, 0, 0);
+                wlr_scene_node_set_position(&con->border.bottom->node,
+                        0, height - border_bottom);
+                wlr_scene_node_set_position(&con->border.left->node,
+                        0, border_top);
+                wlr_scene_node_set_position(&con->border.right->node,
+                        width - border_right, border_top);
+
+                // make sure to reparent, it's possible that the client just came out of
+                // fullscreen mode where the parent of the surface is not the container
+                wlr_scene_node_reparent(&con->view->scene_tree->node, con->content_tree);
+                wlr_scene_node_set_position(&con->view->scene_tree->node,
+                        border_left, border_top);
+        } else {
+                // make sure to disable the title bar if the parent is not managing it
+                if (title_bar) {
+                        wlr_scene_node_set_enabled(&con->title_bar.tree->node, false);
+                }
+
+                arrange_children(con->current.layout, con->current.children,
+                        con->current.focused_inactive_child, con->content_tree,
+                        width, height, gaps);
         }
+}
+
+static int container_get_gaps(struct sway_container *con) {
+        struct sway_workspace *ws = con->current.workspace;
+        struct sway_container *temp = con;
+        while (temp) {
+                enum sway_container_layout layout;
+                if (temp->current.parent) {
+                        layout = temp->current.parent->current.layout;
+                } else {
+                        layout = ws->current.layout;
+                }
+                if (layout == L_TABBED || layout == L_STACKED) {
+                        return 0;
+                }
+                temp = temp->pending.parent;
+        }
+        return ws->gaps_inner;
+}
 
-        // Damage the new location
-        desktop_damage_whole_container(container);
-        if (view && view->surface) {
-                struct wlr_surface *surface = view->surface;
-                struct wlr_box box = {
-                        .x = container->current.content_x - view->geometry.x,
-                        .y = container->current.content_y - view->geometry.y,
-                        .width = surface->current.width,
-                        .height = surface->current.height,
-                };
-                desktop_damage_box(&box);
+static void arrange_fullscreen(struct wlr_scene_tree *tree,
+                struct sway_container *fs, struct sway_workspace *ws,
+                int width, int height) {
+        struct wlr_scene_node *fs_node;
+        if (fs->view) {
+                fs_node = &fs->view->scene_tree->node;
+
+                // if we only care about the view, disable any decorations
+                wlr_scene_node_set_enabled(&fs->scene_tree->node, false);
+        } else {
+                fs_node = &fs->scene_tree->node;
+                arrange_container(fs, width, height, true, container_get_gaps(fs));
         }
 
-        // If the view hasn't responded to the configure, center it within
-        // the container. This is important for fullscreen views which
-        // refuse to resize to the size of the output.
-        if (view && view->surface) {
-                if (view->geometry.width < container->current.content_width) {
-                        container->surface_x = container->current.content_x +
-                                (container->current.content_width - view->geometry.width) / 2;
+        wlr_scene_node_reparent(fs_node, tree);
+        wlr_scene_node_lower_to_bottom(fs_node);
+        wlr_scene_node_set_position(fs_node, 0, 0);
+}
+
+static void arrange_workspace_floating(struct sway_workspace *ws) {
+        for (int i = 0; i < ws->current.floating->length; i++) {
+                struct sway_container *floater = ws->current.floating->items[i];
+                struct wlr_scene_tree *layer = root->layers.floating;
+
+                if (floater->current.fullscreen_mode != FULLSCREEN_NONE) {
+                        continue;
+                }
+
+                if (root->fullscreen_global) {
+                        if (container_is_transient_for(floater, root->fullscreen_global)) {
+                                layer = root->layers.fullscreen_global;
+                        }
                 } else {
-                        container->surface_x = container->current.content_x;
+                        for (int i = 0; i < root->outputs->length; i++) {
+                                struct sway_output *output = root->outputs->items[i];
+                                struct sway_workspace *active = output->current.active_workspace;
+
+                                if (active && active->fullscreen &&
+                                                container_is_transient_for(floater, active->fullscreen)) {
+                                        layer = root->layers.fullscreen;
+                                }
+                        }
+                }
+
+                wlr_scene_node_reparent(&floater->scene_tree->node, layer);
+                wlr_scene_node_set_position(&floater->scene_tree->node,
+                        floater->current.x, floater->current.y);
+                wlr_scene_node_set_enabled(&floater->scene_tree->node, true);
+
+                arrange_container(floater, floater->current.width, floater->current.height,
+                        true, ws->gaps_inner);
+        }
+}
+
+static void arrange_workspace_tiling(struct sway_workspace *ws,
+                int width, int height) {
+        arrange_children(ws->current.layout, ws->current.tiling,
+                ws->current.focused_inactive_child, ws->layers.tiling,
+                width, height, ws->gaps_inner);
+}
+
+static void disable_workspace(struct sway_workspace *ws) {
+        // if any containers were just moved to a disabled workspace it will
+        // have the parent of the old workspace. Move the workspace so that it won't
+        // be shown.
+        for (int i = 0; i < ws->current.tiling->length; i++) {
+                struct sway_container *child = ws->current.tiling->items[i];
+
+                wlr_scene_node_reparent(&child->scene_tree->node, ws->layers.tiling);
+                disable_container(child);
+        }
+
+        for (int i = 0; i < ws->current.floating->length; i++) {
+                struct sway_container *floater = ws->current.floating->items[i];
+                wlr_scene_node_reparent(&floater->scene_tree->node, root->layers.floating);
+                disable_container(floater);
+                wlr_scene_node_set_enabled(&floater->scene_tree->node, false);
+        }
+}
+
+static void arrange_output(struct sway_output *output, int width, int height) {
+        for (int i = 0; i < output->current.workspaces->length; i++) {
+                struct sway_workspace *child = output->current.workspaces->items[i];
+
+                bool activated = output->current.active_workspace == child;
+
+                wlr_scene_node_reparent(&child->layers.tiling->node, output->layers.tiling);
+                wlr_scene_node_reparent(&child->layers.fullscreen->node, output->layers.fullscreen);
+
+                for (int i = 0; i < child->current.floating->length; i++) {
+                        struct sway_container *floater = child->current.floating->items[i];
+                        wlr_scene_node_reparent(&floater->scene_tree->node, root->layers.floating);
+                        wlr_scene_node_set_enabled(&floater->scene_tree->node, activated);
                 }
-                if (view->geometry.height < container->current.content_height) {
-                        container->surface_y = container->current.content_y +
-                                (container->current.content_height - view->geometry.height) / 2;
+
+                if (activated) {
+                        struct sway_container *fs = child->current.fullscreen;
+                        wlr_scene_node_set_enabled(&child->layers.tiling->node, !fs);
+                        wlr_scene_node_set_enabled(&child->layers.fullscreen->node, fs);
+
+                        arrange_workspace_floating(child);
+
+                        wlr_scene_node_set_enabled(&output->layers.shell_background->node, !fs);
+                        wlr_scene_node_set_enabled(&output->layers.shell_bottom->node, !fs);
+                        wlr_scene_node_set_enabled(&output->layers.fullscreen->node, fs);
+
+                        if (fs) {
+                                wlr_scene_rect_set_size(output->fullscreen_background, width, height);
+
+                                arrange_fullscreen(child->layers.fullscreen, fs, child,
+                                        width, height);
+                        } else {
+                                struct wlr_box *area = &output->usable_area;
+                                struct side_gaps *gaps = &child->current_gaps;
+
+                                wlr_scene_node_set_position(&child->layers.tiling->node,
+                                        gaps->left + area->x, gaps->top + area->y);
+
+                                arrange_workspace_tiling(child,
+                                        area->width - gaps->left - gaps->right,
+                                        area->height - gaps->top - gaps->bottom);
+                        }
                 } else {
-                        container->surface_y = container->current.content_y;
+                        wlr_scene_node_set_enabled(&child->layers.tiling->node, false);
+                        wlr_scene_node_set_enabled(&child->layers.fullscreen->node, false);
+
+                        disable_workspace(child);
                 }
         }
+}
+
+static void arrange_popup(struct wlr_scene_tree *popup) {
+        struct wlr_scene_node *node;
+        wl_list_for_each(node, &popup->children, link) {
+                struct sway_xdg_popup *popup = scene_descriptor_try_get(node,
+                        SWAY_SCENE_DESC_POPUP);
+
+                // the popup layer may have popups from layer_shell surfaces, in this
+                // case those don't have a scene descriptor, so lets skip those here.
+                if (popup) {
+                        struct wlr_scene_tree *tree = popup->view->content_tree;
+
+                        int lx, ly;
+                        wlr_scene_node_coords(&tree->node, &lx, &ly);
+                        wlr_scene_node_set_position(&popup->scene_tree->node, lx, ly);
+                }
+        }
+}
+
+static void arrange_root(struct sway_root *root) {
+        struct sway_container *fs = root->fullscreen_global;
+
+        wlr_scene_node_set_enabled(&root->layers.shell_background->node, !fs);
+        wlr_scene_node_set_enabled(&root->layers.shell_bottom->node, !fs);
+        wlr_scene_node_set_enabled(&root->layers.tiling->node, !fs);
+        wlr_scene_node_set_enabled(&root->layers.floating->node, !fs);
+        wlr_scene_node_set_enabled(&root->layers.shell_top->node, !fs);
+        wlr_scene_node_set_enabled(&root->layers.fullscreen->node, !fs);
+
+        // hide all contents in the scratchpad
+        for (int i = 0; i < root->scratchpad->length; i++) {
+                struct sway_container *con = root->scratchpad->items[i];
+
+                wlr_scene_node_set_enabled(&con->scene_tree->node, false);
+        }
+
+        if (fs) {
+                for (int i = 0; i < root->outputs->length; i++) {
+                        struct sway_output *output = root->outputs->items[i];
+                        struct sway_workspace *ws = output->current.active_workspace;
+
+                        if (ws) {
+                                arrange_workspace_floating(ws);
+                        }
+                }
 
-        if (!container->node.destroying) {
-                container_discover_outputs(container);
+                arrange_fullscreen(root->layers.fullscreen_global, fs, NULL,
+                        root->width, root->height);
+        } else {
+                for (int i = 0; i < root->outputs->length; i++) {
+                        struct sway_output *output = root->outputs->items[i];
+
+                        wlr_scene_output_set_position(output->scene_output, output->lx, output->ly);
+
+                        wlr_scene_node_reparent(&output->layers.shell_background->node, root->layers.shell_background);
+                        wlr_scene_node_reparent(&output->layers.shell_bottom->node, root->layers.shell_bottom);
+                        wlr_scene_node_reparent(&output->layers.tiling->node, root->layers.tiling);
+                        wlr_scene_node_reparent(&output->layers.shell_top->node, root->layers.shell_top);
+                        wlr_scene_node_reparent(&output->layers.shell_overlay->node, root->layers.shell_overlay);
+                        wlr_scene_node_reparent(&output->layers.fullscreen->node, root->layers.fullscreen);
+                        wlr_scene_node_reparent(&output->layers.session_lock->node, root->layers.session_lock);
+
+                        wlr_scene_node_set_position(&output->layers.shell_background->node, output->lx, output->ly);
+                        wlr_scene_node_set_position(&output->layers.shell_bottom->node, output->lx, output->ly);
+                        wlr_scene_node_set_position(&output->layers.tiling->node, output->lx, output->ly);
+                        wlr_scene_node_set_position(&output->layers.fullscreen->node, output->lx, output->ly);
+                        wlr_scene_node_set_position(&output->layers.shell_top->node, output->lx, output->ly);
+                        wlr_scene_node_set_position(&output->layers.shell_overlay->node, output->lx, output->ly);
+                        wlr_scene_node_set_position(&output->layers.session_lock->node, output->lx, output->ly);
+
+                        arrange_output(output, output->width, output->height);
+                }
         }
+
+        arrange_popup(root->layers.popup);
 }
 
 /**
@@ -313,74 +721,29 @@ static void transaction_apply(struct sway_transaction *transaction) {
 
                 node->instruction = NULL;
         }
-
-        cursor_rebase_all();
 }
 
-static void transaction_commit(struct sway_transaction *transaction);
-
-// Return true if both transactions operate on the same nodes
-static bool transaction_same_nodes(struct sway_transaction *a,
-                struct sway_transaction *b) {
-        if (a->instructions->length != b->instructions->length) {
-                return false;
-        }
-        for (int i = 0; i < a->instructions->length; ++i) {
-                struct sway_transaction_instruction *a_inst = a->instructions->items[i];
-                struct sway_transaction_instruction *b_inst = b->instructions->items[i];
-                if (a_inst->node != b_inst->node) {
-                        return false;
-                }
-        }
-        return true;
-}
+static void transaction_commit_pending(void);
 
-static void transaction_progress_queue(void) {
-        if (!server.transactions->length) {
+static void transaction_progress(void) {
+        if (!server.queued_transaction) {
                 return;
         }
-        // Only the first transaction in the queue is committed, so that's the one
-        // we try to process.
-        struct sway_transaction *transaction = server.transactions->items[0];
-        if (transaction->num_waiting) {
+        if (server.queued_transaction->num_waiting > 0) {
                 return;
         }
-        transaction_apply(transaction);
-        transaction_destroy(transaction);
-        list_del(server.transactions, 0);
+        transaction_apply(server.queued_transaction);
+        arrange_root(root);
+        cursor_rebase_all();
+        transaction_destroy(server.queued_transaction);
+        server.queued_transaction = NULL;
 
-        if (server.transactions->length == 0) {
-                // The transaction queue is empty, so we're done.
-                sway_idle_inhibit_v1_check_active(server.idle_inhibit_manager_v1);
+        if (!server.pending_transaction) {
+                sway_idle_inhibit_v1_check_active();
                 return;
         }
 
-        // If there's a bunch of consecutive transactions which all apply to the
-        // same views, skip all except the last one.
-        while (server.transactions->length >= 2) {
-                struct sway_transaction *txn = server.transactions->items[0];
-                struct sway_transaction *dup = NULL;
-
-                for (int i = 1; i < server.transactions->length; i++) {
-                        struct sway_transaction *maybe_dup = server.transactions->items[i];
-                        if (transaction_same_nodes(txn, maybe_dup)) {
-                                dup = maybe_dup;
-                                break;
-                        }
-                }
-
-                if (dup) {
-                        list_del(server.transactions, 0);
-                        transaction_destroy(txn);
-                } else {
-                        break;
-                }
-        }
-
-        // We again commit the first transaction in the queue to process it.
-        transaction = server.transactions->items[0];
-        transaction_commit(transaction);
-        transaction_progress_queue();
+        transaction_commit_pending();
 }
 
 static int handle_timeout(void *data) {
@@ -388,7 +751,7 @@ static int handle_timeout(void *data) {
         sway_log(SWAY_DEBUG, "Transaction %p timed out (%zi waiting)",
                         transaction, transaction->num_waiting);
         transaction->num_waiting = 0;
-        transaction_progress_queue();
+        transaction_progress();
         return 0;
 }
 
@@ -400,6 +763,9 @@ static bool should_configure(struct sway_node *node,
         if (node->destroying) {
                 return false;
         }
+        if (!instruction->server_request) {
+                return false;
+        }
         struct sway_container_state *cstate = &node->sway_container->current;
         struct sway_container_state *istate = &instruction->container_state;
 #if HAVE_XWAYLAND
@@ -431,28 +797,24 @@ static void transaction_commit(struct sway_transaction *transaction) {
                 struct sway_transaction_instruction *instruction =
                         transaction->instructions->items[i];
                 struct sway_node *node = instruction->node;
+                bool hidden = node_is_view(node) && !node->destroying &&
+                        !view_is_visible(node->sway_container->view);
                 if (should_configure(node, instruction)) {
                         instruction->serial = view_configure(node->sway_container->view,
                                         instruction->container_state.content_x,
                                         instruction->container_state.content_y,
                                         instruction->container_state.content_width,
                                         instruction->container_state.content_height);
-                        ++transaction->num_waiting;
-
-                        // From here on we are rendering a saved buffer of the view, which
-                        // means we can send a frame done event to make the client redraw it
-                        // as soon as possible. Additionally, this is required if a view is
-                        // mapping and its default geometry doesn't intersect an output.
-                        struct timespec now;
-                        clock_gettime(CLOCK_MONOTONIC, &now);
-                        wlr_surface_send_frame_done(
-                                        node->sway_container->view->surface, &now);
-                }
-                if (node_is_view(node) && wl_list_empty(&node->sway_container->view->saved_buffers)) {
+                        if (!hidden) {
+                                instruction->waiting = true;
+                                ++transaction->num_waiting;
+                        }
+
+                        view_send_frame_done(node->sway_container->view);
+                }
+                if (!hidden && node_is_view(node) &&
+                                !node->sway_container->view->saved_surface_tree) {
                         view_save_buffer(node->sway_container->view);
-                        memcpy(&node->sway_container->view->saved_geometry,
-                                        &node->sway_container->view->geometry,
-                                        sizeof(struct wlr_box));
                 }
                 node->instruction = instruction;
         }
@@ -483,6 +845,17 @@ static void transaction_commit(struct sway_transaction *transaction) {
         }
 }
 
+static void transaction_commit_pending(void) {
+        if (server.queued_transaction) {
+                return;
+        }
+        struct sway_transaction *transaction = server.pending_transaction;
+        server.pending_transaction = NULL;
+        server.queued_transaction = transaction;
+        transaction_commit(transaction);
+        transaction_progress();
+}
+
 static void set_instruction_ready(
                 struct sway_transaction_instruction *instruction) {
         struct sway_transaction *transaction = instruction->transaction;
@@ -501,25 +874,28 @@ static void set_instruction_ready(
         }
 
         // If the transaction has timed out then its num_waiting will be 0 already.
-        if (transaction->num_waiting > 0 && --transaction->num_waiting == 0) {
+        if (instruction->waiting && transaction->num_waiting > 0 &&
+                        --transaction->num_waiting == 0) {
                 sway_log(SWAY_DEBUG, "Transaction %p is ready", transaction);
                 wl_event_source_timer_update(transaction->timer, 0);
         }
 
         instruction->node->instruction = NULL;
-        transaction_progress_queue();
+        transaction_progress();
 }
 
-void transaction_notify_view_ready_by_serial(struct sway_view *view,
+bool transaction_notify_view_ready_by_serial(struct sway_view *view,
                 uint32_t serial) {
         struct sway_transaction_instruction *instruction =
                 view->container->node.instruction;
         if (instruction != NULL && instruction->serial == serial) {
                 set_instruction_ready(instruction);
+                return true;
         }
+        return false;
 }
 
-void transaction_notify_view_ready_by_geometry(struct sway_view *view,
+bool transaction_notify_view_ready_by_geometry(struct sway_view *view,
                 double x, double y, int width, int height) {
         struct sway_transaction_instruction *instruction =
                 view->container->node.instruction;
@@ -529,39 +905,37 @@ void transaction_notify_view_ready_by_geometry(struct sway_view *view,
                         instruction->container_state.content_width == width &&
                         instruction->container_state.content_height == height) {
                 set_instruction_ready(instruction);
+                return true;
         }
+        return false;
 }
 
-void transaction_notify_view_ready_immediately(struct sway_view *view) {
-        struct sway_transaction_instruction *instruction =
-                        view->container->node.instruction;
-        if (instruction != NULL) {
-                set_instruction_ready(instruction);
-        }
-}
-
-void transaction_commit_dirty(void) {
+static void _transaction_commit_dirty(bool server_request) {
         if (!server.dirty_nodes->length) {
                 return;
         }
-        struct sway_transaction *transaction = transaction_create();
-        if (!transaction) {
-                return;
+
+        if (!server.pending_transaction) {
+                server.pending_transaction = transaction_create();
+                if (!server.pending_transaction) {
+                        return;
+                }
         }
+
         for (int i = 0; i < server.dirty_nodes->length; ++i) {
                 struct sway_node *node = server.dirty_nodes->items[i];
-                transaction_add_node(transaction, node);
+                transaction_add_node(server.pending_transaction, node, server_request);
                 node->dirty = false;
         }
         server.dirty_nodes->length = 0;
 
-        list_add(server.transactions, transaction);
+        transaction_commit_pending();
+}
 
-        // We only commit the first transaction added to the queue.
-        if (server.transactions->length == 1) {
-                transaction_commit(transaction);
-                // Attempting to progress the queue here is useful
-                // if the transaction has nothing to wait for.
-                transaction_progress_queue();
-        }
+void transaction_commit_dirty(void) {
+        _transaction_commit_dirty(true);
+}
+
+void transaction_commit_dirty_client(void) {
+        _transaction_commit_dirty(false);
 }
diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c
index 667fb9e5..7cdd97c8 100644
--- a/sway/desktop/xdg_shell.c
+++ b/sway/desktop/xdg_shell.c
@@ -7,7 +7,7 @@
 #include <wlr/util/edges.h>
 #include "log.h"
 #include "sway/decoration.h"
-#include "sway/desktop.h"
+#include "sway/scene_descriptor.h"
 #include "sway/desktop/transaction.h"
 #include "sway/input/cursor.h"
 #include "sway/input/input-manager.h"
@@ -19,64 +19,44 @@
 #include "sway/tree/workspace.h"
 #include "sway/xdg_decoration.h"
 
-static const struct sway_view_child_impl popup_impl;
-
-static void popup_get_root_coords(struct sway_view_child *child,
-                int *root_sx, int *root_sy) {
-        struct sway_xdg_popup *popup = (struct sway_xdg_popup *)child;
-        struct wlr_xdg_surface *surface = popup->wlr_xdg_surface;
-
-        int x_offset = -child->view->geometry.x - surface->geometry.x;
-        int y_offset = -child->view->geometry.y - surface->geometry.y;
-
-        wlr_xdg_popup_get_toplevel_coords(surface->popup,
-                x_offset + surface->popup->geometry.x,
-                y_offset + surface->popup->geometry.y,
-                root_sx, root_sy);
-}
-
-static void popup_destroy(struct sway_view_child *child) {
-        if (!sway_assert(child->impl == &popup_impl,
-                        "Expected an xdg_shell popup")) {
-                return;
-        }
-        struct sway_xdg_popup *popup = (struct sway_xdg_popup *)child;
-        wl_list_remove(&popup->new_popup.link);
-        wl_list_remove(&popup->destroy.link);
-        free(popup);
-}
-
-static const struct sway_view_child_impl popup_impl = {
-        .get_root_coords = popup_get_root_coords,
-        .destroy = popup_destroy,
-};
-
 static struct sway_xdg_popup *popup_create(
-        struct wlr_xdg_popup *wlr_popup, struct sway_view *view);
+        struct wlr_xdg_popup *wlr_popup, struct sway_view *view,
+        struct wlr_scene_tree *parent);
 
 static void popup_handle_new_popup(struct wl_listener *listener, void *data) {
         struct sway_xdg_popup *popup =
                 wl_container_of(listener, popup, new_popup);
         struct wlr_xdg_popup *wlr_popup = data;
-        popup_create(wlr_popup, popup->child.view);
+        popup_create(wlr_popup, popup->view, popup->xdg_surface_tree);
 }
 
 static void popup_handle_destroy(struct wl_listener *listener, void *data) {
         struct sway_xdg_popup *popup = wl_container_of(listener, popup, destroy);
-        view_child_destroy(&popup->child);
+
+        wl_list_remove(&popup->new_popup.link);
+        wl_list_remove(&popup->destroy.link);
+        wl_list_remove(&popup->surface_commit.link);
+        wlr_scene_node_destroy(&popup->scene_tree->node);
+        free(popup);
 }
 
 static void popup_unconstrain(struct sway_xdg_popup *popup) {
-        struct sway_view *view = popup->child.view;
-        struct wlr_xdg_popup *wlr_popup = popup->wlr_xdg_surface->popup;
+        struct sway_view *view = popup->view;
+        struct wlr_xdg_popup *wlr_popup = popup->wlr_xdg_popup;
 
-        struct sway_output *output = view->container->workspace->output;
+        struct sway_workspace *workspace = view->container->pending.workspace;
+        if (!workspace) {
+                // is null if in the scratchpad
+                return;
+        }
+
+        struct sway_output *output = workspace->output;
 
         // the output box expressed in the coordinate system of the toplevel parent
         // of the popup
         struct wlr_box output_toplevel_sx_box = {
-                .x = output->lx - view->container->content_x,
-                .y = output->ly - view->container->content_y,
+                .x = output->lx - view->container->pending.content_x + view->geometry.x,
+                .y = output->ly - view->container->pending.content_y + view->geometry.y,
                 .width = output->width,
                 .height = output->height,
         };
@@ -84,32 +64,62 @@ static void popup_unconstrain(struct sway_xdg_popup *popup) {
         wlr_xdg_popup_unconstrain_from_box(wlr_popup, &output_toplevel_sx_box);
 }
 
-static struct sway_xdg_popup *popup_create(
-                struct wlr_xdg_popup *wlr_popup, struct sway_view *view) {
+static void popup_handle_surface_commit(struct wl_listener *listener, void *data) {
+        struct sway_xdg_popup *popup = wl_container_of(listener, popup, surface_commit);
+        if (popup->wlr_xdg_popup->base->initial_commit) {
+                popup_unconstrain(popup);
+        }
+}
+
+static struct sway_xdg_popup *popup_create(struct wlr_xdg_popup *wlr_popup,
+                struct sway_view *view, struct wlr_scene_tree *parent) {
         struct wlr_xdg_surface *xdg_surface = wlr_popup->base;
 
-        struct sway_xdg_popup *popup =
-                calloc(1, sizeof(struct sway_xdg_popup));
-        if (popup == NULL) {
+        struct sway_xdg_popup *popup = calloc(1, sizeof(struct sway_xdg_popup));
+        if (!popup) {
                 return NULL;
         }
-        view_child_init(&popup->child, &popup_impl, view, xdg_surface->surface);
-        popup->wlr_xdg_surface = xdg_surface;
 
+        popup->wlr_xdg_popup = wlr_popup;
+        popup->view = view;
+
+        popup->scene_tree = wlr_scene_tree_create(parent);
+        if (!popup->scene_tree) {
+                free(popup);
+                return NULL;
+        }
+
+        popup->xdg_surface_tree = wlr_scene_xdg_surface_create(
+                popup->scene_tree, xdg_surface);
+        if (!popup->xdg_surface_tree) {
+                wlr_scene_node_destroy(&popup->scene_tree->node);
+                free(popup);
+                return NULL;
+        }
+
+        if (!scene_descriptor_assign(&popup->scene_tree->node,
+                        SWAY_SCENE_DESC_POPUP, popup)) {
+                sway_log(SWAY_ERROR, "Failed to allocate a popup scene descriptor");
+                wlr_scene_node_destroy(&popup->scene_tree->node);
+                free(popup);
+                return NULL;
+        }
+
+        popup->wlr_xdg_popup = xdg_surface->popup;
+        struct sway_xdg_shell_view *shell_view =
+                wl_container_of(view, shell_view, view);
+        xdg_surface->data = shell_view;
+
+        wl_signal_add(&xdg_surface->surface->events.commit, &popup->surface_commit);
+        popup->surface_commit.notify = popup_handle_surface_commit;
         wl_signal_add(&xdg_surface->events.new_popup, &popup->new_popup);
         popup->new_popup.notify = popup_handle_new_popup;
-        wl_signal_add(&xdg_surface->events.destroy, &popup->destroy);
+        wl_signal_add(&wlr_popup->events.destroy, &popup->destroy);
         popup->destroy.notify = popup_handle_destroy;
 
-        wl_signal_add(&xdg_surface->events.map, &popup->child.surface_map);
-        wl_signal_add(&xdg_surface->events.unmap, &popup->child.surface_unmap);
-
-        popup_unconstrain(popup);
-
         return popup;
 }
 
-
 static struct sway_xdg_shell_view *xdg_shell_view_from_view(
                 struct sway_view *view) {
         if (!sway_assert(view->type == SWAY_VIEW_XDG_SHELL,
@@ -122,7 +132,7 @@ static struct sway_xdg_shell_view *xdg_shell_view_from_view(
 static void get_constraints(struct sway_view *view, double *min_width,
                 double *max_width, double *min_height, double *max_height) {
         struct wlr_xdg_toplevel_state *state =
-                &view->wlr_xdg_surface->toplevel->current;
+                &view->wlr_xdg_toplevel->current;
         *min_width = state->min_width > 0 ? state->min_width : DBL_MIN;
         *max_width = state->max_width > 0 ? state->max_width : DBL_MAX;
         *min_height = state->min_height > 0 ? state->min_height : DBL_MIN;
@@ -136,9 +146,9 @@ static const char *get_string_prop(struct sway_view *view,
         }
         switch (prop) {
         case VIEW_PROP_TITLE:
-                return view->wlr_xdg_surface->toplevel->title;
+                return view->wlr_xdg_toplevel->title;
         case VIEW_PROP_APP_ID:
-                return view->wlr_xdg_surface->toplevel->app_id;
+                return view->wlr_xdg_toplevel->app_id;
         default:
                 return NULL;
         }
@@ -151,50 +161,52 @@ static uint32_t configure(struct sway_view *view, double lx, double ly,
         if (xdg_shell_view == NULL) {
                 return 0;
         }
-        return wlr_xdg_toplevel_set_size(view->wlr_xdg_surface, width, height);
+        return wlr_xdg_toplevel_set_size(view->wlr_xdg_toplevel,
+                width, height);
 }
 
 static void set_activated(struct sway_view *view, bool activated) {
         if (xdg_shell_view_from_view(view) == NULL) {
                 return;
         }
-        struct wlr_xdg_surface *surface = view->wlr_xdg_surface;
-        if (surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL) {
-                wlr_xdg_toplevel_set_activated(surface, activated);
-        }
+        wlr_xdg_toplevel_set_activated(view->wlr_xdg_toplevel, activated);
 }
 
 static void set_tiled(struct sway_view *view, bool tiled) {
         if (xdg_shell_view_from_view(view) == NULL) {
                 return;
         }
-        struct wlr_xdg_surface *surface = view->wlr_xdg_surface;
-        enum wlr_edges edges = WLR_EDGE_NONE;
-        if (tiled) {
-                edges = WLR_EDGE_LEFT | WLR_EDGE_RIGHT | WLR_EDGE_TOP |
-                                WLR_EDGE_BOTTOM;
+        if (wl_resource_get_version(view->wlr_xdg_toplevel->resource) >=
+                        XDG_TOPLEVEL_STATE_TILED_LEFT_SINCE_VERSION) {
+                enum wlr_edges edges = WLR_EDGE_NONE;
+                if (tiled) {
+                        edges = WLR_EDGE_LEFT | WLR_EDGE_RIGHT | WLR_EDGE_TOP |
+                                        WLR_EDGE_BOTTOM;
+                }
+                wlr_xdg_toplevel_set_tiled(view->wlr_xdg_toplevel, edges);
+        } else {
+                // The version is too low for the tiled state; configure as maximized instead
+                // to stop the client from drawing decorations outside of the toplevel geometry.
+                wlr_xdg_toplevel_set_maximized(view->wlr_xdg_toplevel, tiled);
         }
-        wlr_xdg_toplevel_set_tiled(surface, edges);
 }
 
 static void set_fullscreen(struct sway_view *view, bool fullscreen) {
         if (xdg_shell_view_from_view(view) == NULL) {
                 return;
         }
-        struct wlr_xdg_surface *surface = view->wlr_xdg_surface;
-        wlr_xdg_toplevel_set_fullscreen(surface, fullscreen);
+        wlr_xdg_toplevel_set_fullscreen(view->wlr_xdg_toplevel, fullscreen);
 }
 
 static void set_resizing(struct sway_view *view, bool resizing) {
         if (xdg_shell_view_from_view(view) == NULL) {
                 return;
         }
-        struct wlr_xdg_surface *surface = view->wlr_xdg_surface;
-        wlr_xdg_toplevel_set_resizing(surface, resizing);
+        wlr_xdg_toplevel_set_resizing(view->wlr_xdg_toplevel, resizing);
 }
 
 static bool wants_floating(struct sway_view *view) {
-        struct wlr_xdg_toplevel *toplevel = view->wlr_xdg_surface->toplevel;
+        struct wlr_xdg_toplevel *toplevel = view->wlr_xdg_toplevel;
         struct wlr_xdg_toplevel_state *state = &toplevel->current;
         return (state->min_width != 0 && state->min_height != 0
                 && (state->min_width == state->max_width
@@ -202,35 +214,17 @@ static bool wants_floating(struct sway_view *view) {
                 || toplevel->parent;
 }
 
-static void for_each_surface(struct sway_view *view,
-                wlr_surface_iterator_func_t iterator, void *user_data) {
-        if (xdg_shell_view_from_view(view) == NULL) {
-                return;
-        }
-        wlr_xdg_surface_for_each_surface(view->wlr_xdg_surface, iterator,
-                user_data);
-}
-
-static void for_each_popup_surface(struct sway_view *view,
-                wlr_surface_iterator_func_t iterator, void *user_data) {
-        if (xdg_shell_view_from_view(view) == NULL) {
-                return;
-        }
-        wlr_xdg_surface_for_each_popup_surface(view->wlr_xdg_surface, iterator,
-                user_data);
-}
-
 static bool is_transient_for(struct sway_view *child,
                 struct sway_view *ancestor) {
         if (xdg_shell_view_from_view(child) == NULL) {
                 return false;
         }
-        struct wlr_xdg_surface *surface = child->wlr_xdg_surface;
-        while (surface && surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL) {
-                if (surface->toplevel->parent == ancestor->wlr_xdg_surface) {
+        struct wlr_xdg_toplevel *toplevel = child->wlr_xdg_toplevel;
+        while (toplevel) {
+                if (toplevel->parent == ancestor->wlr_xdg_toplevel) {
                         return true;
                 }
-                surface = surface->toplevel->parent;
+                toplevel = toplevel->parent;
         }
         return false;
 }
@@ -239,17 +233,13 @@ static void _close(struct sway_view *view) {
         if (xdg_shell_view_from_view(view) == NULL) {
                 return;
         }
-        struct wlr_xdg_surface *surface = view->wlr_xdg_surface;
-        if (surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL
-                        && surface->toplevel) {
-                wlr_xdg_toplevel_send_close(surface);
-        }
+        wlr_xdg_toplevel_send_close(view->wlr_xdg_toplevel);
 }
 
 static void close_popups(struct sway_view *view) {
         struct wlr_xdg_popup *popup, *tmp;
-        wl_list_for_each_safe(popup, tmp, &view->wlr_xdg_surface->popups, link) {
-                wlr_xdg_popup_destroy(popup->base);
+        wl_list_for_each_safe(popup, tmp, &view->wlr_xdg_toplevel->base->popups, link) {
+                wlr_xdg_popup_destroy(popup);
         }
 }
 
@@ -271,8 +261,6 @@ static const struct sway_view_impl view_impl = {
         .set_fullscreen = set_fullscreen,
         .set_resizing = set_resizing,
         .wants_floating = wants_floating,
-        .for_each_surface = for_each_surface,
-        .for_each_popup_surface = for_each_popup_surface,
         .is_transient_for = is_transient_for,
         .close = _close,
         .close_popups = close_popups,
@@ -283,7 +271,20 @@ static void handle_commit(struct wl_listener *listener, void *data) {
         struct sway_xdg_shell_view *xdg_shell_view =
                 wl_container_of(listener, xdg_shell_view, commit);
         struct sway_view *view = &xdg_shell_view->view;
-        struct wlr_xdg_surface *xdg_surface = view->wlr_xdg_surface;
+        struct wlr_xdg_surface *xdg_surface = view->wlr_xdg_toplevel->base;
+
+        if (xdg_surface->initial_commit) {
+                if (view->xdg_decoration != NULL) {
+                        set_xdg_decoration_mode(view->xdg_decoration);
+                }
+                // XXX: https://github.com/swaywm/sway/issues/2176
+                wlr_xdg_surface_schedule_configure(xdg_surface);
+                return;
+        }
+
+        if (!xdg_surface->surface->mapped) {
+                return;
+        }
 
         struct wlr_box new_geo;
         wlr_xdg_surface_get_geometry(xdg_surface, &new_geo);
@@ -293,22 +294,35 @@ static void handle_commit(struct wl_listener *listener, void *data) {
                         new_geo.y != view->geometry.y;
 
         if (new_size) {
-                // The view has unexpectedly sent a new size
-                desktop_damage_view(view);
-                view_update_size(view, new_geo.width, new_geo.height);
+                // The client changed its surface size in this commit. For floating
+                // containers, we resize the container to match. For tiling containers,
+                // we only recenter the surface.
                 memcpy(&view->geometry, &new_geo, sizeof(struct wlr_box));
-                desktop_damage_view(view);
-                transaction_commit_dirty();
+                if (container_is_floating(view->container)) {
+                        view_update_size(view);
+                        // Only set the toplevel size the current container actually has a size.
+                        if (view->container->current.width) {
+                                wlr_xdg_toplevel_set_size(view->wlr_xdg_toplevel, view->geometry.width,
+                                        view->geometry.height);
+                        }
+                        transaction_commit_dirty_client();
+                }
+
+                view_center_and_clip_surface(view);
         }
 
         if (view->container->node.instruction) {
-                transaction_notify_view_ready_by_serial(view,
-                                xdg_surface->configure_serial);
-        } else if (new_size) {
-                transaction_notify_view_ready_immediately(view);
+                bool successful = transaction_notify_view_ready_by_serial(view,
+                                xdg_surface->current.configure_serial);
+
+                // If we saved the view and this commit isn't what we're looking for
+                // that means the user will never actually see the buffers submitted to
+                // us here. Just send frame done events to these surfaces so they can
+                // commit another time for us.
+                if (view->saved_surface_tree && !successful) {
+                        view_send_frame_done(view);
+                }
         }
-
-        view_damage_from(view);
 }
 
 static void handle_set_title(struct wl_listener *listener, void *data) {
@@ -330,31 +344,42 @@ static void handle_new_popup(struct wl_listener *listener, void *data) {
         struct sway_xdg_shell_view *xdg_shell_view =
                 wl_container_of(listener, xdg_shell_view, new_popup);
         struct wlr_xdg_popup *wlr_popup = data;
-        popup_create(wlr_popup, &xdg_shell_view->view);
+
+        struct sway_xdg_popup *popup = popup_create(wlr_popup,
+                &xdg_shell_view->view, root->layers.popup);
+        if (!popup) {
+                return;
+        }
+
+        int lx, ly;
+        wlr_scene_node_coords(&popup->view->content_tree->node, &lx, &ly);
+        wlr_scene_node_set_position(&popup->scene_tree->node, lx, ly);
+}
+
+static void handle_request_maximize(struct wl_listener *listener, void *data) {
+        struct sway_xdg_shell_view *xdg_shell_view =
+                wl_container_of(listener, xdg_shell_view, request_maximize);
+        struct wlr_xdg_toplevel *toplevel = xdg_shell_view->view.wlr_xdg_toplevel;
+        wlr_xdg_surface_schedule_configure(toplevel->base);
 }
 
 static void handle_request_fullscreen(struct wl_listener *listener, void *data) {
         struct sway_xdg_shell_view *xdg_shell_view =
                 wl_container_of(listener, xdg_shell_view, request_fullscreen);
-        struct wlr_xdg_toplevel_set_fullscreen_event *e = data;
-        struct wlr_xdg_surface *xdg_surface =
-                xdg_shell_view->view.wlr_xdg_surface;
+        struct wlr_xdg_toplevel *toplevel = xdg_shell_view->view.wlr_xdg_toplevel;
         struct sway_view *view = &xdg_shell_view->view;
 
-        if (!sway_assert(xdg_surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL,
-                                "xdg_shell requested fullscreen of surface with role %i",
-                                xdg_surface->role)) {
-                return;
-        }
-        if (!xdg_surface->mapped) {
+        if (!toplevel->base->surface->mapped) {
                 return;
         }
 
         struct sway_container *container = view->container;
-        if (e->fullscreen && e->output && e->output->data) {
-                struct sway_output *output = e->output->data;
+        struct wlr_xdg_toplevel_requested *req = &toplevel->requested;
+        if (req->fullscreen && req->fullscreen_output && req->fullscreen_output->data) {
+                struct sway_output *output = req->fullscreen_output->data;
                 struct sway_workspace *ws = output_get_active_workspace(output);
-                if (ws && !container_is_scratchpad_hidden(container)) {
+                if (ws && !container_is_scratchpad_hidden(container) &&
+                                container->pending.workspace != ws) {
                         if (container_is_floating(container)) {
                                 workspace_add_floating(ws, container);
                         } else {
@@ -363,22 +388,18 @@ static void handle_request_fullscreen(struct wl_listener *listener, void *data)
                 }
         }
 
-        container_set_fullscreen(container, e->fullscreen);
+        container_set_fullscreen(container, req->fullscreen);
 
         arrange_root();
         transaction_commit_dirty();
 }
 
-static void handle_request_maximize(struct wl_listener *listener, void *data) {
-        struct wlr_xdg_surface *surface = data;
-        wlr_xdg_surface_schedule_configure(surface);
-}
-
 static void handle_request_move(struct wl_listener *listener, void *data) {
         struct sway_xdg_shell_view *xdg_shell_view =
                 wl_container_of(listener, xdg_shell_view, request_move);
         struct sway_view *view = &xdg_shell_view->view;
-        if (!container_is_floating(view->container)) {
+        if (!container_is_floating(view->container) ||
+                        view->container->pending.fullscreen_mode) {
                 return;
         }
         struct wlr_xdg_toplevel_move_event *e = data;
@@ -413,10 +434,9 @@ static void handle_unmap(struct wl_listener *listener, void *data) {
 
         view_unmap(view);
 
-        wl_list_remove(&xdg_shell_view->commit.link);
         wl_list_remove(&xdg_shell_view->new_popup.link);
-        wl_list_remove(&xdg_shell_view->request_fullscreen.link);
         wl_list_remove(&xdg_shell_view->request_maximize.link);
+        wl_list_remove(&xdg_shell_view->request_fullscreen.link);
         wl_list_remove(&xdg_shell_view->request_move.link);
         wl_list_remove(&xdg_shell_view->request_resize.link);
         wl_list_remove(&xdg_shell_view->set_title.link);
@@ -427,62 +447,61 @@ static void handle_map(struct wl_listener *listener, void *data) {
         struct sway_xdg_shell_view *xdg_shell_view =
                 wl_container_of(listener, xdg_shell_view, map);
         struct sway_view *view = &xdg_shell_view->view;
-        struct wlr_xdg_surface *xdg_surface = view->wlr_xdg_surface;
+        struct wlr_xdg_toplevel *toplevel = view->wlr_xdg_toplevel;
 
-        view->natural_width = view->wlr_xdg_surface->geometry.width;
-        view->natural_height = view->wlr_xdg_surface->geometry.height;
+        view->natural_width = toplevel->base->current.geometry.width;
+        view->natural_height = toplevel->base->current.geometry.height;
         if (!view->natural_width && !view->natural_height) {
-                view->natural_width = view->wlr_xdg_surface->surface->current.width;
-                view->natural_height = view->wlr_xdg_surface->surface->current.height;
+                view->natural_width = toplevel->base->surface->current.width;
+                view->natural_height = toplevel->base->surface->current.height;
         }
 
         bool csd = false;
 
-        if (!view->xdg_decoration) {
+        if (view->xdg_decoration) {
+                enum wlr_xdg_toplevel_decoration_v1_mode mode =
+                        view->xdg_decoration->wlr_xdg_decoration->requested_mode;
+                csd = mode == WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE;
+        } else {
                 struct sway_server_decoration *deco =
-                                decoration_from_surface(xdg_surface->surface);
+                                decoration_from_surface(toplevel->base->surface);
                 csd = !deco || deco->wlr_server_decoration->mode ==
                         WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT;
-
         }
 
-        view_map(view, view->wlr_xdg_surface->surface,
-                xdg_surface->toplevel->client_pending.fullscreen,
-                xdg_surface->toplevel->client_pending.fullscreen_output,
+        view_map(view, toplevel->base->surface,
+                toplevel->requested.fullscreen,
+                toplevel->requested.fullscreen_output,
                 csd);
 
         transaction_commit_dirty();
 
-        xdg_shell_view->commit.notify = handle_commit;
-        wl_signal_add(&xdg_surface->surface->events.commit,
-                &xdg_shell_view->commit);
-
         xdg_shell_view->new_popup.notify = handle_new_popup;
-        wl_signal_add(&xdg_surface->events.new_popup,
+        wl_signal_add(&toplevel->base->events.new_popup,
                 &xdg_shell_view->new_popup);
 
-        xdg_shell_view->request_fullscreen.notify = handle_request_fullscreen;
-        wl_signal_add(&xdg_surface->toplevel->events.request_fullscreen,
-                        &xdg_shell_view->request_fullscreen);
-
         xdg_shell_view->request_maximize.notify = handle_request_maximize;
-        wl_signal_add(&xdg_surface->toplevel->events.request_maximize,
+        wl_signal_add(&toplevel->events.request_maximize,
                         &xdg_shell_view->request_maximize);
 
+        xdg_shell_view->request_fullscreen.notify = handle_request_fullscreen;
+        wl_signal_add(&toplevel->events.request_fullscreen,
+                        &xdg_shell_view->request_fullscreen);
+
         xdg_shell_view->request_move.notify = handle_request_move;
-        wl_signal_add(&xdg_surface->toplevel->events.request_move,
+        wl_signal_add(&toplevel->events.request_move,
                         &xdg_shell_view->request_move);
 
         xdg_shell_view->request_resize.notify = handle_request_resize;
-        wl_signal_add(&xdg_surface->toplevel->events.request_resize,
+        wl_signal_add(&toplevel->events.request_resize,
                         &xdg_shell_view->request_resize);
 
         xdg_shell_view->set_title.notify = handle_set_title;
-        wl_signal_add(&xdg_surface->toplevel->events.set_title,
+        wl_signal_add(&toplevel->events.set_title,
                         &xdg_shell_view->set_title);
 
         xdg_shell_view->set_app_id.notify = handle_set_app_id;
-        wl_signal_add(&xdg_surface->toplevel->events.set_app_id,
+        wl_signal_add(&toplevel->events.set_app_id,
                         &xdg_shell_view->set_app_id);
 }
 
@@ -496,7 +515,8 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
         wl_list_remove(&xdg_shell_view->destroy.link);
         wl_list_remove(&xdg_shell_view->map.link);
         wl_list_remove(&xdg_shell_view->unmap.link);
-        view->wlr_xdg_surface = NULL;
+        wl_list_remove(&xdg_shell_view->commit.link);
+        view->wlr_xdg_toplevel = NULL;
         if (view->xdg_decoration) {
                 view->xdg_decoration->view = NULL;
         }
@@ -508,17 +528,12 @@ struct sway_view *view_from_wlr_xdg_surface(
         return xdg_surface->data;
 }
 
-void handle_xdg_shell_surface(struct wl_listener *listener, void *data) {
-        struct wlr_xdg_surface *xdg_surface = data;
-
-        if (xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP) {
-                sway_log(SWAY_DEBUG, "New xdg_shell popup");
-                return;
-        }
+void handle_xdg_shell_toplevel(struct wl_listener *listener, void *data) {
+        struct wlr_xdg_toplevel *xdg_toplevel = data;
 
         sway_log(SWAY_DEBUG, "New xdg_shell toplevel title='%s' app_id='%s'",
-                xdg_surface->toplevel->title, xdg_surface->toplevel->app_id);
-        wlr_xdg_surface_ping(xdg_surface);
+                xdg_toplevel->title, xdg_toplevel->app_id);
+        wlr_xdg_surface_ping(xdg_toplevel->base);
 
         struct sway_xdg_shell_view *xdg_shell_view =
                 calloc(1, sizeof(struct sway_xdg_shell_view));
@@ -526,17 +541,26 @@ void handle_xdg_shell_surface(struct wl_listener *listener, void *data) {
                 return;
         }
 
-        view_init(&xdg_shell_view->view, SWAY_VIEW_XDG_SHELL, &view_impl);
-        xdg_shell_view->view.wlr_xdg_surface = xdg_surface;
+        if (!view_init(&xdg_shell_view->view, SWAY_VIEW_XDG_SHELL, &view_impl)) {
+                free(xdg_shell_view);
+                return;
+        }
+        xdg_shell_view->view.wlr_xdg_toplevel = xdg_toplevel;
 
         xdg_shell_view->map.notify = handle_map;
-        wl_signal_add(&xdg_surface->events.map, &xdg_shell_view->map);
+        wl_signal_add(&xdg_toplevel->base->surface->events.map, &xdg_shell_view->map);
 
         xdg_shell_view->unmap.notify = handle_unmap;
-        wl_signal_add(&xdg_surface->events.unmap, &xdg_shell_view->unmap);
+        wl_signal_add(&xdg_toplevel->base->surface->events.unmap, &xdg_shell_view->unmap);
+
+        xdg_shell_view->commit.notify = handle_commit;
+        wl_signal_add(&xdg_toplevel->base->surface->events.commit,
+                &xdg_shell_view->commit);
 
         xdg_shell_view->destroy.notify = handle_destroy;
-        wl_signal_add(&xdg_surface->events.destroy, &xdg_shell_view->destroy);
+        wl_signal_add(&xdg_toplevel->events.destroy, &xdg_shell_view->destroy);
+
+        wlr_scene_xdg_surface_create(xdg_shell_view->view.content_tree, xdg_toplevel->base);
 
-        xdg_surface->data = xdg_shell_view;
+        xdg_toplevel->base->data = xdg_shell_view;
 }
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index e1a2e463..9f3f4d5f 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -5,16 +5,20 @@
 #include <wayland-server-core.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_output.h>
+#include <wlr/types/wlr_xdg_activation_v1.h>
+#include <wlr/types/wlr_scene.h>
 #include <wlr/xwayland.h>
+#include <xcb/xcb_icccm.h>
 #include "log.h"
-#include "sway/desktop.h"
 #include "sway/desktop/transaction.h"
 #include "sway/input/cursor.h"
 #include "sway/input/input-manager.h"
 #include "sway/input/seat.h"
 #include "sway/output.h"
+#include "sway/scene_descriptor.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/container.h"
+#include "sway/server.h"
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
 
@@ -42,29 +46,12 @@ static void unmanaged_handle_request_configure(struct wl_listener *listener,
                 ev->width, ev->height);
 }
 
-static void unmanaged_handle_commit(struct wl_listener *listener, void *data) {
-        struct sway_xwayland_unmanaged *surface =
-                wl_container_of(listener, surface, commit);
-        struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface;
-
-        desktop_damage_surface(xsurface->surface, surface->lx, surface->ly,
-                false);
-}
-
 static void unmanaged_handle_set_geometry(struct wl_listener *listener, void *data) {
         struct sway_xwayland_unmanaged *surface =
                 wl_container_of(listener, surface, set_geometry);
         struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface;
 
-        if (xsurface->x != surface->lx || xsurface->y != surface->ly) {
-                // Surface has moved
-                desktop_damage_surface(xsurface->surface, surface->lx, surface->ly,
-                        true);
-                surface->lx = xsurface->x;
-                surface->ly = xsurface->y;
-                desktop_damage_surface(xsurface->surface, surface->lx, surface->ly,
-                        true);
-        }
+        wlr_scene_node_set_position(&surface->surface_scene->buffer->node, xsurface->x, xsurface->y);
 }
 
 static void unmanaged_handle_map(struct wl_listener *listener, void *data) {
@@ -72,17 +59,18 @@ static void unmanaged_handle_map(struct wl_listener *listener, void *data) {
                 wl_container_of(listener, surface, map);
         struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface;
 
-        wl_list_insert(root->xwayland_unmanaged.prev, &surface->link);
-
-        wl_signal_add(&xsurface->events.set_geometry, &surface->set_geometry);
-        surface->set_geometry.notify = unmanaged_handle_set_geometry;
+        surface->surface_scene = wlr_scene_surface_create(root->layers.unmanaged,
+                xsurface->surface);
 
-        wl_signal_add(&xsurface->surface->events.commit, &surface->commit);
-        surface->commit.notify = unmanaged_handle_commit;
+        if (surface->surface_scene) {
+                scene_descriptor_assign(&surface->surface_scene->buffer->node,
+                        SWAY_SCENE_DESC_XWAYLAND_UNMANAGED, surface);
+                wlr_scene_node_set_position(&surface->surface_scene->buffer->node,
+                        xsurface->x, xsurface->y);
 
-        surface->lx = xsurface->x;
-        surface->ly = xsurface->y;
-        desktop_damage_surface(xsurface->surface, surface->lx, surface->ly, true);
+                wl_signal_add(&xsurface->events.set_geometry, &surface->set_geometry);
+                surface->set_geometry.notify = unmanaged_handle_set_geometry;
+        }
 
         if (wlr_xwayland_or_surface_wants_focus(xsurface)) {
                 struct sway_seat *seat = input_manager_current_seat();
@@ -96,23 +84,22 @@ static void unmanaged_handle_unmap(struct wl_listener *listener, void *data) {
         struct sway_xwayland_unmanaged *surface =
                 wl_container_of(listener, surface, unmap);
         struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface;
-        desktop_damage_surface(xsurface->surface, xsurface->x, xsurface->y, true);
-        wl_list_remove(&surface->link);
-        wl_list_remove(&surface->set_geometry.link);
-        wl_list_remove(&surface->commit.link);
+
+        if (surface->surface_scene) {
+                wl_list_remove(&surface->set_geometry.link);
+
+                wlr_scene_node_destroy(&surface->surface_scene->buffer->node);
+                surface->surface_scene = NULL;
+        }
 
         struct sway_seat *seat = input_manager_current_seat();
         if (seat->wlr_seat->keyboard_state.focused_surface == xsurface->surface) {
                 // This simply returns focus to the parent surface if there's one available.
                 // This seems to handle JetBrains issues.
-                if (xsurface->parent && xsurface->parent->surface &&
-                                wlr_surface_is_xwayland_surface(xsurface->parent->surface)) {
-                        struct wlr_xwayland_surface *next_surface =
-                                wlr_xwayland_surface_from_wlr_surface(xsurface->parent->surface);
-                        if (wlr_xwayland_or_surface_wants_focus(next_surface)) {
-                                seat_set_focus_surface(seat, xsurface->parent->surface, false);
-                                return;
-                        }
+                if (xsurface->parent && xsurface->parent->surface
+                                && wlr_xwayland_or_surface_wants_focus(xsurface->parent)) {
+                        seat_set_focus_surface(seat, xsurface->parent->surface, false);
+                        return;
                 }
 
                 // Restore focus
@@ -125,18 +112,53 @@ static void unmanaged_handle_unmap(struct wl_listener *listener, void *data) {
         }
 }
 
+static void unmanaged_handle_request_activate(struct wl_listener *listener, void *data) {
+        struct sway_xwayland_unmanaged *surface =
+                wl_container_of(listener, surface, request_activate);
+        struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface;
+        if (xsurface->surface == NULL || !xsurface->surface->mapped) {
+                return;
+        }
+        struct sway_seat *seat = input_manager_current_seat();
+        struct sway_container *focus = seat_get_focused_container(seat);
+        if (focus && focus->view && focus->view->pid != xsurface->pid) {
+                return;
+        }
+
+        seat_set_focus_surface(seat, xsurface->surface, false);
+}
+
+static void unmanaged_handle_associate(struct wl_listener *listener, void *data) {
+        struct sway_xwayland_unmanaged *surface =
+                wl_container_of(listener, surface, associate);
+        struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface;
+        wl_signal_add(&xsurface->surface->events.map, &surface->map);
+        surface->map.notify = unmanaged_handle_map;
+        wl_signal_add(&xsurface->surface->events.unmap, &surface->unmap);
+        surface->unmap.notify = unmanaged_handle_unmap;
+}
+
+static void unmanaged_handle_dissociate(struct wl_listener *listener, void *data) {
+        struct sway_xwayland_unmanaged *surface =
+                wl_container_of(listener, surface, dissociate);
+        wl_list_remove(&surface->map.link);
+        wl_list_remove(&surface->unmap.link);
+}
+
 static void unmanaged_handle_destroy(struct wl_listener *listener, void *data) {
         struct sway_xwayland_unmanaged *surface =
                 wl_container_of(listener, surface, destroy);
         wl_list_remove(&surface->request_configure.link);
-        wl_list_remove(&surface->map.link);
-        wl_list_remove(&surface->unmap.link);
+        wl_list_remove(&surface->associate.link);
+        wl_list_remove(&surface->dissociate.link);
         wl_list_remove(&surface->destroy.link);
         wl_list_remove(&surface->override_redirect.link);
+        wl_list_remove(&surface->request_activate.link);
         free(surface);
 }
 
 static void handle_map(struct wl_listener *listener, void *data);
+static void handle_associate(struct wl_listener *listener, void *data);
 
 struct sway_xwayland_view *create_xwayland_view(struct wlr_xwayland_surface *xsurface);
 
@@ -145,14 +167,22 @@ static void unmanaged_handle_override_redirect(struct wl_listener *listener, voi
                 wl_container_of(listener, surface, override_redirect);
         struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface;
 
-        bool mapped = xsurface->mapped;
+        bool associated = xsurface->surface != NULL;
+        bool mapped = associated && xsurface->surface->mapped;
         if (mapped) {
                 unmanaged_handle_unmap(&surface->unmap, NULL);
         }
+        if (associated) {
+                unmanaged_handle_dissociate(&surface->dissociate, NULL);
+        }
 
         unmanaged_handle_destroy(&surface->destroy, NULL);
         xsurface->data = NULL;
+
         struct sway_xwayland_view *xwayland_view = create_xwayland_view(xsurface);
+        if (associated) {
+                handle_associate(&xwayland_view->associate, NULL);
+        }
         if (mapped) {
                 handle_map(&xwayland_view->map, xsurface);
         }
@@ -172,14 +202,16 @@ static struct sway_xwayland_unmanaged *create_unmanaged(
         wl_signal_add(&xsurface->events.request_configure,
                 &surface->request_configure);
         surface->request_configure.notify = unmanaged_handle_request_configure;
-        wl_signal_add(&xsurface->events.map, &surface->map);
-        surface->map.notify = unmanaged_handle_map;
-        wl_signal_add(&xsurface->events.unmap, &surface->unmap);
-        surface->unmap.notify = unmanaged_handle_unmap;
+        wl_signal_add(&xsurface->events.associate, &surface->associate);
+        surface->associate.notify = unmanaged_handle_associate;
+        wl_signal_add(&xsurface->events.dissociate, &surface->dissociate);
+        surface->dissociate.notify = unmanaged_handle_dissociate;
         wl_signal_add(&xsurface->events.destroy, &surface->destroy);
         surface->destroy.notify = unmanaged_handle_destroy;
         wl_signal_add(&xsurface->events.set_override_redirect, &surface->override_redirect);
         surface->override_redirect.notify = unmanaged_handle_override_redirect;
+        wl_signal_add(&xsurface->events.request_activate, &surface->request_activate);
+        surface->request_activate.notify = unmanaged_handle_request_activate;
 
         return surface;
 }
@@ -258,6 +290,7 @@ static void set_activated(struct sway_view *view, bool activated) {
         }
 
         wlr_xwayland_surface_activate(surface, activated);
+        wlr_xwayland_surface_restack(surface, NULL, XCB_STACK_MODE_ABOVE);
 }
 
 static void set_tiled(struct sway_view *view, bool tiled) {
@@ -297,7 +330,7 @@ static bool wants_floating(struct sway_view *view) {
                 }
         }
 
-        struct wlr_xwayland_surface_size_hints *size_hints = surface->size_hints;
+        xcb_size_hints_t *size_hints = surface->size_hints;
         if (size_hints != NULL &&
                         size_hints->min_width > 0 && size_hints->min_height > 0 &&
                         (size_hints->max_width == size_hints->min_width ||
@@ -351,7 +384,7 @@ static void destroy(struct sway_view *view) {
 static void get_constraints(struct sway_view *view, double *min_width,
                 double *max_width, double *min_height, double *max_height) {
         struct wlr_xwayland_surface *surface = view->wlr_xwayland_surface;
-        struct wlr_xwayland_surface_size_hints *size_hints = surface->size_hints;
+        xcb_size_hints_t *size_hints = surface->size_hints;
 
         if (size_hints == NULL) {
                 *min_width = DBL_MIN;
@@ -381,17 +414,6 @@ static const struct sway_view_impl view_impl = {
         .destroy = destroy,
 };
 
-static void get_geometry(struct sway_view *view, struct wlr_box *box) {
-        box->x = box->y = 0;
-        if (view->surface) {
-                box->width = view->surface->current.width;
-                box->height = view->surface->current.height;
-        } else {
-                box->width = 0;
-                box->height = 0;
-        }
-}
-
 static void handle_commit(struct wl_listener *listener, void *data) {
         struct sway_xwayland_view *xwayland_view =
                 wl_container_of(listener, xwayland_view, commit);
@@ -399,33 +421,38 @@ static void handle_commit(struct wl_listener *listener, void *data) {
         struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
         struct wlr_surface_state *state = &xsurface->surface->current;
 
+        struct wlr_box new_geo = {0};
+        new_geo.width = state->width;
+        new_geo.height = state->height;
+
+        bool new_size = new_geo.width != view->geometry.width ||
+                        new_geo.height != view->geometry.height;
+
+        if (new_size) {
+                // The client changed its surface size in this commit. For floating
+                // containers, we resize the container to match. For tiling containers,
+                // we only recenter the surface.
+                memcpy(&view->geometry, &new_geo, sizeof(struct wlr_box));
+                if (container_is_floating(view->container)) {
+                        view_update_size(view);
+                        transaction_commit_dirty_client();
+                }
+
+                view_center_and_clip_surface(view);
+        }
+
         if (view->container->node.instruction) {
-                get_geometry(view, &view->geometry);
-                transaction_notify_view_ready_by_geometry(view,
+                bool successful = transaction_notify_view_ready_by_geometry(view,
                                 xsurface->x, xsurface->y, state->width, state->height);
-        } else {
-                struct wlr_box new_geo;
-                get_geometry(view, &new_geo);
-
-                if ((new_geo.width != view->geometry.width ||
-                                        new_geo.height != view->geometry.height ||
-                                        new_geo.x != view->geometry.x ||
-                                        new_geo.y != view->geometry.y)) {
-                        // The view has unexpectedly sent a new size
-                        // eg. The Firefox "Save As" dialog when downloading a file
-                        desktop_damage_view(view);
-                        view_update_size(view, new_geo.width, new_geo.height);
-                        memcpy(&view->geometry, &new_geo, sizeof(struct wlr_box));
-                        desktop_damage_view(view);
-                        transaction_commit_dirty();
-                        transaction_notify_view_ready_by_geometry(view,
-                                        xsurface->x, xsurface->y, new_geo.width, new_geo.height);
-                } else {
-                        memcpy(&view->geometry, &new_geo, sizeof(struct wlr_box));
+
+                // If we saved the view and this commit isn't what we're looking for
+                // that means the user will never actually see the buffers submitted to
+                // us here. Just send frame done events to these surfaces so they can
+                // commit another time for us.
+                if (view->saved_surface_tree && !successful) {
+                        view_send_frame_done(view);
                 }
         }
-
-        view_damage_from(view);
 }
 
 static void handle_destroy(struct wl_listener *listener, void *data) {
@@ -438,6 +465,8 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
                 wl_list_remove(&xwayland_view->commit.link);
         }
 
+        xwayland_view->view.wlr_xwayland_surface = NULL;
+
         wl_list_remove(&xwayland_view->destroy.link);
         wl_list_remove(&xwayland_view->request_configure.link);
         wl_list_remove(&xwayland_view->request_fullscreen.link);
@@ -448,11 +477,12 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
         wl_list_remove(&xwayland_view->set_title.link);
         wl_list_remove(&xwayland_view->set_class.link);
         wl_list_remove(&xwayland_view->set_role.link);
+        wl_list_remove(&xwayland_view->set_startup_id.link);
         wl_list_remove(&xwayland_view->set_window_type.link);
         wl_list_remove(&xwayland_view->set_hints.link);
         wl_list_remove(&xwayland_view->set_decorations.link);
-        wl_list_remove(&xwayland_view->map.link);
-        wl_list_remove(&xwayland_view->unmap.link);
+        wl_list_remove(&xwayland_view->associate.link);
+        wl_list_remove(&xwayland_view->dissociate.link);
         wl_list_remove(&xwayland_view->override_redirect.link);
         view_begin_destroy(&xwayland_view->view);
 }
@@ -466,16 +496,28 @@ static void handle_unmap(struct wl_listener *listener, void *data) {
                 return;
         }
 
+        wl_list_remove(&xwayland_view->commit.link);
+        wl_list_remove(&xwayland_view->surface_tree_destroy.link);
+
+        if (xwayland_view->surface_tree) {
+                wlr_scene_node_destroy(&xwayland_view->surface_tree->node);
+                xwayland_view->surface_tree = NULL;
+        }
+
         view_unmap(view);
+}
 
-        wl_list_remove(&xwayland_view->commit.link);
+static void handle_surface_tree_destroy(struct wl_listener *listener, void *data) {
+        struct sway_xwayland_view *xwayland_view = wl_container_of(listener, xwayland_view,
+                surface_tree_destroy);
+        xwayland_view->surface_tree = NULL;
 }
 
 static void handle_map(struct wl_listener *listener, void *data) {
         struct sway_xwayland_view *xwayland_view =
                 wl_container_of(listener, xwayland_view, map);
-        struct wlr_xwayland_surface *xsurface = data;
         struct sway_view *view = &xwayland_view->view;
+        struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
 
         view->natural_width = xsurface->width;
         view->natural_height = xsurface->height;
@@ -488,23 +530,42 @@ static void handle_map(struct wl_listener *listener, void *data) {
         // Put it back into the tree
         view_map(view, xsurface->surface, xsurface->fullscreen, NULL, false);
 
+        xwayland_view->surface_tree = wlr_scene_subsurface_tree_create(
+                xwayland_view->view.content_tree, xsurface->surface);
+
+        if (xwayland_view->surface_tree) {
+                xwayland_view->surface_tree_destroy.notify = handle_surface_tree_destroy;
+                wl_signal_add(&xwayland_view->surface_tree->node.events.destroy,
+                        &xwayland_view->surface_tree_destroy);
+        }
+
         transaction_commit_dirty();
 }
 
+static void handle_dissociate(struct wl_listener *listener, void *data);
+
 static void handle_override_redirect(struct wl_listener *listener, void *data) {
         struct sway_xwayland_view *xwayland_view =
                 wl_container_of(listener, xwayland_view, override_redirect);
-        struct wlr_xwayland_surface *xsurface = data;
         struct sway_view *view = &xwayland_view->view;
+        struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
 
-        bool mapped = xsurface->mapped;
+        bool associated = xsurface->surface != NULL;
+        bool mapped = associated && xsurface->surface->mapped;
         if (mapped) {
                 handle_unmap(&xwayland_view->unmap, NULL);
         }
+        if (associated) {
+                handle_dissociate(&xwayland_view->dissociate, NULL);
+        }
 
         handle_destroy(&xwayland_view->destroy, view);
         xsurface->data = NULL;
+
         struct sway_xwayland_unmanaged *unmanaged = create_unmanaged(xsurface);
+        if (associated) {
+                unmanaged_handle_associate(&unmanaged->associate, NULL);
+        }
         if (mapped) {
                 unmanaged_handle_map(&unmanaged->map, xsurface);
         }
@@ -516,7 +577,7 @@ static void handle_request_configure(struct wl_listener *listener, void *data) {
         struct wlr_xwayland_surface_configure_event *ev = data;
         struct sway_view *view = &xwayland_view->view;
         struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
-        if (!xsurface->mapped) {
+        if (xsurface->surface == NULL || !xsurface->surface->mapped) {
                 wlr_xwayland_surface_configure(xsurface, ev->x, ev->y,
                         ev->width, ev->height);
                 return;
@@ -527,10 +588,10 @@ static void handle_request_configure(struct wl_listener *listener, void *data) {
                 view->natural_height = ev->height;
                 container_floating_resize_and_center(view->container);
 
-                configure(view, view->container->content_x,
-                                view->container->content_y,
-                                view->container->content_width,
-                                view->container->content_height);
+                configure(view, view->container->pending.content_x,
+                                view->container->pending.content_y,
+                                view->container->pending.content_width,
+                                view->container->pending.content_height);
                 node_set_dirty(&view->container->node);
         } else {
                 configure(view, view->container->current.content_x,
@@ -545,7 +606,7 @@ static void handle_request_fullscreen(struct wl_listener *listener, void *data)
                 wl_container_of(listener, xwayland_view, request_fullscreen);
         struct sway_view *view = &xwayland_view->view;
         struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
-        if (!xsurface->mapped) {
+        if (xsurface->surface == NULL || !xsurface->surface->mapped) {
                 return;
         }
         container_set_fullscreen(view->container, xsurface->fullscreen);
@@ -559,7 +620,7 @@ static void handle_request_minimize(struct wl_listener *listener, void *data) {
                 wl_container_of(listener, xwayland_view, request_minimize);
         struct sway_view *view = &xwayland_view->view;
         struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
-        if (!xsurface->mapped) {
+        if (xsurface->surface == NULL || !xsurface->surface->mapped) {
                 return;
         }
 
@@ -574,10 +635,11 @@ static void handle_request_move(struct wl_listener *listener, void *data) {
                 wl_container_of(listener, xwayland_view, request_move);
         struct sway_view *view = &xwayland_view->view;
         struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
-        if (!xsurface->mapped) {
+        if (xsurface->surface == NULL || !xsurface->surface->mapped) {
                 return;
         }
-        if (!container_is_floating(view->container)) {
+        if (!container_is_floating(view->container) ||
+                        view->container->pending.fullscreen_mode) {
                 return;
         }
         struct sway_seat *seat = input_manager_current_seat();
@@ -589,7 +651,7 @@ static void handle_request_resize(struct wl_listener *listener, void *data) {
                 wl_container_of(listener, xwayland_view, request_resize);
         struct sway_view *view = &xwayland_view->view;
         struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
-        if (!xsurface->mapped) {
+        if (xsurface->surface == NULL || !xsurface->surface->mapped) {
                 return;
         }
         if (!container_is_floating(view->container)) {
@@ -605,10 +667,10 @@ static void handle_request_activate(struct wl_listener *listener, void *data) {
                 wl_container_of(listener, xwayland_view, request_activate);
         struct sway_view *view = &xwayland_view->view;
         struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
-        if (!xsurface->mapped) {
+        if (xsurface->surface == NULL || !xsurface->surface->mapped) {
                 return;
         }
-        view_request_activate(view);
+        view_request_activate(view, NULL);
 
         transaction_commit_dirty();
 }
@@ -618,7 +680,7 @@ static void handle_set_title(struct wl_listener *listener, void *data) {
                 wl_container_of(listener, xwayland_view, set_title);
         struct sway_view *view = &xwayland_view->view;
         struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
-        if (!xsurface->mapped) {
+        if (xsurface->surface == NULL || !xsurface->surface->mapped) {
                 return;
         }
         view_update_title(view, false);
@@ -630,7 +692,7 @@ static void handle_set_class(struct wl_listener *listener, void *data) {
                 wl_container_of(listener, xwayland_view, set_class);
         struct sway_view *view = &xwayland_view->view;
         struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
-        if (!xsurface->mapped) {
+        if (xsurface->surface == NULL || !xsurface->surface->mapped) {
                 return;
         }
         view_execute_criteria(view);
@@ -641,18 +703,43 @@ static void handle_set_role(struct wl_listener *listener, void *data) {
                 wl_container_of(listener, xwayland_view, set_role);
         struct sway_view *view = &xwayland_view->view;
         struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
-        if (!xsurface->mapped) {
+        if (xsurface->surface == NULL || !xsurface->surface->mapped) {
                 return;
         }
         view_execute_criteria(view);
 }
 
+static void handle_set_startup_id(struct wl_listener *listener, void *data) {
+        struct sway_xwayland_view *xwayland_view =
+                wl_container_of(listener, xwayland_view, set_startup_id);
+        struct sway_view *view = &xwayland_view->view;
+        struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
+        if (xsurface->startup_id == NULL) {
+                return;
+        }
+
+        struct wlr_xdg_activation_token_v1 *token =
+                wlr_xdg_activation_v1_find_token(
+                                server.xdg_activation_v1, xsurface->startup_id);
+        if (token == NULL) {
+                // Tried to activate with an unknown or expired token
+                return;
+        }
+
+        struct launcher_ctx *ctx = token->data;
+        if (token->data == NULL) {
+                // TODO: support external launchers in X
+                return;
+        }
+        view_assign_ctx(view, ctx);
+}
+
 static void handle_set_window_type(struct wl_listener *listener, void *data) {
         struct sway_xwayland_view *xwayland_view =
                 wl_container_of(listener, xwayland_view, set_window_type);
         struct sway_view *view = &xwayland_view->view;
         struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
-        if (!xsurface->mapped) {
+        if (xsurface->surface == NULL || !xsurface->surface->mapped) {
                 return;
         }
         view_execute_criteria(view);
@@ -663,20 +750,39 @@ static void handle_set_hints(struct wl_listener *listener, void *data) {
                 wl_container_of(listener, xwayland_view, set_hints);
         struct sway_view *view = &xwayland_view->view;
         struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
-        if (!xsurface->mapped) {
+        if (xsurface->surface == NULL || !xsurface->surface->mapped) {
                 return;
         }
-        if (!xsurface->hints_urgency && view->urgent_timer) {
+        const bool hints_urgency = xcb_icccm_wm_hints_get_urgency(xsurface->hints);
+        if (!hints_urgency && view->urgent_timer) {
                 // The view is in the timeout period. We'll ignore the request to
                 // unset urgency so that the view remains urgent until the timer clears
                 // it.
                 return;
         }
         if (view->allow_request_urgent) {
-                view_set_urgent(view, (bool)xsurface->hints_urgency);
+                view_set_urgent(view, hints_urgency);
         }
 }
 
+static void handle_associate(struct wl_listener *listener, void *data) {
+        struct sway_xwayland_view *xwayland_view =
+                wl_container_of(listener, xwayland_view, associate);
+        struct wlr_xwayland_surface *xsurface =
+                xwayland_view->view.wlr_xwayland_surface;
+        wl_signal_add(&xsurface->surface->events.unmap, &xwayland_view->unmap);
+        xwayland_view->unmap.notify = handle_unmap;
+        wl_signal_add(&xsurface->surface->events.map, &xwayland_view->map);
+        xwayland_view->map.notify = handle_map;
+}
+
+static void handle_dissociate(struct wl_listener *listener, void *data) {
+        struct sway_xwayland_view *xwayland_view =
+                wl_container_of(listener, xwayland_view, dissociate);
+        wl_list_remove(&xwayland_view->map.link);
+        wl_list_remove(&xwayland_view->unmap.link);
+}
+
 struct sway_view *view_from_wlr_xwayland_surface(
                 struct wlr_xwayland_surface *xsurface) {
         return xsurface->data;
@@ -692,7 +798,10 @@ struct sway_xwayland_view *create_xwayland_view(struct wlr_xwayland_surface *xsu
                 return NULL;
         }
 
-        view_init(&xwayland_view->view, SWAY_VIEW_XWAYLAND, &view_impl);
+        if (!view_init(&xwayland_view->view, SWAY_VIEW_XWAYLAND, &view_impl)) {
+                free(xwayland_view);
+                return NULL;
+        }
         xwayland_view->view.wlr_xwayland_surface = xsurface;
 
         wl_signal_add(&xsurface->events.destroy, &xwayland_view->destroy);
@@ -731,6 +840,10 @@ struct sway_xwayland_view *create_xwayland_view(struct wlr_xwayland_surface *xsu
         wl_signal_add(&xsurface->events.set_role, &xwayland_view->set_role);
         xwayland_view->set_role.notify = handle_set_role;
 
+        wl_signal_add(&xsurface->events.set_startup_id,
+                        &xwayland_view->set_startup_id);
+        xwayland_view->set_startup_id.notify = handle_set_startup_id;
+
         wl_signal_add(&xsurface->events.set_window_type,
                         &xwayland_view->set_window_type);
         xwayland_view->set_window_type.notify = handle_set_window_type;
@@ -742,11 +855,11 @@ struct sway_xwayland_view *create_xwayland_view(struct wlr_xwayland_surface *xsu
                         &xwayland_view->set_decorations);
         xwayland_view->set_decorations.notify = handle_set_decorations;
 
-        wl_signal_add(&xsurface->events.unmap, &xwayland_view->unmap);
-        xwayland_view->unmap.notify = handle_unmap;
+        wl_signal_add(&xsurface->events.associate, &xwayland_view->associate);
+        xwayland_view->associate.notify = handle_associate;
 
-        wl_signal_add(&xsurface->events.map, &xwayland_view->map);
-        xwayland_view->map.notify = handle_map;
+        wl_signal_add(&xsurface->events.dissociate, &xwayland_view->dissociate);
+        xwayland_view->dissociate.notify = handle_dissociate;
 
         wl_signal_add(&xsurface->events.set_override_redirect,
                         &xwayland_view->override_redirect);
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index fa604426..404c1eed 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -4,10 +4,10 @@
 #include <libevdev/libevdev.h>
 #include <linux/input-event-codes.h>
 #include <errno.h>
+#include <time.h>
 #include <strings.h>
-#include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_cursor.h>
-#include <wlr/types/wlr_idle.h>
+#include <wlr/types/wlr_cursor_shape_v1.h>
 #include <wlr/types/wlr_pointer.h>
 #include <wlr/types/wlr_touch.h>
 #include <wlr/types/wlr_tablet_v2.h>
@@ -19,56 +19,22 @@
 #include "log.h"
 #include "util.h"
 #include "sway/commands.h"
-#include "sway/desktop.h"
-#include "sway/desktop/transaction.h"
 #include "sway/input/cursor.h"
 #include "sway/input/keyboard.h"
 #include "sway/input/tablet.h"
 #include "sway/layers.h"
 #include "sway/output.h"
+#include "sway/scene_descriptor.h"
 #include "sway/tree/container.h"
 #include "sway/tree/root.h"
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
 #include "wlr-layer-shell-unstable-v1-protocol.h"
 
-static struct wlr_surface *layer_surface_at(struct sway_output *output,
-                struct wl_list *layer, double ox, double oy, double *sx, double *sy) {
-        struct sway_layer_surface *sway_layer;
-        wl_list_for_each_reverse(sway_layer, layer, link) {
-                double _sx = ox - sway_layer->geo.x;
-                double _sy = oy - sway_layer->geo.y;
-                struct wlr_surface *sub = wlr_layer_surface_v1_surface_at(
-                        sway_layer->layer_surface, _sx, _sy, sx, sy);
-                if (sub) {
-                        return sub;
-                }
-        }
-        return NULL;
-}
-
-static bool surface_is_xdg_popup(struct wlr_surface *surface) {
-    if (wlr_surface_is_xdg_surface(surface)) {
-        struct wlr_xdg_surface *xdg_surface =
-            wlr_xdg_surface_from_wlr_surface(surface);
-        return xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP;
-    }
-    return false;
-}
-
-static struct wlr_surface *layer_surface_popup_at(struct sway_output *output,
-                struct wl_list *layer, double ox, double oy, double *sx, double *sy) {
-        struct sway_layer_surface *sway_layer;
-        wl_list_for_each_reverse(sway_layer, layer, link) {
-                double _sx = ox - sway_layer->geo.x;
-                double _sy = oy - sway_layer->geo.y;
-                struct wlr_surface *sub = wlr_layer_surface_v1_surface_at(
-                        sway_layer->layer_surface, _sx, _sy, sx, sy);
-                if (sub && surface_is_xdg_popup(sub)) {
-                        return sub;
-                }
-        }
-        return NULL;
+static uint32_t get_current_time_msec(void) {
+        struct timespec now;
+        clock_gettime(CLOCK_MONOTONIC, &now);
+        return now.tv_sec * 1000 + now.tv_nsec / 1000000;
 }
 
 /**
@@ -78,116 +44,101 @@ static struct wlr_surface *layer_surface_popup_at(struct sway_output *output,
 struct sway_node *node_at_coords(
                 struct sway_seat *seat, double lx, double ly,
                 struct wlr_surface **surface, double *sx, double *sy) {
-        // check for unmanaged views first
-#if HAVE_XWAYLAND
-        struct wl_list *unmanaged = &root->xwayland_unmanaged;
-        struct sway_xwayland_unmanaged *unmanaged_surface;
-        wl_list_for_each_reverse(unmanaged_surface, unmanaged, link) {
-                struct wlr_xwayland_surface *xsurface =
-                        unmanaged_surface->wlr_xwayland_surface;
-
-                double _sx = lx - unmanaged_surface->lx;
-                double _sy = ly - unmanaged_surface->ly;
-                if (wlr_surface_point_accepts_input(xsurface->surface, _sx, _sy)) {
-                        *surface = xsurface->surface;
-                        *sx = _sx;
-                        *sy = _sy;
-                        return NULL;
+        struct wlr_scene_node *scene_node = NULL;
+
+        struct wlr_scene_node *node;
+        wl_list_for_each_reverse(node, &root->layer_tree->children, link) {
+                struct wlr_scene_tree *layer = wlr_scene_tree_from_node(node);
+
+                bool non_interactive = scene_descriptor_try_get(&layer->node,
+                        SWAY_SCENE_DESC_NON_INTERACTIVE);
+                if (non_interactive) {
+                        continue;
+                }
+
+                scene_node = wlr_scene_node_at(&layer->node, lx, ly, sx, sy);
+                if (scene_node) {
+                        break;
                 }
         }
+
+        if (scene_node) {
+                // determine what wlr_surface we clicked on
+                if (scene_node->type == WLR_SCENE_NODE_BUFFER) {
+                        struct wlr_scene_buffer *scene_buffer =
+                                wlr_scene_buffer_from_node(scene_node);
+                        struct wlr_scene_surface *scene_surface =
+                                wlr_scene_surface_try_from_buffer(scene_buffer);
+
+                        if (scene_surface) {
+                                *surface = scene_surface->surface;
+                        }
+                }
+
+                // determine what container we clicked on
+                struct wlr_scene_node *current = scene_node;
+                while (true) {
+                        struct sway_container *con = scene_descriptor_try_get(current,
+                                SWAY_SCENE_DESC_CONTAINER);
+
+                        if (!con) {
+                                struct sway_view *view = scene_descriptor_try_get(current,
+                                        SWAY_SCENE_DESC_VIEW);
+                                if (view) {
+                                        con = view->container;
+                                }
+                        }
+
+                        if (!con) {
+                                struct sway_xdg_popup *popup =
+                                        scene_descriptor_try_get(current, SWAY_SCENE_DESC_POPUP);
+                                if (popup) {
+                                        con = popup->view->container;
+                                }
+                        }
+
+                        if (con && (!con->view || con->view->surface)) {
+                                return &con->node;
+                        }
+
+                        if (scene_descriptor_try_get(current, SWAY_SCENE_DESC_LAYER_SHELL)) {
+                                // We don't want to feed through the current workspace on
+                                // layer shells
+                                return NULL;
+                        }
+
+#if HAVE_XWAYLAND
+                        if (scene_descriptor_try_get(current, SWAY_SCENE_DESC_XWAYLAND_UNMANAGED)) {
+                                return NULL;
+                        }
 #endif
-        // find the output the cursor is on
+
+                        if (!current->parent) {
+                                break;
+                        }
+
+                        current = &current->parent->node;
+                }
+        }
+
+        // if we aren't on a container, determine what workspace we are on
         struct wlr_output *wlr_output = wlr_output_layout_output_at(
                         root->output_layout, lx, ly);
         if (wlr_output == NULL) {
                 return NULL;
         }
+
         struct sway_output *output = wlr_output->data;
         if (!output || !output->enabled) {
                 // output is being destroyed or is being enabled
                 return NULL;
         }
-        double ox = lx, oy = ly;
-        wlr_output_layout_output_coords(root->output_layout, wlr_output, &ox, &oy);
 
-        if (root->fullscreen_global) {
-                // Try fullscreen container
-                struct sway_container *con = tiling_container_at(
-                                &root->fullscreen_global->node, lx, ly, surface, sx, sy);
-                if (con) {
-                        return &con->node;
-                }
-                return NULL;
-        }
-
-        // find the focused workspace on the output for this seat
         struct sway_workspace *ws = output_get_active_workspace(output);
         if (!ws) {
                 return NULL;
         }
 
-        if ((*surface = layer_surface_at(output,
-                                &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY],
-                                ox, oy, sx, sy))) {
-                return NULL;
-        }
-        if (ws->fullscreen) {
-                // Try transient containers
-                for (int i = 0; i < ws->floating->length; ++i) {
-                        struct sway_container *floater = ws->floating->items[i];
-                        if (container_is_transient_for(floater, ws->fullscreen)) {
-                                struct sway_container *con = tiling_container_at(
-                                                &floater->node, lx, ly, surface, sx, sy);
-                                if (con) {
-                                        return &con->node;
-                                }
-                        }
-                }
-                // Try fullscreen container
-                struct sway_container *con =
-                        tiling_container_at(&ws->fullscreen->node, lx, ly, surface, sx, sy);
-                if (con) {
-                        return &con->node;
-                }
-                return NULL;
-        }
-        if ((*surface = layer_surface_popup_at(output,
-                                &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP],
-                                ox, oy, sx, sy))) {
-                return NULL;
-        }
-        if ((*surface = layer_surface_popup_at(output,
-                                &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM],
-                                ox, oy, sx, sy))) {
-                return NULL;
-        }
-        if ((*surface = layer_surface_popup_at(output,
-                                &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND],
-                                ox, oy, sx, sy))) {
-                return NULL;
-        }
-        if ((*surface = layer_surface_at(output,
-                                &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP],
-                                ox, oy, sx, sy))) {
-                return NULL;
-        }
-
-        struct sway_container *c;
-        if ((c = container_at(ws, lx, ly, surface, sx, sy))) {
-                return &c->node;
-        }
-
-        if ((*surface = layer_surface_at(output,
-                                &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM],
-                                ox, oy, sx, sy))) {
-                return NULL;
-        }
-        if ((*surface = layer_surface_at(output,
-                                &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND],
-                                ox, oy, sx, sy))) {
-                return NULL;
-        }
-
         return &ws->node;
 }
 
@@ -213,7 +164,7 @@ void cursor_update_image(struct sway_cursor *cursor,
                 // Try a node's resize edge
                 enum wlr_edges edge = find_resize_edge(node->sway_container, NULL, cursor);
                 if (edge == WLR_EDGE_NONE) {
-                        cursor_set_image(cursor, "left_ptr", NULL);
+                        cursor_set_image(cursor, "default", NULL);
                 } else if (container_is_floating(node->sway_container)) {
                         cursor_set_image(cursor, wlr_xcursor_get_resize_name(edge), NULL);
                 } else {
@@ -224,12 +175,12 @@ void cursor_update_image(struct sway_cursor *cursor,
                         }
                 }
         } else {
-                cursor_set_image(cursor, "left_ptr", NULL);
+                cursor_set_image(cursor, "default", NULL);
         }
 }
 
 static void cursor_hide(struct sway_cursor *cursor) {
-        wlr_cursor_set_image(cursor->cursor, NULL, 0, 0, 0, 0, 0, 0);
+        wlr_cursor_unset_image(cursor->cursor);
         cursor->hidden = true;
         wlr_seat_pointer_notify_clear_focus(cursor->seat->wlr_seat);
 }
@@ -341,7 +292,7 @@ void cursor_unhide(struct sway_cursor *cursor) {
         wl_event_source_timer_update(cursor->hide_source, cursor_get_timeout(cursor));
 }
 
-static void pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
+void pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
                 struct wlr_input_device *device, double dx, double dy,
                 double dx_unaccel, double dy_unaccel) {
         wlr_relative_pointer_manager_v1_send_relative_motion(
@@ -378,30 +329,29 @@ static void pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
 static void handle_pointer_motion_relative(
                 struct wl_listener *listener, void *data) {
         struct sway_cursor *cursor = wl_container_of(listener, cursor, motion);
-        struct wlr_event_pointer_motion *e = data;
-        cursor_handle_activity_from_device(cursor, e->device);
+        struct wlr_pointer_motion_event *e = data;
+        cursor_handle_activity_from_device(cursor, &e->pointer->base);
 
-        pointer_motion(cursor, e->time_msec, e->device, e->delta_x, e->delta_y,
-                        e->unaccel_dx, e->unaccel_dy);
-        transaction_commit_dirty();
+        pointer_motion(cursor, e->time_msec, &e->pointer->base, e->delta_x,
+                e->delta_y, e->unaccel_dx, e->unaccel_dy);
 }
 
 static void handle_pointer_motion_absolute(
                 struct wl_listener *listener, void *data) {
         struct sway_cursor *cursor =
                 wl_container_of(listener, cursor, motion_absolute);
-        struct wlr_event_pointer_motion_absolute *event = data;
-        cursor_handle_activity_from_device(cursor, event->device);
+        struct wlr_pointer_motion_absolute_event *event = data;
+        cursor_handle_activity_from_device(cursor, &event->pointer->base);
 
         double lx, ly;
-        wlr_cursor_absolute_to_layout_coords(cursor->cursor, event->device,
+        wlr_cursor_absolute_to_layout_coords(cursor->cursor, &event->pointer->base,
                         event->x, event->y, &lx, &ly);
 
         double dx = lx - cursor->cursor->x;
         double dy = ly - cursor->cursor->y;
 
-        pointer_motion(cursor, event->time_msec, event->device, dx, dy, dx, dy);
-        transaction_commit_dirty();
+        pointer_motion(cursor, event->time_msec, &event->pointer->base, dx, dy,
+                dx, dy);
 }
 
 void dispatch_cursor_button(struct sway_cursor *cursor,
@@ -416,7 +366,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
 
 static void handle_pointer_button(struct wl_listener *listener, void *data) {
         struct sway_cursor *cursor = wl_container_of(listener, cursor, button);
-        struct wlr_event_pointer_button *event = data;
+        struct wlr_pointer_button_event *event = data;
 
         if (event->state == WLR_BUTTON_PRESSED) {
                 cursor->pressed_button_count++;
@@ -428,23 +378,21 @@ static void handle_pointer_button(struct wl_listener *listener, void *data) {
                 }
         }
 
-        cursor_handle_activity_from_device(cursor, event->device);
-        dispatch_cursor_button(cursor, event->device,
+        cursor_handle_activity_from_device(cursor, &event->pointer->base);
+        dispatch_cursor_button(cursor, &event->pointer->base,
                         event->time_msec, event->button, event->state);
-        transaction_commit_dirty();
 }
 
 void dispatch_cursor_axis(struct sway_cursor *cursor,
-                struct wlr_event_pointer_axis *event) {
+                struct wlr_pointer_axis_event *event) {
         seatop_pointer_axis(cursor->seat, event);
 }
 
 static void handle_pointer_axis(struct wl_listener *listener, void *data) {
         struct sway_cursor *cursor = wl_container_of(listener, cursor, axis);
-        struct wlr_event_pointer_axis *event = data;
-        cursor_handle_activity_from_device(cursor, event->device);
+        struct wlr_pointer_axis_event *event = data;
+        cursor_handle_activity_from_device(cursor, &event->pointer->base);
         dispatch_cursor_axis(cursor, event);
-        transaction_commit_dirty();
 }
 
 static void handle_pointer_frame(struct wl_listener *listener, void *data) {
@@ -454,97 +402,76 @@ static void handle_pointer_frame(struct wl_listener *listener, void *data) {
 
 static void handle_touch_down(struct wl_listener *listener, void *data) {
         struct sway_cursor *cursor = wl_container_of(listener, cursor, touch_down);
-        struct wlr_event_touch_down *event = data;
-        cursor_handle_activity_from_device(cursor, event->device);
+        struct wlr_touch_down_event *event = data;
+        cursor_handle_activity_from_device(cursor, &event->touch->base);
         cursor_hide(cursor);
 
         struct sway_seat *seat = cursor->seat;
-        struct wlr_seat *wlr_seat = seat->wlr_seat;
-        struct wlr_surface *surface = NULL;
 
         double lx, ly;
-        wlr_cursor_absolute_to_layout_coords(cursor->cursor, event->device,
+        wlr_cursor_absolute_to_layout_coords(cursor->cursor, &event->touch->base,
                         event->x, event->y, &lx, &ly);
-        double sx, sy;
-        struct sway_node *focused_node = node_at_coords(seat, lx, ly, &surface, &sx, &sy);
 
         seat->touch_id = event->touch_id;
         seat->touch_x = lx;
         seat->touch_y = ly;
 
-        if (surface && wlr_surface_accepts_touch(wlr_seat, surface)) {
-                if (seat_is_input_allowed(seat, surface)) {
-                        wlr_seat_touch_notify_down(wlr_seat, surface, event->time_msec,
-                                        event->touch_id, sx, sy);
+        seatop_touch_down(seat, event, lx, ly);
+}
 
-                        if (focused_node) {
-                            seat_set_focus(seat, focused_node);
-                        }
+static void handle_touch_up(struct wl_listener *listener, void *data) {
+        struct sway_cursor *cursor = wl_container_of(listener, cursor, touch_up);
+        struct wlr_touch_up_event *event = data;
+        cursor_handle_activity_from_device(cursor, &event->touch->base);
+
+        struct sway_seat *seat = cursor->seat;
+
+        if (cursor->simulating_pointer_from_touch) {
+                if (cursor->pointer_touch_id == cursor->seat->touch_id) {
+                        cursor->pointer_touch_up = true;
+                        dispatch_cursor_button(cursor, &event->touch->base,
+                                event->time_msec, BTN_LEFT, WLR_BUTTON_RELEASED);
                 }
-        } else if (!cursor->simulating_pointer_from_touch &&
-                        (!surface || seat_is_input_allowed(seat, surface))) {
-                // Fallback to cursor simulation.
-                // The pointer_touch_id state is needed, so drags are not aborted when over
-                // a surface supporting touch and multi touch events don't interfere.
-                cursor->simulating_pointer_from_touch = true;
-                cursor->pointer_touch_id = seat->touch_id;
-                double dx, dy;
-                dx = lx - cursor->cursor->x;
-                dy = ly - cursor->cursor->y;
-                pointer_motion(cursor, event->time_msec, event->device, dx, dy, dx, dy);
-                dispatch_cursor_button(cursor, event->device, event->time_msec,
-                                BTN_LEFT, WLR_BUTTON_PRESSED);
-                wlr_seat_pointer_notify_frame(wlr_seat);
-                transaction_commit_dirty();
+        } else {
+                seatop_touch_up(seat, event);
         }
 }
 
-static void handle_touch_up(struct wl_listener *listener, void *data) {
-        struct sway_cursor *cursor = wl_container_of(listener, cursor, touch_up);
-        struct wlr_event_touch_up *event = data;
-        cursor_handle_activity_from_device(cursor, event->device);
+static void handle_touch_cancel(struct wl_listener *listener, void *data) {
+        struct sway_cursor *cursor = wl_container_of(listener, cursor, touch_cancel);
+        struct wlr_touch_cancel_event *event = data;
+        cursor_handle_activity_from_device(cursor, &event->touch->base);
 
-        struct wlr_seat *wlr_seat = cursor->seat->wlr_seat;
+        struct sway_seat *seat = cursor->seat;
 
         if (cursor->simulating_pointer_from_touch) {
                 if (cursor->pointer_touch_id == cursor->seat->touch_id) {
-                        cursor->simulating_pointer_from_touch = false;
-                        dispatch_cursor_button(cursor, event->device, event->time_msec,
-                                        BTN_LEFT, WLR_BUTTON_RELEASED);
-                        wlr_seat_pointer_notify_frame(wlr_seat);
-                        transaction_commit_dirty();
+                        cursor->pointer_touch_up = true;
+                        dispatch_cursor_button(cursor, &event->touch->base,
+                                event->time_msec, BTN_LEFT, WLR_BUTTON_RELEASED);
                 }
         } else {
-                wlr_seat_touch_notify_up(wlr_seat, event->time_msec, event->touch_id);
+                seatop_touch_cancel(seat, event);
         }
 }
 
 static void handle_touch_motion(struct wl_listener *listener, void *data) {
         struct sway_cursor *cursor =
                 wl_container_of(listener, cursor, touch_motion);
-        struct wlr_event_touch_motion *event = data;
-        cursor_handle_activity_from_device(cursor, event->device);
+        struct wlr_touch_motion_event *event = data;
+        cursor_handle_activity_from_device(cursor, &event->touch->base);
 
         struct sway_seat *seat = cursor->seat;
-        struct wlr_seat *wlr_seat = seat->wlr_seat;
-        struct wlr_surface *surface = NULL;
 
         double lx, ly;
-        wlr_cursor_absolute_to_layout_coords(cursor->cursor, event->device,
+        wlr_cursor_absolute_to_layout_coords(cursor->cursor, &event->touch->base,
                         event->x, event->y, &lx, &ly);
-        double sx, sy;
-        node_at_coords(cursor->seat, lx, ly, &surface, &sx, &sy);
 
         if (seat->touch_id == event->touch_id) {
                 seat->touch_x = lx;
                 seat->touch_y = ly;
 
-                struct sway_drag_icon *drag_icon;
-                wl_list_for_each(drag_icon, &root->drag_icons, link) {
-                        if (drag_icon->seat == seat) {
-                                drag_icon_update_position(drag_icon);
-                        }
-                }
+                drag_icons_update_position(seat);
         }
 
         if (cursor->simulating_pointer_from_touch) {
@@ -552,12 +479,29 @@ static void handle_touch_motion(struct wl_listener *listener, void *data) {
                         double dx, dy;
                         dx = lx - cursor->cursor->x;
                         dy = ly - cursor->cursor->y;
-                        pointer_motion(cursor, event->time_msec, event->device, dx, dy, dx, dy);
-                        transaction_commit_dirty();
+                        pointer_motion(cursor, event->time_msec, &event->touch->base,
+                                dx, dy, dx, dy);
+                }
+        } else {
+                seatop_touch_motion(seat, event, lx, ly);
+        }
+}
+
+static void handle_touch_frame(struct wl_listener *listener, void *data) {
+        struct sway_cursor *cursor =
+                wl_container_of(listener, cursor, touch_frame);
+
+        struct wlr_seat *wlr_seat = cursor->seat->wlr_seat;
+
+        if (cursor->simulating_pointer_from_touch) {
+                wlr_seat_pointer_notify_frame(wlr_seat);
+
+                if (cursor->pointer_touch_up) {
+                        cursor->pointer_touch_up = false;
+                        cursor->simulating_pointer_from_touch = false;
                 }
-        } else if (surface) {
-                wlr_seat_touch_notify_motion(wlr_seat, event->time_msec,
-                        event->touch_id, sx, sy);
+        } else {
+                wlr_seat_touch_notify_frame(wlr_seat);
         }
 }
 
@@ -574,14 +518,15 @@ static void apply_mapping_from_region(struct wlr_input_device *device,
         double x1 = region->x1, x2 = region->x2;
         double y1 = region->y1, y2 = region->y2;
 
-        if (region->mm) {
-                if (device->width_mm == 0 || device->height_mm == 0) {
+        if (region->mm && device->type == WLR_INPUT_DEVICE_TABLET_TOOL) {
+                struct wlr_tablet *tablet = wlr_tablet_from_input_device(device);
+                if (tablet->width_mm == 0 || tablet->height_mm == 0) {
                         return;
                 }
-                x1 /= device->width_mm;
-                x2 /= device->width_mm;
-                y1 /= device->height_mm;
-                y2 /= device->height_mm;
+                x1 /= tablet->width_mm;
+                x2 /= tablet->width_mm;
+                y1 /= tablet->height_mm;
+                y2 /= tablet->height_mm;
         }
 
         *x = apply_mapping_from_coord(x1, x2, *x);
@@ -639,14 +584,12 @@ static void handle_tablet_tool_position(struct sway_cursor *cursor,
                 wlr_tablet_v2_tablet_tool_notify_proximity_out(tool->tablet_v2_tool);
                 pointer_motion(cursor, time_msec, input_device->wlr_device, dx, dy, dx, dy);
         }
-
-        transaction_commit_dirty();
 }
 
 static void handle_tool_axis(struct wl_listener *listener, void *data) {
         struct sway_cursor *cursor = wl_container_of(listener, cursor, tool_axis);
-        struct wlr_event_tablet_tool_axis *event = data;
-        cursor_handle_activity_from_device(cursor, event->device);
+        struct wlr_tablet_tool_axis_event *event = data;
+        cursor_handle_activity_from_device(cursor, &event->tablet->base);
 
         struct sway_tablet_tool *sway_tool = event->tool->data;
         if (!sway_tool) {
@@ -701,8 +644,8 @@ static void handle_tool_axis(struct wl_listener *listener, void *data) {
 
 static void handle_tool_tip(struct wl_listener *listener, void *data) {
         struct sway_cursor *cursor = wl_container_of(listener, cursor, tool_tip);
-        struct wlr_event_tablet_tool_tip *event = data;
-        cursor_handle_activity_from_device(cursor, event->device);
+        struct wlr_tablet_tool_tip_event *event = data;
+        cursor_handle_activity_from_device(cursor, &event->tablet->base);
 
         struct sway_tablet_tool *sway_tool = event->tool->data;
         struct wlr_tablet_v2_tablet *tablet_v2 = sway_tool->tablet->tablet_v2;
@@ -717,10 +660,9 @@ static void handle_tool_tip(struct wl_listener *listener, void *data) {
         if (cursor->simulating_pointer_from_tool_tip &&
                         event->state == WLR_TABLET_TOOL_TIP_UP) {
                 cursor->simulating_pointer_from_tool_tip = false;
-                dispatch_cursor_button(cursor, event->device, event->time_msec,
+                dispatch_cursor_button(cursor, &event->tablet->base, event->time_msec,
                         BTN_LEFT, WLR_BUTTON_RELEASED);
                 wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat);
-                transaction_commit_dirty();
         } else if (!surface || !wlr_surface_accepts_tablet_v2(tablet_v2, surface)) {
                 // If we started holding the tool tip down on a surface that accepts
                 // tablet v2, we should notify that surface if it gets released over a
@@ -730,10 +672,9 @@ static void handle_tool_tip(struct wl_listener *listener, void *data) {
                                 WLR_TABLET_TOOL_TIP_UP);
                 } else {
                         cursor->simulating_pointer_from_tool_tip = true;
-                        dispatch_cursor_button(cursor, event->device, event->time_msec,
-                                BTN_LEFT, WLR_BUTTON_PRESSED);
+                        dispatch_cursor_button(cursor, &event->tablet->base,
+                                event->time_msec, BTN_LEFT, WLR_BUTTON_PRESSED);
                         wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat);
-                        transaction_commit_dirty();
                 }
         } else {
                 seatop_tablet_tool_tip(seat, sway_tool, event->time_msec, event->state);
@@ -754,12 +695,13 @@ static struct sway_tablet *get_tablet_for_device(struct sway_cursor *cursor,
 static void handle_tool_proximity(struct wl_listener *listener, void *data) {
         struct sway_cursor *cursor =
                 wl_container_of(listener, cursor, tool_proximity);
-        struct wlr_event_tablet_tool_proximity *event = data;
-        cursor_handle_activity_from_device(cursor, event->device);
+        struct wlr_tablet_tool_proximity_event *event = data;
+        cursor_handle_activity_from_device(cursor, &event->tablet->base);
 
         struct wlr_tablet_tool *tool = event->tool;
         if (!tool->data) {
-                struct sway_tablet *tablet = get_tablet_for_device(cursor, event->device);
+                struct sway_tablet *tablet = get_tablet_for_device(cursor,
+                        &event->tablet->base);
                 if (!tablet) {
                         sway_log(SWAY_ERROR, "no tablet for tablet tool");
                         return;
@@ -784,8 +726,8 @@ static void handle_tool_proximity(struct wl_listener *listener, void *data) {
 
 static void handle_tool_button(struct wl_listener *listener, void *data) {
         struct sway_cursor *cursor = wl_container_of(listener, cursor, tool_button);
-        struct wlr_event_tablet_tool_button *event = data;
-        cursor_handle_activity_from_device(cursor, event->device);
+        struct wlr_tablet_tool_button_event *event = data;
+        cursor_handle_activity_from_device(cursor, &event->tablet->base);
 
         struct sway_tablet_tool *sway_tool = event->tool->data;
         if (!sway_tool) {
@@ -800,32 +742,71 @@ static void handle_tool_button(struct wl_listener *listener, void *data) {
         node_at_coords(cursor->seat, cursor->cursor->x, cursor->cursor->y,
                 &surface, &sx, &sy);
 
-        if (!surface || !wlr_surface_accepts_tablet_v2(tablet_v2, surface)) {
+        // TODO: floating resize should support graphics tablet events
+        struct wlr_keyboard *keyboard = wlr_seat_get_keyboard(cursor->seat->wlr_seat);
+        uint32_t modifiers = keyboard ? wlr_keyboard_get_modifiers(keyboard) : 0;
+        bool mod_pressed = modifiers & config->floating_mod;
+
+        bool surface_supports_tablet_events =
+                surface && wlr_surface_accepts_tablet_v2(tablet_v2, surface);
+
+        // Simulate pointer when:
+        // 1. The modifier key is pressed, OR
+        // 2. The surface under the cursor does not support tablet events.
+        bool should_simulate_pointer = mod_pressed || !surface_supports_tablet_events;
+
+        // Similar to tool tip, we need to selectively simulate mouse events, but we
+        // want to make sure that it is always consistent. Because all tool buttons
+        // currently map to BTN_RIGHT, we need to keep count of how many tool
+        // buttons are currently pressed down so we can send consistent events.
+        //
+        // The logic follows:
+        // - If we are already simulating the pointer, we should continue to do so
+        //   until at least no tool button is held down.
+        // - If we should simulate the pointer and no tool button is currently held
+        //   down, begin simulating the pointer.
+        // - If neither of the above are true, send the tablet events.
+        if ((cursor->tool_buttons > 0 && cursor->simulating_pointer_from_tool_button)
+                || (cursor->tool_buttons == 0 && should_simulate_pointer)) {
+                cursor->simulating_pointer_from_tool_button = true;
+
                 // TODO: the user may want to configure which tool buttons are mapped to
                 // which simulated pointer buttons
                 switch (event->state) {
                 case WLR_BUTTON_PRESSED:
                         if (cursor->tool_buttons == 0) {
-                                dispatch_cursor_button(cursor, event->device,
+                                dispatch_cursor_button(cursor, &event->tablet->base,
                                                 event->time_msec, BTN_RIGHT, event->state);
                         }
-                        cursor->tool_buttons++;
                         break;
                 case WLR_BUTTON_RELEASED:
-                        if (cursor->tool_buttons == 1) {
-                                dispatch_cursor_button(cursor, event->device,
+                        if (cursor->tool_buttons <= 1) {
+                                dispatch_cursor_button(cursor, &event->tablet->base,
                                                 event->time_msec, BTN_RIGHT, event->state);
                         }
-                        cursor->tool_buttons--;
                         break;
                 }
                 wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat);
-                transaction_commit_dirty();
-                return;
+        } else {
+                cursor->simulating_pointer_from_tool_button = false;
+
+                wlr_tablet_v2_tablet_tool_notify_button(sway_tool->tablet_v2_tool,
+                        event->button, (enum zwp_tablet_pad_v2_button_state)event->state);
         }
 
-        wlr_tablet_v2_tablet_tool_notify_button(sway_tool->tablet_v2_tool,
-                event->button, (enum zwp_tablet_pad_v2_button_state)event->state);
+        // Update tool button count.
+        switch (event->state) {
+        case WLR_BUTTON_PRESSED:
+                cursor->tool_buttons++;
+                break;
+        case WLR_BUTTON_RELEASED:
+                if (cursor->tool_buttons == 0) {
+                        sway_log(SWAY_ERROR, "inconsistent tablet tool button events");
+                } else {
+                        cursor->tool_buttons--;
+                }
+                break;
+        }
 }
 
 static void check_constraint_region(struct sway_cursor *cursor) {
@@ -837,8 +818,8 @@ static void check_constraint_region(struct sway_cursor *cursor) {
 
                 struct sway_container *con = view->container;
 
-                double sx = cursor->cursor->x - con->content_x + view->geometry.x;
-                double sy = cursor->cursor->y - con->content_y + view->geometry.y;
+                double sx = cursor->cursor->x - con->pending.content_x + view->geometry.x;
+                double sy = cursor->cursor->y - con->pending.content_y + view->geometry.y;
 
                 if (!pixman_region32_contains_point(region,
                                 floor(sx), floor(sy), NULL)) {
@@ -849,8 +830,8 @@ static void check_constraint_region(struct sway_cursor *cursor) {
                                 double sy = (boxes[0].y1 + boxes[0].y2) / 2.;
 
                                 wlr_cursor_warp_closest(cursor->cursor, NULL,
-                                        sx + con->content_x - view->geometry.x,
-                                        sy + con->content_y - view->geometry.y);
+                                        sx + con->pending.content_x - view->geometry.x,
+                                        sy + con->pending.content_y - view->geometry.y);
 
                                 cursor_rebase(cursor);
                         }
@@ -911,59 +892,68 @@ static void handle_request_pointer_set_cursor(struct wl_listener *listener,
                         event->hotspot_y, focused_client);
 }
 
+static void handle_pointer_hold_begin(struct wl_listener *listener, void *data) {
+        struct sway_cursor *cursor = wl_container_of(
+                        listener, cursor, hold_begin);
+        struct wlr_pointer_hold_begin_event *event = data;
+        cursor_handle_activity_from_device(cursor, &event->pointer->base);
+        seatop_hold_begin(cursor->seat, event);
+}
+
+static void handle_pointer_hold_end(struct wl_listener *listener, void *data) {
+        struct sway_cursor *cursor = wl_container_of(
+                        listener, cursor, hold_end);
+        struct wlr_pointer_hold_end_event *event = data;
+        cursor_handle_activity_from_device(cursor, &event->pointer->base);
+        seatop_hold_end(cursor->seat, event);
+}
+
 static void handle_pointer_pinch_begin(struct wl_listener *listener, void *data) {
         struct sway_cursor *cursor = wl_container_of(
                         listener, cursor, pinch_begin);
-        struct wlr_event_pointer_pinch_begin *event = data;
-        wlr_pointer_gestures_v1_send_pinch_begin(
-                        cursor->pointer_gestures, cursor->seat->wlr_seat,
-                        event->time_msec, event->fingers);
+        struct wlr_pointer_pinch_begin_event *event = data;
+        cursor_handle_activity_from_device(cursor, &event->pointer->base);
+        seatop_pinch_begin(cursor->seat, event);
 }
 
 static void handle_pointer_pinch_update(struct wl_listener *listener, void *data) {
         struct sway_cursor *cursor = wl_container_of(
                         listener, cursor, pinch_update);
-        struct wlr_event_pointer_pinch_update *event = data;
-        wlr_pointer_gestures_v1_send_pinch_update(
-                        cursor->pointer_gestures, cursor->seat->wlr_seat,
-                        event->time_msec, event->dx, event->dy,
-                        event->scale, event->rotation);
+        struct wlr_pointer_pinch_update_event *event = data;
+        cursor_handle_activity_from_device(cursor, &event->pointer->base);
+        seatop_pinch_update(cursor->seat, event);
 }
 
 static void handle_pointer_pinch_end(struct wl_listener *listener, void *data) {
         struct sway_cursor *cursor = wl_container_of(
                         listener, cursor, pinch_end);
-        struct wlr_event_pointer_pinch_end *event = data;
-        wlr_pointer_gestures_v1_send_pinch_end(
-                        cursor->pointer_gestures, cursor->seat->wlr_seat,
-                        event->time_msec, event->cancelled);
+        struct wlr_pointer_pinch_end_event *event = data;
+        cursor_handle_activity_from_device(cursor, &event->pointer->base);
+        seatop_pinch_end(cursor->seat, event);
 }
 
 static void handle_pointer_swipe_begin(struct wl_listener *listener, void *data) {
         struct sway_cursor *cursor = wl_container_of(
                         listener, cursor, swipe_begin);
-        struct wlr_event_pointer_swipe_begin *event = data;
-        wlr_pointer_gestures_v1_send_swipe_begin(
-                        cursor->pointer_gestures, cursor->seat->wlr_seat,
-                        event->time_msec, event->fingers);
+        struct wlr_pointer_swipe_begin_event *event = data;
+        cursor_handle_activity_from_device(cursor, &event->pointer->base);
+        seatop_swipe_begin(cursor->seat, event);
 }
 
 static void handle_pointer_swipe_update(struct wl_listener *listener, void *data) {
         struct sway_cursor *cursor = wl_container_of(
                         listener, cursor, swipe_update);
-        struct wlr_event_pointer_swipe_update *event = data;
-        wlr_pointer_gestures_v1_send_swipe_update(
-                        cursor->pointer_gestures, cursor->seat->wlr_seat,
-                        event->time_msec, event->dx, event->dy);
+        struct wlr_pointer_swipe_update_event *event = data;
+        cursor_handle_activity_from_device(cursor, &event->pointer->base);
+        seatop_swipe_update(cursor->seat, event);
 }
 
 static void handle_pointer_swipe_end(struct wl_listener *listener, void *data) {
         struct sway_cursor *cursor = wl_container_of(
                         listener, cursor, swipe_end);
-        struct wlr_event_pointer_swipe_end *event = data;
-        wlr_pointer_gestures_v1_send_swipe_end(
-                        cursor->pointer_gestures, cursor->seat->wlr_seat,
-                        event->time_msec, event->cancelled);
+        struct wlr_pointer_swipe_end_event *event = data;
+        cursor_handle_activity_from_device(cursor, &event->pointer->base);
+        seatop_swipe_end(cursor->seat, event);
 }
 
 static void handle_image_surface_destroy(struct wl_listener *listener,
@@ -1002,10 +992,9 @@ void cursor_set_image(struct sway_cursor *cursor, const char *image,
         }
 
         if (!image) {
-                wlr_cursor_set_image(cursor->cursor, NULL, 0, 0, 0, 0, 0, 0);
+                wlr_cursor_unset_image(cursor->cursor);
         } else if (!current_image || strcmp(current_image, image) != 0) {
-                wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager, image,
-                                cursor->cursor);
+                wlr_cursor_set_xcursor(cursor->cursor, cursor->xcursor_manager, image);
         }
 }
 
@@ -1037,6 +1026,8 @@ void sway_cursor_destroy(struct sway_cursor *cursor) {
         wl_event_source_remove(cursor->hide_source);
 
         wl_list_remove(&cursor->image_surface_destroy.link);
+        wl_list_remove(&cursor->hold_begin.link);
+        wl_list_remove(&cursor->hold_end.link);
         wl_list_remove(&cursor->pinch_begin.link);
         wl_list_remove(&cursor->pinch_update.link);
         wl_list_remove(&cursor->pinch_end.link);
@@ -1050,7 +1041,9 @@ void sway_cursor_destroy(struct sway_cursor *cursor) {
         wl_list_remove(&cursor->frame.link);
         wl_list_remove(&cursor->touch_down.link);
         wl_list_remove(&cursor->touch_up.link);
+        wl_list_remove(&cursor->touch_cancel.link);
         wl_list_remove(&cursor->touch_motion.link);
+        wl_list_remove(&cursor->touch_frame.link);
         wl_list_remove(&cursor->tool_axis.link);
         wl_list_remove(&cursor->tool_tip.link);
         wl_list_remove(&cursor->tool_button.link);
@@ -1085,19 +1078,24 @@ struct sway_cursor *sway_cursor_create(struct sway_seat *seat) {
         wl_list_init(&cursor->image_surface_destroy.link);
         cursor->image_surface_destroy.notify = handle_image_surface_destroy;
 
-        cursor->pointer_gestures = wlr_pointer_gestures_v1_create(server.wl_display);
-        cursor->pinch_begin.notify = handle_pointer_pinch_begin;
+        wl_signal_add(&wlr_cursor->events.hold_begin, &cursor->hold_begin);
+        cursor->hold_begin.notify = handle_pointer_hold_begin;
+        wl_signal_add(&wlr_cursor->events.hold_end, &cursor->hold_end);
+        cursor->hold_end.notify = handle_pointer_hold_end;
+
         wl_signal_add(&wlr_cursor->events.pinch_begin, &cursor->pinch_begin);
-        cursor->pinch_update.notify = handle_pointer_pinch_update;
+        cursor->pinch_begin.notify = handle_pointer_pinch_begin;
         wl_signal_add(&wlr_cursor->events.pinch_update, &cursor->pinch_update);
-        cursor->pinch_end.notify = handle_pointer_pinch_end;
+        cursor->pinch_update.notify = handle_pointer_pinch_update;
         wl_signal_add(&wlr_cursor->events.pinch_end, &cursor->pinch_end);
-        cursor->swipe_begin.notify = handle_pointer_swipe_begin;
+        cursor->pinch_end.notify = handle_pointer_pinch_end;
+
         wl_signal_add(&wlr_cursor->events.swipe_begin, &cursor->swipe_begin);
-        cursor->swipe_update.notify = handle_pointer_swipe_update;
+        cursor->swipe_begin.notify = handle_pointer_swipe_begin;
         wl_signal_add(&wlr_cursor->events.swipe_update, &cursor->swipe_update);
-        cursor->swipe_end.notify = handle_pointer_swipe_end;
+        cursor->swipe_update.notify = handle_pointer_swipe_update;
         wl_signal_add(&wlr_cursor->events.swipe_end, &cursor->swipe_end);
+        cursor->swipe_end.notify = handle_pointer_swipe_end;
 
         // input events
         wl_signal_add(&wlr_cursor->events.motion, &cursor->motion);
@@ -1122,10 +1120,16 @@ struct sway_cursor *sway_cursor_create(struct sway_seat *seat) {
         wl_signal_add(&wlr_cursor->events.touch_up, &cursor->touch_up);
         cursor->touch_up.notify = handle_touch_up;
 
+        wl_signal_add(&wlr_cursor->events.touch_cancel, &cursor->touch_cancel);
+        cursor->touch_cancel.notify = handle_touch_cancel;
+
         wl_signal_add(&wlr_cursor->events.touch_motion,
                 &cursor->touch_motion);
         cursor->touch_motion.notify = handle_touch_motion;
 
+        wl_signal_add(&wlr_cursor->events.touch_frame, &cursor->touch_frame);
+        cursor->touch_frame.notify = handle_touch_frame;
+
         wl_signal_add(&wlr_cursor->events.tablet_tool_axis,
                 &cursor->tool_axis);
         cursor->tool_axis.notify = handle_tool_axis;
@@ -1170,8 +1174,8 @@ void cursor_warp_to_container(struct sway_cursor *cursor,
                 return;
         }
 
-        double x = container->x + container->width / 2.0;
-        double y = container->y + container->height / 2.0;
+        double x = container->pending.x + container->pending.width / 2.0;
+        double y = container->pending.y + container->pending.height / 2.0;
 
         wlr_cursor_warp(cursor->cursor, NULL, x, y);
         cursor_unhide(cursor);
@@ -1211,11 +1215,7 @@ uint32_t get_mouse_bindsym(const char *name, char **error) {
                 // Get event code from name
                 int code = libevdev_event_code_from_name(EV_KEY, name);
                 if (code == -1) {
-                        size_t len = snprintf(NULL, 0, "Unknown event %s", name) + 1;
-                        *error = malloc(len);
-                        if (*error) {
-                                snprintf(*error, len, "Unknown event %s", name);
-                        }
+                        *error = format_str("Unknown event %s", name);
                         return 0;
                 }
                 return code;
@@ -1237,13 +1237,8 @@ uint32_t get_mouse_bindcode(const char *name, char **error) {
         }
         const char *event = libevdev_event_code_get_name(EV_KEY, code);
         if (!event || strncmp(event, "BTN_", strlen("BTN_")) != 0) {
-                size_t len = snprintf(NULL, 0, "Event code %d (%s) is not a button",
-                                code, event ? event : "(null)") + 1;
-                *error = malloc(len);
-                if (*error) {
-                        snprintf(*error, len, "Event code %d (%s) is not a button",
-                                        code, event ? event : "(null)");
-                }
+                *error = format_str("Event code %d (%s) is not a button",
+                        code, event ? event : "(null)");
                 return 0;
         }
         return code;
@@ -1276,16 +1271,19 @@ const char *get_mouse_button_name(uint32_t button) {
 static void warp_to_constraint_cursor_hint(struct sway_cursor *cursor) {
         struct wlr_pointer_constraint_v1 *constraint = cursor->active_constraint;
 
-        if (constraint->current.committed &
-                        WLR_POINTER_CONSTRAINT_V1_STATE_CURSOR_HINT) {
+        if (constraint->current.cursor_hint.enabled) {
                 double sx = constraint->current.cursor_hint.x;
                 double sy = constraint->current.cursor_hint.y;
 
                 struct sway_view *view = view_from_wlr_surface(constraint->surface);
+                if (!view) {
+                        return;
+                }
+
                 struct sway_container *con = view->container;
 
-                double lx = sx + con->content_x - view->geometry.x;
-                double ly = sy + con->content_y - view->geometry.y;
+                double lx = sx + con->pending.content_x - view->geometry.x;
+                double ly = sy + con->pending.content_y - view->geometry.y;
 
                 wlr_cursor_warp(cursor->cursor, NULL, lx, ly);
 
@@ -1332,12 +1330,9 @@ void handle_pointer_constraint(struct wl_listener *listener, void *data) {
         sway_constraint->destroy.notify = handle_constraint_destroy;
         wl_signal_add(&constraint->events.destroy, &sway_constraint->destroy);
 
-        struct sway_node *focus = seat_get_focus(seat);
-        if (focus && focus->type == N_CONTAINER && focus->sway_container->view) {
-                struct wlr_surface *surface = focus->sway_container->view->surface;
-                if (surface == constraint->surface) {
-                        sway_cursor_constrain(seat->cursor, constraint);
-                }
+        struct wlr_surface *surface = seat->wlr_seat->keyboard_state.focused_surface;
+        if (surface && surface == constraint->surface) {
+                sway_cursor_constrain(seat->cursor, constraint);
         }
 }
 
@@ -1395,3 +1390,26 @@ void sway_cursor_constrain(struct sway_cursor *cursor,
         wl_signal_add(&constraint->surface->events.commit,
                 &cursor->constraint_commit);
 }
+
+void handle_request_set_cursor_shape(struct wl_listener *listener, void *data) {
+        const struct wlr_cursor_shape_manager_v1_request_set_shape_event *event = data;
+        struct sway_seat *seat = event->seat_client->seat->data;
+
+        if (!seatop_allows_set_cursor(seat)) {
+                return;
+        }
+
+        struct wl_client *focused_client = NULL;
+        struct wlr_surface *focused_surface = seat->wlr_seat->pointer_state.focused_surface;
+        if (focused_surface != NULL) {
+                focused_client = wl_resource_get_client(focused_surface->resource);
+        }
+
+        // TODO: check cursor mode
+        if (focused_client == NULL || event->seat_client->client != focused_client) {
+                sway_log(SWAY_DEBUG, "denying request to set cursor from unfocused client");
+                return;
+        }
+
+        cursor_set_image(seat->cursor, wlr_cursor_shape_v1_name(event->shape), focused_client);
+}
diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c
index f04a8ce0..c1bbdde0 100644
--- a/sway/input/input-manager.c
+++ b/sway/input/input-manager.c
@@ -3,10 +3,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
-#include <wlr/backend/libinput.h>
+#include <wlr/config.h>
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_keyboard_group.h>
-#include <wlr/types/wlr_input_inhibitor.h>
 #include <wlr/types/wlr_virtual_keyboard_v1.h>
 #include <wlr/types/wlr_virtual_pointer_v1.h>
 #include "sway/config.h"
@@ -22,6 +21,10 @@
 #include "list.h"
 #include "log.h"
 
+#if WLR_HAS_LIBINPUT_BACKEND
+#include <wlr/backend/libinput.h>
+#endif
+
 #define DEFAULT_SEAT "seat0"
 
 struct input_config *current_input_config = NULL;
@@ -76,20 +79,13 @@ char *input_device_get_identifier(struct wlr_input_device *device) {
                 }
         }
 
-        const char *fmt = "%d:%d:%s";
-        int len = snprintf(NULL, 0, fmt, vendor, product, name) + 1;
-        char *identifier = malloc(len);
-        if (!identifier) {
-                sway_log(SWAY_ERROR, "Unable to allocate unique input device name");
-                return NULL;
-        }
-
-        snprintf(identifier, len, fmt, vendor, product, name);
+        char *identifier = format_str("%d:%d:%s", vendor, product, name);
         free(name);
         return identifier;
 }
 
 static bool device_is_touchpad(struct sway_input_device *device) {
+#if WLR_HAS_LIBINPUT_BACKEND
         if (device->wlr_device->type != WLR_INPUT_DEVICE_POINTER ||
                         !wlr_input_device_is_libinput(device->wlr_device)) {
                 return false;
@@ -99,6 +95,9 @@ static bool device_is_touchpad(struct sway_input_device *device) {
                 wlr_libinput_get_device_handle(device->wlr_device);
 
         return libinput_device_config_tap_get_finger_count(libinput_device) > 0;
+#else
+        return false;
+#endif
 }
 
 const char *input_device_get_type(struct sway_input_device *device) {
@@ -236,7 +235,11 @@ static void handle_new_input(struct wl_listener *listener, void *data) {
 
         apply_input_type_config(input_device);
 
-        sway_input_configure_libinput_device(input_device);
+#if WLR_HAS_LIBINPUT_BACKEND
+        bool config_changed = sway_input_configure_libinput_device(input_device);
+#else
+        bool config_changed = false;
+#endif
 
         wl_signal_add(&device->events.destroy, &input_device->device_destroy);
         input_device->device_destroy.notify = handle_device_destroy;
@@ -274,29 +277,9 @@ static void handle_new_input(struct wl_listener *listener, void *data) {
         }
 
         ipc_event_input("added", input_device);
-}
 
-static void handle_inhibit_activate(struct wl_listener *listener, void *data) {
-        struct sway_input_manager *input_manager = wl_container_of(
-                        listener, input_manager, inhibit_activate);
-        struct sway_seat *seat;
-        wl_list_for_each(seat, &input_manager->seats, link) {
-                seat_set_exclusive_client(seat, input_manager->inhibit->active_client);
-        }
-}
-
-static void handle_inhibit_deactivate(struct wl_listener *listener, void *data) {
-        struct sway_input_manager *input_manager = wl_container_of(
-                        listener, input_manager, inhibit_deactivate);
-        struct sway_seat *seat;
-        wl_list_for_each(seat, &input_manager->seats, link) {
-                seat_set_exclusive_client(seat, NULL);
-                struct sway_node *previous = seat_get_focus(seat);
-                if (previous) {
-                        // Hack to get seat to re-focus the return value of get_focus
-                        seat_set_focus(seat, NULL);
-                        seat_set_focus(seat, previous);
-                }
+        if (config_changed) {
+                ipc_event_input("libinput_config", input_device);
         }
 }
 
@@ -377,7 +360,7 @@ void handle_virtual_keyboard(struct wl_listener *listener, void *data) {
         struct sway_input_manager *input_manager =
                 wl_container_of(listener, input_manager, virtual_keyboard_new);
         struct wlr_virtual_keyboard_v1 *keyboard = data;
-        struct wlr_input_device *device = &keyboard->input_device;
+        struct wlr_input_device *device = &keyboard->keyboard.base;
 
         // TODO: Amend protocol to allow NULL seat
         struct sway_seat *seat = keyboard->seat ?
@@ -410,7 +393,7 @@ void handle_virtual_pointer(struct wl_listener *listener, void *data) {
                 wl_container_of(listener, input_manager, virtual_pointer_new);
         struct wlr_virtual_pointer_v1_new_pointer_event *event = data;
         struct wlr_virtual_pointer_v1 *pointer = event->new_pointer;
-        struct wlr_input_device *device = &pointer->input_device;
+        struct wlr_input_device *device = &pointer->pointer.base;
 
         struct sway_seat *seat = event->suggested_seat ?
                 input_manager_sway_seat_from_wlr_seat(event->suggested_seat) :
@@ -468,14 +451,6 @@ struct sway_input_manager *input_manager_create(struct sway_server *server) {
                 &input->virtual_pointer_new);
         input->virtual_pointer_new.notify = handle_virtual_pointer;
 
-        input->inhibit = wlr_input_inhibit_manager_create(server->wl_display);
-        input->inhibit_activate.notify = handle_inhibit_activate;
-        wl_signal_add(&input->inhibit->events.activate,
-                        &input->inhibit_activate);
-        input->inhibit_deactivate.notify = handle_inhibit_deactivate;
-        wl_signal_add(&input->inhibit->events.deactivate,
-                        &input->inhibit_deactivate);
-
         input->keyboard_shortcuts_inhibit =
                 wlr_keyboard_shortcuts_inhibit_v1_create(server->wl_display);
         input->keyboard_shortcuts_inhibit_new_inhibitor.notify =
@@ -483,6 +458,8 @@ struct sway_input_manager *input_manager_create(struct sway_server *server) {
         wl_signal_add(&input->keyboard_shortcuts_inhibit->events.new_inhibitor,
                         &input->keyboard_shortcuts_inhibit_new_inhibitor);
 
+        input->pointer_gestures = wlr_pointer_gestures_v1_create(server->wl_display);
+
         return input;
 }
 
@@ -520,21 +497,50 @@ static void retranslate_keysyms(struct input_config *input_config) {
                         return;
                 }
         }
+
+        for (int i = 0; i < config->input_type_configs->length; ++i) {
+                struct input_config *ic = config->input_type_configs->items[i];
+                if (ic->xkb_layout || ic->xkb_file) {
+                        // this is the first config with xkb_layout or xkb_file
+                        if (ic->identifier == input_config->identifier) {
+                                translate_keysyms(ic);
+                        }
+
+                        return;
+                }
+        }
 }
 
 static void input_manager_configure_input(
                 struct sway_input_device *input_device) {
-        sway_input_configure_libinput_device(input_device);
+#if WLR_HAS_LIBINPUT_BACKEND
+        bool config_changed = sway_input_configure_libinput_device(input_device);
+#else
+        bool config_changed = false;
+#endif
         struct sway_seat *seat = NULL;
         wl_list_for_each(seat, &server.input->seats, link) {
                 seat_configure_device(seat, input_device);
         }
+        if (config_changed) {
+                ipc_event_input("libinput_config", input_device);
+        }
 }
 
-void input_manager_configure_all_inputs(void) {
-        struct sway_input_device *input_device = NULL;
+void input_manager_configure_all_input_mappings(void) {
+        struct sway_input_device *input_device;
         wl_list_for_each(input_device, &server.input->devices, link) {
-                input_manager_configure_input(input_device);
+                struct sway_seat *seat;
+                wl_list_for_each(seat, &server.input->seats, link) {
+                        seat_configure_device_mapping(seat, input_device);
+                }
+
+#if WLR_HAS_LIBINPUT_BACKEND
+                // Input devices mapped to unavailable outputs get their libinput
+                // send_events setting switched to false. We need to re-enable this
+                // when the output appears.
+                sway_input_configure_libinput_device_send_events(input_device);
+#endif
         }
 }
 
@@ -556,7 +562,9 @@ void input_manager_apply_input_config(struct input_config *input_config) {
 }
 
 void input_manager_reset_input(struct sway_input_device *input_device) {
+#if WLR_HAS_LIBINPUT_BACKEND
         sway_input_reset_libinput_device(input_device);
+#endif
         struct sway_seat *seat = NULL;
         wl_list_for_each(seat, &server.input->seats, link) {
                 seat_reset_device(seat, input_device);
@@ -564,6 +572,13 @@ void input_manager_reset_input(struct sway_input_device *input_device) {
 }
 
 void input_manager_reset_all_inputs(void) {
+        // Set the active keyboard to NULL to avoid spamming configuration updates
+        // for all keyboard devices.
+        struct sway_seat *seat;
+        wl_list_for_each(seat, &server.input->seats, link) {
+                wlr_seat_set_keyboard(seat->wlr_seat, NULL);
+        }
+
         struct sway_input_device *input_device = NULL;
         wl_list_for_each(input_device, &server.input->devices, link) {
                 input_manager_reset_input(input_device);
@@ -572,7 +587,6 @@ void input_manager_reset_all_inputs(void) {
         // If there is at least one keyboard using the default keymap, repeat delay,
         // and repeat rate, then it is possible that there is a keyboard group that
         // need their keyboard disarmed.
-        struct sway_seat *seat;
         wl_list_for_each(seat, &server.input->seats, link) {
                 struct sway_keyboard_group *group;
                 wl_list_for_each(group, &seat->keyboard_groups, link) {
diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
index ce259eb2..b97f0152 100644
--- a/sway/input/keyboard.c
+++ b/sway/input/keyboard.c
@@ -1,15 +1,13 @@
 #include <assert.h>
 #include <limits.h>
 #include <strings.h>
+#include <wlr/config.h>
 #include <wlr/backend/multi.h>
-#include <wlr/backend/session.h>
 #include <wlr/interfaces/wlr_keyboard.h>
-#include <wlr/types/wlr_idle.h>
 #include <wlr/types/wlr_keyboard.h>
 #include <wlr/types/wlr_keyboard_group.h>
 #include <xkbcommon/xkbcommon-names.h>
 #include "sway/commands.h"
-#include "sway/desktop/transaction.h"
 #include "sway/input/input-manager.h"
 #include "sway/input/keyboard.h"
 #include "sway/input/seat.h"
@@ -17,6 +15,10 @@
 #include "sway/ipc-server.h"
 #include "log.h"
 
+#if WLR_HAS_SESSION
+#include <wlr/backend/session.h>
+#endif
+
 static struct modifier_key {
         char *name;
         uint32_t mod;
@@ -265,14 +267,12 @@ static bool keyboard_execute_compositor_binding(struct sway_keyboard *keyboard,
                 xkb_keysym_t keysym = pressed_keysyms[i];
                 if (keysym >= XKB_KEY_XF86Switch_VT_1 &&
                                 keysym <= XKB_KEY_XF86Switch_VT_12) {
-                        if (wlr_backend_is_multi(server.backend)) {
-                                struct wlr_session *session =
-                                        wlr_backend_get_session(server.backend);
-                                if (session) {
-                                        unsigned vt = keysym - XKB_KEY_XF86Switch_VT_1 + 1;
-                                        wlr_session_change_vt(session, vt);
-                                }
+#if WLR_HAS_SESSION
+                        if (server.session) {
+                                unsigned vt = keysym - XKB_KEY_XF86Switch_VT_1 + 1;
+                                wlr_session_change_vt(server.session, vt);
                         }
+#endif
                         return true;
                 }
         }
@@ -292,14 +292,12 @@ static bool keyboard_execute_compositor_binding(struct sway_keyboard *keyboard,
 static size_t keyboard_keysyms_translated(struct sway_keyboard *keyboard,
                 xkb_keycode_t keycode, const xkb_keysym_t **keysyms,
                 uint32_t *modifiers) {
-        struct wlr_input_device *device =
-                keyboard->seat_device->input_device->wlr_device;
-        *modifiers = wlr_keyboard_get_modifiers(device->keyboard);
+        *modifiers = wlr_keyboard_get_modifiers(keyboard->wlr);
         xkb_mod_mask_t consumed = xkb_state_key_get_consumed_mods2(
-                device->keyboard->xkb_state, keycode, XKB_CONSUMED_MODE_XKB);
+                keyboard->wlr->xkb_state, keycode, XKB_CONSUMED_MODE_XKB);
         *modifiers = *modifiers & ~consumed;
 
-        return xkb_state_key_get_syms(device->keyboard->xkb_state,
+        return xkb_state_key_get_syms(keyboard->wlr->xkb_state,
                 keycode, keysyms);
 }
 
@@ -315,13 +313,11 @@ static size_t keyboard_keysyms_translated(struct sway_keyboard *keyboard,
 static size_t keyboard_keysyms_raw(struct sway_keyboard *keyboard,
                 xkb_keycode_t keycode, const xkb_keysym_t **keysyms,
                 uint32_t *modifiers) {
-        struct wlr_input_device *device =
-                keyboard->seat_device->input_device->wlr_device;
-        *modifiers = wlr_keyboard_get_modifiers(device->keyboard);
+        *modifiers = wlr_keyboard_get_modifiers(keyboard->wlr);
 
         xkb_layout_index_t layout_index = xkb_state_key_get_layout(
-                device->keyboard->xkb_state, keycode);
-        return xkb_keymap_key_get_syms_by_level(device->keyboard->keymap,
+                keyboard->wlr->xkb_state, keycode);
+        return xkb_keymap_key_get_syms_by_level(keyboard->wlr->keymap,
                 keycode, layout_index, 0, keysyms);
 }
 
@@ -361,8 +357,7 @@ static void update_keyboard_state(struct sway_keyboard *keyboard,
                         keyinfo->keycode, &keyinfo->translated_keysyms,
                         &keyinfo->translated_modifiers);
 
-        keyinfo->code_modifiers = wlr_keyboard_get_modifiers(
-                        keyboard->seat_device->input_device->wlr_device->keyboard);
+        keyinfo->code_modifiers = wlr_keyboard_get_modifiers(keyboard->wlr);
 
         // Update shortcut model keyinfo
         update_shortcut_state(&keyboard->state_keycodes, raw_keycode, keystate,
@@ -379,16 +374,38 @@ static void update_keyboard_state(struct sway_keyboard *keyboard,
         }
 }
 
+/**
+ * Get keyboard grab of the seat from sway_keyboard if we should forward events
+ * to it.
+ *
+ * Returns NULL if the keyboard is not grabbed by an input method,
+ * or if event is from virtual keyboard of the same client as grab.
+ * TODO: see swaywm/wlroots#2322
+ */
+static struct wlr_input_method_keyboard_grab_v2 *keyboard_get_im_grab(
+                struct sway_keyboard *keyboard) {
+        struct wlr_input_method_v2 *input_method = keyboard->seat_device->
+                sway_seat->im_relay.input_method;
+        struct wlr_virtual_keyboard_v1 *virtual_keyboard =
+                wlr_input_device_get_virtual_keyboard(keyboard->seat_device->input_device->wlr_device);
+        if (!input_method || !input_method->keyboard_grab || (virtual_keyboard &&
+                                wl_resource_get_client(virtual_keyboard->resource) ==
+                                wl_resource_get_client(input_method->keyboard_grab->resource))) {
+                return NULL;
+        }
+        return input_method->keyboard_grab;
+}
+
 static void handle_key_event(struct sway_keyboard *keyboard,
-                struct wlr_event_keyboard_key *event) {
+                struct wlr_keyboard_key_event *event) {
         struct sway_seat *seat = keyboard->seat_device->sway_seat;
         struct wlr_seat *wlr_seat = seat->wlr_seat;
         struct wlr_input_device *wlr_device =
                 keyboard->seat_device->input_device->wlr_device;
         char *device_identifier = input_device_get_identifier(wlr_device);
-        bool exact_identifier = wlr_device->keyboard->group != NULL;
+        bool exact_identifier = keyboard->wlr->group != NULL;
         seat_idle_notify_activity(seat, IDLE_SOURCE_KEYBOARD);
-        bool input_inhibited = seat->exclusive_client != NULL;
+        bool locked = server.session_lock.lock;
         struct sway_keyboard_shortcuts_inhibitor *sway_inhibitor =
                 keyboard_shortcuts_inhibitor_get_for_focused_surface(seat);
         bool shortcuts_inhibited = sway_inhibitor && sway_inhibitor->inhibitor->active;
@@ -406,17 +423,17 @@ static void handle_key_event(struct sway_keyboard *keyboard,
         struct sway_binding *binding_released = NULL;
         get_active_binding(&keyboard->state_keycodes,
                         config->current_mode->keycode_bindings, &binding_released,
-                        keyinfo.code_modifiers, true, input_inhibited,
+                        keyinfo.code_modifiers, true, locked,
                         shortcuts_inhibited, device_identifier,
                         exact_identifier, keyboard->effective_layout);
         get_active_binding(&keyboard->state_keysyms_raw,
                         config->current_mode->keysym_bindings, &binding_released,
-                        keyinfo.raw_modifiers, true, input_inhibited,
+                        keyinfo.raw_modifiers, true, locked,
                         shortcuts_inhibited, device_identifier,
                         exact_identifier, keyboard->effective_layout);
         get_active_binding(&keyboard->state_keysyms_translated,
                         config->current_mode->keysym_bindings, &binding_released,
-                        keyinfo.translated_modifiers, true, input_inhibited,
+                        keyinfo.translated_modifiers, true, locked,
                         shortcuts_inhibited, device_identifier,
                         exact_identifier, keyboard->effective_layout);
 
@@ -438,17 +455,17 @@ static void handle_key_event(struct sway_keyboard *keyboard,
         if (event->state == WL_KEYBOARD_KEY_STATE_PRESSED) {
                 get_active_binding(&keyboard->state_keycodes,
                                 config->current_mode->keycode_bindings, &binding,
-                                keyinfo.code_modifiers, false, input_inhibited,
+                                keyinfo.code_modifiers, false, locked,
                                 shortcuts_inhibited, device_identifier,
                                 exact_identifier, keyboard->effective_layout);
                 get_active_binding(&keyboard->state_keysyms_raw,
                                 config->current_mode->keysym_bindings, &binding,
-                                keyinfo.raw_modifiers, false, input_inhibited,
+                                keyinfo.raw_modifiers, false, locked,
                                 shortcuts_inhibited, device_identifier,
                                 exact_identifier, keyboard->effective_layout);
                 get_active_binding(&keyboard->state_keysyms_translated,
                                 config->current_mode->keysym_bindings, &binding,
-                                keyinfo.translated_modifiers, false, input_inhibited,
+                                keyinfo.translated_modifiers, false, locked,
                                 shortcuts_inhibited, device_identifier,
                                 exact_identifier, keyboard->effective_layout);
         }
@@ -456,10 +473,10 @@ static void handle_key_event(struct sway_keyboard *keyboard,
         // Set up (or clear) keyboard repeat for a pressed binding. Since the
         // binding may remove the keyboard, the timer needs to be updated first
         if (binding && !(binding->flags & BINDING_NOREPEAT) &&
-                        wlr_device->keyboard->repeat_info.delay > 0) {
+                        keyboard->wlr->repeat_info.delay > 0) {
                 keyboard->repeat_binding = binding;
                 if (wl_event_source_timer_update(keyboard->key_repeat_source,
-                                wlr_device->keyboard->repeat_info.delay) < 0) {
+                                keyboard->wlr->repeat_info.delay) < 0) {
                         sway_log(SWAY_DEBUG, "failed to set key repeat timer");
                 }
         } else if (keyboard->repeat_binding) {
@@ -471,7 +488,7 @@ static void handle_key_event(struct sway_keyboard *keyboard,
                 handled = true;
         }
 
-        if (!handled && wlr_device->keyboard->group) {
+        if (!handled && keyboard->wlr->group) {
                 // Only handle device specific bindings for keyboards in a group
                 free(device_identifier);
                 return;
@@ -489,18 +506,41 @@ static void handle_key_event(struct sway_keyboard *keyboard,
                                 keyinfo.raw_keysyms_len);
         }
 
-        if (!handled || event->state == WL_KEYBOARD_KEY_STATE_RELEASED) {
+        if (event->state == WL_KEYBOARD_KEY_STATE_RELEASED) {
+                // If the pressed event was sent to a client, also send the released
+                // event. In particular, don't send the released event to the IM grab.
                 bool pressed_sent = update_shortcut_state(
-                                &keyboard->state_pressed_sent, event->keycode, event->state,
-                                keyinfo.keycode, 0);
-                if (pressed_sent || event->state == WL_KEYBOARD_KEY_STATE_PRESSED) {
-                        wlr_seat_set_keyboard(wlr_seat, wlr_device);
+                        &keyboard->state_pressed_sent, event->keycode,
+                        event->state, keyinfo.keycode, 0);
+                if (pressed_sent) {
+                        wlr_seat_set_keyboard(wlr_seat, keyboard->wlr);
                         wlr_seat_keyboard_notify_key(wlr_seat, event->time_msec,
-                                        event->keycode, event->state);
+                                event->keycode, event->state);
+                        handled = true;
+                }
+        }
+
+        if (!handled) {
+                struct wlr_input_method_keyboard_grab_v2 *kb_grab = keyboard_get_im_grab(keyboard);
+
+                if (kb_grab) {
+                        wlr_input_method_keyboard_grab_v2_set_keyboard(kb_grab, keyboard->wlr);
+                        wlr_input_method_keyboard_grab_v2_send_key(kb_grab,
+                                event->time_msec, event->keycode, event->state);
+                        handled = true;
                 }
         }
 
-        transaction_commit_dirty();
+        if (!handled && event->state != WL_KEYBOARD_KEY_STATE_RELEASED) {
+                // If a released event failed pressed sent test, and not in sent to
+                // keyboard grab, it is still not handled. Don't handle released here.
+                update_shortcut_state(
+                        &keyboard->state_pressed_sent, event->keycode, event->state,
+                        keyinfo.keycode, 0);
+                wlr_seat_set_keyboard(wlr_seat, keyboard->wlr);
+                wlr_seat_keyboard_notify_key(wlr_seat, event->time_msec,
+                                event->keycode, event->state);
+        }
 
         free(device_identifier);
 }
@@ -573,21 +613,18 @@ static void handle_keyboard_group_leave(struct wl_listener *listener,
 }
 
 static int handle_keyboard_repeat(void *data) {
-        struct sway_keyboard *keyboard = (struct sway_keyboard *)data;
-        struct wlr_keyboard *wlr_device =
-                        keyboard->seat_device->input_device->wlr_device->keyboard;
+        struct sway_keyboard *keyboard = data;
         if (keyboard->repeat_binding) {
-                if (wlr_device->repeat_info.rate > 0) {
+                if (keyboard->wlr->repeat_info.rate > 0) {
                         // We queue the next event first, as the command might cancel it
                         if (wl_event_source_timer_update(keyboard->key_repeat_source,
-                                        1000 / wlr_device->repeat_info.rate) < 0) {
+                                        1000 / keyboard->wlr->repeat_info.rate) < 0) {
                                 sway_log(SWAY_DEBUG, "failed to update key repeat timer");
                         }
                 }
 
                 seat_execute_command(keyboard->seat_device->sway_seat,
                                 keyboard->repeat_binding);
-                transaction_commit_dirty();
         }
         return 0;
 }
@@ -614,22 +651,28 @@ static void determine_bar_visibility(uint32_t modifiers) {
 }
 
 static void handle_modifier_event(struct sway_keyboard *keyboard) {
-        struct wlr_input_device *wlr_device =
-                keyboard->seat_device->input_device->wlr_device;
-        if (!wlr_device->keyboard->group) {
-                struct wlr_seat *wlr_seat = keyboard->seat_device->sway_seat->wlr_seat;
-                wlr_seat_set_keyboard(wlr_seat, wlr_device);
-                wlr_seat_keyboard_notify_modifiers(wlr_seat,
-                                &wlr_device->keyboard->modifiers);
+        if (!keyboard->wlr->group) {
+                struct wlr_input_method_keyboard_grab_v2 *kb_grab = keyboard_get_im_grab(keyboard);
 
-                uint32_t modifiers = wlr_keyboard_get_modifiers(wlr_device->keyboard);
+                if (kb_grab) {
+                        wlr_input_method_keyboard_grab_v2_set_keyboard(kb_grab, keyboard->wlr);
+                        wlr_input_method_keyboard_grab_v2_send_modifiers(kb_grab,
+                                        &keyboard->wlr->modifiers);
+                } else {
+                        struct wlr_seat *wlr_seat = keyboard->seat_device->sway_seat->wlr_seat;
+                        wlr_seat_set_keyboard(wlr_seat, keyboard->wlr);
+                        wlr_seat_keyboard_notify_modifiers(wlr_seat,
+                                        &keyboard->wlr->modifiers);
+                }
+
+                uint32_t modifiers = wlr_keyboard_get_modifiers(keyboard->wlr);
                 determine_bar_visibility(modifiers);
         }
 
-        if (wlr_device->keyboard->modifiers.group != keyboard->effective_layout) {
-                keyboard->effective_layout = wlr_device->keyboard->modifiers.group;
+        if (keyboard->wlr->modifiers.group != keyboard->effective_layout) {
+                keyboard->effective_layout = keyboard->wlr->modifiers.group;
 
-                if (!wlr_keyboard_group_from_wlr_keyboard(wlr_device->keyboard)) {
+                if (!wlr_keyboard_group_from_wlr_keyboard(keyboard->wlr)) {
                         ipc_event_input("xkb_layout", keyboard->seat_device->input_device);
                 }
         }
@@ -658,6 +701,7 @@ struct sway_keyboard *sway_keyboard_create(struct sway_seat *seat,
         }
 
         keyboard->seat_device = device;
+        keyboard->wlr = wlr_keyboard_from_input_device(device->input_device->wlr_device);
         device->keyboard = keyboard;
 
         wl_list_init(&keyboard->keyboard_key.link);
@@ -671,23 +715,11 @@ struct sway_keyboard *sway_keyboard_create(struct sway_seat *seat,
 
 static void handle_xkb_context_log(struct xkb_context *context,
                 enum xkb_log_level level, const char *format, va_list args) {
-        va_list args_copy;
-        va_copy(args_copy, args);
-        size_t length = vsnprintf(NULL, 0, format, args_copy) + 1;
-        va_end(args_copy);
-
-        char *error = malloc(length);
-        if (!error) {
-                sway_log(SWAY_ERROR, "Failed to allocate libxkbcommon log message");
-                return;
-        }
-
-        va_copy(args_copy, args);
-        vsnprintf(error, length, format, args_copy);
-        va_end(args_copy);
+        char *error = vformat_str(format, args);
 
-        if (error[length - 2] == '\n') {
-                error[length - 2] = '\0';
+        size_t len = strlen(error);
+        if (error[len - 1] == '\n') {
+                error[len - 1] = '\0';
         }
 
         sway_log_importance_t importance = SWAY_DEBUG;
@@ -708,7 +740,7 @@ static void handle_xkb_context_log(struct xkb_context *context,
 
 struct xkb_keymap *sway_keyboard_compile_keymap(struct input_config *ic,
                 char **error) {
-        struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
+        struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_SECURE_GETENV);
         if (!sway_assert(context, "cannot create XKB context")) {
                 return NULL;
         }
@@ -722,13 +754,8 @@ struct xkb_keymap *sway_keyboard_compile_keymap(struct input_config *ic,
                 if (!keymap_file) {
                         sway_log_errno(SWAY_ERROR, "cannot read xkb file %s", ic->xkb_file);
                         if (error) {
-                                size_t len = snprintf(NULL, 0, "cannot read xkb file %s: %s",
-                                                ic->xkb_file, strerror(errno)) + 1;
-                                *error = malloc(len);
-                                if (*error) {
-                                        snprintf(*error, len, "cannot read xkb_file %s: %s",
-                                                        ic->xkb_file, strerror(errno));
-                                }
+                                *error = format_str("cannot read xkb file %s: %s",
+                                        ic->xkb_file, strerror(errno));
                         }
                         goto cleanup;
                 }
@@ -766,13 +793,12 @@ static void destroy_empty_wlr_keyboard_group(void *data) {
 
 static void sway_keyboard_group_remove(struct sway_keyboard *keyboard) {
         struct sway_input_device *device = keyboard->seat_device->input_device;
-        struct wlr_keyboard *wlr_keyboard = device->wlr_device->keyboard;
-        struct wlr_keyboard_group *wlr_group = wlr_keyboard->group;
+        struct wlr_keyboard_group *wlr_group = keyboard->wlr->group;
 
         sway_log(SWAY_DEBUG, "Removing keyboard %s from group %p",
                         device->identifier, wlr_group);
 
-        wlr_keyboard_group_remove_keyboard(wlr_keyboard->group, wlr_keyboard);
+        wlr_keyboard_group_remove_keyboard(keyboard->wlr->group, keyboard->wlr);
 
         if (wl_list_empty(&wlr_group->devices)) {
                 sway_log(SWAY_DEBUG, "Destroying empty keyboard group %p",
@@ -797,9 +823,7 @@ static void sway_keyboard_group_remove(struct sway_keyboard *keyboard) {
 }
 
 static void sway_keyboard_group_remove_invalid(struct sway_keyboard *keyboard) {
-        struct sway_input_device *device = keyboard->seat_device->input_device;
-        struct wlr_keyboard *wlr_keyboard = device->wlr_device->keyboard;
-        if (!wlr_keyboard->group) {
+        if (!keyboard->wlr->group) {
                 return;
         }
 
@@ -815,7 +839,7 @@ static void sway_keyboard_group_remove_invalid(struct sway_keyboard *keyboard) {
                 break;
         case KEYBOARD_GROUP_DEFAULT: /* fallthrough */
         case KEYBOARD_GROUP_SMART:;
-                struct wlr_keyboard_group *group = wlr_keyboard->group;
+                struct wlr_keyboard_group *group = keyboard->wlr->group;
                 if (!wlr_keyboard_keymaps_match(keyboard->keymap, group->keyboard.keymap) ||
                                 !repeat_info_match(keyboard, &group->keyboard)) {
                         sway_keyboard_group_remove(keyboard);
@@ -826,7 +850,6 @@ static void sway_keyboard_group_remove_invalid(struct sway_keyboard *keyboard) {
 
 static void sway_keyboard_group_add(struct sway_keyboard *keyboard) {
         struct sway_input_device *device = keyboard->seat_device->input_device;
-        struct wlr_keyboard *wlr_keyboard = device->wlr_device->keyboard;
         struct sway_seat *seat = keyboard->seat_device->sway_seat;
         struct seat_config *sc = seat_get_config(seat);
 
@@ -858,7 +881,7 @@ static void sway_keyboard_group_add(struct sway_keyboard *keyboard) {
                                         repeat_info_match(keyboard, &wlr_group->keyboard)) {
                                 sway_log(SWAY_DEBUG, "Adding keyboard %s to group %p",
                                                 device->identifier, wlr_group);
-                                wlr_keyboard_group_add_keyboard(wlr_group, wlr_keyboard);
+                                wlr_keyboard_group_add_keyboard(wlr_group, keyboard->wlr);
                                 return;
                         }
                         break;
@@ -897,7 +920,7 @@ static void sway_keyboard_group_add(struct sway_keyboard *keyboard) {
                 goto cleanup;
         }
         sway_group->seat_device->input_device->wlr_device =
-                sway_group->wlr_group->input_device;
+                &sway_group->wlr_group->keyboard.base;
 
         if (!sway_keyboard_create(seat, sway_group->seat_device)) {
                 sway_log(SWAY_ERROR, "Failed to allocate sway_keyboard for group");
@@ -906,7 +929,7 @@ static void sway_keyboard_group_add(struct sway_keyboard *keyboard) {
 
         sway_log(SWAY_DEBUG, "Adding keyboard %s to group %p",
                         device->identifier, sway_group->wlr_group);
-        wlr_keyboard_group_add_keyboard(sway_group->wlr_group, wlr_keyboard);
+        wlr_keyboard_group_add_keyboard(sway_group->wlr_group, keyboard->wlr);
 
         wl_list_insert(&seat->keyboard_groups, &sway_group->link);
 
@@ -938,10 +961,8 @@ cleanup:
 void sway_keyboard_configure(struct sway_keyboard *keyboard) {
         struct input_config *input_config =
                 input_device_get_config(keyboard->seat_device->input_device);
-        struct wlr_input_device *wlr_device =
-                keyboard->seat_device->input_device->wlr_device;
 
-        if (!sway_assert(!wlr_keyboard_group_from_wlr_keyboard(wlr_device->keyboard),
+        if (!sway_assert(!wlr_keyboard_group_from_wlr_keyboard(keyboard->wlr),
                                 "sway_keyboard_configure should not be called with a "
                                 "keyboard group's keyboard")) {
                 return;
@@ -983,11 +1004,11 @@ void sway_keyboard_configure(struct sway_keyboard *keyboard) {
 
                 sway_keyboard_group_remove_invalid(keyboard);
 
-                wlr_keyboard_set_keymap(wlr_device->keyboard, keyboard->keymap);
-                wlr_keyboard_set_repeat_info(wlr_device->keyboard,
+                wlr_keyboard_set_keymap(keyboard->wlr, keyboard->keymap);
+                wlr_keyboard_set_repeat_info(keyboard->wlr,
                                 keyboard->repeat_rate, keyboard->repeat_delay);
 
-                if (!wlr_device->keyboard->group) {
+                if (!keyboard->wlr->group) {
                         sway_keyboard_group_add(keyboard);
                 }
 
@@ -1007,40 +1028,42 @@ void sway_keyboard_configure(struct sway_keyboard *keyboard) {
                         }
                 }
                 if (locked_mods) {
-                        wlr_keyboard_notify_modifiers(wlr_device->keyboard, 0, 0,
+                        wlr_keyboard_notify_modifiers(keyboard->wlr, 0, 0,
                                         locked_mods, 0);
                         uint32_t leds = 0;
                         for (uint32_t i = 0; i < WLR_LED_COUNT; ++i) {
-                                if (xkb_state_led_index_is_active(
-                                                wlr_device->keyboard->xkb_state,
-                                                wlr_device->keyboard->led_indexes[i])) {
+                                if (xkb_state_led_index_is_active(keyboard->wlr->xkb_state,
+                                                keyboard->wlr->led_indexes[i])) {
                                         leds |= (1 << i);
                                 }
                         }
-                        if (wlr_device->keyboard->group) {
-                                wlr_keyboard_led_update(
-                                                &wlr_device->keyboard->group->keyboard, leds);
+                        if (keyboard->wlr->group) {
+                                wlr_keyboard_led_update(&keyboard->wlr->group->keyboard, leds);
                         } else {
-                                wlr_keyboard_led_update(wlr_device->keyboard, leds);
+                                wlr_keyboard_led_update(keyboard->wlr, leds);
                         }
                 }
         } else {
                 xkb_keymap_unref(keymap);
                 sway_keyboard_group_remove_invalid(keyboard);
-                if (!wlr_device->keyboard->group) {
+                if (!keyboard->wlr->group) {
                         sway_keyboard_group_add(keyboard);
                 }
         }
 
+        // If the seat has no active keyboard, set this one
         struct wlr_seat *seat = keyboard->seat_device->sway_seat->wlr_seat;
-        wlr_seat_set_keyboard(seat, wlr_device);
+        struct wlr_keyboard *current_keyboard = seat->keyboard_state.keyboard;
+        if (current_keyboard == NULL) {
+                wlr_seat_set_keyboard(seat, keyboard->wlr);
+        }
 
         wl_list_remove(&keyboard->keyboard_key.link);
-        wl_signal_add(&wlr_device->keyboard->events.key, &keyboard->keyboard_key);
+        wl_signal_add(&keyboard->wlr->events.key, &keyboard->keyboard_key);
         keyboard->keyboard_key.notify = handle_keyboard_key;
 
         wl_list_remove(&keyboard->keyboard_modifiers.link);
-        wl_signal_add(&wlr_device->keyboard->events.modifiers,
+        wl_signal_add(&keyboard->wlr->events.modifiers,
                 &keyboard->keyboard_modifiers);
         keyboard->keyboard_modifiers.notify = handle_keyboard_modifiers;
 
@@ -1057,12 +1080,11 @@ void sway_keyboard_destroy(struct sway_keyboard *keyboard) {
         if (!keyboard) {
                 return;
         }
-        if (keyboard->seat_device->input_device->wlr_device->keyboard->group) {
+        if (keyboard->wlr->group) {
                 sway_keyboard_group_remove(keyboard);
         }
         struct wlr_seat *wlr_seat = keyboard->seat_device->sway_seat->wlr_seat;
-        struct sway_input_device *device = keyboard->seat_device->input_device;
-        if (wlr_seat_get_keyboard(wlr_seat) == device->wlr_device->keyboard) {
+        if (wlr_seat_get_keyboard(wlr_seat) == keyboard->wlr) {
                 wlr_seat_set_keyboard(wlr_seat, NULL);
         }
         if (keyboard->keymap) {
diff --git a/sway/input/libinput.c b/sway/input/libinput.c
index 54520f9e..0266c7a9 100644
--- a/sway/input/libinput.c
+++ b/sway/input/libinput.c
@@ -1,5 +1,6 @@
 #include <float.h>
 #include <libinput.h>
+#include <libudev.h>
 #include <limits.h>
 #include <wlr/backend/libinput.h>
 #include "log.h"
@@ -78,6 +79,16 @@ static bool set_accel_speed(struct libinput_device *device, double speed) {
         return true;
 }
 
+static bool set_rotation_angle(struct libinput_device *device, double angle) {
+        if (!libinput_device_config_rotation_is_available(device) ||
+                        libinput_device_config_rotation_get_angle(device) == angle) {
+                return false;
+        }
+        sway_log(SWAY_DEBUG, "rotation_set_angle(%f)", angle);
+        log_status(libinput_device_config_rotation_set_angle(device, angle));
+        return true;
+}
+
 static bool set_accel_profile(struct libinput_device *device,
                 enum libinput_config_accel_profile profile) {
         if (!libinput_device_config_accel_is_available(device) ||
@@ -155,6 +166,18 @@ static bool set_scroll_button(struct libinput_device *dev, uint32_t button) {
         return true;
 }
 
+static bool set_scroll_button_lock(struct libinput_device *dev,
+                enum libinput_config_scroll_button_lock_state lock) {
+        uint32_t scroll = libinput_device_config_scroll_get_methods(dev);
+        if ((scroll & ~LIBINPUT_CONFIG_SCROLL_NO_SCROLL) == 0 ||
+                        libinput_device_config_scroll_get_button_lock(dev) == lock) {
+                return false;
+        }
+        sway_log(SWAY_DEBUG, "scroll_set_button_lock(%" PRIu32 ")", lock);
+        log_status(libinput_device_config_scroll_set_button_lock(dev, lock));
+        return true;
+}
+
 static bool set_dwt(struct libinput_device *device, bool dwt) {
         if (!libinput_device_config_dwt_is_available(device) ||
                         libinput_device_config_dwt_get_enabled(device) == dwt) {
@@ -165,6 +188,16 @@ static bool set_dwt(struct libinput_device *device, bool dwt) {
         return true;
 }
 
+static bool set_dwtp(struct libinput_device *device, bool dwtp) {
+        if (!libinput_device_config_dwtp_is_available(device) ||
+                        libinput_device_config_dwtp_get_enabled(device) == dwtp) {
+                return false;
+        }
+        sway_log(SWAY_DEBUG, "dwtp_set_enabled(%d)", dwtp);
+        log_status(libinput_device_config_dwtp_set_enabled(device, dwtp));
+        return true;
+}
+
 static bool set_calibration_matrix(struct libinput_device *dev, float mat[6]) {
         if (!libinput_device_config_calibration_has_matrix(dev)) {
                 return false;
@@ -186,35 +219,38 @@ static bool set_calibration_matrix(struct libinput_device *dev, float mat[6]) {
         return changed;
 }
 
-void sway_input_configure_libinput_device(struct sway_input_device *input_device) {
-        struct input_config *ic = input_device_get_config(input_device);
-        if (!ic || !wlr_input_device_is_libinput(input_device->wlr_device)) {
-                return;
-        }
-
-        struct libinput_device *device =
-                wlr_libinput_get_device_handle(input_device->wlr_device);
-        sway_log(SWAY_DEBUG, "sway_input_configure_libinput_device('%s' on '%s')",
-                        ic->identifier, input_device->identifier);
-
-        bool changed = false;
+static bool configure_send_events(struct libinput_device *device,
+                struct input_config *ic) {
         if (ic->mapped_to_output &&
+                        strcmp("*", ic->mapped_to_output) != 0 &&
                         !output_by_name_or_id(ic->mapped_to_output)) {
                 sway_log(SWAY_DEBUG,
                                 "%s '%s' is mapped to offline output '%s'; disabling input",
                                 ic->input_type, ic->identifier, ic->mapped_to_output);
-                changed |= set_send_events(device,
-                        LIBINPUT_CONFIG_SEND_EVENTS_DISABLED);
+                return set_send_events(device, LIBINPUT_CONFIG_SEND_EVENTS_DISABLED);
         } else if (ic->send_events != INT_MIN) {
-                changed |= set_send_events(device, ic->send_events);
+                return set_send_events(device, ic->send_events);
         } else {
                 // Have to reset to the default mode here, otherwise if ic->send_events
                 // is unset and a mapped output just came online after being disabled,
                 // we'd remain stuck sending no events.
-                changed |= set_send_events(device,
+                return set_send_events(device,
                         libinput_device_config_send_events_get_default_mode(device));
         }
+}
+
+bool sway_input_configure_libinput_device(struct sway_input_device *input_device) {
+        struct input_config *ic = input_device_get_config(input_device);
+        if (!ic || !wlr_input_device_is_libinput(input_device->wlr_device)) {
+                return false;
+        }
 
+        struct libinput_device *device =
+                wlr_libinput_get_device_handle(input_device->wlr_device);
+        sway_log(SWAY_DEBUG, "sway_input_configure_libinput_device('%s' on '%s')",
+                        ic->identifier, input_device->identifier);
+
+        bool changed = configure_send_events(device, ic);
         if (ic->tap != INT_MIN) {
                 changed |= set_tap(device, ic->tap);
         }
@@ -230,6 +266,9 @@ void sway_input_configure_libinput_device(struct sway_input_device *input_device
         if (ic->pointer_accel != FLT_MIN) {
                 changed |= set_accel_speed(device, ic->pointer_accel);
         }
+        if (ic->rotation_angle != FLT_MIN) {
+                changed |= set_rotation_angle(device, ic->rotation_angle);
+        }
         if (ic->accel_profile != INT_MIN) {
                 changed |= set_accel_profile(device, ic->accel_profile);
         }
@@ -251,13 +290,33 @@ void sway_input_configure_libinput_device(struct sway_input_device *input_device
         if (ic->scroll_button != INT_MIN) {
                 changed |= set_scroll_button(device, ic->scroll_button);
         }
+        if (ic->scroll_button_lock != INT_MIN) {
+                changed |= set_scroll_button_lock(device, ic->scroll_button_lock);
+        }
         if (ic->dwt != INT_MIN) {
                 changed |= set_dwt(device, ic->dwt);
         }
+        if (ic->dwtp != INT_MIN) {
+                changed |= set_dwtp(device, ic->dwtp);
+        }
         if (ic->calibration_matrix.configured) {
                 changed |= set_calibration_matrix(device, ic->calibration_matrix.matrix);
         }
 
+        return changed;
+}
+
+void sway_input_configure_libinput_device_send_events(
+                struct sway_input_device *input_device) {
+        struct input_config *ic = input_device_get_config(input_device);
+        if (!ic || !wlr_input_device_is_libinput(input_device->wlr_device)) {
+                return;
+        }
+
+        struct libinput_device *device =
+                wlr_libinput_get_device_handle(input_device->wlr_device);
+        bool changed = configure_send_events(device, ic);
+
         if (changed) {
                 ipc_event_input("libinput_config", input_device);
         }
@@ -286,6 +345,8 @@ void sway_input_reset_libinput_device(struct sway_input_device *input_device) {
                 libinput_device_config_tap_get_default_drag_lock_enabled(device));
         changed |= set_accel_speed(device,
                 libinput_device_config_accel_get_default_speed(device));
+        changed |= set_rotation_angle(device,
+                libinput_device_config_rotation_get_default_angle(device));
         changed |= set_accel_profile(device,
                 libinput_device_config_accel_get_default_profile(device));
         changed |= set_natural_scroll(device,
@@ -303,6 +364,8 @@ void sway_input_reset_libinput_device(struct sway_input_device *input_device) {
                 libinput_device_config_scroll_get_default_button(device));
         changed |= set_dwt(device,
                 libinput_device_config_dwt_get_default_enabled(device));
+        changed |= set_dwtp(device,
+                libinput_device_config_dwtp_get_default_enabled(device));
 
         float matrix[6];
         libinput_device_config_calibration_get_default_matrix(device, matrix);
@@ -312,3 +375,32 @@ void sway_input_reset_libinput_device(struct sway_input_device *input_device) {
                 ipc_event_input("libinput_config", input_device);
         }
 }
+
+bool sway_libinput_device_is_builtin(struct sway_input_device *sway_device) {
+        if (!wlr_input_device_is_libinput(sway_device->wlr_device)) {
+                return false;
+        }
+
+        struct libinput_device *device =
+                wlr_libinput_get_device_handle(sway_device->wlr_device);
+        struct udev_device *udev_device =
+                libinput_device_get_udev_device(device);
+        if (!udev_device) {
+                return false;
+        }
+
+        const char *id_path = udev_device_get_property_value(udev_device, "ID_PATH");
+        if (!id_path) {
+                return false;
+        }
+
+        const char prefix_platform[] = "platform-";
+        if (strncmp(id_path, prefix_platform, strlen(prefix_platform)) != 0) {
+                return false;
+        }
+
+        const char prefix_pci[] = "pci-";
+        const char infix_platform[] = "-platform-";
+        return (strncmp(id_path, prefix_pci, strlen(prefix_pci)) == 0) &&
+                strstr(id_path, infix_platform);
+}
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 1f5865ee..75fea484 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -4,22 +4,25 @@
 #include <string.h>
 #include <strings.h>
 #include <time.h>
+#include <wlr/config.h>
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_data_device.h>
-#include <wlr/types/wlr_idle.h>
+#include <wlr/types/wlr_idle_notify_v1.h>
 #include <wlr/types/wlr_keyboard_group.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_primary_selection.h>
 #include <wlr/types/wlr_tablet_v2.h>
+#include <wlr/types/wlr_touch.h>
 #include <wlr/types/wlr_xcursor_manager.h>
 #include "config.h"
 #include "list.h"
 #include "log.h"
 #include "sway/config.h"
-#include "sway/desktop.h"
+#include "sway/scene_descriptor.h"
 #include "sway/input/cursor.h"
 #include "sway/input/input-manager.h"
 #include "sway/input/keyboard.h"
+#include "sway/input/libinput.h"
 #include "sway/input/seat.h"
 #include "sway/input/switch.h"
 #include "sway/input/tablet.h"
@@ -41,6 +44,7 @@ static void seat_device_destroy(struct sway_seat_device *seat_device) {
         sway_keyboard_destroy(seat_device->keyboard);
         sway_tablet_destroy(seat_device->tablet);
         sway_tablet_pad_destroy(seat_device->tablet_pad);
+        sway_switch_destroy(seat_device->switch_device);
         wlr_cursor_detach_input_device(seat_device->sway_seat->cursor->cursor,
                 seat_device->input_device->wlr_device);
         wl_list_remove(&seat_device->link);
@@ -50,6 +54,16 @@ static void seat_device_destroy(struct sway_seat_device *seat_device) {
 static void seat_node_destroy(struct sway_seat_node *seat_node) {
         wl_list_remove(&seat_node->destroy.link);
         wl_list_remove(&seat_node->link);
+
+        /*
+         * This is the only time we remove items from the focus stack without
+         * immediately re-adding them. If we just removed the last thing,
+         * mark that nothing has focus anymore.
+         */
+        if (wl_list_empty(&seat_node->seat->focus_stack)) {
+                seat_node->seat->has_focus = false;
+        }
+
         free(seat_node);
 }
 
@@ -78,6 +92,7 @@ void seat_destroy(struct sway_seat *seat) {
         for (int i = 0; i < seat->deferred_bindings->length; i++) {
                 free_sway_binding(seat->deferred_bindings->items[i]);
         }
+        wlr_scene_node_destroy(&seat->scene_tree->node);
         list_free(seat->deferred_bindings);
         free(seat->prev_workspace_name);
         free(seat);
@@ -85,21 +100,10 @@ void seat_destroy(struct sway_seat *seat) {
 
 void seat_idle_notify_activity(struct sway_seat *seat,
                 enum sway_input_idle_source source) {
-        uint32_t mask = seat->idle_inhibit_sources;
-        struct wlr_idle_timeout *timeout;
-        int ntimers = 0, nidle = 0;
-        wl_list_for_each(timeout, &server.idle->idle_timers, link) {
-                ++ntimers;
-                if (timeout->idle_state) {
-                        ++nidle;
-                }
-        }
-        if (nidle == ntimers) {
-                mask = seat->idle_wake_sources;
-        }
-        if ((source & mask) > 0) {
-                wlr_idle_notify_activity(server.idle, seat->wlr_seat);
+        if ((source & seat->idle_inhibit_sources) == 0) {
+                return;
         }
+        wlr_idle_notifier_v1_notify_activity(server.idle_notifier_v1, seat->wlr_seat);
 }
 
 /**
@@ -129,7 +133,7 @@ static struct sway_keyboard *sway_keyboard_for_wlr_keyboard(
                 if (input_device->wlr_device->type != WLR_INPUT_DEVICE_KEYBOARD) {
                         continue;
                 }
-                if (input_device->wlr_device->keyboard == wlr_keyboard) {
+                if (input_device->wlr_device == &wlr_keyboard->base) {
                         return seat_device->keyboard;
                 }
         }
@@ -137,7 +141,7 @@ static struct sway_keyboard *sway_keyboard_for_wlr_keyboard(
         wl_list_for_each(group, &seat->keyboard_groups, link) {
                 struct sway_input_device *input_device =
                         group->seat_device->input_device;
-                if (input_device->wlr_device->keyboard == wlr_keyboard) {
+                if (input_device->wlr_device == &wlr_keyboard->base) {
                         return group->seat_device->keyboard;
                 }
         }
@@ -161,11 +165,11 @@ static void seat_keyboard_notify_enter(struct sway_seat *seat,
                         state->pressed_keycodes, state->npressed, &keyboard->modifiers);
 }
 
-static void seat_tablet_pads_notify_enter(struct sway_seat *seat,
+static void seat_tablet_pads_set_focus(struct sway_seat *seat,
                 struct wlr_surface *surface) {
         struct sway_seat_device *seat_device;
         wl_list_for_each(seat_device, &seat->devices, link) {
-                sway_tablet_pad_notify_enter(seat_device->tablet_pad, surface);
+                sway_tablet_pad_set_focus(seat_device->tablet_pad, surface);
         }
 }
 
@@ -189,7 +193,7 @@ static void seat_send_focus(struct sway_node *node, struct sway_seat *seat) {
 #endif
 
                 seat_keyboard_notify_enter(seat, view->surface);
-                seat_tablet_pads_notify_enter(seat, view->surface);
+                seat_tablet_pads_set_focus(seat, view->surface);
                 sway_input_method_relay_set_focus(&seat->im_relay, view->surface);
 
                 struct wlr_pointer_constraint_v1 *constraint =
@@ -209,14 +213,13 @@ void seat_for_each_node(struct sway_seat *seat,
 
 struct sway_container *seat_get_focus_inactive_view(struct sway_seat *seat,
                 struct sway_node *ancestor) {
-        if (ancestor->type == N_CONTAINER && ancestor->sway_container->view) {
+        if (node_is_view(ancestor)) {
                 return ancestor->sway_container;
         }
         struct sway_seat_node *current;
         wl_list_for_each(current, &seat->focus_stack, link) {
                 struct sway_node *node = current->node;
-                if (node->type == N_CONTAINER && node->sway_container->view &&
-                                node_has_ancestor(node, ancestor)) {
+                if (node_is_view(node) && node_has_ancestor(node, ancestor)) {
                         return node->sway_container;
                 }
         }
@@ -235,7 +238,7 @@ static void handle_seat_node_destroy(struct wl_listener *listener, void *data) {
                 seat_node_destroy(seat_node);
                 // If an unmanaged or layer surface is focused when an output gets
                 // disabled and an empty workspace on the output was focused by the
-                // seat, the seat needs to refocus it's focus inactive to update the
+                // seat, the seat needs to refocus its focus inactive to update the
                 // value of seat->workspace.
                 if (seat->workspace == node->sway_workspace) {
                         struct sway_node *node = seat_get_focus_inactive(seat, &root->node);
@@ -309,8 +312,8 @@ static void handle_seat_node_destroy(struct wl_listener *listener, void *data) {
                 // Setting focus_inactive
                 focus = seat_get_focus_inactive(seat, &root->node);
                 seat_set_raw_focus(seat, next_focus);
-                if (focus->type == N_CONTAINER && focus->sway_container->workspace) {
-                        seat_set_raw_focus(seat, &focus->sway_container->workspace->node);
+                if (focus->type == N_CONTAINER && focus->sway_container->pending.workspace) {
+                        seat_set_raw_focus(seat, &focus->sway_container->pending.workspace->node);
                 }
                 seat_set_raw_focus(seat, focus);
         }
@@ -351,25 +354,15 @@ static void handle_new_node(struct wl_listener *listener, void *data) {
         seat_node_from_node(seat, node);
 }
 
-static void drag_icon_damage_whole(struct sway_drag_icon *icon) {
-        if (!icon->wlr_drag_icon->mapped) {
-                return;
-        }
-        desktop_damage_surface(icon->wlr_drag_icon->surface, icon->x, icon->y, true);
-}
-
-void drag_icon_update_position(struct sway_drag_icon *icon) {
-        drag_icon_damage_whole(icon);
-
-        struct wlr_drag_icon *wlr_icon = icon->wlr_drag_icon;
-        struct sway_seat *seat = icon->seat;
+static void drag_icon_update_position(struct sway_seat *seat, struct wlr_scene_node *node) {
+        struct wlr_drag_icon *wlr_icon = scene_descriptor_try_get(node, SWAY_SCENE_DESC_DRAG_ICON);
         struct wlr_cursor *cursor = seat->cursor->cursor;
+
         switch (wlr_icon->drag->grab_type) {
         case WLR_DRAG_GRAB_KEYBOARD:
                 return;
         case WLR_DRAG_GRAB_KEYBOARD_POINTER:
-                icon->x = cursor->x;
-                icon->y = cursor->y;
+                wlr_scene_node_set_position(node, cursor->x, cursor->y);
                 break;
         case WLR_DRAG_GRAB_KEYBOARD_TOUCH:;
                 struct wlr_touch_point *point =
@@ -377,39 +370,15 @@ void drag_icon_update_position(struct sway_drag_icon *icon) {
                 if (point == NULL) {
                         return;
                 }
-                icon->x = seat->touch_x;
-                icon->y = seat->touch_y;
+                wlr_scene_node_set_position(node, seat->touch_x, seat->touch_y);
         }
-
-        drag_icon_damage_whole(icon);
-}
-
-static void drag_icon_handle_surface_commit(struct wl_listener *listener,
-                void *data) {
-        struct sway_drag_icon *icon =
-                wl_container_of(listener, icon, surface_commit);
-        drag_icon_update_position(icon);
-}
-
-static void drag_icon_handle_map(struct wl_listener *listener, void *data) {
-        struct sway_drag_icon *icon = wl_container_of(listener, icon, map);
-        drag_icon_damage_whole(icon);
-}
-
-static void drag_icon_handle_unmap(struct wl_listener *listener, void *data) {
-        struct sway_drag_icon *icon = wl_container_of(listener, icon, unmap);
-        drag_icon_damage_whole(icon);
 }
 
-static void drag_icon_handle_destroy(struct wl_listener *listener, void *data) {
-        struct sway_drag_icon *icon = wl_container_of(listener, icon, destroy);
-        icon->wlr_drag_icon->data = NULL;
-        wl_list_remove(&icon->link);
-        wl_list_remove(&icon->surface_commit.link);
-        wl_list_remove(&icon->unmap.link);
-        wl_list_remove(&icon->map.link);
-        wl_list_remove(&icon->destroy.link);
-        free(icon);
+void drag_icons_update_position(struct sway_seat *seat) {
+        struct wlr_scene_node *node;
+        wl_list_for_each(node, &seat->drag_icons->children, link) {
+                drag_icon_update_position(seat, node);
+        }
 }
 
 static void drag_handle_destroy(struct wl_listener *listener, void *data) {
@@ -481,27 +450,20 @@ static void handle_start_drag(struct wl_listener *listener, void *data) {
 
         struct wlr_drag_icon *wlr_drag_icon = wlr_drag->icon;
         if (wlr_drag_icon != NULL) {
-                struct sway_drag_icon *icon = calloc(1, sizeof(struct sway_drag_icon));
-                if (icon == NULL) {
-                        sway_log(SWAY_ERROR, "Allocation failed");
+                struct wlr_scene_tree *tree = wlr_scene_drag_icon_create(seat->drag_icons, wlr_drag_icon);
+                if (!tree) {
+                        sway_log(SWAY_ERROR, "Failed to allocate a drag icon scene tree");
                         return;
                 }
-                icon->seat = seat;
-                icon->wlr_drag_icon = wlr_drag_icon;
-                wlr_drag_icon->data = icon;
-
-                icon->surface_commit.notify = drag_icon_handle_surface_commit;
-                wl_signal_add(&wlr_drag_icon->surface->events.commit, &icon->surface_commit);
-                icon->unmap.notify = drag_icon_handle_unmap;
-                wl_signal_add(&wlr_drag_icon->events.unmap, &icon->unmap);
-                icon->map.notify = drag_icon_handle_map;
-                wl_signal_add(&wlr_drag_icon->events.map, &icon->map);
-                icon->destroy.notify = drag_icon_handle_destroy;
-                wl_signal_add(&wlr_drag_icon->events.destroy, &icon->destroy);
 
-                wl_list_insert(&root->drag_icons, &icon->link);
+                if (!scene_descriptor_assign(&tree->node, SWAY_SCENE_DESC_DRAG_ICON,
+                                wlr_drag_icon)) {
+                        sway_log(SWAY_ERROR, "Failed to allocate a drag icon scene descriptor");
+                        wlr_scene_node_destroy(&tree->node);
+                        return;
+                }
 
-                drag_icon_update_position(icon);
+                drag_icon_update_position(seat, &tree->node);
         }
         seatop_begin_default(seat);
 }
@@ -548,8 +510,18 @@ struct sway_seat *seat_create(const char *seat_name) {
                 return NULL;
         }
 
+        bool failed = false;
+        seat->scene_tree = alloc_scene_tree(root->layers.seat, &failed);
+        seat->drag_icons = alloc_scene_tree(seat->scene_tree, &failed);
+        if (failed) {
+                wlr_scene_node_destroy(&seat->scene_tree->node);
+                free(seat);
+                return NULL;
+        }
+
         seat->wlr_seat = wlr_seat_create(server.wl_display, seat_name);
         if (!sway_assert(seat->wlr_seat, "could not allocate seat")) {
+                wlr_scene_node_destroy(&seat->scene_tree->node);
                 free(seat);
                 return NULL;
         }
@@ -557,6 +529,7 @@ struct sway_seat *seat_create(const char *seat_name) {
 
         seat->cursor = sway_cursor_create(seat);
         if (!seat->cursor) {
+                wlr_scene_node_destroy(&seat->scene_tree->node);
                 wlr_seat_destroy(seat->wlr_seat);
                 free(seat);
                 return NULL;
@@ -653,7 +626,7 @@ static void seat_update_capabilities(struct sway_seat *seat) {
         } else {
                 wlr_seat_set_capabilities(seat->wlr_seat, caps);
                 if ((previous_caps & WL_SEAT_CAPABILITY_POINTER) == 0) {
-                        cursor_set_image(seat->cursor, "left_ptr", NULL);
+                        cursor_set_image(seat->cursor, "default", NULL);
                 }
         }
 }
@@ -666,12 +639,55 @@ static void seat_reset_input_config(struct sway_seat *seat,
                 sway_device->input_device->wlr_device, NULL);
 }
 
-static void seat_apply_input_config(struct sway_seat *seat,
+static bool has_prefix(const char *str, const char *prefix) {
+        return strncmp(str, prefix, strlen(prefix)) == 0;
+}
+
+/**
+ * Get the name of the built-in output, if any. Returns NULL if there isn't
+ * exactly one built-in output.
+ */
+static const char *get_builtin_output_name(void) {
+        const char *match = NULL;
+        for (int i = 0; i < root->outputs->length; ++i) {
+                struct sway_output *output = root->outputs->items[i];
+                const char *name = output->wlr_output->name;
+                if (has_prefix(name, "eDP-") || has_prefix(name, "LVDS-") ||
+                                has_prefix(name, "DSI-")) {
+                        if (match != NULL) {
+                                return NULL;
+                        }
+                        match = name;
+                }
+        }
+        return match;
+}
+
+static bool is_touch_or_tablet_tool(struct sway_seat_device *seat_device) {
+        switch (seat_device->input_device->wlr_device->type) {
+        case WLR_INPUT_DEVICE_TOUCH:
+        case WLR_INPUT_DEVICE_TABLET_TOOL:
+                return true;
+        default:
+                return false;
+        }
+}
+
+static void seat_apply_input_mapping(struct sway_seat *seat,
                 struct sway_seat_device *sway_device) {
         struct input_config *ic =
                 input_device_get_config(sway_device->input_device);
 
-        sway_log(SWAY_DEBUG, "Applying input config to %s",
+        switch (sway_device->input_device->wlr_device->type) {
+        case WLR_INPUT_DEVICE_POINTER:
+        case WLR_INPUT_DEVICE_TOUCH:
+        case WLR_INPUT_DEVICE_TABLET_TOOL:
+                break;
+        default:
+                return; // these devices don't support mappings
+        }
+
+        sway_log(SWAY_DEBUG, "Applying input mapping to %s",
                 sway_device->input_device->identifier);
 
         const char *mapped_to_output = ic == NULL ? NULL : ic->mapped_to_output;
@@ -680,8 +696,38 @@ static void seat_apply_input_config(struct sway_seat *seat,
                 ic == NULL ? MAPPED_TO_DEFAULT : ic->mapped_to;
 
         switch (mapped_to) {
-        case MAPPED_TO_DEFAULT:
-                mapped_to_output = sway_device->input_device->wlr_device->output_name;
+        case MAPPED_TO_DEFAULT:;
+                /*
+                 * If the wlroots backend provides an output name, use that.
+                 *
+                 * Otherwise, try to map built-in touch and pointer devices to the
+                 * built-in output.
+                 */
+                struct wlr_input_device *dev = sway_device->input_device->wlr_device;
+                switch (dev->type) {
+                case WLR_INPUT_DEVICE_POINTER:
+                        mapped_to_output = wlr_pointer_from_input_device(dev)->output_name;
+                        break;
+                case WLR_INPUT_DEVICE_TOUCH:
+                        mapped_to_output = wlr_touch_from_input_device(dev)->output_name;
+                        break;
+                default:
+                        mapped_to_output = NULL;
+                        break;
+                }
+#if WLR_HAS_LIBINPUT_BACKEND
+                if (mapped_to_output == NULL && is_touch_or_tablet_tool(sway_device) &&
+                                sway_libinput_device_is_builtin(sway_device->input_device)) {
+                        mapped_to_output = get_builtin_output_name();
+                        if (mapped_to_output) {
+                                sway_log(SWAY_DEBUG, "Auto-detected output '%s' for device '%s'",
+                                        mapped_to_output, sway_device->input_device->identifier);
+                        }
+                }
+#else
+                (void)is_touch_or_tablet_tool;
+                (void)get_builtin_output_name;
+#endif
                 if (mapped_to_output == NULL) {
                         return;
                 }
@@ -725,12 +771,9 @@ static void seat_apply_input_config(struct sway_seat *seat,
 
 static void seat_configure_pointer(struct sway_seat *seat,
                 struct sway_seat_device *sway_device) {
-        if ((seat->wlr_seat->capabilities & WL_SEAT_CAPABILITY_POINTER) == 0) {
-                seat_configure_xcursor(seat);
-        }
+        seat_configure_xcursor(seat);
         wlr_cursor_attach_input_device(seat->cursor->cursor,
                 sway_device->input_device->wlr_device);
-        seat_apply_input_config(seat, sway_device);
         wl_event_source_timer_update(
                         seat->cursor->hide_source, cursor_get_timeout(seat->cursor));
 }
@@ -741,13 +784,22 @@ static void seat_configure_keyboard(struct sway_seat *seat,
                 sway_keyboard_create(seat, seat_device);
         }
         sway_keyboard_configure(seat_device->keyboard);
-        wlr_seat_set_keyboard(seat->wlr_seat,
-                        seat_device->input_device->wlr_device);
-        struct sway_node *focus = seat_get_focus(seat);
-        if (focus && node_is_view(focus)) {
-                // force notify reenter to pick up the new configuration
+
+        // We only need to update the current keyboard, as the rest will be updated
+        // as they are activated.
+        struct wlr_keyboard *wlr_keyboard =
+                wlr_keyboard_from_input_device(seat_device->input_device->wlr_device);
+        struct wlr_keyboard *current_keyboard = seat->wlr_seat->keyboard_state.keyboard;
+        if (wlr_keyboard != current_keyboard) {
+                return;
+        }
+
+        // force notify reenter to pick up the new configuration.  This reuses
+        // the current focused surface to avoid breaking input grabs.
+        struct wlr_surface *surface = seat->wlr_seat->keyboard_state.focused_surface;
+        if (surface) {
                 wlr_seat_keyboard_notify_clear_focus(seat->wlr_seat);
-                seat_keyboard_notify_enter(seat, focus->sway_container->view->surface);
+                seat_keyboard_notify_enter(seat, surface);
         }
 }
 
@@ -756,7 +808,6 @@ static void seat_configure_switch(struct sway_seat *seat,
         if (!seat_device->switch_device) {
                 sway_switch_create(seat, seat_device);
         }
-        seat_apply_input_config(seat, seat_device);
         sway_switch_configure(seat_device->switch_device);
 }
 
@@ -764,7 +815,6 @@ static void seat_configure_touch(struct sway_seat *seat,
                 struct sway_seat_device *sway_device) {
         wlr_cursor_attach_input_device(seat->cursor->cursor,
                 sway_device->input_device->wlr_device);
-        seat_apply_input_config(seat, sway_device);
 }
 
 static void seat_configure_tablet_tool(struct sway_seat *seat,
@@ -775,7 +825,6 @@ static void seat_configure_tablet_tool(struct sway_seat *seat,
         sway_configure_tablet(sway_device->tablet);
         wlr_cursor_attach_input_device(seat->cursor->cursor,
                 sway_device->input_device->wlr_device);
-        seat_apply_input_config(seat, sway_device);
 }
 
 static void seat_configure_tablet_pad(struct sway_seat *seat,
@@ -832,6 +881,18 @@ void seat_configure_device(struct sway_seat *seat,
                         seat_configure_tablet_pad(seat, seat_device);
                         break;
         }
+
+        seat_apply_input_mapping(seat, seat_device);
+}
+
+void seat_configure_device_mapping(struct sway_seat *seat,
+                struct sway_input_device *input_device) {
+        struct sway_seat_device *seat_device = seat_get_device(seat, input_device);
+        if (!seat_device) {
+                return;
+        }
+
+        seat_apply_input_mapping(seat, seat_device);
 }
 
 void seat_reset_device(struct sway_seat *seat,
@@ -948,7 +1009,7 @@ void seat_configure_xcursor(struct sway_seat *seat) {
 
                         wlr_xcursor_manager_load(server.xwayland.xcursor_manager, 1);
                         struct wlr_xcursor *xcursor = wlr_xcursor_manager_get_xcursor(
-                                server.xwayland.xcursor_manager, "left_ptr", 1);
+                                server.xwayland.xcursor_manager, "default", 1);
                         if (xcursor != NULL) {
                                 struct wlr_xcursor_image *image = xcursor->images[0];
                                 wlr_xwayland_set_cursor(
@@ -974,32 +1035,35 @@ void seat_configure_xcursor(struct sway_seat *seat) {
                         sway_log(SWAY_ERROR,
                                 "Cannot create XCursor manager for theme '%s'", cursor_theme);
                 }
-        }
 
-        for (int i = 0; i < root->outputs->length; ++i) {
-                struct sway_output *sway_output = root->outputs->items[i];
-                struct wlr_output *output = sway_output->wlr_output;
-                bool result =
-                        wlr_xcursor_manager_load(seat->cursor->xcursor_manager,
-                                output->scale);
-                if (!result) {
-                        sway_log(SWAY_ERROR,
-                                "Cannot load xcursor theme for output '%s' with scale %f",
-                                output->name, output->scale);
+
+                for (int i = 0; i < root->outputs->length; ++i) {
+                        struct sway_output *sway_output = root->outputs->items[i];
+                        struct wlr_output *output = sway_output->wlr_output;
+                        bool result =
+                                wlr_xcursor_manager_load(seat->cursor->xcursor_manager,
+                                        output->scale);
+                        if (!result) {
+                                sway_log(SWAY_ERROR,
+                                        "Cannot load xcursor theme for output '%s' with scale %f",
+                                        output->name, output->scale);
+                        }
                 }
-        }
 
-        // Reset the cursor so that we apply it to outputs that just appeared
-        cursor_set_image(seat->cursor, NULL, NULL);
-        cursor_set_image(seat->cursor, "left_ptr", NULL);
-        wlr_cursor_warp(seat->cursor->cursor, NULL, seat->cursor->cursor->x,
-                seat->cursor->cursor->y);
+                // Reset the cursor so that we apply it to outputs that just appeared
+                cursor_set_image(seat->cursor, NULL, NULL);
+                cursor_set_image(seat->cursor, "default", NULL);
+                wlr_cursor_warp(seat->cursor->cursor, NULL, seat->cursor->cursor->x,
+                        seat->cursor->cursor->y);
+        }
 }
 
 bool seat_is_input_allowed(struct sway_seat *seat,
                 struct wlr_surface *surface) {
-        struct wl_client *client = wl_resource_get_client(surface->resource);
-        return !seat->exclusive_client || seat->exclusive_client == client;
+        if (server.session_lock.lock) {
+                return sway_session_lock_has_surface(server.session_lock.lock, surface);
+        }
+        return true;
 }
 
 static void send_unfocus(struct sway_container *con, void *data) {
@@ -1058,15 +1122,7 @@ void seat_set_raw_focus(struct sway_seat *seat, struct sway_node *node) {
         }
 }
 
-void seat_set_focus(struct sway_seat *seat, struct sway_node *node) {
-        if (seat->focused_layer) {
-                struct wlr_layer_surface_v1 *layer = seat->focused_layer;
-                seat_set_focus_layer(seat, NULL);
-                seat_set_focus(seat, node);
-                seat_set_focus_layer(seat, layer);
-                return;
-        }
-
+static void seat_set_workspace_focus(struct sway_seat *seat, struct sway_node *node) {
         struct sway_node *last_focus = seat_get_focus(seat);
         if (last_focus == node) {
                 return;
@@ -1086,30 +1142,19 @@ void seat_set_focus(struct sway_seat *seat, struct sway_node *node) {
         }
 
         struct sway_workspace *new_workspace = node->type == N_WORKSPACE ?
-                node->sway_workspace : node->sway_container->workspace;
+                node->sway_workspace : node->sway_container->pending.workspace;
         struct sway_container *container = node->type == N_CONTAINER ?
                 node->sway_container : NULL;
 
-        // Deny setting focus to a view which is hidden by a fullscreen container
-        if (new_workspace && new_workspace->fullscreen && container &&
-                        !container_is_fullscreen_or_child(container)) {
-                // Unless it's a transient container
-                if (!container_is_transient_for(container, new_workspace->fullscreen)) {
-                        return;
-                }
+        // Deny setting focus to a view which is hidden by a fullscreen container or global
+        if (container && container_obstructing_fullscreen_container(container)) {
+                return;
         }
+
         // Deny setting focus to a workspace node when using fullscreen global
         if (root->fullscreen_global && !container && new_workspace) {
                 return;
         }
-        // Deny setting focus to a view which is hidden by a fullscreen global
-        if (root->fullscreen_global && container != root->fullscreen_global &&
-                                !container_has_ancestor(container, root->fullscreen_global)) {
-                // Unless it's a transient container
-                if (!container_is_transient_for(container, root->fullscreen_global)) {
-                        return;
-                }
-        }
 
         struct sway_output *new_output =
                 new_workspace ? new_workspace->output : NULL;
@@ -1135,10 +1180,10 @@ void seat_set_focus(struct sway_seat *seat, struct sway_node *node) {
         // Put the container parents on the focus stack, then the workspace, then
         // the focused container.
         if (container) {
-                struct sway_container *parent = container->parent;
+                struct sway_container *parent = container->pending.parent;
                 while (parent) {
                         seat_set_raw_focus(seat, &parent->node);
-                        parent = parent->parent;
+                        parent = parent->pending.parent;
                 }
         }
         if (new_workspace) {
@@ -1210,6 +1255,24 @@ void seat_set_focus(struct sway_seat *seat, struct sway_node *node) {
         }
 }
 
+void seat_set_focus(struct sway_seat *seat, struct sway_node *node) {
+        // Prevents the layer from losing focus if it has keyboard exclusivity
+        if (seat->has_exclusive_layer) {
+                struct wlr_layer_surface_v1 *layer = seat->focused_layer;
+                seat_set_focus_layer(seat, NULL);
+                seat_set_workspace_focus(seat, node);
+                seat_set_focus_layer(seat, layer);
+        } else if (seat->focused_layer) {
+                seat_set_focus_layer(seat, NULL);
+                seat_set_workspace_focus(seat, node);
+        } else {
+                seat_set_workspace_focus(seat, node);
+        }
+        if (server.session_lock.lock) {
+                seat_set_focus_surface(seat, server.session_lock.lock->focused, false);
+        }
+}
+
 void seat_set_focus_container(struct sway_seat *seat,
                 struct sway_container *con) {
         seat_set_focus(seat, con ? &con->node : NULL);
@@ -1234,7 +1297,8 @@ void seat_set_focus_surface(struct sway_seat *seat,
                 wlr_seat_keyboard_notify_clear_focus(seat->wlr_seat);
         }
 
-        seat_tablet_pads_notify_enter(seat, surface);
+        sway_input_method_relay_set_focus(&seat->im_relay, surface);
+        seat_tablet_pads_set_focus(seat, surface);
 }
 
 void seat_set_focus_layer(struct sway_seat *seat,
@@ -1248,28 +1312,23 @@ void seat_set_focus_layer(struct sway_seat *seat,
                         seat_set_focus(seat, previous);
                 }
                 return;
-        } else if (!layer || seat->focused_layer == layer) {
+        } else if (!layer) {
                 return;
         }
-        assert(layer->mapped);
-        seat_set_focus_surface(seat, layer->surface, true);
-        if (layer->current.layer >= ZWLR_LAYER_SHELL_V1_LAYER_TOP) {
-                seat->focused_layer = layer;
+        assert(layer->surface->mapped);
+        if (layer->current.layer >= ZWLR_LAYER_SHELL_V1_LAYER_TOP &&
+                        layer->current.keyboard_interactive
+                        == ZWLR_LAYER_SURFACE_V1_KEYBOARD_INTERACTIVITY_EXCLUSIVE) {
+                seat->has_exclusive_layer = true;
         }
-}
-
-void seat_set_exclusive_client(struct sway_seat *seat,
-                struct wl_client *client) {
-        if (!client) {
-                seat->exclusive_client = client;
-                // Triggers a refocus of the topmost surface layer if necessary
-                // TODO: Make layer surface focus per-output based on cursor position
-                for (int i = 0; i < root->outputs->length; ++i) {
-                        struct sway_output *output = root->outputs->items[i];
-                        arrange_layers(output);
-                }
+        if (seat->focused_layer == layer) {
                 return;
         }
+        seat_set_focus_surface(seat, layer->surface, true);
+        seat->focused_layer = layer;
+}
+
+void seat_unfocus_unless_client(struct sway_seat *seat, struct wl_client *client) {
         if (seat->focused_layer) {
                 if (wl_resource_get_client(seat->focused_layer->resource) != client) {
                         seat_set_focus_layer(seat, NULL);
@@ -1296,7 +1355,6 @@ void seat_set_exclusive_client(struct sway_seat *seat,
                                         now.tv_nsec / 1000, point->touch_id);
                 }
         }
-        seat->exclusive_client = client;
 }
 
 struct sway_node *seat_get_focus_inactive(struct sway_seat *seat,
@@ -1326,7 +1384,7 @@ struct sway_container *seat_get_focus_inactive_tiling(struct sway_seat *seat,
                 struct sway_node *node = current->node;
                 if (node->type == N_CONTAINER &&
                                 !container_is_floating_or_child(node->sway_container) &&
-                                node->sway_container->workspace == workspace) {
+                                node->sway_container->pending.workspace == workspace) {
                         return node->sway_container;
                 }
         }
@@ -1343,7 +1401,7 @@ struct sway_container *seat_get_focus_inactive_floating(struct sway_seat *seat,
                 struct sway_node *node = current->node;
                 if (node->type == N_CONTAINER &&
                                 container_is_floating_or_child(node->sway_container) &&
-                                node->sway_container->workspace == workspace) {
+                                node->sway_container->pending.workspace == workspace) {
                         return node->sway_container;
                 }
         }
@@ -1377,9 +1435,8 @@ struct sway_node *seat_get_focus(struct sway_seat *seat) {
         if (!seat->has_focus) {
                 return NULL;
         }
-        if (wl_list_empty(&seat->focus_stack)) {
-                return NULL;
-        }
+        sway_assert(!wl_list_empty(&seat->focus_stack),
+                        "focus_stack is empty, but has_focus is true");
         struct sway_seat_node *current =
                 wl_container_of(seat->focus_stack.next, current, link);
         return current->node;
@@ -1391,7 +1448,7 @@ struct sway_workspace *seat_get_focused_workspace(struct sway_seat *seat) {
                 return NULL;
         }
         if (focus->type == N_CONTAINER) {
-                return focus->sway_container->workspace;
+                return focus->sway_container->pending.workspace;
         }
         if (focus->type == N_WORKSPACE) {
                 return focus->sway_workspace;
@@ -1404,8 +1461,8 @@ struct sway_workspace *seat_get_last_known_workspace(struct sway_seat *seat) {
         wl_list_for_each(current, &seat->focus_stack, link) {
                 struct sway_node *node = current->node;
                 if (node->type == N_CONTAINER &&
-                                node->sway_container->workspace) {
-                        return node->sway_container->workspace;
+                                node->sway_container->pending.workspace) {
+                        return node->sway_container->pending.workspace;
                 } else if (node->type == N_WORKSPACE) {
                         return node->sway_workspace;
                 }
@@ -1514,12 +1571,38 @@ void seatop_pointer_motion(struct sway_seat *seat, uint32_t time_msec) {
 }
 
 void seatop_pointer_axis(struct sway_seat *seat,
-                struct wlr_event_pointer_axis *event) {
+                struct wlr_pointer_axis_event *event) {
         if (seat->seatop_impl->pointer_axis) {
                 seat->seatop_impl->pointer_axis(seat, event);
         }
 }
 
+void seatop_touch_motion(struct sway_seat *seat, struct wlr_touch_motion_event *event,
+                double lx, double ly) {
+        if (seat->seatop_impl->touch_motion) {
+                seat->seatop_impl->touch_motion(seat, event, lx, ly);
+        }
+}
+
+void seatop_touch_up(struct sway_seat *seat, struct wlr_touch_up_event *event) {
+        if (seat->seatop_impl->touch_up) {
+                seat->seatop_impl->touch_up(seat, event);
+        }
+}
+
+void seatop_touch_down(struct sway_seat *seat, struct wlr_touch_down_event *event,
+                double lx, double ly) {
+        if (seat->seatop_impl->touch_down) {
+                seat->seatop_impl->touch_down(seat, event, lx, ly);
+        }
+}
+
+void seatop_touch_cancel(struct sway_seat *seat, struct wlr_touch_cancel_event *event) {
+        if (seat->seatop_impl->touch_cancel) {
+                seat->seatop_impl->touch_cancel(seat, event);
+        }
+}
+
 void seatop_tablet_tool_tip(struct sway_seat *seat,
                 struct sway_tablet_tool *tool, uint32_t time_msec,
                 enum wlr_tablet_tool_tip_state state) {
@@ -1537,6 +1620,62 @@ void seatop_tablet_tool_motion(struct sway_seat *seat,
         }
 }
 
+void seatop_hold_begin(struct sway_seat *seat,
+                struct wlr_pointer_hold_begin_event *event) {
+        if (seat->seatop_impl->hold_begin) {
+                seat->seatop_impl->hold_begin(seat, event);
+        }
+}
+
+void seatop_hold_end(struct sway_seat *seat,
+                struct wlr_pointer_hold_end_event *event) {
+        if (seat->seatop_impl->hold_end) {
+                seat->seatop_impl->hold_end(seat, event);
+        }
+}
+
+void seatop_pinch_begin(struct sway_seat *seat,
+                struct wlr_pointer_pinch_begin_event *event) {
+        if (seat->seatop_impl->pinch_begin) {
+                seat->seatop_impl->pinch_begin(seat, event);
+        }
+}
+
+void seatop_pinch_update(struct sway_seat *seat,
+                struct wlr_pointer_pinch_update_event *event) {
+        if (seat->seatop_impl->pinch_update) {
+                seat->seatop_impl->pinch_update(seat, event);
+        }
+}
+
+void seatop_pinch_end(struct sway_seat *seat,
+                struct wlr_pointer_pinch_end_event *event) {
+        if (seat->seatop_impl->pinch_end) {
+                seat->seatop_impl->pinch_end(seat, event);
+        }
+}
+
+void seatop_swipe_begin(struct sway_seat *seat,
+                struct wlr_pointer_swipe_begin_event *event) {
+        if (seat->seatop_impl->swipe_begin) {
+                seat->seatop_impl->swipe_begin(seat, event);
+        }
+}
+
+void seatop_swipe_update(struct sway_seat *seat,
+                struct wlr_pointer_swipe_update_event *event) {
+        if (seat->seatop_impl->swipe_update) {
+                seat->seatop_impl->swipe_update(seat, event);
+        }
+}
+
+void seatop_swipe_end(struct sway_seat *seat,
+                struct wlr_pointer_swipe_end_event *event) {
+        if (seat->seatop_impl->swipe_end) {
+                seat->seatop_impl->swipe_end(seat, event);
+        }
+}
+
 void seatop_rebase(struct sway_seat *seat, uint32_t time_msec) {
         if (seat->seatop_impl->rebase) {
                 seat->seatop_impl->rebase(seat, time_msec);
@@ -1552,13 +1691,6 @@ void seatop_end(struct sway_seat *seat) {
         seat->seatop_impl = NULL;
 }
 
-void seatop_render(struct sway_seat *seat, struct sway_output *output,
-                pixman_region32_t *damage) {
-        if (seat->seatop_impl->render) {
-                seat->seatop_impl->render(seat, output, damage);
-        }
-}
-
 bool seatop_allows_set_cursor(struct sway_seat *seat) {
         return seat->seatop_impl->allow_set_cursor;
 }
diff --git a/sway/input/seatop_default.c b/sway/input/seatop_default.c
index a583ed62..c56330fd 100644
--- a/sway/input/seatop_default.c
+++ b/sway/input/seatop_default.c
@@ -2,12 +2,17 @@
 #include <float.h>
 #include <libevdev/libevdev.h>
 #include <wlr/types/wlr_cursor.h>
+#include <wlr/types/wlr_subcompositor.h>
 #include <wlr/types/wlr_tablet_v2.h>
 #include <wlr/types/wlr_xcursor_manager.h>
+#include "gesture.h"
+#include "sway/desktop/transaction.h"
 #include "sway/input/cursor.h"
 #include "sway/input/seat.h"
 #include "sway/input/tablet.h"
+#include "sway/layers.h"
 #include "sway/output.h"
+#include "sway/scene_descriptor.h"
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
 #include "log.h"
@@ -19,6 +24,7 @@ struct seatop_default_event {
         struct sway_node *previous_node;
         uint32_t pressed_buttons[SWAY_CURSOR_PRESSED_BUTTONS_CAP];
         size_t pressed_button_count;
+        struct gesture_tracker gestures;
 };
 
 /*-----------------------------------------\
@@ -50,6 +56,9 @@ static bool edge_is_external(struct sway_container *cont, enum wlr_edges edge) {
         while (cont) {
                 if (container_parent_layout(cont) == layout) {
                         list_t *siblings = container_get_siblings(cont);
+                        if (!siblings) {
+                                return false;
+                        }
                         int index = list_find(siblings, cont);
                         if (index > 0 && (edge == WLR_EDGE_LEFT || edge == WLR_EDGE_TOP)) {
                                 return false;
@@ -59,7 +68,7 @@ static bool edge_is_external(struct sway_container *cont, enum wlr_edges edge) {
                                 return false;
                         }
                 }
-                cont = cont->parent;
+                cont = cont->pending.parent;
         }
         return true;
 }
@@ -69,25 +78,25 @@ static enum wlr_edges find_edge(struct sway_container *cont,
         if (!cont->view || (surface && cont->view->surface != surface)) {
                 return WLR_EDGE_NONE;
         }
-        if (cont->border == B_NONE || !cont->border_thickness ||
-                        cont->border == B_CSD) {
+        if (cont->pending.border == B_NONE || !cont->pending.border_thickness ||
+                        cont->pending.border == B_CSD) {
                 return WLR_EDGE_NONE;
         }
-        if (cont->fullscreen_mode) {
+        if (cont->pending.fullscreen_mode) {
                 return WLR_EDGE_NONE;
         }
 
         enum wlr_edges edge = 0;
-        if (cursor->cursor->x < cont->x + cont->border_thickness) {
+        if (cursor->cursor->x < cont->pending.x + cont->pending.border_thickness) {
                 edge |= WLR_EDGE_LEFT;
         }
-        if (cursor->cursor->y < cont->y + cont->border_thickness) {
+        if (cursor->cursor->y < cont->pending.y + cont->pending.border_thickness) {
                 edge |= WLR_EDGE_TOP;
         }
-        if (cursor->cursor->x >= cont->x + cont->width - cont->border_thickness) {
+        if (cursor->cursor->x >= cont->pending.x + cont->pending.width - cont->pending.border_thickness) {
                 edge |= WLR_EDGE_RIGHT;
         }
-        if (cursor->cursor->y >= cont->y + cont->height - cont->border_thickness) {
+        if (cursor->cursor->y >= cont->pending.y + cont->pending.height - cont->pending.border_thickness) {
                 edge |= WLR_EDGE_BOTTOM;
         }
 
@@ -225,13 +234,15 @@ static void handle_tablet_tool_tip(struct sway_seat *seat,
         struct sway_container *cont = node && node->type == N_CONTAINER ?
                 node->sway_container : NULL;
 
-        if (wlr_surface_is_layer_surface(surface)) {
+        struct wlr_layer_surface_v1 *layer;
+#if HAVE_XWAYLAND
+        struct wlr_xwayland_surface *xsurface;
+#endif
+        if ((layer = wlr_layer_surface_v1_try_from_wlr_surface(surface)) &&
+                        layer->current.keyboard_interactive) {
                 // Handle tapping a layer surface
-                struct wlr_layer_surface_v1 *layer =
-                                wlr_layer_surface_v1_from_wlr_surface(surface);
-                if (layer->current.keyboard_interactive) {
-                        seat_set_focus_layer(seat, layer);
-                }
+                seat_set_focus_layer(seat, layer);
+                transaction_commit_dirty();
         } else if (cont) {
                 bool is_floating_or_child = container_is_floating_or_child(cont);
                 bool is_fullscreen_or_child = container_is_fullscreen_or_child(cont);
@@ -249,26 +260,24 @@ static void handle_tablet_tool_tip(struct sway_seat *seat,
 
                 // Handle moving a tiling container
                 if (config->tiling_drag && mod_pressed && !is_floating_or_child &&
-                                cont->fullscreen_mode == FULLSCREEN_NONE) {
+                                cont->pending.fullscreen_mode == FULLSCREEN_NONE) {
                         seatop_begin_move_tiling(seat, cont);
                         return;
                 }
 
                 // Handle tapping on a container surface
                 seat_set_focus_container(seat, cont);
-                seatop_begin_down(seat, node->sway_container, time_msec, sx, sy);
+                seatop_begin_down(seat, node->sway_container, sx, sy);
         }
 #if HAVE_XWAYLAND
         // Handle tapping on an xwayland unmanaged view
-        else if (wlr_surface_is_xwayland_surface(surface)) {
-                struct wlr_xwayland_surface *xsurface =
-                                wlr_xwayland_surface_from_wlr_surface(surface);
-                if (xsurface->override_redirect &&
-                                wlr_xwayland_or_surface_wants_focus(xsurface)) {
-                        struct wlr_xwayland *xwayland = server.xwayland.wlr_xwayland;
-                        wlr_xwayland_set_seat(xwayland, seat->wlr_seat);
-                        seat_set_focus_surface(seat, xsurface->surface, false);
-                }
+        else if ((xsurface = wlr_xwayland_surface_try_from_wlr_surface(surface)) &&
+                        xsurface->override_redirect &&
+                        wlr_xwayland_or_surface_wants_focus(xsurface)) {
+                struct wlr_xwayland *xwayland = server.xwayland.wlr_xwayland;
+                wlr_xwayland_set_seat(xwayland, seat->wlr_seat);
+                seat_set_focus_surface(seat, xsurface->surface, false);
+                transaction_commit_dirty();
         }
 #endif
 
@@ -356,17 +365,21 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
         if (node && node->type == N_WORKSPACE) {
                 if (state == WLR_BUTTON_PRESSED) {
                         seat_set_focus(seat, node);
+                        transaction_commit_dirty();
                 }
                 seat_pointer_notify_button(seat, time_msec, button, state);
                 return;
         }
 
-        // Handle clicking a layer surface
-        if (surface && wlr_surface_is_layer_surface(surface)) {
-                struct wlr_layer_surface_v1 *layer =
-                        wlr_layer_surface_v1_from_wlr_surface(surface);
+        // Handle clicking a layer surface and its popups/subsurfaces
+        struct wlr_layer_surface_v1 *layer = NULL;
+        if ((layer = toplevel_layer_surface_from_surface(surface))) {
                 if (layer->current.keyboard_interactive) {
                         seat_set_focus_layer(seat, layer);
+                        transaction_commit_dirty();
+                }
+                if (state == WLR_BUTTON_PRESSED) {
+                        seatop_begin_down_on_surface(seat, surface, sx, sy);
                 }
                 seat_pointer_notify_button(seat, time_msec, button, state);
                 return;
@@ -381,7 +394,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
                 struct sway_container *cont_to_focus = cont;
                 enum sway_container_layout layout = container_parent_layout(cont);
                 if (layout == L_TABBED || layout == L_STACKED) {
-                        cont_to_focus = seat_get_focus_inactive_view(seat, &cont->parent->node);
+                        cont_to_focus = seat_get_focus_inactive_view(seat, &cont->pending.parent->node);
                 }
 
                 seat_set_focus_container(seat, cont_to_focus);
@@ -397,9 +410,9 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
                         BTN_LEFT : BTN_RIGHT;
                 if (button == btn_resize) {
                         edge = 0;
-                        edge |= cursor->cursor->x > cont->x + cont->width / 2 ?
+                        edge |= cursor->cursor->x > cont->pending.x + cont->pending.width / 2 ?
                                 WLR_EDGE_RIGHT : WLR_EDGE_LEFT;
-                        edge |= cursor->cursor->y > cont->y + cont->height / 2 ?
+                        edge |= cursor->cursor->y > cont->pending.y + cont->pending.height / 2 ?
                                 WLR_EDGE_BOTTOM : WLR_EDGE_TOP;
 
                         const char *image = NULL;
@@ -419,13 +432,31 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
                 }
         }
 
+        // Handle changing focus when clicking on a container
+        if (cont && state == WLR_BUTTON_PRESSED) {
+                // Default case: focus the container that was just clicked.
+                node = &cont->node;
+
+                // If the container is a tab/stacked container and the click happened
+                // on a tab, switch to the tab. If the tab contents were already
+                // focused, focus the tab container itself. If the tab container was
+                // already focused, cycle back to focusing the tab contents.
+                if (on_titlebar) {
+                        struct sway_container *focus = seat_get_focused_container(seat);
+                        if (focus == cont || !container_has_ancestor(focus, cont)) {
+                                node = seat_get_focus_inactive(seat, &cont->node);
+                        }
+                }
+
+                seat_set_focus(seat, node);
+                transaction_commit_dirty();
+        }
+
         // Handle beginning floating move
         if (cont && is_floating_or_child && !is_fullscreen_or_child &&
                         state == WLR_BUTTON_PRESSED) {
                 uint32_t btn_move = config->floating_mod_inverse ? BTN_RIGHT : BTN_LEFT;
                 if (button == btn_move && (mod_pressed || on_titlebar)) {
-                        seat_set_focus_container(seat,
-                                        seat_get_focus_inactive_view(seat, &cont->node));
                         seatop_begin_move_floating(seat, container_toplevel_ancestor(cont));
                         return;
                 }
@@ -436,6 +467,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
                         state == WLR_BUTTON_PRESSED) {
                 // Via border
                 if (button == BTN_LEFT && resize_edge != WLR_EDGE_NONE) {
+                        seat_set_focus_container(seat, cont);
                         seatop_begin_resize_floating(seat, cont, resize_edge);
                         return;
                 }
@@ -446,10 +478,11 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
                 if (mod_pressed && button == btn_resize) {
                         struct sway_container *floater = container_toplevel_ancestor(cont);
                         edge = 0;
-                        edge |= cursor->cursor->x > floater->x + floater->width / 2 ?
+                        edge |= cursor->cursor->x > floater->pending.x + floater->pending.width / 2 ?
                                 WLR_EDGE_RIGHT : WLR_EDGE_LEFT;
-                        edge |= cursor->cursor->y > floater->y + floater->height / 2 ?
+                        edge |= cursor->cursor->y > floater->pending.y + floater->pending.height / 2 ?
                                 WLR_EDGE_BOTTOM : WLR_EDGE_TOP;
+                        seat_set_focus_container(seat, floater);
                         seatop_begin_resize_floating(seat, floater, edge);
                         return;
                 }
@@ -458,52 +491,42 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
         // Handle moving a tiling container
         if (config->tiling_drag && (mod_pressed || on_titlebar) &&
                         state == WLR_BUTTON_PRESSED && !is_floating_or_child &&
-                        cont && cont->fullscreen_mode == FULLSCREEN_NONE) {
-                struct sway_container *focus = seat_get_focused_container(seat);
-                bool focused = focus == cont || container_has_ancestor(focus, cont);
-                if (on_titlebar && !focused) {
-                        node = seat_get_focus_inactive(seat, &cont->node);
-                        seat_set_focus(seat, node);
-                }
-
-                // If moving a container by it's title bar, use a threshold for the drag
+                        cont && cont->pending.fullscreen_mode == FULLSCREEN_NONE) {
+                // If moving a container by its title bar, use a threshold for the drag
                 if (!mod_pressed && config->tiling_drag_threshold > 0) {
                         seatop_begin_move_tiling_threshold(seat, cont);
                 } else {
                         seatop_begin_move_tiling(seat, cont);
                 }
+
                 return;
         }
 
         // Handle mousedown on a container surface
         if (surface && cont && state == WLR_BUTTON_PRESSED) {
-                seat_set_focus_container(seat, cont);
-                seatop_begin_down(seat, cont, time_msec, sx, sy);
+                seatop_begin_down(seat, cont, sx, sy);
                 seat_pointer_notify_button(seat, time_msec, button, WLR_BUTTON_PRESSED);
                 return;
         }
 
         // Handle clicking a container surface or decorations
         if (cont && state == WLR_BUTTON_PRESSED) {
-                node = seat_get_focus_inactive(seat, &cont->node);
-                seat_set_focus(seat, node);
                 seat_pointer_notify_button(seat, time_msec, button, state);
                 return;
         }
 
 #if HAVE_XWAYLAND
         // Handle clicking on xwayland unmanaged view
-        if (surface && wlr_surface_is_xwayland_surface(surface)) {
-                struct wlr_xwayland_surface *xsurface =
-                        wlr_xwayland_surface_from_wlr_surface(surface);
-                if (xsurface->override_redirect &&
-                                wlr_xwayland_or_surface_wants_focus(xsurface)) {
-                        struct wlr_xwayland *xwayland = server.xwayland.wlr_xwayland;
-                        wlr_xwayland_set_seat(xwayland, seat->wlr_seat);
-                        seat_set_focus_surface(seat, xsurface->surface, false);
-                        seat_pointer_notify_button(seat, time_msec, button, state);
-                        return;
-                }
+        struct wlr_xwayland_surface *xsurface;
+        if (surface &&
+                        (xsurface = wlr_xwayland_surface_try_from_wlr_surface(surface)) &&
+                        xsurface->override_redirect &&
+                        wlr_xwayland_or_surface_wants_focus(xsurface)) {
+                struct wlr_xwayland *xwayland = server.xwayland.wlr_xwayland;
+                wlr_xwayland_set_seat(xwayland, seat->wlr_seat);
+                seat_set_focus_surface(seat, xsurface->surface, false);
+                transaction_commit_dirty();
+                seat_pointer_notify_button(seat, time_msec, button, state);
         }
 #endif
 
@@ -526,10 +549,26 @@ static void check_focus_follows_mouse(struct sway_seat *seat,
                 if (wlr_output == NULL) {
                         return;
                 }
+
+                struct wlr_surface *surface = NULL;
+                double sx, sy;
+                node_at_coords(seat, seat->cursor->cursor->x, seat->cursor->cursor->y,
+                                &surface, &sx, &sy);
+
+                // Focus topmost layer surface
+                struct wlr_layer_surface_v1 *layer = NULL;
+                if ((layer = toplevel_layer_surface_from_surface(surface)) &&
+                                layer->current.keyboard_interactive) {
+                        seat_set_focus_layer(seat, layer);
+                        transaction_commit_dirty();
+                        return;
+                }
+
                 struct sway_output *hovered_output = wlr_output->data;
                 if (focus && hovered_output != node_get_output(focus)) {
                         struct sway_workspace *ws = output_get_active_workspace(hovered_output);
                         seat_set_focus(seat, &ws->node);
+                        transaction_commit_dirty();
                 }
                 return;
         }
@@ -541,6 +580,7 @@ static void check_focus_follows_mouse(struct sway_seat *seat,
                 struct sway_output *hovered_output = node_get_output(hovered_node);
                 if (hovered_output != focused_output) {
                         seat_set_focus(seat, seat_get_focus_inactive(seat, hovered_node));
+                        transaction_commit_dirty();
                 }
                 return;
         }
@@ -556,6 +596,7 @@ static void check_focus_follows_mouse(struct sway_seat *seat,
                 if (hovered_node != e->previous_node ||
                                 config->focus_follows_mouse == FOLLOWS_ALWAYS) {
                         seat_set_focus(seat, hovered_node);
+                        transaction_commit_dirty();
                 }
         }
 }
@@ -583,12 +624,7 @@ static void handle_pointer_motion(struct sway_seat *seat, uint32_t time_msec) {
                 wlr_seat_pointer_notify_clear_focus(seat->wlr_seat);
         }
 
-        struct sway_drag_icon *drag_icon;
-        wl_list_for_each(drag_icon, &root->drag_icons, link) {
-                if (drag_icon->seat == seat) {
-                        drag_icon_update_position(drag_icon);
-                }
-        }
+        drag_icons_update_position(seat);
 
         e->previous_node = node;
 }
@@ -618,21 +654,46 @@ static void handle_tablet_tool_motion(struct sway_seat *seat,
                 wlr_tablet_v2_tablet_tool_notify_proximity_out(tool->tablet_v2_tool);
         }
 
-        struct sway_drag_icon *drag_icon;
-        wl_list_for_each(drag_icon, &root->drag_icons, link) {
-                if (drag_icon->seat == seat) {
-                        drag_icon_update_position(drag_icon);
-                }
-        }
+        drag_icons_update_position(seat);
 
         e->previous_node = node;
 }
 
+static void handle_touch_down(struct sway_seat *seat,
+                struct wlr_touch_down_event *event, double lx, double ly) {
+        struct wlr_surface *surface = NULL;
+        struct wlr_seat *wlr_seat = seat->wlr_seat;
+        struct sway_cursor *cursor = seat->cursor;
+        double sx, sy;
+        node_at_coords(seat, seat->touch_x, seat->touch_y, &surface, &sx, &sy);
+
+        if (surface && wlr_surface_accepts_touch(wlr_seat, surface)) {
+                if (seat_is_input_allowed(seat, surface)) {
+                        cursor->simulating_pointer_from_touch = false;
+                        seatop_begin_touch_down(seat, surface, event, sx, sy, lx, ly);
+                }
+        } else if (!cursor->simulating_pointer_from_touch &&
+                        (!surface || seat_is_input_allowed(seat, surface))) {
+                // Fallback to cursor simulation.
+                // The pointer_touch_id state is needed, so drags are not aborted when over
+                // a surface supporting touch and multi touch events don't interfere.
+                cursor->simulating_pointer_from_touch = true;
+                cursor->pointer_touch_id = seat->touch_id;
+                double dx, dy;
+                dx = seat->touch_x - cursor->cursor->x;
+                dy = seat->touch_y - cursor->cursor->y;
+                pointer_motion(cursor, event->time_msec, &event->touch->base, dx, dy,
+                                dx, dy);
+                dispatch_cursor_button(cursor, &event->touch->base, event->time_msec,
+                                BTN_LEFT, WLR_BUTTON_PRESSED);
+        }
+}
+
 /*----------------------------------------\
  * Functions used by handle_pointer_axis  /
  *--------------------------------------*/
 
-static uint32_t wl_axis_to_button(struct wlr_event_pointer_axis *event) {
+static uint32_t wl_axis_to_button(struct wlr_pointer_axis_event *event) {
         switch (event->orientation) {
         case WLR_AXIS_ORIENTATION_VERTICAL:
                 return event->delta < 0 ? SWAY_SCROLL_UP : SWAY_SCROLL_DOWN;
@@ -645,9 +706,9 @@ static uint32_t wl_axis_to_button(struct wlr_event_pointer_axis *event) {
 }
 
 static void handle_pointer_axis(struct sway_seat *seat,
-                struct wlr_event_pointer_axis *event) {
+                struct wlr_pointer_axis_event *event) {
         struct sway_input_device *input_device =
-                event->device ? event->device->data : NULL;
+                event->pointer ? event->pointer->base.data : NULL;
         struct input_config *ic =
                 input_device ? input_device_get_config(input_device) : NULL;
         struct sway_cursor *cursor = seat->cursor;
@@ -664,7 +725,7 @@ static void handle_pointer_axis(struct sway_seat *seat,
         bool on_border = edge != WLR_EDGE_NONE;
         bool on_titlebar = cont && !on_border && !surface;
         bool on_titlebar_border = cont && on_border &&
-                cursor->cursor->y < cont->content_y;
+                cursor->cursor->y < cont->pending.content_y;
         bool on_contents = cont && !on_border && surface;
         bool on_workspace = node && node->type == N_WORKSPACE;
         float scroll_factor =
@@ -693,6 +754,7 @@ static void handle_pointer_axis(struct sway_seat *seat,
 
         // Scrolling on a tabbed or stacked title bar (handled as press event)
         if (!handled && (on_titlebar || on_titlebar_border)) {
+                struct sway_node *new_focus;
                 enum sway_container_layout layout = container_parent_layout(cont);
                 if (layout == L_TABBED || layout == L_STACKED) {
                         struct sway_node *tabcontainer = node_get_parent(node);
@@ -700,7 +762,7 @@ static void handle_pointer_axis(struct sway_seat *seat,
                                 seat_get_active_tiling_child(seat, tabcontainer);
                         list_t *siblings = container_get_siblings(cont);
                         int desired = list_find(siblings, active->sway_container) +
-                                round(scroll_factor * event->delta_discrete);
+                                roundf(scroll_factor * event->delta_discrete / WLR_POINTER_AXIS_DISCRETE_STEP);
                         if (desired < 0) {
                                 desired = 0;
                         } else if (desired >= siblings->length) {
@@ -709,13 +771,16 @@ static void handle_pointer_axis(struct sway_seat *seat,
 
                         struct sway_container *new_sibling_con = siblings->items[desired];
                         struct sway_node *new_sibling = &new_sibling_con->node;
-                        struct sway_node *new_focus =
-                                seat_get_focus_inactive(seat, new_sibling);
                         // Use the focused child of the tabbed/stacked container, not the
                         // container the user scrolled on.
-                        seat_set_focus(seat, new_focus);
-                        handled = true;
+                        new_focus = seat_get_focus_inactive(seat, new_sibling);
+                } else {
+                        new_focus = seat_get_focus_inactive(seat, &cont->node);
                 }
+
+                seat_set_focus(seat, new_focus);
+                transaction_commit_dirty();
+                handled = true;
         }
 
         // Handle mouse bindings - x11 mouse buttons 4-7 - release event
@@ -731,8 +796,307 @@ static void handle_pointer_axis(struct sway_seat *seat,
 
         if (!handled) {
                 wlr_seat_pointer_notify_axis(cursor->seat->wlr_seat, event->time_msec,
-                        event->orientation, scroll_factor * event->delta,
-                        round(scroll_factor * event->delta_discrete), event->source);
+                        event->orientation, scroll_factor * event->delta, 
+                        roundf(scroll_factor * event->delta_discrete), event->source,
+                        event->relative_direction);
+        }
+}
+
+/*------------------------------------\
+ * Functions used by gesture support  /
+ *----------------------------------*/
+
+/**
+ * Check gesture binding for a specific gesture type and finger count.
+ * Returns true if binding is present, false otherwise
+ */
+static bool gesture_binding_check(list_t *bindings, enum gesture_type type,
+                uint8_t fingers, struct sway_input_device *device) {
+        char *input =
+                device ? input_device_get_identifier(device->wlr_device) : strdup("*");
+
+        for (int i = 0; i < bindings->length; ++i) {
+                struct sway_gesture_binding *binding = bindings->items[i];
+
+                // Check type and finger count
+                if (!gesture_check(&binding->gesture, type, fingers)) {
+                        continue;
+                }
+
+                // Check that input matches
+                if (strcmp(binding->input, "*") != 0 &&
+                        strcmp(binding->input, input) != 0) {
+                        continue;
+                }
+
+                free(input);
+
+                return true;
+        }
+
+        free(input);
+
+        return false;
+}
+
+/**
+ * Return the gesture binding which matches gesture type, finger count
+ * and direction, otherwise return null.
+ */
+static struct sway_gesture_binding* gesture_binding_match(
+                list_t *bindings, struct gesture *gesture, const char *input) {
+        struct sway_gesture_binding *current = NULL;
+
+        // Find best matching binding
+        for (int i = 0; i < bindings->length; ++i) {
+                struct sway_gesture_binding *binding = bindings->items[i];
+                bool exact = binding->flags & BINDING_EXACT;
+
+                // Check gesture matching
+                if (!gesture_match(&binding->gesture, gesture, exact)) {
+                        continue;
+                }
+
+                // Check input matching
+                if (strcmp(binding->input, "*") != 0 &&
+                                strcmp(binding->input, input) != 0) {
+                        continue;
+                }
+
+                // If we already have a match ...
+                if (current) {
+                        // ... check if input matching is equivalent
+                        if (strcmp(current->input, binding->input) == 0) {
+
+                                // ... - do not override an exact binding
+                                if (!exact && current->flags & BINDING_EXACT) {
+                                        continue;
+                                }
+
+                                // ... - and ensure direction matching is better or equal
+                                if (gesture_compare(&current->gesture, &binding->gesture) > 0) {
+                                        continue;
+                                }
+                        } else if (strcmp(binding->input, "*") == 0) {
+                                // ... do not accept worse input match
+                                continue;
+                        }
+                }
+
+                // Accept newer or better match
+                current = binding;
+
+                // If exact binding and input is found, quit search
+                if (strcmp(current->input, input) == 0 &&
+                                gesture_compare(&current->gesture, gesture) == 0) {
+                        break;
+                }
+        } // for all gesture bindings
+
+        return current;
+}
+
+// Wrapper around gesture_tracker_end to use tracker with sway bindings
+static struct sway_gesture_binding* gesture_tracker_end_and_match(
+                struct gesture_tracker *tracker, struct sway_input_device* device) {
+        // Determine name of input that received gesture
+        char *input = device
+                ? input_device_get_identifier(device->wlr_device)
+                : strdup("*");
+
+        // Match tracking result to binding
+        struct gesture *gesture = gesture_tracker_end(tracker);
+        struct sway_gesture_binding *binding = gesture_binding_match(
+                        config->current_mode->gesture_bindings, gesture, input);
+        free(gesture);
+        free(input);
+
+        return binding;
+}
+
+// Small wrapper around seat_execute_command to work on gesture bindings
+static void gesture_binding_execute(struct sway_seat *seat,
+                struct sway_gesture_binding *binding) {
+        struct sway_binding *dummy_binding =
+                calloc(1, sizeof(struct sway_binding));
+        dummy_binding->type = BINDING_GESTURE;
+        dummy_binding->command = binding->command;
+
+        char *description = gesture_to_string(&binding->gesture);
+        sway_log(SWAY_DEBUG, "executing gesture binding: %s", description);
+        free(description);
+
+        seat_execute_command(seat, dummy_binding);
+
+        free(dummy_binding);
+}
+
+static void handle_hold_begin(struct sway_seat *seat,
+                struct wlr_pointer_hold_begin_event *event) {
+        // Start tracking gesture if there is a matching binding ...
+        struct sway_input_device *device =
+                event->pointer ? event->pointer->base.data : NULL;
+        list_t *bindings = config->current_mode->gesture_bindings;
+        if (gesture_binding_check(bindings, GESTURE_TYPE_HOLD, event->fingers, device)) {
+                struct seatop_default_event *seatop = seat->seatop_data;
+                gesture_tracker_begin(&seatop->gestures, GESTURE_TYPE_HOLD, event->fingers);
+        } else {
+                // ... otherwise forward to client
+                struct sway_cursor *cursor = seat->cursor;
+                wlr_pointer_gestures_v1_send_hold_begin(
+                        server.input->pointer_gestures, cursor->seat->wlr_seat,
+                        event->time_msec, event->fingers);
+        }
+}
+
+static void handle_hold_end(struct sway_seat *seat,
+                struct wlr_pointer_hold_end_event *event) {
+        // Ensure that gesture is being tracked and was not cancelled
+        struct seatop_default_event *seatop = seat->seatop_data;
+        if (!gesture_tracker_check(&seatop->gestures, GESTURE_TYPE_HOLD)) {
+                struct sway_cursor *cursor = seat->cursor;
+                wlr_pointer_gestures_v1_send_hold_end(
+                        server.input->pointer_gestures, cursor->seat->wlr_seat,
+                        event->time_msec, event->cancelled);
+                return;
+        }
+        if (event->cancelled) {
+                gesture_tracker_cancel(&seatop->gestures);
+                return;
+        }
+
+        // End gesture tracking and execute matched binding
+        struct sway_input_device *device =
+                event->pointer ? event->pointer->base.data : NULL;
+        struct sway_gesture_binding *binding = gesture_tracker_end_and_match(
+                &seatop->gestures, device);
+
+        if (binding) {
+                gesture_binding_execute(seat, binding);
+        }
+}
+
+static void handle_pinch_begin(struct sway_seat *seat,
+                struct wlr_pointer_pinch_begin_event *event) {
+        // Start tracking gesture if there is a matching binding ...
+        struct sway_input_device *device =
+                event->pointer ? event->pointer->base.data : NULL;
+        list_t *bindings = config->current_mode->gesture_bindings;
+        if (gesture_binding_check(bindings, GESTURE_TYPE_PINCH, event->fingers, device)) {
+                struct seatop_default_event *seatop = seat->seatop_data;
+                gesture_tracker_begin(&seatop->gestures, GESTURE_TYPE_PINCH, event->fingers);
+        } else {
+                // ... otherwise forward to client
+                struct sway_cursor *cursor = seat->cursor;
+                wlr_pointer_gestures_v1_send_pinch_begin(
+                        server.input->pointer_gestures, cursor->seat->wlr_seat,
+                        event->time_msec, event->fingers);
+        }
+}
+
+static void handle_pinch_update(struct sway_seat *seat,
+                struct wlr_pointer_pinch_update_event *event) {
+        // Update any ongoing tracking ...
+        struct seatop_default_event *seatop = seat->seatop_data;
+        if (gesture_tracker_check(&seatop->gestures, GESTURE_TYPE_PINCH)) {
+                gesture_tracker_update(&seatop->gestures, event->dx, event->dy,
+                        event->scale, event->rotation);
+        } else {
+                // ... otherwise forward to client
+                struct sway_cursor *cursor = seat->cursor;
+                wlr_pointer_gestures_v1_send_pinch_update(
+                        server.input->pointer_gestures,
+                        cursor->seat->wlr_seat,
+                        event->time_msec, event->dx, event->dy,
+                        event->scale, event->rotation);
+        }
+}
+
+static void handle_pinch_end(struct sway_seat *seat,
+                struct wlr_pointer_pinch_end_event *event) {
+        // Ensure that gesture is being tracked and was not cancelled
+        struct seatop_default_event *seatop = seat->seatop_data;
+        if (!gesture_tracker_check(&seatop->gestures, GESTURE_TYPE_PINCH)) {
+                struct sway_cursor *cursor = seat->cursor;
+                wlr_pointer_gestures_v1_send_pinch_end(
+                        server.input->pointer_gestures, cursor->seat->wlr_seat,
+                        event->time_msec, event->cancelled);
+                return;
+        }
+        if (event->cancelled) {
+                gesture_tracker_cancel(&seatop->gestures);
+                return;
+        }
+
+        // End gesture tracking and execute matched binding
+        struct sway_input_device *device =
+                event->pointer ? event->pointer->base.data : NULL;
+        struct sway_gesture_binding *binding = gesture_tracker_end_and_match(
+                &seatop->gestures, device);
+
+        if (binding) {
+                gesture_binding_execute(seat, binding);
+        }
+}
+
+static void handle_swipe_begin(struct sway_seat *seat,
+                struct wlr_pointer_swipe_begin_event *event) {
+        // Start tracking gesture if there is a matching binding ...
+        struct sway_input_device *device =
+                event->pointer ? event->pointer->base.data : NULL;
+        list_t *bindings = config->current_mode->gesture_bindings;
+        if (gesture_binding_check(bindings, GESTURE_TYPE_SWIPE, event->fingers, device)) {
+                struct seatop_default_event *seatop = seat->seatop_data;
+                gesture_tracker_begin(&seatop->gestures, GESTURE_TYPE_SWIPE, event->fingers);
+        } else {
+                // ... otherwise forward to client
+                struct sway_cursor *cursor = seat->cursor;
+                wlr_pointer_gestures_v1_send_swipe_begin(
+                        server.input->pointer_gestures, cursor->seat->wlr_seat,
+                        event->time_msec, event->fingers);
+        }
+}
+
+static void handle_swipe_update(struct sway_seat *seat,
+                struct wlr_pointer_swipe_update_event *event) {
+
+        // Update any ongoing tracking ...
+        struct seatop_default_event *seatop = seat->seatop_data;
+        if (gesture_tracker_check(&seatop->gestures, GESTURE_TYPE_SWIPE)) {
+                gesture_tracker_update(&seatop->gestures,
+                        event->dx, event->dy, NAN, NAN);
+        } else {
+                // ... otherwise forward to client
+                struct sway_cursor *cursor = seat->cursor;
+                wlr_pointer_gestures_v1_send_swipe_update(
+                        server.input->pointer_gestures, cursor->seat->wlr_seat,
+                        event->time_msec, event->dx, event->dy);
+        }
+}
+
+static void handle_swipe_end(struct sway_seat *seat,
+                struct wlr_pointer_swipe_end_event *event) {
+        // Ensure gesture is being tracked and was not cancelled
+        struct seatop_default_event *seatop = seat->seatop_data;
+        if (!gesture_tracker_check(&seatop->gestures, GESTURE_TYPE_SWIPE)) {
+                struct sway_cursor *cursor = seat->cursor;
+                wlr_pointer_gestures_v1_send_swipe_end(server.input->pointer_gestures,
+                        cursor->seat->wlr_seat, event->time_msec, event->cancelled);
+                return;
+        }
+        if (event->cancelled) {
+                gesture_tracker_cancel(&seatop->gestures);
+                return;
+        }
+
+        // End gesture tracking and execute matched binding
+        struct sway_input_device *device =
+                event->pointer ? event->pointer->base.data : NULL;
+        struct sway_gesture_binding *binding = gesture_tracker_end_and_match(
+                &seatop->gestures, device);
+
+        if (binding) {
+                gesture_binding_execute(seat, binding);
         }
 }
 
@@ -765,6 +1129,15 @@ static const struct sway_seatop_impl seatop_impl = {
         .pointer_axis = handle_pointer_axis,
         .tablet_tool_tip = handle_tablet_tool_tip,
         .tablet_tool_motion = handle_tablet_tool_motion,
+        .hold_begin = handle_hold_begin,
+        .hold_end = handle_hold_end,
+        .pinch_begin = handle_pinch_begin,
+        .pinch_update = handle_pinch_update,
+        .pinch_end = handle_pinch_end,
+        .swipe_begin = handle_swipe_begin,
+        .swipe_update = handle_swipe_update,
+        .swipe_end = handle_swipe_end,
+        .touch_down = handle_touch_down,
         .rebase = handle_rebase,
         .allow_set_cursor = true,
 };
@@ -775,8 +1148,8 @@ void seatop_begin_default(struct sway_seat *seat) {
         struct seatop_default_event *e =
                 calloc(1, sizeof(struct seatop_default_event));
         sway_assert(e, "Unable to allocate seatop_default_event");
+
         seat->seatop_impl = &seatop_impl;
         seat->seatop_data = e;
-
         seatop_rebase(seat, 0);
 }
diff --git a/sway/input/seatop_down.c b/sway/input/seatop_down.c
index 17f619e3..b4421fe6 100644
--- a/sway/input/seatop_down.c
+++ b/sway/input/seatop_down.c
@@ -2,21 +2,134 @@
 #include <float.h>
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_tablet_v2.h>
+#include <wlr/types/wlr_touch.h>
 #include "sway/input/cursor.h"
 #include "sway/input/seat.h"
 #include "sway/tree/view.h"
+#include "sway/desktop/transaction.h"
 #include "log.h"
 
+struct seatop_touch_point_event {
+        double ref_lx, ref_ly;         // touch's x/y at start of op
+        double ref_con_lx, ref_con_ly; // container's x/y at start of op
+        int32_t touch_id;
+        struct wl_list link;
+};
+
 struct seatop_down_event {
         struct sway_container *con;
+        struct sway_seat *seat;
+        struct wl_listener surface_destroy;
+        struct wlr_surface *surface;
         double ref_lx, ref_ly;         // cursor's x/y at start of op
         double ref_con_lx, ref_con_ly; // container's x/y at start of op
+        struct wl_list point_events;   // seatop_touch_point_event::link
 };
 
+static void handle_touch_motion(struct sway_seat *seat,
+                struct wlr_touch_motion_event *event, double lx, double ly) {
+        struct seatop_down_event *e = seat->seatop_data;
+
+        struct seatop_touch_point_event *point_event;
+        bool found = false;
+        wl_list_for_each(point_event, &e->point_events, link) {
+                if (point_event->touch_id == event->touch_id) {
+                        found = true;
+                        break;
+                }
+        }
+        if (!found) {
+                return; // Probably not a point_event from this seatop_down
+        }
+
+        double moved_x = lx - point_event->ref_lx;
+        double moved_y = ly - point_event->ref_ly;
+        double sx = point_event->ref_con_lx + moved_x;
+        double sy = point_event->ref_con_ly + moved_y;
+
+        wlr_seat_touch_notify_motion(seat->wlr_seat, event->time_msec,
+                event->touch_id, sx, sy);
+}
+
+static void handle_touch_up(struct sway_seat *seat,
+                struct wlr_touch_up_event *event) {
+        struct seatop_down_event *e = seat->seatop_data;
+        struct seatop_touch_point_event *point_event, *tmp;
+
+        wl_list_for_each_safe(point_event, tmp, &e->point_events, link) {
+                if (point_event->touch_id == event->touch_id) {
+                        wl_list_remove(&point_event->link);
+                        free(point_event);
+                        break;
+                }
+        }
+
+        wlr_seat_touch_notify_up(seat->wlr_seat, event->time_msec, event->touch_id);
+
+        if (wl_list_empty(&e->point_events)) {
+                seatop_begin_default(seat);
+        }
+}
+
+static void handle_touch_down(struct sway_seat *seat,
+                struct wlr_touch_down_event *event, double lx, double ly) {
+        struct seatop_down_event *e = seat->seatop_data;
+        double sx, sy;
+        struct wlr_surface *surface = NULL;
+        struct sway_node *focused_node = node_at_coords(seat, seat->touch_x,
+                seat->touch_y, &surface, &sx, &sy);
+
+        if (!surface || surface != e->surface) { // Must start from the initial surface
+                return;
+        }
+
+        struct seatop_touch_point_event *point_event =
+                calloc(1, sizeof(struct seatop_touch_point_event));
+        if (!sway_assert(point_event, "Unable to allocate point_event")) {
+                return;
+        }
+        point_event->touch_id = event->touch_id;
+        point_event->ref_lx = lx;
+        point_event->ref_ly = ly;
+        point_event->ref_con_lx = sx;
+        point_event->ref_con_ly = sy;
+
+        wl_list_insert(&e->point_events, &point_event->link);
+
+        wlr_seat_touch_notify_down(seat->wlr_seat, surface, event->time_msec,
+                        event->touch_id, sx, sy);
+
+        if (focused_node) {
+            seat_set_focus(seat, focused_node);
+        }
+}
+
+static void handle_touch_cancel(struct sway_seat *seat,
+                struct wlr_touch_cancel_event *event) {
+        struct seatop_down_event *e = seat->seatop_data;
+        struct seatop_touch_point_event *point_event, *tmp;
+
+        wl_list_for_each_safe(point_event, tmp, &e->point_events, link) {
+                if (point_event->touch_id == event->touch_id) {
+                        wl_list_remove(&point_event->link);
+                        free(point_event);
+                        break;
+                }
+        }
+
+        if (e->surface) {
+                wlr_seat_touch_notify_cancel(seat->wlr_seat, e->surface);
+        }
+
+        if (wl_list_empty(&e->point_events)) {
+                seatop_begin_default(seat);
+        }
+}
+
 static void handle_pointer_axis(struct sway_seat *seat,
-                struct wlr_event_pointer_axis *event) {
+                struct wlr_pointer_axis_event *event) {
         struct sway_input_device *input_device =
-                event->device ? event->device->data : NULL;
+                event->pointer ? event->pointer->base.data : NULL;
         struct input_config *ic =
                 input_device ? input_device_get_config(input_device) : NULL;
         float scroll_factor =
@@ -24,7 +137,8 @@ static void handle_pointer_axis(struct sway_seat *seat,
 
         wlr_seat_pointer_notify_axis(seat->wlr_seat, event->time_msec,
                 event->orientation, scroll_factor * event->delta,
-                round(scroll_factor * event->delta_discrete), event->source);
+                roundf(scroll_factor * event->delta_discrete), event->source,
+                event->relative_direction);
 }
 
 static void handle_button(struct sway_seat *seat, uint32_t time_msec,
@@ -39,8 +153,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
 
 static void handle_pointer_motion(struct sway_seat *seat, uint32_t time_msec) {
         struct seatop_down_event *e = seat->seatop_data;
-        struct sway_container *con = e->con;
-        if (seat_is_input_allowed(seat, con->view->surface)) {
+        if (seat_is_input_allowed(seat, e->surface)) {
                 double moved_x = seat->cursor->cursor->x - e->ref_lx;
                 double moved_y = seat->cursor->cursor->y - e->ref_ly;
                 double sx = e->ref_con_lx + moved_x;
@@ -61,8 +174,7 @@ static void handle_tablet_tool_tip(struct sway_seat *seat,
 static void handle_tablet_tool_motion(struct sway_seat *seat,
                 struct sway_tablet_tool *tool, uint32_t time_msec) {
         struct seatop_down_event *e = seat->seatop_data;
-        struct sway_container *con = e->con;
-        if (seat_is_input_allowed(seat, con->view->surface)) {
+        if (seat_is_input_allowed(seat, e->surface)) {
                 double moved_x = seat->cursor->cursor->x - e->ref_lx;
                 double moved_y = seat->cursor->cursor->y - e->ref_ly;
                 double sx = e->ref_con_lx + moved_x;
@@ -71,6 +183,14 @@ static void handle_tablet_tool_motion(struct sway_seat *seat,
         }
 }
 
+static void handle_destroy(struct wl_listener *listener, void *data) {
+        struct seatop_down_event *e =
+                wl_container_of(listener, e, surface_destroy);
+        if (e) {
+                seatop_begin_default(e->seat);
+        }
+}
+
 static void handle_unref(struct sway_seat *seat, struct sway_container *con) {
         struct seatop_down_event *e = seat->seatop_data;
         if (e->con == con) {
@@ -78,33 +198,63 @@ static void handle_unref(struct sway_seat *seat, struct sway_container *con) {
         }
 }
 
+static void handle_end(struct sway_seat *seat) {
+        struct seatop_down_event *e = seat->seatop_data;
+        wl_list_remove(&e->surface_destroy.link);
+}
+
 static const struct sway_seatop_impl seatop_impl = {
         .button = handle_button,
         .pointer_motion = handle_pointer_motion,
         .pointer_axis = handle_pointer_axis,
         .tablet_tool_tip = handle_tablet_tool_tip,
         .tablet_tool_motion = handle_tablet_tool_motion,
+        .touch_motion = handle_touch_motion,
+        .touch_up = handle_touch_up,
+        .touch_down = handle_touch_down,
+        .touch_cancel = handle_touch_cancel,
         .unref = handle_unref,
+        .end = handle_end,
         .allow_set_cursor = true,
 };
 
 void seatop_begin_down(struct sway_seat *seat, struct sway_container *con,
-                uint32_t time_msec, int sx, int sy) {
+                double sx, double sy) {
+        seatop_begin_down_on_surface(seat, con->view->surface, sx, sy);
+        struct seatop_down_event *e = seat->seatop_data;
+        e->con = con;
+
+        container_raise_floating(con);
+        transaction_commit_dirty();
+}
+
+void seatop_begin_touch_down(struct sway_seat *seat,
+                struct wlr_surface *surface, struct wlr_touch_down_event *event,
+                double sx, double sy, double lx, double ly) {
+        seatop_begin_down_on_surface(seat, surface, sx, sy);
+        handle_touch_down(seat, event, lx, ly);
+}
+
+void seatop_begin_down_on_surface(struct sway_seat *seat,
+                struct wlr_surface *surface, double sx, double sy) {
         seatop_end(seat);
 
         struct seatop_down_event *e =
                 calloc(1, sizeof(struct seatop_down_event));
-        if (!e) {
+        if (!sway_assert(e, "Unable to allocate e")) {
                 return;
         }
-        e->con = con;
+        e->con = NULL;
+        e->seat = seat;
+        e->surface = surface;
+        wl_signal_add(&e->surface->events.destroy, &e->surface_destroy);
+        e->surface_destroy.notify = handle_destroy;
         e->ref_lx = seat->cursor->cursor->x;
         e->ref_ly = seat->cursor->cursor->y;
         e->ref_con_lx = sx;
         e->ref_con_ly = sy;
+        wl_list_init(&e->point_events);
 
         seat->seatop_impl = &seatop_impl;
         seat->seatop_data = e;
-
-        container_raise_floating(con);
 }
diff --git a/sway/input/seatop_move_floating.c b/sway/input/seatop_move_floating.c
index 7f501fc9..21d048ce 100644
--- a/sway/input/seatop_move_floating.c
+++ b/sway/input/seatop_move_floating.c
@@ -1,6 +1,6 @@
 #define _POSIX_C_SOURCE 200809L
 #include <wlr/types/wlr_cursor.h>
-#include "sway/desktop.h"
+#include "sway/desktop/transaction.h"
 #include "sway/input/cursor.h"
 #include "sway/input/seat.h"
 
@@ -14,7 +14,8 @@ static void finalize_move(struct sway_seat *seat) {
 
         // We "move" the container to its own location
         // so it discovers its output again.
-        container_floating_move_to(e->con, e->con->x, e->con->y);
+        container_floating_move_to(e->con, e->con->pending.x, e->con->pending.y);
+        transaction_commit_dirty();
 
         seatop_begin_default(seat);
 }
@@ -37,9 +38,8 @@ static void handle_tablet_tool_tip(struct sway_seat *seat,
 static void handle_pointer_motion(struct sway_seat *seat, uint32_t time_msec) {
         struct seatop_move_floating_event *e = seat->seatop_data;
         struct wlr_cursor *cursor = seat->cursor->cursor;
-        desktop_damage_whole_container(e->con);
         container_floating_move_to(e->con, cursor->x - e->dx, cursor->y - e->dy);
-        desktop_damage_whole_container(e->con);
+        transaction_commit_dirty();
 }
 
 static void handle_unref(struct sway_seat *seat, struct sway_container *con) {
@@ -67,13 +67,14 @@ void seatop_begin_move_floating(struct sway_seat *seat,
                 return;
         }
         e->con = con;
-        e->dx = cursor->cursor->x - con->x;
-        e->dy = cursor->cursor->y - con->y;
+        e->dx = cursor->cursor->x - con->pending.x;
+        e->dy = cursor->cursor->y - con->pending.y;
 
         seat->seatop_impl = &seatop_impl;
         seat->seatop_data = e;
 
         container_raise_floating(con);
+        transaction_commit_dirty();
 
         cursor_set_image(cursor, "grab", NULL);
         wlr_seat_pointer_notify_clear_focus(seat->wlr_seat);
diff --git a/sway/input/seatop_move_tiling.c b/sway/input/seatop_move_tiling.c
index 704e7270..7de39ff6 100644
--- a/sway/input/seatop_move_tiling.c
+++ b/sway/input/seatop_move_tiling.c
@@ -2,7 +2,7 @@
 #include <limits.h>
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/util/edges.h>
-#include "sway/desktop.h"
+#include "sway/desktop/transaction.h"
 #include "sway/input/cursor.h"
 #include "sway/input/seat.h"
 #include "sway/ipc-server.h"
@@ -15,31 +15,25 @@
 // Thickness of the dropzone when dragging to the edge of a layout container
 #define DROP_LAYOUT_BORDER 30
 
+// Thickness of indicator when dropping onto a titlebar.  This should be a
+// multiple of 2.
+#define DROP_SPLIT_INDICATOR 10
+
 struct seatop_move_tiling_event {
         struct sway_container *con;
         struct sway_node *target_node;
         enum wlr_edges target_edge;
-        struct wlr_box drop_box;
         double ref_lx, ref_ly; // cursor's x/y at start of op
         bool threshold_reached;
+        bool split_target;
+        bool insert_after_target;
+        struct wlr_scene_rect *indicator_rect;
 };
 
-static void handle_render(struct sway_seat *seat,
-                struct sway_output *output, pixman_region32_t *damage) {
+static void handle_end(struct sway_seat *seat) {
         struct seatop_move_tiling_event *e = seat->seatop_data;
-        if (!e->threshold_reached) {
-                return;
-        }
-        if (e->target_node && node_get_output(e->target_node) == output) {
-                float color[4];
-                memcpy(&color, config->border_colors.focused.indicator,
-                                sizeof(float) * 4);
-                premultiply_alpha(color, 0.5);
-                struct wlr_box box;
-                memcpy(&box, &e->drop_box, sizeof(struct wlr_box));
-                scale_box(&box, output->wlr_output->scale);
-                render_rect(output, damage, &box, color);
-        }
+        wlr_scene_node_destroy(&e->indicator_rect->node);
+        e->indicator_rect = NULL;
 }
 
 static void handle_motion_prethreshold(struct sway_seat *seat) {
@@ -60,6 +54,7 @@ static void handle_motion_prethreshold(struct sway_seat *seat) {
 
         // If the threshold has been exceeded, start the actual drag
         if ((cx - sx) * (cx - sx) + (cy - sy) * (cy - sy) > threshold) {
+                wlr_scene_node_set_enabled(&e->indicator_rect->node, true);
                 e->threshold_reached = true;
                 cursor_set_image(seat->cursor, "grab", NULL);
         }
@@ -91,15 +86,86 @@ static void resize_box(struct wlr_box *box, enum wlr_edges edge,
         }
 }
 
+static void split_border(double pos, int offset, int len, int n_children,
+                int avoid, int *out_pos, bool *out_after) {
+        int region = 2 * n_children * (pos - offset) / len;
+        // If the cursor is over the right side of a left-adjacent titlebar, or the
+        // left side of a right-adjacent titlebar, it's position when dropped will
+        // be the same.  To avoid this, shift the region for adjacent containers.
+        if (avoid >= 0) {
+                if (region == 2 * avoid - 1 || region == 2 * avoid) {
+                        region--;
+                } else if (region == 2 * avoid + 1 || region == 2 * avoid + 2) {
+                        region++;
+                }
+        }
+
+        int child_index = (region + 1) / 2;
+        *out_after = region % 2;
+        // When dropping at the beginning or end of a container, show the drop
+        // region within the container boundary, otherwise show it on top of the
+        // border between two titlebars.
+        if (child_index == 0) {
+                *out_pos = offset;
+        } else if (child_index == n_children) {
+                *out_pos = offset + len - DROP_SPLIT_INDICATOR;
+        } else {
+                *out_pos = offset + child_index * len / n_children -
+                        DROP_SPLIT_INDICATOR / 2;
+        }
+}
+
+static bool split_titlebar(struct sway_node *node, struct sway_container *avoid,
+                struct wlr_cursor *cursor, struct wlr_box *title_box, bool *after) {
+        struct sway_container *con = node->sway_container;
+        struct sway_node *parent = &con->pending.parent->node;
+        int title_height = container_titlebar_height();
+        struct wlr_box box;
+        int n_children, avoid_index;
+        enum sway_container_layout layout =
+                parent ? node_get_layout(parent) : L_NONE;
+        if (layout == L_TABBED || layout == L_STACKED) {
+                node_get_box(parent, &box);
+                n_children = node_get_children(parent)->length;
+                avoid_index = list_find(node_get_children(parent), avoid);
+        } else {
+                node_get_box(node, &box);
+                n_children = 1;
+                avoid_index = -1;
+        }
+        if (layout == L_STACKED && cursor->y < box.y + title_height * n_children) {
+                // Drop into stacked titlebars.
+                title_box->width = box.width;
+                title_box->height = DROP_SPLIT_INDICATOR;
+                title_box->x = box.x;
+                split_border(cursor->y, box.y, title_height * n_children,
+                        n_children, avoid_index, &title_box->y, after);
+                return true;
+        } else if (layout != L_STACKED && cursor->y < box.y + title_height) {
+                // Drop into side-by-side titlebars.
+                title_box->width = DROP_SPLIT_INDICATOR;
+                title_box->height = title_height;
+                title_box->y = box.y;
+                split_border(cursor->x, box.x, box.width, n_children,
+                        avoid_index, &title_box->x, after);
+                return true;
+        }
+        return false;
+}
+
+static void update_indicator(struct seatop_move_tiling_event *e, struct wlr_box *box) {
+        wlr_scene_node_set_position(&e->indicator_rect->node, box->x, box->y);
+        wlr_scene_rect_set_size(e->indicator_rect, box->width, box->height);
+}
+
 static void handle_motion_postthreshold(struct sway_seat *seat) {
         struct seatop_move_tiling_event *e = seat->seatop_data;
+        e->split_target = false;
         struct wlr_surface *surface = NULL;
         double sx, sy;
         struct sway_cursor *cursor = seat->cursor;
         struct sway_node *node = node_at_coords(seat,
                         cursor->cursor->x, cursor->cursor->y, &surface, &sx, &sy);
-        // Damage the old location
-        desktop_damage_box(&e->drop_box);
 
         if (!node) {
                 // Eg. hovered over a layer surface such as swaybar
@@ -112,41 +178,77 @@ static void handle_motion_postthreshold(struct sway_seat *seat) {
                 // Empty workspace
                 e->target_node = node;
                 e->target_edge = WLR_EDGE_NONE;
-                workspace_get_box(node->sway_workspace, &e->drop_box);
-                desktop_damage_box(&e->drop_box);
+
+                struct wlr_box drop_box;
+                workspace_get_box(node->sway_workspace, &drop_box);
+                update_indicator(e, &drop_box);
                 return;
         }
 
         // Deny moving within own workspace if this is the only child
         struct sway_container *con = node->sway_container;
-        if (workspace_num_tiling_views(e->con->workspace) == 1 &&
-                        con->workspace == e->con->workspace) {
+        if (workspace_num_tiling_views(e->con->pending.workspace) == 1 &&
+                        con->pending.workspace == e->con->pending.workspace) {
                 e->target_node = NULL;
                 e->target_edge = WLR_EDGE_NONE;
                 return;
         }
 
+        struct wlr_box drop_box = {
+                .x = con->pending.content_x,
+                .y = con->pending.content_y,
+                .width = con->pending.content_width,
+                .height = con->pending.content_height,
+        };
+
+        // Check if the cursor is over a tilebar only if the destination
+        // container is not a descendant of the source container.
+        if (!surface && !container_has_ancestor(con, e->con) &&
+                        split_titlebar(node, e->con, cursor->cursor,
+                                &drop_box, &e->insert_after_target)) {
+                // Don't allow dropping over the source container's titlebar
+                // to give users a chance to cancel a drag operation.
+                if (con == e->con) {
+                        e->target_node = NULL;
+                } else {
+                        e->target_node = node;
+                        e->split_target = true;
+                }
+                e->target_edge = WLR_EDGE_NONE;
+                update_indicator(e, &drop_box);
+                return;
+        }
+
         // Traverse the ancestors, trying to find a layout container perpendicular
         // to the edge. Eg. close to the top or bottom of a horiz layout.
+        int thresh_top = con->pending.content_y + DROP_LAYOUT_BORDER;
+        int thresh_bottom = con->pending.content_y +
+                con->pending.content_height - DROP_LAYOUT_BORDER;
+        int thresh_left = con->pending.content_x + DROP_LAYOUT_BORDER;
+        int thresh_right = con->pending.content_x +
+                con->pending.content_width - DROP_LAYOUT_BORDER;
         while (con) {
                 enum wlr_edges edge = WLR_EDGE_NONE;
                 enum sway_container_layout layout = container_parent_layout(con);
-                struct wlr_box parent;
-                con->parent ? container_get_box(con->parent, &parent) :
-                        workspace_get_box(con->workspace, &parent);
+                struct wlr_box box;
+                node_get_box(node_get_parent(&con->node), &box);
                 if (layout == L_HORIZ || layout == L_TABBED) {
-                        if (cursor->cursor->y < parent.y + DROP_LAYOUT_BORDER) {
+                        if (cursor->cursor->y < thresh_top) {
                                 edge = WLR_EDGE_TOP;
-                        } else if (cursor->cursor->y > parent.y + parent.height
-                                        - DROP_LAYOUT_BORDER) {
+                                box.height = thresh_top - box.y;
+                        } else if (cursor->cursor->y > thresh_bottom) {
                                 edge = WLR_EDGE_BOTTOM;
+                                box.height = box.y + box.height - thresh_bottom;
+                                box.y = thresh_bottom;
                         }
                 } else if (layout == L_VERT || layout == L_STACKED) {
-                        if (cursor->cursor->x < parent.x + DROP_LAYOUT_BORDER) {
+                        if (cursor->cursor->x < thresh_left) {
                                 edge = WLR_EDGE_LEFT;
-                        } else if (cursor->cursor->x > parent.x + parent.width
-                                        - DROP_LAYOUT_BORDER) {
+                                box.width = thresh_left - box.x;
+                        } else if (cursor->cursor->x > thresh_right) {
                                 edge = WLR_EDGE_RIGHT;
+                                box.width = box.x + box.width - thresh_right;
+                                box.x = thresh_right;
                         }
                 }
                 if (edge) {
@@ -155,12 +257,10 @@ static void handle_motion_postthreshold(struct sway_seat *seat) {
                                 e->target_node = node_get_parent(e->target_node);
                         }
                         e->target_edge = edge;
-                        node_get_box(e->target_node, &e->drop_box);
-                        resize_box(&e->drop_box, edge, DROP_LAYOUT_BORDER);
-                        desktop_damage_box(&e->drop_box);
+                        update_indicator(e, &box);
                         return;
                 }
-                con = con->parent;
+                con = con->pending.parent;
         }
 
         // Use the hovered view - but we must be over the actual surface
@@ -173,23 +273,23 @@ static void handle_motion_postthreshold(struct sway_seat *seat) {
         }
 
         // Find the closest edge
-        size_t thickness = fmin(con->content_width, con->content_height) * 0.3;
+        size_t thickness = fmin(con->pending.content_width, con->pending.content_height) * 0.3;
         size_t closest_dist = INT_MAX;
         size_t dist;
         e->target_edge = WLR_EDGE_NONE;
-        if ((dist = cursor->cursor->y - con->y) < closest_dist) {
+        if ((dist = cursor->cursor->y - con->pending.y) < closest_dist) {
                 closest_dist = dist;
                 e->target_edge = WLR_EDGE_TOP;
         }
-        if ((dist = cursor->cursor->x - con->x) < closest_dist) {
+        if ((dist = cursor->cursor->x - con->pending.x) < closest_dist) {
                 closest_dist = dist;
                 e->target_edge = WLR_EDGE_LEFT;
         }
-        if ((dist = con->x + con->width - cursor->cursor->x) < closest_dist) {
+        if ((dist = con->pending.x + con->pending.width - cursor->cursor->x) < closest_dist) {
                 closest_dist = dist;
                 e->target_edge = WLR_EDGE_RIGHT;
         }
-        if ((dist = con->y + con->height - cursor->cursor->y) < closest_dist) {
+        if ((dist = con->pending.y + con->pending.height - cursor->cursor->y) < closest_dist) {
                 closest_dist = dist;
                 e->target_edge = WLR_EDGE_BOTTOM;
         }
@@ -199,12 +299,8 @@ static void handle_motion_postthreshold(struct sway_seat *seat) {
         }
 
         e->target_node = node;
-        e->drop_box.x = con->content_x;
-        e->drop_box.y = con->content_y;
-        e->drop_box.width = con->content_width;
-        e->drop_box.height = con->content_height;
-        resize_box(&e->drop_box, e->target_edge, thickness);
-        desktop_damage_box(&e->drop_box);
+        resize_box(&drop_box, e->target_edge, thickness);
+        update_indicator(e, &drop_box);
 }
 
 static void handle_pointer_motion(struct sway_seat *seat, uint32_t time_msec) {
@@ -214,6 +310,7 @@ static void handle_pointer_motion(struct sway_seat *seat, uint32_t time_msec) {
         } else {
                 handle_motion_prethreshold(seat);
         }
+        transaction_commit_dirty();
 }
 
 static bool is_parallel(enum sway_container_layout layout,
@@ -232,14 +329,15 @@ static void finalize_move(struct sway_seat *seat) {
         }
 
         struct sway_container *con = e->con;
-        struct sway_container *old_parent = con->parent;
-        struct sway_workspace *old_ws = con->workspace;
+        struct sway_container *old_parent = con->pending.parent;
+        struct sway_workspace *old_ws = con->pending.workspace;
         struct sway_node *target_node = e->target_node;
         struct sway_workspace *new_ws = target_node->type == N_WORKSPACE ?
-                target_node->sway_workspace : target_node->sway_container->workspace;
+                target_node->sway_workspace : target_node->sway_container->pending.workspace;
         enum wlr_edges edge = e->target_edge;
         int after = edge != WLR_EDGE_TOP && edge != WLR_EDGE_LEFT;
-        bool swap = edge == WLR_EDGE_NONE && target_node->type == N_CONTAINER;
+        bool swap = edge == WLR_EDGE_NONE && target_node->type == N_CONTAINER &&
+                !e->split_target;
 
         if (!swap) {
                 container_detach(con);
@@ -248,6 +346,14 @@ static void finalize_move(struct sway_seat *seat) {
         // Moving container into empty workspace
         if (target_node->type == N_WORKSPACE && edge == WLR_EDGE_NONE) {
                 con = workspace_add_tiling(new_ws, con);
+        } else if (e->split_target) {
+                struct sway_container *target = target_node->sway_container;
+                enum sway_container_layout layout = container_parent_layout(target);
+                if (layout != L_TABBED && layout != L_STACKED) {
+                        container_split(target, L_TABBED);
+                }
+                container_add_sibling(target, con, e->insert_after_target);
+                ipc_event_window(con, "move");
         } else if (target_node->type == N_CONTAINER) {
                 // Moving container before/after another
                 struct sway_container *target = target_node->sway_container;
@@ -283,8 +389,8 @@ static void finalize_move(struct sway_seat *seat) {
                 int index = list_find(siblings, con);
                 struct sway_container *sibling = index == 0 ?
                         siblings->items[1] : siblings->items[index - 1];
-                con->width = sibling->width;
-                con->height = sibling->height;
+                con->pending.width = sibling->pending.width;
+                con->pending.height = sibling->pending.height;
                 con->width_fraction = sibling->width_fraction;
                 con->height_fraction = sibling->height_fraction;
         }
@@ -294,6 +400,7 @@ static void finalize_move(struct sway_seat *seat) {
                 arrange_workspace(new_ws);
         }
 
+        transaction_commit_dirty();
         seatop_begin_default(seat);
 }
 
@@ -328,7 +435,7 @@ static const struct sway_seatop_impl seatop_impl = {
         .pointer_motion = handle_pointer_motion,
         .tablet_tool_tip = handle_tablet_tool_tip,
         .unref = handle_unref,
-        .render = handle_render,
+        .end = handle_end,
 };
 
 void seatop_begin_move_tiling_threshold(struct sway_seat *seat,
@@ -340,6 +447,20 @@ void seatop_begin_move_tiling_threshold(struct sway_seat *seat,
         if (!e) {
                 return;
         }
+
+        const float *indicator = config->border_colors.focused.indicator;
+        float color[4] = {
+                indicator[0] * .5,
+                indicator[1] * .5,
+                indicator[2] * .5,
+                indicator[3] * .5,
+        };
+        e->indicator_rect = wlr_scene_rect_create(seat->scene_tree, 0, 0, color);
+        if (!e->indicator_rect) {
+                free(e);
+                return;
+        }
+
         e->con = con;
         e->ref_lx = seat->cursor->cursor->x;
         e->ref_ly = seat->cursor->cursor->y;
@@ -348,6 +469,7 @@ void seatop_begin_move_tiling_threshold(struct sway_seat *seat,
         seat->seatop_data = e;
 
         container_raise_floating(con);
+        transaction_commit_dirty();
         wlr_seat_pointer_notify_clear_focus(seat->wlr_seat);
 }
 
diff --git a/sway/input/seatop_resize_floating.c b/sway/input/seatop_resize_floating.c
index 5da22e47..df683026 100644
--- a/sway/input/seatop_resize_floating.c
+++ b/sway/input/seatop_resize_floating.c
@@ -2,6 +2,7 @@
 #include <limits.h>
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_xcursor_manager.h>
+#include "sway/desktop/transaction.h"
 #include "sway/input/cursor.h"
 #include "sway/input/seat.h"
 #include "sway/tree/arrange.h"
@@ -27,6 +28,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
         if (seat->cursor->pressed_button_count == 0) {
                 container_set_resizing(con, false);
                 arrange_container(con); // Send configure w/o resizing hint
+                transaction_commit_dirty();
                 seatop_begin_default(seat);
         }
 }
@@ -78,17 +80,25 @@ static void handle_pointer_motion(struct sway_seat *seat, uint32_t time_msec) {
         double height = e->ref_height + grow_height;
         int min_width, max_width, min_height, max_height;
         floating_calculate_constraints(&min_width, &max_width,
-                        &min_height, &max_height);
-        width = fmax(min_width + border_width, fmin(width, max_width));
-        height = fmax(min_height + border_height, fmin(height, max_height));
+                &min_height, &max_height);
+        width = fmin(width, max_width - border_width);
+        width = fmax(width, min_width + border_width);
+        width = fmax(width, 1);
+        height = fmin(height, max_height - border_height);
+        height = fmax(height, min_height + border_height);
+        height = fmax(height, 1);
 
         // Apply the view's min/max size
         if (con->view) {
                 double view_min_width, view_max_width, view_min_height, view_max_height;
                 view_get_constraints(con->view, &view_min_width, &view_max_width,
                                 &view_min_height, &view_max_height);
-                width = fmax(view_min_width + border_width, fmin(width, view_max_width));
-                height = fmax(view_min_height + border_height, fmin(height, view_max_height));
+                width = fmin(width, view_max_width - border_width);
+                width = fmax(width, view_min_width + border_width);
+                width = fmax(width, 1);
+                height = fmin(height, view_max_height - border_height);
+                height = fmax(height, view_min_height + border_height);
+                height = fmax(height, 1);
 
         }
 
@@ -116,23 +126,24 @@ static void handle_pointer_motion(struct sway_seat *seat, uint32_t time_msec) {
 
         // Determine the amounts we need to bump everything relative to the current
         // size.
-        int relative_grow_width = width - con->width;
-        int relative_grow_height = height - con->height;
-        int relative_grow_x = (e->ref_con_lx + grow_x) - con->x;
-        int relative_grow_y = (e->ref_con_ly + grow_y) - con->y;
+        int relative_grow_width = width - con->pending.width;
+        int relative_grow_height = height - con->pending.height;
+        int relative_grow_x = (e->ref_con_lx + grow_x) - con->pending.x;
+        int relative_grow_y = (e->ref_con_ly + grow_y) - con->pending.y;
 
         // Actually resize stuff
-        con->x += relative_grow_x;
-        con->y += relative_grow_y;
-        con->width += relative_grow_width;
-        con->height += relative_grow_height;
+        con->pending.x += relative_grow_x;
+        con->pending.y += relative_grow_y;
+        con->pending.width += relative_grow_width;
+        con->pending.height += relative_grow_height;
 
-        con->content_x += relative_grow_x;
-        con->content_y += relative_grow_y;
-        con->content_width += relative_grow_width;
-        con->content_height += relative_grow_height;
+        con->pending.content_x += relative_grow_x;
+        con->pending.content_y += relative_grow_y;
+        con->pending.content_width += relative_grow_width;
+        con->pending.content_height += relative_grow_height;
 
         arrange_container(con);
+        transaction_commit_dirty();
 }
 
 static void handle_unref(struct sway_seat *seat, struct sway_container *con) {
@@ -166,16 +177,17 @@ void seatop_begin_resize_floating(struct sway_seat *seat,
         e->edge = edge == WLR_EDGE_NONE ? WLR_EDGE_BOTTOM | WLR_EDGE_RIGHT : edge;
         e->ref_lx = seat->cursor->cursor->x;
         e->ref_ly = seat->cursor->cursor->y;
-        e->ref_con_lx = con->x;
-        e->ref_con_ly = con->y;
-        e->ref_width = con->width;
-        e->ref_height = con->height;
+        e->ref_con_lx = con->pending.x;
+        e->ref_con_ly = con->pending.y;
+        e->ref_width = con->pending.width;
+        e->ref_height = con->pending.height;
 
         seat->seatop_impl = &seatop_impl;
         seat->seatop_data = e;
 
         container_set_resizing(con, true);
         container_raise_floating(con);
+        transaction_commit_dirty();
 
         const char *image = edge == WLR_EDGE_NONE ?
                 "se-resize" : wlr_xcursor_get_resize_name(edge);
diff --git a/sway/input/seatop_resize_tiling.c b/sway/input/seatop_resize_tiling.c
index 2cca805d..869d11b5 100644
--- a/sway/input/seatop_resize_tiling.c
+++ b/sway/input/seatop_resize_tiling.c
@@ -2,6 +2,7 @@
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/util/edges.h>
 #include "sway/commands.h"
+#include "sway/desktop/transaction.h"
 #include "sway/input/cursor.h"
 #include "sway/input/seat.h"
 #include "sway/tree/arrange.h"
@@ -52,21 +53,22 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
                 if (e->h_con) {
                         container_set_resizing(e->h_con, false);
                         container_set_resizing(e->h_sib, false);
-                        if (e->h_con->parent) {
-                                arrange_container(e->h_con->parent);
+                        if (e->h_con->pending.parent) {
+                                arrange_container(e->h_con->pending.parent);
                         } else {
-                                arrange_workspace(e->h_con->workspace);
+                                arrange_workspace(e->h_con->pending.workspace);
                         }
                 }
                 if (e->v_con) {
                         container_set_resizing(e->v_con, false);
                         container_set_resizing(e->v_sib, false);
-                        if (e->v_con->parent) {
-                                arrange_container(e->v_con->parent);
+                        if (e->v_con->pending.parent) {
+                                arrange_container(e->v_con->pending.parent);
                         } else {
-                                arrange_workspace(e->v_con->workspace);
+                                arrange_workspace(e->v_con->pending.workspace);
                         }
                 }
+                transaction_commit_dirty();
                 seatop_begin_default(seat);
         }
 }
@@ -80,16 +82,16 @@ static void handle_pointer_motion(struct sway_seat *seat, uint32_t time_msec) {
 
         if (e->h_con) {
                 if (e->edge & WLR_EDGE_LEFT) {
-                        amount_x = (e->h_con_orig_width - moved_x) - e->h_con->width;
+                        amount_x = (e->h_con_orig_width - moved_x) - e->h_con->pending.width;
                 } else if (e->edge & WLR_EDGE_RIGHT) {
-                        amount_x = (e->h_con_orig_width + moved_x) - e->h_con->width;
+                        amount_x = (e->h_con_orig_width + moved_x) - e->h_con->pending.width;
                 }
         }
         if (e->v_con) {
                 if (e->edge & WLR_EDGE_TOP) {
-                        amount_y = (e->v_con_orig_height - moved_y) - e->v_con->height;
+                        amount_y = (e->v_con_orig_height - moved_y) - e->v_con->pending.height;
                 } else if (e->edge & WLR_EDGE_BOTTOM) {
-                        amount_y = (e->v_con_orig_height + moved_y) - e->v_con->height;
+                        amount_y = (e->v_con_orig_height + moved_y) - e->v_con->pending.height;
                 }
         }
 
@@ -99,6 +101,7 @@ static void handle_pointer_motion(struct sway_seat *seat, uint32_t time_msec) {
         if (amount_y != 0) {
                 container_resize_tiled(e->v_con, e->edge_y, amount_y);
         }
+        transaction_commit_dirty();
 }
 
 static void handle_unref(struct sway_seat *seat, struct sway_container *con) {
@@ -140,7 +143,7 @@ void seatop_begin_resize_tiling(struct sway_seat *seat,
                 if (e->h_con) {
                         container_set_resizing(e->h_con, true);
                         container_set_resizing(e->h_sib, true);
-                        e->h_con_orig_width = e->h_con->width;
+                        e->h_con_orig_width = e->h_con->pending.width;
                 }
         }
         if (edge & (WLR_EDGE_TOP | WLR_EDGE_BOTTOM)) {
@@ -151,12 +154,13 @@ void seatop_begin_resize_tiling(struct sway_seat *seat,
                 if (e->v_con) {
                         container_set_resizing(e->v_con, true);
                         container_set_resizing(e->v_sib, true);
-                        e->v_con_orig_height = e->v_con->height;
+                        e->v_con_orig_height = e->v_con->pending.height;
                 }
         }
 
         seat->seatop_impl = &seatop_impl;
         seat->seatop_data = e;
 
+        transaction_commit_dirty();
         wlr_seat_pointer_notify_clear_focus(seat->wlr_seat);
 }
diff --git a/sway/input/switch.c b/sway/input/switch.c
index b7c28df1..831f4dbf 100644
--- a/sway/input/switch.c
+++ b/sway/input/switch.c
@@ -1,7 +1,5 @@
 #include "sway/config.h"
-#include "sway/desktop/transaction.h"
 #include "sway/input/switch.h"
-#include <wlr/types/wlr_idle.h>
 #include "log.h"
 
 struct sway_switch *sway_switch_create(struct sway_seat *seat,
@@ -12,6 +10,7 @@ struct sway_switch *sway_switch_create(struct sway_seat *seat,
                 return NULL;
         }
         device->switch_device = switch_device;
+        switch_device->wlr = wlr_switch_from_input_device(device->input_device->wlr_device);
         switch_device->seat_device = device;
         switch_device->state = WLR_SWITCH_STATE_OFF;
         wl_list_init(&switch_device->switch_toggle.link);
@@ -20,9 +19,22 @@ struct sway_switch *sway_switch_create(struct sway_seat *seat,
         return switch_device;
 }
 
+static bool sway_switch_trigger_test(enum sway_switch_trigger trigger,
+                enum wlr_switch_state state) {
+        switch (trigger) {
+        case SWAY_SWITCH_TRIGGER_ON:
+                return state == WLR_SWITCH_STATE_ON;
+        case SWAY_SWITCH_TRIGGER_OFF:
+                return state == WLR_SWITCH_STATE_OFF;
+        case SWAY_SWITCH_TRIGGER_TOGGLE:
+                return true;
+        }
+        abort(); // unreachable
+}
+
 static void execute_binding(struct sway_switch *sway_switch) {
-        struct sway_seat* seat = sway_switch->seat_device->sway_seat;
-        bool input_inhibited = seat->exclusive_client != NULL;
+        struct sway_seat *seat = sway_switch->seat_device->sway_seat;
+        bool locked = server.session_lock.lock;
 
         list_t *bindings = config->current_mode->switch_bindings;
         struct sway_switch_binding *matched_binding = NULL;
@@ -31,22 +43,21 @@ static void execute_binding(struct sway_switch *sway_switch) {
                 if (binding->type != sway_switch->type) {
                         continue;
                 }
-                if (binding->state != WLR_SWITCH_STATE_TOGGLE &&
-                                binding->state != sway_switch->state) {
+                if (!sway_switch_trigger_test(binding->trigger, sway_switch->state)) {
                         continue;
                 }
-                if (config->reloading && (binding->state == WLR_SWITCH_STATE_TOGGLE
+                if (config->reloading && (binding->trigger == SWAY_SWITCH_TRIGGER_TOGGLE
                                 || (binding->flags & BINDING_RELOAD) == 0)) {
                         continue;
                 }
                 bool binding_locked = binding->flags & BINDING_LOCKED;
-                if (!binding_locked && input_inhibited) {
+                if (!binding_locked && locked) {
                         continue;
                 }
 
                 matched_binding = binding;
 
-                if (binding_locked == input_inhibited) {
+                if (binding_locked == locked) {
                         break;
                 }
         }
@@ -61,15 +72,12 @@ static void execute_binding(struct sway_switch *sway_switch) {
                 seat_execute_command(seat, dummy_binding);
                 free(dummy_binding);
         }
-
-        transaction_commit_dirty();
-
 }
 
 static void handle_switch_toggle(struct wl_listener *listener, void *data) {
         struct sway_switch *sway_switch =
                         wl_container_of(listener, sway_switch, switch_toggle);
-        struct wlr_event_switch_toggle *event = data;
+        struct wlr_switch_toggle_event *event = data;
         struct sway_seat *seat = sway_switch->seat_device->sway_seat;
         seat_idle_notify_activity(seat, IDLE_SOURCE_SWITCH);
 
@@ -86,10 +94,8 @@ static void handle_switch_toggle(struct wl_listener *listener, void *data) {
 }
 
 void sway_switch_configure(struct sway_switch *sway_switch) {
-        struct wlr_input_device *wlr_device =
-                sway_switch->seat_device->input_device->wlr_device;
         wl_list_remove(&sway_switch->switch_toggle.link);
-        wl_signal_add(&wlr_device->switch_device->events.toggle,
+        wl_signal_add(&sway_switch->wlr->events.toggle,
                         &sway_switch->switch_toggle);
         sway_switch->switch_toggle.notify = handle_switch_toggle;
         sway_log(SWAY_DEBUG, "Configured switch for device");
diff --git a/sway/input/tablet.c b/sway/input/tablet.c
index 26e86e36..902cb7ed 100644
--- a/sway/input/tablet.c
+++ b/sway/input/tablet.c
@@ -1,6 +1,6 @@
 #define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
-#include <wlr/backend/libinput.h>
+#include <wlr/config.h>
 #include <wlr/types/wlr_tablet_v2.h>
 #include <wlr/types/wlr_tablet_tool.h>
 #include <wlr/types/wlr_tablet_pad.h>
@@ -9,6 +9,10 @@
 #include "sway/input/seat.h"
 #include "sway/input/tablet.h"
 
+#if WLR_HAS_LIBINPUT_BACKEND
+#include <wlr/backend/libinput.h>
+#endif
+
 static void handle_pad_tablet_destroy(struct wl_listener *listener, void *data) {
         struct sway_tablet_pad *pad =
                 wl_container_of(listener, pad, tablet_destroy);
@@ -54,15 +58,14 @@ void sway_configure_tablet(struct sway_tablet *tablet) {
                 tablet->seat_device->input_device->wlr_device;
         struct sway_seat *seat = tablet->seat_device->sway_seat;
 
-        if ((seat->wlr_seat->capabilities & WL_SEAT_CAPABILITY_POINTER) == 0) {
-                seat_configure_xcursor(seat);
-        }
+        seat_configure_xcursor(seat);
 
         if (!tablet->tablet_v2) {
                 tablet->tablet_v2 =
                         wlr_tablet_create(server.tablet_v2, seat->wlr_seat, device);
         }
 
+#if WLR_HAS_LIBINPUT_BACKEND
         /* Search for a sibling tablet pad */
         if (!wlr_input_device_is_libinput(device)) {
                 /* We can only do this on libinput devices */
@@ -87,6 +90,7 @@ void sway_configure_tablet(struct sway_tablet *tablet) {
                         break;
                 }
         }
+#endif
 }
 
 void sway_tablet_destroy(struct sway_tablet *tablet) {
@@ -196,7 +200,7 @@ static void handle_tablet_pad_attach(struct wl_listener *listener,
 
 static void handle_tablet_pad_ring(struct wl_listener *listener, void *data) {
         struct sway_tablet_pad *pad = wl_container_of(listener, pad, ring);
-        struct wlr_event_tablet_pad_ring *event = data;
+        struct wlr_tablet_pad_ring_event *event = data;
 
         if (!pad->current_surface) {
                 return;
@@ -210,7 +214,7 @@ static void handle_tablet_pad_ring(struct wl_listener *listener, void *data) {
 
 static void handle_tablet_pad_strip(struct wl_listener *listener, void *data) {
         struct sway_tablet_pad *pad = wl_container_of(listener, pad, strip);
-        struct wlr_event_tablet_pad_strip *event = data;
+        struct wlr_tablet_pad_strip_event *event = data;
 
         if (!pad->current_surface) {
                 return;
@@ -224,7 +228,7 @@ static void handle_tablet_pad_strip(struct wl_listener *listener, void *data) {
 
 static void handle_tablet_pad_button(struct wl_listener *listener, void *data) {
         struct sway_tablet_pad *pad = wl_container_of(listener, pad, button);
-        struct wlr_event_tablet_pad_button *event = data;
+        struct wlr_tablet_pad_button_event *event = data;
 
         if (!pad->current_surface) {
                 return;
@@ -246,6 +250,7 @@ struct sway_tablet_pad *sway_tablet_pad_create(struct sway_seat *seat,
                 return NULL;
         }
 
+        tablet_pad->wlr = wlr_tablet_pad_from_input_device(device->input_device->wlr_device);
         tablet_pad->seat_device = device;
         wl_list_init(&tablet_pad->attach.link);
         wl_list_init(&tablet_pad->button.link);
@@ -260,40 +265,41 @@ struct sway_tablet_pad *sway_tablet_pad_create(struct sway_seat *seat,
 }
 
 void sway_configure_tablet_pad(struct sway_tablet_pad *tablet_pad) {
-        struct wlr_input_device *device =
+        struct wlr_input_device *wlr_device =
                 tablet_pad->seat_device->input_device->wlr_device;
         struct sway_seat *seat = tablet_pad->seat_device->sway_seat;
 
         if (!tablet_pad->tablet_v2_pad) {
                 tablet_pad->tablet_v2_pad =
-                        wlr_tablet_pad_create(server.tablet_v2, seat->wlr_seat, device);
+                        wlr_tablet_pad_create(server.tablet_v2, seat->wlr_seat, wlr_device);
         }
 
         wl_list_remove(&tablet_pad->attach.link);
         tablet_pad->attach.notify = handle_tablet_pad_attach;
-        wl_signal_add(&device->tablet_pad->events.attach_tablet,
+        wl_signal_add(&tablet_pad->wlr->events.attach_tablet,
                 &tablet_pad->attach);
 
         wl_list_remove(&tablet_pad->button.link);
         tablet_pad->button.notify = handle_tablet_pad_button;
-        wl_signal_add(&device->tablet_pad->events.button, &tablet_pad->button);
+        wl_signal_add(&tablet_pad->wlr->events.button, &tablet_pad->button);
 
         wl_list_remove(&tablet_pad->strip.link);
         tablet_pad->strip.notify = handle_tablet_pad_strip;
-        wl_signal_add(&device->tablet_pad->events.strip, &tablet_pad->strip);
+        wl_signal_add(&tablet_pad->wlr->events.strip, &tablet_pad->strip);
 
         wl_list_remove(&tablet_pad->ring.link);
         tablet_pad->ring.notify = handle_tablet_pad_ring;
-        wl_signal_add(&device->tablet_pad->events.ring, &tablet_pad->ring);
+        wl_signal_add(&tablet_pad->wlr->events.ring, &tablet_pad->ring);
 
+#if WLR_HAS_LIBINPUT_BACKEND
         /* Search for a sibling tablet */
-        if (!wlr_input_device_is_libinput(device)) {
+        if (!wlr_input_device_is_libinput(wlr_device)) {
                 /* We can only do this on libinput devices */
                 return;
         }
 
         struct libinput_device_group *group =
-                libinput_device_get_device_group(wlr_libinput_get_device_handle(device));
+                libinput_device_get_device_group(wlr_libinput_get_device_handle(wlr_device));
         struct sway_tablet *tool;
         wl_list_for_each(tool, &seat->cursor->tablets, link) {
                 struct wlr_input_device *tablet =
@@ -310,6 +316,7 @@ void sway_configure_tablet_pad(struct sway_tablet_pad *tablet_pad) {
                         break;
                 }
         }
+#endif
 }
 
 void sway_tablet_pad_destroy(struct sway_tablet_pad *tablet_pad) {
@@ -333,14 +340,10 @@ static void handle_pad_tablet_surface_destroy(struct wl_listener *listener,
         struct sway_tablet_pad *tablet_pad =
                 wl_container_of(listener, tablet_pad, surface_destroy);
 
-        wlr_tablet_v2_tablet_pad_notify_leave(tablet_pad->tablet_v2_pad,
-                tablet_pad->current_surface);
-        wl_list_remove(&tablet_pad->surface_destroy.link);
-        wl_list_init(&tablet_pad->surface_destroy.link);
-        tablet_pad->current_surface = NULL;
+        sway_tablet_pad_set_focus(tablet_pad, NULL);
 }
 
-void sway_tablet_pad_notify_enter(struct sway_tablet_pad *tablet_pad,
+void sway_tablet_pad_set_focus(struct sway_tablet_pad *tablet_pad,
                 struct wlr_surface *surface) {
         if (!tablet_pad || !tablet_pad->tablet) {
                 return;
@@ -359,7 +362,8 @@ void sway_tablet_pad_notify_enter(struct sway_tablet_pad *tablet_pad,
                 tablet_pad->current_surface = NULL;
         }
 
-        if (!wlr_surface_accepts_tablet_v2(tablet_pad->tablet->tablet_v2, surface)) {
+        if (surface == NULL ||
+                        !wlr_surface_accepts_tablet_v2(tablet_pad->tablet->tablet_v2, surface)) {
                 return;
         }
 
@@ -367,7 +371,6 @@ void sway_tablet_pad_notify_enter(struct sway_tablet_pad *tablet_pad,
                 tablet_pad->tablet->tablet_v2, surface);
 
         tablet_pad->current_surface = surface;
-        wl_list_remove(&tablet_pad->surface_destroy.link);
         tablet_pad->surface_destroy.notify = handle_pad_tablet_surface_destroy;
         wl_signal_add(&surface->events.destroy, &tablet_pad->surface_destroy);
 }
diff --git a/sway/input/text_input.c b/sway/input/text_input.c
index f83726ee..58911c2d 100644
--- a/sway/input/text_input.c
+++ b/sway/input/text_input.c
@@ -55,6 +55,35 @@ static void handle_im_commit(struct wl_listener *listener, void *data) {
         wlr_text_input_v3_send_done(text_input->input);
 }
 
+static void handle_im_keyboard_grab_destroy(struct wl_listener *listener, void *data) {
+        struct sway_input_method_relay *relay = wl_container_of(listener, relay,
+                input_method_keyboard_grab_destroy);
+        struct wlr_input_method_keyboard_grab_v2 *keyboard_grab = data;
+        wl_list_remove(&relay->input_method_keyboard_grab_destroy.link);
+
+        if (keyboard_grab->keyboard) {
+                // send modifier state to original client
+                wlr_seat_keyboard_notify_modifiers(keyboard_grab->input_method->seat,
+                        &keyboard_grab->keyboard->modifiers);
+        }
+}
+
+static void handle_im_grab_keyboard(struct wl_listener *listener, void *data) {
+        struct sway_input_method_relay *relay = wl_container_of(listener, relay,
+                input_method_grab_keyboard);
+        struct wlr_input_method_keyboard_grab_v2 *keyboard_grab = data;
+
+        // send modifier state to grab
+        struct wlr_keyboard *active_keyboard = wlr_seat_get_keyboard(relay->seat->wlr_seat);
+        wlr_input_method_keyboard_grab_v2_set_keyboard(keyboard_grab,
+                active_keyboard);
+
+        wl_signal_add(&keyboard_grab->events.destroy,
+                &relay->input_method_keyboard_grab_destroy);
+        relay->input_method_keyboard_grab_destroy.notify =
+                handle_im_keyboard_grab_destroy;
+}
+
 static void text_input_set_pending_focused_surface(
                 struct sway_text_input *text_input, struct wlr_surface *surface) {
         wl_list_remove(&text_input->pending_focused_surface_destroy.link);
@@ -92,13 +121,18 @@ static void relay_send_im_state(struct sway_input_method_relay *relay,
                 return;
         }
         // TODO: only send each of those if they were modified
-        wlr_input_method_v2_send_surrounding_text(input_method,
-                input->current.surrounding.text, input->current.surrounding.cursor,
-                input->current.surrounding.anchor);
+        if (input->active_features & WLR_TEXT_INPUT_V3_FEATURE_SURROUNDING_TEXT) {
+                wlr_input_method_v2_send_surrounding_text(input_method,
+                        input->current.surrounding.text, input->current.surrounding.cursor,
+                        input->current.surrounding.anchor);
+        }
         wlr_input_method_v2_send_text_change_cause(input_method,
                 input->current.text_change_cause);
-        wlr_input_method_v2_send_content_type(input_method,
-                input->current.content_type.hint, input->current.content_type.purpose);
+        if (input->active_features & WLR_TEXT_INPUT_V3_FEATURE_CONTENT_TYPE) {
+                wlr_input_method_v2_send_content_type(input_method,
+                        input->current.content_type.hint,
+                        input->current.content_type.purpose);
+        }
         wlr_input_method_v2_send_done(input_method);
         // TODO: pass intent, display popup size
 }
@@ -144,6 +178,10 @@ static void handle_text_input_disable(struct wl_listener *listener,
                 void *data) {
         struct sway_text_input *text_input = wl_container_of(listener, text_input,
                 text_input_disable);
+        if (text_input->input->focused_surface == NULL) {
+                sway_log(SWAY_DEBUG, "Disabling text input, but no longer focused");
+                return;
+        }
         relay_disable_text_input(text_input->relay, text_input);
 }
 
@@ -236,6 +274,9 @@ static void relay_handle_input_method(struct wl_listener *listener,
         wl_signal_add(&relay->input_method->events.commit,
                 &relay->input_method_commit);
         relay->input_method_commit.notify = handle_im_commit;
+        wl_signal_add(&relay->input_method->events.grab_keyboard,
+                &relay->input_method_grab_keyboard);
+        relay->input_method_grab_keyboard.notify = handle_im_grab_keyboard;
         wl_signal_add(&relay->input_method->events.destroy,
                 &relay->input_method_destroy);
         relay->input_method_destroy.notify = handle_im_destroy;
diff --git a/sway/ipc-json.c b/sway/ipc-json.c
index fceee84d..58356d4e 100644
--- a/sway/ipc-json.c
+++ b/sway/ipc-json.c
@@ -1,7 +1,12 @@
+#include <ctype.h>
+#include <float.h>
 #include <json.h>
 #include <libevdev/libevdev.h>
 #include <stdio.h>
-#include <ctype.h>
+#include <wlr/config.h>
+#include <wlr/types/wlr_content_type_v1.h>
+#include <wlr/types/wlr_output.h>
+#include <xkbcommon/xkbcommon.h>
 #include "config.h"
 #include "log.h"
 #include "sway/config.h"
@@ -13,16 +18,30 @@
 #include "sway/input/input-manager.h"
 #include "sway/input/cursor.h"
 #include "sway/input/seat.h"
-#include <wlr/backend/libinput.h>
-#include <wlr/types/wlr_box.h>
-#include <wlr/types/wlr_output.h>
-#include <xkbcommon/xkbcommon.h>
 #include "wlr-layer-shell-unstable-v1-protocol.h"
 #include "sway/desktop/idle_inhibit_v1.h"
 
+#if WLR_HAS_LIBINPUT_BACKEND
+#include <wlr/backend/libinput.h>
+#endif
+
 static const int i3_output_id = INT32_MAX;
 static const int i3_scratch_id = INT32_MAX - 1;
 
+static const char *ipc_json_node_type_description(enum sway_node_type node_type) {
+        switch (node_type) {
+        case N_ROOT:
+                return "root";
+        case N_OUTPUT:
+                return "output";
+        case N_WORKSPACE:
+                return "workspace";
+        case N_CONTAINER:
+                return "con";
+        }
+        return "none";
+}
+
 static const char *ipc_json_layout_description(enum sway_container_layout l) {
         switch (l) {
         case L_VERT:
@@ -98,12 +117,43 @@ static const char *ipc_json_output_adaptive_sync_status_description(
                 return "disabled";
         case WLR_OUTPUT_ADAPTIVE_SYNC_ENABLED:
                 return "enabled";
-        case WLR_OUTPUT_ADAPTIVE_SYNC_UNKNOWN:
-                return "unknown";
         }
         return NULL;
 }
 
+static const char *ipc_json_output_mode_aspect_ratio_description(
+                enum wlr_output_mode_aspect_ratio aspect_ratio) {
+        switch (aspect_ratio) {
+        case WLR_OUTPUT_MODE_ASPECT_RATIO_NONE:
+                return "none";
+        case WLR_OUTPUT_MODE_ASPECT_RATIO_4_3:
+                return "4:3";
+        case WLR_OUTPUT_MODE_ASPECT_RATIO_16_9:
+                return "16:9";
+        case WLR_OUTPUT_MODE_ASPECT_RATIO_64_27:
+                return "64:27";
+        case WLR_OUTPUT_MODE_ASPECT_RATIO_256_135:
+                return "256:135";
+        }
+        return NULL;
+}
+
+static json_object *ipc_json_output_mode_description(
+                const struct wlr_output_mode *mode) {
+        const char *pic_ar =
+                ipc_json_output_mode_aspect_ratio_description(mode->picture_aspect_ratio);
+        json_object *mode_object = json_object_new_object();
+        json_object_object_add(mode_object, "width",
+                json_object_new_int(mode->width));
+        json_object_object_add(mode_object, "height",
+                json_object_new_int(mode->height));
+        json_object_object_add(mode_object, "refresh",
+                json_object_new_int(mode->refresh));
+        json_object_object_add(mode_object, "picture_aspect_ratio",
+                json_object_new_string(pic_ar));
+        return mode_object;
+}
+
 #if HAVE_XWAYLAND
 static const char *ipc_json_xwindow_type_description(struct sway_view *view) {
         struct wlr_xwayland_surface *surface = view->wlr_xwayland_surface;
@@ -156,6 +206,20 @@ static const char *ipc_json_user_idle_inhibitor_description(enum sway_idle_inhib
         return NULL;
 }
 
+static const char *ipc_json_content_type_description(enum wp_content_type_v1_type type) {
+        switch (type) {
+        case WP_CONTENT_TYPE_V1_TYPE_NONE:
+                return "none";
+        case WP_CONTENT_TYPE_V1_TYPE_PHOTO:
+                return "photo";
+        case WP_CONTENT_TYPE_V1_TYPE_VIDEO:
+                return "video";
+        case WP_CONTENT_TYPE_V1_TYPE_GAME:
+                return "game";
+        }
+        return NULL;
+}
+
 json_object *ipc_json_get_version(void) {
         int major = 0, minor = 0, patch = 0;
         json_object *version = json_object_new_object();
@@ -189,16 +253,22 @@ static json_object *ipc_json_create_empty_rect(void) {
         return ipc_json_create_rect(&empty);
 }
 
-static json_object *ipc_json_create_node(int id, char *name,
+static json_object *ipc_json_create_node(int id, const char* type, char *name,
                 bool focused, json_object *focus, struct wlr_box *box) {
         json_object *object = json_object_new_object();
 
         json_object_object_add(object, "id", json_object_new_int(id));
-        json_object_object_add(object, "name",
-                        name ? json_object_new_string(name) : NULL);
-        json_object_object_add(object, "rect", ipc_json_create_rect(box));
+        json_object_object_add(object, "type", json_object_new_string(type));
+        json_object_object_add(object, "orientation",
+                        json_object_new_string(
+                                ipc_json_orientation_description(L_HORIZ)));
+        json_object_object_add(object, "percent", NULL);
+        json_object_object_add(object, "urgent", json_object_new_boolean(false));
+        json_object_object_add(object, "marks", json_object_new_array());
         json_object_object_add(object, "focused", json_object_new_boolean(focused));
-        json_object_object_add(object, "focus", focus);
+        json_object_object_add(object, "layout",
+                        json_object_new_string(
+                                ipc_json_layout_description(L_HORIZ)));
 
         // set default values to be compatible with i3
         json_object_object_add(object, "border",
@@ -206,49 +276,66 @@ static json_object *ipc_json_create_node(int id, char *name,
                                 ipc_json_border_description(B_NONE)));
         json_object_object_add(object, "current_border_width",
                         json_object_new_int(0));
-        json_object_object_add(object, "layout",
-                        json_object_new_string(
-                                ipc_json_layout_description(L_HORIZ)));
-        json_object_object_add(object, "orientation",
-                        json_object_new_string(
-                                ipc_json_orientation_description(L_HORIZ)));
-        json_object_object_add(object, "percent", NULL);
-        json_object_object_add(object, "window_rect", ipc_json_create_empty_rect());
+        json_object_object_add(object, "rect", ipc_json_create_rect(box));
         json_object_object_add(object, "deco_rect", ipc_json_create_empty_rect());
+        json_object_object_add(object, "window_rect", ipc_json_create_empty_rect());
         json_object_object_add(object, "geometry", ipc_json_create_empty_rect());
+        json_object_object_add(object, "name",
+                        name ? json_object_new_string(name) : NULL);
         json_object_object_add(object, "window", NULL);
-        json_object_object_add(object, "urgent", json_object_new_boolean(false));
-        json_object_object_add(object, "marks", json_object_new_array());
-        json_object_object_add(object, "fullscreen_mode", json_object_new_int(0));
         json_object_object_add(object, "nodes", json_object_new_array());
         json_object_object_add(object, "floating_nodes", json_object_new_array());
+        json_object_object_add(object, "focus", focus);
+        json_object_object_add(object, "fullscreen_mode", json_object_new_int(0));
         json_object_object_add(object, "sticky", json_object_new_boolean(false));
 
         return object;
 }
 
-static void ipc_json_describe_root(struct sway_root *root, json_object *object) {
-        json_object_object_add(object, "type", json_object_new_string("root"));
+static void ipc_json_describe_wlr_output(struct wlr_output *wlr_output, json_object *object) {
+        json_object_object_add(object, "primary", json_object_new_boolean(false));
+        json_object_object_add(object, "make",
+                        json_object_new_string(wlr_output->make ? wlr_output->make : "Unknown"));
+        json_object_object_add(object, "model",
+                        json_object_new_string(wlr_output->model ? wlr_output->model : "Unknown"));
+        json_object_object_add(object, "serial",
+                        json_object_new_string(wlr_output->serial ? wlr_output->serial : "Unknown"));
+
+        json_object *modes_array = json_object_new_array();
+        struct wlr_output_mode *mode;
+        wl_list_for_each(mode, &wlr_output->modes, link) {
+                json_object *mode_object = json_object_new_object();
+                json_object_object_add(mode_object, "width",
+                        json_object_new_int(mode->width));
+                json_object_object_add(mode_object, "height",
+                        json_object_new_int(mode->height));
+                json_object_object_add(mode_object, "refresh",
+                        json_object_new_int(mode->refresh));
+                json_object_array_add(modes_array, mode_object);
+        }
+        json_object_object_add(object, "modes", modes_array);
 }
 
 static void ipc_json_describe_output(struct sway_output *output,
                 json_object *object) {
+        ipc_json_describe_wlr_output(output->wlr_output, object);
+}
+
+static void ipc_json_describe_enabled_output(struct sway_output *output,
+                json_object *object) {
+        ipc_json_describe_output(output, object);
+
         struct wlr_output *wlr_output = output->wlr_output;
-        json_object_object_add(object, "type", json_object_new_string("output"));
+        json_object_object_add(object, "non_desktop", json_object_new_boolean(false));
         json_object_object_add(object, "active", json_object_new_boolean(true));
         json_object_object_add(object, "dpms",
                         json_object_new_boolean(wlr_output->enabled));
-        json_object_object_add(object, "primary", json_object_new_boolean(false));
+        json_object_object_add(object, "power",
+                        json_object_new_boolean(wlr_output->enabled));
         json_object_object_add(object, "layout", json_object_new_string("output"));
         json_object_object_add(object, "orientation",
                         json_object_new_string(
                                 ipc_json_orientation_description(L_NONE)));
-        json_object_object_add(object, "make",
-                        json_object_new_string(wlr_output->make));
-        json_object_object_add(object, "model",
-                        json_object_new_string(wlr_output->model));
-        json_object_object_add(object, "serial",
-                        json_object_new_string(wlr_output->serial));
         json_object_object_add(object, "scale",
                         json_object_new_double(wlr_output->scale));
         json_object_object_add(object, "scale_filter",
@@ -273,25 +360,26 @@ static void ipc_json_describe_output(struct sway_output *output,
         json_object *modes_array = json_object_new_array();
         struct wlr_output_mode *mode;
         wl_list_for_each(mode, &wlr_output->modes, link) {
-                json_object *mode_object = json_object_new_object();
-                json_object_object_add(mode_object, "width",
-                        json_object_new_int(mode->width));
-                json_object_object_add(mode_object, "height",
-                        json_object_new_int(mode->height));
-                json_object_object_add(mode_object, "refresh",
-                        json_object_new_int(mode->refresh));
+                json_object *mode_object =
+                        ipc_json_output_mode_description(mode);
                 json_object_array_add(modes_array, mode_object);
         }
 
         json_object_object_add(object, "modes", modes_array);
 
-        json_object *current_mode_object = json_object_new_object();
-        json_object_object_add(current_mode_object, "width",
-                json_object_new_int(wlr_output->width));
-        json_object_object_add(current_mode_object, "height",
-                json_object_new_int(wlr_output->height));
-        json_object_object_add(current_mode_object, "refresh",
-                json_object_new_int(wlr_output->refresh));
+        json_object *current_mode_object;
+        if (wlr_output->current_mode != NULL) {
+                current_mode_object =
+                        ipc_json_output_mode_description(wlr_output->current_mode);
+        } else {
+                current_mode_object = json_object_new_object();
+                json_object_object_add(current_mode_object, "width",
+                        json_object_new_int(wlr_output->width));
+                json_object_object_add(current_mode_object, "height",
+                        json_object_new_int(wlr_output->height));
+                json_object_object_add(current_mode_object, "refresh",
+                        json_object_new_int(wlr_output->refresh));
+        }
         json_object_object_add(object, "current_mode", current_mode_object);
 
         struct sway_node *parent = node_get_parent(&output->node);
@@ -315,33 +403,15 @@ json_object *ipc_json_describe_disabled_output(struct sway_output *output) {
 
         json_object *object = json_object_new_object();
 
+        ipc_json_describe_output(output, object);
+
+        json_object_object_add(object, "non_desktop", json_object_new_boolean(false));
         json_object_object_add(object, "type", json_object_new_string("output"));
         json_object_object_add(object, "name",
                         json_object_new_string(wlr_output->name));
         json_object_object_add(object, "active", json_object_new_boolean(false));
         json_object_object_add(object, "dpms", json_object_new_boolean(false));
-        json_object_object_add(object, "primary", json_object_new_boolean(false));
-        json_object_object_add(object, "make",
-                        json_object_new_string(wlr_output->make));
-        json_object_object_add(object, "model",
-                        json_object_new_string(wlr_output->model));
-        json_object_object_add(object, "serial",
-                        json_object_new_string(wlr_output->serial));
-
-        json_object *modes_array = json_object_new_array();
-        struct wlr_output_mode *mode;
-        wl_list_for_each(mode, &wlr_output->modes, link) {
-                json_object *mode_object = json_object_new_object();
-                json_object_object_add(mode_object, "width",
-                        json_object_new_int(mode->width));
-                json_object_object_add(mode_object, "height",
-                        json_object_new_int(mode->height));
-                json_object_object_add(mode_object, "refresh",
-                        json_object_new_int(mode->refresh));
-                json_object_array_add(modes_array, mode_object);
-        }
-
-        json_object_object_add(object, "modes", modes_array);
+        json_object_object_add(object, "power", json_object_new_boolean(false));
 
         json_object_object_add(object, "current_workspace", NULL);
 
@@ -357,6 +427,21 @@ json_object *ipc_json_describe_disabled_output(struct sway_output *output) {
         return object;
 }
 
+json_object *ipc_json_describe_non_desktop_output(struct sway_output_non_desktop *output) {
+        struct wlr_output *wlr_output = output->wlr_output;
+
+        json_object *object = json_object_new_object();
+
+        ipc_json_describe_wlr_output(wlr_output, object);
+
+        json_object_object_add(object, "non_desktop", json_object_new_boolean(true));
+        json_object_object_add(object, "type", json_object_new_string("output"));
+        json_object_object_add(object, "name",
+                                json_object_new_string(wlr_output->name));
+
+        return object;
+}
+
 static json_object *ipc_json_describe_scratchpad_output(void) {
         struct wlr_box box;
         root_get_box(root, &box);
@@ -369,11 +454,9 @@ static json_object *ipc_json_describe_scratchpad_output(void) {
                                 json_object_new_int(container->node.id));
         }
 
-        json_object *workspace = ipc_json_create_node(i3_scratch_id,
+        json_object *workspace = ipc_json_create_node(i3_scratch_id, "workspace",
                                 "__i3_scratch", false, workspace_focus, &box);
         json_object_object_add(workspace, "fullscreen_mode", json_object_new_int(1));
-        json_object_object_add(workspace, "type",
-                        json_object_new_string("workspace"));
 
         // List all hidden scratchpad containers as floating nodes
         json_object *floating_array = json_object_new_array();
@@ -390,10 +473,8 @@ static json_object *ipc_json_describe_scratchpad_output(void) {
         json_object *output_focus = json_object_new_array();
         json_object_array_add(output_focus, json_object_new_int(i3_scratch_id));
 
-        json_object *output = ipc_json_create_node(i3_output_id,
+        json_object *output = ipc_json_create_node(i3_output_id, "output",
                                         "__i3", false, output_focus, &box);
-        json_object_object_add(output, "type",
-                        json_object_new_string("output"));
         json_object_object_add(output, "layout",
                         json_object_new_string("output"));
 
@@ -423,7 +504,6 @@ static void ipc_json_describe_workspace(struct sway_workspace *workspace,
         json_object_object_add(object, "fullscreen_mode", json_object_new_int(1));
         json_object_object_add(object, "output", workspace->output ?
                         json_object_new_string(workspace->output->wlr_output->name) : NULL);
-        json_object_object_add(object, "type", json_object_new_string("workspace"));
         json_object_object_add(object, "urgent",
                         json_object_new_boolean(workspace->urgent));
         json_object_object_add(object, "representation", workspace->representation ?
@@ -448,30 +528,32 @@ static void ipc_json_describe_workspace(struct sway_workspace *workspace,
 
 static void get_deco_rect(struct sway_container *c, struct wlr_box *deco_rect) {
         enum sway_container_layout parent_layout = container_parent_layout(c);
-        bool tab_or_stack = parent_layout == L_TABBED || parent_layout == L_STACKED;
+        list_t *siblings = container_get_siblings(c);
+        bool tab_or_stack = (parent_layout == L_TABBED || parent_layout == L_STACKED)
+                && ((siblings && siblings->length > 1) || !config->hide_lone_tab);
         if (((!tab_or_stack || container_is_floating(c)) &&
                                 c->current.border != B_NORMAL) ||
-                        c->fullscreen_mode != FULLSCREEN_NONE ||
-                        c->workspace == NULL) {
+                        c->pending.fullscreen_mode != FULLSCREEN_NONE ||
+                        c->pending.workspace == NULL) {
                 deco_rect->x = deco_rect->y = deco_rect->width = deco_rect->height = 0;
                 return;
         }
 
-        if (c->parent) {
-                deco_rect->x = c->x - c->parent->x;
-                deco_rect->y = c->y - c->parent->y;
+        if (c->pending.parent) {
+                deco_rect->x = c->pending.x - c->pending.parent->pending.x;
+                deco_rect->y = c->pending.y - c->pending.parent->pending.y;
         } else {
-                deco_rect->x = c->x - c->workspace->x;
-                deco_rect->y = c->y - c->workspace->y;
+                deco_rect->x = c->pending.x - c->pending.workspace->x;
+                deco_rect->y = c->pending.y - c->pending.workspace->y;
         }
-        deco_rect->width = c->width;
+        deco_rect->width = c->pending.width;
         deco_rect->height = container_titlebar_height();
 
         if (!container_is_floating(c)) {
                 if (parent_layout == L_TABBED) {
-                        deco_rect->width = c->parent
-                                ? c->parent->width / c->parent->children->length
-                                : c->workspace->width / c->workspace->tiling->length;
+                        deco_rect->width = c->pending.parent
+                                ? c->pending.parent->pending.width / c->pending.parent->pending.children->length
+                                : c->pending.workspace->width / c->pending.workspace->tiling->length;
                         deco_rect->x += deco_rect->width * container_sibling_index(c);
                 } else if (parent_layout == L_STACKED) {
                         if (!c->view) {
@@ -494,10 +576,10 @@ static void ipc_json_describe_view(struct sway_container *c, json_object *object
         json_object_object_add(object, "visible", json_object_new_boolean(visible));
 
         struct wlr_box window_box = {
-                c->content_x - c->x,
-                (c->current.border == B_PIXEL) ? c->current.border_thickness : 0,
-                c->content_width,
-                c->content_height
+                c->pending.content_x - c->pending.x,
+                (c->current.border == B_PIXEL) ? c->pending.content_y - c->pending.y : 0,
+                c->pending.content_width,
+                c->pending.content_height
         };
 
         json_object_object_add(object, "window_rect", ipc_json_create_rect(&window_box));
@@ -539,6 +621,16 @@ static void ipc_json_describe_view(struct sway_container *c, json_object *object
 
         json_object_object_add(object, "idle_inhibitors", idle_inhibitors);
 
+        enum wp_content_type_v1_type content_type = WP_CONTENT_TYPE_V1_TYPE_NONE;
+        if (c->view->surface != NULL) {
+                content_type = wlr_surface_get_content_type_v1(server.content_type_manager_v1,
+                        c->view->surface);
+        }
+        if (content_type != WP_CONTENT_TYPE_V1_TYPE_NONE) {
+                json_object_object_add(object, "content_type",
+                        json_object_new_string(ipc_json_content_type_description(content_type)));
+        }
+
 #if HAVE_XWAYLAND
         if (c->view->type == SWAY_VIEW_XWAYLAND) {
                 json_object_object_add(object, "window",
@@ -583,16 +675,18 @@ static void ipc_json_describe_view(struct sway_container *c, json_object *object
 static void ipc_json_describe_container(struct sway_container *c, json_object *object) {
         json_object_object_add(object, "name",
                         c->title ? json_object_new_string(c->title) : NULL);
-        json_object_object_add(object, "type",
-                        json_object_new_string(container_is_floating(c) ? "floating_con" : "con"));
+        if (container_is_floating(c)) {
+                json_object_object_add(object, "type",
+                                json_object_new_string("floating_con"));
+        }
 
         json_object_object_add(object, "layout",
                         json_object_new_string(
-                                ipc_json_layout_description(c->layout)));
+                                ipc_json_layout_description(c->pending.layout)));
 
         json_object_object_add(object, "orientation",
                         json_object_new_string(
-                                ipc_json_orientation_description(c->layout)));
+                                ipc_json_orientation_description(c->pending.layout)));
 
         bool urgent = c->view ?
                 view_is_urgent(c->view) : container_has_urgent_child(c);
@@ -600,7 +694,7 @@ static void ipc_json_describe_container(struct sway_container *c, json_object *o
         json_object_object_add(object, "sticky", json_object_new_boolean(c->is_sticky));
 
         json_object_object_add(object, "fullscreen_mode",
-                        json_object_new_int(c->fullscreen_mode));
+                        json_object_new_int(c->pending.fullscreen_mode));
 
         struct sway_node *parent = node_get_parent(&c->node);
         struct wlr_box parent_box = {0, 0, 0, 0};
@@ -610,8 +704,8 @@ static void ipc_json_describe_container(struct sway_container *c, json_object *o
         }
 
         if (parent_box.width != 0 && parent_box.height != 0) {
-                double percent = ((double)c->width / parent_box.width)
-                                * ((double)c->height / parent_box.height);
+                double percent = ((double)c->pending.width / parent_box.width)
+                                * ((double)c->pending.height / parent_box.height);
                 json_object_object_add(object, "percent", json_object_new_double(percent));
         }
 
@@ -692,15 +786,14 @@ json_object *ipc_json_describe_node(struct sway_node *node) {
         };
         seat_for_each_node(seat, focus_inactive_children_iterator, &data);
 
-        json_object *object = ipc_json_create_node(
-                                (int)node->id, name, focused, focus, &box);
+        json_object *object = ipc_json_create_node((int)node->id,
+                                ipc_json_node_type_description(node->type), name, focused, focus, &box);
 
         switch (node->type) {
         case N_ROOT:
-                ipc_json_describe_root(root, object);
                 break;
         case N_OUTPUT:
-                ipc_json_describe_output(node->sway_output, object);
+                ipc_json_describe_enabled_output(node->sway_output, object);
                 break;
         case N_CONTAINER:
                 ipc_json_describe_container(node->sway_container, object);
@@ -743,10 +836,10 @@ json_object *ipc_json_describe_node_recursive(struct sway_node *node) {
                 }
                 break;
         case N_CONTAINER:
-                if (node->sway_container->children) {
-                        for (i = 0; i < node->sway_container->children->length; ++i) {
+                if (node->sway_container->pending.children) {
+                        for (i = 0; i < node->sway_container->pending.children->length; ++i) {
                                 struct sway_container *child =
-                                        node->sway_container->children->items[i];
+                                        node->sway_container->pending.children->items[i];
                                 json_object_array_add(children,
                                                 ipc_json_describe_node_recursive(&child->node));
                         }
@@ -758,6 +851,7 @@ json_object *ipc_json_describe_node_recursive(struct sway_node *node) {
         return object;
 }
 
+#if WLR_HAS_LIBINPUT_BACKEND
 static json_object *describe_libinput_device(struct libinput_device *device) {
         json_object *object = json_object_new_object();
 
@@ -841,6 +935,11 @@ static json_object *describe_libinput_device(struct libinput_device *device) {
                 case LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE:
                         accel_profile = "adaptive";
                         break;
+#if HAVE_LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM
+                case LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM:
+                        accel_profile = "custom";
+                        break;
+#endif
                 }
                 json_object_object_add(object, "accel_profile",
                                 json_object_new_string(accel_profile));
@@ -920,6 +1019,17 @@ static json_object *describe_libinput_device(struct libinput_device *device) {
                         uint32_t button = libinput_device_config_scroll_get_button(device);
                         json_object_object_add(object, "scroll_button",
                                         json_object_new_int(button));
+                        const char *lock = "unknown";
+                        switch (libinput_device_config_scroll_get_button_lock(device)) {
+                        case LIBINPUT_CONFIG_SCROLL_BUTTON_LOCK_ENABLED:
+                                lock = "enabled";
+                                break;
+                        case LIBINPUT_CONFIG_SCROLL_BUTTON_LOCK_DISABLED:
+                                lock = "disabled";
+                                break;
+                        }
+                        json_object_object_add(object, "scroll_button_lock",
+                                        json_object_new_string(lock));
                 }
         }
 
@@ -936,6 +1046,19 @@ static json_object *describe_libinput_device(struct libinput_device *device) {
                 json_object_object_add(object, "dwt", json_object_new_string(dwt));
         }
 
+        if (libinput_device_config_dwtp_is_available(device)) {
+                const char *dwtp = "unknown";
+                switch (libinput_device_config_dwtp_get_enabled(device)) {
+                case LIBINPUT_CONFIG_DWTP_ENABLED:
+                        dwtp = "enabled";
+                        break;
+                case LIBINPUT_CONFIG_DWTP_DISABLED:
+                        dwtp = "disabled";
+                        break;
+                }
+                json_object_object_add(object, "dwtp", json_object_new_string(dwtp));
+        }
+
         if (libinput_device_config_calibration_has_matrix(device)) {
                 float matrix[6];
                 libinput_device_config_calibration_get_matrix(device, matrix);
@@ -950,6 +1073,7 @@ static json_object *describe_libinput_device(struct libinput_device *device) {
 
         return object;
 }
+#endif
 
 json_object *ipc_json_describe_input(struct sway_input_device *device) {
         if (!(sway_assert(device, "Device must not be null"))) {
@@ -971,10 +1095,16 @@ json_object *ipc_json_describe_input(struct sway_input_device *device) {
                         input_device_get_type(device)));
 
         if (device->wlr_device->type == WLR_INPUT_DEVICE_KEYBOARD) {
-                struct wlr_keyboard *keyboard = device->wlr_device->keyboard;
+                struct wlr_keyboard *keyboard =
+                        wlr_keyboard_from_input_device(device->wlr_device);
                 struct xkb_keymap *keymap = keyboard->keymap;
                 struct xkb_state *state = keyboard->xkb_state;
 
+                json_object_object_add(object, "repeat_delay", 
+                        json_object_new_int(keyboard->repeat_info.delay));
+                json_object_object_add(object, "repeat_rate", 
+                        json_object_new_int(keyboard->repeat_info.rate));
+
                 json_object *layouts_arr = json_object_new_array();
                 json_object_object_add(object, "xkb_layout_names", layouts_arr);
 
@@ -996,12 +1126,25 @@ json_object *ipc_json_describe_input(struct sway_input_device *device) {
                 }
         }
 
+        if (device->wlr_device->type == WLR_INPUT_DEVICE_POINTER) {
+                struct input_config *ic = input_device_get_config(device);
+                float scroll_factor = 1.0f;
+                if (ic != NULL && !isnan(ic->scroll_factor) &&
+                                ic->scroll_factor != FLT_MIN) {
+                        scroll_factor = ic->scroll_factor;
+                }
+                json_object_object_add(object, "scroll_factor",
+                                json_object_new_double(scroll_factor));
+        }
+
+#if WLR_HAS_LIBINPUT_BACKEND
         if (wlr_input_device_is_libinput(device->wlr_device)) {
                 struct libinput_device *libinput_dev;
                 libinput_dev = wlr_libinput_get_device_handle(device->wlr_device);
                 json_object_object_add(object, "libinput",
                                 describe_libinput_device(libinput_dev));
         }
+#endif
 
         return object;
 }
@@ -1109,7 +1252,9 @@ json_object *ipc_json_describe_bar_config(struct bar_config *bar) {
         json_object_object_add(json, "verbose",
                         json_object_new_boolean(bar->verbose));
         json_object_object_add(json, "pango_markup",
-                        json_object_new_boolean(bar->pango_markup));
+                        json_object_new_boolean(bar->pango_markup == PANGO_MARKUP_DEFAULT
+                                                                                        ? config->pango_markup
+                                                                                        : bar->pango_markup));
 
         json_object *colors = json_object_new_object();
         json_object_object_add(colors, "background",
diff --git a/sway/ipc-server.c b/sway/ipc-server.c
index aad9a7b5..9692a77f 100644
--- a/sway/ipc-server.c
+++ b/sway/ipc-server.c
@@ -56,7 +56,6 @@ struct ipc_client {
         enum ipc_command_type pending_type;
 };
 
-struct sockaddr_un *ipc_user_sockaddr(void);
 int ipc_handle_connection(int fd, uint32_t mask, void *data);
 int ipc_client_handle_readable(int client_fd, uint32_t mask, void *data);
 int ipc_client_handle_writable(int client_fd, uint32_t mask, void *data);
@@ -150,7 +149,6 @@ struct sockaddr_un *ipc_user_sockaddr(void) {
 int ipc_handle_connection(int fd, uint32_t mask, void *data) {
         (void) fd;
         struct sway_server *server = data;
-        sway_log(SWAY_DEBUG, "Event on IPC listening socket");
         assert(mask == WL_EVENT_READABLE);
 
         int client_fd = accept(ipc_socket, NULL, NULL);
@@ -211,13 +209,10 @@ int ipc_client_handle_readable(int client_fd, uint32_t mask, void *data) {
         }
 
         if (mask & WL_EVENT_HANGUP) {
-                sway_log(SWAY_DEBUG, "Client %d hung up", client->fd);
                 ipc_client_disconnect(client);
                 return 0;
         }
 
-        sway_log(SWAY_DEBUG, "Client %d readable", client->fd);
-
         int read_available;
         if (ioctl(client_fd, FIONREAD, &read_available) == -1) {
                 sway_log_errno(SWAY_INFO, "Unable to read IPC socket buffer size");
@@ -513,6 +508,20 @@ void ipc_event_input(const char *change, struct sway_input_device *device) {
         json_object_put(json);
 }
 
+void ipc_event_output(void) {
+        if (!ipc_has_event_listeners(IPC_EVENT_OUTPUT)) {
+                return;
+        }
+        sway_log(SWAY_DEBUG, "Sending output event");
+
+        json_object *json = json_object_new_object();
+        json_object_object_add(json, "change", json_object_new_string("unspecified"));
+
+        const char *json_string = json_object_to_json_string(json);
+        ipc_send_event(json_string, IPC_EVENT_OUTPUT);
+        json_object_put(json);
+}
+
 int ipc_client_handle_writable(int client_fd, uint32_t mask, void *data) {
         struct ipc_client *client = data;
 
@@ -523,7 +532,6 @@ int ipc_client_handle_writable(int client_fd, uint32_t mask, void *data) {
         }
 
         if (mask & WL_EVENT_HANGUP) {
-                sway_log(SWAY_DEBUG, "Client %d hung up", client->fd);
                 ipc_client_disconnect(client);
                 return 0;
         }
@@ -532,8 +540,6 @@ int ipc_client_handle_writable(int client_fd, uint32_t mask, void *data) {
                 return 0;
         }
 
-        sway_log(SWAY_DEBUG, "Client %d writable", client->fd);
-
         ssize_t written = write(client->fd, client->write_buffer, client->write_buffer_len);
 
         if (written == -1 && errno == EAGAIN) {
@@ -687,11 +693,17 @@ void ipc_client_handle_command(struct ipc_client *client, uint32_t payload_lengt
                 }
                 struct sway_output *output;
                 wl_list_for_each(output, &root->all_outputs, link) {
-                        if (!output->enabled && output != root->noop_output) {
+                        if (!output->enabled && output != root->fallback_output) {
                                 json_object_array_add(outputs,
                                                 ipc_json_describe_disabled_output(output));
                         }
                 }
+
+                for (int i = 0; i < root->non_desktop_outputs->length; i++) {
+                        struct sway_output_non_desktop *non_desktop_output = root->non_desktop_outputs->items[i];
+                        json_object_array_add(outputs, ipc_json_describe_non_desktop_output(non_desktop_output));
+                }
+
                 const char *json_string = json_object_to_json_string(outputs);
                 ipc_send_reply(client, payload_type, json_string,
                         (uint32_t)strlen(json_string));
@@ -727,6 +739,8 @@ void ipc_client_handle_command(struct ipc_client *client, uint32_t payload_lengt
                         const char *event_type = json_object_get_string(json_object_array_get_idx(request, i));
                         if (strcmp(event_type, "workspace") == 0) {
                                 client->subscribed_events |= event_mask(IPC_EVENT_WORKSPACE);
+                        } else if (strcmp(event_type, "output") == 0) {
+                                client->subscribed_events |= event_mask(IPC_EVENT_OUTPUT);
                         } else if (strcmp(event_type, "barconfig_update") == 0) {
                                 client->subscribed_events |= event_mask(IPC_EVENT_BARCONFIG_UPDATE);
                         } else if (strcmp(event_type, "bar_state_update") == 0) {
@@ -911,7 +925,6 @@ void ipc_client_handle_command(struct ipc_client *client, uint32_t payload_lengt
 
 exit_cleanup:
         free(buf);
-        return;
 }
 
 bool ipc_send_reply(struct ipc_client *client, enum ipc_command_type payload_type,
@@ -955,7 +968,5 @@ bool ipc_send_reply(struct ipc_client *client, enum ipc_command_type payload_typ
                                 ipc_client_handle_writable, client);
         }
 
-        sway_log(SWAY_DEBUG, "Added IPC reply of type 0x%x to client %d queue: %s",
-                payload_type, client->fd, payload);
         return true;
 }
diff --git a/sway/lock.c b/sway/lock.c
new file mode 100644
index 00000000..8ad9c3f6
--- /dev/null
+++ b/sway/lock.c
@@ -0,0 +1,354 @@
+#define _POSIX_C_SOURCE 200809L
+#include <assert.h>
+#include <wlr/types/wlr_scene.h>
+#include "log.h"
+#include "sway/input/cursor.h"
+#include "sway/input/keyboard.h"
+#include "sway/input/seat.h"
+#include "sway/layers.h"
+#include "sway/output.h"
+#include "sway/server.h"
+
+struct sway_session_lock_output {
+        struct wlr_scene_tree *tree;
+        struct wlr_scene_rect *background;
+        struct sway_session_lock *lock;
+
+        struct sway_output *output;
+
+        struct wl_list link; // sway_session_lock::outputs
+
+        struct wl_listener destroy;
+        struct wl_listener commit;
+
+        struct wlr_session_lock_surface_v1 *surface;
+
+        // invalid if surface is NULL
+        struct wl_listener surface_destroy;
+        struct wl_listener surface_map;
+};
+
+static void focus_surface(struct sway_session_lock *lock,
+                struct wlr_surface *focused) {
+        lock->focused = focused;
+
+        struct sway_seat *seat;
+        wl_list_for_each(seat, &server.input->seats, link) {
+                seat_set_focus_surface(seat, focused, false);
+        }
+}
+
+static void refocus_output(struct sway_session_lock_output *output) {
+        // Move the seat focus to another surface if one is available
+        if (output->lock->focused == output->surface->surface) {
+                struct wlr_surface *next_focus = NULL;
+
+                struct sway_session_lock_output *candidate;
+                wl_list_for_each(candidate, &output->lock->outputs, link) {
+                        if (candidate == output || !candidate->surface) {
+                                continue;
+                        }
+
+                        if (candidate->surface->surface->mapped) {
+                                next_focus = candidate->surface->surface;
+                                break;
+                        }
+                }
+
+                focus_surface(output->lock, next_focus);
+        }
+}
+
+static void handle_surface_map(struct wl_listener *listener, void *data) {
+        struct sway_session_lock_output *surf = wl_container_of(listener, surf, surface_map);
+        if (surf->lock->focused == NULL) {
+                focus_surface(surf->lock, surf->surface->surface);
+        }
+        cursor_rebase_all();
+}
+
+static void handle_surface_destroy(struct wl_listener *listener, void *data) {
+        struct sway_session_lock_output *output =
+                wl_container_of(listener, output, surface_destroy);
+        refocus_output(output);
+
+        sway_assert(output->surface, "Trying to destroy a surface that the lock doesn't think exists");
+        output->surface = NULL;
+        wl_list_remove(&output->surface_destroy.link);
+        wl_list_remove(&output->surface_map.link);
+}
+
+static void lock_output_reconfigure(struct sway_session_lock_output *output) {
+        int width = output->output->width;
+        int height = output->output->height;
+
+        wlr_scene_rect_set_size(output->background, width, height);
+
+        if (output->surface) {
+                wlr_session_lock_surface_v1_configure(output->surface, width, height);
+        }
+}
+
+static void handle_new_surface(struct wl_listener *listener, void *data) {
+        struct sway_session_lock *lock = wl_container_of(listener, lock, new_surface);
+        struct wlr_session_lock_surface_v1 *lock_surface = data;
+        struct sway_output *output = lock_surface->output->data;
+
+        sway_log(SWAY_DEBUG, "new lock layer surface");
+
+        struct sway_session_lock_output *current_lock_output, *lock_output = NULL;
+        wl_list_for_each(current_lock_output, &lock->outputs, link) {
+                if (current_lock_output->output == output) {
+                        lock_output = current_lock_output;
+                        break;
+                }
+        }
+        sway_assert(lock_output, "Couldn't find output to lock");
+        sway_assert(!lock_output->surface, "Tried to reassign a surface to an existing output");
+
+        lock_output->surface = lock_surface;
+
+        wlr_scene_subsurface_tree_create(lock_output->tree, lock_surface->surface);
+
+        lock_output->surface_destroy.notify = handle_surface_destroy;
+        wl_signal_add(&lock_surface->events.destroy, &lock_output->surface_destroy);
+        lock_output->surface_map.notify = handle_surface_map;
+        wl_signal_add(&lock_surface->surface->events.map, &lock_output->surface_map);
+
+        lock_output_reconfigure(lock_output);
+}
+
+static void sway_session_lock_output_destroy(struct sway_session_lock_output *output) {
+        if (output->surface) {
+                refocus_output(output);
+                wl_list_remove(&output->surface_destroy.link);
+                wl_list_remove(&output->surface_map.link);
+        }
+
+        wl_list_remove(&output->commit.link);
+        wl_list_remove(&output->destroy.link);
+        wl_list_remove(&output->link);
+
+        free(output);
+}
+
+static void lock_node_handle_destroy(struct wl_listener *listener, void *data) {
+        struct sway_session_lock_output *output =
+                wl_container_of(listener, output, destroy);
+        sway_session_lock_output_destroy(output);
+}
+
+static void lock_output_handle_commit(struct wl_listener *listener, void *data) {
+        struct wlr_output_event_commit *event = data;
+        struct sway_session_lock_output *output =
+                wl_container_of(listener, output, commit);
+        if (event->state->committed & (
+                        WLR_OUTPUT_STATE_MODE |
+                        WLR_OUTPUT_STATE_SCALE |
+                        WLR_OUTPUT_STATE_TRANSFORM)) {
+                lock_output_reconfigure(output);
+        }
+}
+
+static struct sway_session_lock_output *session_lock_output_create(
+                struct sway_session_lock *lock, struct sway_output *output) {
+        struct sway_session_lock_output *lock_output = calloc(1, sizeof(*lock_output));
+        if (!lock_output) {
+                sway_log(SWAY_ERROR, "failed to allocate a session lock output");
+                return NULL;
+        }
+
+        struct wlr_scene_tree *tree = wlr_scene_tree_create(output->layers.session_lock);
+        if (!tree) {
+                sway_log(SWAY_ERROR, "failed to allocate a session lock output scene tree");
+                free(lock_output);
+                return NULL;
+        }
+
+        struct wlr_scene_rect *background = wlr_scene_rect_create(tree, 0, 0, (float[4]){
+                lock->abandoned ? 1.f : 0.f,
+                0.f,
+                0.f,
+                1.f,
+        });
+        if (!background) {
+                sway_log(SWAY_ERROR, "failed to allocate a session lock output scene background");
+                wlr_scene_node_destroy(&tree->node);
+                free(lock_output);
+                return NULL;
+        }
+
+        lock_output->output = output;
+        lock_output->tree = tree;
+        lock_output->background = background;
+        lock_output->lock = lock;
+
+        lock_output->destroy.notify = lock_node_handle_destroy;
+        wl_signal_add(&tree->node.events.destroy, &lock_output->destroy);
+
+        lock_output->commit.notify = lock_output_handle_commit;
+        wl_signal_add(&output->wlr_output->events.commit, &lock_output->commit);
+
+        lock_output_reconfigure(lock_output);
+
+        wl_list_insert(&lock->outputs, &lock_output->link);
+
+        return lock_output;
+}
+
+static void sway_session_lock_destroy(struct sway_session_lock* lock) {
+        struct sway_session_lock_output *lock_output, *tmp_lock_output;
+        wl_list_for_each_safe(lock_output, tmp_lock_output, &lock->outputs, link) {
+                // destroying the node will also destroy the whole lock output
+                wlr_scene_node_destroy(&lock_output->tree->node);
+        }
+
+        if (server.session_lock.lock == lock) {
+                server.session_lock.lock = NULL;
+        }
+
+        if (!lock->abandoned) {
+                wl_list_remove(&lock->destroy.link);
+                wl_list_remove(&lock->unlock.link);
+                wl_list_remove(&lock->new_surface.link);
+        }
+
+        free(lock);
+}
+
+static void handle_unlock(struct wl_listener *listener, void *data) {
+        struct sway_session_lock *lock = wl_container_of(listener, lock, unlock);
+        sway_log(SWAY_DEBUG, "session unlocked");
+
+        sway_session_lock_destroy(lock);
+
+        struct sway_seat *seat;
+        wl_list_for_each(seat, &server.input->seats, link) {
+                // copied from seat_set_focus_layer -- deduplicate?
+                struct sway_node *previous = seat_get_focus_inactive(seat, &root->node);
+                if (previous) {
+                        // Hack to get seat to re-focus the return value of get_focus
+                        seat_set_focus(seat, NULL);
+                        seat_set_focus(seat, previous);
+                }
+        }
+
+        // Triggers a refocus of the topmost surface layer if necessary
+        // TODO: Make layer surface focus per-output based on cursor position
+        for (int i = 0; i < root->outputs->length; ++i) {
+                struct sway_output *output = root->outputs->items[i];
+                arrange_layers(output);
+        }
+}
+
+static void handle_abandon(struct wl_listener *listener, void *data) {
+        struct sway_session_lock *lock = wl_container_of(listener, lock, destroy);
+        sway_log(SWAY_INFO, "session lock abandoned");
+
+        struct sway_session_lock_output *lock_output;
+        wl_list_for_each(lock_output, &lock->outputs, link) {
+                wlr_scene_rect_set_color(lock_output->background,
+                        (float[4]){ 1.f, 0.f, 0.f, 1.f });
+        }
+
+        lock->abandoned = true;
+        wl_list_remove(&lock->destroy.link);
+        wl_list_remove(&lock->unlock.link);
+        wl_list_remove(&lock->new_surface.link);
+}
+
+static void handle_session_lock(struct wl_listener *listener, void *data) {
+        struct wlr_session_lock_v1 *lock = data;
+        struct wl_client *client = wl_resource_get_client(lock->resource);
+
+        if (server.session_lock.lock) {
+                if (server.session_lock.lock->abandoned) {
+                        sway_log(SWAY_INFO, "Replacing abandoned lock");
+                        sway_session_lock_destroy(server.session_lock.lock);
+                } else {
+                        sway_log(SWAY_ERROR, "Cannot lock an already locked session");
+                        wlr_session_lock_v1_destroy(lock);
+                        return;
+                }
+        }
+
+        struct sway_session_lock *sway_lock = calloc(1, sizeof(*sway_lock));
+        if (!sway_lock) {
+                sway_log(SWAY_ERROR, "failed to allocate a session lock object");
+                wlr_session_lock_v1_destroy(lock);
+                return;
+        }
+
+        wl_list_init(&sway_lock->outputs);
+
+        sway_log(SWAY_DEBUG, "session locked");
+
+        struct sway_seat *seat;
+        wl_list_for_each(seat, &server.input->seats, link) {
+                seat_unfocus_unless_client(seat, client);
+        }
+
+        struct sway_output *output;
+        wl_list_for_each(output, &root->all_outputs, link) {
+                sway_session_lock_add_output(sway_lock, output);
+        }
+
+        sway_lock->new_surface.notify = handle_new_surface;
+        wl_signal_add(&lock->events.new_surface, &sway_lock->new_surface);
+        sway_lock->unlock.notify = handle_unlock;
+        wl_signal_add(&lock->events.unlock, &sway_lock->unlock);
+        sway_lock->destroy.notify = handle_abandon;
+        wl_signal_add(&lock->events.destroy, &sway_lock->destroy);
+
+        wlr_session_lock_v1_send_locked(lock);
+        server.session_lock.lock = sway_lock;
+}
+
+static void handle_session_lock_destroy(struct wl_listener *listener, void *data) {
+        // if the server shuts down while a lock is active, destroy the lock
+        if (server.session_lock.lock) {
+                sway_session_lock_destroy(server.session_lock.lock);
+        }
+
+        wl_list_remove(&server.session_lock.new_lock.link);
+        wl_list_remove(&server.session_lock.manager_destroy.link);
+
+        server.session_lock.manager = NULL;
+}
+
+void sway_session_lock_add_output(struct sway_session_lock *lock,
+                struct sway_output *output) {
+        struct sway_session_lock_output *lock_output =
+                session_lock_output_create(lock, output);
+
+        // if we run out of memory while trying to lock the screen, the best we
+        // can do is kill the sway process. Security conscious users will have
+        // the sway session fall back to a login shell.
+        if (!lock_output) {
+                sway_log(SWAY_ERROR, "aborting: failed to allocate a lock output");
+                abort();
+        }
+}
+
+bool sway_session_lock_has_surface(struct sway_session_lock *lock,
+                struct wlr_surface *surface) {
+        struct sway_session_lock_output *lock_output;
+        wl_list_for_each(lock_output, &lock->outputs, link) {
+                if (lock_output->surface && lock_output->surface->surface == surface) {
+                        return true;
+                }
+        }
+
+        return false;
+}
+
+void sway_session_lock_init(void) {
+        server.session_lock.manager = wlr_session_lock_manager_v1_create(server.wl_display);
+
+        server.session_lock.new_lock.notify = handle_session_lock;
+        server.session_lock.manager_destroy.notify = handle_session_lock_destroy;
+        wl_signal_add(&server.session_lock.manager->events.new_lock,
+                &server.session_lock.new_lock);
+        wl_signal_add(&server.session_lock.manager->events.destroy,
+                &server.session_lock.manager_destroy);
+}
diff --git a/sway/main.c b/sway/main.c
index 0c219fb3..73254dc2 100644
--- a/sway/main.c
+++ b/sway/main.c
@@ -6,12 +6,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/resource.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/un.h>
 #include <unistd.h>
 #include <wlr/util/log.h>
+#include <wlr/version.h>
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/server.h"
@@ -26,6 +28,7 @@
 
 static bool terminate_request = false;
 static int exit_value = 0;
+static struct rlimit original_nofile_rlimit = {0};
 struct sway_server server = {0};
 struct sway_debug debug = {0};
 
@@ -46,81 +49,6 @@ void sig_handler(int signal) {
         sway_terminate(EXIT_SUCCESS);
 }
 
-void detect_raspi(void) {
-        bool raspi = false;
-        FILE *f = fopen("/sys/firmware/devicetree/base/model", "r");
-        if (!f) {
-                return;
-        }
-        char *line = NULL;
-        size_t line_size = 0;
-        while (getline(&line, &line_size, f) != -1) {
-                if (strstr(line, "Raspberry Pi")) {
-                        raspi = true;
-                        break;
-                }
-        }
-        fclose(f);
-        FILE *g = fopen("/proc/modules", "r");
-        if (!g) {
-                free(line);
-                return;
-        }
-        bool vc4 = false;
-        while (getline(&line, &line_size, g) != -1) {
-                if (strstr(line, "vc4")) {
-                        vc4 = true;
-                        break;
-                }
-        }
-        free(line);
-        fclose(g);
-        if (!vc4 && raspi) {
-                fprintf(stderr, "\x1B[1;31mWarning: You have a "
-                                "Raspberry Pi, but the vc4 Module is "
-                                "not loaded! Set 'dtoverlay=vc4-kms-v3d'"
-                                "in /boot/config.txt and reboot.\x1B[0m\n");
-        }
-}
-
-void detect_proprietary(int allow_unsupported_gpu) {
-        FILE *f = fopen("/proc/modules", "r");
-        if (!f) {
-                return;
-        }
-        char *line = NULL;
-        size_t line_size = 0;
-        while (getline(&line, &line_size, f) != -1) {
-                if (strncmp(line, "nvidia ", 7) == 0) {
-                        if (allow_unsupported_gpu) {
-                                sway_log(SWAY_ERROR,
-                                                "!!! Proprietary Nvidia drivers are in use !!!");
-                        } else {
-                                sway_log(SWAY_ERROR,
-                                        "Proprietary Nvidia drivers are NOT supported. "
-                                        "Use Nouveau. To launch sway anyway, launch with "
-                                        "--my-next-gpu-wont-be-nvidia and DO NOT report issues.");
-                                exit(EXIT_FAILURE);
-                        }
-                        break;
-                }
-                if (strstr(line, "fglrx")) {
-                        if (allow_unsupported_gpu) {
-                                sway_log(SWAY_ERROR,
-                                                "!!! Proprietary AMD drivers are in use !!!");
-                        } else {
-                                sway_log(SWAY_ERROR, "Proprietary AMD drivers do NOT support "
-                                        "Wayland. Use radeon. To try anyway, launch sway with "
-                                        "--unsupported-gpu and DO NOT report issues.");
-                                exit(EXIT_FAILURE);
-                        }
-                        break;
-                }
-        }
-        free(line);
-        fclose(f);
-}
-
 void run_as_ipc_client(char *command, char *socket_path) {
         int socketfd = ipc_open_socket(socket_path);
         uint32_t len = strlen(command);
@@ -184,33 +112,49 @@ static void log_kernel(void) {
         pclose(f);
 }
 
-
-static bool drop_permissions(void) {
-        if (getuid() != geteuid() || getgid() != getegid()) {
-                // Set the gid and uid in the correct order.
-                if (setgid(getgid()) != 0) {
-                        sway_log(SWAY_ERROR, "Unable to drop root group, refusing to start");
-                        return false;
-                }
-                if (setuid(getuid()) != 0) {
-                        sway_log(SWAY_ERROR, "Unable to drop root user, refusing to start");
-                        return false;
-                }
+static bool detect_suid(void) {
+        if (geteuid() != 0 && getegid() != 0) {
+                return false;
         }
-        if (setgid(0) != -1 || setuid(0) != -1) {
-                sway_log(SWAY_ERROR, "Unable to drop root (we shouldn't be able to "
-                        "restore it after setuid), refusing to start");
+
+        if (getuid() == geteuid() && getgid() == getegid()) {
                 return false;
         }
+
+        sway_log(SWAY_ERROR, "SUID operation is no longer supported, refusing to start. "
+                        "This check will be removed in a future release.");
         return true;
 }
 
+static void increase_nofile_limit(void) {
+        if (getrlimit(RLIMIT_NOFILE, &original_nofile_rlimit) != 0) {
+                sway_log_errno(SWAY_ERROR, "Failed to bump max open files limit: "
+                        "getrlimit(NOFILE) failed");
+                return;
+        }
+
+        struct rlimit new_rlimit = original_nofile_rlimit;
+        new_rlimit.rlim_cur = new_rlimit.rlim_max;
+        if (setrlimit(RLIMIT_NOFILE, &new_rlimit) != 0) {
+                sway_log_errno(SWAY_ERROR, "Failed to bump max open files limit: "
+                        "setrlimit(NOFILE) failed");
+                sway_log(SWAY_INFO, "Running with %d max open files",
+                        (int)original_nofile_rlimit.rlim_cur);
+        }
+}
+
+void restore_nofile_limit(void) {
+        if (original_nofile_rlimit.rlim_cur == 0) {
+                return;
+        }
+        if (setrlimit(RLIMIT_NOFILE, &original_nofile_rlimit) != 0) {
+                sway_log_errno(SWAY_ERROR, "Failed to restore max open files limit: "
+                        "setrlimit(NOFILE) failed");
+        }
+}
+
 void enable_debug_flag(const char *flag) {
-        if (strcmp(flag, "damage=highlight") == 0) {
-                debug.damage = DAMAGE_HIGHLIGHT;
-        } else if (strcmp(flag, "damage=rerender") == 0) {
-                debug.damage = DAMAGE_RERENDER;
-        } else if (strcmp(flag, "noatomic") == 0) {
+        if (strcmp(flag, "noatomic") == 0) {
                 debug.noatomic = true;
         } else if (strcmp(flag, "txn-wait") == 0) {
                 debug.txn_wait = true;
@@ -218,6 +162,8 @@ void enable_debug_flag(const char *flag) {
                 debug.txn_timings = true;
         } else if (strncmp(flag, "txn-timeout=", 12) == 0) {
                 server.txn_timeout_ms = atoi(&flag[12]);
+        } else if (strcmp(flag, "legacy-wl-drm") == 0) {
+                debug.legacy_wl_drm = true;
         } else {
                 sway_log(SWAY_ERROR, "Unknown debug flag: %s", flag);
         }
@@ -242,36 +188,35 @@ static void handle_wlr_log(enum wlr_log_importance importance,
         _sway_vlog(convert_wlr_log_importance(importance), sway_fmt, args);
 }
 
+static const struct option long_options[] = {
+        {"help", no_argument, NULL, 'h'},
+        {"config", required_argument, NULL, 'c'},
+        {"validate", no_argument, NULL, 'C'},
+        {"debug", no_argument, NULL, 'd'},
+        {"version", no_argument, NULL, 'v'},
+        {"verbose", no_argument, NULL, 'V'},
+        {"get-socketpath", no_argument, NULL, 'p'},
+        {"unsupported-gpu", no_argument, NULL, 'u'},
+        {0, 0, 0, 0}
+};
+
+static const char usage[] =
+        "Usage: sway [options] [command]\n"
+        "\n"
+        "  -h, --help             Show help message and quit.\n"
+        "  -c, --config <config>  Specify a config file.\n"
+        "  -C, --validate         Check the validity of the config file, then exit.\n"
+        "  -d, --debug            Enables full logging, including debug information.\n"
+        "  -v, --version          Show the version number and quit.\n"
+        "  -V, --verbose          Enables more verbose logging.\n"
+        "      --get-socketpath   Gets the IPC socket path and prints it, then exits.\n"
+        "\n";
+
 int main(int argc, char **argv) {
-        static int verbose = 0, debug = 0, validate = 0, allow_unsupported_gpu = 0;
-
-        static struct option long_options[] = {
-                {"help", no_argument, NULL, 'h'},
-                {"config", required_argument, NULL, 'c'},
-                {"validate", no_argument, NULL, 'C'},
-                {"debug", no_argument, NULL, 'd'},
-                {"version", no_argument, NULL, 'v'},
-                {"verbose", no_argument, NULL, 'V'},
-                {"get-socketpath", no_argument, NULL, 'p'},
-                {"unsupported-gpu", no_argument, NULL, 'u'},
-                {"my-next-gpu-wont-be-nvidia", no_argument, NULL, 'u'},
-                {0, 0, 0, 0}
-        };
+        static bool verbose = false, debug = false, validate = false;
 
         char *config_path = NULL;
 
-        const char* usage =
-                "Usage: sway [options] [command]\n"
-                "\n"
-                "  -h, --help             Show help message and quit.\n"
-                "  -c, --config <config>  Specify a config file.\n"
-                "  -C, --validate         Check the validity of the config file, then exit.\n"
-                "  -d, --debug            Enables full logging, including debug information.\n"
-                "  -v, --version          Show the version number and quit.\n"
-                "  -V, --verbose          Enables more verbose logging.\n"
-                "      --get-socketpath   Gets the IPC socket path and prints it, then exits.\n"
-                "\n";
-
         int c;
         while (1) {
                 int option_index = 0;
@@ -289,25 +234,25 @@ int main(int argc, char **argv) {
                         config_path = strdup(optarg);
                         break;
                 case 'C': // validate
-                        validate = 1;
+                        validate = true;
                         break;
                 case 'd': // debug
-                        debug = 1;
+                        debug = true;
                         break;
                 case 'D': // extended debug options
                         enable_debug_flag(optarg);
                         break;
                 case 'u':
-                        allow_unsupported_gpu = 1;
+                        allow_unsupported_gpu = true;
                         break;
                 case 'v': // version
                         printf("sway version " SWAY_VERSION "\n");
                         exit(EXIT_SUCCESS);
                         break;
                 case 'V': // verbose
-                        verbose = 1;
+                        verbose = true;
                         break;
-                case 'p': ; // --get-socketpath
+                case 'p': // --get-socketpath
                         if (getenv("SWAYSOCK")) {
                                 printf("%s\n", getenv("SWAYSOCK"));
                                 exit(EXIT_SUCCESS);
@@ -322,6 +267,11 @@ int main(int argc, char **argv) {
                 }
         }
 
+        // SUID operation is deprecated, so block it for now.
+        if (detect_suid()) {
+                exit(EXIT_FAILURE);
+        }
+
         // Since wayland requires XDG_RUNTIME_DIR to be set, abort with just the
         // clear error message (when not running as an IPC client).
         if (!getenv("XDG_RUNTIME_DIR") && optind == argc) {
@@ -344,11 +294,10 @@ int main(int argc, char **argv) {
         }
 
         sway_log(SWAY_INFO, "Sway version " SWAY_VERSION);
+        sway_log(SWAY_INFO, "wlroots version " WLR_VERSION_STR);
         log_kernel();
         log_distro();
         log_env();
-        detect_proprietary(allow_unsupported_gpu);
-        detect_raspi();
 
         if (optind < argc) { // Behave as IPC client
                 if (optind != 1) {
@@ -361,9 +310,6 @@ int main(int argc, char **argv) {
                                         "`sway -d 2>sway.log`.");
                         exit(EXIT_FAILURE);
                 }
-                if (!drop_permissions()) {
-                        exit(EXIT_FAILURE);
-                }
                 char *socket_path = getenv("SWAYSOCK");
                 if (!socket_path) {
                         sway_log(SWAY_ERROR, "Unable to retrieve socket path");
@@ -375,14 +321,7 @@ int main(int argc, char **argv) {
                 return 0;
         }
 
-        if (!server_privileged_prepare(&server)) {
-                return 1;
-        }
-
-        if (!drop_permissions()) {
-                server_fini(&server);
-                exit(EXIT_FAILURE);
-        }
+        increase_nofile_limit();
 
         // handle SIGTERM signals
         signal(SIGTERM, sig_handler);
@@ -393,12 +332,14 @@ int main(int argc, char **argv) {
 
         sway_log(SWAY_INFO, "Starting sway version " SWAY_VERSION);
 
-        root = root_create();
-
         if (!server_init(&server)) {
                 return 1;
         }
 
+        if (server.linux_dmabuf_v1) {
+                wlr_scene_set_linux_dmabuf_v1(root->root_scene, server.linux_dmabuf_v1);
+        }
+
         if (validate) {
                 bool valid = load_main_config(config_path, false, true);
                 free(config_path);
@@ -413,6 +354,8 @@ int main(int argc, char **argv) {
                 goto shutdown;
         }
 
+        set_rr_scheduling();
+
         if (!server_start(&server)) {
                 sway_terminate(EXIT_FAILURE);
                 goto shutdown;
diff --git a/sway/meson.build b/sway/meson.build
index 6e138101..d937e425 100644
--- a/sway/meson.build
+++ b/sway/meson.build
@@ -5,24 +5,26 @@ sway_sources = files(
         'decoration.c',
         'ipc-json.c',
         'ipc-server.c',
+        'lock.c',
         'main.c',
+        'realtime.c',
+        'scene_descriptor.c',
         'server.c',
+        'sway_text_node.c',
         'swaynag.c',
+        'xdg_activation_v1.c',
         'xdg_decoration.c',
 
-        'desktop/desktop.c',
         'desktop/idle_inhibit_v1.c',
         'desktop/layer_shell.c',
         'desktop/output.c',
-        'desktop/render.c',
-        'desktop/surface.c',
         'desktop/transaction.c',
         'desktop/xdg_shell.c',
+        'desktop/launcher.c',
 
         'input/input-manager.c',
         'input/cursor.c',
         'input/keyboard.c',
-        'input/libinput.c',
         'input/seat.c',
         'input/seatop_default.c',
         'input/seatop_down.c',
@@ -64,6 +66,7 @@ sway_sources = files(
         'commands/force_focus_wrapping.c',
         'commands/fullscreen.c',
         'commands/gaps.c',
+        'commands/gesture.c',
         'commands/hide_edge_borders.c',
         'commands/inhibit_idle.c',
         'commands/kill.c',
@@ -82,6 +85,7 @@ sway_sources = files(
         'commands/nop.c',
         'commands/output.c',
         'commands/popup_during_fullscreen.c',
+        'commands/primary_selection.c',
         'commands/reload.c',
         'commands/rename.c',
         'commands/resize.c',
@@ -153,6 +157,7 @@ sway_sources = files(
         'commands/input/drag.c',
         'commands/input/drag_lock.c',
         'commands/input/dwt.c',
+        'commands/input/dwtp.c',
         'commands/input/events.c',
         'commands/input/left_handed.c',
         'commands/input/map_from_region.c',
@@ -161,9 +166,11 @@ sway_sources = files(
         'commands/input/middle_emulation.c',
         'commands/input/natural_scroll.c',
         'commands/input/pointer_accel.c',
+        'commands/input/rotation_angle.c',
         'commands/input/repeat_delay.c',
         'commands/input/repeat_rate.c',
         'commands/input/scroll_button.c',
+        'commands/input/scroll_button_lock.c',
         'commands/input/scroll_factor.c',
         'commands/input/scroll_method.c',
         'commands/input/tap.c',
@@ -187,11 +194,14 @@ sway_sources = files(
         'commands/output/max_render_time.c',
         'commands/output/mode.c',
         'commands/output/position.c',
+        'commands/output/power.c',
+        'commands/output/render_bit_depth.c',
         'commands/output/scale.c',
         'commands/output/scale_filter.c',
         'commands/output/subpixel.c',
         'commands/output/toggle.c',
         'commands/output/transform.c',
+        'commands/output/unplug.c',
 
         'tree/arrange.c',
         'tree/container.c',
@@ -204,28 +214,34 @@ sway_sources = files(
 
 sway_deps = [
         cairo,
+        drm,
         jsonc,
         libevdev,
         libinput,
+        libudev,
         math,
         pango,
-        pcre,
-        glesv2,
+        pcre2,
         pixman,
-        server_protos,
+        threads,
         wayland_server,
         wlroots,
         xkbcommon,
+        xcb,
+        xcb_icccm,
 ]
 
 if have_xwayland
         sway_sources += 'desktop/xwayland.c'
-        sway_deps += xcb
+endif
+
+if wlroots_features['libinput_backend']
+        sway_sources += 'input/libinput.c'
 endif
 
 executable(
         'sway',
-        sway_sources,
+        sway_sources + wl_protos_src,
         include_directories: [sway_inc],
         dependencies: sway_deps,
         link_with: [lib_sway_common],
diff --git a/sway/realtime.c b/sway/realtime.c
new file mode 100644
index 00000000..11154af0
--- /dev/null
+++ b/sway/realtime.c
@@ -0,0 +1,40 @@
+#include <sys/resource.h>
+#include <sched.h>
+#include <unistd.h>
+#include <pthread.h>
+#include "sway/server.h"
+#include "log.h"
+
+static void child_fork_callback(void) {
+        struct sched_param param;
+
+        param.sched_priority = 0;
+
+        int ret = pthread_setschedparam(pthread_self(), SCHED_OTHER, &param);
+        if (ret != 0) {
+                sway_log(SWAY_ERROR, "Failed to reset scheduler policy on fork");
+        }
+}
+
+void set_rr_scheduling(void) {
+        int prio = sched_get_priority_min(SCHED_RR);
+        int old_policy;
+        int ret;
+        struct sched_param param;
+
+        ret = pthread_getschedparam(pthread_self(), &old_policy, &param);
+        if (ret != 0) {
+                sway_log(SWAY_DEBUG, "Failed to get old scheduling priority");
+                return;
+        }
+
+        param.sched_priority = prio;
+
+        ret = pthread_setschedparam(pthread_self(), SCHED_RR, &param);
+        if (ret != 0) {
+                sway_log(SWAY_INFO, "Failed to set scheduling priority to %d", prio);
+                return;
+        }
+
+        pthread_atfork(NULL, NULL, child_fork_callback);
+}
diff --git a/sway/scene_descriptor.c b/sway/scene_descriptor.c
new file mode 100644
index 00000000..a30d4664
--- /dev/null
+++ b/sway/scene_descriptor.c
@@ -0,0 +1,66 @@
+#include <stdlib.h>
+#include <wlr/util/addon.h>
+#include "log.h"
+#include "sway/scene_descriptor.h"
+
+struct scene_descriptor {
+        void *data;
+        struct wlr_addon addon;
+};
+
+static const struct wlr_addon_interface addon_interface;
+
+static struct scene_descriptor *scene_node_get_descriptor(
+                struct wlr_scene_node *node, enum sway_scene_descriptor_type type) {
+        struct wlr_addon *addon = wlr_addon_find(&node->addons, (void *)type, &addon_interface);
+        if (!addon) {
+                return NULL;
+        }
+
+        struct scene_descriptor *desc = wl_container_of(addon, desc, addon);
+        return desc;
+}
+
+static void descriptor_destroy(struct scene_descriptor *desc) {
+        wlr_addon_finish(&desc->addon);
+        free(desc);
+}
+
+void *scene_descriptor_try_get(struct wlr_scene_node *node,
+                enum sway_scene_descriptor_type type) {
+        struct scene_descriptor *desc = scene_node_get_descriptor(node, type);
+        if (!desc) {
+                return NULL;
+        }
+
+        return desc->data;
+}
+
+void scene_descriptor_destroy(struct wlr_scene_node *node,
+                enum sway_scene_descriptor_type type) {
+        struct scene_descriptor *desc = scene_node_get_descriptor(node, type);
+        descriptor_destroy(desc);
+}
+
+static void addon_handle_destroy(struct wlr_addon *addon) {
+        struct scene_descriptor *desc = wl_container_of(addon, desc, addon);
+        descriptor_destroy(desc);
+}
+
+static const struct wlr_addon_interface addon_interface = {
+        .name = "sway_scene_descriptor",
+        .destroy = addon_handle_destroy,
+};
+
+bool scene_descriptor_assign(struct wlr_scene_node *node,
+                enum sway_scene_descriptor_type type, void *data) {
+        struct scene_descriptor *desc = calloc(1, sizeof(*desc));
+        if (!desc) {
+                sway_log(SWAY_ERROR, "Could not allocate a scene descriptor");
+                return false;
+        }
+
+        wlr_addon_init(&desc->addon, &node->addons, (void *)type, &addon_interface);
+        desc->data = data;
+        return true;
+}
diff --git a/sway/server.c b/sway/server.c
index f51fcfe2..cc20e89d 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -7,25 +7,37 @@
 #include <wlr/backend.h>
 #include <wlr/backend/headless.h>
 #include <wlr/backend/multi.h>
-#include <wlr/backend/noop.h>
-#include <wlr/backend/session.h>
+#include <wlr/config.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_compositor.h>
+#include <wlr/types/wlr_content_type_v1.h>
+#include <wlr/types/wlr_cursor_shape_v1.h>
 #include <wlr/types/wlr_data_control_v1.h>
+#include <wlr/types/wlr_drm.h>
 #include <wlr/types/wlr_export_dmabuf_v1.h>
+#include <wlr/types/wlr_fractional_scale_v1.h>
 #include <wlr/types/wlr_gamma_control_v1.h>
-#include <wlr/types/wlr_idle.h>
+#include <wlr/types/wlr_idle_notify_v1.h>
 #include <wlr/types/wlr_layer_shell_v1.h>
+#include <wlr/types/wlr_linux_dmabuf_v1.h>
 #include <wlr/types/wlr_pointer_constraints_v1.h>
 #include <wlr/types/wlr_primary_selection_v1.h>
 #include <wlr/types/wlr_relative_pointer_v1.h>
 #include <wlr/types/wlr_screencopy_v1.h>
+#include <wlr/types/wlr_security_context_v1.h>
 #include <wlr/types/wlr_server_decoration.h>
+#include <wlr/types/wlr_single_pixel_buffer_v1.h>
+#include <wlr/types/wlr_subcompositor.h>
 #include <wlr/types/wlr_tablet_v2.h>
 #include <wlr/types/wlr_viewporter.h>
 #include <wlr/types/wlr_xcursor_manager.h>
+#include <wlr/types/wlr_xdg_activation_v1.h>
 #include <wlr/types/wlr_xdg_decoration_v1.h>
+#include <wlr/types/wlr_xdg_foreign_registry.h>
+#include <wlr/types/wlr_xdg_foreign_v1.h>
+#include <wlr/types/wlr_xdg_foreign_v2.h>
 #include <wlr/types/wlr_xdg_output_v1.h>
+#include <xf86drm.h>
 #include "config.h"
 #include "list.h"
 #include "log.h"
@@ -34,41 +46,177 @@
 #include "sway/input/input-manager.h"
 #include "sway/output.h"
 #include "sway/server.h"
+#include "sway/input/cursor.h"
 #include "sway/tree/root.h"
+
 #if HAVE_XWAYLAND
+#include <wlr/xwayland/shell.h>
 #include "sway/xwayland.h"
 #endif
 
-bool server_privileged_prepare(struct sway_server *server) {
-        sway_log(SWAY_DEBUG, "Preparing Wayland server initialization");
+#if WLR_HAS_DRM_BACKEND
+#include <wlr/types/wlr_drm_lease_v1.h>
+#endif
+
+#define SWAY_XDG_SHELL_VERSION 2
+#define SWAY_LAYER_SHELL_VERSION 4
+
+bool allow_unsupported_gpu = false;
+
+#if WLR_HAS_DRM_BACKEND
+static void handle_drm_lease_request(struct wl_listener *listener, void *data) {
+        /* We only offer non-desktop outputs, but in the future we might want to do
+         * more logic here. */
+
+        struct wlr_drm_lease_request_v1 *req = data;
+        struct wlr_drm_lease_v1 *lease = wlr_drm_lease_request_v1_grant(req);
+        if (!lease) {
+                sway_log(SWAY_ERROR, "Failed to grant lease request");
+                wlr_drm_lease_request_v1_reject(req);
+        }
+}
+#endif
+
+static bool is_privileged(const struct wl_global *global) {
+#if WLR_HAS_DRM_BACKEND
+        if (server.drm_lease_manager != NULL) {
+                struct wlr_drm_lease_device_v1 *drm_lease_dev;
+                wl_list_for_each(drm_lease_dev, &server.drm_lease_manager->devices, link) {
+                        if (drm_lease_dev->global == global) {
+                                return true;
+                        }
+                }
+        }
+#endif
+
+        return
+                global == server.output_manager_v1->global ||
+                global == server.output_power_manager_v1->global ||
+                global == server.input_method->global ||
+                global == server.foreign_toplevel_manager->global ||
+                global == server.data_control_manager_v1->global ||
+                global == server.screencopy_manager_v1->global ||
+                global == server.export_dmabuf_manager_v1->global ||
+                global == server.security_context_manager_v1->global ||
+                global == server.gamma_control_manager_v1->global ||
+                global == server.layer_shell->global ||
+                global == server.session_lock.manager->global ||
+                global == server.input->keyboard_shortcuts_inhibit->global ||
+                global == server.input->virtual_keyboard->global ||
+                global == server.input->virtual_pointer->global;
+}
+
+static bool filter_global(const struct wl_client *client,
+                const struct wl_global *global, void *data) {
+#if HAVE_XWAYLAND
+        struct wlr_xwayland *xwayland = server.xwayland.wlr_xwayland;
+        if (xwayland && global == xwayland->shell_v1->global) {
+                return xwayland->server != NULL && client == xwayland->server->client;
+        }
+#endif
+
+        // Restrict usage of privileged protocols to unsandboxed clients
+        // TODO: add a way for users to configure an allow-list
+        const struct wlr_security_context_v1_state *security_context =
+                wlr_security_context_manager_v1_lookup_client(
+                server.security_context_manager_v1, (struct wl_client *)client);
+        if (is_privileged(global)) {
+                return security_context == NULL;
+        }
+
+        return true;
+}
+
+static void detect_proprietary(struct wlr_backend *backend, void *data) {
+        int drm_fd = wlr_backend_get_drm_fd(backend);
+        if (drm_fd < 0) {
+                return;
+        }
+
+        drmVersion *version = drmGetVersion(drm_fd);
+        if (version == NULL) {
+                sway_log(SWAY_ERROR, "drmGetVersion() failed");
+                return;
+        }
+
+        bool is_unsupported = false;
+        if (strcmp(version->name, "nvidia-drm") == 0) {
+                is_unsupported = true;
+                sway_log(SWAY_ERROR, "!!! Proprietary Nvidia drivers are in use !!!");
+                if (!allow_unsupported_gpu) {
+                        sway_log(SWAY_ERROR, "Use Nouveau instead");
+                }
+        }
+
+        if (strcmp(version->name, "evdi") == 0) {
+                is_unsupported = true;
+                sway_log(SWAY_ERROR, "!!! Proprietary DisplayLink drivers are in use !!!");
+        }
+
+        if (!allow_unsupported_gpu && is_unsupported) {
+                sway_log(SWAY_ERROR,
+                        "Proprietary drivers are NOT supported. To launch sway anyway, "
+                        "launch with --unsupported-gpu and DO NOT report issues.");
+                exit(EXIT_FAILURE);
+        }
+
+        drmFreeVersion(version);
+}
+
+bool server_init(struct sway_server *server) {
+        sway_log(SWAY_DEBUG, "Initializing Wayland server");
         server->wl_display = wl_display_create();
         server->wl_event_loop = wl_display_get_event_loop(server->wl_display);
-        server->backend = wlr_backend_autocreate(server->wl_display);
 
+        wl_display_set_global_filter(server->wl_display, filter_global, NULL);
+
+        root = root_create(server->wl_display);
+
+        server->backend = wlr_backend_autocreate(server->wl_event_loop, &server->session);
         if (!server->backend) {
                 sway_log(SWAY_ERROR, "Unable to create backend");
                 return false;
         }
-        return true;
-}
 
-bool server_init(struct sway_server *server) {
-        sway_log(SWAY_DEBUG, "Initializing Wayland server");
+        wlr_multi_for_each_backend(server->backend, detect_proprietary, NULL);
+
+        server->renderer = wlr_renderer_autocreate(server->backend);
+        if (!server->renderer) {
+                sway_log(SWAY_ERROR, "Failed to create renderer");
+                return false;
+        }
+
+        wlr_renderer_init_wl_shm(server->renderer, server->wl_display);
+
+        if (wlr_renderer_get_dmabuf_texture_formats(server->renderer) != NULL) {
+                server->linux_dmabuf_v1 = wlr_linux_dmabuf_v1_create_with_renderer(
+                        server->wl_display, 4, server->renderer);
+        }
+        if (wlr_renderer_get_dmabuf_texture_formats(server->renderer) != NULL &&
+                        debug.legacy_wl_drm) {
+                wlr_drm_create(server->wl_display, server->renderer);
+        }
 
-        struct wlr_renderer *renderer = wlr_backend_get_renderer(server->backend);
-        assert(renderer);
+        server->allocator = wlr_allocator_autocreate(server->backend,
+                server->renderer);
+        if (!server->allocator) {
+                sway_log(SWAY_ERROR, "Failed to create allocator");
+                return false;
+        }
 
-        wlr_renderer_init_wl_display(renderer, server->wl_display);
+        server->compositor = wlr_compositor_create(server->wl_display, 6,
+                server->renderer);
 
-        server->compositor = wlr_compositor_create(server->wl_display, renderer);
-        server->compositor_new_surface.notify = handle_compositor_new_surface;
-        wl_signal_add(&server->compositor->events.new_surface,
-                &server->compositor_new_surface);
+        wlr_subcompositor_create(server->wl_display);
 
         server->data_device_manager =
                 wlr_data_device_manager_create(server->wl_display);
 
-        wlr_gamma_control_manager_v1_create(server->wl_display);
+        server->gamma_control_manager_v1 =
+                wlr_gamma_control_manager_v1_create(server->wl_display);
+        server->gamma_control_set_gamma.notify = handle_gamma_control_set_gamma;
+        wl_signal_add(&server->gamma_control_manager_v1->events.set_gamma,
+                &server->gamma_control_set_gamma);
 
         server->new_output.notify = handle_new_output;
         wl_signal_add(&server->backend->events.new_output, &server->new_output);
@@ -78,19 +226,20 @@ bool server_init(struct sway_server *server) {
 
         wlr_xdg_output_manager_v1_create(server->wl_display, root->output_layout);
 
-        server->idle = wlr_idle_create(server->wl_display);
-        server->idle_inhibit_manager_v1 =
-                sway_idle_inhibit_manager_v1_create(server->wl_display, server->idle);
+        server->idle_notifier_v1 = wlr_idle_notifier_v1_create(server->wl_display);
+        sway_idle_inhibit_manager_v1_init();
 
-        server->layer_shell = wlr_layer_shell_v1_create(server->wl_display);
+        server->layer_shell = wlr_layer_shell_v1_create(server->wl_display,
+                SWAY_LAYER_SHELL_VERSION);
         wl_signal_add(&server->layer_shell->events.new_surface,
                 &server->layer_shell_surface);
         server->layer_shell_surface.notify = handle_layer_shell_surface;
 
-        server->xdg_shell = wlr_xdg_shell_create(server->wl_display);
-        wl_signal_add(&server->xdg_shell->events.new_surface,
-                &server->xdg_shell_surface);
-        server->xdg_shell_surface.notify = handle_xdg_shell_surface;
+        server->xdg_shell = wlr_xdg_shell_create(server->wl_display,
+                SWAY_XDG_SHELL_VERSION);
+        wl_signal_add(&server->xdg_shell->events.new_toplevel,
+                &server->xdg_shell_toplevel);
+        server->xdg_shell_toplevel.notify = handle_xdg_shell_toplevel;
 
         server->tablet_v2 = wlr_tablet_v2_create(server->wl_display);
 
@@ -121,8 +270,7 @@ bool server_init(struct sway_server *server) {
         wl_signal_add(&server->pointer_constraints->events.new_constraint,
                 &server->pointer_constraint);
 
-        server->presentation =
-                wlr_presentation_create(server->wl_display, server->backend);
+        wlr_presentation_create(server->wl_display, server->backend);
 
         server->output_manager_v1 =
                 wlr_output_manager_v1_create(server->wl_display);
@@ -144,16 +292,57 @@ bool server_init(struct sway_server *server) {
         server->foreign_toplevel_manager =
                 wlr_foreign_toplevel_manager_v1_create(server->wl_display);
 
-        wlr_export_dmabuf_manager_v1_create(server->wl_display);
-        wlr_screencopy_manager_v1_create(server->wl_display);
-        wlr_data_control_manager_v1_create(server->wl_display);
-        wlr_primary_selection_v1_device_manager_create(server->wl_display);
+        sway_session_lock_init();
+
+#if WLR_HAS_DRM_BACKEND
+        server->drm_lease_manager=
+                wlr_drm_lease_v1_manager_create(server->wl_display, server->backend);
+        if (server->drm_lease_manager) {
+                server->drm_lease_request.notify = handle_drm_lease_request;
+                wl_signal_add(&server->drm_lease_manager->events.request,
+                                &server->drm_lease_request);
+        } else {
+                sway_log(SWAY_DEBUG, "Failed to create wlr_drm_lease_device_v1");
+                sway_log(SWAY_INFO, "VR will not be available");
+        }
+#endif
+
+        server->export_dmabuf_manager_v1 = wlr_export_dmabuf_manager_v1_create(server->wl_display);
+        server->screencopy_manager_v1 = wlr_screencopy_manager_v1_create(server->wl_display);
+        server->data_control_manager_v1 = wlr_data_control_manager_v1_create(server->wl_display);
+        server->security_context_manager_v1 = wlr_security_context_manager_v1_create(server->wl_display);
         wlr_viewporter_create(server->wl_display);
+        wlr_single_pixel_buffer_manager_v1_create(server->wl_display);
+        server->content_type_manager_v1 =
+                wlr_content_type_manager_v1_create(server->wl_display, 1);
+        wlr_fractional_scale_manager_v1_create(server->wl_display, 1);
+
+        struct wlr_xdg_foreign_registry *foreign_registry =
+                wlr_xdg_foreign_registry_create(server->wl_display);
+        wlr_xdg_foreign_v1_create(server->wl_display, foreign_registry);
+        wlr_xdg_foreign_v2_create(server->wl_display, foreign_registry);
+
+        server->xdg_activation_v1 = wlr_xdg_activation_v1_create(server->wl_display);
+        server->xdg_activation_v1_request_activate.notify =
+                xdg_activation_v1_handle_request_activate;
+        wl_signal_add(&server->xdg_activation_v1->events.request_activate,
+                &server->xdg_activation_v1_request_activate);
+        server->xdg_activation_v1_new_token.notify =
+                xdg_activation_v1_handle_new_token;
+        wl_signal_add(&server->xdg_activation_v1->events.new_token,
+                &server->xdg_activation_v1_new_token);
+
+        struct wlr_cursor_shape_manager_v1 *cursor_shape_manager =
+                wlr_cursor_shape_manager_v1_create(server->wl_display, 1);
+        server->request_set_cursor_shape.notify = handle_request_set_cursor_shape;
+        wl_signal_add(&cursor_shape_manager->events.request_set_shape, &server->request_set_cursor_shape);
+
+        wl_list_init(&server->pending_launcher_ctxs);
 
         // Avoid using "wayland-0" as display socket
         char name_candidate[16];
-        for (int i = 1; i <= 32; ++i) {
-                sprintf(name_candidate, "wayland-%d", i);
+        for (unsigned int i = 1; i <= 32; ++i) {
+                snprintf(name_candidate, sizeof(name_candidate), "wayland-%u", i);
                 if (wl_display_add_socket(server->wl_display, name_candidate) >= 0) {
                         server->socket = strdup(name_candidate);
                         break;
@@ -166,27 +355,26 @@ bool server_init(struct sway_server *server) {
                 return false;
         }
 
-        server->noop_backend = wlr_noop_backend_create(server->wl_display);
-
-        struct wlr_output *wlr_output = wlr_noop_add_output(server->noop_backend);
-        root->noop_output = output_create(wlr_output);
-
-        server->headless_backend =
-                wlr_headless_backend_create_with_renderer(server->wl_display, renderer);
+        server->headless_backend = wlr_headless_backend_create(server->wl_event_loop);
         if (!server->headless_backend) {
-                sway_log(SWAY_INFO, "Failed to create secondary headless backend, "
-                        "starting without it");
+                sway_log(SWAY_ERROR, "Failed to create secondary headless backend");
+                wlr_backend_destroy(server->backend);
+                return false;
         } else {
                 wlr_multi_backend_add(server->backend, server->headless_backend);
         }
 
+        struct wlr_output *wlr_output =
+                        wlr_headless_add_output(server->headless_backend, 800, 600);
+        wlr_output_set_name(wlr_output, "FALLBACK");
+        root->fallback_output = output_create(wlr_output);
+
         // This may have been set already via -Dtxn-timeout
         if (!server->txn_timeout_ms) {
                 server->txn_timeout_ms = 200;
         }
 
         server->dirty_nodes = create_list();
-        server->transactions = create_list();
 
         server->input = input_manager_create(server);
         input_manager_get_default_seat(); // create seat0
@@ -202,7 +390,6 @@ void server_fini(struct sway_server *server) {
         wl_display_destroy_clients(server->wl_display);
         wl_display_destroy(server->wl_display);
         list_free(server->dirty_nodes);
-        list_free(server->transactions);
 }
 
 bool server_start(struct sway_server *server) {
@@ -231,6 +418,10 @@ bool server_start(struct sway_server *server) {
         }
 #endif
 
+        if (config->primary_selection) {
+                wlr_primary_selection_v1_device_manager_create(server->wl_display);
+        }
+
         sway_log(SWAY_INFO, "Starting backend on wayland display '%s'",
                         server->socket);
         if (!wlr_backend_start(server->backend)) {
@@ -238,6 +429,7 @@ bool server_start(struct sway_server *server) {
                 wlr_backend_destroy(server->backend);
                 return false;
         }
+
         return true;
 }
 
diff --git a/sway/sway-bar.5.scd b/sway/sway-bar.5.scd
index 80d08449..42e59d57 100644
--- a/sway/sway-bar.5.scd
+++ b/sway/sway-bar.5.scd
@@ -40,7 +40,7 @@ runtime.
 *font* <font>
         Specifies the font to be used in the bar. _font_ should be specified as a
         pango font description. For more information on pango font descriptions,
-        see https://developer.gnome.org/pango/stable/pango-Fonts.html#pango-font-description-from-string
+        see https://docs.gtk.org/Pango/type_func.FontDescription.from_string.html#description
 
 *gaps* <all> | <horizontal> <vertical> | <top> <right> <bottom> <left>
         Sets the gaps from the edge of the screen for the bar. Gaps can either be
diff --git a/sway/sway-input.5.scd b/sway/sway-input.5.scd
index dbf21d93..442311bb 100644
--- a/sway/sway-input.5.scd
+++ b/sway/sway-input.5.scd
@@ -111,6 +111,9 @@ The following commands may only be used in the configuration file.
         Maps inputs from this device to the specified output. Only meaningful if the
         device is a pointer, touch, or drawing tablet device.
 
+        The wildcard _\*_ can be used to map the input device to the whole desktop
+        layout.
+
 *input* <identifier> map_to_region <X> <Y> <width> <height>
         Maps inputs from this device to the specified region of the global output
         layout. Only meaningful if the device is a pointer, touch, or drawing tablet
@@ -118,11 +121,16 @@ The following commands may only be used in the configuration file.
 
 *input* <identifier> map_from_region <X1xY1> <X2xY2>
         Ignores inputs from this device that do not occur within the specified
-        region. Can be in millimeters (e.g. 10x20mm 20x40mm) or in terms of 0..1
-        (e.g. 0.5x0.5 0.7x0.7). Not all devices support millimeters. Only meaningful
-        if the device is not a keyboard and provides events in absolute terms (such
-        as a drawing tablet or touch screen - most pointers provide events relative
-        to the previous frame).
+        region. Can be in millimeters (e.g. 10x20mm 20x40mm) or the fraction of the
+        full available space in terms of 0..1 (e.g. 0.5x0.5 0.7x0.7). Not all
+        devices support millimeters. Only meaningful if the device is not a
+        keyboard and provides events in absolute terms (such as a drawing tablet
+        or touch screen - most pointers provide events relative to the previous
+        frame).
+
+        Commonly used to maintain the aspect ratio of the input device and screen.
+        Cropping a 16:10 input region to match a 16:9 display can use 0x0 1x0.9 as
+        the argument.
 
 ## LIBINPUT CONFIGURATION
 
@@ -144,6 +152,10 @@ The following commands may only be used in the configuration file.
 *input* <identifier> dwt enabled|disabled
         Enables or disables disable-while-typing for the specified input device.
 
+*input* <identifier> dwtp enabled|disabled
+        Enables or disables disable-while-trackpointing for the specified input
+        device.
+
 *input* <identifier> events enabled|disabled|disabled_on_external_mouse|toggle [<toggle-modes>]
         Enables or disables send_events for specified input device. Disabling
         send_events disables the input device.
@@ -168,12 +180,19 @@ The following commands may only be used in the configuration file.
 *input* <identifier> pointer_accel [<-1|1>]
         Changes the pointer acceleration for the specified input device.
 
+*input* <identifier> rotation_angle <angle>
+        Sets the rotation angle of the device to the given clockwise angle in
+        degrees. The angle must be between 0.0 (inclusive) and 360.0 (exclusive).
+
 *input* <identifier> scroll_button disable|button[1-3,8,9]|<event-code-or-name>
         Sets the button used for scroll_method on_button_down. The button can
         be given as an event name or code, which can be obtained from *libinput
         debug-events*, or as a x11 mouse button (button[1-3,8,9]). If set to
         _disable_, it disables the scroll_method on_button_down.
 
+*input* <identifier> scroll_button_lock enabled|disabled
+        Enables or disables scroll button lock for specified input device.
+
 *input* <identifier> scroll_factor <floating point value>
         Changes the scroll factor for the specified input device. Scroll speed will
         be scaled by the given value, which must be non-negative.
@@ -217,6 +236,8 @@ correct seat.
         absolute coordinates (with respect to the global coordinate space).
         Specifying either value as 0 will not update that coordinate.
 
+        Deprecated: use the virtual-pointer Wayland protocol instead.
+
 *seat* <seat> cursor press|release button[1-9]|<event-name-or-code>
         Simulate pressing (or releasing) the specified mouse button on the
         specified seat. The button can either be provided as a button event name or
@@ -225,12 +246,14 @@ correct seat.
         event will be simulated, however _press_ and _release_ will be ignored and
         both will occur.
 
+        Deprecated: use the virtual-pointer Wayland protocol instead.
+
 *seat* <name> fallback true|false
         Set this seat as the fallback seat. A fallback seat will attach any device
         not explicitly attached to another seat (similar to a "default" seat).
 
 *seat* <name> hide_cursor <timeout>|when-typing [enable|disable]
-        Hides the cursor image after the specified event occured.
+        Hides the cursor image after the specified event occurred.
 
         If _timeout_ is specified, then the cursor will be hidden after _timeout_
         (in milliseconds) has elapsed with no activity on the cursor. A timeout of 0
@@ -240,18 +263,16 @@ correct seat.
         If _when-typing_ is enabled, then the cursor will be hidden whenever a key
         is pressed.
 
+        Be aware that this setting can interfere with input handling in games and
+        certain types of software (Gimp, Blender etc) that rely on simultaneous
+        input from mouse and keyboard.
+
 *seat* <name> idle_inhibit <sources...>
         Sets the set of input event sources which can prevent the seat from
         becoming idle, as a space separated list of source names. Valid names are
         "keyboard", "pointer", "touchpad", "touch", "tablet_pad", "tablet_tool",
         and "switch". The default behavior is to prevent idle on any event.
 
-*seat* <name> idle_wake <sources...>
-        Sets the set of input event sources which can wake the seat from
-        its idle state, as a space separated list of source names. Valid names are
-        "keyboard", "pointer", "touchpad", "touch", "tablet_pad", "tablet_tool",
-        and "switch". The default behavior is to wake from idle on any event.
-
 *seat* <name> keyboard_grouping none|smart
         Set how the keyboards in the seat are grouped together. Currently, there
         are two options. _none_ will disable all keyboard grouping. This will make
@@ -274,7 +295,7 @@ correct seat.
         whether future inhibitors are honoured by default, i.e. activated
         automatically, the default being _enable_. When used at runtime,
         _disable_ also disables any currently active inhibitors. _activate_,
-        _deactivate_ and _toggle_ are only useable at runtime and change the
+        _deactivate_ and _toggle_ are only usable at runtime and change the
         state of a potentially existing inhibitor on the currently focused
         window. This can be used with the current seat alias (_-_) to affect
         only the currently focused window of the current seat. Subcommand
diff --git a/sway/sway-ipc.7.scd b/sway/sway-ipc.7.scd
index 1b855959..f4a5ccff 100644
--- a/sway/sway-ipc.7.scd
+++ b/sway/sway-ipc.7.scd
@@ -213,7 +213,10 @@ following properties:
 :  Whether this output is active/enabled
 |- dpms
 :  boolean
-:  Whether this output is on/off (via DPMS)
+:  (Deprecated, use _power_ instead) Whether this output is on/off (via DPMS)
+|- power
+:  boolean
+:  Whether this output is on/off
 |- primary
 :  boolean
 :  For i3 compatibility, this will be false. It does not make sense in Wayland
@@ -294,7 +297,7 @@ following properties:
 Retrieve a JSON representation of the tree
 
 *REPLY*++
-An array of object the represent the current tree. Each object represents one
+An array of objects that represent the current tree. Each object represents one
 node and will have the following properties:
 
 [- *PROPERTY*
@@ -334,8 +337,9 @@ node and will have the following properties:
    this, but borders are included.
 |- window_rect
 :  object
-:  The geometry of the contents inside the node. The window decorations are
-   excluded from this calculation, but borders are included.
+:  The geometry of the content inside the node. These coordinates are relative
+   to the node itself. Window decorations and borders are outside the
+   _window_rect_
 |- deco_rect
 :  object
 :  The geometry of the decorations for the node relative to the parent node
@@ -370,7 +374,7 @@ node and will have the following properties:
    that can be used as an aid in submitting reproduction steps for bug reports
 |- fullscreen_mode
 :  integer
-:  (Only containers and views) The fullscreen mode of the node. 0 means none, 1 means 
+:  (Only containers and views) The fullscreen mode of the node. 0 means none, 1 means
    full workspace, and 2 means global fullscreen
 |- app_id
 :  string
@@ -1131,6 +1135,9 @@ following properties:
 |- xkb_active_layout_index
 :  integer
 :  (Only keyboards) The index of the active keyboard layout in use
+|- scroll_factor
+:  floating
+:  (Only pointers) Multiplier applied on scroll event values.
 |- libinput
 :  object
 :  (Only libinput devices) An object describing the current device settings.
@@ -1188,9 +1195,16 @@ following properties will be included for devices that support them:
 :  int
 :  The scroll button to use when _scroll_method_ is _on_button_down_. This
    will be given as an input event code
+|- scroll_button_lock
+:  string
+:  Whether scroll button lock is enabled. It can be _enabled_ or _disabled_
 |- dwt
 :  string
 :  Whether disable-while-typing is enabled. It can be _enabled_ or _disabled_
+|- dwtp
+:  string
+:  Whether disable-while-trackpointing is enabled. It can be _enabled_ or
+  _disabled_
 |- calibration_matrix
 :  array
 :  An array of 6 floats representing the calibration matrix for absolute
@@ -1230,7 +1244,8 @@ following properties will be included for devices that support them:
                         "click_method": "button_areas",
                         "middle_emulation": "disabled",
                         "scroll_method": "edge",
-                        "dwt": "enabled"
+                        "dwt": "enabled",
+                        "dwtp": "enabled"
                 }
         },
         {
@@ -1357,7 +1372,8 @@ one seat. Each object has the following properties:
                                         "click_method": "button_areas",
                                         "middle_emulation": "disabled",
                                         "scroll_method": "edge",
-                                        "dwt": "enabled"
+                                        "dwt": "enabled",
+                                        "dwtp": "enabled"
                                 }
                         },
                         {
@@ -1433,6 +1449,9 @@ available:
 :  workspace
 :[ Sent whenever an event involving a workspace occurs such as initialization
    of a new workspace or a different workspace gains focus
+|- 0x80000001
+:  output
+:  Sent when outputs are updated
 |- 0x80000002
 :  mode
 :  Sent whenever the binding mode changes
@@ -1553,6 +1572,20 @@ The following change types are currently available:
 }
 ```
 
+## 0x80000001. OUTPUT
+
+Sent whenever an output is added, removed, or its configuration is changed.
+The event is a single object with the property _change_, which is a string
+containing the reason for the change. Currently, the only value for _change_ is
+_unspecified_.
+
+*Example Event:*
+```
+{
+        "change": "unspecified"
+}
+```
+
 ## 0x80000002. MODE
 
 Sent whenever the binding mode changes. The event consists of a single object
diff --git a/sway/sway-output.5.scd b/sway/sway-output.5.scd
index 69f529fe..028cb7ab 100644
--- a/sway/sway-output.5.scd
+++ b/sway/sway-output.5.scd
@@ -24,7 +24,7 @@ must be separated by one space. For example:
 
 # COMMANDS
 
-*output* <name> mode|resolution|res [--custom] <WIDTHxHEIGHT>[@<RATE>Hz]
+*output* <name> mode|resolution|res [--custom] <width>x<height>[@<rate>Hz]
         Configures the specified output to use the given mode. Modes are a
         combination of width and height (in pixels) and a refresh rate that your
         display can be configured to use. For a list of available modes for each
@@ -40,6 +40,16 @@ must be separated by one space. For example:
 
                 output HDMI-A-1 mode 1920x1080@60Hz
 
+*output* <name> modeline <clock> <hdisplay> <hsync_start> <hsync_end> <htotal> <vdisplay> <vsync_start> <vsync_end> <vtotal> <hsync> <vsync>
+        Configures the specified output to use the given modeline. It can be
+        generated using *cvt*(1) and *gtf*(1) commands. See *xorg.conf*(5).
+        Only supported on DRM backend.
+
+        Example:
+
+                output HDMI-A-1 modeline 173.00 1920 2048 2248 2576 1080 1083 1088 1120 -hsync +vsync
+
+
 *output* <name> position|pos <X> <Y>
         Places the specified output at the specific position in the global
         coordinate space. The cursor may only be moved between immediately
@@ -109,12 +119,20 @@ must be separated by one space. For example:
         Enables or disables the specified output (all outputs are enabled by
         default).
 
+        As opposed to the _power_ command, the output will lose its current
+        workspace and windows.
+
 *output* <name> toggle
         Toggle the specified output.
 
-*output* <name> dpms on|off
-        Enables or disables the specified output via DPMS. To turn an output off
-        (ie. blank the screen but keep workspaces as-is), one can set DPMS to off.
+*output* <name> power on|off|toggle
+        Turns on or off the specified output.
+
+        As opposed to the _enable_ and _disable_ commands, the output keeps its
+        current workspaces and windows.
+
+*output* <name> dpms on|off|toggle
+        Deprecated. Alias for _power_.
 
 *output* <name> max_render_time off|<msec>
         Controls when sway composites the output, as a positive number of
@@ -142,11 +160,26 @@ must be separated by one space. For example:
         Enables or disables adaptive synchronization (often referred to as Variable
         Refresh Rate, or by the vendor-specific names FreeSync/G-Sync).
 
-        Adaptive sync allows clients to submit frames a little to late without
+        Adaptive sync allows clients to submit frames a little too late without
         having to wait a whole refresh period to display it on screen. Enabling
         adaptive sync can improve latency, but can cause flickering on some
         hardware.
 
+*output* <name> render_bit_depth 8|10
+        Controls the color channel bit depth at which frames are rendered; the
+        default is currently 8 bits per channel.
+
+        Setting higher values will not have an effect if hardware and software lack
+        support for such bit depths. Successfully increasing the render bit depth
+        will not necessarily increase the bit depth of the frames sent to a display.
+        An increased render bit depth may provide smoother rendering of gradients,
+        and screenshots which can more precisely store the colors of programs
+        which display high bit depth colors.
+
+        Warnings: this can break screenshot/screencast programs which have not been
+        updated to work with different bit depths. This command is experimental,
+        and may be removed or changed in the future.
+
 # SEE ALSO
 
 *sway*(5) *sway-input*(5)
diff --git a/sway/sway.5.scd b/sway/sway.5.scd
index 02592b5f..7e58b528 100644
--- a/sway/sway.5.scd
+++ b/sway/sway.5.scd
@@ -155,7 +155,7 @@ They are expected to be used with *bindsym* or at runtime through *swaymsg*(1).
         is specified, the view will be fullscreen across all outputs.
 
 *gaps* inner|outer|horizontal|vertical|top|right|bottom|left all|current
-set|plus|minus <amount>
+set|plus|minus|toggle <amount>
         Changes the _inner_ or _outer_ gaps for either _all_ workspaces or the
         _current_ workspace. _outer_ gaps can be altered per side with _top_,
         _right_, _bottom_, and _left_ or per direction with _horizontal_ and
@@ -176,6 +176,12 @@ set|plus|minus <amount>
 *layout* default|splith|splitv|stacking|tabbed
         Sets the layout mode of the focused container.
 
+        When using the _stacking_ layout, only the focused window in the container is
+        displayed, with the opened windows' list on the top of the container.
+
+        The _tabbed_ layout is similar to _stacking_, but the windows’ list is vertically
+        split.
+
 *layout* toggle [split|all]
         Cycles the layout mode of the focused container though a preset list of
         layouts. If no argument is given, then it cycles through stacking, tabbed
@@ -210,15 +216,14 @@ set|plus|minus <amount>
         further details.
 
 *move* left|right|up|down [<px> px]
-        Moves the focused container in the direction specified. If the container,
-        the optional _px_ argument specifies how many pixels to move the container.
-        If unspecified, the default is 10 pixels. Pixels are ignored when moving
-        tiled containers.
+        Moves the focused container in the direction specified. The optional _px_
+        argument specifies how many pixels to move the container. If unspecified,
+        the default is 10 pixels. Pixels are ignored when moving tiled containers.
 
-*move* [absolute] position <pos_x> [px|ppt] <pos_y> [px|ptt]
+*move* [absolute] position <pos_x> [px|ppt] <pos_y> [px|ppt]
         Moves the focused container to the specified position in the workspace.
         The position can be specified in pixels or percentage points, omitting
-        the unit defaults to pixels. If _absolute_ is used, the position is
+        the unit defaults to pixels. If _absolute_ is used, the position is
         relative to all outputs. _absolute_ can not be used with percentage points.
 
 *move* [absolute] position center
@@ -319,8 +324,10 @@ set|plus|minus <amount>
         established by the *seat* subcommand of the same name. See
         *sway-input*(5) for more ways to affect inhibitors.
 
-*split* vertical|v|horizontal|h|toggle|t
-        Splits the current container, vertically or horizontally. When _toggle_ is
+*split* vertical|v|horizontal|h|none|n|toggle|t
+        Splits the current container, vertically or horizontally. When _none_ is
+        specified, the effect of a previous split is undone if the current
+        container is the only child of a split parent. When _toggle_ is
         specified, the current container is split opposite to the parent
         container's layout.
 
@@ -382,8 +389,8 @@ runtime.
                 for_window <criteria> move container to output <output>
 
 *bindsym* [--whole-window] [--border] [--exclude-titlebar] [--release] [--locked] \
-[--to-code] [--input-device=<device>] [--no-warn] [--no-repeat] [Group<1-4>+]<key combo> \
-<command>
+[--to-code] [--input-device=<device>] [--no-warn] [--no-repeat] [--inhibited] \
+[Group<1-4>+]<key combo> <command>
         Binds _key combo_ to execute the sway command _command_ when pressed. You
         may use XKB key names here (*wev*(1) is a good tool for discovering these).
         With the flag _--release_, the command is executed when the key combo is
@@ -404,7 +411,7 @@ runtime.
         a keyboard shortcuts inhibitor is active for the currently focused
         window. Such inhibitors are usually requested by remote desktop and
         virtualization software to enable the user to send keyboard shortcuts
-        to the remote or virtual session. The _--inhibited_ flag allows to
+        to the remote or virtual session. The _--inhibited_ flag allows one to
         define bindings which will be exempt from pass-through to such
         software. The same preference logic as for _--locked_ applies.
 
@@ -447,7 +454,8 @@ runtime.
 ```
 
         *bindcode* [--whole-window] [--border] [--exclude-titlebar] [--release] \
-[--locked] [--input-device=<device>] [--no-warn] [Group<1-4>+]<code> <command>
+[--locked] [--input-device=<device>] [--no-warn] [--no-repeat] [--inhibited] \
+[Group<1-4>+]<code> <command>
         is also available for binding with key/button codes instead of key/button names.
 
 *bindswitch* [--locked] [--no-warn] [--reload] <switch>:<state> <command>
@@ -480,6 +488,62 @@ runtime.
                 bindswitch lid:toggle exec echo "Lid moved"
 ```
 
+*bindgesture* [--exact] [--input-device=<device>] [--no-warn] \
+<gesture>[:<fingers>][:directions] <command>
+        Binds _gesture_ to execute the sway command _command_ when detected.
+        Currently supports the _hold_, _pinch_ or _swipe_ gesture. Optionally
+        can be limited to bind to a certain number of _fingers_ or, for a
+        _pinch_ or _swipe_ gesture, to certain _directions_.
+
+[[ *type*
+:[ *fingers*
+:< *direction*
+|  hold
+:- 1 - 5
+:  none
+|  swipe
+:  3 - 5
+:  up, down, left, right
+|  pinch
+:  2 - 5
+:  all above + inward, outward, clockwise, counterclockwise
+
+        The _fingers_ can be limited to any sensible number or left empty to accept
+        any finger counts.
+        Valid directions are _up_, _down_, _left_ and _right_, as well as _inward_,
+        _outward_, _clockwise_, _counterclockwise_ for the _pinch_ gesture.
+        Multiple directions can be combined by a plus.
+
+        If a _input-device_ is given, the binding will only be executed for
+        that input device and will be executed instead of any binding that is
+        generic to all devices. By default, if you overwrite a binding,
+        swaynag will give you a warning. To silence this, use the _--no-warn_ flag.
+
+        The _--exact_ flag can be used to ensure a binding only matches when exactly
+        all specified directions are matched and nothing more. If there is matching
+        binding with _--exact_, it will be preferred.
+
+        The priority for matching bindings is as follows: input device, then
+        exact matches followed by matches with the highest number of matching
+        directions.
+
+        Gestures executed while the pointer is above a bar are not handled by sway.
+        See the respective documentation, e.g. *bindgesture* in *sway-bar*(5).
+
+        Example:
+```
+                # Allow switching between workspaces with left and right swipes
+                bindgesture swipe:right workspace prev
+                bindgesture swipe:left workspace next
+
+                # Allow container movements by pinching them
+                bindgesture pinch:inward+up move up
+                bindgesture pinch:inward+down move down
+                bindgesture pinch:inward+left move left
+                bindgesture pinch:inward+right move right
+
+```
+
 *client.background* <color>
         This command is ignored and is only present for i3 compatibility.
 
@@ -497,6 +561,12 @@ runtime.
         *client.focused_inactive*
                 The most recently focused view within a container which is not focused.
 
+        *client.focused_tab_title*
+                A view that has focused descendant container.
+                Tab or stack container title that is the parent of the focused container
+                but is not directly focused. Defaults to focused_inactive if not
+                specified and does not use the indicator and child_border colors.
+
         *client.placeholder*
                 Ignored (present for i3 compatibility).
 
@@ -552,6 +622,12 @@ The default colors are:
 :  #ffffff
 :  #484e50
 :  #5f676a
+|  *focused_tab_title*
+:  #333333
+:  #5f676a
+:  #ffffff
+:  n/a
+:  n/a
 |  *unfocused*
 :  #333333
 :  #222222
@@ -573,7 +649,8 @@ The default colors are:
 
 
 *default_border* normal|none|pixel [<n>]
-        Set default border style for new tiled windows.
+        Set default border style for new tiled windows. Config reload won't affect
+        existing windows, only newly created ones after the reload.
 
 *default_floating_border* normal|none|pixel [<n>]
         Set default border style for new floating windows. This only applies to
@@ -606,11 +683,11 @@ The default colors are:
         after switching between workspaces.
 
 *focus_on_window_activation* smart|urgent|focus|none
-        This option determines what to do when an xwayland client requests
-        window activation. If set to _urgent_, the urgent state will be set
-        for that window. If set to _focus_, the window will become focused.
-        If set to _smart_, the window will become focused only if it is already
-        visible, otherwise the urgent state will be set. Default is _urgent_.
+        This option determines what to do when a client requests window activation.
+        If set to _urgent_, the urgent state will be set for that window. If set to
+        _focus_, the window will become focused. If set to _smart_, the window will
+        become focused only if it is already visible, otherwise the urgent state
+        will be set. Default is _urgent_.
 
 *focus_wrapping* yes|no|force|workspace
         This option determines what to do when attempting to focus over the edge
@@ -630,14 +707,14 @@ The default colors are:
         should be used instead. Regardless of whether pango markup is enabled,
         _font_ should be specified as a pango font description. For more
         information on pango font descriptions, see
-        https://developer.gnome.org/pango/stable/pango-Fonts.html#pango-font-description-from-string
+        https://docs.gtk.org/Pango/type_func.FontDescription.from_string.html#description
 
 *force_display_urgency_hint* <timeout> [ms]
         If an application on another workspace sets an urgency hint, switching to this
         workspace may lead to immediate focus of the application, which also means the
-        window decoration color would be immediately resetted to *client.focused*. This
+        window decoration color would be immediately reset to *client.focused*. This
         may make it unnecessarily hard to tell which window originally raised the
-        event. This option allows to set a _timeout_ in ms to delay the urgency hint reset.
+        event. This option allows one to set a _timeout_ in ms to delay the urgency hint reset.
 
 *titlebar_border_thickness* <thickness>
         Thickness of the titlebar border in pixels
@@ -690,9 +767,10 @@ The default colors are:
         borders will only be enabled if the workspace has more than one visible
         child and gaps equal to zero.
 
-*smart_gaps* on|off
+*smart_gaps* on|off|toggle|inverse_outer
         If smart_gaps are _on_ gaps will only be enabled if a workspace has more
-        than one child.
+        than one child. If smart_gaps are _inverse_outer_ outer gaps will only
+        be enabled if a workspace has exactly one child.
 
 *mark* --add|--replace [--toggle] <identifier>
         Marks are arbitrary labels that can be used to identify certain windows and
@@ -731,6 +809,10 @@ The default colors are:
         dialog will not be rendered. If _leave_fullscreen_, the view will exit
         fullscreen mode and the dialog will be rendered.
 
+*primary_selection* enabled|disabled
+        Enable or disable the primary selection clipboard. May only be configured
+        at launch. Default is _enabled_.
+
 *set* $<name> <value>
         Sets variable $_name_ to _value_. You can use the new variable in the
         arguments of future commands. When the variable is used, it can be escaped
@@ -771,6 +853,11 @@ The default colors are:
 *unbindswitch* <switch>:<state>
         Removes a binding for when <switch> changes to <state>.
 
+*unbindgesture* [--exact] [--input-device=<device>] \
+<gesture>[:<fingers>][:directions]
+        Removes a binding for the specified _gesture_, _fingers_
+        and _directions_ combination.
+
 *unbindsym* [--whole-window] [--border] [--exclude-titlebar] [--release] [--locked] \
 [--to-code] [--input-device=<device>] <key combo>
         Removes the binding for _key combo_ that was previously bound with the
@@ -876,6 +963,9 @@ properties in practice for your applications.
 
 The following attributes may be matched with:
 
+*all*
+        Matches all windows.
+
 *app_id*
         Compare value against the app id. Can be a regular expression. If value is
         \_\_focused\_\_, then the app id must be the same as that of the currently
@@ -884,7 +974,8 @@ The following attributes may be matched with:
 *class*
         Compare value against the window class. Can be a regular expression. If
         value is \_\_focused\_\_, then the window class must be the same as that of
-        the currently focused window. _class_ are specific to X11 applications.
+        the currently focused window. _class_ are specific to X11 applications and
+        require XWayland.
 
 *con_id*
         Compare against the internal container ID, which you can find via IPC. If
@@ -898,12 +989,14 @@ The following attributes may be matched with:
         Matches floating windows.
 
 *id*
-        Compare value against the X11 window ID. Must be numeric.
+        Compare value against the X11 window ID. Must be numeric. id is specific to
+        X11 applications and requires XWayland.
 
 *instance*
         Compare value against the window instance. Can be a regular expression. If
         value is \_\_focused\_\_, then the window instance must be the same as that
-        of the currently focused window.
+        of the currently focused window. instance is specific to X11 applications and
+        requires XWayland.
 
 *pid*
         Compare value against the window's process ID. Must be numeric.
@@ -928,12 +1021,14 @@ The following attributes may be matched with:
 *window_role*
         Compare against the window role (WM_WINDOW_ROLE). Can be a regular
         expression. If value is \_\_focused\_\_, then the window role must be the
-        same as that of the currently focused window.
+        same as that of the currently focused window. window_role is specific to X11
+        applications and requires XWayland.
 
 *window_type*
         Compare against the window type (\_NET_WM_WINDOW_TYPE). Possible values
         are normal, dialog, utility, toolbar, splash, menu, dropdown_menu,
-        popup_menu, tooltip and notification.
+        popup_menu, tooltip and notification. window_type is specific to X11
+        applications and requires XWayland.
 
 *workspace*
         Compare against the workspace name for this view. Can be a regular
diff --git a/sway/sway_text_node.c b/sway/sway_text_node.c
new file mode 100644
index 00000000..b9a77d94
--- /dev/null
+++ b/sway/sway_text_node.c
@@ -0,0 +1,303 @@
+#define _POSIX_C_SOURCE 200809L
+#include <drm_fourcc.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wlr/types/wlr_buffer.h>
+#include <wlr/interfaces/wlr_buffer.h>
+#include "cairo_util.h"
+#include "log.h"
+#include "pango.h"
+#include "sway/config.h"
+#include "sway/sway_text_node.h"
+
+struct cairo_buffer {
+        struct wlr_buffer base;
+        cairo_surface_t *surface;
+        cairo_t *cairo;
+};
+
+static void cairo_buffer_handle_destroy(struct wlr_buffer *wlr_buffer) {
+        struct cairo_buffer *buffer = wl_container_of(wlr_buffer, buffer, base);
+
+        cairo_surface_destroy(buffer->surface);
+        cairo_destroy(buffer->cairo);
+        free(buffer);
+}
+
+static bool cairo_buffer_handle_begin_data_ptr_access(struct wlr_buffer *wlr_buffer,
+                uint32_t flags, void **data, uint32_t *format, size_t *stride) {
+        struct cairo_buffer *buffer = wl_container_of(wlr_buffer, buffer, base);
+        *data = cairo_image_surface_get_data(buffer->surface);
+        *stride = cairo_image_surface_get_stride(buffer->surface);
+        *format = DRM_FORMAT_ARGB8888;
+        return true;
+}
+
+static void cairo_buffer_handle_end_data_ptr_access(struct wlr_buffer *wlr_buffer) {
+        // This space is intentionally left blank
+}
+
+static const struct wlr_buffer_impl cairo_buffer_impl = {
+        .destroy = cairo_buffer_handle_destroy,
+        .begin_data_ptr_access = cairo_buffer_handle_begin_data_ptr_access,
+        .end_data_ptr_access = cairo_buffer_handle_end_data_ptr_access,
+};
+
+struct text_buffer {
+        struct wlr_scene_buffer *buffer_node;
+        char *text;
+        struct sway_text_node props;
+
+        bool visible;
+        float scale;
+        enum wl_output_subpixel subpixel;
+
+        struct wl_listener outputs_update;
+        struct wl_listener destroy;
+};
+
+static int get_text_width(struct sway_text_node *props) {
+        if (props->max_width) {
+                return MIN(props->max_width, props->width);
+        }
+
+        return props->width;
+}
+
+static void update_source_box(struct text_buffer *buffer) {
+        struct sway_text_node *props = &buffer->props;
+        struct wlr_fbox source_box = {
+                .x = 0,
+                .y = 0,
+                .width = ceil(get_text_width(props) * buffer->scale),
+                .height = ceil(props->height * buffer->scale),
+        };
+
+        wlr_scene_buffer_set_source_box(buffer->buffer_node, &source_box);
+}
+
+static void render_backing_buffer(struct text_buffer *buffer) {
+        if (!buffer->visible) {
+                return;
+        }
+
+        float scale = buffer->scale;
+        int width = ceil(buffer->props.width * scale);
+        int height = ceil(buffer->props.height * scale);
+        float *color = (float *)&buffer->props.color;
+        float *background = (float *)&buffer->props.background;
+        PangoContext *pango = NULL;
+
+        cairo_font_options_t *fo = cairo_font_options_create();
+        cairo_font_options_set_hint_style(fo, CAIRO_HINT_STYLE_FULL);
+        enum wl_output_subpixel subpixel = buffer->subpixel;
+        if (subpixel == WL_OUTPUT_SUBPIXEL_NONE || subpixel == WL_OUTPUT_SUBPIXEL_UNKNOWN) {
+                cairo_font_options_set_antialias(fo, CAIRO_ANTIALIAS_GRAY);
+        } else {
+                cairo_font_options_set_antialias(fo, CAIRO_ANTIALIAS_SUBPIXEL);
+                cairo_font_options_set_subpixel_order(fo, to_cairo_subpixel_order(subpixel));
+        }
+
+        cairo_surface_t *surface = cairo_image_surface_create(
+                        CAIRO_FORMAT_ARGB32, width, height);
+        cairo_status_t status = cairo_surface_status(surface);
+        if (status != CAIRO_STATUS_SUCCESS) {
+                sway_log(SWAY_ERROR, "cairo_image_surface_create failed: %s",
+                        cairo_status_to_string(status));
+                goto err;
+        }
+
+        struct cairo_buffer *cairo_buffer = calloc(1, sizeof(*cairo_buffer));
+        if (!cairo_buffer) {
+                sway_log(SWAY_ERROR, "cairo_buffer allocation failed");
+                goto err;
+        }
+
+        cairo_t *cairo = cairo_create(surface);
+        if (!cairo) {
+                sway_log(SWAY_ERROR, "cairo_create failed");
+                free(cairo_buffer);
+                goto err;
+        }
+
+        cairo_set_antialias(cairo, CAIRO_ANTIALIAS_BEST);
+        cairo_set_font_options(cairo, fo);
+        pango = pango_cairo_create_context(cairo);
+
+        cairo_set_source_rgba(cairo, background[0], background[1], background[2], background[3]);
+        cairo_rectangle(cairo, 0, 0, width, height);
+        cairo_fill(cairo);
+
+        cairo_set_source_rgba(cairo, color[0], color[1], color[2], color[3]);
+        cairo_move_to(cairo, 0, (config->font_baseline - buffer->props.baseline) * scale);
+
+        render_text(cairo, config->font_description, scale, buffer->props.pango_markup,
+                "%s", buffer->text);
+
+        cairo_surface_flush(surface);
+
+        wlr_buffer_init(&cairo_buffer->base, &cairo_buffer_impl, width, height);
+        cairo_buffer->surface = surface;
+        cairo_buffer->cairo = cairo;
+
+        wlr_scene_buffer_set_buffer(buffer->buffer_node, &cairo_buffer->base);
+        wlr_buffer_drop(&cairo_buffer->base);
+        update_source_box(buffer);
+
+        pixman_region32_t opaque;
+        pixman_region32_init(&opaque);
+        if (background[3] == 1) {
+                pixman_region32_union_rect(&opaque, &opaque, 0, 0,
+                        buffer->props.width, buffer->props.height);
+        }
+        wlr_scene_buffer_set_opaque_region(buffer->buffer_node, &opaque);
+        pixman_region32_fini(&opaque);
+
+err:
+        if (pango) g_object_unref(pango);
+        cairo_font_options_destroy(fo);
+}
+
+static void handle_outputs_update(struct wl_listener *listener, void *data) {
+        struct text_buffer *buffer = wl_container_of(listener, buffer, outputs_update);
+        struct wlr_scene_outputs_update_event *event = data;
+
+        float scale = 0;
+        enum wl_output_subpixel subpixel = WL_OUTPUT_SUBPIXEL_UNKNOWN;
+
+        for (size_t i = 0; i < event->size; i++) {
+                struct wlr_scene_output *output = event->active[i];
+                if (subpixel == WL_OUTPUT_SUBPIXEL_UNKNOWN) {
+                        subpixel = output->output->subpixel;
+                } else if (subpixel != output->output->subpixel) {
+                        subpixel = WL_OUTPUT_SUBPIXEL_NONE;
+                }
+
+                if (scale != 0 && scale != output->output->scale) {
+                        // drop down to gray scale if we encounter outputs with different
+                        // scales or else we will have chromatic aberations
+                        subpixel = WL_OUTPUT_SUBPIXEL_NONE;
+                }
+
+                if (scale < output->output->scale) {
+                        scale = output->output->scale;
+                }
+        }
+
+        buffer->visible = event->size > 0;
+
+        if (scale != buffer->scale || subpixel != buffer->subpixel) {
+                buffer->scale = scale;
+                buffer->subpixel = subpixel;
+                render_backing_buffer(buffer);
+        }
+}
+
+static void handle_destroy(struct wl_listener *listener, void *data) {
+        struct text_buffer *buffer = wl_container_of(listener, buffer, destroy);
+
+        wl_list_remove(&buffer->outputs_update.link);
+        wl_list_remove(&buffer->destroy.link);
+
+        free(buffer->text);
+        free(buffer);
+}
+
+static void text_calc_size(struct text_buffer *buffer) {
+        struct sway_text_node *props = &buffer->props;
+
+        cairo_t *c = cairo_create(NULL);
+        if (!c) {
+                sway_log(SWAY_ERROR, "cairo_t allocation failed");
+                return;
+        }
+
+        cairo_set_antialias(c, CAIRO_ANTIALIAS_BEST);
+        get_text_size(c, config->font_description, &props->width, NULL,
+                &props->baseline, 1, props->pango_markup, "%s", buffer->text);
+        cairo_destroy(c);
+
+        wlr_scene_buffer_set_dest_size(buffer->buffer_node,
+                get_text_width(props), props->height);
+}
+
+struct sway_text_node *sway_text_node_create(struct wlr_scene_tree *parent,
+                char *text, float color[4], bool pango_markup) {
+        struct text_buffer *buffer = calloc(1, sizeof(*buffer));
+        if (!buffer) {
+                return NULL;
+        }
+
+        struct wlr_scene_buffer *node = wlr_scene_buffer_create(parent, NULL);
+        if (!node) {
+                free(buffer);
+                return NULL;
+        }
+
+        buffer->buffer_node = node;
+        buffer->props.node = &node->node;
+        buffer->text = strdup(text);
+        if (!buffer->text) {
+                free(buffer);
+                wlr_scene_node_destroy(&node->node);
+                return NULL;
+        }
+
+        buffer->props.height = config->font_height;
+        buffer->props.pango_markup = pango_markup;
+        memcpy(&buffer->props.color, color, sizeof(*color) * 4);
+
+        buffer->destroy.notify = handle_destroy;
+        wl_signal_add(&node->node.events.destroy, &buffer->destroy);
+        buffer->outputs_update.notify = handle_outputs_update;
+        wl_signal_add(&node->events.outputs_update, &buffer->outputs_update);
+
+        text_calc_size(buffer);
+
+        return &buffer->props;
+}
+
+void sway_text_node_set_color(struct sway_text_node *node, float color[4]) {
+        if (memcmp(&node->color, color, sizeof(*color) * 4) == 0) {
+                return;
+        }
+
+        memcpy(&node->color, color, sizeof(*color) * 4);
+        struct text_buffer *buffer = wl_container_of(node, buffer, props);
+
+        render_backing_buffer(buffer);
+}
+
+void sway_text_node_set_text(struct sway_text_node *node, char *text) {
+        struct text_buffer *buffer = wl_container_of(node, buffer, props);
+        if (strcmp(buffer->text, text) == 0) {
+                return;
+        }
+
+        char *new_text = strdup(text);
+        if (!new_text) {
+                return;
+        }
+
+        free(buffer->text);
+        buffer->text = new_text;
+
+        text_calc_size(buffer);
+        render_backing_buffer(buffer);
+}
+
+void sway_text_node_set_max_width(struct sway_text_node *node, int max_width) {
+        struct text_buffer *buffer = wl_container_of(node, buffer, props);
+        buffer->props.max_width = max_width;
+        wlr_scene_buffer_set_dest_size(buffer->buffer_node,
+                get_text_width(&buffer->props), buffer->props.height);
+        update_source_box(buffer);
+        render_backing_buffer(buffer);
+}
+
+void sway_text_node_set_background(struct sway_text_node *node, float background[4]) {
+        struct text_buffer *buffer = wl_container_of(node, buffer, props);
+        memcpy(&node->background, background, sizeof(*background) * 4);
+        render_backing_buffer(buffer);
+}
diff --git a/sway/swaynag.c b/sway/swaynag.c
index db5a919a..6031174d 100644
--- a/sway/swaynag.c
+++ b/sway/swaynag.c
@@ -64,6 +64,8 @@ bool swaynag_spawn(const char *swaynag_command,
                 sway_log(SWAY_ERROR, "Failed to create fork for swaynag");
                 goto failed;
         } else if (pid == 0) {
+                restore_nofile_limit();
+
                 pid = fork();
                 if (pid < 0) {
                         sway_log_errno(SWAY_ERROR, "fork failed");
@@ -87,8 +89,8 @@ bool swaynag_spawn(const char *swaynag_command,
                         size_t length = strlen(swaynag_command) + strlen(swaynag->args) + 2;
                         char *cmd = malloc(length);
                         snprintf(cmd, length, "%s %s", swaynag_command, swaynag->args);
-                        execl("/bin/sh", "/bin/sh", "-c", cmd, NULL);
-                        sway_log_errno(SWAY_ERROR, "execl failed");
+                        execlp("sh", "sh", "-c", cmd, NULL);
+                        sway_log_errno(SWAY_ERROR, "execlp failed");
                         _exit(EXIT_FAILURE);
                 }
                 _exit(EXIT_SUCCESS);
@@ -143,22 +145,16 @@ void swaynag_log(const char *swaynag_command, struct swaynag_instance *swaynag,
 
         va_list args;
         va_start(args, fmt);
-        size_t length = vsnprintf(NULL, 0, fmt, args) + 1;
+        char *str = vformat_str(fmt, args);
         va_end(args);
-
-        char *temp = malloc(length + 1);
-        if (!temp) {
+        if (!str) {
                 sway_log(SWAY_ERROR, "Failed to allocate buffer for swaynag log entry.");
                 return;
         }
 
-        va_start(args, fmt);
-        vsnprintf(temp, length, fmt, args);
-        va_end(args);
-
-        write(swaynag->fd[1], temp, length);
+        write(swaynag->fd[1], str, strlen(str));
 
-        free(temp);
+        free(str);
 }
 
 void swaynag_show(struct swaynag_instance *swaynag) {
diff --git a/sway/tree/arrange.c b/sway/tree/arrange.c
index bac9f2fa..af925d05 100644
--- a/sway/tree/arrange.c
+++ b/sway/tree/arrange.c
@@ -55,7 +55,7 @@ static void apply_horiz_layout(list_t *children, struct wlr_box *parent) {
         // Calculate gap size
         double inner_gap = 0;
         struct sway_container *child = children->items[0];
-        struct sway_workspace *ws = child->workspace;
+        struct sway_workspace *ws = child->pending.workspace;
         if (ws) {
                 inner_gap = ws->gaps_inner;
         }
@@ -66,7 +66,7 @@ static void apply_horiz_layout(list_t *children, struct wlr_box *parent) {
                 if (layout == L_TABBED || layout == L_STACKED) {
                         inner_gap = 0;
                 }
-                temp = temp->parent;
+                temp = temp->pending.parent;
         }
         double total_gap = fmin(inner_gap * (children->length - 1),
                 fmax(0, parent->width - MIN_SANE_W * children->length));
@@ -79,15 +79,15 @@ static void apply_horiz_layout(list_t *children, struct wlr_box *parent) {
         for (int i = 0; i < children->length; ++i) {
                 struct sway_container *child = children->items[i];
                 child->child_total_width = child_total_width;
-                child->x = child_x;
-                child->y = parent->y;
-                child->width = round(child->width_fraction * child_total_width);
-                child->height = parent->height;
-                child_x += child->width + inner_gap;
+                child->pending.x = child_x;
+                child->pending.y = parent->y;
+                child->pending.width = round(child->width_fraction * child_total_width);
+                child->pending.height = parent->height;
+                child_x += child->pending.width + inner_gap;
 
                 // Make last child use remaining width of parent
                 if (i == children->length - 1) {
-                        child->width = parent->x + parent->width - child->x;
+                        child->pending.width = parent->x + parent->width - child->pending.x;
                 }
         }
 }
@@ -134,7 +134,7 @@ static void apply_vert_layout(list_t *children, struct wlr_box *parent) {
         // Calculate gap size
         double inner_gap = 0;
         struct sway_container *child = children->items[0];
-        struct sway_workspace *ws = child->workspace;
+        struct sway_workspace *ws = child->pending.workspace;
         if (ws) {
                 inner_gap = ws->gaps_inner;
         }
@@ -145,7 +145,7 @@ static void apply_vert_layout(list_t *children, struct wlr_box *parent) {
                 if (layout == L_TABBED || layout == L_STACKED) {
                         inner_gap = 0;
                 }
-                temp = temp->parent;
+                temp = temp->pending.parent;
         }
         double total_gap = fmin(inner_gap * (children->length - 1),
                 fmax(0, parent->height - MIN_SANE_H * children->length));
@@ -158,15 +158,15 @@ static void apply_vert_layout(list_t *children, struct wlr_box *parent) {
         for (int i = 0; i < children->length; ++i) {
                 struct sway_container *child = children->items[i];
                 child->child_total_height = child_total_height;
-                child->x = parent->x;
-                child->y = child_y;
-                child->width = parent->width;
-                child->height = round(child->height_fraction * child_total_height);
-                child_y += child->height + inner_gap;
+                child->pending.x = parent->x;
+                child->pending.y = child_y;
+                child->pending.width = parent->width;
+                child->pending.height = round(child->height_fraction * child_total_height);
+                child_y += child->pending.height + inner_gap;
 
                 // Make last child use remaining height of parent
                 if (i == children->length - 1) {
-                        child->height = parent->y + parent->height - child->y;
+                        child->pending.height = parent->y + parent->height - child->pending.y;
                 }
         }
 }
@@ -178,10 +178,10 @@ static void apply_tabbed_layout(list_t *children, struct wlr_box *parent) {
         for (int i = 0; i < children->length; ++i) {
                 struct sway_container *child = children->items[i];
                 int parent_offset = child->view ? 0 : container_titlebar_height();
-                child->x = parent->x;
-                child->y = parent->y + parent_offset;
-                child->width = parent->width;
-                child->height = parent->height - parent_offset;
+                child->pending.x = parent->x;
+                child->pending.y = parent->y + parent_offset;
+                child->pending.width = parent->width;
+                child->pending.height = parent->height - parent_offset;
         }
 }
 
@@ -193,10 +193,10 @@ static void apply_stacked_layout(list_t *children, struct wlr_box *parent) {
                 struct sway_container *child = children->items[i];
                 int parent_offset = child->view ?  0 :
                         container_titlebar_height() * children->length;
-                child->x = parent->x;
-                child->y = parent->y + parent_offset;
-                child->width = parent->width;
-                child->height = parent->height - parent_offset;
+                child->pending.x = parent->x;
+                child->pending.y = parent->y + parent_offset;
+                child->pending.width = parent->width;
+                child->pending.height = parent->height - parent_offset;
         }
 }
 
@@ -246,7 +246,7 @@ void arrange_container(struct sway_container *container) {
         }
         struct wlr_box box;
         container_get_box(container, &box);
-        arrange_children(container->children, container->layout, &box);
+        arrange_children(container->pending.children, container->pending.layout, &box);
         node_set_dirty(&container->node);
 }
 
@@ -264,6 +264,9 @@ void arrange_workspace(struct sway_workspace *workspace) {
                         area->width, area->height, area->x, area->y);
 
         bool first_arrange = workspace->width == 0 && workspace->height == 0;
+        struct wlr_box prev_box;
+        workspace_get_box(workspace, &prev_box);
+
         double prev_x = workspace->x - workspace->current_gaps.left;
         double prev_y = workspace->y - workspace->current_gaps.top;
         workspace->width = area->width;
@@ -277,13 +280,14 @@ void arrange_workspace(struct sway_workspace *workspace) {
         if (!first_arrange && (diff_x != 0 || diff_y != 0)) {
                 for (int i = 0; i < workspace->floating->length; ++i) {
                         struct sway_container *floater = workspace->floating->items[i];
-                        container_floating_translate(floater, diff_x, diff_y);
-                        double center_x = floater->x + floater->width / 2;
-                        double center_y = floater->y + floater->height / 2;
                         struct wlr_box workspace_box;
                         workspace_get_box(workspace, &workspace_box);
-                        if (!wlr_box_contains_point(&workspace_box, center_x, center_y)) {
-                                container_floating_move_to_center(floater);
+                        floating_fix_coordinates(floater, &prev_box, &workspace_box);
+                        // Set transformation for scratchpad windows.
+                        if (floater->scratchpad) {
+                                struct wlr_box output_box;
+                                output_get_box(output, &output_box);
+                                floater->transform = output_box;
                         }
                 }
         }
@@ -294,10 +298,10 @@ void arrange_workspace(struct sway_workspace *workspace) {
                         workspace->x, workspace->y);
         if (workspace->fullscreen) {
                 struct sway_container *fs = workspace->fullscreen;
-                fs->x = output->lx;
-                fs->y = output->ly;
-                fs->width = output->width;
-                fs->height = output->height;
+                fs->pending.x = output->lx;
+                fs->pending.y = output->ly;
+                fs->pending.width = output->width;
+                fs->pending.height = output->height;
                 arrange_container(fs);
         } else {
                 struct wlr_box box;
@@ -311,12 +315,13 @@ void arrange_output(struct sway_output *output) {
         if (config->reloading) {
                 return;
         }
-        const struct wlr_box *output_box = wlr_output_layout_get_box(
-                        root->output_layout, output->wlr_output);
-        output->lx = output_box->x;
-        output->ly = output_box->y;
-        output->width = output_box->width;
-        output->height = output_box->height;
+        struct wlr_box output_box;
+        wlr_output_layout_get_box(root->output_layout,
+                output->wlr_output, &output_box);
+        output->lx = output_box.x;
+        output->ly = output_box.y;
+        output->width = output_box.width;
+        output->height = output_box.height;
 
         for (int i = 0; i < output->workspaces->length; ++i) {
                 struct sway_workspace *workspace = output->workspaces->items[i];
@@ -328,19 +333,19 @@ void arrange_root(void) {
         if (config->reloading) {
                 return;
         }
-        const struct wlr_box *layout_box =
-                wlr_output_layout_get_box(root->output_layout, NULL);
-        root->x = layout_box->x;
-        root->y = layout_box->y;
-        root->width = layout_box->width;
-        root->height = layout_box->height;
+        struct wlr_box layout_box;
+        wlr_output_layout_get_box(root->output_layout, NULL, &layout_box);
+        root->x = layout_box.x;
+        root->y = layout_box.y;
+        root->width = layout_box.width;
+        root->height = layout_box.height;
 
         if (root->fullscreen_global) {
                 struct sway_container *fs = root->fullscreen_global;
-                fs->x = root->x;
-                fs->y = root->y;
-                fs->width = root->width;
-                fs->height = root->height;
+                fs->pending.x = root->x;
+                fs->pending.y = root->y;
+                fs->pending.width = root->width;
+                fs->pending.height = root->height;
                 arrange_container(fs);
         } else {
                 for (int i = 0; i < root->outputs->length; ++i) {
diff --git a/sway/tree/container.c b/sway/tree/container.c
index 6a9ce1c4..30cb97ba 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -1,28 +1,77 @@
 #define _POSIX_C_SOURCE 200809L
 #include <assert.h>
+#include <drm_fourcc.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
-#include <strings.h>
 #include <wayland-server-core.h>
+#include <wlr/types/wlr_linux_dmabuf_v1.h>
 #include <wlr/types/wlr_output_layout.h>
-#include "cairo.h"
-#include "pango.h"
+#include <wlr/types/wlr_subcompositor.h>
+#include "linux-dmabuf-unstable-v1-protocol.h"
 #include "sway/config.h"
-#include "sway/desktop.h"
 #include "sway/desktop/transaction.h"
 #include "sway/input/input-manager.h"
 #include "sway/input/seat.h"
 #include "sway/ipc-server.h"
+#include "sway/scene_descriptor.h"
+#include "sway/sway_text_node.h"
 #include "sway/output.h"
 #include "sway/server.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
+#include "sway/xdg_decoration.h"
 #include "list.h"
 #include "log.h"
 #include "stringop.h"
 
+static void handle_output_enter(
+                struct wl_listener *listener, void *data) {
+        struct sway_container *con = wl_container_of(
+                        listener, con, output_enter);
+        struct wlr_scene_output *output = data;
+
+        if (con->view->foreign_toplevel) {
+                wlr_foreign_toplevel_handle_v1_output_enter(
+                        con->view->foreign_toplevel, output->output);
+        }
+}
+
+static void handle_output_leave(
+                struct wl_listener *listener, void *data) {
+        struct sway_container *con = wl_container_of(
+                        listener, con, output_leave);
+        struct wlr_scene_output *output = data;
+
+        if (con->view->foreign_toplevel) {
+                wlr_foreign_toplevel_handle_v1_output_leave(
+                        con->view->foreign_toplevel, output->output);
+        }
+}
+
+static bool handle_point_accepts_input(
+                struct wlr_scene_buffer *buffer, double *x, double *y) {
+        return false;
+}
+
+static struct wlr_scene_rect *alloc_rect_node(struct wlr_scene_tree *parent,
+                bool *failed) {
+        if (*failed) {
+                return NULL;
+        }
+
+        // just pass in random values. These will be overwritten when
+        // they need to be used.
+        struct wlr_scene_rect *rect = wlr_scene_rect_create(
+                parent, 0, 0, (float[4]){0.f, 0.f, 0.f, 1.f});
+        if (!rect) {
+                sway_log(SWAY_ERROR, "Failed to allocate a wlr_scene_rect");
+                *failed = true;
+        }
+
+        return rect;
+}
+
 struct sway_container *container_create(struct sway_view *view) {
         struct sway_container *c = calloc(1, sizeof(struct sway_container));
         if (!c) {
@@ -30,23 +79,411 @@ struct sway_container *container_create(struct sway_view *view) {
                 return NULL;
         }
         node_init(&c->node, N_CONTAINER, c);
-        c->layout = L_NONE;
-        c->view = view;
-        c->alpha = 1.0f;
+
+        // Container tree structure
+        // - scene tree
+        //   - title bar
+        //     - border
+        //     - background
+        //     - title text
+        //     - marks text
+        //   - border
+        //     - border top/bottom/left/right
+        //     - content_tree (we put the content node here so when we disable the
+        //       border everything gets disabled. We only render the content iff there
+        //       is a border as well)
+        //     - buffer used for output enter/leave events for foreign_toplevel
+        bool failed = false;
+        c->scene_tree = alloc_scene_tree(root->staging, &failed);
+
+        c->title_bar.tree = alloc_scene_tree(c->scene_tree, &failed);
+        c->title_bar.border = alloc_scene_tree(c->title_bar.tree, &failed);
+        c->title_bar.background = alloc_scene_tree(c->title_bar.tree, &failed);
+
+        // for opacity purposes we need to carfully create the scene such that
+        // none of our rect nodes as well as text buffers don't overlap. To do
+        // this we have to create rects such that they go around text buffers
+        for (int i = 0; i < 4; i++) {
+                alloc_rect_node(c->title_bar.border, &failed);
+        }
+
+        for (int i = 0; i < 5; i++) {
+                alloc_rect_node(c->title_bar.background, &failed);
+        }
+
+        c->border.tree = alloc_scene_tree(c->scene_tree, &failed);
+        c->content_tree = alloc_scene_tree(c->border.tree, &failed);
+
+        if (view) {
+                // only containers with views can have borders
+                c->border.top = alloc_rect_node(c->border.tree, &failed);
+                c->border.bottom = alloc_rect_node(c->border.tree, &failed);
+                c->border.left = alloc_rect_node(c->border.tree, &failed);
+                c->border.right = alloc_rect_node(c->border.tree, &failed);
+
+                c->output_handler = wlr_scene_buffer_create(c->border.tree, NULL);
+                if (!c->output_handler) {
+                        sway_log(SWAY_ERROR, "Failed to allocate a scene node");
+                        failed = true;
+                }
+
+                if (!failed) {
+                        c->output_enter.notify = handle_output_enter;
+                        wl_signal_add(&c->output_handler->events.output_enter,
+                                        &c->output_enter);
+                        c->output_leave.notify = handle_output_leave;
+                        wl_signal_add(&c->output_handler->events.output_leave,
+                                        &c->output_leave);
+                        c->output_handler->point_accepts_input = handle_point_accepts_input;
+                }
+        }
+
+        if (!failed && !scene_descriptor_assign(&c->scene_tree->node,
+                        SWAY_SCENE_DESC_CONTAINER, c)) {
+                failed = true;
+        }
+
+        if (failed) {
+                wlr_scene_node_destroy(&c->scene_tree->node);
+                free(c);
+                return NULL;
+        }
 
         if (!view) {
-                c->children = create_list();
+                c->pending.children = create_list();
                 c->current.children = create_list();
         }
+
+        c->pending.layout = L_NONE;
+        c->view = view;
+        c->alpha = 1.0f;
         c->marks = create_list();
-        c->outputs = create_list();
 
         wl_signal_init(&c->events.destroy);
-        wl_signal_emit(&root->events.new_node, &c->node);
+        wl_signal_emit_mutable(&root->events.new_node, &c->node);
+
+        container_update(c);
 
         return c;
 }
 
+static bool container_is_focused(struct sway_container *con, void *data) {
+        return con->current.focused;
+}
+
+static bool container_has_focused_child(struct sway_container *con) {
+        return container_find_child(con, container_is_focused, NULL);
+}
+
+static bool container_is_current_parent_focused(struct sway_container *con) {
+        if (con->current.parent) {
+                struct sway_container *parent = con->current.parent;
+                return parent->current.focused || container_is_current_parent_focused(parent);
+        } else if (con->current.workspace) {
+                struct sway_workspace *ws = con->current.workspace;
+                return ws->current.focused;
+        }
+
+        return false;
+}
+
+static struct border_colors *container_get_current_colors(
+                struct sway_container *con) {
+        struct border_colors *colors;
+
+        bool urgent = con->view ?
+                view_is_urgent(con->view) : container_has_urgent_child(con);
+        struct sway_container *active_child;
+
+        if (con->current.parent) {
+                active_child = con->current.parent->current.focused_inactive_child;
+        } else if (con->current.workspace) {
+                active_child = con->current.workspace->current.focused_inactive_child;
+        } else {
+                active_child = NULL;
+        }
+
+        if (urgent) {
+                colors = &config->border_colors.urgent;
+        } else if (con->current.focused || container_is_current_parent_focused(con)) {
+                colors = &config->border_colors.focused;
+        } else if (config->has_focused_tab_title && container_has_focused_child(con)) {
+                colors = &config->border_colors.focused_tab_title;
+        } else if (con == active_child) {
+                colors = &config->border_colors.focused_inactive;
+        } else {
+                colors = &config->border_colors.unfocused;
+        }
+
+        return colors;
+}
+
+static bool container_is_current_floating(struct sway_container *container) {
+        if (!container->current.parent && container->current.workspace &&
+                        list_find(container->current.workspace->floating, container) != -1) {
+                return true;
+        }
+        if (container->scratchpad) {
+                return true;
+        }
+        return false;
+}
+
+// scene rect wants premultiplied colors
+static void scene_rect_set_color(struct wlr_scene_rect *rect,
+                const float color[4], float opacity) {
+        const float premultiplied[] = {
+                color[0] * color[3] * opacity,
+                color[1] * color[3] * opacity,
+                color[2] * color[3] * opacity,
+                color[3] * opacity,
+        };
+
+        wlr_scene_rect_set_color(rect, premultiplied);
+}
+
+void container_update(struct sway_container *con) {
+        struct border_colors *colors = container_get_current_colors(con);
+        list_t *siblings = NULL;
+        enum sway_container_layout layout = L_NONE;
+        float alpha = con->alpha;
+
+        if (con->current.parent) {
+                siblings = con->current.parent->current.children;
+                layout = con->current.parent->current.layout;
+        } else if (con->current.workspace) {
+                siblings = con->current.workspace->current.tiling;
+                layout = con->current.workspace->current.layout;
+        }
+
+        float bottom[4], right[4];
+        memcpy(bottom, colors->child_border, sizeof(bottom));
+        memcpy(right, colors->child_border, sizeof(right));
+
+        if (!container_is_current_floating(con) && siblings && siblings->length == 1) {
+                if (layout == L_HORIZ) {
+                        memcpy(right, colors->indicator, sizeof(right));
+                } else if (layout == L_VERT) {
+                        memcpy(bottom, colors->indicator, sizeof(bottom));
+                }
+        }
+
+        struct wlr_scene_node *node;
+        wl_list_for_each(node, &con->title_bar.border->children, link) {
+                struct wlr_scene_rect *rect = wlr_scene_rect_from_node(node);
+                scene_rect_set_color(rect, colors->border, alpha);
+        }
+
+        wl_list_for_each(node, &con->title_bar.background->children, link) {
+                struct wlr_scene_rect *rect = wlr_scene_rect_from_node(node);
+                scene_rect_set_color(rect, colors->background, alpha);
+        }
+
+        if (con->view) {
+                scene_rect_set_color(con->border.top, colors->child_border, alpha);
+                scene_rect_set_color(con->border.bottom, bottom, alpha);
+                scene_rect_set_color(con->border.left, colors->child_border, alpha);
+                scene_rect_set_color(con->border.right, right, alpha);
+        }
+
+        if (con->title_bar.title_text) {
+                sway_text_node_set_color(con->title_bar.title_text, colors->text);
+                sway_text_node_set_background(con->title_bar.title_text, colors->background);
+        }
+
+        if (con->title_bar.marks_text) {
+                sway_text_node_set_color(con->title_bar.marks_text, colors->text);
+                sway_text_node_set_background(con->title_bar.marks_text, colors->background);
+        }
+}
+
+void container_update_itself_and_parents(struct sway_container *con) {
+        container_update(con);
+
+        if (con->current.parent) {
+                container_update_itself_and_parents(con->current.parent);
+        }
+}
+
+static void update_rect_list(struct wlr_scene_tree *tree, pixman_region32_t *region) {
+        int len;
+        const pixman_box32_t *rects = pixman_region32_rectangles(region, &len);
+
+        wlr_scene_node_set_enabled(&tree->node, len > 0);
+        if (len == 0) {
+                return;
+        }
+
+        int i = 0;
+        struct wlr_scene_node *node;
+        wl_list_for_each(node, &tree->children, link) {
+                struct wlr_scene_rect *rect = wlr_scene_rect_from_node(node);
+                wlr_scene_node_set_enabled(&rect->node, i < len);
+
+                if (i < len) {
+                        const pixman_box32_t *box = &rects[i++];
+                        wlr_scene_node_set_position(&rect->node, box->x1, box->y1);
+                        wlr_scene_rect_set_size(rect, box->x2 - box->x1, box->y2 - box->y1);
+                }
+        }
+}
+
+void container_arrange_title_bar(struct sway_container *con) {
+        enum alignment title_align = config->title_align;
+        int marks_buffer_width = 0;
+        int width = con->title_width;
+        int height = container_titlebar_height();
+
+        pixman_region32_t text_area;
+        pixman_region32_init(&text_area);
+
+        if (con->title_bar.marks_text) {
+                struct sway_text_node *node = con->title_bar.marks_text;
+                marks_buffer_width = node->width;
+
+                int h_padding;
+                if (title_align == ALIGN_RIGHT) {
+                        h_padding = config->titlebar_h_padding;
+                } else {
+                        h_padding = width - config->titlebar_h_padding - marks_buffer_width;
+                }
+
+                h_padding = MAX(h_padding, 0);
+
+                int alloc_width = MIN((int)node->width,
+                        width - h_padding - config->titlebar_h_padding);
+                sway_text_node_set_max_width(node, alloc_width);
+                wlr_scene_node_set_position(node->node,
+                        h_padding, (height - node->height) >> 1);
+
+                pixman_region32_union_rect(&text_area, &text_area,
+                        node->node->x, node->node->y, alloc_width, node->height);
+        }
+
+        if (con->title_bar.title_text) {
+                struct sway_text_node *node = con->title_bar.title_text;
+
+                int h_padding;
+                if (title_align == ALIGN_RIGHT) {
+                        h_padding = width - config->titlebar_h_padding - node->width;
+                } else if (title_align == ALIGN_CENTER) {
+                        h_padding = ((int)width - marks_buffer_width - node->width) >> 1;
+                } else {
+                        h_padding = config->titlebar_h_padding;
+                }
+
+                h_padding = MAX(h_padding, 0);
+
+                int alloc_width = MIN((int) node->width,
+                        width - h_padding - config->titlebar_h_padding);
+                sway_text_node_set_max_width(node, alloc_width);
+                wlr_scene_node_set_position(node->node,
+                        h_padding, (height - node->height) >> 1);
+
+                pixman_region32_union_rect(&text_area, &text_area,
+                        node->node->x, node->node->y, alloc_width, node->height);
+        }
+
+        // silence pixman errors
+        if (width <= 0 || height <= 0) {
+                pixman_region32_fini(&text_area);
+                return;
+        }
+
+        pixman_region32_t background, border;
+
+        int thickness = config->titlebar_border_thickness;
+        pixman_region32_init_rect(&background,
+                thickness, thickness,
+                width - thickness * 2, height - thickness * 2);
+        pixman_region32_init_rect(&border, 0, 0, width, height);
+        pixman_region32_subtract(&border, &border, &background);
+
+        pixman_region32_subtract(&background, &background, &text_area);
+        pixman_region32_fini(&text_area);
+
+        update_rect_list(con->title_bar.background, &background);
+        pixman_region32_fini(&background);
+
+        update_rect_list(con->title_bar.border, &border);
+        pixman_region32_fini(&border);
+
+        container_update(con);
+}
+
+void container_update_marks(struct sway_container *con) {
+        char *buffer = NULL;
+
+        if (config->show_marks && con->marks->length) {
+                size_t len = 0;
+                for (int i = 0; i < con->marks->length; ++i) {
+                        char *mark = con->marks->items[i];
+                        if (mark[0] != '_') {
+                                len += strlen(mark) + 2;
+                        }
+                }
+                buffer = calloc(len + 1, 1);
+                char *part = malloc(len + 1);
+
+                if (!sway_assert(buffer && part, "Unable to allocate memory")) {
+                        free(buffer);
+                        return;
+                }
+
+                for (int i = 0; i < con->marks->length; ++i) {
+                        char *mark = con->marks->items[i];
+                        if (mark[0] != '_') {
+                                snprintf(part, len + 1, "[%s]", mark);
+                                strcat(buffer, part);
+                        }
+                }
+                free(part);
+        }
+
+        if (!buffer) {
+                if (con->title_bar.marks_text) {
+                        wlr_scene_node_destroy(con->title_bar.marks_text->node);
+                        con->title_bar.marks_text = NULL;
+                }
+        } else if (!con->title_bar.marks_text) {
+                struct border_colors *colors = container_get_current_colors(con);
+
+                con->title_bar.marks_text = sway_text_node_create(con->title_bar.tree,
+                        buffer, colors->text, false);
+        } else {
+                sway_text_node_set_text(con->title_bar.marks_text, buffer);
+        }
+
+        container_arrange_title_bar(con);
+        free(buffer);
+}
+
+void container_update_title_bar(struct sway_container *con) {
+        if (!con->formatted_title) {
+                return;
+        }
+
+        struct border_colors *colors = container_get_current_colors(con);
+
+        if (con->title_bar.title_text) {
+                wlr_scene_node_destroy(con->title_bar.title_text->node);
+                con->title_bar.title_text = NULL;
+        }
+
+        con->title_bar.title_text = sway_text_node_create(con->title_bar.tree,
+                con->formatted_title, colors->text, config->pango_markup);
+
+        // we always have to remake these text buffers completely for text font
+        // changes etc...
+        if (con->title_bar.marks_text) {
+                wlr_scene_node_destroy(con->title_bar.marks_text->node);
+                con->title_bar.marks_text = NULL;
+        }
+
+        container_update_marks(con);
+        container_arrange_title_bar(con);
+}
+
 void container_destroy(struct sway_container *con) {
         if (!sway_assert(con->node.destroying,
                                 "Tried to free container which wasn't marked as destroying")) {
@@ -58,29 +495,21 @@ void container_destroy(struct sway_container *con) {
         }
         free(con->title);
         free(con->formatted_title);
-        wlr_texture_destroy(con->title_focused);
-        wlr_texture_destroy(con->title_focused_inactive);
-        wlr_texture_destroy(con->title_unfocused);
-        wlr_texture_destroy(con->title_urgent);
-        list_free(con->children);
+        list_free(con->pending.children);
         list_free(con->current.children);
-        list_free(con->outputs);
 
         list_free_items_and_destroy(con->marks);
-        wlr_texture_destroy(con->marks_focused);
-        wlr_texture_destroy(con->marks_focused_inactive);
-        wlr_texture_destroy(con->marks_unfocused);
-        wlr_texture_destroy(con->marks_urgent);
 
-        if (con->view) {
-                if (con->view->container == con) {
-                        con->view->container = NULL;
-                }
+        if (con->view && con->view->container == con) {
+                con->view->container = NULL;
+                wlr_scene_node_destroy(&con->output_handler->node);
                 if (con->view->destroying) {
                         view_destroy(con->view);
                 }
         }
 
+        scene_node_disown_children(con->content_tree);
+        wlr_scene_node_destroy(&con->scene_tree->node);
         free(con);
 }
 
@@ -90,14 +519,14 @@ void container_begin_destroy(struct sway_container *con) {
         }
         // The workspace must have the fullscreen pointer cleared so that the
         // seat code can find an appropriate new focus.
-        if (con->fullscreen_mode == FULLSCREEN_WORKSPACE && con->workspace) {
-                con->workspace->fullscreen = NULL;
+        if (con->pending.fullscreen_mode == FULLSCREEN_WORKSPACE && con->pending.workspace) {
+                con->pending.workspace->fullscreen = NULL;
         }
-        if (con->scratchpad && con->fullscreen_mode == FULLSCREEN_GLOBAL) {
+        if (con->scratchpad && con->pending.fullscreen_mode == FULLSCREEN_GLOBAL) {
                 container_fullscreen_disable(con);
         }
 
-        wl_signal_emit(&con->node.events.destroy, &con->node);
+        wl_signal_emit_mutable(&con->node.events.destroy, &con->node);
 
         container_end_mouse_operation(con);
 
@@ -108,11 +537,11 @@ void container_begin_destroy(struct sway_container *con) {
                 root_scratchpad_remove_container(con);
         }
 
-        if (con->fullscreen_mode == FULLSCREEN_GLOBAL) {
+        if (con->pending.fullscreen_mode == FULLSCREEN_GLOBAL) {
                 container_fullscreen_disable(con);
         }
 
-        if (con->parent || con->workspace) {
+        if (con->pending.parent || con->pending.workspace) {
                 container_detach(con);
         }
 }
@@ -121,12 +550,12 @@ void container_reap_empty(struct sway_container *con) {
         if (con->view) {
                 return;
         }
-        struct sway_workspace *ws = con->workspace;
+        struct sway_workspace *ws = con->pending.workspace;
         while (con) {
-                if (con->children->length) {
+                if (con->pending.children->length) {
                         return;
                 }
-                struct sway_container *parent = con->parent;
+                struct sway_container *parent = con->pending.parent;
                 container_begin_destroy(con);
                 con = parent;
         }
@@ -139,9 +568,9 @@ struct sway_container *container_flatten(struct sway_container *container) {
         if (container->view) {
                 return NULL;
         }
-        while (container && container->children->length == 1) {
-                struct sway_container *child = container->children->items[0];
-                struct sway_container *parent = container->parent;
+        while (container && container->pending.children->length == 1) {
+                struct sway_container *child = container->pending.children->items[0];
+                struct sway_container *parent = container->pending.parent;
                 container_replace(container, child);
                 container_begin_destroy(container);
                 container = parent;
@@ -151,11 +580,11 @@ struct sway_container *container_flatten(struct sway_container *container) {
 
 struct sway_container *container_find_child(struct sway_container *container,
                 bool (*test)(struct sway_container *con, void *data), void *data) {
-        if (!container->children) {
+        if (!container->pending.children) {
                 return NULL;
         }
-        for (int i = 0; i < container->children->length; ++i) {
-                struct sway_container *child = container->children->items[i];
+        for (int i = 0; i < container->pending.children->length; ++i) {
+                struct sway_container *child = container->pending.children->items[i];
                 if (test(child, data)) {
                         return child;
                 }
@@ -167,260 +596,44 @@ struct sway_container *container_find_child(struct sway_container *container,
         return NULL;
 }
 
-static struct sway_container *surface_at_view(struct sway_container *con, double lx, double ly,
-                struct wlr_surface **surface, double *sx, double *sy) {
-        if (!sway_assert(con->view, "Expected a view")) {
-                return NULL;
-        }
-        struct sway_view *view = con->view;
-        double view_sx = lx - con->surface_x + view->geometry.x;
-        double view_sy = ly - con->surface_y + view->geometry.y;
-
-        double _sx, _sy;
-        struct wlr_surface *_surface = NULL;
-        switch (view->type) {
-#if HAVE_XWAYLAND
-        case SWAY_VIEW_XWAYLAND:
-                _surface = wlr_surface_surface_at(view->surface,
-                                view_sx, view_sy, &_sx, &_sy);
-                break;
-#endif
-        case SWAY_VIEW_XDG_SHELL:
-                _surface = wlr_xdg_surface_surface_at(
-                                view->wlr_xdg_surface,
-                                view_sx, view_sy, &_sx, &_sy);
-                break;
-        }
-        if (_surface) {
-                *sx = _sx;
-                *sy = _sy;
-                *surface = _surface;
-                return con;
-        }
-        return NULL;
-}
-
-/**
- * container_at for a container with layout L_TABBED.
- */
-static struct sway_container *container_at_tabbed(struct sway_node *parent,
-                double lx, double ly,
-                struct wlr_surface **surface, double *sx, double *sy) {
-        struct wlr_box box;
-        node_get_box(parent, &box);
-        if (lx < box.x || lx > box.x + box.width ||
-                        ly < box.y || ly > box.y + box.height) {
-                return NULL;
-        }
-        struct sway_seat *seat = input_manager_current_seat();
-        list_t *children = node_get_children(parent);
-        if (!children->length) {
-                return NULL;
-        }
-
-        // Tab titles
-        int title_height = container_titlebar_height();
-        if (ly < box.y + title_height) {
-                int tab_width = box.width / children->length;
-                int child_index = (lx - box.x) / tab_width;
-                if (child_index >= children->length) {
-                        child_index = children->length - 1;
-                }
-                struct sway_container *child = children->items[child_index];
-                return child;
-        }
-
-        // Surfaces
-        struct sway_node *current = seat_get_active_tiling_child(seat, parent);
-        return current ? tiling_container_at(current, lx, ly, surface, sx, sy) : NULL;
-}
-
-/**
- * container_at for a container with layout L_STACKED.
- */
-static struct sway_container *container_at_stacked(struct sway_node *parent,
-                double lx, double ly,
-                struct wlr_surface **surface, double *sx, double *sy) {
-        struct wlr_box box;
-        node_get_box(parent, &box);
-        if (lx < box.x || lx > box.x + box.width ||
-                        ly < box.y || ly > box.y + box.height) {
-                return NULL;
-        }
-        struct sway_seat *seat = input_manager_current_seat();
-        list_t *children = node_get_children(parent);
-
-        // Title bars
-        int title_height = container_titlebar_height();
-        if (title_height > 0) {
-                int child_index = (ly - box.y) / title_height;
-                if (child_index < children->length) {
-                        struct sway_container *child = children->items[child_index];
-                        return child;
+void container_for_each_child(struct sway_container *container,
+                void (*f)(struct sway_container *container, void *data),
+                void *data) {
+        if (container->pending.children)  {
+                for (int i = 0; i < container->pending.children->length; ++i) {
+                        struct sway_container *child = container->pending.children->items[i];
+                        f(child, data);
+                        container_for_each_child(child, f, data);
                 }
         }
-
-        // Surfaces
-        struct sway_node *current = seat_get_active_tiling_child(seat, parent);
-        return current ? tiling_container_at(current, lx, ly, surface, sx, sy) : NULL;
 }
 
-/**
- * container_at for a container with layout L_HORIZ or L_VERT.
- */
-static struct sway_container *container_at_linear(struct sway_node *parent,
-                double lx, double ly,
-                struct wlr_surface **surface, double *sx, double *sy) {
-        list_t *children = node_get_children(parent);
-        for (int i = 0; i < children->length; ++i) {
-                struct sway_container *child = children->items[i];
-                struct sway_container *container =
-                        tiling_container_at(&child->node, lx, ly, surface, sx, sy);
-                if (container) {
-                        return container;
-                }
-        }
-        return NULL;
-}
+struct sway_container *container_obstructing_fullscreen_container(struct sway_container *container)
+{
+        struct sway_workspace *workspace = container->pending.workspace;
 
-static struct sway_container *floating_container_at(double lx, double ly,
-                struct wlr_surface **surface, double *sx, double *sy) {
-        // For outputs with floating containers that overhang the output bounds,
-        // those at the end of the output list appear on top of floating
-        // containers from other outputs, so iterate the list in reverse.
-        for (int i = root->outputs->length - 1; i >= 0; --i) {
-                struct sway_output *output = root->outputs->items[i];
-                for (int j = 0; j < output->workspaces->length; ++j) {
-                        struct sway_workspace *ws = output->workspaces->items[j];
-                        if (!workspace_is_visible(ws)) {
-                                continue;
-                        }
-                        // Items at the end of the list are on top, so iterate the list in
-                        // reverse.
-                        for (int k = ws->floating->length - 1; k >= 0; --k) {
-                                struct sway_container *floater = ws->floating->items[k];
-                                struct sway_container *container =
-                                        tiling_container_at(&floater->node, lx, ly, surface, sx, sy);
-                                if (container) {
-                                        return container;
-                                }
-                        }
+        if (workspace && workspace->fullscreen && !container_is_fullscreen_or_child(container)) {
+                if (container_is_transient_for(container, workspace->fullscreen)) {
+                        return NULL;
                 }
-        }
-        return NULL;
-}
-
-struct sway_container *view_container_at(struct sway_node *parent,
-                double lx, double ly,
-                struct wlr_surface **surface, double *sx, double *sy) {
-        if (!sway_assert(node_is_view(parent), "Expected a view")) {
-                return NULL;
-        }
-
-        struct sway_container *container = parent->sway_container;
-        struct wlr_box box = {
-                        .x = container->x,
-                        .y = container->y,
-                        .width = container->width,
-                        .height = container->height,
-        };
-
-        if (wlr_box_contains_point(&box, lx, ly)) {
-                surface_at_view(parent->sway_container, lx, ly, surface, sx, sy);
-                return container;
+                return workspace->fullscreen;
         }
 
-        return NULL;
-}
-
-struct sway_container *tiling_container_at(struct sway_node *parent,
-                double lx, double ly,
-                struct wlr_surface **surface, double *sx, double *sy) {
-        if (node_is_view(parent)) {
-                return view_container_at(parent, lx, ly, surface, sx, sy);
-        }
-        if (!node_get_children(parent)) {
-                return NULL;
-        }
-        switch (node_get_layout(parent)) {
-        case L_HORIZ:
-        case L_VERT:
-                return container_at_linear(parent, lx, ly, surface, sx, sy);
-        case L_TABBED:
-                return container_at_tabbed(parent, lx, ly, surface, sx, sy);
-        case L_STACKED:
-                return container_at_stacked(parent, lx, ly, surface, sx, sy);
-        case L_NONE:
-                return NULL;
-        }
-        return NULL;
-}
-
-static bool surface_is_popup(struct wlr_surface *surface) {
-        if (wlr_surface_is_xdg_surface(surface)) {
-                struct wlr_xdg_surface *xdg_surface =
-                        wlr_xdg_surface_from_wlr_surface(surface);
-                while (xdg_surface && xdg_surface->role != WLR_XDG_SURFACE_ROLE_NONE) {
-                        if (xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP) {
-                                return true;
-                        }
-                        xdg_surface = xdg_surface->toplevel->parent;
+        struct sway_container *fullscreen_global = root->fullscreen_global;
+        if (fullscreen_global && container != fullscreen_global && !container_has_ancestor(container, fullscreen_global)) {
+                if (container_is_transient_for(container, fullscreen_global)) {
+                        return NULL;
                 }
-                return false;
+                return fullscreen_global;
         }
 
-        return false;
-}
-
-struct sway_container *container_at(struct sway_workspace *workspace,
-                double lx, double ly,
-                struct wlr_surface **surface, double *sx, double *sy) {
-        struct sway_container *c;
-
-        struct sway_seat *seat = input_manager_current_seat();
-        struct sway_container *focus = seat_get_focused_container(seat);
-        bool is_floating = focus && container_is_floating_or_child(focus);
-        // Focused view's popups
-        if (focus && focus->view) {
-                c = surface_at_view(focus, lx, ly, surface, sx, sy);
-                if (c && surface_is_popup(*surface)) {
-                        return c;
-                }
-                *surface = NULL;
-        }
-        // Floating
-        if ((c = floating_container_at(lx, ly, surface ,sx ,sy))) {
-                return c;
-        }
-        // Tiling (focused)
-        if (focus && focus->view && !is_floating) {
-                if ((c = surface_at_view(focus, lx, ly, surface, sx, sy))) {
-                        return c;
-                }
-        }
-        // Tiling (non-focused)
-        if ((c = tiling_container_at(&workspace->node, lx, ly, surface, sx, sy))) {
-                return c;
-        }
         return NULL;
 }
 
-void container_for_each_child(struct sway_container *container,
-                void (*f)(struct sway_container *container, void *data),
-                void *data) {
-        if (container->children)  {
-                for (int i = 0; i < container->children->length; ++i) {
-                        struct sway_container *child = container->children->items[i];
-                        f(child, data);
-                        container_for_each_child(child, f, data);
-                }
-        }
-}
-
 bool container_has_ancestor(struct sway_container *descendant,
                 struct sway_container *ancestor) {
         while (descendant) {
-                descendant = descendant->parent;
+                descendant = descendant->pending.parent;
                 if (descendant == ancestor) {
                         return true;
                 }
@@ -428,119 +641,6 @@ bool container_has_ancestor(struct sway_container *descendant,
         return false;
 }
 
-void container_damage_whole(struct sway_container *container) {
-        for (int i = 0; i < root->outputs->length; ++i) {
-                struct sway_output *output = root->outputs->items[i];
-                output_damage_whole_container(output, container);
-        }
-}
-
-/**
- * Return the output which will be used for scale purposes.
- * This is the most recently entered output.
- */
-struct sway_output *container_get_effective_output(struct sway_container *con) {
-        if (con->outputs->length == 0) {
-                return NULL;
-        }
-        return con->outputs->items[con->outputs->length - 1];
-}
-
-static void update_title_texture(struct sway_container *con,
-                struct wlr_texture **texture, struct border_colors *class) {
-        struct sway_output *output = container_get_effective_output(con);
-        if (!output) {
-                return;
-        }
-        if (*texture) {
-                wlr_texture_destroy(*texture);
-                *texture = NULL;
-        }
-        if (!con->formatted_title) {
-                return;
-        }
-
-        double scale = output->wlr_output->scale;
-        int width = 0;
-        int height = con->title_height * scale;
-
-        // We must use a non-nil cairo_t for cairo_set_font_options to work.
-        // Therefore, we cannot use cairo_create(NULL).
-        cairo_surface_t *dummy_surface = cairo_image_surface_create(
-                        CAIRO_FORMAT_ARGB32, 0, 0);
-        cairo_t *c = cairo_create(dummy_surface);
-        cairo_set_antialias(c, CAIRO_ANTIALIAS_BEST);
-        cairo_font_options_t *fo = cairo_font_options_create();
-        cairo_font_options_set_hint_style(fo, CAIRO_HINT_STYLE_FULL);
-        if (output->wlr_output->subpixel == WL_OUTPUT_SUBPIXEL_NONE) {
-                cairo_font_options_set_antialias(fo, CAIRO_ANTIALIAS_GRAY);
-        } else {
-                cairo_font_options_set_antialias(fo, CAIRO_ANTIALIAS_SUBPIXEL);
-                cairo_font_options_set_subpixel_order(fo,
-                        to_cairo_subpixel_order(output->wlr_output->subpixel));
-        }
-        cairo_set_font_options(c, fo);
-        get_text_size(c, config->font, &width, NULL, NULL, scale,
-                        config->pango_markup, "%s", con->formatted_title);
-        cairo_surface_destroy(dummy_surface);
-        cairo_destroy(c);
-
-        cairo_surface_t *surface = cairo_image_surface_create(
-                        CAIRO_FORMAT_ARGB32, width, height);
-        cairo_t *cairo = cairo_create(surface);
-        cairo_set_antialias(cairo, CAIRO_ANTIALIAS_BEST);
-        cairo_set_font_options(cairo, fo);
-        cairo_font_options_destroy(fo);
-        cairo_set_source_rgba(cairo, class->background[0], class->background[1],
-                        class->background[2], class->background[3]);
-        cairo_paint(cairo);
-        PangoContext *pango = pango_cairo_create_context(cairo);
-        cairo_set_source_rgba(cairo, class->text[0], class->text[1],
-                        class->text[2], class->text[3]);
-        cairo_move_to(cairo, 0, 0);
-
-        pango_printf(cairo, config->font, scale, config->pango_markup,
-                        "%s", con->formatted_title);
-
-        cairo_surface_flush(surface);
-        unsigned char *data = cairo_image_surface_get_data(surface);
-        int stride = cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, width);
-        struct wlr_renderer *renderer = wlr_backend_get_renderer(
-                        output->wlr_output->backend);
-        *texture = wlr_texture_from_pixels(
-                        renderer, WL_SHM_FORMAT_ARGB8888, stride, width, height, data);
-        cairo_surface_destroy(surface);
-        g_object_unref(pango);
-        cairo_destroy(cairo);
-}
-
-void container_update_title_textures(struct sway_container *container) {
-        update_title_texture(container, &container->title_focused,
-                        &config->border_colors.focused);
-        update_title_texture(container, &container->title_focused_inactive,
-                        &config->border_colors.focused_inactive);
-        update_title_texture(container, &container->title_unfocused,
-                        &config->border_colors.unfocused);
-        update_title_texture(container, &container->title_urgent,
-                        &config->border_colors.urgent);
-        container_damage_whole(container);
-}
-
-void container_calculate_title_height(struct sway_container *container) {
-        if (!container->formatted_title) {
-                container->title_height = 0;
-                return;
-        }
-        cairo_t *cairo = cairo_create(NULL);
-        int height;
-        int baseline;
-        get_text_size(cairo, config->font, NULL, &height, &baseline, 1,
-                        config->pango_markup, "%s", container->formatted_title);
-        cairo_destroy(cairo);
-        container->title_height = height;
-        container->title_baseline = baseline;
-}
-
 /**
  * Calculate and return the length of the tree representation.
  * An example tree representation is: V[Terminal, Firefox]
@@ -596,23 +696,28 @@ size_t container_build_representation(enum sway_container_layout layout,
 
 void container_update_representation(struct sway_container *con) {
         if (!con->view) {
-                size_t len = container_build_representation(con->layout,
-                                con->children, NULL);
+                size_t len = container_build_representation(con->pending.layout,
+                                con->pending.children, NULL);
                 free(con->formatted_title);
                 con->formatted_title = calloc(len + 1, sizeof(char));
                 if (!sway_assert(con->formatted_title,
                                         "Unable to allocate title string")) {
                         return;
                 }
-                container_build_representation(con->layout, con->children,
+                container_build_representation(con->pending.layout, con->pending.children,
                                 con->formatted_title);
-                container_calculate_title_height(con);
-                container_update_title_textures(con);
+
+                if (con->title_bar.title_text) {
+                        sway_text_node_set_text(con->title_bar.title_text, con->formatted_title);
+                        container_arrange_title_bar(con);
+                } else {
+                        container_update_title_bar(con);
+                }
         }
-        if (con->parent) {
-                container_update_representation(con->parent);
-        } else if (con->workspace) {
-                workspace_update_representation(con->workspace);
+        if (con->pending.parent) {
+                container_update_representation(con->pending.parent);
+        } else if (con->pending.workspace) {
+                workspace_update_representation(con->pending.workspace);
         }
 }
 
@@ -638,12 +743,13 @@ void floating_calculate_constraints(int *min_width, int *max_width,
                 *min_height = config->floating_minimum_height;
         }
 
-        struct wlr_box *box = wlr_output_layout_get_box(root->output_layout, NULL);
+        struct wlr_box box;
+        wlr_output_layout_get_box(root->output_layout, NULL, &box);
 
         if (config->floating_maximum_width == -1) { // no maximum
                 *max_width = INT_MAX;
         } else if (config->floating_maximum_width == 0) { // automatic
-                *max_width = box->width;
+                *max_width = box.width;
         } else {
                 *max_width = config->floating_maximum_width;
         }
@@ -651,99 +757,112 @@ void floating_calculate_constraints(int *min_width, int *max_width,
         if (config->floating_maximum_height == -1) { // no maximum
                 *max_height = INT_MAX;
         } else if (config->floating_maximum_height == 0) { // automatic
-                *max_height = box->height;
+                *max_height = box.height;
         } else {
                 *max_height = config->floating_maximum_height;
         }
 
 }
 
+void floating_fix_coordinates(struct sway_container *con, struct wlr_box *old, struct wlr_box *new) {
+        if (!old->width || !old->height) {
+                // Fall back to centering on the workspace.
+                container_floating_move_to_center(con);
+        } else {
+                int rel_x = con->pending.x - old->x + (con->pending.width / 2);
+                int rel_y = con->pending.y - old->y + (con->pending.height / 2);
+
+                con->pending.x = new->x + (double)(rel_x * new->width) / old->width - (con->pending.width / 2);
+                con->pending.y = new->y + (double)(rel_y * new->height) / old->height - (con->pending.height / 2);
+
+                sway_log(SWAY_DEBUG, "Transformed container %p to coords (%f, %f)", con, con->pending.x, con->pending.y);
+        }
+}
+
 static void floating_natural_resize(struct sway_container *con) {
         int min_width, max_width, min_height, max_height;
         floating_calculate_constraints(&min_width, &max_width,
                         &min_height, &max_height);
         if (!con->view) {
-                con->width = fmax(min_width, fmin(con->width, max_width));
-                con->height = fmax(min_height, fmin(con->height, max_height));
+                con->pending.width = fmax(min_width, fmin(con->pending.width, max_width));
+                con->pending.height = fmax(min_height, fmin(con->pending.height, max_height));
         } else {
                 struct sway_view *view = con->view;
-                con->content_width =
+                con->pending.content_width =
                         fmax(min_width, fmin(view->natural_width, max_width));
-                con->content_height =
+                con->pending.content_height =
                         fmax(min_height, fmin(view->natural_height, max_height));
                 container_set_geometry_from_content(con);
         }
 }
 
 void container_floating_resize_and_center(struct sway_container *con) {
-        struct sway_workspace *ws = con->workspace;
+        struct sway_workspace *ws = con->pending.workspace;
         if (!ws) {
                 // On scratchpad, just resize
                 floating_natural_resize(con);
                 return;
         }
 
-        struct wlr_box *ob = wlr_output_layout_get_box(root->output_layout,
-                        ws->output->wlr_output);
-        if (!ob) {
+        struct wlr_box ob;
+        wlr_output_layout_get_box(root->output_layout, ws->output->wlr_output, &ob);
+        if (wlr_box_empty(&ob)) {
                 // On NOOP output. Will be called again when moved to an output
-                con->x = 0;
-                con->y = 0;
-                con->width = 0;
-                con->height = 0;
+                con->pending.x = 0;
+                con->pending.y = 0;
+                con->pending.width = 0;
+                con->pending.height = 0;
                 return;
         }
 
         floating_natural_resize(con);
         if (!con->view) {
-                if (con->width > ws->width || con->height > ws->height) {
-                        con->x = ob->x + (ob->width - con->width) / 2;
-                        con->y = ob->y + (ob->height - con->height) / 2;
+                if (con->pending.width > ws->width || con->pending.height > ws->height) {
+                        con->pending.x = ob.x + (ob.width - con->pending.width) / 2;
+                        con->pending.y = ob.y + (ob.height - con->pending.height) / 2;
                 } else {
-                        con->x = ws->x + (ws->width - con->width) / 2;
-                        con->y = ws->y + (ws->height - con->height) / 2;
+                        con->pending.x = ws->x + (ws->width - con->pending.width) / 2;
+                        con->pending.y = ws->y + (ws->height - con->pending.height) / 2;
                 }
         } else {
-                if (con->content_width > ws->width
-                                || con->content_height > ws->height) {
-                        con->content_x = ob->x + (ob->width - con->content_width) / 2;
-                        con->content_y = ob->y + (ob->height - con->content_height) / 2;
+                if (con->pending.content_width > ws->width
+                                || con->pending.content_height > ws->height) {
+                        con->pending.content_x = ob.x + (ob.width - con->pending.content_width) / 2;
+                        con->pending.content_y = ob.y + (ob.height - con->pending.content_height) / 2;
                 } else {
-                        con->content_x = ws->x + (ws->width - con->content_width) / 2;
-                        con->content_y = ws->y + (ws->height - con->content_height) / 2;
+                        con->pending.content_x = ws->x + (ws->width - con->pending.content_width) / 2;
+                        con->pending.content_y = ws->y + (ws->height - con->pending.content_height) / 2;
                 }
 
                 // If the view's border is B_NONE then these properties are ignored.
-                con->border_top = con->border_bottom = true;
-                con->border_left = con->border_right = true;
+                con->pending.border_top = con->pending.border_bottom = true;
+                con->pending.border_left = con->pending.border_right = true;
 
                 container_set_geometry_from_content(con);
         }
 }
 
 void container_floating_set_default_size(struct sway_container *con) {
-        if (!sway_assert(con->workspace, "Expected a container on a workspace")) {
+        if (!sway_assert(con->pending.workspace, "Expected a container on a workspace")) {
                 return;
         }
 
         int min_width, max_width, min_height, max_height;
         floating_calculate_constraints(&min_width, &max_width,
                         &min_height, &max_height);
-        struct wlr_box *box = calloc(1, sizeof(struct wlr_box));
-        workspace_get_box(con->workspace, box);
+        struct wlr_box box;
+        workspace_get_box(con->pending.workspace, &box);
 
-        double width = fmax(min_width, fmin(box->width * 0.5, max_width));
-        double height = fmax(min_height, fmin(box->height * 0.75, max_height));
+        double width = fmax(min_width, fmin(box.width * 0.5, max_width));
+        double height = fmax(min_height, fmin(box.height * 0.75, max_height));
         if (!con->view) {
-                con->width = width;
-                con->height = height;
+                con->pending.width = width;
+                con->pending.height = height;
         } else {
-                con->content_width = width;
-                con->content_height = height;
+                con->pending.content_width = width;
+                con->pending.content_height = height;
                 container_set_geometry_from_content(con);
         }
-
-        free(box);
 }
 
 
@@ -761,8 +880,8 @@ void container_set_resizing(struct sway_container *con, bool resizing) {
                         con->view->impl->set_resizing(con->view, resizing);
                 }
         } else {
-                for (int i = 0; i < con->children->length; ++i ) {
-                        struct sway_container *child = con->children->items[i];
+                for (int i = 0; i < con->pending.children->length; ++i ) {
+                        struct sway_container *child = con->pending.children->items[i];
                         container_set_resizing(child, resizing);
                 }
         }
@@ -774,21 +893,33 @@ void container_set_floating(struct sway_container *container, bool enable) {
         }
 
         struct sway_seat *seat = input_manager_current_seat();
-        struct sway_workspace *workspace = container->workspace;
+        struct sway_workspace *workspace = container->pending.workspace;
+        struct sway_container *focus = seat_get_focused_container(seat);
+        bool set_focus = focus == container;
 
         if (enable) {
-                struct sway_container *old_parent = container->parent;
+                struct sway_container *old_parent = container->pending.parent;
                 container_detach(container);
                 workspace_add_floating(workspace, container);
                 if (container->view) {
                         view_set_tiled(container->view, false);
                         if (container->view->using_csd) {
-                                container->border = B_CSD;
+                                container->saved_border = container->pending.border;
+                                container->pending.border = B_CSD;
+                                if (container->view->xdg_decoration) {
+                                        struct sway_xdg_decoration *deco = container->view->xdg_decoration;
+                                        wlr_xdg_toplevel_decoration_v1_set_mode(deco->wlr_xdg_decoration,
+                                                        WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE);
+                                }
                         }
                 }
                 container_floating_set_default_size(container);
                 container_floating_resize_and_center(container);
                 if (old_parent) {
+                        if (set_focus) {
+                                seat_set_raw_focus(seat, &old_parent->node);
+                                seat_set_raw_focus(seat, &container->node);
+                        }
                         container_reap_empty(old_parent);
                 }
         } else {
@@ -800,19 +931,28 @@ void container_set_floating(struct sway_container *container, bool enable) {
                 struct sway_container *reference =
                         seat_get_focus_inactive_tiling(seat, workspace);
                 if (reference) {
-                        container_add_sibling(reference, container, 1);
-                        container->width = reference->width;
-                        container->height = reference->height;
+                        if (reference->view) {
+                                container_add_sibling(reference, container, 1);
+                        } else {
+                                container_add_child(reference, container);
+                        }
+                        container->pending.width = reference->pending.width;
+                        container->pending.height = reference->pending.height;
                 } else {
                         struct sway_container *other =
                                 workspace_add_tiling(workspace, container);
-                        other->width = workspace->width;
-                        other->height = workspace->height;
+                        other->pending.width = workspace->width;
+                        other->pending.height = workspace->height;
                 }
                 if (container->view) {
                         view_set_tiled(container->view, true);
                         if (container->view->using_csd) {
-                                container->border = container->saved_border;
+                                container->pending.border = container->saved_border;
+                                if (container->view->xdg_decoration) {
+                                        struct sway_xdg_decoration *deco = container->view->xdg_decoration;
+                                        wlr_xdg_toplevel_decoration_v1_set_mode(deco->wlr_xdg_decoration,
+                                                        WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE);
+                                }
                         }
                 }
                 container->width_fraction = 0;
@@ -834,22 +974,22 @@ void container_set_geometry_from_content(struct sway_container *con) {
         size_t border_width = 0;
         size_t top = 0;
 
-        if (con->border != B_CSD) {
-                border_width = con->border_thickness * (con->border != B_NONE);
-                top = con->border == B_NORMAL ?
+        if (con->pending.border != B_CSD && !con->pending.fullscreen_mode) {
+                border_width = con->pending.border_thickness * (con->pending.border != B_NONE);
+                top = con->pending.border == B_NORMAL ?
                         container_titlebar_height() : border_width;
         }
 
-        con->x = con->content_x - border_width;
-        con->y = con->content_y - top;
-        con->width = con->content_width + border_width * 2;
-        con->height = top + con->content_height + border_width;
+        con->pending.x = con->pending.content_x - border_width;
+        con->pending.y = con->pending.content_y - top;
+        con->pending.width = con->pending.content_width + border_width * 2;
+        con->pending.height = top + con->pending.content_height + border_width;
         node_set_dirty(&con->node);
 }
 
 bool container_is_floating(struct sway_container *container) {
-        if (!container->parent && container->workspace &&
-                        list_find(container->workspace->floating, container) != -1) {
+        if (!container->pending.parent && container->pending.workspace &&
+                        list_find(container->pending.workspace->floating, container) != -1) {
                 return true;
         }
         if (container->scratchpad) {
@@ -859,10 +999,10 @@ bool container_is_floating(struct sway_container *container) {
 }
 
 void container_get_box(struct sway_container *container, struct wlr_box *box) {
-        box->x = container->x;
-        box->y = container->y;
-        box->width = container->width;
-        box->height = container->height;
+        box->x = container->pending.x;
+        box->y = container->pending.y;
+        box->width = container->pending.width;
+        box->height = container->pending.height;
 }
 
 /**
@@ -870,14 +1010,14 @@ void container_get_box(struct sway_container *container, struct wlr_box *box) {
  */
 void container_floating_translate(struct sway_container *con,
                 double x_amount, double y_amount) {
-        con->x += x_amount;
-        con->y += y_amount;
-        con->content_x += x_amount;
-        con->content_y += y_amount;
-
-        if (con->children) {
-                for (int i = 0; i < con->children->length; ++i) {
-                        struct sway_container *child = con->children->items[i];
+        con->pending.x += x_amount;
+        con->pending.y += y_amount;
+        con->pending.content_x += x_amount;
+        con->pending.content_y += y_amount;
+
+        if (con->pending.children) {
+                for (int i = 0; i < con->pending.children->length; ++i) {
+                        struct sway_container *child = con->pending.children->items[i];
                         container_floating_translate(child, x_amount, y_amount);
                 }
         }
@@ -893,8 +1033,8 @@ void container_floating_translate(struct sway_container *con,
  * center.
  */
 struct sway_output *container_floating_find_output(struct sway_container *con) {
-        double center_x = con->x + con->width / 2;
-        double center_y = con->y + con->height / 2;
+        double center_x = con->pending.x + con->pending.width / 2;
+        double center_y = con->pending.y + con->pending.height / 2;
         struct sway_output *closest_output = NULL;
         double closest_distance = DBL_MAX;
         for (int i = 0; i < root->outputs->length; ++i) {
@@ -925,11 +1065,11 @@ void container_floating_move_to(struct sway_container *con,
                         "Expected a floating container")) {
                 return;
         }
-        container_floating_translate(con, lx - con->x, ly - con->y);
+        container_floating_translate(con, lx - con->pending.x, ly - con->pending.y);
         if (container_is_scratchpad_hidden(con)) {
                 return;
         }
-        struct sway_workspace *old_workspace = con->workspace;
+        struct sway_workspace *old_workspace = con->pending.workspace;
         struct sway_output *new_output = container_floating_find_output(con);
         if (!sway_assert(new_output, "Unable to find any output")) {
                 return;
@@ -941,6 +1081,13 @@ void container_floating_move_to(struct sway_container *con,
                 workspace_add_floating(new_workspace, con);
                 arrange_workspace(old_workspace);
                 arrange_workspace(new_workspace);
+                // If the moved container was a visible scratchpad container, then
+                // update its transform.
+                if (con->scratchpad) {
+                        struct wlr_box output_box;
+                        output_get_box(new_output, &output_box);
+                        con->transform = output_box;
+                }
                 workspace_detect_urgent(old_workspace);
                 workspace_detect_urgent(new_workspace);
         }
@@ -951,10 +1098,10 @@ void container_floating_move_to_center(struct sway_container *con) {
                         "Expected a floating container")) {
                 return;
         }
-        struct sway_workspace *ws = con->workspace;
-        double new_lx = ws->x + (ws->width - con->width) / 2;
-        double new_ly = ws->y + (ws->height - con->height) / 2;
-        container_floating_translate(con, new_lx - con->x, new_ly - con->y);
+        struct sway_workspace *ws = con->pending.workspace;
+        double new_lx = ws->x + (ws->width - con->pending.width) / 2;
+        double new_ly = ws->y + (ws->height - con->pending.height) / 2;
+        container_floating_translate(con, new_lx - con->pending.x, new_ly - con->pending.y);
 }
 
 static bool find_urgent_iterator(struct sway_container *con, void *data) {
@@ -972,42 +1119,39 @@ void container_end_mouse_operation(struct sway_container *container) {
         }
 }
 
-static void set_fullscreen_iterator(struct sway_container *con, void *data) {
+static void set_fullscreen(struct sway_container *con, bool enable) {
         if (!con->view) {
                 return;
         }
         if (con->view->impl->set_fullscreen) {
-                bool *enable = data;
-                con->view->impl->set_fullscreen(con->view, *enable);
+                con->view->impl->set_fullscreen(con->view, enable);
                 if (con->view->foreign_toplevel) {
                         wlr_foreign_toplevel_handle_v1_set_fullscreen(
-                                con->view->foreign_toplevel, *enable);
+                                con->view->foreign_toplevel, enable);
                 }
         }
 }
 
 static void container_fullscreen_workspace(struct sway_container *con) {
-        if (!sway_assert(con->fullscreen_mode == FULLSCREEN_NONE,
+        if (!sway_assert(con->pending.fullscreen_mode == FULLSCREEN_NONE,
                                 "Expected a non-fullscreen container")) {
                 return;
         }
-        bool enable = true;
-        set_fullscreen_iterator(con, &enable);
-        container_for_each_child(con, set_fullscreen_iterator, &enable);
-        con->fullscreen_mode = FULLSCREEN_WORKSPACE;
+        set_fullscreen(con, true);
+        con->pending.fullscreen_mode = FULLSCREEN_WORKSPACE;
 
-        con->saved_x = con->x;
-        con->saved_y = con->y;
-        con->saved_width = con->width;
-        con->saved_height = con->height;
+        con->saved_x = con->pending.x;
+        con->saved_y = con->pending.y;
+        con->saved_width = con->pending.width;
+        con->saved_height = con->pending.height;
 
-        if (con->workspace) {
-                con->workspace->fullscreen = con;
+        if (con->pending.workspace) {
+                con->pending.workspace->fullscreen = con;
                 struct sway_seat *seat;
                 struct sway_workspace *focus_ws;
                 wl_list_for_each(seat, &server.input->seats, link) {
                         focus_ws = seat_get_focused_workspace(seat);
-                        if (focus_ws == con->workspace) {
+                        if (focus_ws == con->pending.workspace) {
                                 seat_set_focus_container(seat, con);
                         } else {
                                 struct sway_node *focus =
@@ -1023,19 +1167,17 @@ static void container_fullscreen_workspace(struct sway_container *con) {
 }
 
 static void container_fullscreen_global(struct sway_container *con) {
-        if (!sway_assert(con->fullscreen_mode == FULLSCREEN_NONE,
+        if (!sway_assert(con->pending.fullscreen_mode == FULLSCREEN_NONE,
                                 "Expected a non-fullscreen container")) {
                 return;
         }
-        bool enable = true;
-        set_fullscreen_iterator(con, &enable);
-        container_for_each_child(con, set_fullscreen_iterator, &enable);
+        set_fullscreen(con, true);
 
         root->fullscreen_global = con;
-        con->saved_x = con->x;
-        con->saved_y = con->y;
-        con->saved_width = con->width;
-        con->saved_height = con->height;
+        con->saved_x = con->pending.x;
+        con->saved_y = con->pending.y;
+        con->saved_width = con->pending.width;
+        con->saved_height = con->pending.height;
 
         struct sway_seat *seat;
         wl_list_for_each(seat, &server.input->seats, link) {
@@ -1045,34 +1187,32 @@ static void container_fullscreen_global(struct sway_container *con) {
                 }
         }
 
-        con->fullscreen_mode = FULLSCREEN_GLOBAL;
+        con->pending.fullscreen_mode = FULLSCREEN_GLOBAL;
         container_end_mouse_operation(con);
         ipc_event_window(con, "fullscreen_mode");
 }
 
 void container_fullscreen_disable(struct sway_container *con) {
-        if (!sway_assert(con->fullscreen_mode != FULLSCREEN_NONE,
+        if (!sway_assert(con->pending.fullscreen_mode != FULLSCREEN_NONE,
                                 "Expected a fullscreen container")) {
                 return;
         }
-        bool enable = false;
-        set_fullscreen_iterator(con, &enable);
-        container_for_each_child(con, set_fullscreen_iterator, &enable);
+        set_fullscreen(con, false);
 
         if (container_is_floating(con)) {
-                con->x = con->saved_x;
-                con->y = con->saved_y;
-                con->width = con->saved_width;
-                con->height = con->saved_height;
+                con->pending.x = con->saved_x;
+                con->pending.y = con->saved_y;
+                con->pending.width = con->saved_width;
+                con->pending.height = con->saved_height;
         }
 
-        if (con->fullscreen_mode == FULLSCREEN_WORKSPACE) {
-                if (con->workspace) {
-                        con->workspace->fullscreen = NULL;
+        if (con->pending.fullscreen_mode == FULLSCREEN_WORKSPACE) {
+                if (con->pending.workspace) {
+                        con->pending.workspace->fullscreen = NULL;
                         if (container_is_floating(con)) {
                                 struct sway_output *output =
                                         container_floating_find_output(con);
-                                if (con->workspace->output != output) {
+                                if (con->pending.workspace->output != output) {
                                         container_floating_move_to_center(con);
                                 }
                         }
@@ -1084,11 +1224,11 @@ void container_fullscreen_disable(struct sway_container *con) {
         // If the container was mapped as fullscreen and set as floating by
         // criteria, it needs to be reinitialized as floating to get the proper
         // size and location
-        if (container_is_floating(con) && (con->width == 0 || con->height == 0)) {
+        if (container_is_floating(con) && (con->pending.width == 0 || con->pending.height == 0)) {
                 container_floating_resize_and_center(con);
         }
 
-        con->fullscreen_mode = FULLSCREEN_NONE;
+        con->pending.fullscreen_mode = FULLSCREEN_NONE;
         container_end_mouse_operation(con);
         ipc_event_window(con, "fullscreen_mode");
 
@@ -1106,7 +1246,7 @@ void container_fullscreen_disable(struct sway_container *con) {
 
 void container_set_fullscreen(struct sway_container *con,
                 enum sway_fullscreen_mode mode) {
-        if (con->fullscreen_mode == mode) {
+        if (con->pending.fullscreen_mode == mode) {
                 return;
         }
 
@@ -1118,8 +1258,8 @@ void container_set_fullscreen(struct sway_container *con,
                 if (root->fullscreen_global) {
                         container_fullscreen_disable(root->fullscreen_global);
                 }
-                if (con->workspace && con->workspace->fullscreen) {
-                        container_fullscreen_disable(con->workspace->fullscreen);
+                if (con->pending.workspace && con->pending.workspace->fullscreen) {
+                        container_fullscreen_disable(con->pending.workspace->fullscreen);
                 }
                 container_fullscreen_workspace(con);
                 break;
@@ -1127,7 +1267,7 @@ void container_set_fullscreen(struct sway_container *con,
                 if (root->fullscreen_global) {
                         container_fullscreen_disable(root->fullscreen_global);
                 }
-                if (con->fullscreen_mode == FULLSCREEN_WORKSPACE) {
+                if (con->pending.fullscreen_mode == FULLSCREEN_WORKSPACE) {
                         container_fullscreen_disable(con);
                 }
                 container_fullscreen_global(con);
@@ -1137,8 +1277,8 @@ void container_set_fullscreen(struct sway_container *con,
 
 struct sway_container *container_toplevel_ancestor(
                 struct sway_container *container) {
-        while (container->parent) {
-                container = container->parent;
+        while (container->pending.parent) {
+                container = container->pending.parent;
         }
 
         return container;
@@ -1150,148 +1290,67 @@ bool container_is_floating_or_child(struct sway_container *container) {
 
 bool container_is_fullscreen_or_child(struct sway_container *container) {
         do {
-                if (container->fullscreen_mode) {
+                if (container->pending.fullscreen_mode) {
                         return true;
                 }
-                container = container->parent;
+                container = container->pending.parent;
         } while (container);
 
         return false;
 }
 
-static void surface_send_enter_iterator(struct wlr_surface *surface,
-                int x, int y, void *data) {
-        struct wlr_output *wlr_output = data;
-        wlr_surface_send_enter(surface, wlr_output);
-}
-
-static void surface_send_leave_iterator(struct wlr_surface *surface,
-                int x, int y, void *data) {
-        struct wlr_output *wlr_output = data;
-        wlr_surface_send_leave(surface, wlr_output);
-}
-
-void container_discover_outputs(struct sway_container *con) {
-        struct wlr_box con_box = {
-                .x = con->current.x,
-                .y = con->current.y,
-                .width = con->current.width,
-                .height = con->current.height,
-        };
-        struct sway_output *old_output = container_get_effective_output(con);
-
-        for (int i = 0; i < root->outputs->length; ++i) {
-                struct sway_output *output = root->outputs->items[i];
-                struct wlr_box output_box;
-                output_get_box(output, &output_box);
-                struct wlr_box intersection;
-                bool intersects =
-                        wlr_box_intersection(&intersection, &con_box, &output_box);
-                int index = list_find(con->outputs, output);
-
-                if (intersects && index == -1) {
-                        // Send enter
-                        sway_log(SWAY_DEBUG, "Container %p entered output %p", con, output);
-                        if (con->view) {
-                                view_for_each_surface(con->view,
-                                                surface_send_enter_iterator, output->wlr_output);
-                                if (con->view->foreign_toplevel) {
-                                        wlr_foreign_toplevel_handle_v1_output_enter(
-                                                        con->view->foreign_toplevel, output->wlr_output);
-                                }
-                        }
-                        list_add(con->outputs, output);
-                } else if (!intersects && index != -1) {
-                        // Send leave
-                        sway_log(SWAY_DEBUG, "Container %p left output %p", con, output);
-                        if (con->view) {
-                                view_for_each_surface(con->view,
-                                        surface_send_leave_iterator, output->wlr_output);
-                                if (con->view->foreign_toplevel) {
-                                        wlr_foreign_toplevel_handle_v1_output_leave(
-                                                        con->view->foreign_toplevel, output->wlr_output);
-                                }
-                        }
-                        list_del(con->outputs, index);
-                }
-        }
-        struct sway_output *new_output = container_get_effective_output(con);
-        double old_scale = old_output && old_output->enabled ?
-                old_output->wlr_output->scale : -1;
-        double new_scale = new_output ? new_output->wlr_output->scale : -1;
-        if (old_scale != new_scale) {
-                container_update_title_textures(con);
-                container_update_marks_textures(con);
-        }
-}
-
 enum sway_container_layout container_parent_layout(struct sway_container *con) {
-        if (con->parent) {
-                return con->parent->layout;
+        if (con->pending.parent) {
+                return con->pending.parent->pending.layout;
         }
-        if (con->workspace) {
-                return con->workspace->layout;
+        if (con->pending.workspace) {
+                return con->pending.workspace->layout;
         }
         return L_NONE;
 }
 
-enum sway_container_layout container_current_parent_layout(
-                struct sway_container *con) {
-        if (con->current.parent) {
-                return con->current.parent->current.layout;
-        }
-        return con->current.workspace->current.layout;
-}
-
 list_t *container_get_siblings(struct sway_container *container) {
-        if (container->parent) {
-                return container->parent->children;
+        if (container->pending.parent) {
+                return container->pending.parent->pending.children;
         }
-        if (container_is_scratchpad_hidden(container)) {
+        if (!container->pending.workspace) {
                 return NULL;
         }
-        if (list_find(container->workspace->tiling, container) != -1) {
-                return container->workspace->tiling;
+        if (list_find(container->pending.workspace->tiling, container) != -1) {
+                return container->pending.workspace->tiling;
         }
-        return container->workspace->floating;
+        return container->pending.workspace->floating;
 }
 
 int container_sibling_index(struct sway_container *child) {
         return list_find(container_get_siblings(child), child);
 }
 
-list_t *container_get_current_siblings(struct sway_container *container) {
-        if (container->current.parent) {
-                return container->current.parent->current.children;
-        }
-        return container->current.workspace->current.tiling;
-}
-
 void container_handle_fullscreen_reparent(struct sway_container *con) {
-        if (con->fullscreen_mode != FULLSCREEN_WORKSPACE || !con->workspace ||
-                        con->workspace->fullscreen == con) {
+        if (con->pending.fullscreen_mode != FULLSCREEN_WORKSPACE || !con->pending.workspace ||
+                        con->pending.workspace->fullscreen == con) {
                 return;
         }
-        if (con->workspace->fullscreen) {
-                container_fullscreen_disable(con->workspace->fullscreen);
+        if (con->pending.workspace->fullscreen) {
+                container_fullscreen_disable(con->pending.workspace->fullscreen);
         }
-        con->workspace->fullscreen = con;
+        con->pending.workspace->fullscreen = con;
 
-        arrange_workspace(con->workspace);
+        arrange_workspace(con->pending.workspace);
 }
 
 static void set_workspace(struct sway_container *container, void *data) {
-        container->workspace = container->parent->workspace;
+        container->pending.workspace = container->pending.parent->pending.workspace;
 }
 
 void container_insert_child(struct sway_container *parent,
                 struct sway_container *child, int i) {
-        if (child->workspace) {
+        if (child->pending.workspace) {
                 container_detach(child);
         }
-        list_insert(parent->children, i, child);
-        child->parent = parent;
-        child->workspace = parent->workspace;
+        list_insert(parent->pending.children, i, child);
+        child->pending.parent = parent;
+        child->pending.workspace = parent->pending.workspace;
         container_for_each_child(child, set_workspace, NULL);
         container_handle_fullscreen_reparent(child);
         container_update_representation(parent);
@@ -1299,14 +1358,14 @@ void container_insert_child(struct sway_container *parent,
 
 void container_add_sibling(struct sway_container *fixed,
                 struct sway_container *active, bool after) {
-        if (active->workspace) {
+        if (active->pending.workspace) {
                 container_detach(active);
         }
         list_t *siblings = container_get_siblings(fixed);
         int index = list_find(siblings, fixed);
         list_insert(siblings, index + after, active);
-        active->parent = fixed->parent;
-        active->workspace = fixed->workspace;
+        active->pending.parent = fixed->pending.parent;
+        active->pending.workspace = fixed->pending.workspace;
         container_for_each_child(active, set_workspace, NULL);
         container_handle_fullscreen_reparent(active);
         container_update_representation(active);
@@ -1314,17 +1373,13 @@ void container_add_sibling(struct sway_container *fixed,
 
 void container_add_child(struct sway_container *parent,
                 struct sway_container *child) {
-        if (child->workspace) {
+        if (child->pending.workspace) {
                 container_detach(child);
         }
-        list_add(parent->children, child);
-        child->parent = parent;
-        child->workspace = parent->workspace;
+        list_add(parent->pending.children, child);
+        child->pending.parent = parent;
+        child->pending.workspace = parent->pending.workspace;
         container_for_each_child(child, set_workspace, NULL);
-        bool fullscreen = child->fullscreen_mode != FULLSCREEN_NONE ||
-                parent->fullscreen_mode != FULLSCREEN_NONE;
-        set_fullscreen_iterator(child, &fullscreen);
-        container_for_each_child(child, set_fullscreen_iterator, &fullscreen);
         container_handle_fullscreen_reparent(child);
         container_update_representation(parent);
         node_set_dirty(&child->node);
@@ -1332,15 +1387,15 @@ void container_add_child(struct sway_container *parent,
 }
 
 void container_detach(struct sway_container *child) {
-        if (child->fullscreen_mode == FULLSCREEN_WORKSPACE) {
-                child->workspace->fullscreen = NULL;
+        if (child->pending.fullscreen_mode == FULLSCREEN_WORKSPACE) {
+                child->pending.workspace->fullscreen = NULL;
         }
-        if (child->fullscreen_mode == FULLSCREEN_GLOBAL) {
+        if (child->pending.fullscreen_mode == FULLSCREEN_GLOBAL) {
                 root->fullscreen_global = NULL;
         }
 
-        struct sway_container *old_parent = child->parent;
-        struct sway_workspace *old_workspace = child->workspace;
+        struct sway_container *old_parent = child->pending.parent;
+        struct sway_workspace *old_workspace = child->pending.workspace;
         list_t *siblings = container_get_siblings(child);
         if (siblings) {
                 int index = list_find(siblings, child);
@@ -1348,8 +1403,8 @@ void container_detach(struct sway_container *child) {
                         list_del(siblings, index);
                 }
         }
-        child->parent = NULL;
-        child->workspace = NULL;
+        child->pending.parent = NULL;
+        child->pending.workspace = NULL;
         container_for_each_child(child, set_workspace, NULL);
 
         if (old_parent) {
@@ -1364,18 +1419,18 @@ void container_detach(struct sway_container *child) {
 
 void container_replace(struct sway_container *container,
                 struct sway_container *replacement) {
-        enum sway_fullscreen_mode fullscreen = container->fullscreen_mode;
+        enum sway_fullscreen_mode fullscreen = container->pending.fullscreen_mode;
         bool scratchpad = container->scratchpad;
         struct sway_workspace *ws = NULL;
         if (fullscreen != FULLSCREEN_NONE) {
                 container_fullscreen_disable(container);
         }
         if (scratchpad) {
-                ws = container->workspace;
+                ws = container->pending.workspace;
                 root_scratchpad_show(container);
                 root_scratchpad_remove_container(container);
         }
-        if (container->parent || container->workspace) {
+        if (container->pending.parent || container->pending.workspace) {
                 float width_fraction = container->width_fraction;
                 float height_fraction = container->height_fraction;
                 container_add_sibling(container, replacement, 1);
@@ -1403,7 +1458,7 @@ struct sway_container *container_split(struct sway_container *child,
                 enum sway_container_layout layout) {
         // i3 doesn't split singleton H/V containers
         // https://github.com/i3/i3/blob/3cd1c45eba6de073bc4300eebb4e1cc1a0c4479a/src/tree.c#L354
-        if (child->parent || child->workspace) {
+        if (child->pending.parent || child->pending.workspace) {
                 list_t *siblings = container_get_siblings(child);
                 if (siblings->length == 1) {
                         enum sway_container_layout current = container_parent_layout(child);
@@ -1411,12 +1466,12 @@ struct sway_container *container_split(struct sway_container *child,
                                 current = L_NONE;
                         }
                         if (current == L_HORIZ || current == L_VERT) {
-                                if (child->parent) {
-                                        child->parent->layout = layout;
-                                        container_update_representation(child->parent);
+                                if (child->pending.parent) {
+                                        child->pending.parent->pending.layout = layout;
+                                        container_update_representation(child->pending.parent);
                                 } else {
-                                        child->workspace->layout = layout;
-                                        workspace_update_representation(child->workspace);
+                                        child->pending.workspace->layout = layout;
+                                        workspace_update_representation(child->pending.workspace);
                                 }
                                 return child;
                         }
@@ -1429,25 +1484,25 @@ struct sway_container *container_split(struct sway_container *child,
         if (container_is_floating(child) && child->view) {
                 view_set_tiled(child->view, true);
                 if (child->view->using_csd) {
-                        child->border = child->saved_border;
+                        child->pending.border = child->saved_border;
                 }
         }
 
         struct sway_container *cont = container_create(NULL);
-        cont->width = child->width;
-        cont->height = child->height;
+        cont->pending.width = child->pending.width;
+        cont->pending.height = child->pending.height;
         cont->width_fraction = child->width_fraction;
         cont->height_fraction = child->height_fraction;
-        cont->x = child->x;
-        cont->y = child->y;
-        cont->layout = layout;
+        cont->pending.x = child->pending.x;
+        cont->pending.y = child->pending.y;
+        cont->pending.layout = layout;
 
         container_replace(child, cont);
         container_add_child(cont, child);
 
         if (set_focus) {
                 seat_set_raw_focus(seat, &cont->node);
-                if (cont->fullscreen_mode == FULLSCREEN_GLOBAL) {
+                if (cont->pending.fullscreen_mode == FULLSCREEN_GLOBAL) {
                         seat_set_focus(seat, &child->node);
                 } else {
                         seat_set_raw_focus(seat, &child->node);
@@ -1485,7 +1540,7 @@ bool container_find_and_unmark(char *mark) {
                 if (strcmp(con_mark, mark) == 0) {
                         free(con_mark);
                         list_del(con->marks, i);
-                        container_update_marks_textures(con);
+                        container_update_marks(con);
                         ipc_event_window(con, "mark");
                         return true;
                 }
@@ -1516,111 +1571,27 @@ void container_add_mark(struct sway_container *con, char *mark) {
         ipc_event_window(con, "mark");
 }
 
-static void update_marks_texture(struct sway_container *con,
-                struct wlr_texture **texture, struct border_colors *class) {
-        struct sway_output *output = container_get_effective_output(con);
-        if (!output) {
-                return;
-        }
-        if (*texture) {
-                wlr_texture_destroy(*texture);
-                *texture = NULL;
-        }
-        if (!con->marks->length) {
-                return;
-        }
-
-        size_t len = 0;
-        for (int i = 0; i < con->marks->length; ++i) {
-                char *mark = con->marks->items[i];
-                if (mark[0] != '_') {
-                        len += strlen(mark) + 2;
-                }
-        }
-        char *buffer = calloc(len + 1, 1);
-        char *part = malloc(len + 1);
-
-        if (!sway_assert(buffer && part, "Unable to allocate memory")) {
-                free(buffer);
-                return;
-        }
-
-        for (int i = 0; i < con->marks->length; ++i) {
-                char *mark = con->marks->items[i];
-                if (mark[0] != '_') {
-                        sprintf(part, "[%s]", mark);
-                        strcat(buffer, part);
-                }
-        }
-        free(part);
-
-        double scale = output->wlr_output->scale;
-        int width = 0;
-        int height = con->title_height * scale;
-
-        cairo_t *c = cairo_create(NULL);
-        get_text_size(c, config->font, &width, NULL, NULL, scale, false,
-                        "%s", buffer);
-        cairo_destroy(c);
-
-        cairo_surface_t *surface = cairo_image_surface_create(
-                        CAIRO_FORMAT_ARGB32, width, height);
-        cairo_t *cairo = cairo_create(surface);
-        cairo_set_source_rgba(cairo, class->background[0], class->background[1],
-                        class->background[2], class->background[3]);
-        cairo_paint(cairo);
-        PangoContext *pango = pango_cairo_create_context(cairo);
-        cairo_set_antialias(cairo, CAIRO_ANTIALIAS_BEST);
-        cairo_set_source_rgba(cairo, class->text[0], class->text[1],
-                        class->text[2], class->text[3]);
-        cairo_move_to(cairo, 0, 0);
-
-        pango_printf(cairo, config->font, scale, false, "%s", buffer);
-
-        cairo_surface_flush(surface);
-        unsigned char *data = cairo_image_surface_get_data(surface);
-        int stride = cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, width);
-        struct wlr_renderer *renderer = wlr_backend_get_renderer(
-                        output->wlr_output->backend);
-        *texture = wlr_texture_from_pixels(
-                        renderer, WL_SHM_FORMAT_ARGB8888, stride, width, height, data);
-        cairo_surface_destroy(surface);
-        g_object_unref(pango);
-        cairo_destroy(cairo);
-        free(buffer);
-}
-
-void container_update_marks_textures(struct sway_container *con) {
-        if (!config->show_marks) {
-                return;
-        }
-        update_marks_texture(con, &con->marks_focused,
-                        &config->border_colors.focused);
-        update_marks_texture(con, &con->marks_focused_inactive,
-                        &config->border_colors.focused_inactive);
-        update_marks_texture(con, &con->marks_unfocused,
-                        &config->border_colors.unfocused);
-        update_marks_texture(con, &con->marks_urgent,
-                        &config->border_colors.urgent);
-        container_damage_whole(con);
-}
-
 void container_raise_floating(struct sway_container *con) {
         // Bring container to front by putting it at the end of the floating list.
         struct sway_container *floater = container_toplevel_ancestor(con);
-        if (container_is_floating(floater) && floater->workspace) {
-                list_move_to_end(floater->workspace->floating, floater);
-                node_set_dirty(&floater->workspace->node);
+        if (container_is_floating(floater) && floater->pending.workspace) {
+                // it's okay to just raise the scene directly instead of waiting
+                // for the transaction to go through. We won't be reconfiguring
+                // surfaces
+                wlr_scene_node_raise_to_top(&floater->scene_tree->node);
+
+                list_move_to_end(floater->pending.workspace->floating, floater);
+                node_set_dirty(&floater->pending.workspace->node);
         }
 }
 
 bool container_is_scratchpad_hidden(struct sway_container *con) {
-        return con->scratchpad && !con->workspace;
+        return con->scratchpad && !con->pending.workspace;
 }
 
 bool container_is_scratchpad_hidden_or_child(struct sway_container *con) {
         con = container_toplevel_ancestor(con);
-        return con->scratchpad && !con->workspace;
+        return con->scratchpad && !con->pending.workspace;
 }
 
 bool container_is_sticky(struct sway_container *con) {
@@ -1648,39 +1619,39 @@ static bool is_parallel(enum sway_container_layout first,
 static bool container_is_squashable(struct sway_container *con,
                 struct sway_container *child) {
         enum sway_container_layout gp_layout = container_parent_layout(con);
-        return (con->layout == L_HORIZ || con->layout == L_VERT) &&
-                (child->layout == L_HORIZ || child->layout == L_VERT) &&
-                !is_parallel(con->layout, child->layout) &&
-                is_parallel(gp_layout, child->layout);
+        return (con->pending.layout == L_HORIZ || con->pending.layout == L_VERT) &&
+                (child->pending.layout == L_HORIZ || child->pending.layout == L_VERT) &&
+                !is_parallel(con->pending.layout, child->pending.layout) &&
+                is_parallel(gp_layout, child->pending.layout);
 }
 
 static void container_squash_children(struct sway_container *con) {
-        for (int i = 0; i < con->children->length; i++) {
-                struct sway_container *child = con->children->items[i];
+        for (int i = 0; i < con->pending.children->length; i++) {
+                struct sway_container *child = con->pending.children->items[i];
                 i += container_squash(child);
         }
 }
 
 int container_squash(struct sway_container *con) {
-        if (!con->children) {
+        if (!con->pending.children) {
                 return 0;
         }
-        if (con->children->length != 1) {
+        if (con->pending.children->length != 1) {
                 container_squash_children(con);
                 return 0;
         }
-        struct sway_container *child = con->children->items[0];
+        struct sway_container *child = con->pending.children->items[0];
         int idx = container_sibling_index(con);
         int change = 0;
         if (container_is_squashable(con, child)) {
                 // con and child are a redundant H/V pair. Destroy them.
-                while (child->children->length) {
-                        struct sway_container *current = child->children->items[0];
+                while (child->pending.children->length) {
+                        struct sway_container *current = child->pending.children->items[0];
                         container_detach(current);
-                        if (con->parent) {
-                                container_insert_child(con->parent, current, idx);
+                        if (con->pending.parent) {
+                                container_insert_child(con->pending.parent, current, idx);
                         } else {
-                                workspace_insert_tiling_direct(con->workspace, current, idx);
+                                workspace_insert_tiling_direct(con->pending.workspace, current, idx);
                         }
                         change++;
                 }
@@ -1692,3 +1663,177 @@ int container_squash(struct sway_container *con) {
         }
         return change;
 }
+
+static void swap_places(struct sway_container *con1,
+                struct sway_container *con2) {
+        struct sway_container *temp = malloc(sizeof(struct sway_container));
+        temp->pending.x = con1->pending.x;
+        temp->pending.y = con1->pending.y;
+        temp->pending.width = con1->pending.width;
+        temp->pending.height = con1->pending.height;
+        temp->width_fraction = con1->width_fraction;
+        temp->height_fraction = con1->height_fraction;
+        temp->pending.parent = con1->pending.parent;
+        temp->pending.workspace = con1->pending.workspace;
+        bool temp_floating = container_is_floating(con1);
+
+        con1->pending.x = con2->pending.x;
+        con1->pending.y = con2->pending.y;
+        con1->pending.width = con2->pending.width;
+        con1->pending.height = con2->pending.height;
+        con1->width_fraction = con2->width_fraction;
+        con1->height_fraction = con2->height_fraction;
+
+        con2->pending.x = temp->pending.x;
+        con2->pending.y = temp->pending.y;
+        con2->pending.width = temp->pending.width;
+        con2->pending.height = temp->pending.height;
+        con2->width_fraction = temp->width_fraction;
+        con2->height_fraction = temp->height_fraction;
+
+        int temp_index = container_sibling_index(con1);
+        if (con2->pending.parent) {
+                container_insert_child(con2->pending.parent, con1,
+                                container_sibling_index(con2));
+        } else if (container_is_floating(con2)) {
+                workspace_add_floating(con2->pending.workspace, con1);
+        } else {
+                workspace_insert_tiling(con2->pending.workspace, con1,
+                                container_sibling_index(con2));
+        }
+        if (temp->pending.parent) {
+                container_insert_child(temp->pending.parent, con2, temp_index);
+        } else if (temp_floating) {
+                workspace_add_floating(temp->pending.workspace, con2);
+        } else {
+                workspace_insert_tiling(temp->pending.workspace, con2, temp_index);
+        }
+
+        free(temp);
+}
+
+static void swap_focus(struct sway_container *con1,
+                struct sway_container *con2, struct sway_seat *seat,
+                struct sway_container *focus) {
+        if (focus == con1 || focus == con2) {
+                struct sway_workspace *ws1 = con1->pending.workspace;
+                struct sway_workspace *ws2 = con2->pending.workspace;
+                enum sway_container_layout layout1 = container_parent_layout(con1);
+                enum sway_container_layout layout2 = container_parent_layout(con2);
+                if (focus == con1 && (layout2 == L_TABBED || layout2 == L_STACKED)) {
+                        if (workspace_is_visible(ws2)) {
+                                seat_set_focus(seat, &con2->node);
+                        }
+                        seat_set_focus_container(seat, ws1 != ws2 ? con2 : con1);
+                } else if (focus == con2 && (layout1 == L_TABBED
+                                        || layout1 == L_STACKED)) {
+                        if (workspace_is_visible(ws1)) {
+                                seat_set_focus(seat, &con1->node);
+                        }
+                        seat_set_focus_container(seat, ws1 != ws2 ? con1 : con2);
+                } else if (ws1 != ws2) {
+                        seat_set_focus_container(seat, focus == con1 ? con2 : con1);
+                } else {
+                        seat_set_focus_container(seat, focus);
+                }
+        } else {
+                seat_set_focus_container(seat, focus);
+        }
+
+        if (root->fullscreen_global) {
+                seat_set_focus(seat,
+                                seat_get_focus_inactive(seat, &root->fullscreen_global->node));
+        }
+}
+
+void container_swap(struct sway_container *con1, struct sway_container *con2) {
+        if (!sway_assert(con1 && con2, "Cannot swap with nothing")) {
+                return;
+        }
+        if (!sway_assert(!container_has_ancestor(con1, con2)
+                                && !container_has_ancestor(con2, con1),
+                                "Cannot swap ancestor and descendant")) {
+                return;
+        }
+
+        sway_log(SWAY_DEBUG, "Swapping containers %zu and %zu",
+                        con1->node.id, con2->node.id);
+
+        bool scratch1 = con1->scratchpad;
+        bool hidden1 = container_is_scratchpad_hidden(con1);
+        bool scratch2 = con2->scratchpad;
+        bool hidden2 = container_is_scratchpad_hidden(con2);
+        if (scratch1) {
+                if (hidden1) {
+                        root_scratchpad_show(con1);
+                }
+                root_scratchpad_remove_container(con1);
+        }
+        if (scratch2) {
+                if (hidden2) {
+                        root_scratchpad_show(con2);
+                }
+                root_scratchpad_remove_container(con2);
+        }
+
+        enum sway_fullscreen_mode fs1 = con1->pending.fullscreen_mode;
+        if (fs1) {
+                container_fullscreen_disable(con1);
+        }
+        enum sway_fullscreen_mode fs2 = con2->pending.fullscreen_mode;
+        if (fs2) {
+                container_fullscreen_disable(con2);
+        }
+
+        struct sway_seat *seat = input_manager_current_seat();
+        struct sway_container *focus = seat_get_focused_container(seat);
+        struct sway_workspace *vis1 =
+                output_get_active_workspace(con1->pending.workspace->output);
+        struct sway_workspace *vis2 =
+                output_get_active_workspace(con2->pending.workspace->output);
+        if (!sway_assert(vis1 && vis2, "con1 or con2 are on an output without a"
+                                "workspace. This should not happen")) {
+                return;
+        }
+
+        char *stored_prev_name = NULL;
+        if (seat->prev_workspace_name) {
+                stored_prev_name = strdup(seat->prev_workspace_name);
+        }
+
+        swap_places(con1, con2);
+
+        if (!workspace_is_visible(vis1)) {
+                seat_set_focus(seat, seat_get_focus_inactive(seat, &vis1->node));
+        }
+        if (!workspace_is_visible(vis2)) {
+                seat_set_focus(seat, seat_get_focus_inactive(seat, &vis2->node));
+        }
+
+        swap_focus(con1, con2, seat, focus);
+
+        if (stored_prev_name) {
+                free(seat->prev_workspace_name);
+                seat->prev_workspace_name = stored_prev_name;
+        }
+
+        if (scratch1) {
+                root_scratchpad_add_container(con2, NULL);
+                if (!hidden1) {
+                        root_scratchpad_show(con2);
+                }
+        }
+        if (scratch2) {
+                root_scratchpad_add_container(con1, NULL);
+                if (!hidden2) {
+                        root_scratchpad_show(con1);
+                }
+        }
+
+        if (fs1) {
+                container_set_fullscreen(con2, fs1);
+        }
+        if (fs2) {
+                container_set_fullscreen(con1, fs2);
+        }
+}
diff --git a/sway/tree/node.c b/sway/tree/node.c
index ffa7f2cc..213cf0a6 100644
--- a/sway/tree/node.c
+++ b/sway/tree/node.c
@@ -18,13 +18,13 @@ void node_init(struct sway_node *node, enum sway_node_type type, void *thing) {
 const char *node_type_to_str(enum sway_node_type type) {
         switch (type) {
         case N_ROOT:
-                return "N_ROOT";
+                return "root";
         case N_OUTPUT:
-                return "N_OUTPUT";
+                return "output";
         case N_WORKSPACE:
-                return "N_WORKSPACE";
+                return "workspace";
         case N_CONTAINER:
-                return "N_CONTAINER";
+                return "container";
         }
         return "";
 }
@@ -75,7 +75,7 @@ void node_get_box(struct sway_node *node, struct wlr_box *box) {
 struct sway_output *node_get_output(struct sway_node *node) {
         switch (node->type) {
         case N_CONTAINER: {
-                struct sway_workspace *ws = node->sway_container->workspace;
+                struct sway_workspace *ws = node->sway_container->pending.workspace;
                 return ws ? ws->output : NULL;
     }
         case N_WORKSPACE:
@@ -91,7 +91,7 @@ struct sway_output *node_get_output(struct sway_node *node) {
 enum sway_container_layout node_get_layout(struct sway_node *node) {
         switch (node->type) {
         case N_CONTAINER:
-                return node->sway_container->layout;
+                return node->sway_container->pending.layout;
         case N_WORKSPACE:
                 return node->sway_workspace->layout;
         case N_OUTPUT:
@@ -105,11 +105,11 @@ struct sway_node *node_get_parent(struct sway_node *node) {
         switch (node->type) {
         case N_CONTAINER: {
                         struct sway_container *con = node->sway_container;
-                        if (con->parent) {
-                                return &con->parent->node;
+                        if (con->pending.parent) {
+                                return &con->pending.parent->node;
                         }
-                        if (con->workspace) {
-                                return &con->workspace->node;
+                        if (con->pending.workspace) {
+                                return &con->pending.workspace->node;
                         }
                 }
                 return NULL;
@@ -131,7 +131,7 @@ struct sway_node *node_get_parent(struct sway_node *node) {
 list_t *node_get_children(struct sway_node *node) {
         switch (node->type) {
         case N_CONTAINER:
-                return node->sway_container->children;
+                return node->sway_container->pending.children;
         case N_WORKSPACE:
                 return node->sway_workspace->tiling;
         case N_OUTPUT:
@@ -143,7 +143,7 @@ list_t *node_get_children(struct sway_node *node) {
 
 bool node_has_ancestor(struct sway_node *node, struct sway_node *ancestor) {
         if (ancestor->type == N_ROOT && node->type == N_CONTAINER &&
-                        node->sway_container->fullscreen_mode == FULLSCREEN_GLOBAL) {
+                        node->sway_container->pending.fullscreen_mode == FULLSCREEN_GLOBAL) {
                 return true;
         }
         struct sway_node *parent = node_get_parent(node);
@@ -152,10 +152,39 @@ bool node_has_ancestor(struct sway_node *node, struct sway_node *ancestor) {
                         return true;
                 }
                 if (ancestor->type == N_ROOT && parent->type == N_CONTAINER &&
-                                parent->sway_container->fullscreen_mode == FULLSCREEN_GLOBAL) {
+                                parent->sway_container->pending.fullscreen_mode == FULLSCREEN_GLOBAL) {
                         return true;
                 }
                 parent = node_get_parent(parent);
         }
         return false;
 }
+
+void scene_node_disown_children(struct wlr_scene_tree *tree) {
+        // this function can be called as part of destruction code that will be invoked
+        // upon an allocation failure. Let's not crash on NULL due to an allocation error.
+        if (!tree) {
+                return;
+        }
+
+        struct wlr_scene_node *child, *tmp_child;
+        wl_list_for_each_safe(child, tmp_child, &tree->children, link) {
+                wlr_scene_node_reparent(child, root->staging);
+        }
+}
+
+struct wlr_scene_tree *alloc_scene_tree(struct wlr_scene_tree *parent,
+                bool *failed) {
+        // fallthrough
+        if (*failed) {
+                return NULL;
+        }
+
+        struct wlr_scene_tree *tree = wlr_scene_tree_create(parent);
+        if (!tree) {
+                sway_log(SWAY_ERROR, "Failed to allocate a scene node");
+                *failed = true;
+        }
+
+        return tree;
+}
diff --git a/sway/tree/output.c b/sway/tree/output.c
index a8ae30f7..cd7bf0c2 100644
--- a/sway/tree/output.c
+++ b/sway/tree/output.c
@@ -3,12 +3,12 @@
 #include <ctype.h>
 #include <string.h>
 #include <strings.h>
-#include <wlr/types/wlr_output_damage.h>
 #include "sway/ipc-server.h"
 #include "sway/layers.h"
 #include "sway/output.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/workspace.h"
+#include "sway/server.h"
 #include "log.h"
 #include "util.h"
 
@@ -56,8 +56,8 @@ static void restore_workspaces(struct sway_output *output) {
         }
 
         // Saved workspaces
-        while (root->noop_output->workspaces->length) {
-                struct sway_workspace *ws = root->noop_output->workspaces->items[0];
+        while (root->fallback_output->workspaces->length) {
+                struct sway_workspace *ws = root->fallback_output->workspaces->items[0];
                 workspace_detach(ws);
                 output_add_workspace(output, ws);
 
@@ -70,13 +70,13 @@ static void restore_workspaces(struct sway_output *output) {
                 // floater re-centered
                 for (int i = 0; i < ws->floating->length; i++) {
                         struct sway_container *floater = ws->floating->items[i];
-                        if (floater->width == 0 || floater->height == 0 ||
-                                        floater->width > output->width ||
-                                        floater->height > output->height ||
-                                        floater->x > output->lx + output->width ||
-                                        floater->y > output->ly + output->height ||
-                                        floater->x + floater->width < output->lx ||
-                                        floater->y + floater->height < output->ly) {
+                        if (floater->pending.width == 0 || floater->pending.height == 0 ||
+                                        floater->pending.width > output->width ||
+                                        floater->pending.height > output->height ||
+                                        floater->pending.x > output->lx + output->width ||
+                                        floater->pending.y > output->ly + output->height ||
+                                        floater->pending.x + floater->pending.width < output->lx ||
+                                        floater->pending.y + floater->pending.height < output->ly) {
                                 container_floating_resize_and_center(floater);
                         }
                 }
@@ -87,26 +87,63 @@ static void restore_workspaces(struct sway_output *output) {
         output_sort_workspaces(output);
 }
 
+static void destroy_scene_layers(struct sway_output *output) {
+        wlr_scene_node_destroy(&output->fullscreen_background->node);
+
+        scene_node_disown_children(output->layers.tiling);
+        scene_node_disown_children(output->layers.fullscreen);
+
+        wlr_scene_node_destroy(&output->layers.shell_background->node);
+        wlr_scene_node_destroy(&output->layers.shell_bottom->node);
+        wlr_scene_node_destroy(&output->layers.tiling->node);
+        wlr_scene_node_destroy(&output->layers.fullscreen->node);
+        wlr_scene_node_destroy(&output->layers.shell_top->node);
+        wlr_scene_node_destroy(&output->layers.shell_overlay->node);
+        wlr_scene_node_destroy(&output->layers.session_lock->node);
+}
+
 struct sway_output *output_create(struct wlr_output *wlr_output) {
         struct sway_output *output = calloc(1, sizeof(struct sway_output));
         node_init(&output->node, N_OUTPUT, output);
+
+        bool failed = false;
+        output->layers.shell_background = alloc_scene_tree(root->staging, &failed);
+        output->layers.shell_bottom = alloc_scene_tree(root->staging, &failed);
+        output->layers.tiling = alloc_scene_tree(root->staging, &failed);
+        output->layers.fullscreen = alloc_scene_tree(root->staging, &failed);
+        output->layers.shell_top = alloc_scene_tree(root->staging, &failed);
+        output->layers.shell_overlay = alloc_scene_tree(root->staging, &failed);
+        output->layers.session_lock = alloc_scene_tree(root->staging, &failed);
+
+        if (!failed) {
+                output->fullscreen_background = wlr_scene_rect_create(
+                        output->layers.fullscreen, 0, 0, (float[4]){0.f, 0.f, 0.f, 1.f});
+
+                if (!output->fullscreen_background) {
+                        sway_log(SWAY_ERROR, "Unable to allocate a background rect");
+                        failed = true;
+                }
+        }
+
+        if (failed) {
+                destroy_scene_layers(output);
+                wlr_scene_output_destroy(output->scene_output);
+                free(output);
+                return NULL;
+        }
+
         output->wlr_output = wlr_output;
         wlr_output->data = output;
         output->detected_subpixel = wlr_output->subpixel;
         output->scale_filter = SCALE_FILTER_NEAREST;
 
-        wl_signal_init(&output->events.destroy);
+        wl_signal_init(&output->events.disable);
 
         wl_list_insert(&root->all_outputs, &output->link);
 
         output->workspaces = create_list();
         output->current.workspaces = create_list();
 
-        size_t len = sizeof(output->layers) / sizeof(output->layers[0]);
-        for (size_t i = 0; i < len; ++i) {
-                wl_list_init(&output->layers[i]);
-        }
-
         return output;
 }
 
@@ -146,7 +183,7 @@ void output_enable(struct sway_output *output) {
 
         input_manager_configure_xcursor();
 
-        wl_signal_emit(&root->events.new_node, &output->node);
+        wl_signal_emit_mutable(&root->events.new_node, &output->node);
 
         arrange_layers(output);
         arrange_root();
@@ -192,7 +229,7 @@ static void output_evacuate(struct sway_output *output) {
                         new_output = fallback_output;
                 }
                 if (!new_output) {
-                        new_output = root->noop_output;
+                        new_output = root->fallback_output;
                 }
 
                 struct sway_workspace *new_output_ws =
@@ -238,20 +275,14 @@ void output_destroy(struct sway_output *output) {
                                 "which is still referenced by transactions")) {
                 return;
         }
+
+        destroy_scene_layers(output);
         list_free(output->workspaces);
         list_free(output->current.workspaces);
         wl_event_source_remove(output->repaint_timer);
         free(output);
 }
 
-static void untrack_output(struct sway_container *con, void *data) {
-        struct sway_output *output = data;
-        int index = list_find(con->outputs, output);
-        if (index != -1) {
-                list_del(con->outputs, index);
-        }
-}
-
 void output_disable(struct sway_output *output) {
         if (!sway_assert(output->enabled, "Expected an enabled output")) {
                 return;
@@ -262,23 +293,20 @@ void output_disable(struct sway_output *output) {
         }
 
         sway_log(SWAY_DEBUG, "Disabling output '%s'", output->wlr_output->name);
-        wl_signal_emit(&output->events.destroy, output);
+        wl_signal_emit_mutable(&output->events.disable, output);
 
         output_evacuate(output);
 
-        root_for_each_container(untrack_output, output);
-
         list_del(root->outputs, index);
 
         output->enabled = false;
-        output->current_mode = NULL;
 
         arrange_root();
 
         // Reconfigure all devices, since devices with map_to_output directives for
         // an output that goes offline should stop sending events as long as the
         // output remains offline.
-        input_manager_configure_all_inputs();
+        input_manager_configure_all_input_mappings();
 }
 
 void output_begin_destroy(struct sway_output *output) {
@@ -286,13 +314,10 @@ void output_begin_destroy(struct sway_output *output) {
                 return;
         }
         sway_log(SWAY_DEBUG, "Destroying output '%s'", output->wlr_output->name);
+        wl_signal_emit_mutable(&output->node.events.destroy, &output->node);
 
         output->node.destroying = true;
         node_set_dirty(&output->node);
-
-        wl_list_remove(&output->link);
-        output->wlr_output->data = NULL;
-        output->wlr_output = NULL;
 }
 
 struct sway_output *output_from_wlr_output(struct wlr_output *output) {
@@ -304,10 +329,10 @@ struct sway_output *output_get_in_direction(struct sway_output *reference,
         if (!sway_assert(direction, "got invalid direction: %d", direction)) {
                 return NULL;
         }
-        struct wlr_box *output_box =
-                wlr_output_layout_get_box(root->output_layout, reference->wlr_output);
-        int lx = output_box->x + output_box->width / 2;
-        int ly = output_box->y + output_box->height / 2;
+        struct wlr_box output_box;
+        wlr_output_layout_get_box(root->output_layout, reference->wlr_output, &output_box);
+        int lx = output_box.x + output_box.width / 2;
+        int ly = output_box.y + output_box.height / 2;
         struct wlr_output *wlr_adjacent = wlr_output_layout_adjacent_output(
                         root->output_layout, direction, reference->wlr_output, lx, ly);
         if (!wlr_adjacent) {
@@ -393,6 +418,33 @@ void output_get_box(struct sway_output *output, struct wlr_box *box) {
         box->height = output->height;
 }
 
+static void handle_destroy_non_desktop(struct wl_listener *listener, void *data) {
+        struct sway_output_non_desktop *output =
+                wl_container_of(listener, output, destroy);
+
+        sway_log(SWAY_DEBUG, "Destroying non-desktop output '%s'", output->wlr_output->name);
+
+        int index = list_find(root->non_desktop_outputs, output);
+        list_del(root->non_desktop_outputs, index);
+
+        wl_list_remove(&output->destroy.link);
+
+        free(output);
+}
+
+struct sway_output_non_desktop *output_non_desktop_create(
+                struct wlr_output *wlr_output) {
+        struct sway_output_non_desktop *output =
+                calloc(1, sizeof(struct sway_output_non_desktop));
+
+        output->wlr_output = wlr_output;
+
+        wl_signal_add(&wlr_output->events.destroy, &output->destroy);
+        output->destroy.notify = handle_destroy_non_desktop;
+
+        return output;
+}
+
 enum sway_container_layout output_get_default_layout(
                 struct sway_output *output) {
         if (config->default_orientation != L_NONE) {
diff --git a/sway/tree/root.c b/sway/tree/root.c
index ebd185ec..e9cea5e2 100644
--- a/sway/tree/root.c
+++ b/sway/tree/root.c
@@ -3,10 +3,13 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wlr/types/wlr_output_layout.h>
+#include <wlr/types/wlr_scene.h>
+#include <wlr/util/transform.h>
 #include "sway/desktop/transaction.h"
 #include "sway/input/seat.h"
 #include "sway/ipc-server.h"
 #include "sway/output.h"
+#include "sway/scene_descriptor.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/container.h"
 #include "sway/tree/root.h"
@@ -23,21 +26,60 @@ static void output_layout_handle_change(struct wl_listener *listener,
         transaction_commit_dirty();
 }
 
-struct sway_root *root_create(void) {
+struct sway_root *root_create(struct wl_display *wl_display) {
         struct sway_root *root = calloc(1, sizeof(struct sway_root));
         if (!root) {
                 sway_log(SWAY_ERROR, "Unable to allocate sway_root");
                 return NULL;
         }
+
+        struct wlr_scene *root_scene = wlr_scene_create();
+        if (!root_scene) {
+                sway_log(SWAY_ERROR, "Unable to allocate root scene node");
+                free(root);
+                return NULL;
+        }
+
         node_init(&root->node, N_ROOT, root);
-        root->output_layout = wlr_output_layout_create();
-        wl_list_init(&root->all_outputs);
+        root->root_scene = root_scene;
+
+        bool failed = false;
+        root->staging = alloc_scene_tree(&root_scene->tree, &failed);
+        root->layer_tree = alloc_scene_tree(&root_scene->tree, &failed);
+
+        root->layers.shell_background = alloc_scene_tree(root->layer_tree, &failed);
+        root->layers.shell_bottom = alloc_scene_tree(root->layer_tree, &failed);
+        root->layers.tiling = alloc_scene_tree(root->layer_tree, &failed);
+        root->layers.floating = alloc_scene_tree(root->layer_tree, &failed);
+        root->layers.shell_top = alloc_scene_tree(root->layer_tree, &failed);
+        root->layers.fullscreen = alloc_scene_tree(root->layer_tree, &failed);
+        root->layers.fullscreen_global = alloc_scene_tree(root->layer_tree, &failed);
 #if HAVE_XWAYLAND
-        wl_list_init(&root->xwayland_unmanaged);
+        root->layers.unmanaged = alloc_scene_tree(root->layer_tree, &failed);
 #endif
-        wl_list_init(&root->drag_icons);
+        root->layers.shell_overlay = alloc_scene_tree(root->layer_tree, &failed);
+        root->layers.popup = alloc_scene_tree(root->layer_tree, &failed);
+        root->layers.seat = alloc_scene_tree(root->layer_tree, &failed);
+        root->layers.session_lock = alloc_scene_tree(root->layer_tree, &failed);
+
+        if (!failed && !scene_descriptor_assign(&root->layers.seat->node,
+                        SWAY_SCENE_DESC_NON_INTERACTIVE, (void *)1)) {
+                failed = true;
+        }
+
+        if (failed) {
+                wlr_scene_node_destroy(&root_scene->tree.node);
+                free(root);
+                return NULL;
+        }
+
+        wlr_scene_node_set_enabled(&root->staging->node, false);
+
+        root->output_layout = wlr_output_layout_create(wl_display);
+        wl_list_init(&root->all_outputs);
         wl_signal_init(&root->events.new_node);
         root->outputs = create_list();
+        root->non_desktop_outputs = create_list();
         root->scratchpad = create_list();
 
         root->output_layout_change.notify = output_layout_handle_change;
@@ -49,21 +91,34 @@ struct sway_root *root_create(void) {
 void root_destroy(struct sway_root *root) {
         wl_list_remove(&root->output_layout_change.link);
         list_free(root->scratchpad);
+        list_free(root->non_desktop_outputs);
         list_free(root->outputs);
-        wlr_output_layout_destroy(root->output_layout);
+        wlr_scene_node_destroy(&root->root_scene->tree.node);
         free(root);
 }
 
+static void set_container_transform(struct sway_workspace *ws,
+                        struct sway_container *con) {
+        struct sway_output *output = ws->output;
+        struct wlr_box box = {0};
+        if (output) {
+                output_get_box(output, &box);
+        }
+        con->transform = box;
+}
+
 void root_scratchpad_add_container(struct sway_container *con, struct sway_workspace *ws) {
         if (!sway_assert(!con->scratchpad, "Container is already in scratchpad")) {
                 return;
         }
 
-        struct sway_container *parent = con->parent;
-        struct sway_workspace *workspace = con->workspace;
+        struct sway_container *parent = con->pending.parent;
+        struct sway_workspace *workspace = con->pending.workspace;
+
+        set_container_transform(workspace, con);
 
         // Clear the fullscreen mode when sending to the scratchpad
-        if (con->fullscreen_mode != FULLSCREEN_NONE) {
+        if (con->pending.fullscreen_mode != FULLSCREEN_NONE) {
                 container_fullscreen_disable(con);
         }
 
@@ -117,7 +172,7 @@ void root_scratchpad_show(struct sway_container *con) {
                 sway_log(SWAY_DEBUG, "No focused workspace to show scratchpad on");
                 return;
         }
-        struct sway_workspace *old_ws = con->workspace;
+        struct sway_workspace *old_ws = con->pending.workspace;
 
         // If the current con or any of its parents are in fullscreen mode, we
         // first need to disable it before showing the scratchpad con.
@@ -131,31 +186,34 @@ void root_scratchpad_show(struct sway_container *con) {
         // Show the container
         if (old_ws) {
                 container_detach(con);
-                workspace_consider_destroy(old_ws);
+                // Make sure the last inactive container on the old workspace is above
+                // the workspace itself in the focus stack.
+                struct sway_node *node = seat_get_focus_inactive(seat, &old_ws->node);
+                seat_set_raw_focus(seat, node);
         } else {
                 // Act on the ancestor of scratchpad hidden split containers
-                while (con->parent) {
-                        con = con->parent;
+                while (con->pending.parent) {
+                        con = con->pending.parent;
                 }
         }
         workspace_add_floating(new_ws, con);
 
-        // Make sure the container's center point overlaps this workspace
-        double center_lx = con->x + con->width / 2;
-        double center_ly = con->y + con->height / 2;
-
-        struct wlr_box workspace_box;
-        workspace_get_box(new_ws, &workspace_box);
-        if (!wlr_box_contains_point(&workspace_box, center_lx, center_ly)) {
-                container_floating_resize_and_center(con);
+        if (new_ws->output) {
+                struct wlr_box output_box;
+                output_get_box(new_ws->output, &output_box);
+                floating_fix_coordinates(con, &con->transform, &output_box);
         }
+        set_container_transform(new_ws, con);
 
         arrange_workspace(new_ws);
         seat_set_focus(seat, seat_get_focus_inactive(seat, &con->node));
+        if (old_ws) {
+                workspace_consider_destroy(old_ws);
+        }
 }
 
 static void disable_fullscreen(struct sway_container *con, void *data) {
-        if (con->fullscreen_mode != FULLSCREEN_NONE) {
+        if (con->pending.fullscreen_mode != FULLSCREEN_NONE) {
                 container_fullscreen_disable(con);
         }
 }
@@ -163,14 +221,16 @@ static void disable_fullscreen(struct sway_container *con, void *data) {
 void root_scratchpad_hide(struct sway_container *con) {
         struct sway_seat *seat = input_manager_current_seat();
         struct sway_node *focus = seat_get_focus_inactive(seat, &root->node);
-        struct sway_workspace *ws = con->workspace;
+        struct sway_workspace *ws = con->pending.workspace;
 
-        if (con->fullscreen_mode == FULLSCREEN_GLOBAL && !con->workspace) {
+        if (con->pending.fullscreen_mode == FULLSCREEN_GLOBAL && !con->pending.workspace) {
                 // If the container was made fullscreen global while in the scratchpad,
                 // it should be shown until fullscreen has been disabled
                 return;
         }
 
+        set_container_transform(con->pending.workspace, con);
+
         disable_fullscreen(con, NULL);
         container_for_each_child(con, disable_fullscreen, NULL);
         container_detach(con);
@@ -183,163 +243,6 @@ void root_scratchpad_hide(struct sway_container *con) {
         ipc_event_window(con, "move");
 }
 
-struct pid_workspace {
-        pid_t pid;
-        char *workspace;
-        struct timespec time_added;
-
-        struct sway_output *output;
-        struct wl_listener output_destroy;
-
-        struct wl_list link;
-};
-
-static struct wl_list pid_workspaces;
-
-/**
- * Get the pid of a parent process given the pid of a child process.
- *
- * Returns the parent pid or NULL if the parent pid cannot be determined.
- */
-static pid_t get_parent_pid(pid_t child) {
-        pid_t parent = -1;
-        char file_name[100];
-        char *buffer = NULL;
-        const char *sep = " ";
-        FILE *stat = NULL;
-        size_t buf_size = 0;
-
-        sprintf(file_name, "/proc/%d/stat", child);
-
-        if ((stat = fopen(file_name, "r"))) {
-                if (getline(&buffer, &buf_size, stat) != -1) {
-                        strtok(buffer, sep); // pid
-                        strtok(NULL, sep);   // executable name
-                        strtok(NULL, sep);   // state
-                        char *token = strtok(NULL, sep);   // parent pid
-                        parent = strtol(token, NULL, 10);
-                }
-                free(buffer);
-                fclose(stat);
-        }
-
-        if (parent) {
-                return (parent == child) ? -1 : parent;
-        }
-
-        return -1;
-}
-
-static void pid_workspace_destroy(struct pid_workspace *pw) {
-        wl_list_remove(&pw->output_destroy.link);
-        wl_list_remove(&pw->link);
-        free(pw->workspace);
-        free(pw);
-}
-
-struct sway_workspace *root_workspace_for_pid(pid_t pid) {
-        if (!pid_workspaces.prev && !pid_workspaces.next) {
-                wl_list_init(&pid_workspaces);
-                return NULL;
-        }
-
-        struct sway_workspace *ws = NULL;
-        struct pid_workspace *pw = NULL;
-
-        sway_log(SWAY_DEBUG, "Looking up workspace for pid %d", pid);
-
-        do {
-                struct pid_workspace *_pw = NULL;
-                wl_list_for_each(_pw, &pid_workspaces, link) {
-                        if (pid == _pw->pid) {
-                                pw = _pw;
-                                sway_log(SWAY_DEBUG,
-                                                "found pid_workspace for pid %d, workspace %s",
-                                                pid, pw->workspace);
-                                goto found;
-                        }
-                }
-                pid = get_parent_pid(pid);
-        } while (pid > 1);
-found:
-
-        if (pw && pw->workspace) {
-                ws = workspace_by_name(pw->workspace);
-
-                if (!ws) {
-                        sway_log(SWAY_DEBUG,
-                                        "Creating workspace %s for pid %d because it disappeared",
-                                        pw->workspace, pid);
-                        ws = workspace_create(pw->output, pw->workspace);
-                }
-
-                pid_workspace_destroy(pw);
-        }
-
-        return ws;
-}
-
-static void pw_handle_output_destroy(struct wl_listener *listener, void *data) {
-        struct pid_workspace *pw = wl_container_of(listener, pw, output_destroy);
-        pw->output = NULL;
-        wl_list_remove(&pw->output_destroy.link);
-        wl_list_init(&pw->output_destroy.link);
-}
-
-void root_record_workspace_pid(pid_t pid) {
-        sway_log(SWAY_DEBUG, "Recording workspace for process %d", pid);
-        if (!pid_workspaces.prev && !pid_workspaces.next) {
-                wl_list_init(&pid_workspaces);
-        }
-
-        struct sway_seat *seat = input_manager_current_seat();
-        struct sway_workspace *ws = seat_get_focused_workspace(seat);
-        if (!ws) {
-                sway_log(SWAY_DEBUG, "Bailing out, no workspace");
-                return;
-        }
-        struct sway_output *output = ws->output;
-        if (!output) {
-                sway_log(SWAY_DEBUG, "Bailing out, no output");
-                return;
-        }
-
-        struct timespec now;
-        clock_gettime(CLOCK_MONOTONIC, &now);
-
-        // Remove expired entries
-        static const int timeout = 60;
-        struct pid_workspace *old, *_old;
-        wl_list_for_each_safe(old, _old, &pid_workspaces, link) {
-                if (now.tv_sec - old->time_added.tv_sec >= timeout) {
-                        pid_workspace_destroy(old);
-                }
-        }
-
-        struct pid_workspace *pw = calloc(1, sizeof(struct pid_workspace));
-        pw->workspace = strdup(ws->name);
-        pw->output = output;
-        pw->pid = pid;
-        memcpy(&pw->time_added, &now, sizeof(struct timespec));
-        pw->output_destroy.notify = pw_handle_output_destroy;
-        wl_signal_add(&output->wlr_output->events.destroy, &pw->output_destroy);
-        wl_list_insert(&pid_workspaces, &pw->link);
-}
-
-void root_remove_workspace_pid(pid_t pid) {
-        if (!pid_workspaces.prev || !pid_workspaces.next) {
-                return;
-        }
-
-        struct pid_workspace *pw, *tmp;
-        wl_list_for_each_safe(pw, tmp, &pid_workspaces, link) {
-                if (pid == pw->pid) {
-                        pid_workspace_destroy(pw);
-                        return;
-                }
-        }
-}
-
 void root_for_each_workspace(void (*f)(struct sway_workspace *ws, void *data),
                 void *data) {
         for (int i = 0; i < root->outputs->length; ++i) {
@@ -365,8 +268,8 @@ void root_for_each_container(void (*f)(struct sway_container *con, void *data),
         }
 
         // Saved workspaces
-        for (int i = 0; i < root->noop_output->workspaces->length; ++i) {
-                struct sway_workspace *ws = root->noop_output->workspaces->items[i];
+        for (int i = 0; i < root->fallback_output->workspaces->length; ++i) {
+                struct sway_workspace *ws = root->fallback_output->workspaces->items[i];
                 workspace_for_each_container(ws, f, data);
         }
 }
@@ -418,8 +321,8 @@ struct sway_container *root_find_container(
         }
 
         // Saved workspaces
-        for (int i = 0; i < root->noop_output->workspaces->length; ++i) {
-                struct sway_workspace *ws = root->noop_output->workspaces->items[i];
+        for (int i = 0; i < root->fallback_output->workspaces->length; ++i) {
+                struct sway_workspace *ws = root->fallback_output->workspaces->items[i];
                 if ((result = workspace_find_container(ws, test, data))) {
                         return result;
                 }
@@ -434,17 +337,3 @@ void root_get_box(struct sway_root *root, struct wlr_box *box) {
         box->width = root->width;
         box->height = root->height;
 }
-
-void root_rename_pid_workspaces(const char *old_name, const char *new_name) {
-        if (!pid_workspaces.prev && !pid_workspaces.next) {
-                wl_list_init(&pid_workspaces);
-        }
-
-        struct pid_workspace *pw = NULL;
-        wl_list_for_each(pw, &pid_workspaces, link) {
-                if (strcmp(pw->workspace, old_name) == 0) {
-                        free(pw->workspace);
-                        pw->workspace = strdup(new_name);
-                }
-        }
-}
diff --git a/sway/tree/view.c b/sway/tree/view.c
index 7afcdf31..d6984178 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -6,6 +6,7 @@
 #include <wlr/types/wlr_buffer.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_server_decoration.h>
+#include <wlr/types/wlr_subcompositor.h>
 #include <wlr/types/wlr_xdg_decoration_v1.h>
 #include "config.h"
 #if HAVE_XWAYLAND
@@ -15,14 +16,16 @@
 #include "log.h"
 #include "sway/criteria.h"
 #include "sway/commands.h"
-#include "sway/desktop.h"
 #include "sway/desktop/transaction.h"
 #include "sway/desktop/idle_inhibit_v1.h"
+#include "sway/desktop/launcher.h"
 #include "sway/input/cursor.h"
 #include "sway/ipc-server.h"
 #include "sway/output.h"
 #include "sway/input/seat.h"
+#include "sway/scene_descriptor.h"
 #include "sway/server.h"
+#include "sway/sway_text_node.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/container.h"
 #include "sway/tree/view.h"
@@ -32,15 +35,29 @@
 #include "pango.h"
 #include "stringop.h"
 
-void view_init(struct sway_view *view, enum sway_view_type type,
+bool view_init(struct sway_view *view, enum sway_view_type type,
                 const struct sway_view_impl *impl) {
+        bool failed = false;
+        view->scene_tree = alloc_scene_tree(root->staging, &failed);
+        view->content_tree = alloc_scene_tree(view->scene_tree, &failed);
+
+        if (!failed && !scene_descriptor_assign(&view->scene_tree->node,
+                        SWAY_SCENE_DESC_VIEW, view)) {
+                failed = true;
+        }
+
+        if (failed) {
+                wlr_scene_node_destroy(&view->scene_tree->node);
+                return false;
+        }
+
         view->type = type;
         view->impl = impl;
         view->executed_criteria = create_list();
-        wl_list_init(&view->saved_buffers);
         view->allow_request_urgent = true;
         view->shortcuts_inhibit = SHORTCUTS_INHIBIT_DEFAULT;
         wl_signal_init(&view->events.unmap);
+        return true;
 }
 
 void view_destroy(struct sway_view *view) {
@@ -56,11 +73,11 @@ void view_destroy(struct sway_view *view) {
                                 "(might have a pending transaction?)")) {
                 return;
         }
-        if (!wl_list_empty(&view->saved_buffers)) {
-                view_remove_saved_buffer(view);
-        }
+        wl_list_remove(&view->events.unmap.listener_list);
         list_free(view->executed_criteria);
 
+        view_assign_ctx(view, NULL);
+        wlr_scene_node_destroy(&view->scene_tree->node);
         free(view->title_format);
 
         if (view->impl->destroy) {
@@ -206,7 +223,7 @@ bool view_ancestor_is_only_visible(struct sway_view *view) {
                 } else {
                         only_visible = true;
                 }
-                con = con->parent;
+                con = con->pending.parent;
         }
         return only_visible;
 }
@@ -222,72 +239,73 @@ static bool view_is_only_visible(struct sway_view *view) {
                         }
                 }
 
-                con = con->parent;
+                con = con->pending.parent;
         }
 
         return true;
 }
 
 static bool gaps_to_edge(struct sway_view *view) {
-        struct side_gaps gaps = view->container->workspace->current_gaps;
+        struct side_gaps gaps = view->container->pending.workspace->current_gaps;
         return gaps.top > 0 || gaps.right > 0 || gaps.bottom > 0 || gaps.left > 0;
 }
 
 void view_autoconfigure(struct sway_view *view) {
         struct sway_container *con = view->container;
-        struct sway_workspace *ws = con->workspace;
+        struct sway_workspace *ws = con->pending.workspace;
 
         if (container_is_scratchpad_hidden(con) &&
-                        con->fullscreen_mode != FULLSCREEN_GLOBAL) {
+                        con->pending.fullscreen_mode != FULLSCREEN_GLOBAL) {
                 return;
         }
         struct sway_output *output = ws ? ws->output : NULL;
 
-        if (con->fullscreen_mode == FULLSCREEN_WORKSPACE) {
-                con->content_x = output->lx;
-                con->content_y = output->ly;
-                con->content_width = output->width;
-                con->content_height = output->height;
+        if (con->pending.fullscreen_mode == FULLSCREEN_WORKSPACE) {
+                con->pending.content_x = output->lx;
+                con->pending.content_y = output->ly;
+                con->pending.content_width = output->width;
+                con->pending.content_height = output->height;
                 return;
-        } else if (con->fullscreen_mode == FULLSCREEN_GLOBAL) {
-                con->content_x = root->x;
-                con->content_y = root->y;
-                con->content_width = root->width;
-                con->content_height = root->height;
+        } else if (con->pending.fullscreen_mode == FULLSCREEN_GLOBAL) {
+                con->pending.content_x = root->x;
+                con->pending.content_y = root->y;
+                con->pending.content_width = root->width;
+                con->pending.content_height = root->height;
                 return;
         }
 
-        con->border_top = con->border_bottom = true;
-        con->border_left = con->border_right = true;
+        con->pending.border_top = con->pending.border_bottom = true;
+        con->pending.border_left = con->pending.border_right = true;
         double y_offset = 0;
 
-        if (!container_is_floating(con) && ws) {
+        if (!container_is_floating_or_child(con) && ws) {
                 if (config->hide_edge_borders == E_BOTH
                                 || config->hide_edge_borders == E_VERTICAL) {
-                        con->border_left = con->x != ws->x;
-                        int right_x = con->x + con->width;
-                        con->border_right = right_x != ws->x + ws->width;
+                        con->pending.border_left = con->pending.x != ws->x;
+                        int right_x = con->pending.x + con->pending.width;
+                        con->pending.border_right = right_x != ws->x + ws->width;
                 }
 
                 if (config->hide_edge_borders == E_BOTH
                                 || config->hide_edge_borders == E_HORIZONTAL) {
-                        con->border_top = con->y != ws->y;
-                        int bottom_y = con->y + con->height;
-                        con->border_bottom = bottom_y != ws->y + ws->height;
+                        con->pending.border_top = con->pending.y != ws->y;
+                        int bottom_y = con->pending.y + con->pending.height;
+                        con->pending.border_bottom = bottom_y != ws->y + ws->height;
                 }
 
                 bool smart = config->hide_edge_borders_smart == ESMART_ON ||
                         (config->hide_edge_borders_smart == ESMART_NO_GAPS &&
                         !gaps_to_edge(view));
                 if (smart) {
-                        bool show_border = container_is_floating_or_child(con) ||
-                                !view_is_only_visible(view);
-                        con->border_left &= show_border;
-                        con->border_right &= show_border;
-                        con->border_top &= show_border;
-                        con->border_bottom &= show_border;
+                        bool show_border = !view_is_only_visible(view);
+                        con->pending.border_left &= show_border;
+                        con->pending.border_right &= show_border;
+                        con->pending.border_top &= show_border;
+                        con->pending.border_bottom &= show_border;
                 }
+        }
 
+        if (!container_is_floating(con)) {
                 // In a tabbed or stacked container, the container's y is the top of the
                 // title area. We have to offset the surface y by the height of the title,
                 // bar, and disable any top border because we'll always have the title bar.
@@ -298,56 +316,56 @@ void view_autoconfigure(struct sway_view *view) {
                         enum sway_container_layout layout = container_parent_layout(con);
                         if (layout == L_TABBED) {
                                 y_offset = container_titlebar_height();
-                                con->border_top = false;
+                                con->pending.border_top = false;
                         } else if (layout == L_STACKED) {
                                 y_offset = container_titlebar_height() * siblings->length;
-                                con->border_top = false;
+                                con->pending.border_top = false;
                         }
                 }
         }
 
         double x, y, width, height;
-        switch (con->border) {
+        switch (con->pending.border) {
         default:
         case B_CSD:
         case B_NONE:
-                x = con->x;
-                y = con->y + y_offset;
-                width = con->width;
-                height = con->height - y_offset;
+                x = con->pending.x;
+                y = con->pending.y + y_offset;
+                width = con->pending.width;
+                height = con->pending.height - y_offset;
                 break;
         case B_PIXEL:
-                x = con->x + con->border_thickness * con->border_left;
-                y = con->y + con->border_thickness * con->border_top + y_offset;
-                width = con->width
-                        - con->border_thickness * con->border_left
-                        - con->border_thickness * con->border_right;
-                height = con->height - y_offset
-                        - con->border_thickness * con->border_top
-                        - con->border_thickness * con->border_bottom;
+                x = con->pending.x + con->pending.border_thickness * con->pending.border_left;
+                y = con->pending.y + con->pending.border_thickness * con->pending.border_top + y_offset;
+                width = con->pending.width
+                        - con->pending.border_thickness * con->pending.border_left
+                        - con->pending.border_thickness * con->pending.border_right;
+                height = con->pending.height - y_offset
+                        - con->pending.border_thickness * con->pending.border_top
+                        - con->pending.border_thickness * con->pending.border_bottom;
                 break;
         case B_NORMAL:
                 // Height is: 1px border + 3px pad + title height + 3px pad + 1px border
-                x = con->x + con->border_thickness * con->border_left;
-                width = con->width
-                        - con->border_thickness * con->border_left
-                        - con->border_thickness * con->border_right;
+                x = con->pending.x + con->pending.border_thickness * con->pending.border_left;
+                width = con->pending.width
+                        - con->pending.border_thickness * con->pending.border_left
+                        - con->pending.border_thickness * con->pending.border_right;
                 if (y_offset) {
-                        y = con->y + y_offset;
-                        height = con->height - y_offset
-                                - con->border_thickness * con->border_bottom;
+                        y = con->pending.y + y_offset;
+                        height = con->pending.height - y_offset
+                                - con->pending.border_thickness * con->pending.border_bottom;
                 } else {
-                        y = con->y + container_titlebar_height();
-                        height = con->height - container_titlebar_height()
-                                - con->border_thickness * con->border_bottom;
+                        y = con->pending.y + container_titlebar_height();
+                        height = con->pending.height - container_titlebar_height()
+                                - con->pending.border_thickness * con->pending.border_bottom;
                 }
                 break;
         }
 
-        con->content_x = x;
-        con->content_y = y;
-        con->content_width = width;
-        con->content_height = height;
+        con->pending.content_x = x;
+        con->pending.content_y = y;
+        con->pending.content_width = width;
+        con->pending.content_height = height;
 }
 
 void view_set_activated(struct sway_view *view, bool activated) {
@@ -360,17 +378,17 @@ void view_set_activated(struct sway_view *view, bool activated) {
         }
 }
 
-void view_request_activate(struct sway_view *view) {
-        struct sway_workspace *ws = view->container->workspace;
-        if (!ws) { // hidden scratchpad container
-                return;
+void view_request_activate(struct sway_view *view, struct sway_seat *seat) {
+        struct sway_workspace *ws = view->container->pending.workspace;
+        if (!seat) {
+                seat = input_manager_current_seat();
         }
-        struct sway_seat *seat = input_manager_current_seat();
 
         switch (config->focus_on_window_activation) {
         case FOWA_SMART:
-                if (workspace_is_visible(ws)) {
+                if (ws && workspace_is_visible(ws)) {
                         seat_set_focus_container(seat, view->container);
+                        container_raise_floating(view->container);
                 } else {
                         view_set_urgent(view, true);
                 }
@@ -379,11 +397,17 @@ void view_request_activate(struct sway_view *view) {
                 view_set_urgent(view, true);
                 break;
         case FOWA_FOCUS:
-                seat_set_focus_container(seat, view->container);
+                if (container_is_scratchpad_hidden_or_child(view->container)) {
+                        root_scratchpad_show(view->container);
+                } else {
+                        seat_set_focus_container(seat, view->container);
+                        container_raise_floating(view->container);
+                }
                 break;
         case FOWA_NONE:
                 break;
         }
+        transaction_commit_dirty();
 }
 
 void view_set_csd_from_server(struct sway_view *view, bool enabled) {
@@ -401,13 +425,13 @@ void view_set_csd_from_server(struct sway_view *view, bool enabled) {
 void view_update_csd_from_client(struct sway_view *view, bool enabled) {
         sway_log(SWAY_DEBUG, "View %p updated CSD to %i", view, enabled);
         struct sway_container *con = view->container;
-        if (enabled && con && con->border != B_CSD) {
-                con->saved_border = con->border;
+        if (enabled && con && con->pending.border != B_CSD) {
+                con->saved_border = con->pending.border;
                 if (container_is_floating(con)) {
-                        con->border = B_CSD;
+                        con->pending.border = B_CSD;
                 }
-        } else if (!enabled && con && con->border == B_CSD) {
-                con->border = con->saved_border;
+        } else if (!enabled && con && con->pending.border == B_CSD) {
+                con->pending.border = con->saved_border;
         }
         view->using_csd = enabled;
 }
@@ -430,49 +454,6 @@ void view_close_popups(struct sway_view *view) {
         }
 }
 
-void view_damage_from(struct sway_view *view) {
-        for (int i = 0; i < root->outputs->length; ++i) {
-                struct sway_output *output = root->outputs->items[i];
-                output_damage_from_view(output, view);
-        }
-}
-
-void view_for_each_surface(struct sway_view *view,
-                wlr_surface_iterator_func_t iterator, void *user_data) {
-        if (!view->surface) {
-                return;
-        }
-        if (view->impl->for_each_surface) {
-                view->impl->for_each_surface(view, iterator, user_data);
-        } else {
-                wlr_surface_for_each_surface(view->surface, iterator, user_data);
-        }
-}
-
-void view_for_each_popup_surface(struct sway_view *view,
-                wlr_surface_iterator_func_t iterator, void *user_data) {
-        if (!view->surface) {
-                return;
-        }
-        if (view->impl->for_each_popup_surface) {
-                view->impl->for_each_popup_surface(view, iterator, user_data);
-        }
-}
-
-static void view_subsurface_create(struct sway_view *view,
-        struct wlr_subsurface *subsurface);
-
-static void view_init_subsurfaces(struct sway_view *view,
-        struct wlr_surface *surface);
-
-static void view_handle_surface_new_subsurface(struct wl_listener *listener,
-                void *data) {
-        struct sway_view *view =
-                wl_container_of(listener, view, surface_new_subsurface);
-        struct wlr_subsurface *subsurface = data;
-        view_subsurface_create(view, subsurface);
-}
-
 static bool view_has_executed_criteria(struct sway_view *view,
                 struct criteria *criteria) {
         for (int i = 0; i < view->executed_criteria->length; ++i) {
@@ -514,7 +495,7 @@ static void view_populate_pid(struct sway_view *view) {
 #if HAVE_XWAYLAND
         case SWAY_VIEW_XWAYLAND:;
                 struct wlr_xwayland_surface *surf =
-                        wlr_xwayland_surface_from_wlr_surface(view->surface);
+                        wlr_xwayland_surface_try_from_wlr_surface(view->surface);
                 pid = surf->pid;
                 break;
 #endif
@@ -527,6 +508,20 @@ static void view_populate_pid(struct sway_view *view) {
         view->pid = pid;
 }
 
+void view_assign_ctx(struct sway_view *view, struct launcher_ctx *ctx) {
+        if (view->ctx) {
+                // This ctx has been replaced
+                launcher_ctx_destroy(view->ctx);
+                view->ctx = NULL;
+        }
+        if (ctx == NULL) {
+                return;
+        }
+        launcher_ctx_consume(ctx);
+
+        view->ctx = ctx;
+}
+
 static struct sway_workspace *select_workspace(struct sway_view *view) {
         struct sway_seat *seat = input_manager_current_seat();
 
@@ -562,13 +557,14 @@ static struct sway_workspace *select_workspace(struct sway_view *view) {
         }
         list_free(criterias);
         if (ws) {
-                root_remove_workspace_pid(view->pid);
+                view_assign_ctx(view, NULL);
                 return ws;
         }
 
         // Check if there's a PID mapping
-        ws = root_workspace_for_pid(view->pid);
+        ws = view->ctx ? launcher_ctx_get_workspace(view->ctx) : NULL;
         if (ws) {
+                view_assign_ctx(view, NULL);
                 return ws;
         }
 
@@ -577,7 +573,7 @@ static struct sway_workspace *select_workspace(struct sway_view *view) {
         if (node && node->type == N_WORKSPACE) {
                 return node->sway_workspace;
         } else if (node && node->type == N_CONTAINER) {
-                return node->sway_container->workspace;
+                return node->sway_container->pending.workspace;
         }
 
         // When there's no outputs connected, the above should match a workspace on
@@ -590,12 +586,17 @@ static bool should_focus(struct sway_view *view) {
         struct sway_seat *seat = input_manager_current_seat();
         struct sway_container *prev_con = seat_get_focused_container(seat);
         struct sway_workspace *prev_ws = seat_get_focused_workspace(seat);
-        struct sway_workspace *map_ws = view->container->workspace;
+        struct sway_workspace *map_ws = view->container->pending.workspace;
 
-        if (view->container->fullscreen_mode == FULLSCREEN_GLOBAL) {
+        if (view->container->pending.fullscreen_mode == FULLSCREEN_GLOBAL) {
                 return true;
         }
 
+        // View opened "under" fullscreen view should not be given focus.
+        if (root->fullscreen_global || !map_ws || map_ws->fullscreen) {
+                return false;
+        }
+
         // Views can only take focus if they are mapped into the active workspace
         if (prev_ws != map_ws) {
                 return false;
@@ -603,9 +604,9 @@ static bool should_focus(struct sway_view *view) {
 
         // If the view is the only one in the focused workspace, it'll get focus
         // regardless of any no_focus criteria.
-        if (!view->container->parent && !prev_con) {
-                size_t num_children = view->container->workspace->tiling->length +
-                        view->container->workspace->floating->length;
+        if (!view->container->pending.parent && !prev_con) {
+                size_t num_children = view->container->pending.workspace->tiling->length +
+                        view->container->pending.workspace->floating->length;
                 if (num_children == 1) {
                         return true;
                 }
@@ -635,6 +636,7 @@ static void handle_foreign_activate_request(
                         break;
                 }
         }
+        transaction_commit_dirty();
 }
 
 static void handle_foreign_fullscreen_request(
@@ -645,9 +647,21 @@ static void handle_foreign_fullscreen_request(
 
         // Match fullscreen command behavior for scratchpad hidden views
         struct sway_container *container = view->container;
-        if (!container->workspace) {
-                while (container->parent) {
-                        container = container->parent;
+        if (!container->pending.workspace) {
+                while (container->pending.parent) {
+                        container = container->pending.parent;
+                }
+        }
+
+        if (event->fullscreen && event->output && event->output->data) {
+                struct sway_output *output = event->output->data;
+                struct sway_workspace *ws = output_get_active_workspace(output);
+                if (ws && !container_is_scratchpad_hidden(view->container)) {
+                        if (container_is_floating(view->container)) {
+                                workspace_add_floating(ws, view->container);
+                        } else {
+                                workspace_add_tiling(ws, view->container);
+                        }
                 }
         }
 
@@ -656,12 +670,13 @@ static void handle_foreign_fullscreen_request(
         if (event->fullscreen) {
                 arrange_root();
         } else {
-                if (container->parent) {
-                        arrange_container(container->parent);
-                } else if (container->workspace) {
-                        arrange_workspace(container->workspace);
+                if (container->pending.parent) {
+                        arrange_container(container->pending.parent);
+                } else if (container->pending.workspace) {
+                        arrange_workspace(container->pending.workspace);
                 }
         }
+        transaction_commit_dirty();
 }
 
 static void handle_foreign_close_request(
@@ -692,6 +707,13 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
         view_populate_pid(view);
         view->container = container_create(view);
 
+        if (view->ctx == NULL) {
+                struct launcher_ctx *ctx = launcher_ctx_find_pid(view->pid);
+                if (ctx != NULL) {
+                        view_assign_ctx(view, ctx);
+                }
+        }
+
         // If there is a request to be opened fullscreen on a specific output, try
         // to honor that request. Otherwise, fallback to assigns, pid mappings,
         // focused workspace, etc
@@ -705,10 +727,29 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
         }
 
         struct sway_seat *seat = input_manager_current_seat();
-        struct sway_node *node = ws ? seat_get_focus_inactive(seat, &ws->node)
-                : seat_get_focus_inactive(seat, &root->node);
-        struct sway_container *target_sibling = node->type == N_CONTAINER ?
-                node->sway_container : NULL;
+        struct sway_node *node =
+                seat_get_focus_inactive(seat, ws ? &ws->node : &root->node);
+        struct sway_container *target_sibling = NULL;
+        if (node && node->type == N_CONTAINER) {
+                if (container_is_floating(node->sway_container)) {
+                        // If we're about to launch the view into the floating container, then
+                        // launch it as a tiled view instead.
+                        if (ws) {
+                                target_sibling = seat_get_focus_inactive_tiling(seat, ws);
+                                if (target_sibling) {
+                                        struct sway_container *con =
+                                                seat_get_focus_inactive_view(seat, &target_sibling->node);
+                                        if (con)  {
+                                                target_sibling = con;
+                                        }
+                                }
+                        } else {
+                                ws = seat_get_last_known_workspace(seat);
+                        }
+                } else {
+                        target_sibling = node->sway_container;
+                }
+        }
 
         view->foreign_toplevel =
                 wlr_foreign_toplevel_handle_v1_create(server.foreign_toplevel_manager);
@@ -725,13 +766,6 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
         wl_signal_add(&view->foreign_toplevel->events.destroy,
                         &view->foreign_destroy);
 
-        // If we're about to launch the view into the floating container, then
-        // launch it as a tiled view in the root of the workspace instead.
-        if (target_sibling && container_is_floating(target_sibling)) {
-                target_sibling = NULL;
-                ws = seat_get_last_known_workspace(seat);
-        }
-
         struct sway_container *container = view->container;
         if (target_sibling) {
                 container_add_sibling(target_sibling, container, 1);
@@ -740,30 +774,25 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
         }
         ipc_event_window(view->container, "new");
 
-        view_init_subsurfaces(view, wlr_surface);
-        wl_signal_add(&wlr_surface->events.new_subsurface,
-                &view->surface_new_subsurface);
-        view->surface_new_subsurface.notify = view_handle_surface_new_subsurface;
-
         if (decoration) {
                 view_update_csd_from_client(view, decoration);
         }
 
         if (view->impl->wants_floating && view->impl->wants_floating(view)) {
-                view->container->border = config->floating_border;
-                view->container->border_thickness = config->floating_border_thickness;
+                view->container->pending.border = config->floating_border;
+                view->container->pending.border_thickness = config->floating_border_thickness;
                 container_set_floating(view->container, true);
         } else {
-                view->container->border = config->border;
-                view->container->border_thickness = config->border_thickness;
+                view->container->pending.border = config->border;
+                view->container->pending.border_thickness = config->border_thickness;
                 view_set_tiled(view, true);
         }
 
         if (config->popup_during_fullscreen == POPUP_LEAVE &&
-                        container->workspace &&
-                        container->workspace->fullscreen &&
-                        container->workspace->fullscreen->view) {
-                struct sway_container *fs = container->workspace->fullscreen;
+                        container->pending.workspace &&
+                        container->pending.workspace->fullscreen &&
+                        container->pending.workspace->fullscreen->view) {
+                struct sway_container *fs = container->pending.workspace->fullscreen;
                 if (view_is_transient_for(view, fs->view)) {
                         container_set_fullscreen(fs, false);
                 }
@@ -774,12 +803,12 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
 
         if (fullscreen) {
                 container_set_fullscreen(view->container, true);
-                arrange_workspace(view->container->workspace);
+                arrange_workspace(view->container->pending.workspace);
         } else {
-                if (container->parent) {
-                        arrange_container(container->parent);
-                } else if (container->workspace) {
-                        arrange_workspace(container->workspace);
+                if (container->pending.parent) {
+                        arrange_container(container->pending.parent);
+                } else if (container->pending.workspace) {
+                        arrange_workspace(container->pending.workspace);
                 }
         }
 
@@ -788,11 +817,10 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
         bool set_focus = should_focus(view);
 
 #if HAVE_XWAYLAND
-        if (wlr_surface_is_xwayland_surface(wlr_surface)) {
-                struct wlr_xwayland_surface *xsurface =
-                        wlr_xwayland_surface_from_wlr_surface(wlr_surface);
-        set_focus = (wlr_xwayland_icccm_input_model(xsurface) !=
-                        WLR_ICCCM_INPUT_MODEL_NONE) && set_focus;
+        struct wlr_xwayland_surface *xsurface;
+        if ((xsurface = wlr_xwayland_surface_try_from_wlr_surface(wlr_surface))) {
+                set_focus &= wlr_xwayland_icccm_input_model(xsurface) !=
+                                WLR_ICCCM_INPUT_MODEL_NONE;
         }
 #endif
 
@@ -803,18 +831,16 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
         const char *app_id;
         const char *class;
         if ((app_id = view_get_app_id(view)) != NULL) {
-                wlr_foreign_toplevel_handle_v1_set_app_id(
-                                view->foreign_toplevel, app_id);
+                wlr_foreign_toplevel_handle_v1_set_app_id(view->foreign_toplevel, app_id);
         } else if ((class = view_get_class(view)) != NULL) {
-                wlr_foreign_toplevel_handle_v1_set_app_id(
-                                view->foreign_toplevel, class);
+                wlr_foreign_toplevel_handle_v1_set_app_id(view->foreign_toplevel, class);
         }
 }
 
 void view_unmap(struct sway_view *view) {
-        wl_signal_emit(&view->events.unmap, view);
+        wl_signal_emit_mutable(&view->events.unmap, view);
 
-        wl_list_remove(&view->surface_new_subsurface.link);
+        view->executed_criteria->length = 0;
 
         if (view->urgent_timer) {
                 wl_event_source_remove(view->urgent_timer);
@@ -826,8 +852,8 @@ void view_unmap(struct sway_view *view) {
                 view->foreign_toplevel = NULL;
         }
 
-        struct sway_container *parent = view->container->parent;
-        struct sway_workspace *ws = view->container->workspace;
+        struct sway_container *parent = view->container->pending.parent;
+        struct sway_workspace *ws = view->container->pending.workspace;
         container_begin_destroy(view->container);
         if (parent) {
                 container_reap_empty(parent);
@@ -860,262 +886,54 @@ void view_unmap(struct sway_view *view) {
         view->surface = NULL;
 }
 
-void view_update_size(struct sway_view *view, int width, int height) {
+void view_update_size(struct sway_view *view) {
         struct sway_container *con = view->container;
-
-        if (container_is_floating(con)) {
-                con->content_width = width;
-                con->content_height = height;
-                container_set_geometry_from_content(con);
-        } else {
-                con->surface_x = con->content_x + (con->content_width - width) / 2;
-                con->surface_y = con->content_y + (con->content_height - height) / 2;
-                con->surface_x = fmax(con->surface_x, con->content_x);
-                con->surface_y = fmax(con->surface_y, con->content_y);
-        }
+        con->pending.content_width = view->geometry.width;
+        con->pending.content_height = view->geometry.height;
+        container_set_geometry_from_content(con);
 }
 
-static const struct sway_view_child_impl subsurface_impl;
+void view_center_and_clip_surface(struct sway_view *view) {
+        struct sway_container *con = view->container;
 
-static void subsurface_get_root_coords(struct sway_view_child *child,
-                int *root_sx, int *root_sy) {
-        struct wlr_surface *surface = child->surface;
-        *root_sx = -child->view->geometry.x;
-        *root_sy = -child->view->geometry.y;
+        if (container_is_floating(con)) {
+                // We always center the current coordinates rather than the next, as the
+                // geometry immediately affects the currently active rendering.
+                int x = (int) fmax(0, (con->current.content_width - view->geometry.width) / 2);
+                int y = (int) fmax(0, (con->current.content_height - view->geometry.height) / 2);
 
-        if (child->parent && child->parent->impl &&
-                        child->parent->impl->get_root_coords) {
-                int sx, sy;
-                child->parent->impl->get_root_coords(child->parent, &sx, &sy);
-                *root_sx += sx;
-                *root_sy += sy;
+                wlr_scene_node_set_position(&view->content_tree->node, x, y);
         } else {
-                while (surface && wlr_surface_is_subsurface(surface)) {
-                        struct wlr_subsurface *subsurface =
-                                wlr_subsurface_from_wlr_surface(surface);
-                        if (subsurface == NULL) {
-                                break;
-                        }
-                        *root_sx += subsurface->current.x;
-                        *root_sy += subsurface->current.y;
-                        surface = subsurface->parent;
-                }
-        }
-}
-
-static void subsurface_destroy(struct sway_view_child *child) {
-        if (!sway_assert(child->impl == &subsurface_impl,
-                        "Expected a subsurface")) {
-                return;
-        }
-        struct sway_subsurface *subsurface = (struct sway_subsurface *)child;
-        wl_list_remove(&subsurface->destroy.link);
-        free(subsurface);
-}
-
-static const struct sway_view_child_impl subsurface_impl = {
-        .get_root_coords = subsurface_get_root_coords,
-        .destroy = subsurface_destroy,
-};
-
-static void subsurface_handle_destroy(struct wl_listener *listener,
-                void *data) {
-        struct sway_subsurface *subsurface =
-                wl_container_of(listener, subsurface, destroy);
-        struct sway_view_child *child = &subsurface->child;
-        view_child_destroy(child);
-}
-
-static void view_child_damage(struct sway_view_child *child, bool whole);
-
-static void view_subsurface_create(struct sway_view *view,
-                struct wlr_subsurface *wlr_subsurface) {
-        struct sway_subsurface *subsurface =
-                calloc(1, sizeof(struct sway_subsurface));
-        if (subsurface == NULL) {
-                sway_log(SWAY_ERROR, "Allocation failed");
-                return;
-        }
-        view_child_init(&subsurface->child, &subsurface_impl, view,
-                wlr_subsurface->surface);
-
-        wl_signal_add(&wlr_subsurface->events.destroy, &subsurface->destroy);
-        subsurface->destroy.notify = subsurface_handle_destroy;
-
-        subsurface->child.mapped = true;
-
-        view_child_damage(&subsurface->child, true);
-}
-
-static void view_child_subsurface_create(struct sway_view_child *child,
-                struct wlr_subsurface *wlr_subsurface) {
-        struct sway_subsurface *subsurface =
-                calloc(1, sizeof(struct sway_subsurface));
-        if (subsurface == NULL) {
-                sway_log(SWAY_ERROR, "Allocation failed");
-                return;
-        }
-        subsurface->child.parent = child;
-        wl_list_insert(&child->children, &subsurface->child.link);
-        view_child_init(&subsurface->child, &subsurface_impl, child->view,
-                wlr_subsurface->surface);
-
-        wl_signal_add(&wlr_subsurface->events.destroy, &subsurface->destroy);
-        subsurface->destroy.notify = subsurface_handle_destroy;
-
-        subsurface->child.mapped = true;
-
-        view_child_damage(&subsurface->child, true);
-}
-
-static void view_child_damage(struct sway_view_child *child, bool whole) {
-        if (!child || !child->mapped || !child->view || !child->view->container) {
-                return;
+                wlr_scene_node_set_position(&view->content_tree->node, 0, 0);
         }
-        int sx, sy;
-        child->impl->get_root_coords(child, &sx, &sy);
-        desktop_damage_surface(child->surface,
-                        child->view->container->content_x + sx,
-                        child->view->container->content_y + sy, whole);
-}
-
-static void view_child_handle_surface_commit(struct wl_listener *listener,
-                void *data) {
-        struct sway_view_child *child =
-                wl_container_of(listener, child, surface_commit);
-        view_child_damage(child, false);
-}
 
-static void view_child_handle_surface_new_subsurface(
-                struct wl_listener *listener, void *data) {
-        struct sway_view_child *child =
-                wl_container_of(listener, child, surface_new_subsurface);
-        struct wlr_subsurface *subsurface = data;
-        view_child_subsurface_create(child, subsurface);
-}
-
-static void view_child_handle_surface_destroy(struct wl_listener *listener,
-                void *data) {
-        struct sway_view_child *child =
-                wl_container_of(listener, child, surface_destroy);
-        view_child_destroy(child);
-}
-
-static void view_init_subsurfaces(struct sway_view *view,
-                struct wlr_surface *surface) {
-        struct wlr_subsurface *subsurface;
-        wl_list_for_each(subsurface, &surface->subsurfaces, parent_link) {
-                view_subsurface_create(view, subsurface);
-        }
-}
-
-static void view_child_handle_surface_map(struct wl_listener *listener,
-                void *data) {
-        struct sway_view_child *child =
-                wl_container_of(listener, child, surface_map);
-        child->mapped = true;
-        view_child_damage(child, true);
-}
-
-static void view_child_handle_surface_unmap(struct wl_listener *listener,
-                void *data) {
-        struct sway_view_child *child =
-                wl_container_of(listener, child, surface_unmap);
-        view_child_damage(child, true);
-        child->mapped = false;
-}
-
-static void view_child_handle_view_unmap(struct wl_listener *listener,
-                void *data) {
-        struct sway_view_child *child =
-                wl_container_of(listener, child, view_unmap);
-        view_child_damage(child, true);
-        child->mapped = false;
-}
-
-void view_child_init(struct sway_view_child *child,
-                const struct sway_view_child_impl *impl, struct sway_view *view,
-                struct wlr_surface *surface) {
-        child->impl = impl;
-        child->view = view;
-        child->surface = surface;
-        wl_list_init(&child->children);
-
-        wl_signal_add(&surface->events.commit, &child->surface_commit);
-        child->surface_commit.notify = view_child_handle_surface_commit;
-        wl_signal_add(&surface->events.new_subsurface,
-                &child->surface_new_subsurface);
-        child->surface_new_subsurface.notify =
-                view_child_handle_surface_new_subsurface;
-        wl_signal_add(&surface->events.destroy, &child->surface_destroy);
-        child->surface_destroy.notify = view_child_handle_surface_destroy;
-
-        // Not all child views have a map/unmap event
-        child->surface_map.notify = view_child_handle_surface_map;
-        wl_list_init(&child->surface_map.link);
-        child->surface_unmap.notify = view_child_handle_surface_unmap;
-        wl_list_init(&child->surface_unmap.link);
-
-        wl_signal_add(&view->events.unmap, &child->view_unmap);
-        child->view_unmap.notify = view_child_handle_view_unmap;
-
-        struct sway_workspace *workspace = child->view->container->workspace;
-        if (workspace) {
-                wlr_surface_send_enter(child->surface, workspace->output->wlr_output);
-        }
-
-        view_init_subsurfaces(child->view, surface);
-}
-
-void view_child_destroy(struct sway_view_child *child) {
-        if (child->mapped && child->view->container != NULL) {
-                view_child_damage(child, true);
-        }
-
-        if (child->parent != NULL) {
-                wl_list_remove(&child->link);
-                child->parent = NULL;
-        }
-
-        struct sway_view_child *subchild, *tmpchild;
-        wl_list_for_each_safe(subchild, tmpchild, &child->children, link) {
-                wl_list_remove(&subchild->link);
-                subchild->parent = NULL;
-        }
-
-        wl_list_remove(&child->surface_commit.link);
-        wl_list_remove(&child->surface_destroy.link);
-        wl_list_remove(&child->surface_map.link);
-        wl_list_remove(&child->surface_unmap.link);
-        wl_list_remove(&child->view_unmap.link);
-        wl_list_remove(&child->surface_new_subsurface.link);
-
-        if (child->impl && child->impl->destroy) {
-                child->impl->destroy(child);
-        } else {
-                free(child);
+        // only make sure to clip the content if there is content to clip
+        if (!wl_list_empty(&con->view->content_tree->children)) {
+                wlr_scene_subsurface_tree_set_clip(&con->view->content_tree->node, &(struct wlr_box){
+                        .x = con->view->geometry.x,
+                        .y = con->view->geometry.y,
+                        .width = con->current.content_width,
+                        .height = con->current.content_height,
+                });
         }
 }
 
 struct sway_view *view_from_wlr_surface(struct wlr_surface *wlr_surface) {
-        if (wlr_surface_is_xdg_surface(wlr_surface)) {
-                struct wlr_xdg_surface *xdg_surface =
-                        wlr_xdg_surface_from_wlr_surface(wlr_surface);
+        struct wlr_xdg_surface *xdg_surface;
+        if ((xdg_surface = wlr_xdg_surface_try_from_wlr_surface(wlr_surface))) {
                 return view_from_wlr_xdg_surface(xdg_surface);
         }
 #if HAVE_XWAYLAND
-        if (wlr_surface_is_xwayland_surface(wlr_surface)) {
-                struct wlr_xwayland_surface *xsurface =
-                        wlr_xwayland_surface_from_wlr_surface(wlr_surface);
+        struct wlr_xwayland_surface *xsurface;
+        if ((xsurface = wlr_xwayland_surface_try_from_wlr_surface(wlr_surface))) {
                 return view_from_wlr_xwayland_surface(xsurface);
         }
 #endif
-        if (wlr_surface_is_subsurface(wlr_surface)) {
-                struct wlr_subsurface *subsurface =
-                        wlr_subsurface_from_wlr_surface(wlr_surface);
+        struct wlr_subsurface *subsurface;
+        if ((subsurface = wlr_subsurface_try_from_wlr_surface(wlr_surface))) {
                 return view_from_wlr_surface(subsurface->parent);
         }
-        if (wlr_surface_is_layer_surface(wlr_surface)) {
+        if (wlr_layer_surface_v1_try_from_wlr_surface(wlr_surface) != NULL) {
                 return NULL;
         }
 
@@ -1211,25 +1029,31 @@ void view_update_title(struct sway_view *view, bool force) {
 
         free(view->container->title);
         free(view->container->formatted_title);
-        if (title) {
-                size_t len = parse_title_format(view, NULL);
+
+        size_t len = parse_title_format(view, NULL);
+
+        if (len) {
                 char *buffer = calloc(len + 1, sizeof(char));
                 if (!sway_assert(buffer, "Unable to allocate title string")) {
                         return;
                 }
-                parse_title_format(view, buffer);
 
-                view->container->title = strdup(title);
+                parse_title_format(view, buffer);
                 view->container->formatted_title = buffer;
         } else {
-                view->container->title = NULL;
                 view->container->formatted_title = NULL;
         }
-        container_calculate_title_height(view->container);
-        config_update_font_height(false);
+
+        view->container->title = title ? strdup(title) : NULL;
 
         // Update title after the global font height is updated
-        container_update_title_textures(view->container);
+        if (view->container->title_bar.title_text && len) {
+                sway_text_node_set_text(view->container->title_bar.title_text,
+                        view->container->formatted_title);
+                container_arrange_title_bar(view->container);
+        } else {
+                container_update_title_bar(view->container);
+        }
 
         ipc_event_window(view->container, "title");
 
@@ -1242,15 +1066,15 @@ bool view_is_visible(struct sway_view *view) {
         if (view->container->node.destroying) {
                 return false;
         }
-        struct sway_workspace *workspace = view->container->workspace;
-        if (!workspace && view->container->fullscreen_mode != FULLSCREEN_GLOBAL) {
+        struct sway_workspace *workspace = view->container->pending.workspace;
+        if (!workspace && view->container->pending.fullscreen_mode != FULLSCREEN_GLOBAL) {
                 bool fs_global_descendant = false;
-                struct sway_container *parent = view->container->parent;
+                struct sway_container *parent = view->container->pending.parent;
                 while (parent) {
-                        if (parent->fullscreen_mode == FULLSCREEN_GLOBAL) {
+                        if (parent->pending.fullscreen_mode == FULLSCREEN_GLOBAL) {
                                 fs_global_descendant = true;
                         }
-                        parent = parent->parent;
+                        parent = parent->pending.parent;
                 }
                 if (!fs_global_descendant) {
                         return false;
@@ -1268,13 +1092,13 @@ bool view_is_visible(struct sway_view *view) {
                 enum sway_container_layout layout = container_parent_layout(con);
                 if ((layout == L_TABBED || layout == L_STACKED)
                                 && !container_is_floating(con)) {
-                        struct sway_node *parent = con->parent ?
-                                &con->parent->node : &con->workspace->node;
+                        struct sway_node *parent = con->pending.parent ?
+                                &con->pending.parent->node : &con->pending.workspace->node;
                         if (seat_get_active_tiling_child(seat, parent) != &con->node) {
                                 return false;
                         }
                 }
-                con = con->parent;
+                con = con->pending.parent;
         }
         // Check view isn't hidden by another fullscreen view
         struct sway_container *fs = root->fullscreen_global ?
@@ -1296,6 +1120,7 @@ void view_set_urgent(struct sway_view *view, bool enable) {
                         return;
                 }
                 clock_gettime(CLOCK_MONOTONIC, &view->urgent);
+                container_update_itself_and_parents(view->container);
         } else {
                 view->urgent = (struct timespec){ 0 };
                 if (view->urgent_timer) {
@@ -1303,12 +1128,11 @@ void view_set_urgent(struct sway_view *view, bool enable) {
                         view->urgent_timer = NULL;
                 }
         }
-        container_damage_whole(view->container);
 
         ipc_event_window(view->container, "urgent");
 
         if (!container_is_scratchpad_hidden(view->container)) {
-                workspace_detect_urgent(view->container->workspace);
+                workspace_detect_urgent(view->container->pending.workspace);
         }
 }
 
@@ -1317,40 +1141,54 @@ bool view_is_urgent(struct sway_view *view) {
 }
 
 void view_remove_saved_buffer(struct sway_view *view) {
-        if (!sway_assert(!wl_list_empty(&view->saved_buffers), "Expected a saved buffer")) {
+        if (!sway_assert(view->saved_surface_tree, "Expected a saved buffer")) {
                 return;
         }
-        struct sway_saved_buffer *saved_buf, *tmp;
-        wl_list_for_each_safe(saved_buf, tmp, &view->saved_buffers, link) {
-                wlr_buffer_unlock(&saved_buf->buffer->base);
-                wl_list_remove(&saved_buf->link);
-                free(saved_buf);
-        }
+
+        wlr_scene_node_destroy(&view->saved_surface_tree->node);
+        view->saved_surface_tree = NULL;
+        wlr_scene_node_set_enabled(&view->content_tree->node, true);
 }
 
-static void view_save_buffer_iterator(struct wlr_surface *surface,
+static void view_save_buffer_iterator(struct wlr_scene_buffer *buffer,
                 int sx, int sy, void *data) {
-        struct sway_view *view = data;
-
-        if (surface && wlr_surface_has_buffer(surface)) {
-                wlr_buffer_lock(&surface->buffer->base);
-                struct sway_saved_buffer *saved_buffer = calloc(1, sizeof(struct sway_saved_buffer));
-                saved_buffer->buffer = surface->buffer;
-                saved_buffer->width = surface->current.width;
-                saved_buffer->height = surface->current.height;
-                saved_buffer->x = sx;
-                saved_buffer->y = sy;
-                saved_buffer->transform = surface->current.transform;
-                wlr_surface_get_buffer_source_box(surface, &saved_buffer->source_box);
-                wl_list_insert(&view->saved_buffers, &saved_buffer->link);
+        struct wlr_scene_tree *tree = data;
+
+        struct wlr_scene_buffer *sbuf = wlr_scene_buffer_create(tree, NULL);
+        if (!sbuf) {
+                sway_log(SWAY_ERROR, "Could not allocate a scene buffer when saving a surface");
+                return;
         }
+
+        wlr_scene_buffer_set_dest_size(sbuf,
+                buffer->dst_width, buffer->dst_height);
+        wlr_scene_buffer_set_opaque_region(sbuf, &buffer->opaque_region);
+        wlr_scene_buffer_set_source_box(sbuf, &buffer->src_box);
+        wlr_scene_node_set_position(&sbuf->node, sx, sy);
+        wlr_scene_buffer_set_transform(sbuf, buffer->transform);
+        wlr_scene_buffer_set_buffer(sbuf, buffer->buffer);
 }
 
 void view_save_buffer(struct sway_view *view) {
-        if (!sway_assert(wl_list_empty(&view->saved_buffers), "Didn't expect saved buffer")) {
+        if (!sway_assert(!view->saved_surface_tree, "Didn't expect saved buffer")) {
                 view_remove_saved_buffer(view);
         }
-        view_for_each_surface(view, view_save_buffer_iterator, view);
+
+        view->saved_surface_tree = wlr_scene_tree_create(view->scene_tree);
+        if (!view->saved_surface_tree) {
+                sway_log(SWAY_ERROR, "Could not allocate a scene tree node when saving a surface");
+                return;
+        }
+
+        // Enable and disable the saved surface tree like so to atomitaclly update
+        // the tree. This will prevent over damaging or other weirdness.
+        wlr_scene_node_set_enabled(&view->saved_surface_tree->node, false);
+
+        wlr_scene_node_for_each_buffer(&view->content_tree->node,
+                view_save_buffer_iterator, view->saved_surface_tree);
+
+        wlr_scene_node_set_enabled(&view->content_tree->node, false);
+        wlr_scene_node_set_enabled(&view->saved_surface_tree->node, true);
 }
 
 bool view_is_transient_for(struct sway_view *child,
@@ -1358,3 +1196,19 @@ bool view_is_transient_for(struct sway_view *child,
         return child->impl->is_transient_for &&
                 child->impl->is_transient_for(child, ancestor);
 }
+
+static void send_frame_done_iterator(struct wlr_scene_buffer *scene_buffer,
+                int x, int y, void *data) {
+        struct timespec *when = data;
+        wl_signal_emit_mutable(&scene_buffer->events.frame_done, when);
+}
+
+void view_send_frame_done(struct sway_view *view) {
+        struct timespec when;
+        clock_gettime(CLOCK_MONOTONIC, &when);
+
+        struct wlr_scene_node *node;
+        wl_list_for_each(node, &view->content_tree->children, link) {
+                wlr_scene_node_for_each_buffer(node, send_frame_done_iterator, &when);
+        }
+}
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index 921b7d19..40d33435 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -48,14 +48,16 @@ struct sway_output *workspace_get_initial_output(const char *name) {
         if (focus && focus->type == N_WORKSPACE) {
                 return focus->sway_workspace->output;
         } else if (focus && focus->type == N_CONTAINER) {
-                return focus->sway_container->workspace->output;
+                return focus->sway_container->pending.workspace->output;
         }
-        // Fallback to the first output or noop output for headless
-        return root->outputs->length ? root->outputs->items[0] : root->noop_output;
+        // Fallback to the first output or the headless output
+        return root->outputs->length ? root->outputs->items[0] : root->fallback_output;
 }
 
 struct sway_workspace *workspace_create(struct sway_output *output,
                 const char *name) {
+        sway_assert(name, "NULL name given to workspace_create");
+
         if (output == NULL) {
                 output = workspace_get_initial_output(name);
         }
@@ -69,7 +71,19 @@ struct sway_workspace *workspace_create(struct sway_output *output,
                 return NULL;
         }
         node_init(&ws->node, N_WORKSPACE, ws);
-        ws->name = name ? strdup(name) : NULL;
+
+        bool failed = false;
+        ws->layers.tiling = alloc_scene_tree(root->staging, &failed);
+        ws->layers.fullscreen = alloc_scene_tree(root->staging, &failed);
+
+        if (failed) {
+                wlr_scene_node_destroy(&ws->layers.tiling->node);
+                wlr_scene_node_destroy(&ws->layers.fullscreen->node);
+                free(ws);
+                return NULL;
+        }
+
+        ws->name = strdup(name);
         ws->prev_split_layout = L_NONE;
         ws->layout = output_get_default_layout(output);
         ws->floating = create_list();
@@ -114,7 +128,7 @@ struct sway_workspace *workspace_create(struct sway_output *output,
         output_sort_workspaces(output);
 
         ipc_event_workspace(NULL, ws, "init");
-        wl_signal_emit(&root->events.new_node, &ws->node);
+        wl_signal_emit_mutable(&root->events.new_node, &ws->node);
 
         return ws;
 }
@@ -129,6 +143,11 @@ void workspace_destroy(struct sway_workspace *workspace) {
                 return;
         }
 
+        scene_node_disown_children(workspace->layers.tiling);
+        scene_node_disown_children(workspace->layers.fullscreen);
+        wlr_scene_node_destroy(&workspace->layers.tiling->node);
+        wlr_scene_node_destroy(&workspace->layers.fullscreen->node);
+
         free(workspace->name);
         free(workspace->representation);
         list_free_items_and_destroy(workspace->output_priority);
@@ -142,7 +161,7 @@ void workspace_destroy(struct sway_workspace *workspace) {
 void workspace_begin_destroy(struct sway_workspace *workspace) {
         sway_log(SWAY_DEBUG, "Destroying workspace '%s'", workspace->name);
         ipc_event_workspace(NULL, workspace, "empty"); // intentional
-        wl_signal_emit(&workspace->node.events.destroy, &workspace->node);
+        wl_signal_emit_mutable(&workspace->node.events.destroy, &workspace->node);
 
         if (workspace->output) {
                 workspace_detach(workspace);
@@ -174,22 +193,16 @@ void workspace_consider_destroy(struct sway_workspace *ws) {
 static bool workspace_valid_on_output(const char *output_name,
                 const char *ws_name) {
         struct workspace_config *wsc = workspace_find_config(ws_name);
-        char identifier[128];
         struct sway_output *output = output_by_name_or_id(output_name);
         if (!output) {
                 return false;
         }
-        output_name = output->wlr_output->name;
-        output_get_identifier(identifier, sizeof(identifier), output);
-
         if (!wsc) {
                 return true;
         }
 
         for (int i = 0; i < wsc->outputs->length; i++) {
-                if (strcmp(wsc->outputs->items[i], "*") == 0 ||
-                                strcmp(wsc->outputs->items[i], output_name) == 0 ||
-                                strcmp(wsc->outputs->items[i], identifier) == 0) {
+                if (output_match_name_or_id(output, wsc->outputs->items[i])) {
                         return true;
                 }
         }
@@ -222,10 +235,8 @@ static void workspace_name_from_binding(const struct sway_binding * binding,
                 // not a command about workspaces
                 if (strcmp(_target, "next") == 0 ||
                                 strcmp(_target, "prev") == 0 ||
-                                strncmp(_target, "next_on_output",
-                                        strlen("next_on_output")) == 0 ||
-                                strncmp(_target, "prev_on_output",
-                                        strlen("next_on_output")) == 0 ||
+                                strcmp(_target, "next_on_output") == 0 ||
+                                strcmp(_target, "prev_on_output") == 0 ||
                                 strcmp(_target, "number") == 0 ||
                                 strcmp(_target, "back_and_forth") == 0 ||
                                 strcmp(_target, "current") == 0) {
@@ -286,13 +297,10 @@ char *workspace_next_name(const char *output_name) {
         // assignments primarily, falling back to bindings and numbers.
         struct sway_mode *mode = config->current_mode;
 
-        char identifier[128];
         struct sway_output *output = output_by_name_or_id(output_name);
         if (!output) {
                 return NULL;
         }
-        output_name = output->wlr_output->name;
-        output_get_identifier(identifier, sizeof(identifier), output);
 
         int order = INT_MAX;
         char *target = NULL;
@@ -312,9 +320,7 @@ char *workspace_next_name(const char *output_name) {
                 }
                 bool found = false;
                 for (int j = 0; j < wsc->outputs->length; ++j) {
-                        if (strcmp(wsc->outputs->items[j], "*") == 0 ||
-                                        strcmp(wsc->outputs->items[j], output_name) == 0 ||
-                                        strcmp(wsc->outputs->items[j], identifier) == 0) {
+                        if (output_match_name_or_id(output, wsc->outputs->items[j])) {
                                 found = true;
                                 free(target);
                                 target = strdup(wsc->workspace);
@@ -363,11 +369,11 @@ struct sway_workspace *workspace_by_name(const char *name) {
         if (current && strcmp(name, "prev") == 0) {
                 return workspace_prev(current);
         } else if (current && strcmp(name, "prev_on_output") == 0) {
-                return workspace_output_prev(current, false);
+                return workspace_output_prev(current);
         } else if (current && strcmp(name, "next") == 0) {
                 return workspace_next(current);
         } else if (current && strcmp(name, "next_on_output") == 0) {
-                return workspace_output_next(current, false);
+                return workspace_output_next(current);
         } else if (strcmp(name, "current") == 0) {
                 return current;
         } else if (strcasecmp(name, "back_and_forth") == 0) {
@@ -530,7 +536,7 @@ struct sway_workspace *workspace_next(struct sway_workspace *workspace) {
  * otherwise the next one is returned.
  */
 static struct sway_workspace *workspace_output_prev_next_impl(
-                struct sway_output *output, int dir, bool create) {
+                struct sway_output *output, int dir) {
         struct sway_seat *seat = input_manager_current_seat();
         struct sway_workspace *workspace = seat_get_focused_workspace(seat);
         if (!workspace) {
@@ -540,46 +546,43 @@ static struct sway_workspace *workspace_output_prev_next_impl(
         }
 
         int index = list_find(output->workspaces, workspace);
-        if (!workspace_is_empty(workspace) && create &&
-                        (index + dir < 0 || index + dir == output->workspaces->length)) {
-                struct sway_output *output = workspace->output;
-                char *next = workspace_next_name(output->wlr_output->name);
-                workspace_create(output, next);
-                free(next);
-        }
         size_t new_index = wrap(index + dir, output->workspaces->length);
         return output->workspaces->items[new_index];
 }
 
-struct sway_workspace *workspace_output_next(
-                struct sway_workspace *current, bool create) {
-        return workspace_output_prev_next_impl(current->output, 1, create);
+
+struct sway_workspace *workspace_output_next(struct sway_workspace *current) {
+        return workspace_output_prev_next_impl(current->output, 1);
 }
 
-struct sway_workspace *workspace_output_prev(
-                struct sway_workspace *current, bool create) {
-        return workspace_output_prev_next_impl(current->output, -1, create);
+struct sway_workspace *workspace_output_prev(struct sway_workspace *current) {
+        return workspace_output_prev_next_impl(current->output, -1);
 }
 
-bool workspace_switch(struct sway_workspace *workspace,
-                bool no_auto_back_and_forth) {
+struct sway_workspace *workspace_auto_back_and_forth(
+                struct sway_workspace *workspace) {
         struct sway_seat *seat = input_manager_current_seat();
         struct sway_workspace *active_ws = NULL;
         struct sway_node *focus = seat_get_focus_inactive(seat, &root->node);
         if (focus && focus->type == N_WORKSPACE) {
                 active_ws = focus->sway_workspace;
         } else if (focus && focus->type == N_CONTAINER) {
-                active_ws = focus->sway_container->workspace;
+                active_ws = focus->sway_container->pending.workspace;
         }
 
-        if (!no_auto_back_and_forth && config->auto_back_and_forth && active_ws
-                        && active_ws == workspace && seat->prev_workspace_name) {
+        if (config->auto_back_and_forth && active_ws && active_ws == workspace &&
+                        seat->prev_workspace_name) {
                 struct sway_workspace *new_ws =
                         workspace_by_name(seat->prev_workspace_name);
                 workspace = new_ws ?
                         new_ws :
                         workspace_create(NULL, seat->prev_workspace_name);
         }
+        return workspace;
+}
+
+bool workspace_switch(struct sway_workspace *workspace) {
+        struct sway_seat *seat = input_manager_current_seat();
 
         sway_log(SWAY_DEBUG, "Switching to workspace %p:%s",
                 workspace, workspace->name);
@@ -657,15 +660,9 @@ void workspace_output_add_priority(struct sway_workspace *workspace,
 
 struct sway_output *workspace_output_get_highest_available(
                 struct sway_workspace *ws, struct sway_output *exclude) {
-        char exclude_id[128] = {'\0'};
-        if (exclude) {
-                output_get_identifier(exclude_id, sizeof(exclude_id), exclude);
-        }
-
         for (int i = 0; i < ws->output_priority->length; i++) {
-                char *name = ws->output_priority->items[i];
-                if (exclude && (strcmp(name, exclude->wlr_output->name) == 0
-                                        || strcmp(name, exclude_id) == 0)) {
+                const char *name = ws->output_priority->items[i];
+                if (exclude && output_match_name_or_id(exclude, name)) {
                         continue;
                 }
 
@@ -689,7 +686,6 @@ void workspace_detect_urgent(struct sway_workspace *workspace) {
         if (workspace->urgent != new_urgent) {
                 workspace->urgent = new_urgent;
                 ipc_event_workspace(NULL, workspace, "urgent");
-                output_damage_whole(workspace->output);
         }
 }
 
@@ -736,13 +732,13 @@ struct sway_container *workspace_find_container(struct sway_workspace *ws,
 }
 
 static void set_workspace(struct sway_container *container, void *data) {
-        container->workspace = container->parent->workspace;
+        container->pending.workspace = container->pending.parent->pending.workspace;
 }
 
 static void workspace_attach_tiling(struct sway_workspace *ws,
                 struct sway_container *con) {
         list_add(ws->tiling, con);
-        con->workspace = ws;
+        con->pending.workspace = ws;
         container_for_each_child(con, set_workspace, NULL);
         container_handle_fullscreen_reparent(con);
         workspace_update_representation(ws);
@@ -753,7 +749,7 @@ static void workspace_attach_tiling(struct sway_workspace *ws,
 struct sway_container *workspace_wrap_children(struct sway_workspace *ws) {
         struct sway_container *fs = ws->fullscreen;
         struct sway_container *middle = container_create(NULL);
-        middle->layout = ws->layout;
+        middle->pending.layout = ws->layout;
         while (ws->tiling->length) {
                 struct sway_container *child = ws->tiling->items[0];
                 container_detach(child);
@@ -771,9 +767,9 @@ void workspace_unwrap_children(struct sway_workspace *ws,
                 return;
         }
 
-        ws->layout = wrap->layout;
-        while (wrap->children->length) {
-                struct sway_container *child = wrap->children->items[0];
+        ws->layout = wrap->pending.layout;
+        while (wrap->pending.children->length) {
+                struct sway_container *child = wrap->pending.children->items[0];
                 container_detach(child);
                 workspace_add_tiling(ws, child);
         }
@@ -793,14 +789,18 @@ void workspace_detach(struct sway_workspace *workspace) {
 
 struct sway_container *workspace_add_tiling(struct sway_workspace *workspace,
                 struct sway_container *con) {
-        if (con->workspace) {
+        if (con->pending.workspace) {
+                struct sway_container *old_parent = con->pending.parent;
                 container_detach(con);
+                if (old_parent) {
+                        container_reap_empty(old_parent);
+                }
         }
         if (config->default_layout != L_NONE) {
                 con = container_split(con, config->default_layout);
         }
         list_add(workspace->tiling, con);
-        con->workspace = workspace;
+        con->pending.workspace = workspace;
         container_for_each_child(con, set_workspace, NULL);
         container_handle_fullscreen_reparent(con);
         workspace_update_representation(workspace);
@@ -811,11 +811,11 @@ struct sway_container *workspace_add_tiling(struct sway_workspace *workspace,
 
 void workspace_add_floating(struct sway_workspace *workspace,
                 struct sway_container *con) {
-        if (con->workspace) {
+        if (con->pending.workspace) {
                 container_detach(con);
         }
         list_add(workspace->floating, con);
-        con->workspace = workspace;
+        con->pending.workspace = workspace;
         container_for_each_child(con, set_workspace, NULL);
         container_handle_fullscreen_reparent(con);
         node_set_dirty(&workspace->node);
@@ -825,7 +825,7 @@ void workspace_add_floating(struct sway_workspace *workspace,
 void workspace_insert_tiling_direct(struct sway_workspace *workspace,
                 struct sway_container *con, int index) {
         list_insert(workspace->tiling, index, con);
-        con->workspace = workspace;
+        con->pending.workspace = workspace;
         container_for_each_child(con, set_workspace, NULL);
         container_handle_fullscreen_reparent(con);
         workspace_update_representation(workspace);
@@ -835,7 +835,7 @@ void workspace_insert_tiling_direct(struct sway_workspace *workspace,
 
 struct sway_container *workspace_insert_tiling(struct sway_workspace *workspace,
                 struct sway_container *con, int index) {
-        if (con->workspace) {
+        if (con->pending.workspace) {
                 container_detach(con);
         }
         if (config->default_layout != L_NONE) {
@@ -845,24 +845,36 @@ struct sway_container *workspace_insert_tiling(struct sway_workspace *workspace,
         return con;
 }
 
+bool workspace_has_single_visible_container(struct sway_workspace *ws) {
+        struct sway_seat *seat = input_manager_get_default_seat();
+        struct sway_container *focus =
+                seat_get_focus_inactive_tiling(seat, ws);
+        if (focus && !focus->view) {
+                focus = seat_get_focus_inactive_view(seat, &focus->node);
+        }
+        return (focus && focus->view && view_ancestor_is_only_visible(focus->view));
+}
+
 void workspace_add_gaps(struct sway_workspace *ws) {
-        if (config->smart_gaps) {
-                struct sway_seat *seat = input_manager_get_default_seat();
-                struct sway_container *focus =
-                        seat_get_focus_inactive_tiling(seat, ws);
-                if (focus && !focus->view) {
-                        focus = seat_get_focus_inactive_view(seat, &focus->node);
-                }
-                if (focus && focus->view && view_ancestor_is_only_visible(focus->view)) {
-                        ws->current_gaps.top = 0;
-                        ws->current_gaps.right = 0;
-                        ws->current_gaps.bottom = 0;
-                        ws->current_gaps.left = 0;
-                        return;
-                }
+        if (config->smart_gaps == SMART_GAPS_ON
+                        && workspace_has_single_visible_container(ws)) {
+                ws->current_gaps.top = 0;
+                ws->current_gaps.right = 0;
+                ws->current_gaps.bottom = 0;
+                ws->current_gaps.left = 0;
+                return;
+        }
+
+        if (config->smart_gaps == SMART_GAPS_INVERSE_OUTER
+                        && !workspace_has_single_visible_container(ws)) {
+                ws->current_gaps.top = 0;
+                ws->current_gaps.right = 0;
+                ws->current_gaps.bottom = 0;
+                ws->current_gaps.left = 0;
+        } else {
+                ws->current_gaps = ws->gaps_outer;
         }
 
-        ws->current_gaps = ws->gaps_outer;
         // Add inner gaps and make sure we don't turn out negative
         ws->current_gaps.top = fmax(0, ws->current_gaps.top + ws->gaps_inner);
         ws->current_gaps.right = fmax(0, ws->current_gaps.right + ws->gaps_inner);
@@ -905,7 +917,7 @@ struct sway_container *workspace_split(struct sway_workspace *workspace,
         enum sway_container_layout old_layout = workspace->layout;
         struct sway_container *middle = workspace_wrap_children(workspace);
         workspace->layout = layout;
-        middle->layout = old_layout;
+        middle->pending.layout = old_layout;
 
         struct sway_seat *seat;
         wl_list_for_each(seat, &server.input->seats, link) {
diff --git a/sway/xdg_activation_v1.c b/sway/xdg_activation_v1.c
new file mode 100644
index 00000000..c26ee19a
--- /dev/null
+++ b/sway/xdg_activation_v1.c
@@ -0,0 +1,50 @@
+#include <wlr/types/wlr_xdg_activation_v1.h>
+#include "sway/desktop/launcher.h"
+#include "sway/tree/view.h"
+#include "sway/tree/workspace.h"
+
+void xdg_activation_v1_handle_request_activate(struct wl_listener *listener,
+                void *data) {
+        const struct wlr_xdg_activation_v1_request_activate_event *event = data;
+
+        struct wlr_xdg_surface *xdg_surface =
+                wlr_xdg_surface_try_from_wlr_surface(event->surface);
+        if (xdg_surface == NULL) {
+                return;
+        }
+        struct sway_view *view = xdg_surface->data;
+        if (view == NULL) {
+                return;
+        }
+
+        if (!xdg_surface->surface->mapped) {
+                // This is a startup notification. If we are tracking it, the data
+                // field is a launcher_ctx.
+                struct launcher_ctx *ctx = event->token->data;
+                if (!ctx || ctx->activated) {
+                        // This ctx has already been activated and cannot be used again
+                        // for a startup notification. It will be destroyed
+                        return;
+                } else {
+                        ctx->activated = true;
+                        view_assign_ctx(view, ctx);
+                }
+                return;
+        }
+
+        struct wlr_seat *wlr_seat = event->token->seat;
+        struct sway_seat *seat = wlr_seat ? wlr_seat->data : NULL;
+        view_request_activate(view, seat);
+}
+
+void xdg_activation_v1_handle_new_token(struct wl_listener *listener, void *data) {
+        struct wlr_xdg_activation_token_v1 *token = data;
+        struct sway_seat *seat = token->seat ? token->seat->data :
+                input_manager_current_seat();
+
+        struct sway_workspace *ws = seat_get_focused_workspace(seat);
+        if (ws) {
+                launcher_ctx_create(token, &ws->node);
+                return;
+        }
+}
diff --git a/sway/xdg_decoration.c b/sway/xdg_decoration.c
index e7c3ea73..fa8c6279 100644
--- a/sway/xdg_decoration.c
+++ b/sway/xdg_decoration.c
@@ -10,7 +10,7 @@ static void xdg_decoration_handle_destroy(struct wl_listener *listener,
                 void *data) {
         struct sway_xdg_decoration *deco =
                 wl_container_of(listener, deco, destroy);
-        if(deco->view) {
+        if (deco->view) {
                 deco->view->xdg_decoration = NULL;
         }
         wl_list_remove(&deco->destroy.link);
@@ -23,13 +23,12 @@ static void xdg_decoration_handle_request_mode(struct wl_listener *listener,
                 void *data) {
         struct sway_xdg_decoration *deco =
                 wl_container_of(listener, deco, request_mode);
-        wlr_xdg_toplevel_decoration_v1_set_mode(deco->wlr_xdg_decoration,
-                        WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE);
+        set_xdg_decoration_mode(deco);
 }
 
 void handle_xdg_decoration(struct wl_listener *listener, void *data) {
         struct wlr_xdg_toplevel_decoration_v1 *wlr_deco = data;
-        struct sway_xdg_shell_view *xdg_shell_view = wlr_deco->surface->data;
+        struct sway_xdg_shell_view *xdg_shell_view = wlr_deco->toplevel->base->data;
 
         struct sway_xdg_decoration *deco = calloc(1, sizeof(*deco));
         if (deco == NULL) {
@@ -48,16 +47,46 @@ void handle_xdg_decoration(struct wl_listener *listener, void *data) {
 
         wl_list_insert(&server.xdg_decorations, &deco->link);
 
-        xdg_decoration_handle_request_mode(&deco->request_mode, wlr_deco);
+        set_xdg_decoration_mode(deco);
 }
 
 struct sway_xdg_decoration *xdg_decoration_from_surface(
                 struct wlr_surface *surface) {
         struct sway_xdg_decoration *deco;
         wl_list_for_each(deco, &server.xdg_decorations, link) {
-                if (deco->wlr_xdg_decoration->surface->surface == surface) {
+                if (deco->wlr_xdg_decoration->toplevel->base->surface == surface) {
                         return deco;
                 }
         }
         return NULL;
 }
+
+void set_xdg_decoration_mode(struct sway_xdg_decoration *deco) {
+        struct sway_view *view = deco->view;
+        enum wlr_xdg_toplevel_decoration_v1_mode mode =
+                WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE;
+        enum wlr_xdg_toplevel_decoration_v1_mode client_mode =
+                deco->wlr_xdg_decoration->requested_mode;
+
+        bool floating;
+        if (view->container) {
+                floating = container_is_floating(view->container);
+                bool csd = false;
+                csd = client_mode ==
+                        WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE;
+                view_update_csd_from_client(view, csd);
+                arrange_container(view->container);
+                transaction_commit_dirty();
+        } else {
+                floating = view->impl->wants_floating &&
+                        view->impl->wants_floating(view);
+        }
+
+        if (floating && client_mode) {
+                mode = client_mode;
+        }
+
+        if (view->wlr_xdg_toplevel->base->initialized) {
+                wlr_xdg_toplevel_decoration_v1_set_mode(deco->wlr_xdg_decoration, mode);
+        }
+}
diff --git a/swaybar/bar.c b/swaybar/bar.c
index 231c1ad7..021fc3bd 100644
--- a/swaybar/bar.c
+++ b/swaybar/bar.c
@@ -51,10 +51,6 @@ static void swaybar_output_free(struct swaybar_output *output) {
         if (output->surface != NULL) {
                 wl_surface_destroy(output->surface);
         }
-        if (output->input_region != NULL) {
-                wl_region_destroy(output->input_region);
-        }
-        zxdg_output_v1_destroy(output->xdg_output);
         wl_output_destroy(output->output);
         destroy_buffer(&output->buffers[0]);
         destroy_buffer(&output->buffers[1]);
@@ -90,7 +86,7 @@ static void layer_surface_closed(void *_output,
         swaybar_output_free(output);
 }
 
-struct zwlr_layer_surface_v1_listener layer_surface_listener = {
+static const struct zwlr_layer_surface_v1_listener layer_surface_listener = {
         .configure = layer_surface_configure,
         .closed = layer_surface_closed,
 };
@@ -114,10 +110,9 @@ static void add_layer_surface(struct swaybar_output *output) {
 
         if (overlay) {
                 // Empty input region
-                output->input_region = wl_compositor_create_region(bar->compositor);
-                assert(output->input_region);
-
-                wl_surface_set_input_region(output->surface, output->input_region);
+                struct wl_region *region = wl_compositor_create_region(bar->compositor);
+                wl_surface_set_input_region(output->surface, region);
+                wl_region_destroy(region);
         }
 
         zwlr_layer_surface_v1_set_anchor(output->layer_surface, config->position);
@@ -172,7 +167,7 @@ bool determine_bar_visibility(struct swaybar *bar, bool moving_layer) {
                 if (bar->status) {
                         sway_log(SWAY_DEBUG, "Sending %s signal to status command",
                                         visible ? "cont" : "stop");
-                        kill(bar->status->pid, visible ?
+                        kill(-bar->status->pid, visible ?
                                         bar->status->cont_signal : bar->status->stop_signal);
                 }
         }
@@ -230,7 +225,7 @@ static void output_scale(void *data, struct wl_output *wl_output,
         }
 }
 
-struct wl_output_listener output_listener = {
+static const struct wl_output_listener output_listener = {
         .geometry = output_geometry,
         .mode = output_mode,
         .done = output_done,
@@ -307,7 +302,7 @@ static void xdg_output_handle_description(void *data,
         }
 }
 
-struct zxdg_output_v1_listener xdg_output_listener = {
+static const struct zxdg_output_v1_listener xdg_output_listener = {
         .logical_position = xdg_output_handle_logical_position,
         .logical_size = xdg_output_handle_logical_size,
         .done = xdg_output_handle_done,
@@ -367,6 +362,9 @@ static void handle_global(void *data, struct wl_registry *registry,
         } else if (strcmp(interface, zxdg_output_manager_v1_interface.name) == 0) {
                 bar->xdg_output_manager = wl_registry_bind(registry, name,
                         &zxdg_output_manager_v1_interface, 2);
+        } else if (strcmp(interface, wp_cursor_shape_manager_v1_interface.name) == 0) {
+                bar->cursor_shape_manager = wl_registry_bind(registry, name,
+                        &wp_cursor_shape_manager_v1_interface, 1);
         }
 }
 
@@ -430,15 +428,17 @@ bool bar_setup(struct swaybar *bar, const char *socket_path) {
         // Second roundtrip for xdg-output
         wl_display_roundtrip(bar->display);
 
-        struct swaybar_seat *seat;
-        wl_list_for_each(seat, &bar->seats, link) {
-                struct swaybar_pointer *pointer = &seat->pointer;
-                if (!pointer) {
-                        continue;
+        if (!bar->cursor_shape_manager) {
+                struct swaybar_seat *seat;
+                wl_list_for_each(seat, &bar->seats, link) {
+                        struct swaybar_pointer *pointer = &seat->pointer;
+                        if (!pointer) {
+                                continue;
+                        }
+                        pointer->cursor_surface =
+                                wl_compositor_create_surface(bar->compositor);
+                        assert(pointer->cursor_surface);
                 }
-                pointer->cursor_surface =
-                        wl_compositor_create_surface(bar->compositor);
-                assert(pointer->cursor_surface);
         }
 
         if (bar->config->status_command) {
@@ -461,13 +461,28 @@ bool bar_setup(struct swaybar *bar, const char *socket_path) {
 
 static void display_in(int fd, short mask, void *data) {
         struct swaybar *bar = data;
+        if (mask & (POLLHUP | POLLERR)) {
+                if (mask & POLLERR) {
+                        sway_log(SWAY_ERROR, "Wayland display poll error");
+                }
+                bar->running = false;
+                return;
+        }
         if (wl_display_dispatch(bar->display) == -1) {
+                sway_log(SWAY_ERROR, "wl_display_dispatch failed");
                 bar->running = false;
         }
 }
 
 static void ipc_in(int fd, short mask, void *data) {
         struct swaybar *bar = data;
+        if (mask & (POLLHUP | POLLERR)) {
+                if (mask & POLLERR) {
+                        sway_log(SWAY_ERROR, "IPC poll error");
+                }
+                bar->running = false;
+                return;
+        }
         if (handle_ipc_readable(bar)) {
                 set_bar_dirty(bar);
         }
diff --git a/swaybar/config.c b/swaybar/config.c
index abedaec0..5e828773 100644
--- a/swaybar/config.c
+++ b/swaybar/config.c
@@ -26,7 +26,7 @@ struct swaybar_config *init_config(void) {
         config->status_command = NULL;
         config->pango_markup = false;
         config->position = parse_position("bottom");
-        config->font = strdup("monospace 10");
+        config->font_description = pango_font_description_from_string("monospace 10");
         config->mode = strdup("dock");
         config->hidden_state = strdup("hide");
         config->sep_symbol = NULL;
@@ -105,7 +105,7 @@ void free_tray_binding(struct tray_binding *binding) {
 
 void free_config(struct swaybar_config *config) {
         free(config->status_command);
-        free(config->font);
+        pango_font_description_free(config->font_description);
         free(config->mode);
         free(config->hidden_state);
         free(config->sep_symbol);
diff --git a/swaybar/i3bar.c b/swaybar/i3bar.c
index 4bcd5843..ccd5a076 100644
--- a/swaybar/i3bar.c
+++ b/swaybar/i3bar.c
@@ -28,6 +28,19 @@ void i3bar_block_unref(struct i3bar_block *block) {
         }
 }
 
+static bool i3bar_parse_json_color(json_object *json, uint32_t *color) {
+        if (!json) {
+                return false;
+        }
+
+        const char *hexstring = json_object_get_string(json);
+        bool color_set = parse_color(hexstring, color);
+        if (!color_set) {
+                sway_log(SWAY_ERROR, "Ignoring invalid block hexadecimal color string: %s", hexstring);
+        }
+        return color_set;
+}
+
 static void i3bar_parse_json(struct status_line *status,
                 struct json_object *json_array) {
         struct i3bar_block *block, *tmp;
@@ -68,13 +81,7 @@ static void i3bar_parse_json(struct status_line *status,
                         strdup(json_object_get_string(full_text)) : NULL;
                 block->short_text = short_text ?
                         strdup(json_object_get_string(short_text)) : NULL;
-                if (color) {
-                        const char *hexstring = json_object_get_string(color);
-                        block->color_set = parse_color(hexstring, &block->color);
-                        if (!block->color_set) {
-                                sway_log(SWAY_ERROR, "Invalid block color: %s", hexstring);
-                        }
-                }
+                block->color_set = i3bar_parse_json_color(color, &block->color);
                 if (min_width) {
                         json_type type = json_object_get_type(min_width);
                         if (type == json_type_int) {
@@ -100,14 +107,8 @@ static void i3bar_parse_json(struct status_line *status,
                 block->separator_block_width = separator_block_width ?
                         json_object_get_int(separator_block_width) : 9;
                 // Airblader features
-                const char *hex = background ? json_object_get_string(background) : NULL;
-                if (hex && !parse_color(hex, &block->background)) {
-                        sway_log(SWAY_ERROR, "Ignoring invalid block background: %s", hex);
-                }
-                hex = border ? json_object_get_string(border) : NULL;
-                if (hex && !parse_color(hex, &block->border)) {
-                        sway_log(SWAY_ERROR, "Ignoring invalid block border: %s", hex);
-                }
+                i3bar_parse_json_color(background, &block->background);
+                block->border_set = i3bar_parse_json_color(border, &block->border);
                 block->border_top = border_top ? json_object_get_int(border_top) : 1;
                 block->border_bottom = border_bottom ?
                         json_object_get_int(border_bottom) : 1;
@@ -268,11 +269,16 @@ bool i3bar_handle_readable(struct status_line *status) {
 
 enum hotspot_event_handling i3bar_block_send_click(struct status_line *status,
                 struct i3bar_block *block, double x, double y, double rx, double ry,
-                double w, double h, int scale, uint32_t button) {
+                double w, double h, int scale, uint32_t button, bool released) {
         sway_log(SWAY_DEBUG, "block %s clicked", block->name);
         if (!block->name || !status->click_events) {
                 return HOTSPOT_PROCESS;
         }
+        if (released) {
+                // Since we handle the pressed event, also handle the released event
+                // to block it from falling through to a binding in the bar
+                return HOTSPOT_IGNORE;
+        }
 
         struct json_object *event_json = json_object_new_object();
         json_object_object_add(event_json, "name",
diff --git a/common/background-image.c b/swaybar/image.c
index de42e8e9..ed24b9f9 100644
--- a/common/background-image.c
+++ b/swaybar/image.c
@@ -1,29 +1,12 @@
 #include <assert.h>
-#include "background-image.h"
-#include "cairo.h"
+#include "config.h"
 #include "log.h"
+#include "swaybar/image.h"
+
 #if HAVE_GDK_PIXBUF
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #endif
 
-enum background_mode parse_background_mode(const char *mode) {
-        if (strcmp(mode, "stretch") == 0) {
-                return BACKGROUND_MODE_STRETCH;
-        } else if (strcmp(mode, "fill") == 0) {
-                return BACKGROUND_MODE_FILL;
-        } else if (strcmp(mode, "fit") == 0) {
-                return BACKGROUND_MODE_FIT;
-        } else if (strcmp(mode, "center") == 0) {
-                return BACKGROUND_MODE_CENTER;
-        } else if (strcmp(mode, "tile") == 0) {
-                return BACKGROUND_MODE_TILE;
-        } else if (strcmp(mode, "solid_color") == 0) {
-                return BACKGROUND_MODE_SOLID_COLOR;
-        }
-        sway_log(SWAY_ERROR, "Unsupported background mode: %s", mode);
-        return BACKGROUND_MODE_INVALID;
-}
-
 #if HAVE_GDK_PIXBUF
 static cairo_surface_t* gdk_cairo_image_surface_create_from_pixbuf(
                 const GdkPixbuf *gdkbuf) {
@@ -121,7 +104,7 @@ static cairo_surface_t* gdk_cairo_image_surface_create_from_pixbuf(
 }
 #endif // HAVE_GDK_PIXBUF
 
-cairo_surface_t *load_background_image(const char *path) {
+cairo_surface_t *load_image(const char *path) {
         cairo_surface_t *image;
 #if HAVE_GDK_PIXBUF
         GError *err = NULL;
@@ -151,70 +134,3 @@ cairo_surface_t *load_background_image(const char *path) {
         }
         return image;
 }
-
-void render_background_image(cairo_t *cairo, cairo_surface_t *image,
-                enum background_mode mode, int buffer_width, int buffer_height) {
-        double width = cairo_image_surface_get_width(image);
-        double height = cairo_image_surface_get_height(image);
-
-        cairo_save(cairo);
-        switch (mode) {
-        case BACKGROUND_MODE_STRETCH:
-                cairo_scale(cairo,
-                                (double)buffer_width / width,
-                                (double)buffer_height / height);
-                cairo_set_source_surface(cairo, image, 0, 0);
-                break;
-        case BACKGROUND_MODE_FILL: {
-                double window_ratio = (double)buffer_width / buffer_height;
-                double bg_ratio = width / height;
-
-                if (window_ratio > bg_ratio) {
-                        double scale = (double)buffer_width / width;
-                        cairo_scale(cairo, scale, scale);
-                        cairo_set_source_surface(cairo, image,
-                                        0, (double)buffer_height / 2 / scale - height / 2);
-                } else {
-                        double scale = (double)buffer_height / height;
-                        cairo_scale(cairo, scale, scale);
-                        cairo_set_source_surface(cairo, image,
-                                        (double)buffer_width / 2 / scale - width / 2, 0);
-                }
-                break;
-        }
-        case BACKGROUND_MODE_FIT: {
-                double window_ratio = (double)buffer_width / buffer_height;
-                double bg_ratio = width / height;
-
-                if (window_ratio > bg_ratio) {
-                        double scale = (double)buffer_height / height;
-                        cairo_scale(cairo, scale, scale);
-                        cairo_set_source_surface(cairo, image,
-                                        (double)buffer_width / 2 / scale - width / 2, 0);
-                } else {
-                        double scale = (double)buffer_width / width;
-                        cairo_scale(cairo, scale, scale);
-                        cairo_set_source_surface(cairo, image,
-                                        0, (double)buffer_height / 2 / scale - height / 2);
-                }
-                break;
-        }
-        case BACKGROUND_MODE_CENTER:
-                cairo_set_source_surface(cairo, image,
-                                (double)buffer_width / 2 - width / 2,
-                                (double)buffer_height / 2 - height / 2);
-                break;
-        case BACKGROUND_MODE_TILE: {
-                cairo_pattern_t *pattern = cairo_pattern_create_for_surface(image);
-                cairo_pattern_set_extend(pattern, CAIRO_EXTEND_REPEAT);
-                cairo_set_source(cairo, pattern);
-                break;
-        }
-        case BACKGROUND_MODE_SOLID_COLOR:
-        case BACKGROUND_MODE_INVALID:
-                assert(0);
-                break;
-        }
-        cairo_paint(cairo);
-        cairo_restore(cairo);
-}
diff --git a/swaybar/input.c b/swaybar/input.c
index 4fe6dd93..ada4bc86 100644
--- a/swaybar/input.c
+++ b/swaybar/input.c
@@ -81,8 +81,16 @@ void update_cursor(struct swaybar_seat *seat) {
         int scale = pointer->current ? pointer->current->scale : 1;
         pointer->cursor_theme = wl_cursor_theme_load(
                 cursor_theme, cursor_size * scale, seat->bar->shm);
+        if (!pointer->cursor_theme) {
+                sway_log(SWAY_ERROR, "Failed to load cursor theme");
+                return;
+        }
         struct wl_cursor *cursor;
-        cursor = wl_cursor_theme_get_cursor(pointer->cursor_theme, "left_ptr");
+        cursor = wl_cursor_theme_get_cursor(pointer->cursor_theme, "default");
+        if (!cursor) {
+                sway_log(SWAY_ERROR, "Failed to get default cursor from theme");
+                return;
+        }
         pointer->cursor_image = cursor->images[0];
         wl_surface_set_buffer_scale(pointer->cursor_surface, scale);
         wl_surface_attach(pointer->cursor_surface,
@@ -101,7 +109,9 @@ static void wl_pointer_enter(void *data, struct wl_pointer *wl_pointer,
                 wl_fixed_t surface_x, wl_fixed_t surface_y) {
         struct swaybar_seat *seat = data;
         struct swaybar_pointer *pointer = &seat->pointer;
-        pointer->serial = serial;
+        seat->pointer.x = wl_fixed_to_double(surface_x);
+        seat->pointer.y = wl_fixed_to_double(surface_y);
+
         struct swaybar_output *output;
         wl_list_for_each(output, &seat->bar->outputs, link) {
                 if (output->surface == surface) {
@@ -109,7 +119,18 @@ static void wl_pointer_enter(void *data, struct wl_pointer *wl_pointer,
                         break;
                 }
         }
-        update_cursor(seat);
+
+        if (seat->bar->cursor_shape_manager) {
+                struct wp_cursor_shape_device_v1 *device =
+                        wp_cursor_shape_manager_v1_get_pointer(
+                                seat->bar->cursor_shape_manager, wl_pointer);
+                wp_cursor_shape_device_v1_set_shape(device, serial,
+                        WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_DEFAULT);
+                wp_cursor_shape_device_v1_destroy(device);
+        } else {
+                pointer->serial = serial;
+                update_cursor(seat);
+        }
 }
 
 static void wl_pointer_leave(void *data, struct wl_pointer *wl_pointer,
@@ -139,16 +160,15 @@ static bool check_bindings(struct swaybar *bar, uint32_t button,
 }
 
 static bool process_hotspots(struct swaybar_output *output,
-                double x, double y, uint32_t button) {
-        double px = x * output->scale;
-        double py = y * output->scale;
+                double x, double y, uint32_t button, uint32_t state) {
+        bool released = state == WL_POINTER_BUTTON_STATE_RELEASED;
         struct swaybar_hotspot *hotspot;
         wl_list_for_each(hotspot, &output->hotspots, link) {
-                if (px >= hotspot->x && py >= hotspot->y
-                                && px < hotspot->x + hotspot->width
-                                && py < hotspot->y + hotspot->height) {
+                if (x >= hotspot->x && y >= hotspot->y
+                                && x < hotspot->x + hotspot->width
+                                && y < hotspot->y + hotspot->height) {
                         if (HOTSPOT_IGNORE == hotspot->callback(output, hotspot, x, y,
-                                        button, hotspot->data)) {
+                                        button, released, hotspot->data)) {
                                 return true;
                         }
                 }
@@ -166,14 +186,11 @@ static void wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
                 return;
         }
 
-        if (check_bindings(seat->bar, button, state)) {
+        if (process_hotspots(output, pointer->x, pointer->y, button, state)) {
                 return;
         }
 
-        if (state != WL_POINTER_BUTTON_STATE_PRESSED) {
-                return;
-        }
-        process_hotspots(output, pointer->x, pointer->y, button);
+        check_bindings(seat->bar, button, state);
 }
 
 static void workspace_next(struct swaybar *bar, struct swaybar_output *output,
@@ -209,7 +226,7 @@ static void workspace_next(struct swaybar *bar, struct swaybar_output *output,
                 }
         }
 
-        if (new) {
+        if (new && new != active) {
                 ipc_send_workspace_command(bar, new->name);
 
                 // Since we're asking Sway to switch to 'new', it should become visible.
@@ -222,15 +239,15 @@ static void workspace_next(struct swaybar *bar, struct swaybar_output *output,
 static void process_discrete_scroll(struct swaybar_seat *seat,
                 struct swaybar_output *output, struct swaybar_pointer *pointer,
                 uint32_t axis, wl_fixed_t value) {
-        // If there is a button press binding, execute it, skip default behavior,
-        // and check button release bindings
         uint32_t button = wl_axis_to_button(axis, value);
-        if (check_bindings(seat->bar, button, WL_POINTER_BUTTON_STATE_PRESSED)) {
-                check_bindings(seat->bar, button, WL_POINTER_BUTTON_STATE_RELEASED);
+        if (process_hotspots(output, pointer->x, pointer->y, button, WL_POINTER_BUTTON_STATE_PRESSED)) {
+                // (Currently hotspots don't do anything on release events, so no need to emit one)
                 return;
         }
 
-        if (process_hotspots(output, pointer->x, pointer->y, button)) {
+        // If there is a button press binding, execute it, and check button release bindings
+        if (check_bindings(seat->bar, button, WL_POINTER_BUTTON_STATE_PRESSED)) {
+                check_bindings(seat->bar, button, WL_POINTER_BUTTON_STATE_RELEASED);
                 return;
         }
 
@@ -339,7 +356,7 @@ static void wl_pointer_axis_discrete(void *data, struct wl_pointer *wl_pointer,
         seat->axis[axis].discrete_steps += abs(discrete);
 }
 
-static struct wl_pointer_listener pointer_listener = {
+static const struct wl_pointer_listener pointer_listener = {
         .enter = wl_pointer_enter,
         .leave = wl_pointer_leave,
         .motion = wl_pointer_motion,
@@ -403,7 +420,8 @@ static void wl_touch_up(void *data, struct wl_touch *wl_touch,
         }
         if (time - slot->time < 500) {
                 // Tap, treat it like a pointer click
-                process_hotspots(slot->output, slot->x, slot->y, BTN_LEFT);
+                process_hotspots(slot->output, slot->x, slot->y, BTN_LEFT, WL_POINTER_BUTTON_STATE_PRESSED);
+                // (Currently hotspots don't do anything on release events, so no need to emit one)
         }
         slot->output = NULL;
 }
diff --git a/swaybar/ipc.c b/swaybar/ipc.c
index 6bbe9408..33ae6544 100644
--- a/swaybar/ipc.c
+++ b/swaybar/ipc.c
@@ -147,8 +147,10 @@ static bool ipc_parse_config(
 
         json_object *font = json_object_object_get(bar_config, "font");
         if (font) {
-                free(config->font);
-                config->font = parse_font(json_object_get_string(font));
+                pango_font_description_free(config->font_description);
+                char *font_value = parse_font(json_object_get_string(font));
+                config->font_description = pango_font_description_from_string(font_value);
+                free(font_value);
         }
 
         json_object *gaps = json_object_object_get(bar_config, "gaps");
@@ -424,12 +426,9 @@ bool ipc_initialize(struct swaybar *bar) {
         }
         free(res);
 
-        struct swaybar_config *config = bar->config;
-        char subscribe[128]; // suitably large buffer
-        len = snprintf(subscribe, 128,
-                        "[ \"barconfig_update\" , \"bar_state_update\" %s %s ]",
-                        config->binding_mode_indicator ? ", \"mode\"" : "",
-                        config->workspace_buttons ? ", \"workspace\"" : "");
+        char *subscribe =
+                "[ \"barconfig_update\", \"bar_state_update\", \"mode\", \"workspace\" ]";
+        len = strlen(subscribe);
         free(ipc_single_command(bar->ipc_event_socketfd,
                         IPC_SUBSCRIBE, subscribe, &len));
         return true;
@@ -485,8 +484,7 @@ static bool handle_barconfig_update(struct swaybar *bar, const char *payload,
                         destroy_layer_surface(output);
                         wl_list_remove(&output->link);
                         wl_list_insert(&bar->unused_outputs, &output->link);
-                } else if (!oldcfg->font || !newcfg->font ||
-                                strcmp(oldcfg->font, newcfg->font) != 0) {
+                } else if (!pango_font_description_equal(oldcfg->font_description, newcfg->font_description)) {
                         output->height = 0;  // force update height
                 }
         }
@@ -547,9 +545,23 @@ bool handle_ipc_readable(struct swaybar *bar) {
                 return false;
         }
 
-        json_object *result = json_tokener_parse(resp->payload);
-        if (!result) {
-                sway_log(SWAY_ERROR, "failed to parse payload as json");
+        // The default depth of 32 is too small to represent some nested layouts, but
+        // we can't pass INT_MAX here because json-c (as of this writing) prefaults
+        // all the memory for its stack.
+        json_tokener *tok = json_tokener_new_ex(JSON_MAX_DEPTH);
+        if (!tok) {
+                sway_log_errno(SWAY_ERROR, "failed to create tokener");
+                free_ipc_response(resp);
+                return false;
+        }
+
+        json_object *result = json_tokener_parse_ex(tok, resp->payload, -1);
+        enum json_tokener_error err = json_tokener_get_error(tok);
+        json_tokener_free(tok);
+
+        if (err != json_tokener_success) {
+                sway_log(SWAY_ERROR, "failed to parse payload as json: %s",
+                                json_tokener_error_desc(err));
                 free_ipc_response(resp);
                 return false;
         }
diff --git a/swaybar/main.c b/swaybar/main.c
index 5c36d66b..a44c1e63 100644
--- a/swaybar/main.c
+++ b/swaybar/main.c
@@ -18,7 +18,7 @@ int main(int argc, char **argv) {
         char *socket_path = NULL;
         bool debug = false;
 
-        static struct option long_options[] = {
+        static const struct option long_options[] = {
                 {"help", no_argument, NULL, 'h'},
                 {"version", no_argument, NULL, 'v'},
                 {"socket", required_argument, NULL, 's'},
diff --git a/swaybar/meson.build b/swaybar/meson.build
index 9feb3cd2..34bbdeea 100644
--- a/swaybar/meson.build
+++ b/swaybar/meson.build
@@ -8,7 +8,6 @@ tray_files = have_tray ? [
 
 swaybar_deps = [
         cairo,
-        client_protos,
         gdk_pixbuf,
         jsonc,
         math,
@@ -27,12 +26,14 @@ executable(
                 'bar.c',
                 'config.c',
                 'i3bar.c',
+                'image.c',
                 'input.c',
                 'ipc.c',
                 'main.c',
                 'render.c',
                 'status_line.c',
-                tray_files
+                tray_files,
+                wl_protos_src,
         ],
         include_directories: [sway_inc],
         dependencies: swaybar_deps,
diff --git a/swaybar/render.c b/swaybar/render.c
index df066622..1113ca44 100644
--- a/swaybar/render.c
+++ b/swaybar/render.c
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
-#include "cairo.h"
+#include "cairo_util.h"
 #include "pango.h"
 #include "pool-buffer.h"
 #include "swaybar/bar.h"
@@ -14,6 +14,7 @@
 #include "swaybar/ipc.h"
 #include "swaybar/render.h"
 #include "swaybar/status_line.h"
+#include "log.h"
 #if HAVE_TRAY
 #include "swaybar/tray/tray.h"
 #endif
@@ -23,28 +24,51 @@ static const int WS_HORIZONTAL_PADDING = 5;
 static const double WS_VERTICAL_PADDING = 1.5;
 static const double BORDER_WIDTH = 1;
 
-static uint32_t render_status_line_error(cairo_t *cairo,
-                struct swaybar_output *output, double *x) {
+struct render_context {
+        cairo_t *cairo;
+        struct swaybar_output *output;
+        cairo_font_options_t *textaa_sharp;
+        cairo_font_options_t *textaa_safe;
+        uint32_t background_color;
+};
+
+static void choose_text_aa_mode(struct render_context *ctx, uint32_t fontcolor) {
+        uint32_t salpha = fontcolor & 0xFF;
+        uint32_t balpha = ctx->background_color & 0xFF;
+
+        // Subpixel antialiasing requires blend be done in cairo, not compositor
+        cairo_font_options_t *fo = salpha == balpha ?
+                        ctx->textaa_sharp : ctx->textaa_safe;
+        cairo_set_font_options(ctx->cairo, fo);
+
+        // Color emojis, being semitransparent bitmaps, are leaky with 'SOURCE'
+        cairo_operator_t op = salpha == 0xFF ?
+                        CAIRO_OPERATOR_OVER : CAIRO_OPERATOR_SOURCE;
+        cairo_set_operator(ctx->cairo, op);
+}
+
+static uint32_t render_status_line_error(struct render_context *ctx, double *x) {
+        struct swaybar_output *output = ctx->output;
         const char *error = output->bar->status->text;
         if (!error) {
                 return 0;
         }
 
-        uint32_t height = output->height * output->scale;
+        uint32_t height = output->height;
 
+        cairo_t *cairo = ctx->cairo;
         cairo_set_source_u32(cairo, 0xFF0000FF);
 
-        int margin = 3 * output->scale;
-        double ws_vertical_padding =
-                output->bar->config->status_padding * output->scale;
+        int margin = 3;
+        double ws_vertical_padding = output->bar->config->status_padding;
 
-        char *font = output->bar->config->font;
+        PangoFontDescription *font = output->bar->config->font_description;
         int text_width, text_height;
         get_text_size(cairo, font, &text_width, &text_height, NULL,
-                        output->scale, false, "%s", error);
+                        1, false, "%s", error);
 
         uint32_t ideal_height = text_height + ws_vertical_padding * 2;
-        uint32_t ideal_surface_height = ideal_height / output->scale;
+        uint32_t ideal_surface_height = ideal_height;
         if (!output->bar->config->height &&
                         output->height < ideal_surface_height) {
                 return ideal_surface_height;
@@ -53,42 +77,45 @@ static uint32_t render_status_line_error(cairo_t *cairo,
 
         double text_y = height / 2.0 - text_height / 2.0;
         cairo_move_to(cairo, *x, (int)floor(text_y));
-        pango_printf(cairo, font, output->scale, false, "%s", error);
+        choose_text_aa_mode(ctx, 0xFF0000FF);
+        render_text(cairo, font, 1, false, "%s", error);
         *x -= margin;
         return output->height;
 }
 
-static uint32_t render_status_line_text(cairo_t *cairo,
-                struct swaybar_output *output, double *x) {
+static uint32_t render_status_line_text(struct render_context *ctx, double *x) {
+        struct swaybar_output *output = ctx->output;
         const char *text = output->bar->status->text;
         if (!text) {
                 return 0;
         }
 
+        cairo_t *cairo = ctx->cairo;
         struct swaybar_config *config = output->bar->config;
-        cairo_set_source_u32(cairo, output->focused ?
-                        config->colors.focused_statusline : config->colors.statusline);
+        uint32_t fontcolor = output->focused ?
+                        config->colors.focused_statusline : config->colors.statusline;
+        cairo_set_source_u32(cairo, fontcolor);
 
         int text_width, text_height;
-        get_text_size(cairo, config->font, &text_width, &text_height, NULL,
-                        output->scale, config->pango_markup, "%s", text);
+        get_text_size(cairo, config->font_description, &text_width, &text_height, NULL,
+                        1, config->pango_markup, "%s", text);
 
-        double ws_vertical_padding = config->status_padding * output->scale;
-        int margin = 3 * output->scale;
+        double ws_vertical_padding = config->status_padding;
+        int margin = 3;
 
         uint32_t ideal_height = text_height + ws_vertical_padding * 2;
-        uint32_t ideal_surface_height = ideal_height / output->scale;
+        uint32_t ideal_surface_height = ideal_height;
         if (!output->bar->config->height &&
                         output->height < ideal_surface_height) {
                 return ideal_surface_height;
         }
 
         *x -= text_width + margin;
-        uint32_t height = output->height * output->scale;
+        uint32_t height = output->height;
         double text_y = height / 2.0 - text_height / 2.0;
         cairo_move_to(cairo, *x, (int)floor(text_y));
-        pango_printf(cairo, config->font, output->scale,
-                        config->pango_markup, "%s", text);
+        choose_text_aa_mode(ctx, fontcolor);
+        render_text(cairo, config->font_description, 1, config->pango_markup, "%s", text);
         *x -= margin;
         return output->height;
 }
@@ -96,6 +123,7 @@ static uint32_t render_status_line_text(cairo_t *cairo,
 static void render_sharp_rectangle(cairo_t *cairo, uint32_t color,
                 double x, double y, double width, double height) {
         cairo_save(cairo);
+        cairo_set_operator(cairo, CAIRO_OPERATOR_SOURCE);
         cairo_set_source_u32(cairo, color);
         cairo_set_antialias(cairo, CAIRO_ANTIALIAS_NONE);
         cairo_rectangle(cairo, x, y, width, height);
@@ -109,6 +137,7 @@ static void render_sharp_line(cairo_t *cairo, uint32_t color,
                 render_sharp_rectangle(cairo, color, x, y, width, height);
         } else {
                 cairo_save(cairo);
+                cairo_set_operator(cairo, CAIRO_OPERATOR_SOURCE);
                 cairo_set_source_u32(cairo, color);
                 cairo_set_antialias(cairo, CAIRO_ANTIALIAS_NONE);
                 if (width == 1) {
@@ -131,24 +160,23 @@ static void render_sharp_line(cairo_t *cairo, uint32_t color,
 
 static enum hotspot_event_handling block_hotspot_callback(
                 struct swaybar_output *output, struct swaybar_hotspot *hotspot,
-                double x, double y, uint32_t button, void *data) {
+                double x, double y, uint32_t button, bool released, void *data) {
         struct i3bar_block *block = data;
         struct status_line *status = output->bar->status;
         return i3bar_block_send_click(status, block, x, y,
-                        x - (double)hotspot->x / output->scale,
-                        y - (double)hotspot->y / output->scale,
-                        (double)hotspot->width / output->scale,
-                        (double)hotspot->height / output->scale,
-                        output->scale, button);
+                        x - (double)hotspot->x,
+                        y - (double)hotspot->y,
+                        (double)hotspot->width,
+                        (double)hotspot->height,
+                        output->scale, button, released);
 }
 
 static void i3bar_block_unref_callback(void *data) {
         i3bar_block_unref(data);
 }
 
-static uint32_t render_status_block(cairo_t *cairo,
-                struct swaybar_output *output, struct i3bar_block *block, double *x,
-                bool edge, bool use_short_text) {
+static uint32_t render_status_block(struct render_context *ctx,
+                struct i3bar_block *block, double *x, bool edge, bool use_short_text) {
         if (!block->full_text || !*block->full_text) {
                 return 0;
         }
@@ -158,20 +186,21 @@ static uint32_t render_status_block(cairo_t *cairo,
                 text = block->short_text;
         }
 
+        cairo_t *cairo = ctx->cairo;
+        struct swaybar_output *output = ctx->output;
         struct swaybar_config *config = output->bar->config;
-
         int text_width, text_height;
-        get_text_size(cairo, config->font, &text_width, &text_height, NULL,
-                        output->scale, block->markup, "%s", text);
+        get_text_size(cairo, config->font_description, &text_width, &text_height, NULL, 1,
+                        block->markup, "%s", text);
 
-        int margin = 3 * output->scale;
-        double ws_vertical_padding = config->status_padding * output->scale;
+        int margin = 3;
+        double ws_vertical_padding = config->status_padding;
 
         int width = text_width;
         if (block->min_width_str) {
                 int w;
-                get_text_size(cairo, config->font, &w, NULL, NULL,
-                                output->scale, block->markup, "%s", block->min_width_str);
+                get_text_size(cairo, config->font_description, &w, NULL, NULL, 1, block->markup,
+                                "%s", block->min_width_str);
                 block->min_width = w;
         }
         if (width < block->min_width) {
@@ -180,30 +209,30 @@ static uint32_t render_status_block(cairo_t *cairo,
 
         double block_width = width;
         uint32_t ideal_height = text_height + ws_vertical_padding * 2;
-        uint32_t ideal_surface_height = ideal_height / output->scale;
+        uint32_t ideal_surface_height = ideal_height;
         if (!output->bar->config->height &&
                         output->height < ideal_surface_height) {
                 return ideal_surface_height;
         }
 
         *x -= width;
-        if ((block->border || block->urgent) && block->border_left > 0) {
-                *x -= (block->border_left * output->scale + margin);
-                block_width += block->border_left * output->scale + margin;
+        if ((block->border_set || block->urgent) && block->border_left > 0) {
+                *x -= (block->border_left + margin);
+                block_width += block->border_left + margin;
         }
-        if ((block->border || block->urgent) && block->border_right > 0) {
-                *x -= (block->border_right * output->scale + margin);
-                block_width += block->border_right * output->scale + margin;
+        if ((block->border_set || block->urgent) && block->border_right > 0) {
+                *x -= (block->border_right + margin);
+                block_width += block->border_right + margin;
         }
 
         int sep_width, sep_height;
         int sep_block_width = block->separator_block_width;
         if (!edge) {
                 if (config->sep_symbol) {
-                        get_text_size(cairo, config->font, &sep_width, &sep_height, NULL,
-                                        output->scale, false, "%s", config->sep_symbol);
+                        get_text_size(cairo, config->font_description, &sep_width, &sep_height, NULL,
+                                        1, false, "%s", config->sep_symbol);
                         uint32_t _ideal_height = sep_height + ws_vertical_padding * 2;
-                        uint32_t _ideal_surface_height = _ideal_height / output->scale;
+                        uint32_t _ideal_surface_height = _ideal_height;
                         if (!output->bar->config->height &&
                                         output->height < _ideal_surface_height) {
                                 return _ideal_surface_height;
@@ -214,10 +243,10 @@ static uint32_t render_status_block(cairo_t *cairo,
                 }
                 *x -= sep_block_width;
         } else if (config->status_edge_padding) {
-                *x -= config->status_edge_padding * output->scale;
+                *x -= config->status_edge_padding;
         }
 
-        uint32_t height = output->height * output->scale;
+        uint32_t height = output->height;
         if (output->bar->status->click_events) {
                 struct swaybar_hotspot *hotspot = calloc(1, sizeof(struct swaybar_hotspot));
                 hotspot->x = *x;
@@ -240,27 +269,30 @@ static uint32_t render_status_block(cairo_t *cairo,
         if (bg_color) {
                 render_sharp_rectangle(cairo, bg_color, x_pos, y_pos,
                                 block_width, render_height);
+                ctx->background_color = bg_color;
         }
 
         uint32_t border_color = block->urgent
                 ? config->colors.urgent_workspace.border : block->border;
-        if (border_color && block->border_top > 0) {
-                render_sharp_line(cairo, border_color, x_pos, y_pos,
-                                block_width, block->border_top * output->scale);
-        }
-        if (border_color && block->border_bottom > 0) {
-                render_sharp_line(cairo, border_color, x_pos,
-                                y_pos + render_height - block->border_bottom * output->scale,
-                                block_width, block->border_bottom * output->scale);
-        }
-        if (border_color && block->border_left > 0) {
-                render_sharp_line(cairo, border_color, x_pos, y_pos,
-                                block->border_left * output->scale, render_height);
-                x_pos += block->border_left * output->scale + margin;
+        if (block->border_set || block->urgent) {
+                if (block->border_top > 0) {
+                        render_sharp_line(cairo, border_color, x_pos, y_pos,
+                                        block_width, block->border_top);
+                }
+                if (block->border_bottom > 0) {
+                        render_sharp_line(cairo, border_color, x_pos,
+                                        y_pos + render_height - block->border_bottom,
+                                        block_width, block->border_bottom);
+                }
+                if (block->border_left > 0) {
+                        render_sharp_line(cairo, border_color, x_pos, y_pos,
+                                        block->border_left, render_height);
+                }
+                x_pos += block->border_left + margin;
         }
 
         double offset = 0;
-        if (strncmp(block->align, "left", 5) == 0) {
+        if (strncmp(block->align, "left", 4) == 0) {
                 offset = x_pos;
         } else if (strncmp(block->align, "right", 5) == 0) {
                 offset = x_pos + width - text_width;
@@ -274,30 +306,35 @@ static uint32_t render_status_block(cairo_t *cairo,
         color = block->color_set ? block->color : color;
         color = block->urgent ? config->colors.urgent_workspace.text : color;
         cairo_set_source_u32(cairo, color);
-        pango_printf(cairo, config->font, output->scale,
-                        block->markup, "%s", text);
+        choose_text_aa_mode(ctx, color);
+        render_text(cairo, config->font_description, 1, block->markup, "%s", text);
         x_pos += width;
 
-        if (block->border && block->border_right > 0) {
+        if (block->border_set || block->urgent) {
                 x_pos += margin;
-                render_sharp_line(cairo, border_color, x_pos, y_pos,
-                                block->border_right * output->scale, render_height);
-                x_pos += block->border_right * output->scale;
+                if (block->border_right > 0) {
+                        render_sharp_line(cairo, border_color, x_pos, y_pos,
+                                        block->border_right, render_height);
+                }
+                x_pos += block->border_right;
         }
 
         if (!edge && block->separator) {
                 if (output->focused) {
-                        cairo_set_source_u32(cairo, config->colors.focused_separator);
+                        color = config->colors.focused_separator;
                 } else {
-                        cairo_set_source_u32(cairo, config->colors.separator);
+                        color = config->colors.separator;
                 }
+                cairo_set_source_u32(cairo, color);
                 if (config->sep_symbol) {
                         offset = x_pos + (sep_block_width - sep_width) / 2;
                         double sep_y = height / 2.0 - sep_height / 2.0;
                         cairo_move_to(cairo, offset, (int)floor(sep_y));
-                        pango_printf(cairo, config->font, output->scale, false,
+                        choose_text_aa_mode(ctx, color);
+                        render_text(cairo, config->font_description, 1, false,
                                         "%s", config->sep_symbol);
                 } else {
+                        cairo_set_operator(cairo, CAIRO_OPERATOR_SOURCE);
                         cairo_set_line_width(cairo, 1);
                         cairo_move_to(cairo, x_pos + sep_block_width / 2, margin);
                         cairo_line_to(cairo, x_pos + sep_block_width / 2, height - margin);
@@ -317,18 +354,18 @@ static void predict_status_block_pos(cairo_t *cairo,
         struct swaybar_config *config = output->bar->config;
 
         int text_width, text_height;
-        get_text_size(cairo, config->font, &text_width, &text_height, NULL,
-                        output->scale, block->markup, "%s", block->full_text);
+        get_text_size(cairo, config->font_description, &text_width, &text_height, NULL, 1,
+                        block->markup, "%s", block->full_text);
 
-        int margin = 3 * output->scale;
-        double ws_vertical_padding = config->status_padding * output->scale;
+        int margin = 3;
+        double ws_vertical_padding = config->status_padding;
 
         int width = text_width;
 
         if (block->min_width_str) {
                 int w;
-                get_text_size(cairo, config->font, &w, NULL, NULL,
-                                output->scale, block->markup, "%s", block->min_width_str);
+                get_text_size(cairo, config->font_description, &w, NULL, NULL,
+                                1, block->markup, "%s", block->min_width_str);
                 block->min_width = w;
         }
         if (width < block->min_width) {
@@ -336,28 +373,28 @@ static void predict_status_block_pos(cairo_t *cairo,
         }
 
         uint32_t ideal_height = text_height + ws_vertical_padding * 2;
-        uint32_t ideal_surface_height = ideal_height / output->scale;
+        uint32_t ideal_surface_height = ideal_height;
         if (!output->bar->config->height &&
                         output->height < ideal_surface_height) {
                 return;
         }
 
         *x -= width;
-        if ((block->border || block->urgent) && block->border_left > 0) {
-                *x -= (block->border_left * output->scale + margin);
+        if ((block->border_set || block->urgent) && block->border_left > 0) {
+                *x -= (block->border_left + margin);
         }
-        if ((block->border || block->urgent) && block->border_right > 0) {
-                *x -= (block->border_right * output->scale + margin);
+        if ((block->border_set || block->urgent) && block->border_right > 0) {
+                *x -= (block->border_right + margin);
         }
 
         int sep_width, sep_height;
         int sep_block_width = block->separator_block_width;
         if (!edge) {
                 if (config->sep_symbol) {
-                        get_text_size(cairo, config->font, &sep_width, &sep_height, NULL,
-                                        output->scale, false, "%s", config->sep_symbol);
+                        get_text_size(cairo, config->font_description, &sep_width, &sep_height, NULL,
+                                        1, false, "%s", config->sep_symbol);
                         uint32_t _ideal_height = sep_height + ws_vertical_padding * 2;
-                        uint32_t _ideal_surface_height = _ideal_height / output->scale;
+                        uint32_t _ideal_surface_height = _ideal_height;
                         if (!output->bar->config->height &&
                                         output->height < _ideal_surface_height) {
                                 return;
@@ -368,13 +405,13 @@ static void predict_status_block_pos(cairo_t *cairo,
                 }
                 *x -= sep_block_width;
         } else if (config->status_edge_padding) {
-                *x -= config->status_edge_padding * output->scale;
+                *x -= config->status_edge_padding;
         }
 }
 
 static double predict_status_line_pos(cairo_t *cairo,
                 struct swaybar_output *output, double x) {
-        bool edge = x == output->width * output->scale;
+        bool edge = x == output->width;
         struct i3bar_block *block;
         wl_list_for_each(block, &output->bar->status->blocks, link) {
                 predict_status_block_pos(cairo, output, block, &x, edge);
@@ -389,24 +426,24 @@ static uint32_t predict_workspace_button_length(cairo_t *cairo,
         struct swaybar_config *config = output->bar->config;
 
         int text_width, text_height;
-        get_text_size(cairo, config->font, &text_width, &text_height, NULL,
-                        output->scale, config->pango_markup, "%s", ws->label);
+        get_text_size(cairo, config->font_description, &text_width, &text_height, NULL, 1,
+                        config->pango_markup, "%s", ws->label);
 
-        int ws_vertical_padding = WS_VERTICAL_PADDING * output->scale;
-        int ws_horizontal_padding = WS_HORIZONTAL_PADDING * output->scale;
-        int border_width = BORDER_WIDTH * output->scale;
+        int ws_vertical_padding = WS_VERTICAL_PADDING;
+        int ws_horizontal_padding = WS_HORIZONTAL_PADDING;
+        int border_width = BORDER_WIDTH;
 
         uint32_t ideal_height = ws_vertical_padding * 2 + text_height
                 + border_width * 2;
-        uint32_t ideal_surface_height = ideal_height / output->scale;
+        uint32_t ideal_surface_height = ideal_height;
         if (!output->bar->config->height &&
                         output->height < ideal_surface_height) {
                 return 0;
         }
 
         uint32_t width = text_width + ws_horizontal_padding * 2 + border_width * 2;
-        if (width < config->workspace_min_width * output->scale) {
-                width = config->workspace_min_width * output->scale;
+        if (width < config->workspace_min_width) {
+                width = config->workspace_min_width;
         }
         return width;
 }
@@ -437,39 +474,40 @@ static uint32_t predict_binding_mode_indicator_length(cairo_t *cairo,
         }
 
         int text_width, text_height;
-        get_text_size(cairo, config->font, &text_width, &text_height, NULL,
-                        output->scale, output->bar->mode_pango_markup,
+        get_text_size(cairo, config->font_description, &text_width, &text_height, NULL,
+                        1, output->bar->mode_pango_markup,
                         "%s", mode);
 
-        int ws_vertical_padding = WS_VERTICAL_PADDING * output->scale;
-        int ws_horizontal_padding = WS_HORIZONTAL_PADDING * output->scale;
-        int border_width = BORDER_WIDTH * output->scale;
+        int ws_vertical_padding = WS_VERTICAL_PADDING;
+        int ws_horizontal_padding = WS_HORIZONTAL_PADDING;
+        int border_width = BORDER_WIDTH;
 
         uint32_t ideal_height = text_height + ws_vertical_padding * 2
                 + border_width * 2;
-        uint32_t ideal_surface_height = ideal_height / output->scale;
+        uint32_t ideal_surface_height = ideal_height;
         if (!output->bar->config->height &&
                         output->height < ideal_surface_height) {
                 return 0;
         }
         uint32_t width = text_width + ws_horizontal_padding * 2 + border_width * 2;
-        if (width < config->workspace_min_width * output->scale) {
-                width = config->workspace_min_width * output->scale;
+        if (width < config->workspace_min_width) {
+                width = config->workspace_min_width;
         }
         return width;
 }
 
-static uint32_t render_status_line_i3bar(cairo_t *cairo,
-                struct swaybar_output *output, double *x) {
+static uint32_t render_status_line_i3bar(struct render_context *ctx, double *x) {
+        struct swaybar_output *output = ctx->output;
         uint32_t max_height = 0;
-        bool edge = *x == output->width * output->scale;
+        bool edge = *x == output->width;
         struct i3bar_block *block;
         bool use_short_text = false;
 
+        cairo_t *cairo = ctx->cairo;
         double reserved_width =
                         predict_workspace_buttons_length(cairo, output) +
                         predict_binding_mode_indicator_length(cairo, output) +
-                        3 * output->scale; // require a bit of space for margin
+                        3; // require a bit of space for margin
 
         double predicted_full_pos =
                         predict_status_line_pos(cairo, output, *x);
@@ -479,7 +517,7 @@ static uint32_t render_status_line_i3bar(cairo_t *cairo,
         }
 
         wl_list_for_each(block, &output->bar->status->blocks, link) {
-                uint32_t h = render_status_block(cairo, output, block, x, edge,
+                uint32_t h = render_status_block(ctx, block, x, edge,
                                         use_short_text);
                 max_height = h > max_height ? h : max_height;
                 edge = false;
@@ -487,53 +525,56 @@ static uint32_t render_status_line_i3bar(cairo_t *cairo,
         return max_height;
 }
 
-static uint32_t render_status_line(cairo_t *cairo,
-                struct swaybar_output *output, double *x) {
-        struct status_line *status = output->bar->status;
+static uint32_t render_status_line(struct render_context *ctx, double *x) {
+        struct status_line *status = ctx->output->bar->status;
         switch (status->protocol) {
         case PROTOCOL_ERROR:
-                return render_status_line_error(cairo, output, x);
+                return render_status_line_error(ctx, x);
         case PROTOCOL_TEXT:
-                return render_status_line_text(cairo, output, x);
+                return render_status_line_text(ctx, x);
         case PROTOCOL_I3BAR:
-                return render_status_line_i3bar(cairo, output, x);
+                return render_status_line_i3bar(ctx, x);
         case PROTOCOL_UNDEF:
                 return 0;
         }
         return 0;
 }
 
-static uint32_t render_binding_mode_indicator(cairo_t *cairo,
-                struct swaybar_output *output, double x) {
+static uint32_t render_binding_mode_indicator(struct render_context *ctx,
+                double x) {
+        struct swaybar_output *output = ctx->output;
         const char *mode = output->bar->mode;
         if (!mode) {
                 return 0;
         }
 
+        cairo_t *cairo = ctx->cairo;
         struct swaybar_config *config = output->bar->config;
         int text_width, text_height;
-        get_text_size(cairo, config->font, &text_width, &text_height, NULL,
-                        output->scale, output->bar->mode_pango_markup,
+        get_text_size(cairo, config->font_description, &text_width, &text_height, NULL,
+                        1, output->bar->mode_pango_markup,
                         "%s", mode);
 
-        int ws_vertical_padding = WS_VERTICAL_PADDING * output->scale;
-        int ws_horizontal_padding = WS_HORIZONTAL_PADDING * output->scale;
-        int border_width = BORDER_WIDTH * output->scale;
+        int ws_vertical_padding = WS_VERTICAL_PADDING;
+        int ws_horizontal_padding = WS_HORIZONTAL_PADDING;
+        int border_width = BORDER_WIDTH;
 
         uint32_t ideal_height = text_height + ws_vertical_padding * 2
                 + border_width * 2;
-        uint32_t ideal_surface_height = ideal_height / output->scale;
+        uint32_t ideal_surface_height = ideal_height;
         if (!output->bar->config->height &&
                         output->height < ideal_surface_height) {
                 return ideal_surface_height;
         }
         uint32_t width = text_width + ws_horizontal_padding * 2 + border_width * 2;
-        if (width < config->workspace_min_width * output->scale) {
-                width = config->workspace_min_width * output->scale;
+        if (width < config->workspace_min_width) {
+                width = config->workspace_min_width;
         }
 
-        uint32_t height = output->height * output->scale;
+        uint32_t height = output->height;
+        cairo_set_operator(cairo, CAIRO_OPERATOR_SOURCE);
         cairo_set_source_u32(cairo, config->colors.binding_mode.background);
+        ctx->background_color = config->colors.binding_mode.background;
         cairo_rectangle(cairo, x, 0, width, height);
         cairo_fill(cairo);
 
@@ -550,24 +591,30 @@ static uint32_t render_binding_mode_indicator(cairo_t *cairo,
         double text_y = height / 2.0 - text_height / 2.0;
         cairo_set_source_u32(cairo, config->colors.binding_mode.text);
         cairo_move_to(cairo, x + width / 2 - text_width / 2, (int)floor(text_y));
-        pango_printf(cairo, config->font, output->scale,
-                        output->bar->mode_pango_markup, "%s", mode);
+        choose_text_aa_mode(ctx, config->colors.binding_mode.text);
+        render_text(cairo, config->font_description, 1, output->bar->mode_pango_markup,
+                        "%s", mode);
         return output->height;
 }
 
 static enum hotspot_event_handling workspace_hotspot_callback(
                 struct swaybar_output *output, struct swaybar_hotspot *hotspot,
-                double x, double y, uint32_t button, void *data) {
+                double x, double y, uint32_t button, bool released, void *data) {
         if (button != BTN_LEFT) {
                 return HOTSPOT_PROCESS;
         }
+        if (released) {
+                // Since we handle the pressed event, also handle the released event
+                // to block it from falling through to a binding in the bar
+                return HOTSPOT_IGNORE;
+        }
         ipc_send_workspace_command(output->bar, (const char *)data);
         return HOTSPOT_IGNORE;
 }
 
-static uint32_t render_workspace_button(cairo_t *cairo,
-                struct swaybar_output *output,
+static uint32_t render_workspace_button(struct render_context *ctx,
                 struct swaybar_workspace *ws, double *x) {
+        struct swaybar_output *output = ctx->output;
         struct swaybar_config *config = output->bar->config;
         struct box_colors box_colors;
         if (ws->urgent) {
@@ -580,30 +627,33 @@ static uint32_t render_workspace_button(cairo_t *cairo,
                 box_colors = config->colors.inactive_workspace;
         }
 
-        uint32_t height = output->height * output->scale;
+        uint32_t height = output->height;
 
+        cairo_t *cairo = ctx->cairo;
         int text_width, text_height;
-        get_text_size(cairo, config->font, &text_width, &text_height, NULL,
-                        output->scale, config->pango_markup, "%s", ws->label);
+        get_text_size(cairo, config->font_description, &text_width, &text_height, NULL,
+                        1, config->pango_markup, "%s", ws->label);
 
-        int ws_vertical_padding = WS_VERTICAL_PADDING * output->scale;
-        int ws_horizontal_padding = WS_HORIZONTAL_PADDING * output->scale;
-        int border_width = BORDER_WIDTH * output->scale;
+        int ws_vertical_padding = WS_VERTICAL_PADDING;
+        int ws_horizontal_padding = WS_HORIZONTAL_PADDING;
+        int border_width = BORDER_WIDTH;
 
         uint32_t ideal_height = ws_vertical_padding * 2 + text_height
                 + border_width * 2;
-        uint32_t ideal_surface_height = ideal_height / output->scale;
+        uint32_t ideal_surface_height = ideal_height;
         if (!output->bar->config->height &&
                         output->height < ideal_surface_height) {
                 return ideal_surface_height;
         }
 
         uint32_t width = text_width + ws_horizontal_padding * 2 + border_width * 2;
-        if (width < config->workspace_min_width * output->scale) {
-                width = config->workspace_min_width * output->scale;
+        if (width < config->workspace_min_width) {
+                width = config->workspace_min_width;
         }
 
+        cairo_set_operator(cairo, CAIRO_OPERATOR_SOURCE);
         cairo_set_source_u32(cairo, box_colors.background);
+        ctx->background_color = box_colors.background;
         cairo_rectangle(cairo, *x, 0, width, height);
         cairo_fill(cairo);
 
@@ -620,7 +670,8 @@ static uint32_t render_workspace_button(cairo_t *cairo,
         double text_y = height / 2.0 - text_height / 2.0;
         cairo_set_source_u32(cairo, box_colors.text);
         cairo_move_to(cairo, *x + width / 2 - text_width / 2, (int)floor(text_y));
-        pango_printf(cairo, config->font, output->scale, config->pango_markup,
+        choose_text_aa_mode(ctx, box_colors.text);
+        render_text(cairo, config->font_description, 1, config->pango_markup,
                         "%s", ws->label);
 
         struct swaybar_hotspot *hotspot = calloc(1, sizeof(struct swaybar_hotspot));
@@ -637,20 +688,15 @@ static uint32_t render_workspace_button(cairo_t *cairo,
         return output->height;
 }
 
-static uint32_t render_to_cairo(cairo_t *cairo, struct swaybar_output *output) {
+static uint32_t render_to_cairo(struct render_context *ctx) {
+        cairo_t *cairo = ctx->cairo;
+        struct swaybar_output *output = ctx->output;
         struct swaybar *bar = output->bar;
         struct swaybar_config *config = bar->config;
-        cairo_set_operator(cairo, CAIRO_OPERATOR_SOURCE);
-        if (output->focused) {
-                cairo_set_source_u32(cairo, config->colors.focused_background);
-        } else {
-                cairo_set_source_u32(cairo, config->colors.background);
-        }
-        cairo_paint(cairo);
 
         int th;
-        get_text_size(cairo, config->font, NULL, &th, NULL, output->scale, false, "");
-        uint32_t max_height = (th + WS_VERTICAL_PADDING * 4) / output->scale;
+        get_text_size(cairo, config->font_description, NULL, &th, NULL, 1, false, "");
+        uint32_t max_height = (th + WS_VERTICAL_PADDING * 4);
         /*
          * Each render_* function takes the actual height of the bar, and returns
          * the ideal height. If the actual height is too short, the render function
@@ -658,7 +704,7 @@ static uint32_t render_to_cairo(cairo_t *cairo, struct swaybar_output *output) {
          * height is too tall, the render function should adapt its drawing to
          * utilize the available space.
          */
-        double x = output->width * output->scale;
+        double x = output->width;
 #if HAVE_TRAY
         if (bar->tray) {
                 uint32_t h = render_tray(cairo, output, &x);
@@ -666,19 +712,19 @@ static uint32_t render_to_cairo(cairo_t *cairo, struct swaybar_output *output) {
         }
 #endif
         if (bar->status) {
-                uint32_t h = render_status_line(cairo, output, &x);
+                uint32_t h = render_status_line(ctx, &x);
                 max_height = h > max_height ? h : max_height;
         }
         x = 0;
         if (config->workspace_buttons) {
                 struct swaybar_workspace *ws;
                 wl_list_for_each(ws, &output->workspaces, link) {
-                        uint32_t h = render_workspace_button(cairo, output, ws, &x);
+                        uint32_t h = render_workspace_button(ctx, ws, &x);
                         max_height = h > max_height ? h : max_height;
                 }
         }
         if (config->binding_mode_indicator) {
-                uint32_t h = render_binding_mode_indicator(cairo, output, x);
+                uint32_t h = render_binding_mode_indicator(ctx, x);
                 max_height = h > max_height ? h : max_height;
         }
 
@@ -708,26 +754,44 @@ void render_frame(struct swaybar_output *output) {
 
         free_hotspots(&output->hotspots);
 
+        uint32_t background_color;
+        if (output->focused) {
+                background_color = output->bar->config->colors.focused_background;
+        } else {
+                background_color = output->bar->config->colors.background;
+        }
+
+        struct render_context ctx = { 0 };
+        ctx.output = output;
+        // initial background color used for deciding the best way to antialias text
+        ctx.background_color = background_color;
+
         cairo_surface_t *recorder = cairo_recording_surface_create(
                         CAIRO_CONTENT_COLOR_ALPHA, NULL);
         cairo_t *cairo = cairo_create(recorder);
+        cairo_scale(cairo, output->scale, output->scale);
         cairo_set_antialias(cairo, CAIRO_ANTIALIAS_BEST);
+        ctx.cairo = cairo;
+
         cairo_font_options_t *fo = cairo_font_options_create();
-        cairo_font_options_set_hint_style(fo, CAIRO_HINT_STYLE_FULL);
+        cairo_font_options_set_antialias(fo, CAIRO_ANTIALIAS_GRAY);
+        ctx.textaa_safe = fo;
         if (output->subpixel == WL_OUTPUT_SUBPIXEL_NONE) {
-                cairo_font_options_set_antialias(fo, CAIRO_ANTIALIAS_GRAY);
+                ctx.textaa_sharp = ctx.textaa_safe;
         } else {
+                fo = cairo_font_options_create();
                 cairo_font_options_set_antialias(fo, CAIRO_ANTIALIAS_SUBPIXEL);
                 cairo_font_options_set_subpixel_order(fo,
                         to_cairo_subpixel_order(output->subpixel));
+                ctx.textaa_sharp = fo;
         }
-        cairo_set_font_options(cairo, fo);
-        cairo_font_options_destroy(fo);
-        cairo_save(cairo);
-        cairo_set_operator(cairo, CAIRO_OPERATOR_CLEAR);
+
+
+        cairo_set_operator(cairo, CAIRO_OPERATOR_SOURCE);
+        cairo_set_source_u32(cairo, background_color);
         cairo_paint(cairo);
-        cairo_restore(cairo);
-        uint32_t height = render_to_cairo(cairo, output);
+
+        uint32_t height = render_to_cairo(&ctx);
         int config_height = output->bar->config->height;
         if (config_height > 0) {
                 height = config_height;
@@ -753,9 +817,7 @@ void render_frame(struct swaybar_output *output) {
                                 output->width * output->scale,
                                 output->height * output->scale);
                 if (!output->current_buffer) {
-                        cairo_surface_destroy(recorder);
-                        cairo_destroy(cairo);
-                        return;
+                        goto cleanup;
                 }
                 cairo_t *shm = output->current_buffer->cairo;
 
@@ -773,12 +835,29 @@ void render_frame(struct swaybar_output *output) {
                 wl_surface_damage(output->surface, 0, 0,
                                 output->width, output->height);
 
+                uint32_t bg_alpha = background_color & 0xFF;
+                if (bg_alpha == 0xFF) {
+                        struct wl_region *region =
+                                wl_compositor_create_region(output->bar->compositor);
+                        wl_region_add(region, 0, 0, INT32_MAX, INT32_MAX);
+                        wl_surface_set_opaque_region(output->surface, region);
+                        wl_region_destroy(region);
+                } else {
+                        wl_surface_set_opaque_region(output->surface, NULL);
+                }
+
                 struct wl_callback *frame_callback = wl_surface_frame(output->surface);
                 wl_callback_add_listener(frame_callback, &output_frame_listener, output);
                 output->frame_scheduled = true;
 
                 wl_surface_commit(output->surface);
         }
+
+cleanup:
+        if (ctx.textaa_sharp != ctx.textaa_safe) {
+                cairo_font_options_destroy(ctx.textaa_sharp);
+        }
+        cairo_font_options_destroy(ctx.textaa_safe);
         cairo_surface_destroy(recorder);
         cairo_destroy(cairo);
 }
diff --git a/swaybar/status_line.c b/swaybar/status_line.c
index ecd91032..2e9bb7f1 100644
--- a/swaybar/status_line.c
+++ b/swaybar/status_line.c
@@ -117,11 +117,11 @@ bool status_handle_readable(struct status_line *status) {
                 status->text = status->buffer;
                 // intentional fall-through
         case PROTOCOL_TEXT:
-                errno = 0;
                 while (true) {
                         if (status->buffer[read_bytes - 1] == '\n') {
                                 status->buffer[read_bytes - 1] = '\0';
                         }
+                        errno = 0;
                         read_bytes = getline(&status->buffer,
                                         &status->buffer_size, status->read);
                         if (errno == EAGAIN) {
@@ -157,7 +157,12 @@ struct status_line *status_line_init(char *cmd) {
         assert(!getenv("WAYLAND_SOCKET") && "display must be initialized before "
                 " starting `status-command`; WAYLAND_SOCKET should not be set");
         status->pid = fork();
-        if (status->pid == 0) {
+        if (status->pid < 0) {
+                sway_log_errno(SWAY_ERROR, "fork failed");
+                exit(1);
+        } else if (status->pid == 0) {
+                setpgid(0, 0);
+
                 dup2(pipe_read_fd[1], STDOUT_FILENO);
                 close(pipe_read_fd[0]);
                 close(pipe_read_fd[1]);
@@ -185,8 +190,8 @@ struct status_line *status_line_init(char *cmd) {
 
 void status_line_free(struct status_line *status) {
         status_line_close_fds(status);
-        kill(status->pid, status->cont_signal);
-        kill(status->pid, SIGTERM);
+        kill(-status->pid, status->cont_signal);
+        kill(-status->pid, SIGTERM);
         waitpid(status->pid, NULL, 0);
         if (status->protocol == PROTOCOL_I3BAR) {
                 struct i3bar_block *block, *tmp;
diff --git a/swaybar/tray/host.c b/swaybar/tray/host.c
index ddf2416d..eea2caa5 100644
--- a/swaybar/tray/host.c
+++ b/swaybar/tray/host.c
@@ -10,6 +10,7 @@
 #include "swaybar/tray/tray.h"
 #include "list.h"
 #include "log.h"
+#include "stringop.h"
 
 static const char *watcher_path = "/StatusNotifierWatcher";
 
@@ -138,12 +139,10 @@ static int handle_new_watcher(sd_bus_message *msg,
 
 bool init_host(struct swaybar_host *host, char *protocol,
                 struct swaybar_tray *tray) {
-        size_t len = snprintf(NULL, 0, "org.%s.StatusNotifierWatcher", protocol) + 1;
-        host->watcher_interface = malloc(len);
+        host->watcher_interface = format_str("org.%s.StatusNotifierWatcher", protocol);
         if (!host->watcher_interface) {
                 return false;
         }
-        snprintf(host->watcher_interface, len, "org.%s.StatusNotifierWatcher", protocol);
 
         sd_bus_slot *reg_slot = NULL, *unreg_slot = NULL, *watcher_slot = NULL;
         int ret = sd_bus_match_signal(tray->bus, &reg_slot, host->watcher_interface,
@@ -173,13 +172,10 @@ bool init_host(struct swaybar_host *host, char *protocol,
         }
 
         pid_t pid = getpid();
-        size_t service_len = snprintf(NULL, 0, "org.%s.StatusNotifierHost-%d",
-                        protocol, pid) + 1;
-        host->service = malloc(service_len);
+        host->service = format_str("org.%s.StatusNotifierHost-%d", protocol, pid);
         if (!host->service) {
                 goto error;
         }
-        snprintf(host->service, service_len, "org.%s.StatusNotifierHost-%d", protocol, pid);
         ret = sd_bus_request_name(tray->bus, host->service, 0);
         if (ret < 0) {
                 sway_log(SWAY_DEBUG, "Failed to acquire service name: %s", strerror(-ret));
diff --git a/swaybar/tray/icon.c b/swaybar/tray/icon.c
index c426c3d4..b513dca5 100644
--- a/swaybar/tray/icon.c
+++ b/swaybar/tray/icon.c
@@ -40,9 +40,7 @@ static list_t *get_basedirs(void) {
         data_dirs = strdup(data_dirs);
         char *dir = strtok(data_dirs, ":");
         do {
-                size_t path_len = snprintf(NULL, 0, "%s/icons", dir) + 1;
-                char *path = malloc(path_len);
-                snprintf(path, path_len, "%s/icons", dir);
+                char *path = format_str("%s/icons", dir);
                 list_add(basedirs, path);
         } while ((dir = strtok(NULL, ":")));
         free(data_dirs);
@@ -206,13 +204,7 @@ static const char *entry_handler(char *group, char *key, char *value,
  */
 static struct icon_theme *read_theme_file(char *basedir, char *theme_name) {
         // look for index.theme file
-        size_t path_len = snprintf(NULL, 0, "%s/%s/index.theme", basedir,
-                        theme_name) + 1;
-        char *path = malloc(path_len);
-        if (!path) {
-                return NULL;
-        }
-        snprintf(path, path_len, "%s/%s/index.theme", basedir, theme_name);
+        char *path = format_str("%s/%s/index.theme", basedir, theme_name);
         FILE *theme_file = fopen(path, "r");
         free(path);
         if (!theme_file) {
@@ -416,26 +408,20 @@ static char *find_icon_in_subdir(char *name, char *basedir, char *theme,
 #endif
         };
 
-        size_t path_len = snprintf(NULL, 0, "%s/%s/%s/%s.EXT", basedir, theme,
-                        subdir, name) + 1;
-        char *path = malloc(path_len);
-
         for (size_t i = 0; i < sizeof(extensions) / sizeof(*extensions); ++i) {
-                snprintf(path, path_len, "%s/%s/%s/%s.%s", basedir, theme, subdir,
-                                name, extensions[i]);
+                char *path = format_str("%s/%s/%s/%s.%s",
+                        basedir, theme, subdir, name, extensions[i]);
                 if (access(path, R_OK) == 0) {
                         return path;
                 }
+                free(path);
         }
 
-        free(path);
         return NULL;
 }
 
 static bool theme_exists_in_basedir(char *theme, char *basedir) {
-        size_t path_len = snprintf(NULL, 0, "%s/%s", basedir, theme) + 1;
-        char *path = malloc(path_len);
-        snprintf(path, path_len, "%s/%s", basedir, theme);
+        char *path = format_str("%s/%s", basedir, theme);
         bool ret = dir_exists(path);
         free(path);
         return ret;
diff --git a/swaybar/tray/item.c b/swaybar/tray/item.c
index a5660f62..d5fe50b1 100644
--- a/swaybar/tray/item.c
+++ b/swaybar/tray/item.c
@@ -7,13 +7,13 @@
 #include <string.h>
 #include "swaybar/bar.h"
 #include "swaybar/config.h"
+#include "swaybar/image.h"
 #include "swaybar/input.h"
 #include "swaybar/tray/host.h"
 #include "swaybar/tray/icon.h"
 #include "swaybar/tray/item.h"
 #include "swaybar/tray/tray.h"
-#include "background-image.h"
-#include "cairo.h"
+#include "cairo_util.h"
 #include "list.h"
 #include "log.h"
 #include "wlr-layer-shell-unstable-v1-client-protocol.h"
@@ -118,8 +118,13 @@ static int get_property_callback(sd_bus_message *msg, void *data,
 
         int ret;
         if (sd_bus_message_is_method_error(msg, NULL)) {
-                sway_log(SWAY_ERROR, "%s %s: %s", sni->watcher_id, prop,
-                                sd_bus_message_get_error(msg)->message);
+                const sd_bus_error *err = sd_bus_message_get_error(msg);
+                sway_log_importance_t log_lv = SWAY_ERROR;
+                if ((!strcmp(prop, "IconThemePath")) &&
+                                (!strcmp(err->name, SD_BUS_ERROR_UNKNOWN_PROPERTY))) {
+                        log_lv = SWAY_DEBUG;
+                }
+                sway_log(log_lv, "%s %s: %s", sni->watcher_id, prop, err->message);
                 ret = sd_bus_message_get_errno(msg);
                 goto cleanup;
         }
@@ -380,13 +385,18 @@ static int cmp_sni_id(const void *item, const void *cmp_to) {
 
 static enum hotspot_event_handling icon_hotspot_callback(
                 struct swaybar_output *output, struct swaybar_hotspot *hotspot,
-                double x, double y, uint32_t button, void *data) {
+                double x, double y, uint32_t button, bool released, void *data) {
         sway_log(SWAY_DEBUG, "Clicked on %s", (char *)data);
 
         struct swaybar_tray *tray = output->bar->tray;
         int idx = list_seq_find(tray->items, cmp_sni_id, data);
 
         if (idx != -1) {
+                if (released) {
+                        // Since we handle the pressed event, also handle the released event
+                        // to block it from falling through to a binding in the bar
+                        return HOTSPOT_IGNORE;
+                }
                 struct swaybar_sni *sni = tray->items->items[idx];
                 // guess global position since wayland doesn't expose it
                 struct swaybar_config *config = tray->bar->config;
@@ -421,7 +431,7 @@ static void reload_sni(struct swaybar_sni *sni, char *icon_theme,
                 list_free(icon_search_paths);
                 if (icon_path) {
                         cairo_surface_destroy(sni->icon);
-                        sni->icon = load_background_image(icon_path);
+                        sni->icon = load_image(icon_path);
                         free(icon_path);
                         return;
                 }
@@ -461,6 +471,11 @@ uint32_t render_sni(cairo_t *cairo, struct swaybar_output *output, double *x,
                 sni->target_size = target_size;
         }
 
+        // Passive
+        if (sni->status && sni->status[0] == 'P') {
+                return 0;
+        }
+
         int icon_size;
         cairo_surface_t *icon;
         if (sni->icon) {
@@ -488,24 +503,36 @@ uint32_t render_sni(cairo_t *cairo, struct swaybar_output *output, double *x,
                 cairo_destroy(cairo_icon);
         }
 
-        int padded_size = icon_size + 2*padding;
-        *x -= padded_size;
-        int y = floor((height - padded_size) / 2.0);
+        double descaled_padding = (double)padding / output->scale;
+        double descaled_icon_size = (double)icon_size / output->scale;
+
+        int size = descaled_icon_size + 2 * descaled_padding;
+        *x -= size;
+        int icon_y = floor((output->height - size) / 2.0);
 
         cairo_operator_t op = cairo_get_operator(cairo);
         cairo_set_operator(cairo, CAIRO_OPERATOR_OVER);
-        cairo_set_source_surface(cairo, icon, *x + padding, y + padding);
-        cairo_rectangle(cairo, *x, y, padded_size, padded_size);
+
+        cairo_matrix_t scale_matrix;
+        cairo_pattern_t *icon_pattern = cairo_pattern_create_for_surface(icon);
+        // TODO: check cairo_pattern_status for "ENOMEM"
+        cairo_matrix_init_scale(&scale_matrix, output->scale, output->scale);
+        cairo_matrix_translate(&scale_matrix, -(*x + descaled_padding), -(icon_y + descaled_padding));
+        cairo_pattern_set_matrix(icon_pattern, &scale_matrix);
+        cairo_set_source(cairo, icon_pattern);
+        cairo_rectangle(cairo, *x, icon_y, size, size);
         cairo_fill(cairo);
+
         cairo_set_operator(cairo, op);
 
+        cairo_pattern_destroy(icon_pattern);
         cairo_surface_destroy(icon);
 
         struct swaybar_hotspot *hotspot = calloc(1, sizeof(struct swaybar_hotspot));
         hotspot->x = *x;
         hotspot->y = 0;
-        hotspot->width = height;
-        hotspot->height = height;
+        hotspot->width = size;
+        hotspot->height = output->height;
         hotspot->callback = icon_hotspot_callback;
         hotspot->destroy = free;
         hotspot->data = strdup(sni->watcher_id);
diff --git a/swaybar/tray/tray.c b/swaybar/tray/tray.c
index 5fe6f9c3..b0545f4a 100644
--- a/swaybar/tray/tray.c
+++ b/swaybar/tray/tray.c
@@ -116,8 +116,8 @@ uint32_t render_tray(cairo_t *cairo, struct swaybar_output *output, double *x) {
                 }
         } // else display on all
 
-        if ((int) output->height*output->scale <= 2*config->tray_padding) {
-                return 2*config->tray_padding + 1;
+        if ((int)(output->height * output->scale) <= 2 * config->tray_padding) {
+                return (2 * config->tray_padding + 1) / output->scale;
         }
 
         uint32_t max_height = 0;
diff --git a/swaybar/tray/watcher.c b/swaybar/tray/watcher.c
index 16afc27c..2458a8c2 100644
--- a/swaybar/tray/watcher.c
+++ b/swaybar/tray/watcher.c
@@ -6,6 +6,7 @@
 #include <string.h>
 #include "list.h"
 #include "log.h"
+#include "stringop.h"
 #include "swaybar/tray/watcher.h"
 
 static const char *obj_path = "/StatusNotifierWatcher";
@@ -76,9 +77,7 @@ static int register_sni(sd_bus_message *msg, void *data, sd_bus_error *error) {
                         service = service_or_path;
                         path = "/StatusNotifierItem";
                 }
-                size_t id_len = snprintf(NULL, 0, "%s%s", service, path) + 1;
-                id = malloc(id_len);
-                snprintf(id, id_len, "%s%s", service, path);
+                id = format_str("%s%s", service, path);
         }
 
         if (list_seq_find(watcher->items, cmp_id, id) == -1) {
@@ -107,7 +106,7 @@ static int register_host(sd_bus_message *msg, void *data, sd_bus_error *error) {
                 sway_log(SWAY_DEBUG, "Registering Status Notifier Host '%s'", service);
                 list_add(watcher->hosts, strdup(service));
                 sd_bus_emit_signal(watcher->bus, obj_path, watcher->interface,
-                                "StatusNotifierHostRegistered", "s", service);
+                                "StatusNotifierHostRegistered", "");
         } else {
                 sway_log(SWAY_DEBUG, "Status Notifier Host '%s' already registered", service);
         }
@@ -159,9 +158,7 @@ struct swaybar_watcher *create_watcher(char *protocol, sd_bus *bus) {
                 return NULL;
         }
 
-        size_t len = snprintf(NULL, 0, "org.%s.StatusNotifierWatcher", protocol) + 1;
-        watcher->interface = malloc(len);
-        snprintf(watcher->interface, len, "org.%s.StatusNotifierWatcher", protocol);
+        watcher->interface = format_str("org.%s.StatusNotifierWatcher", protocol);
 
         sd_bus_slot *signal_slot = NULL, *vtable_slot = NULL;
         int ret = sd_bus_add_object_vtable(bus, &vtable_slot, obj_path,
diff --git a/swaymsg/main.c b/swaymsg/main.c
index 60536e48..db9346c4 100644
--- a/swaymsg/main.c
+++ b/swaymsg/main.c
@@ -1,4 +1,6 @@
 #define _POSIX_C_SOURCE 200809L
+
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -58,7 +60,7 @@ static void pretty_print_cmd(json_object *r) {
         if (!success_object(r)) {
                 json_object *error;
                 if (!json_object_object_get_ex(r, "error", &error)) {
-                        printf("An unknkown error occurred");
+                        printf("An unknown error occurred");
                 } else {
                         printf("Error: %s\n", json_object_get_string(error));
                 }
@@ -183,12 +185,14 @@ static void pretty_print_seat(json_object *i) {
 }
 
 static void pretty_print_output(json_object *o) {
-        json_object *name, *rect, *focused, *active, *ws, *current_mode;
+        json_object *name, *rect, *focused, *active, *power, *ws, *current_mode, *non_desktop;
         json_object_object_get_ex(o, "name", &name);
         json_object_object_get_ex(o, "rect", &rect);
         json_object_object_get_ex(o, "focused", &focused);
         json_object_object_get_ex(o, "active", &active);
+        json_object_object_get_ex(o, "power", &power);
         json_object_object_get_ex(o, "current_workspace", &ws);
+        json_object_object_get_ex(o, "non_desktop", &non_desktop);
         json_object *make, *model, *serial, *scale, *scale_filter, *subpixel,
                 *transform, *max_render_time, *adaptive_sync_status;
         json_object_object_get_ex(o, "make", &make);
@@ -211,10 +215,19 @@ static void pretty_print_output(json_object *o) {
         json_object_object_get_ex(current_mode, "height", &height);
         json_object_object_get_ex(current_mode, "refresh", &refresh);
 
-        if (json_object_get_boolean(active)) {
+        if (json_object_get_boolean(non_desktop)) {
+                printf(
+                        "Output %s '%s %s %s' (non-desktop)\n",
+                        json_object_get_string(name),
+                        json_object_get_string(make),
+                        json_object_get_string(model),
+                        json_object_get_string(serial)
+                );
+        } else if (json_object_get_boolean(active)) {
                 printf(
                         "Output %s '%s %s %s'%s\n"
                         "  Current mode: %dx%d @ %.3f Hz\n"
+                        "  Power: %s\n"
                         "  Position: %d,%d\n"
                         "  Scale factor: %f\n"
                         "  Scale filter: %s\n"
@@ -229,6 +242,7 @@ static void pretty_print_output(json_object *o) {
                         json_object_get_int(width),
                         json_object_get_int(height),
                         (double)json_object_get_int(refresh) / 1000,
+                        json_object_get_boolean(power) ? "on" : "off",
                         json_object_get_int(x), json_object_get_int(y),
                         json_object_get_double(scale),
                         json_object_get_string(scale_filter),
@@ -245,7 +259,7 @@ static void pretty_print_output(json_object *o) {
                         json_object_get_string(adaptive_sync_status));
         } else {
                 printf(
-                        "Output %s '%s %s %s' (inactive)\n",
+                        "Output %s '%s %s %s' (disabled)\n",
                         json_object_get_string(name),
                         json_object_get_string(make),
                         json_object_get_string(model),
@@ -260,14 +274,22 @@ static void pretty_print_output(json_object *o) {
                 for (size_t i = 0; i < modes_len; ++i) {
                         json_object *mode = json_object_array_get_idx(modes, i);
 
-                        json_object *mode_width, *mode_height, *mode_refresh;
+                        json_object *mode_width, *mode_height, *mode_refresh,
+                                *mode_picture_aspect_ratio;
                         json_object_object_get_ex(mode, "width", &mode_width);
                         json_object_object_get_ex(mode, "height", &mode_height);
                         json_object_object_get_ex(mode, "refresh", &mode_refresh);
+                        json_object_object_get_ex(mode, "picture_aspect_ratio",
+                                &mode_picture_aspect_ratio);
 
-                        printf("    %dx%d @ %.3f Hz\n", json_object_get_int(mode_width),
+                        printf("    %dx%d @ %.3f Hz", json_object_get_int(mode_width),
                                 json_object_get_int(mode_height),
                                 (double)json_object_get_int(mode_refresh) / 1000);
+                        if (mode_picture_aspect_ratio &&
+                                        strcmp("none", json_object_get_string(mode_picture_aspect_ratio)) != 0) {
+                                printf(" (%s)", json_object_get_string(mode_picture_aspect_ratio));
+                        }
+                        printf("\n");
                 }
         }
 
@@ -286,28 +308,83 @@ static void pretty_print_config(json_object *c) {
         printf("%s\n", json_object_get_string(config));
 }
 
-static void pretty_print(int type, json_object *resp) {
-        if (type != IPC_COMMAND && type != IPC_GET_WORKSPACES &&
-                        type != IPC_GET_INPUTS && type != IPC_GET_OUTPUTS &&
-                        type != IPC_GET_VERSION && type != IPC_GET_SEATS &&
-                        type != IPC_GET_CONFIG && type != IPC_SEND_TICK) {
-                printf("%s\n", json_object_to_json_string_ext(resp,
-                        JSON_C_TO_STRING_PRETTY | JSON_C_TO_STRING_SPACED));
-                return;
+static void pretty_print_tree(json_object *obj, int indent) {
+        for (int i = 0; i < indent; i++) {
+                printf("  ");
         }
 
-        if (type == IPC_SEND_TICK) {
-                return;
+        int id = json_object_get_int(json_object_object_get(obj, "id"));
+        const char *name = json_object_get_string(json_object_object_get(obj, "name"));
+        const char *type = json_object_get_string(json_object_object_get(obj, "type"));
+        const char *shell = json_object_get_string(json_object_object_get(obj, "shell"));
+
+        printf("#%d: %s \"%s\"", id, type, name);
+
+        if (shell != NULL) {
+                int pid = json_object_get_int(json_object_object_get(obj, "pid"));
+                const char *app_id = json_object_get_string(json_object_object_get(obj, "app_id"));
+                json_object *window_props_obj = json_object_object_get(obj, "window_properties");
+                const char *instance = json_object_get_string(json_object_object_get(window_props_obj, "instance"));
+                const char *class = json_object_get_string(json_object_object_get(window_props_obj, "class"));
+                int x11_id = json_object_get_int(json_object_object_get(obj, "window"));
+
+                printf(" (%s, pid: %d", shell, pid);
+                if (app_id != NULL) {
+                        printf(", app_id: \"%s\"", app_id);
+                }
+                if (instance != NULL) {
+                        printf(", instance: \"%s\"", instance);
+                }
+                if (class != NULL) {
+                        printf(", class: \"%s\"", class);
+                }
+                if (x11_id != 0) {
+                        printf(", X11 window: 0x%X", x11_id);
+                }
+                printf(")");
         }
 
-        if (type == IPC_GET_VERSION) {
-                pretty_print_version(resp);
-                return;
+        printf("\n");
+
+        json_object *nodes_obj = json_object_object_get(obj, "nodes");
+        size_t len = json_object_array_length(nodes_obj);
+        for (size_t i = 0; i < len; i++) {
+                pretty_print_tree(json_object_array_get_idx(nodes_obj, i), indent + 1);
         }
 
-        if (type == IPC_GET_CONFIG) {
+        json_object *floating_nodes_obj;
+        json_bool floating_nodes = json_object_object_get_ex(obj, "floating_nodes", &floating_nodes_obj);
+        if (floating_nodes) {
+                size_t len = json_object_array_length(floating_nodes_obj);
+                for (size_t i = 0; i < len; i++) {
+                        pretty_print_tree(json_object_array_get_idx(floating_nodes_obj, i), indent + 1);
+                }
+        }
+}
+
+static void pretty_print(int type, json_object *resp) {
+        switch (type) {
+        case IPC_SEND_TICK:
+                return;
+        case IPC_GET_VERSION:
+                pretty_print_version(resp);
+                return;
+        case IPC_GET_CONFIG:
                 pretty_print_config(resp);
                 return;
+        case IPC_GET_TREE:
+                pretty_print_tree(resp, 0);
+                return;
+        case IPC_COMMAND:
+        case IPC_GET_WORKSPACES:
+        case IPC_GET_INPUTS:
+        case IPC_GET_OUTPUTS:
+        case IPC_GET_SEATS:
+                break;
+        default:
+                printf("%s\n", json_object_to_json_string_ext(resp,
+                        JSON_C_TO_STRING_PRETTY | JSON_C_TO_STRING_SPACED));
+                return;
         }
 
         json_object *obj;
@@ -343,7 +420,7 @@ int main(int argc, char **argv) {
 
         sway_log_init(SWAY_INFO, NULL);
 
-        static struct option long_options[] = {
+        static const struct option long_options[] = {
                 {"help", no_argument, NULL, 'h'},
                 {"monitor", no_argument, NULL, 'm'},
                 {"pretty", no_argument, NULL, 'p'},
@@ -480,12 +557,20 @@ int main(int argc, char **argv) {
         char *resp = ipc_single_command(socketfd, type, command, &len);
 
         // pretty print the json
-        json_object *obj = json_tokener_parse(resp);
-        if (obj == NULL) {
+        json_tokener *tok = json_tokener_new_ex(JSON_MAX_DEPTH);
+        if (tok == NULL) {
+                if (quiet) {
+                        exit(EXIT_FAILURE);
+                }
+                sway_abort("failed allocating json_tokener");
+        }
+        json_object *obj = json_tokener_parse_ex(tok, resp, -1);
+        enum json_tokener_error err = json_tokener_get_error(tok);
+        json_tokener_free(tok);
+        if (obj == NULL || err != json_tokener_success) {
                 if (!quiet) {
-                        fprintf(stderr, "ERROR: Could not parse json response from ipc. "
-                                        "This is a bug in sway.");
-                        printf("%s\n", resp);
+                        sway_log(SWAY_ERROR, "failed to parse payload as json: %s",
+                                json_tokener_error_desc(err));
                 }
                 ret = 1;
         } else {
@@ -517,13 +602,22 @@ int main(int argc, char **argv) {
                                 break;
                         }
 
-                        json_object *obj = json_tokener_parse(reply->payload);
-                        if (obj == NULL) {
+                        json_tokener *tok = json_tokener_new_ex(JSON_MAX_DEPTH);
+                        if (tok == NULL) {
+                                if (quiet) {
+                                        exit(EXIT_FAILURE);
+                                }
+                                sway_abort("failed allocating json_tokener");
+                        }
+                        json_object *obj = json_tokener_parse_ex(tok, reply->payload, -1);
+                        enum json_tokener_error err = json_tokener_get_error(tok);
+                        json_tokener_free(tok);
+                        if (obj == NULL || err != json_tokener_success) {
                                 if (!quiet) {
-                                        fprintf(stderr, "ERROR: Could not parse json response from"
-                                                        " ipc. This is a bug in sway.");
-                                        ret = 1;
+                                        sway_log(SWAY_ERROR, "failed to parse payload as json: %s",
+                                                json_tokener_error_desc(err));
                                 }
+                                ret = 1;
                                 break;
                         } else if (quiet) {
                                 json_object_put(obj);
diff --git a/swaymsg/swaymsg.1.scd b/swaymsg/swaymsg.1.scd
index b69013b5..abee1bb9 100644
--- a/swaymsg/swaymsg.1.scd
+++ b/swaymsg/swaymsg.1.scd
@@ -21,12 +21,13 @@ _swaymsg_ [options...] [message]
 
 *-p, --pretty*
         Use pretty output even when not using a tty.
+        Not available for all message types.
 
 *-q, --quiet*
         Sends the IPC message but does not print the response from sway.
 
 *-r, --raw*
-        Use raw output even if using a tty.
+        Use raw JSON output even if using a tty.
 
 *-s, --socket* <path>
         Use the specified socket path. Otherwise, swaymsg will ask sway where the
@@ -46,6 +47,11 @@ _swaymsg_ [options...] [message]
 
         See *sway*(5) for a list of commands.
 
+        _swaymsg_ can return pretty printed (standalone-default) or JSON-formatted
+        (*--raw*) output. For detailed documentation on the returned JSON-data of
+        each message type listed below, refer to *sway-ipc*(7). The JSON-format can
+        contain more information than the pretty print.
+
         Tips:
         - Command expansion is performed twice: once by swaymsg, and again by sway.
           If you have quoted multi-word strings in your command, enclose the entire
@@ -60,20 +66,20 @@ _swaymsg_ [options...] [message]
           _swaymsg -- mark --add test_ instead of _swaymsg mark --add test_.
 
 *get\_workspaces*
-        Gets a JSON-encoded list of workspaces and their status.
+        Gets a list of workspaces and their status.
 
 *get\_inputs*
-        Gets a JSON-encoded list of current inputs.
+        Gets a list of current inputs.
 
 *get\_outputs*
-        Gets a JSON-encoded list of current outputs.
+        Gets a list of current outputs.
 
 *get\_tree*
         Gets a JSON-encoded layout tree of all open windows, containers, outputs,
         workspaces, and so on.
 
 *get\_seats*
-        Gets a JSON-encoded list of all seats,
+        Gets a list of all seats,
         its properties and all assigned devices.
 
 *get\_marks*
@@ -83,7 +89,7 @@ _swaymsg_ [options...] [message]
         Get a JSON-encoded configuration for swaybar.
 
 *get\_version*
-        Get JSON-encoded version information for the running instance of sway.
+        Get version information for the running instance of sway.
 
 *get\_binding\_modes*
         Gets a JSON-encoded list of currently configured binding modes.
@@ -92,7 +98,7 @@ _swaymsg_ [options...] [message]
         Gets JSON-encoded info about the current binding state.
 
 *get\_config*
-        Gets a JSON-encoded copy of the current configuration.
+        Gets a copy of the current configuration. Doesn't expand includes.
 
 *send\_tick*
         Sends a tick event to all subscribed clients.
@@ -101,6 +107,8 @@ _swaymsg_ [options...] [message]
         Subscribe to a list of event types. The argument for this type should be
         provided in the form of a valid JSON array. If any of the types are invalid
         or if a valid JSON array is not provided, this will result in a failure.
+        For a list of valid event types and the data returned with them refer to
+        *sway-ipc*(7).
 
 # RETURN CODES
 
diff --git a/swaynag/config.c b/swaynag/config.c
index ca7f4eb2..cff3930f 100644
--- a/swaynag/config.c
+++ b/swaynag/config.c
@@ -11,24 +11,40 @@
 #include "util.h"
 #include "wlr-layer-shell-unstable-v1-client-protocol.h"
 
-static char *read_from_stdin(void) {
-        char *buffer = NULL;
-        size_t buffer_len = 0;
-        char *line = NULL;
-        size_t line_size = 0;
-        ssize_t nread;
-        while ((nread = getline(&line, &line_size, stdin)) != -1) {
+static char *read_and_trim_stdin(void) {
+        char *buffer = NULL, *line = NULL;
+        size_t buffer_len = 0, line_size = 0;
+        while (1) {
+                ssize_t nread = getline(&line, &line_size, stdin);
+                if (nread == -1) {
+                        if (feof(stdin)) {
+                                break;
+                        } else {
+                                perror("getline");
+                                goto freeline;
+                        }
+                }
                 buffer = realloc(buffer, buffer_len + nread + 1);
-                snprintf(&buffer[buffer_len], nread + 1, "%s", line);
+                if (!buffer) {
+                        perror("realloc");
+                        goto freebuf;
+                }
+                memcpy(&buffer[buffer_len], line, nread + 1);
                 buffer_len += nread;
         }
         free(line);
 
-        while (buffer && buffer[buffer_len - 1] == '\n') {
+        while (buffer_len && buffer[buffer_len - 1] == '\n') {
                 buffer[--buffer_len] = '\0';
         }
 
         return buffer;
+
+freeline:
+        free(line);
+freebuf:
+        free(buffer);
+        return NULL;
 }
 
 int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag,
@@ -51,7 +67,7 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag,
                 TO_PADDING_BTN,
         };
 
-        static struct option opts[] = {
+        static const struct option opts[] = {
                 {"button", required_argument, NULL, 'b'},
                 {"button-no-terminal", required_argument, NULL, 'B'},
                 {"button-dismiss", required_argument, NULL, 'z'},
@@ -59,6 +75,7 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag,
                 {"config", required_argument, NULL, 'c'},
                 {"debug", no_argument, NULL, 'd'},
                 {"edge", required_argument, NULL, 'e'},
+                {"layer", required_argument, NULL, 'y'},
                 {"font", required_argument, NULL, 'f'},
                 {"help", no_argument, NULL, 'h'},
                 {"detailed-message", no_argument, NULL, 'l'},
@@ -104,6 +121,8 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag,
                 "  -c, --config <path>             Path to config file.\n"
                 "  -d, --debug                     Enable debugging.\n"
                 "  -e, --edge top|bottom           Set the edge to use.\n"
+                "  -y, --layer overlay|top|bottom|background\n"
+            "                                  Set the layer to use.\n"
                 "  -f, --font <font>               Set the font to use.\n"
                 "  -h, --help                      Show help message and quit.\n"
                 "  -l, --detailed-message          Read a detailed message from stdin.\n"
@@ -133,7 +152,7 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag,
 
         optind = 1;
         while (1) {
-                int c = getopt_long(argc, argv, "b:B:z:Z:c:de:f:hlL:m:o:s:t:v", opts, NULL);
+                int c = getopt_long(argc, argv, "b:B:z:Z:c:de:y:f:hlL:m:o:s:t:v", opts, NULL);
                 if (c == -1) {
                         break;
                 }
@@ -147,8 +166,11 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag,
                                         fprintf(stderr, "Missing action for button %s\n", optarg);
                                         return EXIT_FAILURE;
                                 }
-                                struct swaynag_button *button;
-                                button = calloc(sizeof(struct swaynag_button), 1);
+                                struct swaynag_button *button = calloc(1, sizeof(struct swaynag_button));
+                                if (!button) {
+                                        perror("calloc");
+                                        return EXIT_FAILURE;
+                                }
                                 button->text = strdup(optarg);
                                 button->type = SWAYNAG_ACTION_COMMAND;
                                 button->action = strdup(argv[optind]);
@@ -184,24 +206,45 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag,
                                 }
                         }
                         break;
+                case 'y': // Layer
+                        if (type) {
+                                if (strcmp(optarg, "background") == 0) {
+                                        type->layer = ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND;
+                                } else if (strcmp(optarg, "bottom") == 0) {
+                                        type->layer = ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM;
+                                } else if (strcmp(optarg, "top") == 0) {
+                                        type->layer = ZWLR_LAYER_SHELL_V1_LAYER_TOP;
+                                } else if (strcmp(optarg, "overlay") == 0) {
+                                        type->layer = ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY;
+                                } else {
+                                        fprintf(stderr, "Invalid layer: %s\n"
+                                                        "Usage: --layer overlay|top|bottom|background\n",
+                                                        optarg);
+                                        return EXIT_FAILURE;
+                                }
+                        }
+                        break;
                 case 'f': // Font
                         if (type) {
-                                free(type->font);
-                                type->font = strdup(optarg);
+                                pango_font_description_free(type->font_description);
+                                type->font_description = pango_font_description_from_string(optarg);
                         }
                         break;
                 case 'l': // Detailed Message
                         if (swaynag) {
                                 free(swaynag->details.message);
-                                swaynag->details.message = read_from_stdin();
+                                swaynag->details.message = read_and_trim_stdin();
+                                if (!swaynag->details.message) {
+                                        return EXIT_FAILURE;
+                                }
                                 swaynag->details.button_up.text = strdup("â–²");
                                 swaynag->details.button_down.text = strdup("â–¼");
                         }
                         break;
                 case 'L': // Detailed Button Text
                         if (swaynag) {
-                                free(swaynag->details.button_details->text);
-                                swaynag->details.button_details->text = strdup(optarg);
+                                free(swaynag->details.details_text);
+                                swaynag->details.details_text = strdup(optarg);
                         }
                         break;
                 case 'm': // Message
@@ -218,8 +261,7 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag,
                         break;
                 case 's': // Dismiss Button Text
                         if (swaynag) {
-                                struct swaynag_button *button_close;
-                                button_close = swaynag->buttons->items[0];
+                                struct swaynag_button *button_close = swaynag->buttons->items[0];
                                 free(button_close->text);
                                 button_close->text = strdup(optarg);
                         }
@@ -378,23 +420,24 @@ int swaynag_load_config(char *path, struct swaynag *swaynag, list_t *types) {
 
                 if (line[0] == '[') {
                         char *close = strchr(line, ']');
-                        if (!close) {
-                                fprintf(stderr, "Closing bracket not found on line %d\n",
-                                                line_number);
+                        if (!close || close != &line[nread - 2] || nread <= 3) {
+                                fprintf(stderr, "Line %d is malformed\n", line_number);
                                 result = 1;
                                 break;
                         }
-                        char *name = calloc(1, close - line);
-                        strncat(name, line + 1, close - line - 1);
-                        type = swaynag_type_get(types, name);
+                        *close = '\0';
+                        type = swaynag_type_get(types, &line[1]);
                         if (!type) {
-                                type = swaynag_type_new(name);
+                                type = swaynag_type_new(&line[1]);
                                 list_add(types, type);
                         }
-                        free(name);
                 } else {
-                        char *flag = malloc(sizeof(char) * (nread + 3));
-                        sprintf(flag, "--%s", line);
+                        char *flag = malloc(nread + 3);
+                        if (!flag) {
+                                perror("calloc");
+                                return EXIT_FAILURE;
+                        }
+                        snprintf(flag, nread + 3, "--%s", line);
                         char *argv[] = {"swaynag", flag};
                         result = swaynag_parse_options(2, argv, swaynag, types, type,
                                         NULL, NULL);
diff --git a/swaynag/main.c b/swaynag/main.c
index 88007818..20390207 100644
--- a/swaynag/main.c
+++ b/swaynag/main.c
@@ -20,33 +20,27 @@ void sway_terminate(int code) {
 }
 
 int main(int argc, char **argv) {
-        int exit_code = EXIT_SUCCESS;
+        int status = EXIT_SUCCESS;
 
         list_t *types = create_list();
         swaynag_types_add_default(types);
 
-        memset(&swaynag, 0, sizeof(swaynag));
         swaynag.buttons = create_list();
         wl_list_init(&swaynag.outputs);
         wl_list_init(&swaynag.seats);
 
-        struct swaynag_button *button_close =
-                calloc(sizeof(struct swaynag_button), 1);
+        struct swaynag_button *button_close = calloc(1, sizeof(struct swaynag_button));
         button_close->text = strdup("X");
         button_close->type = SWAYNAG_ACTION_DISMISS;
         list_add(swaynag.buttons, button_close);
 
-        swaynag.details.button_details =
-                calloc(sizeof(struct swaynag_button), 1);
-        swaynag.details.button_details->text = strdup("Toggle details");
-        swaynag.details.button_details->type = SWAYNAG_ACTION_EXPAND;
+        swaynag.details.details_text = strdup("Toggle details");
 
         char *config_path = NULL;
         bool debug = false;
-        int launch_status = swaynag_parse_options(argc, argv, NULL, NULL, NULL,
+        status = swaynag_parse_options(argc, argv, NULL, NULL, NULL,
                         &config_path, &debug);
-        if (launch_status != 0)  {
-                exit_code = launch_status;
+        if (status != 0)  {
                 goto cleanup;
         }
         sway_log_init(debug ? SWAY_DEBUG : SWAY_ERROR, NULL);
@@ -56,29 +50,27 @@ int main(int argc, char **argv) {
         }
         if (config_path) {
                 sway_log(SWAY_DEBUG, "Loading config file: %s", config_path);
-                int config_status = swaynag_load_config(config_path, &swaynag, types);
-                free(config_path);
-                if (config_status != 0) {
-                        exit_code = config_status;
+                status = swaynag_load_config(config_path, &swaynag, types);
+                if (status != 0) {
                         goto cleanup;
                 }
         }
 
+
         if (argc > 1) {
                 struct swaynag_type *type_args = swaynag_type_new("<args>");
                 list_add(types, type_args);
 
-                int result = swaynag_parse_options(argc, argv, &swaynag, types,
+                status = swaynag_parse_options(argc, argv, &swaynag, types,
                                 type_args, NULL, NULL);
-                if (result != 0) {
-                        exit_code = result;
+                if (status != 0) {
                         goto cleanup;
                 }
         }
 
         if (!swaynag.message) {
                 sway_log(SWAY_ERROR, "No message passed. Please provide --message/-m");
-                exit_code = EXIT_FAILURE;
+                status = EXIT_FAILURE;
                 goto cleanup;
         }
 
@@ -96,20 +88,20 @@ int main(int argc, char **argv) {
         swaynag_type_merge(type, swaynag_type_get(types, "<args>"));
         swaynag.type = type;
 
-        swaynag_types_free(types);
-
         if (swaynag.details.message) {
+                swaynag.details.button_details = calloc(1, sizeof(struct swaynag_button));
+                swaynag.details.button_details->text = strdup(swaynag.details.details_text);
+                swaynag.details.button_details->type = SWAYNAG_ACTION_EXPAND;
                 list_add(swaynag.buttons, swaynag.details.button_details);
-        } else {
-                free(swaynag.details.button_details->text);
-                free(swaynag.details.button_details);
         }
 
         sway_log(SWAY_DEBUG, "Output: %s", swaynag.type->output);
         sway_log(SWAY_DEBUG, "Anchors: %" PRIu32, swaynag.type->anchors);
         sway_log(SWAY_DEBUG, "Type: %s", swaynag.type->name);
         sway_log(SWAY_DEBUG, "Message: %s", swaynag.message);
-        sway_log(SWAY_DEBUG, "Font: %s", swaynag.type->font);
+        char *font = pango_font_description_to_string(swaynag.type->font_description);
+        sway_log(SWAY_DEBUG, "Font: %s", font);
+        free(font);
         sway_log(SWAY_DEBUG, "Buttons");
         for (int i = 0; i < swaynag.buttons->length; i++) {
                 struct swaynag_button *button = swaynag.buttons->items[i];
@@ -120,12 +112,9 @@ int main(int argc, char **argv) {
 
         swaynag_setup(&swaynag);
         swaynag_run(&swaynag);
-        return exit_code;
 
 cleanup:
         swaynag_types_free(types);
-        free(swaynag.details.button_details->text);
-        free(swaynag.details.button_details);
         swaynag_destroy(&swaynag);
-        return exit_code;
+        return status;
 }
diff --git a/swaynag/meson.build b/swaynag/meson.build
index 71f2fc2d..aef21483 100644
--- a/swaynag/meson.build
+++ b/swaynag/meson.build
@@ -5,13 +5,14 @@ executable(
                 'render.c',
                 'swaynag.c',
                 'types.c',
+                wl_protos_src,
         ],
         include_directories: [sway_inc],
         dependencies: [
                 cairo,
-                client_protos,
                 pango,
                 pangocairo,
+                rt,
                 wayland_client,
                 wayland_cursor,
         ],
diff --git a/swaynag/render.c b/swaynag/render.c
index cf2cc9e0..21b03289 100644
--- a/swaynag/render.c
+++ b/swaynag/render.c
@@ -1,5 +1,5 @@
 #include <stdint.h>
-#include "cairo.h"
+#include "cairo_util.h"
 #include "log.h"
 #include "pango.h"
 #include "pool-buffer.h"
@@ -9,20 +9,20 @@
 
 static uint32_t render_message(cairo_t *cairo, struct swaynag *swaynag) {
         int text_width, text_height;
-        get_text_size(cairo, swaynag->type->font, &text_width, &text_height, NULL,
-                        swaynag->scale, true, "%s", swaynag->message);
+        get_text_size(cairo, swaynag->type->font_description, &text_width, &text_height, NULL,
+                        1, true, "%s", swaynag->message);
 
-        int padding = swaynag->type->message_padding * swaynag->scale;
+        int padding = swaynag->type->message_padding;
 
         uint32_t ideal_height = text_height + padding * 2;
-        uint32_t ideal_surface_height = ideal_height / swaynag->scale;
+        uint32_t ideal_surface_height = ideal_height;
         if (swaynag->height < ideal_surface_height) {
                 return ideal_surface_height;
         }
 
         cairo_set_source_u32(cairo, swaynag->type->text);
         cairo_move_to(cairo, padding, (int)(ideal_height - text_height) / 2);
-        pango_printf(cairo, swaynag->type->font, swaynag->scale, false,
+        render_text(cairo, swaynag->type->font_description, 1, false,
                         "%s", swaynag->message);
 
         return ideal_surface_height;
@@ -31,11 +31,11 @@ static uint32_t render_message(cairo_t *cairo, struct swaynag *swaynag) {
 static void render_details_scroll_button(cairo_t *cairo,
                 struct swaynag *swaynag, struct swaynag_button *button) {
         int text_width, text_height;
-        get_text_size(cairo, swaynag->type->font, &text_width, &text_height, NULL,
-                        swaynag->scale, true, "%s", button->text);
+        get_text_size(cairo, swaynag->type->font_description, &text_width, &text_height, NULL,
+                        1, true, "%s", button->text);
 
-        int border = swaynag->type->button_border_thickness * swaynag->scale;
-        int padding = swaynag->type->button_padding * swaynag->scale;
+        int border = swaynag->type->button_border_thickness;
+        int padding = swaynag->type->button_padding;
 
         cairo_set_source_u32(cairo, swaynag->type->details_background);
         cairo_rectangle(cairo, button->x, button->y,
@@ -50,41 +50,41 @@ static void render_details_scroll_button(cairo_t *cairo,
         cairo_set_source_u32(cairo, swaynag->type->button_text);
         cairo_move_to(cairo, button->x + border + padding,
                         button->y + border + (button->height - text_height) / 2);
-        pango_printf(cairo, swaynag->type->font, swaynag->scale, true,
+        render_text(cairo, swaynag->type->font_description, 1, true,
                         "%s", button->text);
 }
 
 static int get_detailed_scroll_button_width(cairo_t *cairo,
                 struct swaynag *swaynag) {
         int up_width, down_width, temp_height;
-        get_text_size(cairo, swaynag->type->font, &up_width, &temp_height, NULL,
-                        swaynag->scale, true,
+        get_text_size(cairo, swaynag->type->font_description, &up_width, &temp_height, NULL,
+                        1, true,
                         "%s", swaynag->details.button_up.text);
-        get_text_size(cairo, swaynag->type->font, &down_width, &temp_height, NULL,
-                        swaynag->scale, true,
+        get_text_size(cairo, swaynag->type->font_description, &down_width, &temp_height, NULL,
+                        1, true,
                         "%s", swaynag->details.button_down.text);
 
         int text_width =  up_width > down_width ? up_width : down_width;
-        int border = swaynag->type->button_border_thickness * swaynag->scale;
-        int padding = swaynag->type->button_padding * swaynag->scale;
+        int border = swaynag->type->button_border_thickness;
+        int padding = swaynag->type->button_padding;
 
         return text_width + border * 2 + padding * 2;
 }
 
 static uint32_t render_detailed(cairo_t *cairo, struct swaynag *swaynag,
                 uint32_t y) {
-        uint32_t width = swaynag->width * swaynag->scale;
+        uint32_t width = swaynag->width;
 
-        int border = swaynag->type->details_border_thickness * swaynag->scale;
-        int padding = swaynag->type->message_padding * swaynag->scale;
+        int border = swaynag->type->details_border_thickness;
+        int padding = swaynag->type->message_padding;
         int decor = padding + border;
 
         swaynag->details.x = decor;
-        swaynag->details.y = y * swaynag->scale + decor;
+        swaynag->details.y = y + decor;
         swaynag->details.width = width - decor * 2;
 
-        PangoLayout *layout = get_pango_layout(cairo, swaynag->type->font,
-                        swaynag->details.message, swaynag->scale, false);
+        PangoLayout *layout = get_pango_layout(cairo, swaynag->type->font_description,
+                        swaynag->details.message, 1, false);
         pango_layout_set_width(layout,
                         (swaynag->details.width - padding * 2) * PANGO_SCALE);
         pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
@@ -164,7 +164,7 @@ static uint32_t render_detailed(cairo_t *cairo, struct swaynag *swaynag,
         pango_cairo_show_layout(cairo, layout);
         g_object_unref(layout);
 
-        return ideal_height / swaynag->scale;
+        return ideal_height;
 }
 
 static uint32_t render_button(cairo_t *cairo, struct swaynag *swaynag,
@@ -172,14 +172,14 @@ static uint32_t render_button(cairo_t *cairo, struct swaynag *swaynag,
         struct swaynag_button *button = swaynag->buttons->items[button_index];
 
         int text_width, text_height;
-        get_text_size(cairo, swaynag->type->font, &text_width, &text_height, NULL,
-                        swaynag->scale, true, "%s", button->text);
+        get_text_size(cairo, swaynag->type->font_description, &text_width, &text_height, NULL,
+                        1, true, "%s", button->text);
 
-        int border = swaynag->type->button_border_thickness * swaynag->scale;
-        int padding = swaynag->type->button_padding * swaynag->scale;
+        int border = swaynag->type->button_border_thickness;
+        int padding = swaynag->type->button_padding;
 
         uint32_t ideal_height = text_height + padding * 2 + border * 2;
-        uint32_t ideal_surface_height = ideal_height / swaynag->scale;
+        uint32_t ideal_surface_height = ideal_height;
         if (swaynag->height < ideal_surface_height) {
                 return ideal_surface_height;
         }
@@ -201,7 +201,7 @@ static uint32_t render_button(cairo_t *cairo, struct swaynag *swaynag,
 
         cairo_set_source_u32(cairo, swaynag->type->button_text);
         cairo_move_to(cairo, button->x + padding, button->y + padding);
-        pango_printf(cairo, swaynag->type->font, swaynag->scale, true,
+        render_text(cairo, swaynag->type->font_description, 1, true,
                         "%s", button->text);
 
         *x = button->x - border;
@@ -220,13 +220,12 @@ static uint32_t render_to_cairo(cairo_t *cairo, struct swaynag *swaynag) {
         max_height = h > max_height ? h : max_height;
 
         int x = swaynag->width - swaynag->type->button_margin_right;
-        x *= swaynag->scale;
         for (int i = 0; i < swaynag->buttons->length; i++) {
                 h = render_button(cairo, swaynag, i, &x);
                 max_height = h > max_height ? h : max_height;
-                x -= swaynag->type->button_gap * swaynag->scale;
+                x -= swaynag->type->button_gap;
                 if (i == 0) {
-                        x -= swaynag->type->button_gap_close * swaynag->scale;
+                        x -= swaynag->type->button_gap_close;
                 }
         }
 
@@ -235,14 +234,14 @@ static uint32_t render_to_cairo(cairo_t *cairo, struct swaynag *swaynag) {
                 max_height = h > max_height ? h : max_height;
         }
 
-        int border = swaynag->type->bar_border_thickness * swaynag->scale;
+        int border = swaynag->type->bar_border_thickness;
         if (max_height > swaynag->height) {
                 max_height += border;
         }
         cairo_set_source_u32(cairo, swaynag->type->border_bottom);
         cairo_rectangle(cairo, 0,
-                        swaynag->height * swaynag->scale - border,
-                        swaynag->width * swaynag->scale,
+                        swaynag->height - border,
+                        swaynag->width,
                         border);
         cairo_fill(cairo);
 
@@ -257,6 +256,7 @@ void render_frame(struct swaynag *swaynag) {
         cairo_surface_t *recorder = cairo_recording_surface_create(
                         CAIRO_CONTENT_COLOR_ALPHA, NULL);
         cairo_t *cairo = cairo_create(recorder);
+        cairo_scale(cairo, swaynag->scale, swaynag->scale);
         cairo_save(cairo);
         cairo_set_operator(cairo, CAIRO_OPERATOR_CLEAR);
         cairo_paint(cairo);
diff --git a/swaynag/swaynag.1.scd b/swaynag/swaynag.1.scd
index 4a03469e..1cc85db7 100644
--- a/swaynag/swaynag.1.scd
+++ b/swaynag/swaynag.1.scd
@@ -48,6 +48,9 @@ _swaynag_ [options...]
 *-e, --edge* top|bottom
         Set the edge to use.
 
+*-y, --layer* overlay|top|bottom|background
+        Set the layer to use.
+
 *-f, --font* <font>
         Set the font to use.
 
diff --git a/swaynag/swaynag.5.scd b/swaynag/swaynag.5.scd
index a078a4d7..3c367d0f 100644
--- a/swaynag/swaynag.5.scd
+++ b/swaynag/swaynag.5.scd
@@ -53,7 +53,7 @@ The following sizing options can also be set:
 *message-padding=<padding>*
         Set the padding for the message.
 
-*details-gackground=<color>*
+*details-background=<color>*
         The background color for the details.
 
 *details-border-size=<size>*
@@ -79,6 +79,9 @@ Additionally, the following options can be assigned a default per-type:
 *edge=top|bottom*
         Set the edge to use.
 
+*layer=overlay|top|bottom|background*
+        Set the layer to use.
+
 *font=<font>*
         Set the font to use.
 
diff --git a/swaynag/swaynag.c b/swaynag/swaynag.c
index d9bec368..6ea739e3 100644
--- a/swaynag/swaynag.c
+++ b/swaynag/swaynag.c
@@ -28,10 +28,15 @@ static bool terminal_execute(char *terminal, char *command) {
         fprintf(tmp, "#!/bin/sh\nrm %s\n%s", fname, command);
         fclose(tmp);
         chmod(fname, S_IRUSR | S_IWUSR | S_IXUSR);
-        char *cmd = malloc(sizeof(char) * (strlen(terminal) + strlen(" -e ") + strlen(fname) + 1));
-        sprintf(cmd, "%s -e %s", terminal, fname);
-        execl("/bin/sh", "/bin/sh", "-c", cmd, NULL);
-        sway_log_errno(SWAY_ERROR, "Failed to run command, execl() returned.");
+        size_t cmd_size = strlen(terminal) + strlen(" -e ") + strlen(fname) + 1;
+        char *cmd = malloc(cmd_size);
+        if (!cmd) {
+                perror("malloc");
+                return false;
+        }
+        snprintf(cmd, cmd_size, "%s -e %s", terminal, fname);
+        execlp("sh", "sh", "-c", cmd, NULL);
+        sway_log_errno(SWAY_ERROR, "Failed to run command, execlp() returned.");
         free(cmd);
         return false;
 }
@@ -58,7 +63,7 @@ static void swaynag_button_execute(struct swaynag *swaynag,
                         } else if (pid == 0) {
                                 // Child of the child. Will be reparented to the init process
                                 char *terminal = getenv("TERMINAL");
-                                if (button->terminal && terminal && strlen(terminal)) {
+                                if (button->terminal && terminal && *terminal) {
                                         sway_log(SWAY_DEBUG, "Found $TERMINAL: %s", terminal);
                                         if (!terminal_execute(terminal, button->action)) {
                                                 swaynag_destroy(swaynag);
@@ -69,8 +74,8 @@ static void swaynag_button_execute(struct swaynag *swaynag,
                                                 sway_log(SWAY_DEBUG,
                                                                 "$TERMINAL not found. Running directly");
                                         }
-                                        execl("/bin/sh", "/bin/sh", "-c", button->action, NULL);
-                                        sway_log_errno(SWAY_DEBUG, "execl failed");
+                                        execlp("sh", "sh", "-c", button->action, NULL);
+                                        sway_log_errno(SWAY_DEBUG, "execlp failed");
                                         _exit(EXIT_FAILURE);
                                 }
                         }
@@ -103,7 +108,7 @@ static void layer_surface_closed(void *data,
         swaynag_destroy(swaynag);
 }
 
-static struct zwlr_layer_surface_v1_listener layer_surface_listener = {
+static const struct zwlr_layer_surface_v1_listener layer_surface_listener = {
         .configure = layer_surface_configure,
         .closed = layer_surface_closed,
 };
@@ -124,7 +129,7 @@ static void surface_enter(void *data, struct wl_surface *surface,
         };
 }
 
-static struct wl_surface_listener surface_listener = {
+static const struct wl_surface_listener surface_listener = {
         .enter = surface_enter,
         .leave = nop,
 };
@@ -138,7 +143,7 @@ static void update_cursor(struct swaynag_seat *seat) {
         const char *cursor_theme = getenv("XCURSOR_THEME");
         unsigned cursor_size = 24;
         const char *env_cursor_size = getenv("XCURSOR_SIZE");
-        if (env_cursor_size && strlen(env_cursor_size) > 0) {
+        if (env_cursor_size && *env_cursor_size) {
                 errno = 0;
                 char *end;
                 unsigned size = strtoul(env_cursor_size, &end, 10);
@@ -148,8 +153,15 @@ static void update_cursor(struct swaynag_seat *seat) {
         }
         pointer->cursor_theme = wl_cursor_theme_load(
                 cursor_theme, cursor_size * swaynag->scale, swaynag->shm);
-        struct wl_cursor *cursor =
-                wl_cursor_theme_get_cursor(pointer->cursor_theme, "left_ptr");
+        if (!pointer->cursor_theme) {
+                sway_log(SWAY_ERROR, "Failed to load cursor theme");
+                return;
+        }
+        struct wl_cursor *cursor = wl_cursor_theme_get_cursor(pointer->cursor_theme, "default");
+        if (!cursor) {
+                sway_log(SWAY_ERROR, "Failed to get default cursor from theme");
+                return;
+        }
         pointer->cursor_image = cursor->images[0];
         wl_surface_set_buffer_scale(pointer->cursor_surface,
                         swaynag->scale);
@@ -177,9 +189,22 @@ static void wl_pointer_enter(void *data, struct wl_pointer *wl_pointer,
                 uint32_t serial, struct wl_surface *surface,
                 wl_fixed_t surface_x, wl_fixed_t surface_y) {
         struct swaynag_seat *seat = data;
+
         struct swaynag_pointer *pointer = &seat->pointer;
-        pointer->serial = serial;
-        update_cursor(seat);
+        pointer->x = wl_fixed_to_int(surface_x);
+        pointer->y = wl_fixed_to_int(surface_y);
+
+        if (seat->swaynag->cursor_shape_manager) {
+                struct wp_cursor_shape_device_v1 *device =
+                        wp_cursor_shape_manager_v1_get_pointer(
+                                seat->swaynag->cursor_shape_manager, wl_pointer);
+                wp_cursor_shape_device_v1_set_shape(device, serial,
+                        WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_DEFAULT);
+                wp_cursor_shape_device_v1_destroy(device);
+        } else {
+                pointer->serial = serial;
+                update_cursor(seat);
+        }
 }
 
 static void wl_pointer_motion(void *data, struct wl_pointer *wl_pointer,
@@ -198,8 +223,8 @@ static void wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
                 return;
         }
 
-        double x = seat->pointer.x * swaynag->scale;
-        double y = seat->pointer.y * swaynag->scale;
+        double x = seat->pointer.x;
+        double y = seat->pointer.y;
         for (int i = 0; i < swaynag->buttons->length; i++) {
                 struct swaynag_button *nagbutton = swaynag->buttons->items[i];
                 if (x >= nagbutton->x
@@ -263,7 +288,7 @@ static void wl_pointer_axis(void *data, struct wl_pointer *wl_pointer,
         render_frame(swaynag);
 }
 
-static struct wl_pointer_listener pointer_listener = {
+static const struct wl_pointer_listener pointer_listener = {
         .enter = wl_pointer_enter,
         .leave = nop,
         .motion = wl_pointer_motion,
@@ -289,7 +314,7 @@ static void seat_handle_capabilities(void *data, struct wl_seat *wl_seat,
         }
 }
 
-const struct wl_seat_listener seat_listener = {
+static const struct wl_seat_listener seat_listener = {
         .capabilities = seat_handle_capabilities,
         .name = nop,
 };
@@ -305,33 +330,25 @@ static void output_scale(void *data, struct wl_output *output,
         }
 }
 
-static struct wl_output_listener output_listener = {
-        .geometry = nop,
-        .mode = nop,
-        .done = nop,
-        .scale = output_scale,
-};
-
-static void xdg_output_handle_name(void *data,
-                struct zxdg_output_v1 *xdg_output, const char *name) {
+static void output_name(void *data, struct wl_output *output,
+                const char *name) {
         struct swaynag_output *swaynag_output = data;
-        char *outname = swaynag_output->swaynag->type->output;
-        sway_log(SWAY_DEBUG, "Checking against output %s for %s", name, outname);
-        if (!swaynag_output->swaynag->output && outname && name
-                        && strcmp(outname, name) == 0) {
+        swaynag_output->name = strdup(name);
+
+        const char *outname = swaynag_output->swaynag->type->output;
+        if (!swaynag_output->swaynag->output && outname &&
+                        strcmp(outname, name) == 0) {
                 sway_log(SWAY_DEBUG, "Using output %s", name);
                 swaynag_output->swaynag->output = swaynag_output;
         }
-        swaynag_output->name = strdup(name);
-        zxdg_output_v1_destroy(xdg_output);
-        swaynag_output->swaynag->querying_outputs--;
 }
 
-static struct zxdg_output_v1_listener xdg_output_listener = {
-        .logical_position = nop,
-        .logical_size = nop,
+static const struct wl_output_listener output_listener = {
+        .geometry = nop,
+        .mode = nop,
         .done = nop,
-        .name = xdg_output_handle_name,
+        .scale = output_scale,
+        .name = output_name,
         .description = nop,
 };
 
@@ -345,6 +362,7 @@ static void handle_global(void *data, struct wl_registry *registry,
                 struct swaynag_seat *seat =
                         calloc(1, sizeof(struct swaynag_seat));
                 if (!seat) {
+                        perror("calloc");
                         return;
                 }
 
@@ -359,33 +377,28 @@ static void handle_global(void *data, struct wl_registry *registry,
         } else if (strcmp(interface, wl_shm_interface.name) == 0) {
                 swaynag->shm = wl_registry_bind(registry, name, &wl_shm_interface, 1);
         } else if (strcmp(interface, wl_output_interface.name) == 0) {
-                if (!swaynag->output && swaynag->xdg_output_manager) {
-                        swaynag->querying_outputs++;
+                if (!swaynag->output) {
                         struct swaynag_output *output =
                                 calloc(1, sizeof(struct swaynag_output));
+                        if (!output) {
+                                perror("calloc");
+                                return;
+                        }
                         output->wl_output = wl_registry_bind(registry, name,
-                                        &wl_output_interface, 3);
+                                        &wl_output_interface, 4);
                         output->wl_name = name;
                         output->scale = 1;
                         output->swaynag = swaynag;
                         wl_list_insert(&swaynag->outputs, &output->link);
                         wl_output_add_listener(output->wl_output,
                                         &output_listener, output);
-
-                        struct zxdg_output_v1 *xdg_output;
-                        xdg_output = zxdg_output_manager_v1_get_xdg_output(
-                                        swaynag->xdg_output_manager, output->wl_output);
-                        zxdg_output_v1_add_listener(xdg_output,
-                                        &xdg_output_listener, output);
                 }
         } else if (strcmp(interface, zwlr_layer_shell_v1_interface.name) == 0) {
                 swaynag->layer_shell = wl_registry_bind(
                                 registry, name, &zwlr_layer_shell_v1_interface, 1);
-        } else if (strcmp(interface, zxdg_output_manager_v1_interface.name) == 0
-                        && version >= ZXDG_OUTPUT_V1_NAME_SINCE_VERSION) {
-                swaynag->xdg_output_manager = wl_registry_bind(registry, name,
-                                &zxdg_output_manager_v1_interface,
-                                ZXDG_OUTPUT_V1_NAME_SINCE_VERSION);
+        } else if (strcmp(interface, wp_cursor_shape_manager_v1_interface.name) == 0) {
+                swaynag->cursor_shape_manager = wl_registry_bind(
+                                registry, name, &wp_cursor_shape_manager_v1_interface, 1);
         }
 }
 
@@ -451,12 +464,11 @@ void swaynag_setup(struct swaynag *swaynag) {
 
         assert(swaynag->compositor && swaynag->layer_shell && swaynag->shm);
 
-        while (swaynag->querying_outputs > 0) {
-                if (wl_display_roundtrip(swaynag->display) < 0) {
-                        sway_log(SWAY_ERROR, "Error during outputs init.");
-                        swaynag_destroy(swaynag);
-                        exit(EXIT_FAILURE);
-                }
+        // Second roundtrip to get wl_output properties
+        if (wl_display_roundtrip(swaynag->display) < 0) {
+                sway_log(SWAY_ERROR, "Error during outputs init.");
+                swaynag_destroy(swaynag);
+                exit(EXIT_FAILURE);
         }
 
         if (!swaynag->output && swaynag->type->output) {
@@ -465,7 +477,9 @@ void swaynag_setup(struct swaynag *swaynag) {
                 exit(EXIT_FAILURE);
         }
 
-        swaynag_setup_cursors(swaynag);
+        if (!swaynag->cursor_shape_manager) {
+                swaynag_setup_cursors(swaynag);
+        }
 
         swaynag->surface = wl_compositor_create_surface(swaynag->compositor);
         assert(swaynag->surface);
@@ -474,7 +488,8 @@ void swaynag_setup(struct swaynag *swaynag) {
         swaynag->layer_surface = zwlr_layer_shell_v1_get_layer_surface(
                         swaynag->layer_shell, swaynag->surface,
                         swaynag->output ? swaynag->output->wl_output : NULL,
-                        ZWLR_LAYER_SHELL_V1_LAYER_TOP, "swaynag");
+                        swaynag->type->layer,
+                        "swaynag");
         assert(swaynag->layer_surface);
         zwlr_layer_surface_v1_add_listener(swaynag->layer_surface,
                         &layer_surface_listener, swaynag);
@@ -491,10 +506,6 @@ void swaynag_run(struct swaynag *swaynag) {
                         && wl_display_dispatch(swaynag->display) != -1) {
                 // This is intentionally left blank
         }
-
-        if (swaynag->display) {
-                wl_display_disconnect(swaynag->display);
-        }
 }
 
 void swaynag_destroy(struct swaynag *swaynag) {
@@ -509,6 +520,7 @@ void swaynag_destroy(struct swaynag *swaynag) {
         }
         list_free(swaynag->buttons);
         free(swaynag->details.message);
+        free(swaynag->details.details_text);
         free(swaynag->details.button_up.text);
         free(swaynag->details.button_down.text);
 
@@ -529,13 +541,8 @@ void swaynag_destroy(struct swaynag *swaynag) {
                 swaynag_seat_destroy(seat);
         }
 
-        if (&swaynag->buffers[0]) {
-                destroy_buffer(&swaynag->buffers[0]);
-        }
-
-        if (&swaynag->buffers[1]) {
-                destroy_buffer(&swaynag->buffers[1]);
-        }
+        destroy_buffer(&swaynag->buffers[0]);
+        destroy_buffer(&swaynag->buffers[1]);
 
         if (swaynag->outputs.prev || swaynag->outputs.next) {
                 struct swaynag_output *output, *temp;
@@ -554,4 +561,8 @@ void swaynag_destroy(struct swaynag *swaynag) {
         if (swaynag->shm) {
                 wl_shm_destroy(swaynag->shm);
         }
+
+        if (swaynag->display) {
+                wl_display_disconnect(swaynag->display);
+        }
 }
diff --git a/swaynag/types.c b/swaynag/types.c
index fa045532..409cc668 100644
--- a/swaynag/types.c
+++ b/swaynag/types.c
@@ -26,15 +26,18 @@ struct swaynag_type *swaynag_type_new(const char *name) {
         type->button_gap_close = -1;
         type->button_margin_right = -1;
         type->button_padding = -1;
+        type->layer = -1;
         return type;
 }
 
 void swaynag_types_add_default(list_t *types) {
         struct swaynag_type *type_defaults = swaynag_type_new("<defaults>");
-        type_defaults->font = strdup("pango:Monospace 10");
+        type_defaults->font_description =
+                pango_font_description_from_string("pango:Monospace 10");
         type_defaults->anchors = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP
                 | ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT
                 | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
+        type_defaults->layer = ZWLR_LAYER_SHELL_V1_LAYER_TOP;
         type_defaults->button_background = 0x333333FF;
         type_defaults->details_background = 0x333333FF;
         type_defaults->background = 0x323232FF;
@@ -88,8 +91,8 @@ void swaynag_type_merge(struct swaynag_type *dest, struct swaynag_type *src) {
                 return;
         }
 
-        if (src->font) {
-                dest->font = strdup(src->font);
+        if (src->font_description) {
+                dest->font_description = pango_font_description_copy(src->font_description);
         }
 
         if (src->output) {
@@ -100,6 +103,10 @@ void swaynag_type_merge(struct swaynag_type *dest, struct swaynag_type *src) {
                 dest->anchors = src->anchors;
         }
 
+        if (src->layer >= 0) {
+                dest->layer = src->layer;
+        }
+
         // Colors
         if (src->button_background > 0) {
                 dest->button_background = src->button_background;
@@ -166,7 +173,7 @@ void swaynag_type_merge(struct swaynag_type *dest, struct swaynag_type *src) {
 
 void swaynag_type_free(struct swaynag_type *type) {
         free(type->name);
-        free(type->font);
+        pango_font_description_free(type->font_description);
         free(type->output);
         free(type);
 }