236 files changed, 7106 insertions, 7328 deletions

diff --git a/.builds/alpine.yml b/.builds/alpine.yml
index 324cf6ce..59df7737 100644
--- a/.builds/alpine.yml
+++ b/.builds/alpine.yml
@@ -4,6 +4,7 @@ packages:
   - eudev-dev
   - gdk-pixbuf-dev
   - json-c-dev
+  - libdisplay-info-dev
   - libevdev-dev
   - libinput-dev
   - libseat-dev
@@ -19,7 +20,8 @@ packages:
   - wayland-protocols
   - xcb-util-image-dev
   - xcb-util-wm-dev
-  - xwayland
+  - xwayland-dev
+  - hwdata-dev
 sources:
   - https://github.com/swaywm/sway
   - https://gitlab.freedesktop.org/wlroots/wlroots.git
diff --git a/.builds/archlinux.yml b/.builds/archlinux.yml
index ac5536e5..9972c01a 100644
--- a/.builds/archlinux.yml
+++ b/.builds/archlinux.yml
@@ -3,6 +3,7 @@ packages:
   - cairo
   - gdk-pixbuf2
   - json-c
+  - libdisplay-info
   - libegl
   - libinput
   - libxcb
@@ -17,6 +18,7 @@ packages:
   - xcb-util-wm
   - xorg-xwayland
   - seatd
+  - hwdata
 sources:
   - https://github.com/swaywm/sway
   - https://gitlab.freedesktop.org/wlroots/wlroots.git
diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml
index aa3007d8..29c6312a 100644
--- a/.builds/freebsd.yml
+++ b/.builds/freebsd.yml
@@ -20,11 +20,14 @@ 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://gitlab.freedesktop.org/wlroots/wlroots.git
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/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 059fda89..68b411d9 100644
--- a/README.de.md
+++ b/README.de.md
@@ -2,13 +2,13 @@
 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 [E88F5E48](https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48) 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
 
@@ -23,8 +23,8 @@ sway benötigt die folgenden Pakete:
 * 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 3a641295..5ce94cde 100644
--- a/README.dk.md
+++ b/README.dk.md
@@ -45,12 +45,6 @@ Kør følgende kommandoer:
     ninja -C build
     sudo ninja -C build install
 
-På systemer uden logind eller seatd skal du sætte SUID bit på sway filen:
-
-    sudo chmod a+s /usr/local/bin/sway
-
-Sway dropper 'root' tilladelser kort efter opstart.
-
 ## Konfiguration
 
 Hvis du allerede bruger i3 kan du bare kopiere din i3 konfiguration til
diff --git a/README.es.md b/README.es.md
index 5e598e1a..1f1657df 100644
--- a/README.es.md
+++ b/README.es.md
@@ -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 e99160e8..7752fc70 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -51,12 +51,6 @@ 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 vers
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
index f325cb88..d697f78e 100644
--- a/README.gr.md
+++ b/README.gr.md
@@ -44,12 +44,6 @@ _\*Compile-time dep_
     ninja -C build/
     sudo ninja -C build/ install
 
-Σε συστήματα χωρίς logind ή seatd, πρέπει να κάνετε suid το sway binary:
-
-    sudo chmod a+s /usr/local/bin/sway
-
-Το Sway θα κάνει drop root δικαιώματα λίγο μετά την εκκίνηση.
-
 ## Configuration
 
 Εάν ήδη χρησιμοποιήτε το i3, αντιγράψτε το i3 config σας στο `~/.config/sway/config` και
diff --git a/README.hi.md b/README.hi.md
index af64eada..eae5e90a 100644
--- a/README.hi.md
+++ b/README.hi.md
@@ -48,13 +48,6 @@ _\* Compilation के समय आवश्यक_
         ninja -C build/
         sudo ninja -C build/ install
 
-उन systems पर जिनमें ना तो logind है, ना ही seatd है, आपको sway की binary
-को suid करना पडेगा:
-
-        sudo chmod a+s /usr/local/bin/sway
-
-Sway अपनी root अनुमतियां प्रारंभ होने के कुछ ही देर बाद छोड़ देगी।
-
 ## Configuration
 
 अगर आप पहले से ही i3 का उपयोग करते हैं तो अपने i3 config को
diff --git a/README.hu.md b/README.hu.md
index 9e3bc9e1..82ca6785 100644
--- a/README.hu.md
+++ b/README.hu.md
@@ -44,13 +44,6 @@ Futtasd ezeket a parancsokat:
     ninja -C build
     sudo ninja -C build install
 
-Ha `logind` nélküli rendszert használsz, akkor be kell állítanod a `suid` bitet
-a futtaható állományon:
-
-    sudo chmod a+s /usr/local/bin/sway
-
-A Sway indulás után nem sokkal el fogja engedni a root jogosultságait.
-
 ## Konfiguráció
 
 Ha előzőleg i3-mat használtál, akkor átmásolhatod az i3 beállításaidat a
diff --git a/README.ir.md b/README.ir.md
index 64956a9e..a485a405 100644
--- a/README.ir.md
+++ b/README.ir.md
@@ -45,12 +45,6 @@ _\*نیازمندی‌های زمان کامپایل برنامه_
     ninja -C build
     sudo ninja -C build install
 
-روی سیستم‌های بدون logind، باید فرمان زیر را برای suid کردن باینری sway اجرا کنید:
-
-    sudo chmod a+s /usr/local/bin/sway
-
-&rlm;sway پس از startup مجوزهای دسترسی root را رها می‌کند.
-
 ### شخصی سازی و تنظیمات
 
 اگر در حال حاضر از i3 استفاده می‌کنید، تنظیمات i3 خودتان را در فایل ‪`~/.config/sway/config`‬ کپی کنید و بدون نیاز به تغییر کار خواهد کرد. در غیر این‌صورت، فایل نمونه تنظیمات را استفاده کنید. این فایل عموما در ‪`/etc/sway/config`‬ قرار دارد. برای آگاهی بیشتر `man 5 sway` را اجرا کنید.
diff --git a/README.it.md b/README.it.md
index b14b522d..82bb5783 100644
--- a/README.it.md
+++ b/README.it.md
@@ -42,13 +42,6 @@ Esegui questi comandi:
     ninja -C build/
     sudo ninja -C build/ install
 
-Nei sistemi in cui non sono disponibili né logind né seatd, è necessario
-impostare il permesso suid al binario di sway:
-
-    sudo chmod a+s /usr/local/bin/sway
-
-Sway rinuncerà ai permessi di root poco dopo l'avvio.
-
 ## Configurazione
 
 Se hai già usato i3, copia il tuo file di configurazione in
diff --git a/README.ja.md b/README.ja.md
index ece9ce48..4e9a9971 100644
--- a/README.ja.md
+++ b/README.ja.md
@@ -34,11 +34,11 @@ Swayは沢山のディストリビューションで提供されています。"
 * 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 7a1f4ce1..e086c174 100644
--- a/README.ko.md
+++ b/README.ko.md
@@ -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 27918868..15c7c099 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # sway
 
-**[English][en]** - [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]
+**[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.libera.chat).
@@ -31,7 +31,8 @@ Install dependencies:
 * 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) \*
 
@@ -43,12 +44,6 @@ Run these commands:
     ninja -C build/
     sudo ninja -C build/ install
 
-On systems without logind nor seatd, you need to suid the sway binary:
-
-    sudo chmod a+s /usr/local/bin/sway
-
-Sway will drop root permissions shortly after startup.
-
 ## Configuration
 
 If you already use i3, then copy your i3 config to `~/.config/sway/config` and
@@ -62,11 +57,13 @@ 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
+[ar]: README.ar.md
+[cs]: README.cs.md
 [de]: README.de.md
 [dk]: README.dk.md
 [es]: README.es.md
 [fr]: README.fr.md
-[sv]: README.sv.md
+[ge]: README.ge.md
 [gr]: README.gr.md
 [hi]: README.hi.md
 [hu]: README.hu.md
@@ -75,10 +72,12 @@ sway (gdm is known to work fairly well).
 [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
@@ -91,4 +90,5 @@ sway (gdm is known to work fairly well).
 [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
+[swaybg]: https://github.com/swaywm/swaybg/
 [scdoc]: https://git.sr.ht/~sircmpwn/scdoc
diff --git a/README.nl.md b/README.nl.md
index 8a344f03..bf1ea975 100644
--- a/README.nl.md
+++ b/README.nl.md
@@ -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 ab99abb1..65b3c3a1 100644
--- a/README.pl.md
+++ b/README.pl.md
@@ -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 b22948aa..c1611a31 100644
--- a/README.pt.md
+++ b/README.pt.md
@@ -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 4ce05093..a3559a8b 100644
--- a/README.ro.md
+++ b/README.ro.md
@@ -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 fb6f3344..edc0eda7 100644
--- a/README.ru.md
+++ b/README.ru.md
@@ -45,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`, и
diff --git a/README.sv.md b/README.sv.md
index 28724270..c50ca068 100644
--- a/README.sv.md
+++ b/README.sv.md
@@ -41,12 +41,6 @@ Kör dessa kommandon:
     ninja -C build/
     sudo ninja -C build/ install
 
-På system utan logind eller seatd måste du ge sways exekverbara fil root-privilegier:
-
-    sudo chmod a+s /usr/local/bin/sway
-
-Sway kommer att överge sina root-privilegier kort efter uppstart.
-
 ## 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.
diff --git a/README.tr.md b/README.tr.md
index e09d2eaf..40de1474 100644
--- a/README.tr.md
+++ b/README.tr.md
@@ -42,12 +42,6 @@ _\*Derleme-anı bağımlılıkları_
     ninja -C build
     sudo ninja -C build install
 
-logind olmayan sistemlerde, sway ikilisine (binary) izin vermeniz (suid) gerekir:
-
-    sudo chmod a+s /usr/local/bin/sway
-
-Sway, başlangıçtan kısa bir süre sonra kök(root) izinlerini bırakacaktır.
-
 ## 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.
diff --git a/README.uk.md b/README.uk.md
index d9adcd13..33359cff 100644
--- a/README.uk.md
+++ b/README.uk.md
@@ -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 b057bfb8..a6f4518a 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -39,12 +39,6 @@ _\*编译时依赖_
     ninja -C build/
     sudo ninja -C build/ install
 
-在没有logind或seatd的系统上, 你需要给sway二进制文件设置suid:
-
-    sudo chmod a+s /usr/local/bin/sway
-
-启动后，Sway会尽快放弃root权限。
-
 ## 配置
 
 如果你已经在使用i3，直接复制i3配置文件到 `~/.config/sway/config`，这是开箱即用的。或者，你可以复制配置样例到`~/.config/sway/config`。它通常位于 `/etc/sway/config`。
diff --git a/README.zh-TW.md b/README.zh-TW.md
index a7168244..2de2f63f 100644
--- a/README.zh-TW.md
+++ b/README.zh-TW.md
@@ -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 ea31edd3..c47c40eb 100644
--- a/client/pool-buffer.c
+++ b/client/pool-buffer.c
@@ -1,50 +1,42 @@
-#define _POSIX_C_SOURCE 200809
 #include <assert.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 +54,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/gesture.c b/common/gesture.c
index 8c2efe99..272aa837 100644
--- a/common/gesture.c
+++ b/common/gesture.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include "gesture.h"
 
 #include <math.h>
@@ -12,23 +11,6 @@
 
 const uint8_t GESTURE_FINGERS_ANY = 0;
 
-// Helper to easily allocate and format string
-static char *strformat(const char *format, ...) {
-        va_list args;
-        va_start(args, format);
-        int length = vsnprintf(NULL, 0, format, args) + 1;
-        va_end(args);
-
-        char *result = malloc(length);
-        if (result) {
-                va_start(args, format);
-                vsnprintf(result, length, format, args);
-                va_end(args);
-        }
-
-        return result;
-}
-
 char *gesture_parse(const char *input, struct gesture *output) {
         // Clear output in case of failure
         output->type = GESTURE_TYPE_NONE;
@@ -38,7 +20,7 @@ char *gesture_parse(const char *input, struct gesture *output) {
         // Split input type, fingers and directions
         list_t *split = split_string(input, ":");
         if (split->length < 1 || split->length > 3) {
-                return strformat(
+                return format_str(
                                 "expected <gesture>[:<fingers>][:direction], got %s",
                                 input);
         }
@@ -51,8 +33,8 @@ char *gesture_parse(const char *input, struct gesture *output) {
         } else if (strcmp(split->items[0], "swipe") == 0) {
                 output->type = GESTURE_TYPE_SWIPE;
         } else {
-                return strformat("expected hold|pinch|swipe, got %s",
-                                split->items[0]);
+                return format_str("expected hold|pinch|swipe, got %s",
+                                (const char *)split->items[0]);
         }
 
         // Parse optional arguments
@@ -67,7 +49,7 @@ char *gesture_parse(const char *input, struct gesture *output) {
                         next = split->length == 3 ? split->items[2] : NULL;
                 } else if (split->length == 3) {
                         // Fail here if argument can only be finger count
-                        return strformat("expected 1-9, got %s", next);
+                        return format_str("expected 1-9, got %s", next);
                 }
 
                 // If there is an argument left, try to parse as direction
@@ -95,7 +77,7 @@ char *gesture_parse(const char *input, struct gesture *output) {
                                 } else if (strcmp(item, "counterclockwise") == 0) {
                                         output->directions |= GESTURE_DIRECTION_COUNTERCLOCKWISE;
                                 } else {
-                                        return strformat("expected direction, got %s", item);
+                                        return format_str("expected direction, got %s", item);
                                 }
                         }
                         list_free_items_and_destroy(directions);
@@ -163,7 +145,7 @@ static char *gesture_directions_to_string(uint32_t directions) {
                         if (!result) {
                                 result = strdup(name);
                         } else {
-                                char *new = strformat("%s+%s", result, name);
+                                char *new = format_str("%s+%s", result, name);
                                 free(result);
                                 result = new;
                         }
@@ -179,7 +161,7 @@ static char *gesture_directions_to_string(uint32_t directions) {
 
 char *gesture_to_string(struct gesture *gesture) {
         char *directions = gesture_directions_to_string(gesture->directions);
-        char *result = strformat("%s:%u:%s",
+        char *result = format_str("%s:%u:%s",
                 gesture_type_string(gesture->type),
                 gesture->fingers, directions);
         free(directions);
diff --git a/common/ipc-client.c b/common/ipc-client.c
index d30212d2..a0be2b2d 100644
--- a/common/ipc-client.c
+++ b/common/ipc-client.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/common/log.c b/common/log.c
index 483420e7..3eacdb34 100644
--- a/common/log.c
+++ b/common/log.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200112L
 #include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/common/loop.c b/common/loop.c
index 80fe18ea..b99c6d55 100644
--- a/common/loop.c
+++ b/common/loop.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200112L
 #include <limits.h>
 #include <string.h>
 #include <stdbool.h>
diff --git a/common/meson.build b/common/meson.build
index 3756075a..c0ce1f68 100644
--- a/common/meson.build
+++ b/common/meson.build
@@ -1,7 +1,6 @@
 lib_sway_common = static_library(
         'sway-common',
         files(
-                'background-image.c',
                 'cairo.c',
                 'gesture.c',
                 'ipc-client.c',
@@ -14,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 e04bf80f..288569b3 100644
--- a/common/pango.c
+++ b/common/pango.c
@@ -84,18 +84,11 @@ void get_text_size(cairo_t *cairo, const PangoFontDescription *desc, int *width,
                 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, desc, buf, scale, markup);
         pango_cairo_update_layout(cairo, layout);
@@ -104,6 +97,7 @@ void get_text_size(cairo_t *cairo, const PangoFontDescription *desc, int *width,
                 *baseline = pango_layout_get_baseline(layout) / PANGO_SCALE;
         }
         g_object_unref(layout);
+
         free(buf);
 }
 
@@ -125,18 +119,11 @@ 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, desc, buf, scale, markup);
         cairo_font_options_t *fo = cairo_font_options_create();
@@ -146,5 +133,6 @@ void render_text(cairo_t *cairo, const PangoFontDescription *desc,
         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..16d04917 100644
--- a/common/stringop.c
+++ b/common/stringop.c
@@ -1,5 +1,5 @@
-#define _POSIX_C_SOURCE 200809L
 #include <ctype.h>
+#include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -328,3 +328,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 5d4c0673..7c492bcb 100644
--- a/common/util.c
+++ b/common/util.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <ctype.h>
 #include <fcntl.h>
 #include <math.h>
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 3eda7ac7..a5173165 100644
--- a/config.in
+++ b/config.in
@@ -18,7 +18,7 @@ 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
 #
@@ -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 %I:%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/autoname-workspaces.py b/contrib/autoname-workspaces.py
deleted file mode 100755
index 3ec39928..00000000
--- a/contrib/autoname-workspaces.py
+++ /dev/null
@@ -1,124 +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):
-    name = None
-    if window.app_id is not None and len(window.app_id) > 0:
-        name = window.app_id.lower()
-    elif window.window_class is not None and len(window.window_class) > 0:
-        name =  window.window_class.lower()
-
-    if name in WINDOW_ICONS:
-        return WINDOW_ICONS[name]
-
-    logging.info("No icon available for window with name: %s" % str(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 1ec19def..00000000
--- a/contrib/grimshot
+++ /dev/null
@@ -1,168 +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:-$HOME/.config}/user-dirs.dirs" && \
-    . "${XDG_CONFIG_HOME:-$HOME/.config}/user-dirs.dirs"
-
-  echo "${XDG_SCREENSHOTS_DIR:-${XDG_PICTURES_DIR:-$HOME}}"
-}
-
-NOTIFY=no
-CURSOR=
-
-while [ $# -gt 0 ]; do
-  key="$1"
-
-  case $key in
-    -n|--notify)
-      NOTIFY=yes
-      shift # past argument
-      ;;
-    -c|--cursor)
-      CURSOR=yes
-      shift # past argument
-      ;;
-    *)    # unknown option
-      break # done with parsing --flags
-      ;;
-  esac
-done
-
-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] [--cursor] (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 or '-' to pipe to STDOUT."
-  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 [ -n "$OUTPUT" ]; then
-    grim ${CURSOR:+-c} -o "$OUTPUT" "$FILE" || die "Unable to invoke grim"
-  elif [ -z "$GEOM" ]; then
-    grim ${CURSOR:+-c} "$FILE" || die "Unable to invoke grim"
-  else
-    grim ${CURSOR:+-c} -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 1
-  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 1
-  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 2c4c6a95..00000000
--- a/contrib/grimshot.1
+++ /dev/null
@@ -1,109 +0,0 @@
-.\" Generated by scdoc 1.11.2
-.\" 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" "2022-03-31"
-.P
-.SH NAME
-.P
-grimshot - a helper for screenshots within sway
-.P
-.SH SYNOPSIS
-.P
-\fBgrimshot\fR [--notify] [--cursor] (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
-\fB--cursor\fR
-.RS 4
-Include cursors in the screenshot.\&
-.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.\&
-Set FILE to '\&-'\& to pipe the output to STDOUT.\&
-.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 e356f99d..00000000
--- a/contrib/grimshot.1.scd
+++ /dev/null
@@ -1,80 +0,0 @@
-grimshot(1)
-
-# NAME
-
-grimshot - a helper for screenshots within sway
-
-# SYNOPSIS
-
-*grimshot* [--notify] [--cursor] (copy|save) [TARGET] [FILE]++
-*grimshot* check++
-*grimshot* usage
-
-# OPTIONS
-
-*--notify*
-        Show notifications to the user that a screenshot has been taken.
-
-*--cursor*
-        Include cursors in the screenshot.
-
-*save*
-        Save the screenshot into a regular file. Grimshot will write image
-        files to *XDG_SCREENSHOTS_DIR* if this is set (or defined
-        in *user-dirs.dir*), or otherwise fall back to *XDG_PICTURES_DIR*.
-        Set FILE to '-' to pipe the output to STDOUT.
-
-*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 b81134dd..00000000
--- a/contrib/inactive-windows-transparency.py
+++ /dev/null
@@ -1,69 +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_workspace = ipc.get_tree().find_focused()
-
-    if focused_workspace == None:
-        return
-
-    focused = event.container
-    workspace = focused_workspace.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 a97ef375..00000000
--- a/include/background-image.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _SWAY_BACKGROUND_IMAGE_H
-#define _SWAY_BACKGROUND_IMAGE_H
-#include "cairo_util.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/pango.h b/include/pango.h
index 1db113c2..228e39cf 100644
--- a/include/pango.h
+++ b/include/pango.h
@@ -5,6 +5,7 @@
 #include <stdint.h>
 #include <cairo.h>
 #include <pango/pangocairo.h>
+#include "stringop.h"
 
 /**
  * Utility function which escape characters a & < > ' ".
@@ -16,9 +17,9 @@ size_t escape_markup_text(const char *src, char *dest);
 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 PangoFontDescription *desc, int *width, int *height,
-                int *baseline, double scale, bool markup, const char *fmt, ...);
+                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, ...);
+                double scale, bool markup, const char *fmt, ...) _SWAY_ATTRIB_PRINTF(5, 6);
 
 #endif
diff --git a/include/stringop.h b/include/stringop.h
index b29f59b2..19a50f23 100644
--- a/include/stringop.h
+++ b/include/stringop.h
@@ -5,6 +5,12 @@
 #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);
 
@@ -31,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 013a7b82..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,7 +47,7 @@ enum expected_args {
 struct cmd_results *checkarg(int argc, const char *name,
                 enum expected_args type, int val);
 
-const struct cmd_handler *find_handler(char *line,
+const struct cmd_handler *find_handler(const char *line,
                 const struct cmd_handler *cmd_handlers, size_t handlers_size);
 
 /**
@@ -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.
  */
@@ -159,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;
@@ -252,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;
@@ -260,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;
@@ -294,6 +297,7 @@ 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 68c06846..0be1cd22 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -12,6 +12,7 @@
 #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"
@@ -150,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;
@@ -288,6 +292,14 @@ struct output_config {
 };
 
 /**
+ * An output config pre-matched to an output
+ */
+struct matched_output_config {
+        struct sway_output *output;
+        struct output_config *config;
+};
+
+/**
  * Stores size of gaps for each side
  */
 struct side_gaps {
@@ -529,6 +541,7 @@ 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;
@@ -622,7 +635,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,20 +688,22 @@ const char *sway_output_scale_filter_to_string(enum scale_filter_mode scale_filt
 
 struct output_config *new_output_config(const char *name);
 
-void merge_output_config(struct output_config *dst, struct output_config *src);
-
-bool apply_output_config(struct output_config *oc, struct sway_output *output);
+bool apply_output_configs(struct matched_output_config *configs,
+                size_t configs_len, bool test_only);
 
-bool test_output_config(struct output_config *oc, struct sway_output *output);
+void apply_all_output_configs(void);
 
-struct output_config *store_output_config(struct output_config *oc);
+/**
+ * store_output_config stores a new output config. An output may be matched by
+ * three different config types, in order of precedence: Identifier, name and
+ * wildcard. When storing a config type of lower precedence, assume that the
+ * user wants the config to take immediate effect by superseding (clearing) the
+ * same values from higher presedence configuration.
+ */
+void store_output_config(struct output_config *oc);
 
 struct output_config *find_output_config(struct sway_output *output);
 
-void apply_output_config_to_outputs(struct output_config *oc);
-
-void reset_outputs(void);
-
 void free_output_config(struct output_config *oc);
 
 bool spawn_swaybg(void);
@@ -718,7 +733,7 @@ void free_workspace_config(struct workspace_config *wsc);
 /**
  * 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.
  */
diff --git a/include/sway/criteria.h b/include/sway/criteria.h
index 59f57f94..8da345ea 100644
--- a/include/sway/criteria.h
+++ b/include/sway/criteria.h
@@ -43,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 7f2f5b3e..00000000
--- a/include/sway/desktop.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <wlr/types/wlr_compositor.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 58d54c68..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,9 @@ 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;
@@ -33,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);
@@ -48,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..412068a9
--- /dev/null
+++ b/include/sway/desktop/launcher.h
@@ -0,0 +1,40 @@
+#ifndef _SWAY_LAUNCHER_H
+#define _SWAY_LAUNCHER_H
+
+#include <stdlib.h>
+#include <wayland-server-core.h>
+#include "sway/input/seat.h"
+
+struct launcher_ctx {
+        pid_t pid;
+        char *fallback_name;
+        struct wlr_xdg_activation_token_v1 *token;
+        struct wl_listener token_destroy;
+        struct sway_seat *seat;
+        struct wl_listener seat_destroy;
+
+        bool activated;
+        bool had_focused_surface;
+
+        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 7dd58ba8..dd7edb7a 100644
--- a/include/sway/desktop/transaction.h
+++ b/include/sway/desktop/transaction.h
@@ -1,6 +1,8 @@
 #ifndef _SWAY_TRANSACTION_H
 #define _SWAY_TRANSACTION_H
 #include <stdint.h>
+#include <stdbool.h>
+#include <wlr/types/wlr_scene.h>
 
 /**
  * Transactions enable us to perform atomic layout updates.
@@ -38,8 +40,11 @@ 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);
 
 /**
@@ -47,8 +52,13 @@ 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);
 
+void arrange_popups(struct wlr_scene_tree *popups);
+
 #endif
diff --git a/include/sway/input/cursor.h b/include/sway/input/cursor.h
index 8a2898dd..527d0350 100644
--- a/include/sway/input/cursor.h
+++ b/include/sway/input/cursor.h
@@ -35,7 +35,6 @@ 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;
@@ -53,6 +52,7 @@ 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;
@@ -64,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;
@@ -107,9 +108,13 @@ 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);
+        enum wl_pointer_button_state state);
 
 void dispatch_cursor_axis(struct sway_cursor *cursor,
                 struct wlr_pointer_axis_event *event);
@@ -140,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..45c75199 100644
--- a/include/sway/input/input-manager.h
+++ b/include/sway/input/input-manager.h
@@ -1,10 +1,10 @@
 #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>
+#include <wlr/types/wlr_transient_seat_v1.h>
 #include "sway/server.h"
 #include "sway/config.h"
 #include "list.h"
@@ -21,10 +21,11 @@ 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 wlr_transient_seat_manager_v1 *transient_seat_manager;
 
         struct wl_listener new_input;
         struct wl_listener inhibit_activate;
@@ -32,6 +33,7 @@ struct sway_input_manager {
         struct wl_listener keyboard_shortcuts_inhibit_new_inhibitor;
         struct wl_listener virtual_keyboard_new;
         struct wl_listener virtual_pointer_new;
+        struct wl_listener transient_seat_create;
 };
 
 struct sway_input_manager *input_manager_create(struct sway_server *server);
@@ -44,7 +46,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/libinput.h b/include/sway/input/libinput.h
index 890d632e..1f84a8e3 100644
--- a/include/sway/input/libinput.h
+++ b/include/sway/input/libinput.h
@@ -2,7 +2,10 @@
 #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);
 
diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
index c2041742..428f9679 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"
@@ -15,7 +17,7 @@ struct sway_seat;
 struct sway_seatop_impl {
         void (*button)(struct sway_seat *seat, uint32_t time_msec,
                         struct wlr_input_device *device, uint32_t button,
-                        enum wlr_button_state state);
+                        enum wl_pointer_button_state state);
         void (*pointer_motion)(struct sway_seat *seat, uint32_t time_msec);
         void (*pointer_axis)(struct sway_seat *seat,
                         struct wlr_pointer_axis_event *event);
@@ -36,14 +38,20 @@ struct sway_seatop_impl {
         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;
 };
 
@@ -66,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;
@@ -89,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;
@@ -122,6 +124,7 @@ struct sway_seat {
         struct wl_listener start_drag;
         struct wl_listener request_set_selection;
         struct wl_listener request_set_primary_selection;
+        struct wl_listener destroy;
 
         struct wl_list devices; // sway_seat_device::link
         struct wl_list keyboard_groups; // sway_keyboard_group::link
@@ -157,6 +160,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);
 
@@ -187,8 +193,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);
 
@@ -201,10 +206,6 @@ struct sway_workspace *seat_get_last_known_workspace(struct sway_seat *seat);
 
 struct sway_container *seat_get_focused_container(struct sway_seat *seat);
 
-// Force focus to a particular surface that is not part of the workspace
-// hierarchy (used for lockscreen)
-void sway_force_focus(struct wlr_surface *surface);
-
 /**
  * Return the last container to be focused for the seat (or the most recently
  * opened if no container has received focused) that is a child of the given
@@ -251,7 +252,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);
@@ -259,10 +260,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, double sx, double sy);
+                double sx, double sy);
 
 void seatop_begin_down_on_surface(struct sway_seat *seat,
-                struct wlr_surface *surface, uint32_t time_msec, double sx, double sy);
+                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);
@@ -283,13 +287,13 @@ struct sway_container *seat_get_focus_inactive_floating(struct sway_seat *seat,
                 struct sway_workspace *workspace);
 
 void seat_pointer_notify_button(struct sway_seat *seat, uint32_t time_msec,
-                uint32_t button, enum wlr_button_state state);
+                uint32_t button, enum wl_pointer_button_state state);
 
 void seat_consider_warp_to_focus(struct sway_seat *seat);
 
 void seatop_button(struct sway_seat *seat, uint32_t time_msec,
                 struct wlr_input_device *device, uint32_t button,
-                enum wlr_button_state state);
+                enum wl_pointer_button_state state);
 
 void seatop_pointer_motion(struct sway_seat *seat, uint32_t time_msec);
 
@@ -322,6 +326,18 @@ void seatop_swipe_update(struct sway_seat *seat,
 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);
 
 /**
@@ -336,13 +352,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/tablet.h b/include/sway/input/tablet.h
index c0a5aff7..2fa5db6d 100644
--- a/include/sway/input/tablet.h
+++ b/include/sway/input/tablet.h
@@ -63,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 c70fd935..1993f928 100644
--- a/include/sway/input/text_input.h
+++ b/include/sway/input/text_input.h
@@ -4,12 +4,11 @@
 #include <wlr/types/wlr_text_input_v3.h>
 #include <wlr/types/wlr_input_method_v2.h>
 #include <wlr/types/wlr_compositor.h>
-#include "sway/input/seat.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.
@@ -22,18 +21,21 @@ struct sway_input_method_relay {
         struct sway_seat *seat;
 
         struct wl_list text_inputs; // sway_text_input::link
+        struct wl_list input_popups; // sway_input_popup::link
         struct wlr_input_method_v2 *input_method; // doesn't have to be present
 
         struct wl_listener text_input_new;
 
         struct wl_listener input_method_new;
         struct wl_listener input_method_commit;
+        struct wl_listener input_method_new_popup_surface;
         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 {
         struct sway_input_method_relay *relay;
 
diff --git a/include/sway/input/text_input_popup.h b/include/sway/input/text_input_popup.h
new file mode 100644
index 00000000..e5f6ab8b
--- /dev/null
+++ b/include/sway/input/text_input_popup.h
@@ -0,0 +1,20 @@
+#ifndef _SWAY_INPUT_TEXT_INPUT_POPUP_H
+#define _SWAY_INPUT_TEXT_INPUT_POPUP_H
+
+#include "sway/tree/view.h"
+
+struct sway_input_popup {
+        struct sway_input_method_relay *relay;
+
+        struct wlr_scene_tree *scene_tree;
+        struct sway_popup_desc desc;
+        struct wlr_input_popup_surface_v2 *popup_surface;
+
+        struct wl_list link;
+
+        struct wl_listener popup_destroy;
+        struct wl_listener popup_surface_commit;
+
+        struct wl_listener focused_surface_unmap;
+};
+#endif
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 f8508493..fd6384e0 100644
--- a/include/sway/layers.h
+++ b/include/sway/layers.h
@@ -3,61 +3,42 @@
 #include <stdbool.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_layer_shell_v1.h>
-
-enum layer_parent {
-        LAYER_PARENT_LAYER,
-        LAYER_PARENT_POPUP,
-};
+#include "sway/tree/view.h"
 
 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;
         bool mapped;
-        struct wlr_box extent;
-        enum zwlr_layer_shell_v1_layer layer;
 
-        struct wl_list subsurfaces;
+        struct wlr_scene_tree *popups;
+        struct sway_popup_desc desc;
+
+        struct sway_output *output;
+        struct wlr_scene_layer_surface_v1 *scene;
+        struct wlr_scene_tree *tree;
+        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_list link;
-
-        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 6d8319bf..d546d488 100644
--- a/include/sway/output.h
+++ b/include/sway/output.h
@@ -3,7 +3,9 @@
 #include <time.h>
 #include <unistd.h>
 #include <wayland-server-core.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"
@@ -18,34 +20,47 @@ 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 powered off
-        struct wlr_output_mode *current_mode;
 
-        bool enabling, enabled;
+        bool 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 disable;
@@ -55,6 +70,13 @@ struct sway_output {
         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);
@@ -75,18 +97,8 @@ 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);
@@ -100,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);
 
@@ -158,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);
@@ -177,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 4cce17cc..c71851f6 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -2,45 +2,41 @@
 #define _SWAY_SERVER_H
 #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_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;
 
@@ -50,15 +46,16 @@ struct sway_server {
 
         struct wl_listener new_output;
         struct wl_listener output_layout_change;
+        struct wl_listener renderer_lost;
 
-        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;
 
@@ -81,8 +78,6 @@ struct sway_server {
         struct wlr_drm_lease_v1_manager *drm_lease_manager;
         struct wl_listener drm_lease_request;
 
-        struct wlr_presentation *presentation;
-
         struct wlr_pointer_constraints_v1 *pointer_constraints;
         struct wl_listener pointer_constraint;
 
@@ -90,15 +85,13 @@ 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 {
-                bool locked;
+                struct sway_session_lock *lock;
                 struct wlr_session_lock_manager_v1 *manager;
 
-                struct wlr_session_lock_v1 *lock;
-                struct wl_listener lock_new_surface;
-                struct wl_listener lock_unlock;
-                struct wl_listener lock_destroy;
-
                 struct wl_listener new_lock;
                 struct wl_listener manager_destroy;
         } session_lock;
@@ -107,10 +100,21 @@ struct sway_server {
         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_ext_foreign_toplevel_list_v1 *foreign_toplevel_list;
         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.
@@ -137,17 +141,13 @@ 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
-        bool noscanout;        // Disable direct scan-out
-
-        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;
 
+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);
@@ -155,13 +155,16 @@ void server_run(struct sway_server *server);
 
 void restore_nofile_limit(void);
 
-void handle_compositor_new_surface(struct wl_listener *listener, void *data);
 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 sway_session_lock_init(void);
-void handle_xdg_shell_surface(struct wl_listener *listener, void *data);
+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
@@ -170,6 +173,8 @@ 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);
 
diff --git a/include/sway/surface.h b/include/sway/surface.h
deleted file mode 100644
index fb1cd775..00000000
--- a/include/sway/surface.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef _SWAY_SURFACE_H
-#define _SWAY_SURFACE_H
-#include <wlr/types/wlr_compositor.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 751612e2..93f6bfbb 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -3,6 +3,7 @@
 #include <stdint.h>
 #include <sys/types.h>
 #include <wlr/types/wlr_compositor.h>
+#include <wlr/types/wlr_scene.h>
 #include "list.h"
 #include "sway/tree/node.h"
 
@@ -68,11 +69,39 @@ struct sway_container {
         struct sway_node node;
         struct sway_view *view;
 
+        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 prev_split_layout;
 
@@ -100,33 +129,19 @@ struct sway_container {
         double child_total_width;
         double child_total_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;
-
-        // 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_focused_tab_title;
-        struct wlr_texture *title_unfocused;
-        struct wlr_texture *title_urgent;
+        float alpha;
 
         list_t *marks; // char *
-        struct wlr_texture *marks_focused;
-        struct wlr_texture *marks_focused_inactive;
-        struct wlr_texture *marks_focused_tab_title;
-        struct wlr_texture *marks_unfocused;
-        struct wlr_texture *marks_urgent;
 
         struct {
                 struct wl_signal destroy;
@@ -146,19 +161,6 @@ 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);
 
@@ -175,13 +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);
+
+void container_update_marks(struct sway_container *container);
 
 size_t container_build_representation(enum sway_container_layout layout,
                 list_t *children, char *buffer);
@@ -196,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);
@@ -215,11 +220,6 @@ void container_set_geometry_from_content(struct sway_container *con);
 bool container_is_floating(struct sway_container *container);
 
 /**
- * Same as above, but for current container state.
- */
-bool container_is_current_floating(struct sway_container *container);
-
-/**
  * Get a container's box in layout coordinates.
  */
 void container_get_box(struct sway_container *container, struct wlr_box *box);
@@ -281,26 +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.
- * If the container is not on any output, return NULL.
- */
-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,
@@ -348,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);
@@ -373,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 5d4a2f2d..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,6 +63,7 @@ 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
@@ -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 0dcbf1aa..7faacdcc 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -2,7 +2,8 @@
 #define _SWAY_VIEW_H
 #include <wayland-server-core.h>
 #include <wlr/types/wlr_compositor.h>
-#include "config.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,15 +80,11 @@ 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_ext_foreign_toplevel_handle_v1 *ext_foreign_toplevel;
 
         struct wlr_foreign_toplevel_handle_v1 *foreign_toplevel;
         struct wl_listener foreign_activate_request;
@@ -118,8 +107,6 @@ struct sway_view {
                 struct wl_signal unmap;
         } events;
 
-        struct wl_listener surface_new_subsurface;
-
         int max_render_time; // In milliseconds
 
         enum seat_config_shortcuts_inhibit shortcuts_inhibit;
@@ -144,6 +131,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;
@@ -155,72 +144,55 @@ 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_view_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_popup_desc {
+        struct wlr_scene_node *relative;
         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_scene_tree *scene_tree;
+        struct wlr_scene_tree *xdg_surface_tree;
         struct wlr_xdg_popup *wlr_xdg_popup;
 
+        struct sway_popup_desc desc;
+
+        struct wl_listener surface_commit;
         struct wl_listener new_popup;
+        struct wl_listener reposition;
         struct wl_listener destroy;
 };
 
@@ -269,7 +241,12 @@ 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);
+
+/*
+ * Called when the view requests urgent state
+ */
+void view_request_urgent(struct sway_view *view);
 
 /**
  * If possible, instructs the client to change their decoration mode.
@@ -288,23 +265,9 @@ 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);
@@ -326,14 +289,7 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
 void view_unmap(struct sway_view *view);
 
 void view_update_size(struct sway_view *view);
-void view_center_surface(struct sway_view *view);
-
-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_center_and_clip_surface(struct sway_view *view);
 
 struct sway_view *view_from_wlr_xdg_surface(
         struct wlr_xdg_surface *xdg_surface);
@@ -343,6 +299,8 @@ struct sway_view *view_from_wlr_xwayland_surface(
 #endif
 struct sway_view *view_from_wlr_surface(struct wlr_surface *surface);
 
+void view_update_app_id(struct sway_view *view);
+
 /**
  * Re-read the view's title property and update any relevant title bars.
  * The force argument makes it recreate the title bars even if the title hasn't
@@ -372,4 +330,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 b3d93a81..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;
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 3ad0bdf3..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;
diff --git a/include/swaybar/i3bar.h b/include/swaybar/i3bar.h
index 1aec6d6c..dced2a6c 100644
--- a/include/swaybar/i3bar.h
+++ b/include/swaybar/i3bar.h
@@ -30,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 2d68b6c9..fb9e9c21 100644
--- a/include/swaynag/swaynag.h
+++ b/include/swaynag/swaynag.h
@@ -4,6 +4,8 @@
 #include <strings.h>
 #include "list.h"
 #include "pool-buffer.h"
+#include "cursor-shape-v1-client-protocol.h"
+
 #include "swaynag/types.h"
 
 #define SWAYNAG_MAX_HEIGHT 500
@@ -58,6 +60,7 @@ struct swaynag_button {
 struct swaynag_details {
         bool visible;
         char *message;
+        char *details_text;
 
         int x;
         int y;
@@ -67,7 +70,7 @@ struct swaynag_details {
         int offset;
         int visible_lines;
         int total_lines;
-        struct swaynag_button button_details;
+        struct swaynag_button *button_details;
         struct swaynag_button button_up;
         struct swaynag_button button_down;
 };
@@ -84,6 +87,7 @@ struct swaynag {
         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 18f218e0..9c3c50db 100644
--- a/include/swaynag/types.h
+++ b/include/swaynag/types.h
@@ -1,10 +1,13 @@
 #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; // Used for debugging.
         PangoFontDescription *font_description;
         char *output;
         uint32_t anchors;
diff --git a/meson.build b/meson.build
index d23300be..1043e4ba 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project(
         'sway',
         'c',
-        version: '1.8-dev',
+        version: '1.10-dev',
         license: 'MIT',
         meson_version: '>=0.60.0',
         default_options: [
@@ -14,10 +14,12 @@ project(
 add_project_arguments(
         [
                 '-DWLR_USE_UNSTABLE',
+                '-D_POSIX_C_SOURCE=200809L',
 
                 '-Wno-unused-parameter',
                 '-Wno-unused-result',
                 '-Wno-missing-braces',
+                '-Wno-format-zero-length',
                 '-Wundef',
                 '-Wvla',
         ],
@@ -36,55 +38,54 @@ if is_freebsd
 endif
 
 # Execute the wlroots subproject, if any
-wlroots_version = ['>=0.16.0', '<0.17.0']
+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,
+        'libinput_backend': false,
+        'session': false,
+}
+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
+
+null_dep = dependency('', required: false)
 
 jsonc = dependency('json-c', version: '>=0.13')
 pcre2 = dependency('libpcre2-8')
-wayland_server = dependency('wayland-server', version: '>=1.20.0')
+wayland_server = dependency('wayland-server', version: '>=1.21.0')
 wayland_client = dependency('wayland-client')
 wayland_cursor = dependency('wayland-cursor')
-wayland_egl = dependency('wayland-egl')
 wayland_protos = dependency('wayland-protocols', version: '>=1.24')
-wlroots = dependency('wlroots', version: wlroots_version)
-xkbcommon = dependency('xkbcommon')
+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')
-glesv2 = dependency('glesv2')
 libevdev = dependency('libevdev')
-libinput = dependency('libinput', version: '>=1.6.0')
+libinput = wlroots_features['libinput_backend'] ? dependency('libinput', version: '>=1.21.0') : null_dep
 xcb = dependency('xcb', required: get_option('xwayland'))
-drm_full = dependency('libdrm') # only needed for drm_fourcc.h
-drm = drm_full.partial_dependency(compile_args: true, includes: true)
-libudev = dependency('libudev')
-bash_comp = dependency('bash-completion', required: false)
-fish_comp = dependency('fish', required: false)
+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
 
-wlroots_features = {
-        'xwayland': false,
-}
-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']
+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()
@@ -115,6 +116,11 @@ 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()
@@ -262,59 +268,7 @@ 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/swaymsg',
-        )
-
-        if get_option('swaybar')
-                bash_files += files('completions/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_files = files(
-                'completions/fish/sway.fish',
-                'completions/fish/swaymsg.fish',
-        )
-
-        if get_option('swaynag')
-                fish_files += files('completions/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
+subdir('completions')
 
 summary({
         'xwayland': have_xwayland,
@@ -322,4 +276,3 @@ summary({
         'tray': have_tray,
         'man-pages': scdoc.found(),
 }, bool_yn: true)
-
diff --git a/meson_options.txt b/meson_options.txt
index 6ba67554..8d0d6509 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -6,6 +6,6 @@ option('swaybar', type: 'boolean', value: true, description: 'Enable support for
 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 df24a4e5..81edb584 100644
--- a/protocols/meson.build
+++ b/protocols/meson.build
@@ -1,81 +1,43 @@
 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_variable(pkgconfig: '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'],
-        [wl_protocol_dir, 'unstable/linux-dmabuf/linux-dmabuf-unstable-v1.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/release.sh b/release.sh
new file mode 100755
index 00000000..62baf415
--- /dev/null
+++ b/release.sh
@@ -0,0 +1,31 @@
+#!/bin/sh -eu
+
+prev=$(git describe --tags --abbrev=0)
+next=$(meson rewrite kwargs info project / 2>&1 >/dev/null | jq -r '.kwargs["project#/"].version')
+
+case "$next" in
+*-dev)
+        echo "This is a development version"
+        exit 1
+        ;;
+esac
+
+if [ "$prev" = "$next" ]; then
+        echo "Version not bumped in meson.build"
+        exit 1
+fi
+
+if ! git diff-index --quiet HEAD -- meson.build; then
+        echo "meson.build not committed"
+        exit 1
+fi
+
+shortlog="$(git shortlog --no-merges "$prev..")"
+(echo "sway $next"; echo ""; echo "$shortlog") | git tag "$next" -ase -F -
+
+prefix=sway-$next
+archive=$prefix.tar.gz
+git archive --prefix="$prefix/" -o "$archive" "$next"
+gpg --output "$archive".sig --detach-sig "$archive"
+
+gh release create "sway $next" -t "$next" -n "" -d "$archive" "$archive.sig"
diff --git a/sway/commands.c b/sway/commands.c
index 2160a970..8d003dfa 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdlib.h>
@@ -104,6 +103,7 @@ static const struct cmd_handler handlers[] = {
 static const struct cmd_handler config_handlers[] = {
         { "default_orientation", cmd_default_orientation },
         { "include", cmd_include },
+        { "primary_selection", cmd_primary_selection },
         { "swaybg_command", cmd_swaybg_command },
         { "swaynag_command", cmd_swaynag_command },
         { "workspace_layout", cmd_workspace_layout },
@@ -147,7 +147,7 @@ static int handler_compare(const void *_a, const void *_b) {
         return strcasecmp(a->command, b->command);
 }
 
-const struct cmd_handler *find_handler(char *line,
+const struct cmd_handler *find_handler(const char *line,
                 const struct cmd_handler *handlers, size_t handlers_size) {
         if (!handlers || !handlers_size) {
                 return NULL;
@@ -380,10 +380,13 @@ struct cmd_results *config_command(char *exec, char **new_block) {
         sway_log(SWAY_INFO, "Config command: %s", exec);
         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;
         }
 
@@ -485,20 +488,10 @@ struct cmd_results *cmd_results_new(enum cmd_status status,
         }
         results->status = status;
         if (format) {
-                char *error = NULL;
                 va_list args;
                 va_start(args, format);
-                int slen = vsnprintf(NULL, 0, format, args);
+                results->error = vformat_str(format, args);
                 va_end(args);
-                if (slen > 0) {
-                        error = malloc(slen + 1);
-                        if (error != NULL) {
-                                va_start(args, format);
-                                vsnprintf(error, slen + 1, 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..bf95cf00 100644
--- a/sway/commands/assign.c
+++ b/sway/commands/assign.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdio.h>
 #include <string.h>
 #include "sway/commands.h"
@@ -17,7 +16,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 8571d282..635e895b 100644
--- a/sway/commands/bar.c
+++ b/sway/commands/bar.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809
 #include <stdio.h>
 #include <string.h>
 #include <strings.h>
@@ -73,12 +72,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])) {
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/font.c b/sway/commands/bar/font.c
index 891c87af..0c074679 100644
--- a/sway/commands/bar/font.c
+++ b/sway/commands/bar/font.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "log.h"
diff --git a/sway/commands/bar/hidden_state.c b/sway/commands/bar/hidden_state.c
index 8b661e3a..7b38831e 100644
--- a/sway/commands/bar/hidden_state.c
+++ b/sway/commands/bar/hidden_state.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include <strings.h>
 #include "sway/commands.h"
diff --git a/sway/commands/bar/icon_theme.c b/sway/commands/bar/icon_theme.c
index 6ac07843..fee21709 100644
--- a/sway/commands/bar/icon_theme.c
+++ b/sway/commands/bar/icon_theme.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "config.h"
 #include "sway/commands.h"
diff --git a/sway/commands/bar/id.c b/sway/commands/bar/id.c
index a9a61743..46cf4ca9 100644
--- a/sway/commands/bar/id.c
+++ b/sway/commands/bar/id.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "log.h"
diff --git a/sway/commands/bar/mode.c b/sway/commands/bar/mode.c
index 7c2f423b..d69e910b 100644
--- a/sway/commands/bar/mode.c
+++ b/sway/commands/bar/mode.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include <strings.h>
 #include "sway/commands.h"
diff --git a/sway/commands/bar/output.c b/sway/commands/bar/output.c
index cac1d056..51730176 100644
--- a/sway/commands/bar/output.c
+++ b/sway/commands/bar/output.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdbool.h>
 #include <string.h>
 #include "sway/commands.h"
diff --git a/sway/commands/bar/position.c b/sway/commands/bar/position.c
index b207de0b..94f530ec 100644
--- a/sway/commands/bar/position.c
+++ b/sway/commands/bar/position.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include <strings.h>
 #include "sway/commands.h"
diff --git a/sway/commands/bar/separator_symbol.c b/sway/commands/bar/separator_symbol.c
index 6737d4d2..50e9a873 100644
--- a/sway/commands/bar/separator_symbol.c
+++ b/sway/commands/bar/separator_symbol.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "log.h"
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/bar/tray_output.c b/sway/commands/bar/tray_output.c
index eb3b486e..679facf7 100644
--- a/sway/commands/bar/tray_output.c
+++ b/sway/commands/bar/tray_output.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "config.h"
 #include "sway/commands.h"
diff --git a/sway/commands/bind.c b/sway/commands/bind.c
index c0b383db..268f2855 100644
--- a/sway/commands/bind.c
+++ b/sway/commands/bind.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <libevdev/libevdev.h>
 #include <linux/input-event-codes.h>
 #include <string.h>
@@ -127,7 +126,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 {
@@ -143,7 +142,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 {
@@ -182,7 +181,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) {
@@ -539,7 +538,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;
@@ -549,7 +548,8 @@ 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->trigger = SWAY_SWITCH_TRIGGER_ON;
@@ -562,7 +562,7 @@ struct cmd_results *cmd_bind_or_unbind_switch(int argc, char **argv,
                 return cmd_results_new(CMD_FAILURE,
                                 "Invalid %s command "
                                 "(expected switch state: unknown state %s)",
-                                bindtype, split->items[1]);
+                                bindtype, (const char *)split->items[1]);
         }
         list_free_items_and_destroy(split);
 
diff --git a/sway/commands/client.c b/sway/commands/client.c
index 77263145..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,
@@ -51,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);
diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c
index b35065c1..8bc1048c 100644
--- a/sway/commands/exec_always.c
+++ b/sway/commands/exec_always.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
@@ -8,6 +7,7 @@
 #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"
@@ -25,11 +25,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 *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;
@@ -51,6 +62,7 @@ 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
@@ -63,6 +75,12 @@ struct cmd_results *cmd_exec_process(int argc, char **argv) {
                 close(fd[0]);
                 if ((child = fork()) == 0) {
                         close(fd[1]);
+                        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);
@@ -90,8 +108,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_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/font.c b/sway/commands/font.c
index 74bb6b9f..9920d03e 100644
--- a/sway/commands/font.c
+++ b/sway/commands/font.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "sway/config.h"
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/gesture.c b/sway/commands/gesture.c
index d4442cc3..90a20716 100644
--- a/sway/commands/gesture.c
+++ b/sway/commands/gesture.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include "sway/config.h"
 
 #include "gesture.h"
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 77acb671..306c40f7 100644
--- a/sway/commands/input.c
+++ b/sway/commands/input.c
@@ -14,6 +14,7 @@ static const struct cmd_handler input_handlers[] = {
         { "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 const 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 },
diff --git a/sway/commands/input/calibration_matrix.c b/sway/commands/input/calibration_matrix.c
index 38749fbb..53fe2c35 100644
--- a/sway/commands/input/calibration_matrix.c
+++ b/sway/commands/input/calibration_matrix.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include <strings.h>
 #include "sway/config.h"
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..2f8f753d 100644
--- a/sway/commands/input/map_from_region.c
+++ b/sway/commands/input/map_from_region.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdbool.h>
 #include <string.h>
 #include <strings.h>
@@ -11,11 +10,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_output.c b/sway/commands/input/map_to_output.c
index f60fb7d5..a7266baa 100644
--- a/sway/commands/input/map_to_output.c
+++ b/sway/commands/input/map_to_output.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include <strings.h>
 #include "sway/config.h"
diff --git a/sway/commands/input/map_to_region.c b/sway/commands/input/map_to_region.c
index 284b57d0..9087c589 100644
--- a/sway/commands/input/map_to_region.c
+++ b/sway/commands/input/map_to_region.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <string.h>
 #include "sway/commands.h"
@@ -49,5 +48,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_file.c b/sway/commands/input/xkb_file.c
index 493f94fb..056f00e5 100644
--- a/sway/commands/input/xkb_file.c
+++ b/sway/commands/input/xkb_file.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <unistd.h>
 #include <errno.h>
 #include "sway/config.h"
diff --git a/sway/commands/input/xkb_layout.c b/sway/commands/input/xkb_layout.c
index 22626517..1d01886c 100644
--- a/sway/commands/input/xkb_layout.c
+++ b/sway/commands/input/xkb_layout.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include "sway/config.h"
 #include "sway/commands.h"
 #include "log.h"
diff --git a/sway/commands/input/xkb_model.c b/sway/commands/input/xkb_model.c
index f4a33de3..a9144a8a 100644
--- a/sway/commands/input/xkb_model.c
+++ b/sway/commands/input/xkb_model.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include "sway/config.h"
 #include "sway/commands.h"
 #include "log.h"
diff --git a/sway/commands/input/xkb_numlock.c b/sway/commands/input/xkb_numlock.c
index 87d3e60c..bbe848fe 100644
--- a/sway/commands/input/xkb_numlock.c
+++ b/sway/commands/input/xkb_numlock.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include "sway/config.h"
 #include "sway/commands.h"
 #include "util.h"
diff --git a/sway/commands/input/xkb_options.c b/sway/commands/input/xkb_options.c
index d609293f..7ca20777 100644
--- a/sway/commands/input/xkb_options.c
+++ b/sway/commands/input/xkb_options.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include "sway/config.h"
 #include "sway/commands.h"
 #include "log.h"
diff --git a/sway/commands/input/xkb_rules.c b/sway/commands/input/xkb_rules.c
index 3b59622c..8fbd26fb 100644
--- a/sway/commands/input/xkb_rules.c
+++ b/sway/commands/input/xkb_rules.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include "sway/config.h"
 #include "sway/commands.h"
 #include "log.h"
diff --git a/sway/commands/input/xkb_switch_layout.c b/sway/commands/input/xkb_switch_layout.c
index 3cce4ec8..ecac8e6c 100644
--- a/sway/commands/input/xkb_switch_layout.c
+++ b/sway/commands/input/xkb_switch_layout.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <assert.h>
 #include <wlr/interfaces/wlr_keyboard.h>
 #include "sway/config.h"
diff --git a/sway/commands/input/xkb_variant.c b/sway/commands/input/xkb_variant.c
index d0e21d77..2d14ea9c 100644
--- a/sway/commands/input/xkb_variant.c
+++ b/sway/commands/input/xkb_variant.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include "sway/config.h"
 #include "sway/commands.h"
 #include "log.h"
diff --git a/sway/commands/layout.c b/sway/commands/layout.c
index 2ba61b38..12ce4839 100644
--- a/sway/commands/layout.c
+++ b/sway/commands/layout.c
@@ -153,7 +153,7 @@ 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) {
diff --git a/sway/commands/mark.c b/sway/commands/mark.c
index aa5f185c..2bfc86b3 100644
--- a/sway/commands/mark.c
+++ b/sway/commands/mark.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "sway/config.h"
@@ -59,7 +58,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 7263efcb..b3216967 100644
--- a/sway/commands/mode.c
+++ b/sway/commands/mode.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdbool.h>
 #include <string.h>
 #include "sway/commands.h"
diff --git a/sway/commands/move.c b/sway/commands/move.c
index 0d0d9727..8addf26e 100644
--- a/sway/commands/move.c
+++ b/sway/commands/move.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <ctype.h>
 #include <math.h>
 #include <stdbool.h>
@@ -206,9 +205,17 @@ static void container_move_to_workspace(struct sway_container *container,
                 container_detach(container);
                 workspace_add_floating(workspace, container);
                 container_handle_fullscreen_reparent(container);
-                // If changing output, center it within the workspace
+                // If changing output, adjust the coordinates of the window.
                 if (old_output != workspace->output && !container->pending.fullscreen_mode) {
-                        container_floating_move_to_center(container);
+                        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);
@@ -462,7 +469,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,
@@ -522,7 +529,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 +693,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);
 }
 
@@ -759,15 +769,6 @@ static struct cmd_results *cmd_move_in_direction(
                 ipc_event_window(container, "move");
         }
 
-        // Hack to re-focus container
-        seat_set_raw_focus(config->handler_context.seat, &new_ws->node);
-        seat_set_focus_container(config->handler_context.seat, container);
-
-        if (old_ws != new_ws) {
-                ipc_event_workspace(old_ws, new_ws, "focus");
-                workspace_detect_urgent(old_ws);
-                workspace_detect_urgent(new_ws);
-        }
         container_end_mouse_operation(container);
 
         return cmd_results_new(CMD_SUCCESS, NULL);
@@ -818,7 +819,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,19 +829,19 @@ 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) {
@@ -862,7 +863,7 @@ static struct cmd_results *cmd_move_to_position(int argc, char **argv) {
         }
 
         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 };
@@ -875,7 +876,7 @@ static struct cmd_results *cmd_move_to_position(int argc, char **argv) {
         }
 
         if (argc < 1) {
-                return cmd_results_new(CMD_FAILURE, expected_position_syntax);
+                return cmd_results_new(CMD_FAILURE, "%s", expected_position_syntax);
         }
 
         struct movement_amount ly = { .amount = 0, .unit = MOVEMENT_UNIT_INVALID };
@@ -884,7 +885,7 @@ static struct cmd_results *cmd_move_to_position(int argc, char **argv) {
         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");
@@ -1030,13 +1031,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 ||
@@ -1050,5 +1051,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 c102344d..5e5d31b3 100644
--- a/sway/commands/output.c
+++ b/sway/commands/output.c
@@ -27,6 +27,7 @@ static const 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) {
@@ -102,15 +103,18 @@ struct cmd_results *cmd_output(int argc, char **argv) {
 
         bool background = output->background;
 
-        output = store_output_config(output);
+        store_output_config(output);
 
         // If reloading, the output configs will be applied after reading the
         // entire config and before the deferred commands so that an auto generated
         // workspace name is not given to re-enabled outputs.
         if (!config->reloading && !config->validating) {
-                apply_output_config_to_outputs(output);
+                apply_all_output_configs();
                 if (background) {
-                        spawn_swaybg();
+                        if (!spawn_swaybg()) {
+                                return cmd_results_new(CMD_FAILURE,
+                                        "Failed to apply background configuration");
+                        }
                 }
         }
 
diff --git a/sway/commands/output/background.c b/sway/commands/output/background.c
index 67f212ff..55bd7671 100644
--- a/sway/commands/output/background.c
+++ b/sway/commands/output/background.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <libgen.h>
 #include <stdio.h>
 #include <string.h>
@@ -123,7 +122,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/toggle.c b/sway/commands/output/toggle.c
index 6342d526..c6b72845 100644
--- a/sway/commands/output/toggle.c
+++ b/sway/commands/output/toggle.c
@@ -29,7 +29,7 @@ struct cmd_results *output_cmd_toggle(int argc, char **argv) {
                 config->handler_context.output_config->enabled = 1;
         }
 
-        free(oc);
+        free_output_config(oc);
         config->handler_context.leftovers.argc = argc;
         config->handler_context.leftovers.argv = argv;
         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..9e2689c2
--- /dev/null
+++ b/sway/commands/primary_selection.c
@@ -0,0 +1,25 @@
+#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);
+
+        // config->primary_selection is reset to the previous value on reload in
+        // load_main_config()
+        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 = primary_selection;
+
+        return cmd_results_new(CMD_SUCCESS, NULL);
+}
diff --git a/sway/commands/reload.c b/sway/commands/reload.c
index 76f14bba..6c0aac26 100644
--- a/sway/commands/reload.c
+++ b/sway/commands/reload.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "sway/config.h"
@@ -9,9 +8,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,7 +46,7 @@ static void do_reload(void *data) {
         }
         list_free_items_and_destroy(bar_ids);
 
-        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 425069de..32b746ea 100644
--- a/sway/commands/resize.c
+++ b/sway/commands/resize.c
@@ -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
@@ -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->pending.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->pending.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,6 +300,11 @@ 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) {
@@ -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,10 +455,10 @@ 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);
                 }
         }
 
@@ -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/seat/attach.c b/sway/commands/seat/attach.c
index 00bfdab6..47d18546 100644
--- a/sway/commands/seat/attach.c
+++ b/sway/commands/seat/attach.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "sway/config.h"
diff --git a/sway/commands/seat/cursor.c b/sway/commands/seat/cursor.c
index 504a9f5e..df7c379d 100644
--- a/sway/commands/seat/cursor.c
+++ b/sway/commands/seat/cursor.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <linux/input-event-codes.h>
 
 #include <strings.h>
@@ -18,7 +17,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 +26,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 +36,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]))) {
@@ -85,36 +84,36 @@ struct cmd_results *seat_cmd_cursor(int argc, char **argv) {
 
 static struct cmd_results *press_or_release(struct sway_cursor *cursor,
                 char *action, char *button_str) {
-        enum wlr_button_state state;
+        enum wl_pointer_button_state state;
         uint32_t button;
         if (strcasecmp(action, "press") == 0) {
-                state = WLR_BUTTON_PRESSED;
+                state = WL_POINTER_BUTTON_STATE_PRESSED;
         } else if (strcasecmp(action, "release") == 0) {
-                state = WLR_BUTTON_RELEASED;
+                state = WL_POINTER_BUTTON_STATE_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
                         || button == SWAY_SCROLL_LEFT || button == SWAY_SCROLL_RIGHT) {
                 // Dispatch axis event
-                enum wlr_axis_orientation orientation =
+                enum wl_pointer_axis orientation =
                         (button == SWAY_SCROLL_UP || button == SWAY_SCROLL_DOWN)
-                        ? WLR_AXIS_ORIENTATION_VERTICAL
-                        : WLR_AXIS_ORIENTATION_HORIZONTAL;
+                        ? WL_POINTER_AXIS_VERTICAL_SCROLL
+                        : WL_POINTER_AXIS_HORIZONTAL_SCROLL;
                 double delta = (button == SWAY_SCROLL_UP || button == SWAY_SCROLL_LEFT)
                         ? -1 : 1;
                 struct wlr_pointer_axis_event event = {
                         .pointer = NULL,
                         .time_msec = 0,
-                        .source = WLR_AXIS_SOURCE_WHEEL,
+                        .source = WL_POINTER_AXIS_SOURCE_WHEEL,
                         .orientation = orientation,
                         .delta = delta * 15,
                         .delta_discrete = delta
diff --git a/sway/commands/seat/hide_cursor.c b/sway/commands/seat/hide_cursor.c
index e09b82d9..f5177a47 100644
--- a/sway/commands/seat/hide_cursor.c
+++ b/sway/commands/seat/hide_cursor.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "sway/config.h"
diff --git a/sway/commands/seat/idle.c b/sway/commands/seat/idle.c
index 82428f2c..2974453e 100644
--- a/sway/commands/seat/idle.c
+++ b/sway/commands/seat/idle.c
@@ -1,8 +1,8 @@
-#define _POSIX_C_SOURCE 200809L
 #include <limits.h>
 #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 +69,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/seat/xcursor_theme.c b/sway/commands/seat/xcursor_theme.c
index 202f35b9..61322a57 100644
--- a/sway/commands/seat/xcursor_theme.c
+++ b/sway/commands/seat/xcursor_theme.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "sway/config.h"
diff --git a/sway/commands/set.c b/sway/commands/set.c
index c539e9fc..ba384c7c 100644
--- a/sway/commands/set.c
+++ b/sway/commands/set.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdio.h>
 #include <string.h>
 #include <strings.h>
diff --git a/sway/commands/show_marks.c b/sway/commands/show_marks.c
index 0d373b80..60cef9fa 100644
--- a/sway/commands/show_marks.c
+++ b/sway/commands/show_marks.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "sway/config.h"
@@ -10,8 +9,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 +22,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/split.c b/sway/commands/split.c
index c8a2cfc1..500a497d 100644
--- a/sway/commands/split.c
+++ b/sway/commands/split.c
@@ -32,7 +32,7 @@ static struct cmd_results *do_split(int layout) {
         return cmd_results_new(CMD_SUCCESS, NULL);
 }
 
-static struct cmd_results *do_unsplit() {
+static struct cmd_results *do_unsplit(void) {
         struct sway_container *con = config->handler_context.container;
         struct sway_workspace *ws = config->handler_context.workspace;
 
diff --git a/sway/commands/swap.c b/sway/commands/swap.c
index 9355944d..e142eede 100644
--- a/sway/commands/swap.c
+++ b/sway/commands/swap.c
@@ -1,10 +1,10 @@
-#define _POSIX_C_SOURCE 200809L
 #include <strings.h>
 #include "config.h"
 #include "log.h"
 #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 +13,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->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 = config->handler_context.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);
-        }
-}
-
 static bool test_con_id(struct sway_container *container, void *data) {
         size_t *con_id = data;
         return container->node.id == *con_id;
@@ -219,7 +45,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 +64,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) {
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 a2446b7e..0b2ea265 100644
--- a/sway/commands/title_format.c
+++ b/sway/commands/title_format.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "sway/config.h"
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 19274dfb..4aba5bae 100644
--- a/sway/commands/unmark.c
+++ b/sway/commands/unmark.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "sway/config.h"
@@ -8,9 +7,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
@@ -38,8 +41,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 a6a0beda..37a201b4 100644
--- a/sway/commands/workspace.c
+++ b/sway/commands/workspace.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <ctype.h>
 #include <limits.h>
 #include <string.h>
@@ -61,7 +60,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 +78,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 +109,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 +157,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,7 +177,7 @@ 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");
                 }
 
diff --git a/sway/commands/xwayland.c b/sway/commands/xwayland.c
index 6ca26923..584a8e3a 100644
--- a/sway/commands/xwayland.c
+++ b/sway/commands/xwayland.c
@@ -20,6 +20,8 @@ struct cmd_results *cmd_xwayland(int argc, char **argv) {
                 xwayland = XWAYLAND_MODE_DISABLED;
         }
 
+        // config->xwayland is reset to the previous value on reload in
+        // load_main_config()
         if (config->reloading && config->xwayland != xwayland) {
                 return cmd_results_new(CMD_FAILURE,
                                 "xwayland can only be enabled/disabled at launch");
diff --git a/sway/config.c b/sway/config.c
index b41dd871..f9131e0f 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -1,3 +1,4 @@
+#undef _POSIX_C_SOURCE
 #define _XOPEN_SOURCE 700 // for realpath
 #include <stdio.h>
 #include <stdbool.h>
@@ -36,19 +37,26 @@
 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_rule_names rules, uint32_t context_flags) {
+        struct xkb_context *context = xkb_context_new(context_flags | XKB_CONTEXT_NO_SECURE_GETENV);
         struct xkb_keymap *xkb_keymap = xkb_keymap_new_from_names(
                 context,
                 &rules,
                 XKB_KEYMAP_COMPILE_NO_FLAGS);
-
         xkb_context_unref(context);
+        if (xkb_keymap == NULL) {
+                sway_log(SWAY_ERROR, "Failed to compile keysym translation XKB keymap");
+                return NULL;
+        }
+
         return xkb_state_new(xkb_keymap);
 }
 
 static void keysym_translation_state_destroy(
                 struct xkb_state *state) {
+        if (state == NULL) {
+                return;
+        }
         xkb_keymap_unref(xkb_state_get_keymap(state));
         xkb_state_unref(state);
 }
@@ -273,6 +281,7 @@ 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 = SMART_GAPS_OFF;
         config->gaps_inner = 0;
@@ -335,8 +344,14 @@ static void config_defaults(struct sway_config *config) {
 
         // The keysym to keycode translation
         struct xkb_rule_names rules = {0};
-        config->keysym_translation_state =
-                keysym_translation_state_create(rules);
+        config->keysym_translation_state = keysym_translation_state_create(rules, 0);
+        if (config->keysym_translation_state == NULL) {
+                config->keysym_translation_state = keysym_translation_state_create(rules,
+                        XKB_CONTEXT_NO_ENVIRONMENT_NAMES);
+        }
+        if (config->keysym_translation_state == NULL) {
+                goto cleanup;
+        }
 
         return;
 cleanup:
@@ -351,13 +366,7 @@ 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;
+        return format_str("%s/%s/config", prefix, config_folder);
 }
 
 static char *get_config_path(void) {
@@ -367,10 +376,7 @@ static char *get_config_path(void) {
 
         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_fallback = format_str("%s/.config", home);
                 config_home = config_home_fallback;
         }
 
@@ -474,6 +480,11 @@ bool load_main_config(const char *file, bool is_active, bool validating) {
                                 old_config->xwayland ? "enabled" : "disabled");
                 config->xwayland = old_config->xwayland;
 
+                // primary_selection can only be enabled/disabled at launch
+                sway_log(SWAY_DEBUG, "primary_selection will remain %s",
+                                old_config->primary_selection ? "enabled" : "disabled");
+                config->primary_selection = old_config->primary_selection;
+
                 if (!config->validating) {
                         if (old_config->swaybg_client != NULL) {
                                 wl_client_destroy(old_config->swaybg_client);
@@ -493,56 +504,7 @@ bool load_main_config(const char *file, bool is_active, bool validating) {
 
         config->reading = true;
 
-        // Read security configs
-        // TODO: Security
-        bool success = true;
-        /*
-        DIR *dir = opendir(SYSCONFDIR "/sway/security.d");
-        if (!dir) {
-                sway_log(SWAY_ERROR,
-                        "%s does not exist, sway will have no security configuration"
-                        " and will probably be broken", SYSCONFDIR "/sway/security.d");
-        } else {
-                list_t *secconfigs = create_list();
-                char *base = SYSCONFDIR "/sway/security.d/";
-                struct dirent *ent = readdir(dir);
-                struct stat s;
-                while (ent != NULL) {
-                        char *_path = malloc(strlen(ent->d_name) + strlen(base) + 1);
-                        strcpy(_path, base);
-                        strcat(_path, ent->d_name);
-                        lstat(_path, &s);
-                        if (S_ISREG(s.st_mode) && ent->d_name[0] != '.') {
-                                list_add(secconfigs, _path);
-                        }
-                        else {
-                                free(_path);
-                        }
-                        ent = readdir(dir);
-                }
-                closedir(dir);
-
-                list_qsort(secconfigs, qstrcmp);
-                for (int i = 0; i < secconfigs->length; ++i) {
-                        char *_path = secconfigs->items[i];
-                        if (stat(_path, &s) || s.st_uid != 0 || s.st_gid != 0 ||
-                                        (((s.st_mode & 0777) != 0644) &&
-                                        (s.st_mode & 0777) != 0444)) {
-                                sway_log(SWAY_ERROR,
-                                        "Refusing to load %s - it must be owned by root "
-                                        "and mode 644 or 444", _path);
-                                success = false;
-                        } else {
-                                success = success && load_config(_path, config);
-                        }
-                }
-
-                list_free_items_and_destroy(secconfigs);
-        }
-        */
-
-        success = success && load_config(path, config,
-                        &config->swaynag_config_errors);
+        bool success = load_config(path, config, &config->swaynag_config_errors);
 
         if (validating) {
                 free_config(config);
@@ -570,7 +532,7 @@ bool load_main_config(const char *file, bool is_active, bool validating) {
                 }
                 sway_switch_retrigger_bindings_for_all();
 
-                reset_outputs();
+                apply_all_output_configs();
                 spawn_swaybg();
 
                 config->reloading = false;
@@ -923,23 +885,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);
         }
 }
 
@@ -979,7 +936,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);
@@ -1041,8 +998,12 @@ void translate_keysyms(struct input_config *input_config) {
 
         struct xkb_rule_names rules = {0};
         input_config_fill_rule_names(input_config, &rules);
-        config->keysym_translation_state =
-                keysym_translation_state_create(rules);
+        config->keysym_translation_state = keysym_translation_state_create(rules, 0);
+        if (config->keysym_translation_state == NULL) {
+                sway_log(SWAY_ERROR, "Failed to create keysym translation XKB state "
+                        "for device '%s'", input_config->identifier);
+                return;
+        }
 
         for (int i = 0; i < config->modes->length; ++i) {
                 struct sway_mode *mode = config->modes->items[i];
diff --git a/sway/config/bar.c b/sway/config/bar.c
index d1b342e6..908b2865 100644
--- a/sway/config/bar.c
+++ b/sway/config/bar.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <signal.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -256,7 +255,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..de3b21ed 100644
--- a/sway/config/input.c
+++ b/sway/config/input.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <limits.h>
 #include <float.h>
@@ -25,14 +24,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 +63,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 +75,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 +96,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 b3e8371e..54af5d8e 100644
--- a/sway/config/output.c
+++ b/sway/config/output.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <assert.h>
 #include <drm_fourcc.h>
 #include <stdbool.h>
@@ -6,10 +5,11 @@
 #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>
-#include <wlr/backend/drm.h>
+#include <wlr/types/wlr_output_swapchain_manager.h>
 #include "sway/config.h"
 #include "sway/input/cursor.h"
 #include "sway/output.h"
@@ -17,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;
@@ -75,7 +79,72 @@ struct output_config *new_output_config(const char *name) {
         return oc;
 }
 
-void merge_output_config(struct output_config *dst, struct output_config *src) {
+// supersede_output_config clears all fields in dst that were set in src
+static void supersede_output_config(struct output_config *dst, struct output_config *src) {
+        if (src->enabled != -1) {
+                dst->enabled = -1;
+        }
+        if (src->width != -1) {
+                dst->width = -1;
+        }
+        if (src->height != -1) {
+                dst->height = -1;
+        }
+        if (src->x != -1) {
+                dst->x = -1;
+        }
+        if (src->y != -1) {
+                dst->y = -1;
+        }
+        if (src->scale != -1) {
+                dst->scale = -1;
+        }
+        if (src->scale_filter != SCALE_FILTER_DEFAULT) {
+                dst->scale_filter = SCALE_FILTER_DEFAULT;
+        }
+        if (src->subpixel != WL_OUTPUT_SUBPIXEL_UNKNOWN) {
+                dst->subpixel = WL_OUTPUT_SUBPIXEL_UNKNOWN;
+        }
+        if (src->refresh_rate != -1) {
+                dst->refresh_rate = -1;
+        }
+        if (src->custom_mode != -1) {
+                dst->custom_mode = -1;
+        }
+        if (src->drm_mode.type != (uint32_t) -1) {
+                dst->drm_mode.type = -1;
+        }
+        if (src->transform != -1) {
+                dst->transform = -1;
+        }
+        if (src->max_render_time != -1) {
+                dst->max_render_time = -1;
+        }
+        if (src->adaptive_sync != -1) {
+                dst->adaptive_sync = -1;
+        }
+        if (src->render_bit_depth != RENDER_BIT_DEPTH_DEFAULT) {
+                dst->render_bit_depth = RENDER_BIT_DEPTH_DEFAULT;
+        }
+        if (src->background) {
+                free(dst->background);
+                dst->background = NULL;
+        }
+        if (src->background_option) {
+                free(dst->background_option);
+                dst->background_option = NULL;
+        }
+        if (src->background_fallback) {
+                free(dst->background_fallback);
+                dst->background_fallback = NULL;
+        }
+        if (src->power != -1) {
+                dst->power = -1;
+        }
+}
+
+// merge_output_config sets all fields in dst that were set in src
+static void merge_output_config(struct output_config *dst, struct output_config *src) {
         if (src->enabled != -1) {
                 dst->enabled = src->enabled;
         }
@@ -138,103 +207,42 @@ void merge_output_config(struct output_config *dst, struct output_config *src) {
         }
 }
 
-static void merge_wildcard_on_all(struct output_config *wildcard) {
-        for (int i = 0; i < config->output_configs->length; i++) {
-                struct output_config *oc = config->output_configs->items[i];
-                if (strcmp(wildcard->name, oc->name) != 0) {
-                        sway_log(SWAY_DEBUG, "Merging output * config on %s", oc->name);
-                        merge_output_config(oc, wildcard);
-                }
-        }
-}
+void store_output_config(struct output_config *oc) {
+        bool merged = false;
+        bool wildcard = strcmp(oc->name, "*") == 0;
+        struct sway_output *output = wildcard ? NULL : output_by_name_or_id(oc->name);
 
-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;
+        if (output) {
                 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;
-                }
         }
 
-        if (!id_on_name) {
-                return;
-        }
-
-        int i = list_seq_find(config->output_configs, output_name_cmp, id_on_name);
-        if (i >= 0) {
-                sway_log(SWAY_DEBUG, "Merging on top of existing id on name config");
-                merge_output_config(config->output_configs->items[i], oc);
-        } else {
-                // If both a name and identifier config, exist generate an id on name
-                int ni = list_seq_find(config->output_configs, output_name_cmp, name);
-                int ii = list_seq_find(config->output_configs, output_name_cmp, id);
-                if ((ni >= 0 && ii >= 0) || (ni >= 0 && strcmp(oc->name, id) == 0)
-                                || (ii >= 0 && strcmp(oc->name, name) == 0)) {
-                        struct output_config *ion_oc = new_output_config(id_on_name);
-                        if (ni >= 0) {
-                                merge_output_config(ion_oc, config->output_configs->items[ni]);
-                        }
-                        if (ii >= 0) {
-                                merge_output_config(ion_oc, config->output_configs->items[ii]);
-                        }
-                        merge_output_config(ion_oc, 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) (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->power,
-                                ion_oc->max_render_time);
+        for (int i = 0; i < config->output_configs->length; i++) {
+                struct output_config *old = config->output_configs->items[i];
+
+                // If the old config matches the new config's name, regardless of
+                // whether it was name or identifier, merge on top of the existing
+                // config. If the new config is a wildcard, this also merges on top of
+                // old wildcard configs.
+                if (strcmp(old->name, oc->name) == 0) {
+                        merge_output_config(old, oc);
+                        merged = true;
+                        continue;
                 }
-        }
-        free(id_on_name);
-}
 
-struct output_config *store_output_config(struct output_config *oc) {
-        bool wildcard = strcmp(oc->name, "*") == 0;
-        if (wildcard) {
-                merge_wildcard_on_all(oc);
-        } else {
-                merge_id_on_name(oc);
-        }
+                // If the new config is a wildcard config we supersede all non-wildcard
+                // configs. Old wildcard configs have already been handled above.
+                if (wildcard) {
+                        supersede_output_config(old, oc);
+                        continue;
+                }
 
-        int i = list_seq_find(config->output_configs, output_name_cmp, oc->name);
-        if (i >= 0) {
-                sway_log(SWAY_DEBUG, "Merging on top of existing output config");
-                struct output_config *current = config->output_configs->items[i];
-                merge_output_config(current, oc);
-                free_output_config(oc);
-                oc = current;
-        } else if (!wildcard) {
-                sway_log(SWAY_DEBUG, "Adding non-wildcard output config");
-                i = list_seq_find(config->output_configs, output_name_cmp, "*");
-                if (i >= 0) {
-                        sway_log(SWAY_DEBUG, "Merging on top of output * config");
-                        struct output_config *current = new_output_config(oc->name);
-                        merge_output_config(current, config->output_configs->items[i]);
-                        merge_output_config(current, oc);
-                        free_output_config(oc);
-                        oc = current;
+                // If the new config matches an output's name, and the old config
+                // matches on that output's identifier, supersede it.
+                if (output && strcmp(old->name, id) == 0 &&
+                                strcmp(oc->name, output->wlr_output->name) == 0) {
+                        supersede_output_config(old, oc);
                 }
-                list_add(config->output_configs, oc);
-        } else {
-                // New wildcard config. Just add it
-                sway_log(SWAY_DEBUG, "Adding output * config");
-                list_add(config->output_configs, oc);
         }
 
         sway_log(SWAY_DEBUG, "Config stored for output %s (enabled: %d) (%dx%d@%fHz "
@@ -245,7 +253,13 @@ struct output_config *store_output_config(struct output_config *oc) {
                 oc->transform, oc->background, oc->background_option, oc->power,
                 oc->max_render_time);
 
-        return oc;
+        // If the configuration was not merged into an existing configuration, add
+        // it to the list. Otherwise we're done with it and can free it.
+        if (!merged) {
+                list_add(config->output_configs, oc);
+        } else {
+                free_output_config(oc);
+        }
 }
 
 static void set_mode(struct wlr_output *output, struct wlr_output_state *pending,
@@ -253,7 +267,9 @@ static void set_mode(struct wlr_output *output, struct wlr_output_state *pending
         // 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);
@@ -263,29 +279,35 @@ static void set_mode(struct wlr_output *output, struct wlr_output_state *pending
         }
 
         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_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;
@@ -295,6 +317,9 @@ static void set_modeline(struct wlr_output *output,
         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
@@ -436,9 +461,11 @@ static void queue_output_config(struct output_config *oc,
         enum wl_output_transform tr = WL_OUTPUT_TRANSFORM_NORMAL;
         if (oc && oc->transform >= 0) {
                 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);
@@ -450,6 +477,16 @@ 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, pending);
                 sway_log(SWAY_DEBUG, "Auto-detected output scale: %f", scale);
@@ -463,6 +500,10 @@ static void queue_output_config(struct output_config *oc,
                 sway_log(SWAY_DEBUG, "Set %s adaptive sync to %d", wlr_output->name,
                         oc->adaptive_sync);
                 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) {
@@ -482,35 +523,12 @@ static void queue_output_config(struct output_config *oc,
         }
 }
 
-bool apply_output_config(struct output_config *oc, struct sway_output *output) {
+static bool finalize_output_config(struct output_config *oc, struct sway_output *output) {
         if (output == root->fallback_output) {
                 return false;
         }
 
         struct wlr_output *wlr_output = output->wlr_output;
-
-        // Flag to prevent the output mode event handler from calling us
-        output->enabling = (!oc || oc->enabled);
-
-        struct wlr_output_state pending = {0};
-        queue_output_config(oc, output, &pending);
-
-        if (!oc || oc->power != 0) {
-                output->current_mode = pending.mode;
-        }
-
-        sway_log(SWAY_DEBUG, "Committing output %s", wlr_output->name);
-        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.
-                sway_log(SWAY_ERROR, "Failed to commit output %s", wlr_output->name);
-                output->enabling = false;
-                return false;
-        }
-
-        output->enabling = false;
-
         if (oc && !oc->enabled) {
                 sway_log(SWAY_DEBUG, "Disabling output %s", oc->name);
                 if (output->enabled) {
@@ -520,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) {
@@ -540,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);
                 }
         }
 
@@ -569,25 +584,9 @@ bool apply_output_config(struct output_config *oc, struct sway_output *output) {
                 output->max_render_time = oc->max_render_time;
         }
 
-        // 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();
-        // 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->fallback_output) {
-                return false;
-        }
-
-        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;
@@ -607,143 +606,167 @@ static void default_output_config(struct output_config *oc,
         oc->max_render_time = 0;
 }
 
-static struct output_config *get_output_config(char *identifier,
-                struct sway_output *sway_output) {
+// find_output_config returns a merged output_config containing all stored
+// configuration that applies to the specified output.
+struct output_config *find_output_config(struct sway_output *sway_output) {
         const char *name = sway_output->wlr_output->name;
+        struct output_config *oc = NULL;
 
-        struct output_config *oc_id_on_name = NULL;
-        struct output_config *oc_name = NULL;
-        struct output_config *oc_id = NULL;
+        struct output_config *result = new_output_config(name);
+        if (config->reloading) {
+                default_output_config(result, sway_output->wlr_output);
+        }
 
-        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);
-        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];
-        } else {
-                i = list_seq_find(config->output_configs, output_name_cmp, name);
-                if (i >= 0) {
-                        oc_name = config->output_configs->items[i];
-                }
+        char id[128];
+        output_get_identifier(id, sizeof(id), sway_output);
 
-                i = list_seq_find(config->output_configs, output_name_cmp, identifier);
-                if (i >= 0) {
-                        oc_id = config->output_configs->items[i];
-                }
+        int i;
+        bool match = false;
+        if ((i = list_seq_find(config->output_configs, output_name_cmp, "*")) >= 0) {
+                match = true;
+                oc = config->output_configs->items[i];
+                merge_output_config(result, oc);
         }
-
-        struct output_config *result = new_output_config("temp");
-        if (config->reloading) {
-                default_output_config(result, sway_output->wlr_output);
+        if ((i = list_seq_find(config->output_configs, output_name_cmp, name)) >= 0) {
+                match = true;
+                oc = config->output_configs->items[i];
+                merge_output_config(result, oc);
         }
-        if (oc_id_on_name) {
-                // Already have an identifier on name config, use that
-                free(result->name);
-                result->name = strdup(id_on_name);
-                merge_output_config(result, oc_id_on_name);
-        } else if (oc_name && oc_id) {
-                // Generate a config named `<identifier> on <name>` which contains a
-                // merged copy of the identifier on name. This will make sure that both
-                // identifier and name configs are respected, with identifier getting
-                // priority
-                struct output_config *temp = new_output_config(id_on_name);
-                merge_output_config(temp, oc_name);
-                merge_output_config(temp, oc_id);
-                list_add(config->output_configs, temp);
-
-                free(result->name);
-                result->name = strdup(id_on_name);
-                merge_output_config(result, temp);
-
-                sway_log(SWAY_DEBUG, "Generated output config \"%s\" (enabled: %d)"
-                        " (%dx%d@%fHz position %d,%d scale %f transform %d) (bg %s %s)"
-                        " (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->power,
-                        result->max_render_time);
-        } else if (oc_name) {
-                // No identifier config, just return a copy of the name config
-                free(result->name);
-                result->name = strdup(name);
-                merge_output_config(result, oc_name);
-        } else if (oc_id) {
-                // No name config, just return a copy of the identifier config
-                free(result->name);
-                result->name = strdup(identifier);
-                merge_output_config(result, oc_id);
-        } else {
-                i = list_seq_find(config->output_configs, output_name_cmp, "*");
-                if (i >= 0) {
-                        // No name or identifier config, but there is a wildcard config
-                        free(result->name);
-                        result->name = strdup("*");
-                        merge_output_config(result, config->output_configs->items[i]);
-                } else if (!config->reloading) {
-                        // No name, identifier, or wildcard config. Since we are not
-                        // reloading with defaults, the output config will be empty, so
-                        // just return NULL
-                        free_output_config(result);
-                        result = NULL;
-                }
+        if ((i = list_seq_find(config->output_configs, output_name_cmp, id)) >= 0) {
+                match = true;
+                oc = config->output_configs->items[i];
+                merge_output_config(result, oc);
+        }
+
+        if (!match && !config->reloading) {
+                // No name, identifier, or wildcard config. Since we are not
+                // reloading with defaults, the output config will be empty, so
+                // just return NULL
+                free_output_config(result);
+                return NULL;
         }
 
-        free(id_on_name);
         return result;
 }
 
-struct output_config *find_output_config(struct sway_output *output) {
-        char id[128];
-        output_get_identifier(id, sizeof(id), output);
-        return get_output_config(id, output);
-}
+bool apply_output_configs(struct matched_output_config *configs,
+                size_t configs_len, bool test_only) {
+        struct wlr_backend_output_state *states = calloc(configs_len, sizeof(*states));
+        if (!states) {
+                return false;
+        }
 
-void apply_output_config_to_outputs(struct output_config *oc) {
-        // Try to find the output container and apply configuration now. If
-        // 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)) {
-                        struct output_config *current = get_output_config(id, sway_output);
-                        if (!current) {
-                                // No stored output config matched, apply oc directly
-                                sway_log(SWAY_DEBUG, "Applying oc directly");
-                                current = new_output_config(oc->name);
-                                merge_output_config(current, oc);
-                        }
-                        apply_output_config(current, sway_output);
-                        free_output_config(current);
+        sway_log(SWAY_DEBUG, "Committing %zd outputs", configs_len);
+        for (size_t idx = 0; idx < configs_len; idx++) {
+                struct matched_output_config *cfg = &configs[idx];
+                struct wlr_backend_output_state *backend_state = &states[idx];
 
-                        if (!wildcard) {
-                                // Stop looking if the output config isn't applicable to all
-                                // outputs
-                                break;
-                        }
+                backend_state->output = cfg->output->wlr_output;
+                wlr_output_state_init(&backend_state->base);
+
+                sway_log(SWAY_DEBUG, "Preparing config for %s",
+                        cfg->output->wlr_output->name);
+                queue_output_config(cfg->config, cfg->output, &backend_state->base);
+        }
+
+        struct wlr_output_swapchain_manager swapchain_mgr;
+        wlr_output_swapchain_manager_init(&swapchain_mgr, server.backend);
+
+        bool ok = wlr_output_swapchain_manager_prepare(&swapchain_mgr, states, configs_len);
+        if (!ok) {
+                sway_log(SWAY_ERROR, "Swapchain prepare failed");
+                goto out;
+        }
+
+        if (test_only) {
+                // The swapchain manager already did a test for us
+                goto out;
+        }
+
+        for (size_t idx = 0; idx < configs_len; idx++) {
+                struct matched_output_config *cfg = &configs[idx];
+                struct wlr_backend_output_state *backend_state = &states[idx];
+
+                struct wlr_scene_output_state_options opts = {
+                        .swapchain = wlr_output_swapchain_manager_get_swapchain(
+                                &swapchain_mgr, backend_state->output),
+                };
+                struct wlr_scene_output *scene_output = cfg->output->scene_output;
+                struct wlr_output_state *state = &backend_state->base;
+                if (!wlr_scene_output_build_state(scene_output, state, &opts)) {
+                        sway_log(SWAY_ERROR, "Building output state for '%s' failed",
+                                backend_state->output->name);
+                        goto out;
                 }
         }
 
+        ok = wlr_backend_commit(server.backend, states, configs_len);
+        if (!ok) {
+                sway_log(SWAY_ERROR, "Backend commit failed");
+                goto out;
+        }
+
+        sway_log(SWAY_DEBUG, "Commit of %zd outputs succeeded", configs_len);
+
+        wlr_output_swapchain_manager_apply(&swapchain_mgr);
+
+        for (size_t idx = 0; idx < configs_len; idx++) {
+                struct matched_output_config *cfg = &configs[idx];
+                sway_log(SWAY_DEBUG, "Finalizing config for %s",
+                        cfg->output->wlr_output->name);
+                finalize_output_config(cfg->config, cfg->output);
+        }
+
+out:
+        wlr_output_swapchain_manager_finish(&swapchain_mgr);
+        for (size_t idx = 0; idx < configs_len; idx++) {
+                struct wlr_backend_output_state *backend_state = &states[idx];
+                wlr_output_state_finish(&backend_state->base);
+        }
+        free(states);
+
+        // 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_input_mappings();
+        // Reconfigure the cursor images, since the scale may have changed.
+        input_manager_configure_xcursor();
+
         struct sway_seat *seat;
         wl_list_for_each(seat, &server.input->seats, link) {
                 wlr_seat_pointer_notify_clear_focus(seat->wlr_seat);
                 cursor_rebase(seat->cursor);
         }
+
+        return ok;
 }
 
-void reset_outputs(void) {
-        struct output_config *oc = NULL;
-        int i = list_seq_find(config->output_configs, output_name_cmp, "*");
-        if (i >= 0) {
-                oc = config->output_configs->items[i];
-        } else {
-                oc = store_output_config(new_output_config("*"));
+void apply_all_output_configs(void) {
+        size_t configs_len = wl_list_length(&root->all_outputs);
+        struct matched_output_config *configs = calloc(configs_len, sizeof(*configs));
+        if (!configs) {
+                return;
         }
-        apply_output_config_to_outputs(oc);
+
+        int config_idx = 0;
+        struct sway_output *sway_output;
+        wl_list_for_each(sway_output, &root->all_outputs, link) {
+                if (sway_output == root->fallback_output) {
+                        configs_len--;
+                        continue;
+                }
+
+                struct matched_output_config *config = &configs[config_idx++];
+                config->output = sway_output;
+                config->config = find_output_config(sway_output);
+        }
+
+        apply_output_configs(configs, configs_len, false);
+        for (size_t idx = 0; idx < configs_len; idx++) {
+                struct matched_output_config *cfg = &configs[idx];
+                free_output_config(cfg->config);
+        }
+        free(configs);
 }
 
 void free_output_config(struct output_config *oc) {
@@ -810,7 +833,9 @@ static bool _spawn_swaybg(char **command) {
                         setenv("WAYLAND_SOCKET", wayland_socket_str, true);
 
                         execvp(command[0], command);
-                        sway_log_errno(SWAY_ERROR, "execvp failed");
+                        sway_log_errno(SWAY_ERROR, "failed to execute '%s' "
+                                "(background configuration probably not applied)",
+                                command[0]);
                         _exit(EXIT_FAILURE);
                 }
                 _exit(EXIT_SUCCESS);
@@ -820,12 +845,13 @@ static bool _spawn_swaybg(char **command) {
                 sway_log_errno(SWAY_ERROR, "close failed");
                 return false;
         }
-        if (waitpid(pid, NULL, 0) < 0) {
+        int fork_status = 0;
+        if (waitpid(pid, &fork_status, 0) < 0) {
                 sway_log_errno(SWAY_ERROR, "waitpid failed");
                 return false;
         }
 
-        return true;
+        return WIFEXITED(fork_status) && WEXITSTATUS(fork_status) == EXIT_SUCCESS;
 }
 
 bool spawn_swaybg(void) {
diff --git a/sway/config/seat.c b/sway/config/seat.c
index 84260aa3..f2326189 100644
--- a/sway/config/seat.c
+++ b/sway/config/seat.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
@@ -99,7 +98,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 97cf667e..e16b4fa8 100644
--- a/sway/criteria.c
+++ b/sway/criteria.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdbool.h>
@@ -19,6 +18,7 @@
 bool criteria_is_empty(struct criteria *criteria) {
         return !criteria->title
                 && !criteria->shell
+                && !criteria->all
                 && !criteria->app_id
                 && !criteria->con_mark
                 && !criteria->con_id
@@ -96,7 +96,8 @@ 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);
@@ -189,7 +190,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) {
@@ -209,7 +210,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) {
@@ -229,7 +230,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) {
@@ -261,7 +262,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) {
@@ -281,12 +282,12 @@ 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;
@@ -301,12 +302,12 @@ 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;
@@ -455,6 +456,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,
@@ -477,7 +479,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;
@@ -523,8 +527,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);
@@ -534,6 +538,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;
diff --git a/sway/desktop/desktop.c b/sway/desktop/desktop.c
deleted file mode 100644
index c8d4502c..00000000
--- a/sway/desktop/desktop.c
+++ /dev/null
@@ -1,40 +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_box);
-                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 82353038..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,7 +34,6 @@ void handle_idle_inhibitor_v1(struct wl_listener *listener, void *data) {
                 return;
         }
 
-        inhibitor->manager = manager;
         inhibitor->mode = INHIBIT_IDLE_APPLICATION;
         inhibitor->wlr_inhibitor = wlr_inhibitor;
         wl_list_insert(&manager->inhibitors, &inhibitor->link);
@@ -42,33 +41,34 @@ void handle_idle_inhibitor_v1(struct wl_listener *listener, void *data) {
         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) {
+        wl_list_for_each(inhibitor, &manager->inhibitors, link) {
                 if (inhibitor->mode != INHIBIT_IDLE_APPLICATION &&
                                 inhibitor->view == view) {
                         return inhibitor;
@@ -79,9 +79,9 @@ 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) {
+        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;
@@ -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..28043d19
--- /dev/null
+++ b/sway/desktop/launcher.c
@@ -0,0 +1,267 @@
+#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);
+        if (ctx->seat) {
+                wl_list_remove(&ctx->seat_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;
+        // Having surface set means that the focus check in wlroots has passed
+        ctx->had_focused_surface = token->surface != NULL;
+
+        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;
+}
+
+static void launch_ctx_handle_seat_destroy(struct wl_listener *listener, void *data) {
+        struct launcher_ctx *ctx = wl_container_of(listener, ctx, seat_destroy);
+        ctx->seat = NULL;
+        wl_list_remove(&ctx->seat_destroy.link);
+}
+
+// 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);
+
+        struct launcher_ctx *ctx = launcher_ctx_create(token, &ws->node);
+        if (!ctx) {
+                wlr_xdg_activation_token_v1_destroy(token);
+                return NULL;
+        }
+        ctx->seat = seat;
+        ctx->seat_destroy.notify = launch_ctx_handle_seat_destroy;
+        wl_signal_add(&seat->wlr_seat->events.destroy, &ctx->seat_destroy);
+
+        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 d44d6338..4b2584b6 100644
--- a/sway/desktop/layer_shell.c
+++ b/sway/desktop/layer_shell.c
@@ -3,10 +3,12 @@
 #include <string.h>
 #include <wayland-server-core.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_scene.h>
 #include <wlr/types/wlr_subcompositor.h>
+#include <wlr/types/wlr_xdg_shell.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"
@@ -17,162 +19,55 @@
 #include "sway/tree/arrange.h"
 #include "sway/tree/workspace.h"
 
-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;
-                        }
-                        if (edges[i].negative_axis) {
-                                *edges[i].negative_axis -= exclusive + edges[i].margin;
+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;
+                }
+
+                // 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;
                         }
-                        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 (box.width == 0) {
-                        box.x = bounds.x;
-                } else if ((state->anchor & both_horiz) == both_horiz) {
-                        box.x = bounds.x + ((bounds.width / 2) - (box.width / 2));
-                } 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 (box.height == 0) {
-                        box.y = bounds.y;
-                } else if ((state->anchor & both_vert) == both_vert) {
-                        box.y = bounds.y + ((bounds.height / 2) - (box.height / 2));
-                } 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 (box.width == 0) {
-                        box.x += state->margin.left;
-                        box.width = bounds.width -
-                                (state->margin.left + state->margin.right);
-                } else if ((state->anchor & both_horiz) == both_horiz) {
-                        // don't apply margins
-                } 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 (box.height == 0) {
-                        box.y += state->margin.top;
-                        box.height = bounds.height -
-                                (state->margin.top + state->margin.bottom);
-                } else if ((state->anchor & both_vert) == both_vert) {
-                        // don't apply margins
-                } 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 (!sway_assert(box.width >= 0 && box.height >= 0,
-                                "Expected layer surface to have positive size")) {
+
+                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);
         }
 }
 
@@ -180,81 +75,94 @@ 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);
+        } else {
+                arrange_popups(root->layers.popup);
         }
+}
 
-        // Arrange non-exclusive 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->desc.relative = &scene->tree->node;
+
+        if (!scene_descriptor_assign(&popups->node,
+                        SWAY_SCENE_DESC_POPUP, &surface->desc)) {
+                sway_log(SWAY_ERROR, "Failed to allocate a popup scene descriptor");
+                wlr_scene_node_destroy(&popups->node);
+                free(surface);
+                return NULL;
+        }
+
+        surface->tree = scene->tree;
+        surface->scene = scene;
+        surface->layer_surface = scene->layer_surface;
+        surface->popups = popups;
+        surface->layer_surface->data = surface;
+
+        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;
                         }
                 }
         }
@@ -262,293 +170,142 @@ 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;
-
-        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);
 
-        wlr_layer_surface_v1_destroy(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;
-        sway_assert(wlr_output, "wlr_layer_surface_v1 has null output");
-        struct sway_output *output = wlr_output->data;
-        struct wlr_box old_extent = layer->extent;
-
-        bool layer_changed = false;
-        if (layer_surface->current.committed != 0
-                        || layer->mapped != layer_surface->mapped) {
-                layer->mapped = layer_surface->mapped;
-                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;
-                }
-                arrange_layers(output);
-        }
-
-        wlr_surface_get_extends(layer_surface->surface, &layer->extent);
-        layer->extent.x += layer->geo.x;
-        layer->extent.y += layer->geo.y;
+                wl_container_of(listener, layer, node_destroy);
 
-        bool extent_changed =
-                memcmp(&old_extent, &layer->extent, sizeof(struct wlr_box)) != 0;
-        if (extent_changed || layer_changed) {
-                output_damage_box(output, &old_extent);
-                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);
-        }
+        // 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);
 
-        transaction_commit_dirty();
-}
-
-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;
-        sway_assert(wlr_output, "wlr_layer_surface_v1 has null output");
-        struct sway_output *output = wlr_output->data;
-        output_damage_surface(output, sway_layer->geo.x, sway_layer->geo.y,
-                sway_layer->layer_surface->surface, true);
-}
-
-static void layer_subsurface_destroy(struct sway_layer_subsurface *subsurface);
-
-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);
-        }
-
-        struct sway_layer_subsurface *subsurface, *subsurface_tmp;
-        wl_list_for_each_safe(subsurface, subsurface_tmp, &sway_layer->subsurfaces, link) {
-                layer_subsurface_destroy(subsurface);
+        if (layer->output) {
+                arrange_layers(layer->output);
+                transaction_commit_dirty();
         }
 
-        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);
-
-        struct wlr_output *wlr_output = sway_layer->layer_surface->output;
-        sway_assert(wlr_output, "wlr_layer_surface_v1 has null output");
-        struct sway_output *output = wlr_output->data;
-        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 wlr_output *wlr_output = sway_layer->layer_surface->output;
-        sway_assert(wlr_output, "wlr_layer_surface_v1 has null output");
-        struct sway_output *output = wlr_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);
-}
+        layer->layer_surface->data = NULL;
 
-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;
-        sway_assert(wlr_output, "wlr_layer_surface_v1 has null output");
-        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);
+        free(layer);
 }
 
-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 layer_subsurface_destroy(struct sway_layer_subsurface *subsurface) {
-        wl_list_remove(&subsurface->link);
-        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 void subsurface_handle_destroy(struct wl_listener *listener,
-                void *data) {
-        struct sway_layer_subsurface *subsurface =
-                        wl_container_of(listener, subsurface, destroy);
-        layer_subsurface_destroy(subsurface);
-}
+static void handle_surface_commit(struct wl_listener *listener, void *data) {
+        struct sway_layer_surface *surface =
+                wl_container_of(listener, surface, surface_commit);
 
-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_subsurface));
-        if (subsurface == NULL) {
-                return NULL;
+        struct wlr_layer_surface_v1 *layer_surface = surface->layer_surface;
+        if (!layer_surface->initialized) {
+                return;
         }
 
-        subsurface->wlr_subsurface = wlr_subsurface;
-        subsurface->layer_surface = layer_surface;
-        wl_list_insert(&layer_surface->subsurfaces, &subsurface->link);
-
-        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);
-}
-
+        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);
+        }
 
-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;
 }
 
-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->current.geometry.x - popup->base->current.geometry.x;
-        int popup_sy = popup->current.geometry.y - popup->base->current.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->current.geometry.x;
-                        oy += layer_popup->wlr_popup->current.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;
-        sway_assert(wlr_output, "wlr_layer_surface_v1 has null 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;
-        sway_assert(wlr_output, "wlr_layer_surface_v1 has null 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;
+
+        // if a client tries to create a popup while we are in the process of destroying
+        // its output, don't crash.
+        if (!output) {
+                return;
+        }
 
-        struct wlr_output *wlr_output = layer->layer_surface->output;
-        sway_assert(wlr_output, "wlr_layer_surface_v1 has null output");
-        struct sway_output *output = wlr_output->data;
+        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,
         };
@@ -556,32 +313,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;
 }
@@ -590,19 +353,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) {
@@ -634,10 +392,6 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
                                 sway_log(SWAY_ERROR,
                                                 "no output to auto-assign layer surface '%s' to",
                                                 layer_surface->namespace);
-                                // Note that layer_surface->output can be NULL
-                                // here, but none of our destroy callbacks are
-                                // registered yet so we don't have to make them
-                                // handle that case.
                                 wlr_layer_surface_v1_destroy(layer_surface);
                                 return;
                         }
@@ -646,44 +400,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;
+        }
+
+        struct sway_layer_surface *surface =
+                sway_layer_surface_create(scene_surface);
+        if (!surface) {
+                wlr_layer_surface_v1_destroy(layer_surface);
+
+                sway_log(SWAY_ERROR, "Could not allocate a sway_layer_surface");
                 return;
         }
 
-        wl_list_init(&sway_layer->subsurfaces);
+        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;
+        }
 
-        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;
+        surface->output = output;
 
-        struct sway_output *output = layer_surface->output->data;
-        sway_layer->output_destroy.notify = handle_output_destroy;
-        wl_signal_add(&output->events.disable, &sway_layer->output_destroy);
-
-        wl_list_insert(&output->layers[layer_surface->pending.layer],
-                        &sway_layer->link);
-
-        // Temporarily set the layer's current state to pending
-        // So that we can easily arrange it
-        struct wlr_layer_surface_v1_state old_state = layer_surface->current;
-        layer_surface->current = layer_surface->pending;
-        arrange_layers(output);
-        layer_surface->current = old_state;
+        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 7bb9dab2..bd3de3fe 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -1,44 +1,61 @@
-#define _POSIX_C_SOURCE 200809L
 #include <assert.h>
 #include <stdlib.h>
 #include <strings.h>
 #include <time.h>
 #include <wayland-server-core.h>
-#include <wlr/backend/drm.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_buffer.h>
-#include <wlr/types/wlr_drm_lease_v1.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_management_v1.h>
+#include <wlr/types/wlr_output_power_management_v1.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_presentation_time.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;
                 }
         }
@@ -48,536 +65,217 @@ 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;
 }
 
-struct surface_iterator_data {
-        sway_surface_iterator_func_t user_iterator;
-        void *user_data;
-
-        struct sway_output *output;
-        struct sway_view *view;
-        double ox, oy;
-        int width, height;
-};
-
-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;
-
-        struct wlr_box box = {
-                .x = floor(data->ox + sx),
-                .y = floor(data->oy + sy),
-                .width = sw,
-                .height = sh,
-        };
-        if (surface_box != NULL) {
-                memcpy(surface_box, &box, sizeof(struct wlr_box));
+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];
         }
-
-        struct wlr_box output_box = {
-                .width = output->width,
-                .height = output->height,
-        };
-
-        struct wlr_box intersection;
-        return wlr_box_intersection(&intersection, &output_box, &box);
+        return focus->sway_workspace;
 }
 
-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;
-        }
+struct send_frame_done_data {
+        struct timespec when;
+        int msec_until_refresh;
+        struct sway_output *output;
+};
 
-        data->user_iterator(data->output, data->view, surface, &box,
-                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,
-        };
-
-        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,
-        };
-
-        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,
-        };
-
-        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;
-                struct wlr_surface *surface = wlr_layer_surface_v1->surface;
-                struct surface_iterator_data data = {
-                        .user_iterator = iterator,
-                        .user_data = user_data,
-                        .output = output,
-                        .view = NULL,
-                        .ox = layer_surface->geo.x,
-                        .oy = layer_surface->geo.y,
-                        .width = surface->current.width,
-                        .height = surface->current.height,
-                };
-                wlr_layer_surface_v1_for_each_surface(wlr_layer_surface_v1,
-                        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_surface *surface = wlr_layer_surface_v1->surface;
-                struct surface_iterator_data data = {
-                        .user_iterator = iterator,
-                        .user_data = user_data,
-                        .output = output,
-                        .view = NULL,
-                        .ox = layer_surface->geo.x,
-                        .oy = layer_surface->geo.y,
-                        .width = surface->current.width,
-                        .height = surface->current.height,
-                };
-                wlr_layer_surface_v1_for_each_popup_surface(wlr_layer_surface_v1,
-                        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 (server.session_lock.locked) {
-                if (server.session_lock.lock == NULL) {
-                        return;
-                }
-                struct wlr_session_lock_surface_v1 *lock_surface;
-                wl_list_for_each(lock_surface, &server.session_lock.lock->surfaces, link) {
-                        if (lock_surface->output != output->wlr_output) {
-                                continue;
-                        }
-                        if (!lock_surface->mapped) {
-                                continue;
-                        }
+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;
 
-                        output_surface_for_each_surface(output, lock_surface->surface,
-                                0.0, 0.0, iterator, user_data);
-                }
+        if (buffer->primary_output != data->output->scene_output) {
                 return;
         }
 
-        if (output_has_opaque_overlay_layer_surface(output)) {
-                goto overlay;
-        }
-
-        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);
-                                }
-                        }
+        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;
                 }
-#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);
-        }
-
-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;
+                if (!current->parent) {
+                        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;
-                }
+                current = &current->parent->node;
         }
-        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, void *user_data) {
-        int view_max_render_time = 0;
-        if (view != NULL) {
-                view_max_render_time = view->max_render_time;
-        }
-
-        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, void *data) {
-        size_t *n = data;
-        (*n)++;
-}
+        struct buffer_timer *timer = NULL;
 
-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;
+        if (output->max_render_time != 0 && view_max_render_time != 0 && delay > 0) {
+                timer = buffer_timer_get_or_create(buffer);
         }
 
-        if (server.session_lock.locked) {
-                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 (!wl_list_empty(&view->saved_buffers)) {
-                return false;
+static enum wlr_scale_filter_mode get_scale_filter(struct sway_output *output,
+                struct wlr_scene_buffer *buffer) {
+        // if we are scaling down, we should always choose linear
+        if (buffer->dst_width > 0 && buffer->dst_height > 0 && (
+                        buffer->dst_width < buffer->buffer_width ||
+                        buffer->dst_height < buffer->buffer_height)) {
+                return WLR_SCALE_FILTER_BILINEAR;
         }
 
-        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;
-                }
+        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
         }
+}
 
-#if HAVE_XWAYLAND
-        if (!wl_list_empty(&root->xwayland_unmanaged)) {
-                return false;
-        }
-#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, buffer);
 
-        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 && !debug.noscanout) {
-                // 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_damage_whole(output);
+
+                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;
         }
@@ -588,9 +286,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;
@@ -637,116 +333,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, void *_data) {
-        bool *data = _data;
-        bool whole = *data;
-
-        struct wlr_box box = *_box;
-        scale_box(&box, output->wlr_output->scale);
-
-        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_output_damage_add(output->damage, &damage);
-        pixman_region32_fini(&damage);
-
-        if (whole) {
-                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) {
@@ -764,33 +352,36 @@ static void update_output_manager_config(struct sway_server *server) {
                 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 = output->current_mode != NULL && output->enabled;
-                config_head->state.mode = output->current_mode;
-                if (!wlr_box_empty(&output_box)) {
-                        config_head->state.x = output_box.x;
-                        config_head->state.y = output_box.y;
-                }
+                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;
-        output_begin_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;
 
@@ -799,34 +390,14 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
         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) {
@@ -837,17 +408,21 @@ 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) {
@@ -862,6 +437,13 @@ 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) {
@@ -883,10 +465,14 @@ void handle_new_output(struct wl_listener *listener, void *data) {
 
         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;
         }
 
@@ -896,32 +482,46 @@ void handle_new_output(struct wl_listener *listener, void *data) {
                 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);
 
-        struct output_config *oc = find_output_config(output);
-        apply_output_config(oc, output);
-        free_output_config(oc);
+        if (server->session_lock.lock) {
+                sway_session_lock_add_output(server->session_lock.lock, output);
+        }
+
+        apply_all_output_configs();
 
         transaction_commit_dirty();
 
@@ -935,62 +535,103 @@ 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 struct output_config *output_config_for_config_head(
+                struct wlr_output_configuration_head_v1 *config_head,
+                struct sway_output *output) {
+        struct output_config *oc = new_output_config(output->wlr_output->name);
+        oc->enabled = config_head->state.enabled;
+        if (!oc->enabled) {
+                return oc;
+        }
+
+        if (config_head->state.mode != NULL) {
+                struct wlr_output_mode *mode = config_head->state.mode;
+                oc->width = mode->width;
+                oc->height = mode->height;
+                oc->refresh_rate = mode->refresh / 1000.f;
+        } else {
+                oc->width = config_head->state.custom_mode.width;
+                oc->height = config_head->state.custom_mode.height;
+                oc->refresh_rate =
+                        config_head->state.custom_mode.refresh / 1000.f;
+        }
+        oc->x = config_head->state.x;
+        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;
+        return oc;
+}
+
 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
-
-        struct wlr_output_configuration_head_v1 *config_head;
-        // First disable outputs we need to disable
-        bool ok = true;
-        wl_list_for_each(config_head, &config->heads, link) {
-                struct wlr_output *wlr_output = config_head->state.output;
-                struct sway_output *output = wlr_output->data;
-                if (!output->enabled || config_head->state.enabled) {
+        size_t configs_len = wl_list_length(&root->all_outputs);
+        struct matched_output_config *configs = calloc(configs_len, sizeof(*configs));
+        if (!configs) {
+                return;
+        }
+
+        int config_idx = 0;
+        struct sway_output *sway_output;
+        wl_list_for_each(sway_output, &root->all_outputs, link) {
+                if (sway_output == root->fallback_output) {
+                        configs_len--;
                         continue;
                 }
-                struct output_config *oc = new_output_config(output->wlr_output->name);
-                oc->enabled = false;
 
-                if (test_only) {
-                        ok &= test_output_config(oc, output);
-                } else {
-                        oc = store_output_config(oc);
-                        ok &= apply_output_config(oc, output);
-                }
-        }
+                struct matched_output_config *cfg = &configs[config_idx++];
+                cfg->output = sway_output;
 
-        // Then enable outputs that need to
-        wl_list_for_each(config_head, &config->heads, link) {
-                struct wlr_output *wlr_output = config_head->state.output;
-                struct sway_output *output = wlr_output->data;
-                if (!config_head->state.enabled) {
-                        continue;
+                struct wlr_output_configuration_head_v1 *config_head;
+                wl_list_for_each(config_head, &config->heads, link) {
+                        if (config_head->state.output == sway_output->wlr_output) {
+                                cfg->config = output_config_for_config_head(config_head, sway_output);
+                                break;
+                        }
                 }
-                struct output_config *oc = new_output_config(output->wlr_output->name);
-                oc->enabled = true;
-                if (config_head->state.mode != NULL) {
-                        struct wlr_output_mode *mode = config_head->state.mode;
-                        oc->width = mode->width;
-                        oc->height = mode->height;
-                        oc->refresh_rate = mode->refresh / 1000.f;
-                } else {
-                        oc->width = config_head->state.custom_mode.width;
-                        oc->height = config_head->state.custom_mode.height;
-                        oc->refresh_rate =
-                                config_head->state.custom_mode.refresh / 1000.f;
+                if (!cfg->config) {
+                        cfg->config = find_output_config(sway_output);
                 }
-                oc->x = config_head->state.x;
-                oc->y = config_head->state.y;
-                oc->transform = config_head->state.transform;
-                oc->scale = config_head->state.scale;
+        }
+
+        bool ok = apply_output_configs(configs, configs_len, test_only);
+        for (size_t idx = 0; idx < configs_len; idx++) {
+                struct matched_output_config *cfg = &configs[idx];
 
-                if (test_only) {
-                        ok &= test_output_config(oc, output);
+                // Only store new configs for successful non-test commits. Old configs,
+                // test-only and failed commits just get freed.
+                bool store_config = false;
+                if (!test_only && ok) {
+                        struct wlr_output_configuration_head_v1 *config_head;
+                        wl_list_for_each(config_head, &config->heads, link) {
+                                if (config_head->state.output == sway_output->wlr_output) {
+                                        store_config = true;
+                                        break;
+                                }
+                        }
+                }
+                if (store_config) {
+                        store_output_config(cfg->config);
                 } else {
-                        oc = store_output_config(oc);
-                        ok &= apply_output_config(oc, output);
+                        free_output_config(cfg->config);
                 }
         }
+        free(configs);
 
         if (ok) {
                 wlr_output_configuration_v1_send_succeeded(config);
@@ -1034,6 +675,6 @@ void handle_output_power_manager_set_mode(struct wl_listener *listener,
                 oc->power = 1;
                 break;
         }
-        oc = store_output_config(oc);
-        apply_output_config(oc, output);
+        store_output_config(oc);
+        apply_all_output_configs();
 }
diff --git a/sway/desktop/render.c b/sway/desktop/render.c
deleted file mode 100644
index ed9ad490..00000000
--- a/sway/desktop/render.c
+++ /dev/null
@@ -1,1204 +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_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_compositor.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;
-        struct wlr_box *clip_box;
-};
-
-/**
- * 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_output->renderer;
-        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_output->renderer;
-        struct sway_output *output = wlr_output->data;
-
-        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, 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 proj_box = *_box;
-        scale_box(&proj_box, wlr_output->scale);
-
-        float matrix[9];
-        enum wl_output_transform transform =
-                wlr_output_transform_invert(surface->current.transform);
-        wlr_matrix_project_box(matrix, &proj_box, transform, 0.0,
-                wlr_output->transform_matrix);
-
-        struct wlr_box dst_box = *_box;
-        struct wlr_box *clip_box = data->clip_box;
-        if (clip_box != NULL) {
-                dst_box.width = fmin(dst_box.width, clip_box->width);
-                dst_box.height = fmin(dst_box.height, clip_box->height);
-        }
-        scale_box(&dst_box, wlr_output->scale);
-
-        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_output->renderer;
-
-        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,
-        };
-        struct wlr_box clip_box;
-        if (!container_is_current_floating(view->container)) {
-                // As we pass the geometry offsets to the surface iterator, we will
-                // need to account for the offsets in the clip dimensions.
-                clip_box.width = view->container->current.content_width + view->geometry.x;
-                clip_box.height = view->container->current.content_height + view->geometry.y;
-                data.clip_box = &clip_box;
-        }
-        // 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;
-        }
-
-        bool floating = container_is_current_floating(view->container);
-
-        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 proj_box = {
-                        .x = saved_buf->x - view->saved_geometry.x - output->lx,
-                        .y = saved_buf->y - view->saved_geometry.y - output->ly,
-                        .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, &proj_box);
-                if (!intersects) {
-                        continue;
-                }
-
-                struct wlr_box dst_box = proj_box;
-                scale_box(&proj_box, wlr_output->scale);
-
-                float matrix[9];
-                enum wl_output_transform transform = wlr_output_transform_invert(saved_buf->transform);
-                wlr_matrix_project_box(matrix, &proj_box, transform, 0,
-                        wlr_output->transform_matrix);
-
-                if (!floating) {
-                        dst_box.width = fmin(dst_box.width,
-                                        view->container->current.content_width -
-                                        (saved_buf->x - view->container->current.content_x) + view->saved_geometry.x);
-                        dst_box.height = fmin(dst_box.height,
-                                        view->container->current.content_height -
-                                        (saved_buf->y - view->container->current.content_y) + view->saved_geometry.y);
-                }
-                scale_box(&dst_box, wlr_output->scale);
-
-                render_texture(wlr_output, damage, saved_buf->buffer->texture,
-                        &saved_buf->source_box, &dst_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 = floor(state->x);
-                box.y = floor(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_current_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 = floor(state->content_x + state->content_width);
-                box.y = floor(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_current_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 = floor(state->x);
-                box.y = floor(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 = {
-                        .width = marks_texture->width,
-                        .height = marks_texture->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 = {
-                        .width = title_texture->width,
-                        .height = title_texture->height,
-                };
-
-                // The effective output may be NULL when con is not on any output.
-                // This can happen because we render all children of containers,
-                // even those that are out of the bounds of any output.
-                struct sway_output *effective = container_get_effective_output(con);
-                float title_scale = effective ? effective->wlr_output->scale : output_scale;
-                texture_box.width = texture_box.width * output_scale / title_scale;
-                texture_box.height = texture_box.height * output_scale / title_scale;
-                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((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 = floor(state->x);
-        box.y = floor(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, floor(state->x),
-                                                floor(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);
-                }
-        }
-}
-
-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);
-}
-
-/**
- * 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 (config->has_focused_tab_title && container_has_focused_child(child)) {
-                        colors = &config->border_colors.focused_tab_title;
-                        title_texture = child->title_focused_tab_title;
-                        marks_texture = child->marks_focused_tab_title;
-                } 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 = floor(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 (config->has_focused_tab_title && container_has_focused_child(child)) {
-                        colors = &config->border_colors.focused_tab_title;
-                        title_texture = child->title_focused_tab_title;
-                        marks_texture = child->marks_focused_tab_title;
-                 } 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 = floor(con->current.x),
-                        .y = floor(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 = floor(ws->current.x),
-                        .y = floor(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, floor(con->current.x),
-                                        floor(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->current.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 = output->server->renderer;
-
-        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 (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 (!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});
-        }
-
-        if (server.session_lock.locked) {
-                float clear_color[] = {0.0f, 0.0f, 0.0f, 1.0f};
-                if (server.session_lock.lock == NULL) {
-                        // abandoned lock -> red BG
-                        clear_color[0] = 1.f;
-                }
-                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 (server.session_lock.lock != NULL) {
-                        struct render_data data = {
-                                .damage = damage,
-                                .alpha = 1.0f,
-                        };
-
-                        struct wlr_session_lock_surface_v1 *lock_surface;
-                        wl_list_for_each(lock_surface, &server.session_lock.lock->surfaces, link) {
-                                if (lock_surface->output != wlr_output) {
-                                        continue;
-                                }
-                                if (!lock_surface->mapped) {
-                                        continue;
-                                }
-
-                                output_surface_for_each_surface(output, lock_surface->surface,
-                                        0.0, 0.0, render_surface_iterator, &data);
-                        }
-                }
-                goto renderer_end;
-        }
-
-        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_DEFAULT) {
-                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 1d7b536d..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_compositor.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 f5a3a053..042141ab 100644
--- a/sway/desktop/transaction.c
+++ b/sway/desktop/transaction.c
@@ -1,11 +1,10 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 #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"
@@ -214,39 +213,20 @@ static void transaction_add_node(struct sway_transaction *transaction,
 
 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 = saved_buf->x - view->saved_geometry.x,
-                                .y = saved_buf->y - view->saved_geometry.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.
@@ -256,35 +236,443 @@ 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;
+}
+
+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));
+        }
+
+        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 {
+                        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 (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 {
+                        wlr_scene_node_set_enabled(&child->layers.tiling->node, false);
+                        wlr_scene_node_set_enabled(&child->layers.fullscreen->node, false);
+
+                        disable_workspace(child);
                 }
         }
+}
 
-        // 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) {
-                view_center_surface(view);
+void arrange_popups(struct wlr_scene_tree *popups) {
+        struct wlr_scene_node *node;
+        wl_list_for_each(node, &popups->children, link) {
+                struct sway_popup_desc *popup = scene_descriptor_try_get(node,
+                        SWAY_SCENE_DESC_POPUP);
+
+                int lx, ly;
+                wlr_scene_node_coords(popup->relative, &lx, &ly);
+                wlr_scene_node_set_position(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);
 
-        // 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);
+        // 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 (!container->node.destroying) {
-                container_discover_outputs(container);
+        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);
+                        }
+                }
+
+                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_popups(root->layers.popup);
 }
 
 /**
@@ -326,8 +714,6 @@ static void transaction_apply(struct sway_transaction *transaction) {
 
                 node->instruction = NULL;
         }
-
-        cursor_rebase_all();
 }
 
 static void transaction_commit_pending(void);
@@ -340,11 +726,13 @@ static void transaction_progress(void) {
                 return;
         }
         transaction_apply(server.queued_transaction);
+        arrange_root(root);
+        cursor_rebase_all();
         transaction_destroy(server.queued_transaction);
         server.queued_transaction = NULL;
 
         if (!server.pending_transaction) {
-                sway_idle_inhibit_v1_check_active(server.idle_inhibit_manager_v1);
+                sway_idle_inhibit_v1_check_active();
                 return;
         }
 
@@ -415,21 +803,11 @@ static void transaction_commit(struct sway_transaction *transaction) {
                                 ++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);
+                        view_send_frame_done(node->sway_container->view);
                 }
                 if (!hidden && node_is_view(node) &&
-                                wl_list_empty(&node->sway_container->view->saved_buffers)) {
+                                !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;
         }
@@ -499,16 +877,18 @@ static void set_instruction_ready(
         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;
@@ -518,7 +898,9 @@ 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;
 }
 
 static void _transaction_commit_dirty(bool server_request) {
diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c
index 8da922d5..7c417891 100644
--- a/sway/desktop/xdg_shell.c
+++ b/sway/desktop/xdg_shell.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 199309L
 #include <float.h>
 #include <stdbool.h>
 #include <stdlib.h>
@@ -7,7 +6,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,55 +18,39 @@
 #include "sway/tree/workspace.h"
 #include "sway/xdg_decoration.h"
 
-static const struct sway_view_child_impl popup_impl;
-
-static void popup_get_view_coords(struct sway_view_child *child,
-                int *sx, int *sy) {
-        struct sway_xdg_popup *popup = (struct sway_xdg_popup *)child;
-        struct wlr_xdg_popup *wlr_popup = popup->wlr_xdg_popup;
-
-        wlr_xdg_popup_get_toplevel_coords(wlr_popup,
-                wlr_popup->current.geometry.x - wlr_popup->base->current.geometry.x,
-                wlr_popup->current.geometry.y - wlr_popup->base->current.geometry.y,
-                sx, 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_view_coords = popup_get_view_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);
+        wl_list_remove(&popup->reposition.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 sway_view *view = popup->view;
         struct wlr_xdg_popup *wlr_popup = popup->wlr_xdg_popup;
 
-        struct sway_output *output = view->container->pending.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
@@ -81,32 +64,72 @@ 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 void popup_handle_reposition(struct wl_listener *listener, void *data) {
+        struct sway_xdg_popup *popup = wl_container_of(listener, popup, reposition);
+        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;
+        }
+
+        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;
         }
-        view_child_init(&popup->child, &popup_impl, view, xdg_surface->surface);
+
+        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;
+        }
+
+        popup->desc.relative = &view->content_tree->node;
+        popup->desc.view = view;
+
+        if (!scene_descriptor_assign(&popup->scene_tree->node,
+                        SWAY_SCENE_DESC_POPUP, &popup->desc)) {
+                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.reposition, &popup->reposition);
+        popup->reposition.notify = popup_handle_reposition;
+        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,
@@ -163,12 +186,19 @@ static void set_tiled(struct sway_view *view, bool tiled) {
         if (xdg_shell_view_from_view(view) == NULL) {
                 return;
         }
-        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(view->wlr_xdg_toplevel, edges);
 }
 
 static void set_fullscreen(struct sway_view *view, bool fullscreen) {
@@ -194,24 +224,6 @@ 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_toplevel->base, 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_toplevel->base,
-                iterator, user_data);
-}
-
 static bool is_transient_for(struct sway_view *child,
                 struct sway_view *ancestor) {
         if (xdg_shell_view_from_view(child) == NULL) {
@@ -259,8 +271,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,
@@ -273,6 +283,20 @@ static void handle_commit(struct wl_listener *listener, void *data) {
         struct sway_view *view = &xdg_shell_view->view;
         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);
+                // TODO: wlr_xdg_toplevel_set_bounds()
+                return;
+        }
+
+        if (!xdg_surface->surface->mapped) {
+                return;
+        }
+
         struct wlr_box new_geo;
         wlr_xdg_surface_get_geometry(xdg_surface, &new_geo);
         bool new_size = new_geo.width != view->geometry.width ||
@@ -284,23 +308,32 @@ static void handle_commit(struct wl_listener *listener, void *data) {
                 // 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.
-                desktop_damage_view(view);
                 memcpy(&view->geometry, &new_geo, sizeof(struct wlr_box));
                 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();
-                } else {
-                        view_center_surface(view);
                 }
-                desktop_damage_view(view);
+
+                view_center_and_clip_surface(view);
         }
 
         if (view->container->node.instruction) {
-                transaction_notify_view_ready_by_serial(view,
+                bool successful = transaction_notify_view_ready_by_serial(view,
                                 xdg_surface->current.configure_serial);
-        }
 
-        view_damage_from(view);
+                // 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);
+                }
+        }
 }
 
 static void handle_set_title(struct wl_listener *listener, void *data) {
@@ -315,6 +348,7 @@ static void handle_set_app_id(struct wl_listener *listener, void *data) {
         struct sway_xdg_shell_view *xdg_shell_view =
                 wl_container_of(listener, xdg_shell_view, set_app_id);
         struct sway_view *view = &xdg_shell_view->view;
+        view_update_app_id(view);
         view_execute_criteria(view);
 }
 
@@ -322,7 +356,16 @@ 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) {
@@ -338,7 +381,7 @@ static void handle_request_fullscreen(struct wl_listener *listener, void *data)
         struct wlr_xdg_toplevel *toplevel = xdg_shell_view->view.wlr_xdg_toplevel;
         struct sway_view *view = &xdg_shell_view->view;
 
-        if (!toplevel->base->mapped) {
+        if (!toplevel->base->surface->mapped) {
                 return;
         }
 
@@ -403,7 +446,6 @@ 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_maximize.link);
         wl_list_remove(&xdg_shell_view->request_fullscreen.link);
@@ -446,10 +488,6 @@ static void handle_map(struct wl_listener *listener, void *data) {
 
         transaction_commit_dirty();
 
-        xdg_shell_view->commit.notify = handle_commit;
-        wl_signal_add(&toplevel->base->surface->events.commit,
-                &xdg_shell_view->commit);
-
         xdg_shell_view->new_popup.notify = handle_new_popup;
         wl_signal_add(&toplevel->base->events.new_popup,
                 &xdg_shell_view->new_popup);
@@ -489,6 +527,7 @@ 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);
+        wl_list_remove(&xdg_shell_view->commit.link);
         view->wlr_xdg_toplevel = NULL;
         if (view->xdg_decoration) {
                 view->xdg_decoration->view = NULL;
@@ -501,17 +540,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));
@@ -519,17 +553,29 @@ 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_toplevel = xdg_surface->toplevel;
+        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_toplevel->base->data = xdg_shell_view;
 
-        xdg_surface->data = xdg_shell_view;
+        wlr_xdg_toplevel_set_wm_capabilities(xdg_toplevel,
+                XDG_TOPLEVEL_WM_CAPABILITIES_FULLSCREEN);
 }
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index 7c5dde53..270cf08f 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -1,21 +1,23 @@
-#define _POSIX_C_SOURCE 199309L
 #include <float.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #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"
 
@@ -43,29 +45,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) {
@@ -73,17 +58,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);
+        surface->surface_scene = wlr_scene_surface_create(root->layers.unmanaged,
+                xsurface->surface);
 
-        wl_signal_add(&xsurface->events.set_geometry, &surface->set_geometry);
-        surface->set_geometry.notify = unmanaged_handle_set_geometry;
+        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);
 
-        wl_signal_add(&xsurface->surface->events.commit, &surface->commit);
-        surface->commit.notify = unmanaged_handle_commit;
-
-        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();
@@ -97,10 +83,13 @@ 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) {
@@ -123,8 +112,10 @@ static void unmanaged_handle_unmap(struct wl_listener *listener, void *data) {
 }
 
 static void unmanaged_handle_request_activate(struct wl_listener *listener, void *data) {
-        struct wlr_xwayland_surface *xsurface = data;
-        if (!xsurface->mapped) {
+        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();
@@ -136,12 +127,29 @@ static void unmanaged_handle_request_activate(struct wl_listener *listener, void
         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);
@@ -149,6 +157,7 @@ static void unmanaged_handle_destroy(struct wl_listener *listener, void *data) {
 }
 
 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);
 
@@ -157,14 +166,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);
         }
@@ -184,10 +201,10 @@ 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);
@@ -396,17 +413,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);
@@ -414,34 +420,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;
-        get_geometry(view, &new_geo);
+        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 ||
-                        new_geo.x != view->geometry.x ||
-                        new_geo.y != view->geometry.y;
+                        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.
-                desktop_damage_view(view);
                 memcpy(&view->geometry, &new_geo, sizeof(struct wlr_box));
                 if (container_is_floating(view->container)) {
                         view_update_size(view);
                         transaction_commit_dirty_client();
-                } else {
-                        view_center_surface(view);
                 }
-                desktop_damage_view(view);
+
+                view_center_and_clip_surface(view);
         }
 
         if (view->container->node.instruction) {
-                transaction_notify_view_ready_by_geometry(view,
+                bool successful = transaction_notify_view_ready_by_geometry(view,
                                 xsurface->x, xsurface->y, state->width, state->height);
-        }
 
-        view_damage_from(view);
+                // 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);
+                }
+        }
 }
 
 static void handle_destroy(struct wl_listener *listener, void *data) {
@@ -466,11 +476,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);
 }
@@ -484,16 +495,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;
@@ -506,23 +529,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);
         }
@@ -534,7 +576,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;
@@ -563,7 +605,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);
@@ -577,7 +619,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;
         }
 
@@ -592,7 +634,7 @@ 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) ||
@@ -608,7 +650,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)) {
@@ -624,10 +666,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();
 }
@@ -637,7 +679,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);
@@ -649,7 +691,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);
@@ -660,18 +702,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);
@@ -682,7 +749,7 @@ 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;
         }
         const bool hints_urgency = xcb_icccm_wm_hints_get_urgency(xsurface->hints);
@@ -697,6 +764,24 @@ static void handle_set_hints(struct wl_listener *listener, void *data) {
         }
 }
 
+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;
@@ -712,7 +797,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);
@@ -751,6 +839,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;
@@ -762,11 +854,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 2ee63124..3d04826c 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <assert.h>
 #include <math.h>
 #include <libevdev/libevdev.h>
@@ -7,8 +6,9 @@
 #include <time.h>
 #include <strings.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_relative_pointer_v1.h>
 #include <wlr/types/wlr_touch.h>
 #include <wlr/types/wlr_tablet_v2.h>
 #include <wlr/types/wlr_tablet_pad.h>
@@ -19,12 +19,12 @@
 #include "log.h"
 #include "util.h"
 #include "sway/commands.h"
-#include "sway/desktop.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"
@@ -37,45 +37,6 @@ static uint32_t get_current_time_msec(void) {
         return now.tv_sec * 1000 + now.tv_nsec / 1000000;
 }
 
-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;
-}
-
 /**
  * Returns the node at the cursor's position. If there is a surface at that
  * location, it is stored in **surface (it may not be a view).
@@ -83,116 +44,98 @@ 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) {
-        // find the output the cursor is 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);
+        struct wlr_scene_node *scene_node = NULL;
 
-        // layer surfaces on the overlay layer are rendered on top
-        if ((*surface = layer_surface_at(output,
-                                &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY],
-                                ox, oy, sx, sy))) {
-                return 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);
 
-        // check for unmanaged views
-#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;
+                bool non_interactive = scene_descriptor_try_get(&layer->node,
+                        SWAY_SCENE_DESC_NON_INTERACTIVE);
+                if (non_interactive) {
+                        continue;
                 }
-        }
-#endif
 
-        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;
+                scene_node = wlr_scene_node_at(&layer->node, lx, ly, sx, sy);
+                if (scene_node) {
+                        break;
                 }
-                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 (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 (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;
-                                }
+                        if (scene_surface) {
+                                *surface = scene_surface->surface;
                         }
                 }
-                // Try fullscreen container
-                struct sway_container *con =
-                        tiling_container_at(&ws->fullscreen->node, lx, ly, surface, sx, sy);
-                if (con) {
-                        return &con->node;
+
+                // 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_popup_desc *popup =
+                                        scene_descriptor_try_get(current, SWAY_SCENE_DESC_POPUP);
+                                if (popup && popup->view) {
+                                        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
+
+                        if (!current->parent) {
+                                break;
+                        }
+
+                        current = &current->parent->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 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;
         }
 
-        if ((*surface = layer_surface_at(output,
-                                &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM],
-                                ox, oy, sx, sy))) {
+        struct sway_output *output = wlr_output->data;
+        if (!output || !output->enabled) {
+                // output is being destroyed or is being enabled
                 return NULL;
         }
-        if ((*surface = layer_surface_at(output,
-                                &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND],
-                                ox, oy, sx, sy))) {
+
+        struct sway_workspace *ws = output_get_active_workspace(output);
+        if (!ws) {
                 return NULL;
         }
 
@@ -221,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 {
@@ -232,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);
 }
@@ -300,7 +243,7 @@ static enum sway_input_idle_source idle_source_from_device(
                 return IDLE_SOURCE_POINTER;
         case WLR_INPUT_DEVICE_TOUCH:
                 return IDLE_SOURCE_TOUCH;
-        case WLR_INPUT_DEVICE_TABLET_TOOL:
+        case WLR_INPUT_DEVICE_TABLET:
                 return IDLE_SOURCE_TABLET_TOOL;
         case WLR_INPUT_DEVICE_TABLET_PAD:
                 return IDLE_SOURCE_TABLET_PAD;
@@ -349,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(
@@ -413,7 +356,7 @@ static void handle_pointer_motion_absolute(
 
 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) {
+                enum wl_pointer_button_state state) {
         if (time_msec == 0) {
                 time_msec = get_current_time_msec();
         }
@@ -425,7 +368,7 @@ static void handle_pointer_button(struct wl_listener *listener, void *data) {
         struct sway_cursor *cursor = wl_container_of(listener, cursor, button);
         struct wlr_pointer_button_event *event = data;
 
-        if (event->state == WLR_BUTTON_PRESSED) {
+        if (event->state == WL_POINTER_BUTTON_STATE_PRESSED) {
                 cursor->pressed_button_count++;
         } else {
                 if (cursor->pressed_button_count > 0) {
@@ -464,43 +407,16 @@ static void handle_touch_down(struct wl_listener *listener, void *data) {
         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->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);
-
-                        if (focused_node) {
-                            seat_set_focus(seat, focused_node);
-                        }
-                }
-        } 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->touch->base, dx, dy,
-                        dx, dy);
-                dispatch_cursor_button(cursor, &event->touch->base, event->time_msec,
-                                BTN_LEFT, WLR_BUTTON_PRESSED);
-        }
+        seatop_touch_down(seat, event, lx, ly);
 }
 
 static void handle_touch_up(struct wl_listener *listener, void *data) {
@@ -508,16 +424,34 @@ static void handle_touch_up(struct wl_listener *listener, void *data) {
         struct wlr_touch_up_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->pointer_touch_up = true;
                         dispatch_cursor_button(cursor, &event->touch->base,
-                                event->time_msec, BTN_LEFT, WLR_BUTTON_RELEASED);
+                                event->time_msec, BTN_LEFT, WL_POINTER_BUTTON_STATE_RELEASED);
                 }
         } else {
-                wlr_seat_touch_notify_up(wlr_seat, event->time_msec, event->touch_id);
+                seatop_touch_up(seat, event);
+        }
+}
+
+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 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, WL_POINTER_BUTTON_STATE_RELEASED);
+                }
+        } else {
+                seatop_touch_cancel(seat, event);
         }
 }
 
@@ -528,25 +462,16 @@ static void handle_touch_motion(struct wl_listener *listener, void *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->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) {
@@ -557,9 +482,8 @@ static void handle_touch_motion(struct wl_listener *listener, void *data) {
                         pointer_motion(cursor, event->time_msec, &event->touch->base,
                                 dx, dy, dx, dy);
                 }
-        } else if (surface) {
-                wlr_seat_touch_notify_motion(wlr_seat, event->time_msec,
-                        event->touch_id, sx, sy);
+        } else {
+                seatop_touch_motion(seat, event, lx, ly);
         }
 }
 
@@ -594,7 +518,7 @@ 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 && device->type == WLR_INPUT_DEVICE_TABLET_TOOL) {
+        if (region->mm && device->type == WLR_INPUT_DEVICE_TABLET) {
                 struct wlr_tablet *tablet = wlr_tablet_from_input_device(device);
                 if (tablet->width_mm == 0 || tablet->height_mm == 0) {
                         return;
@@ -737,7 +661,7 @@ static void handle_tool_tip(struct wl_listener *listener, void *data) {
                         event->state == WLR_TABLET_TOOL_TIP_UP) {
                 cursor->simulating_pointer_from_tool_tip = false;
                 dispatch_cursor_button(cursor, &event->tablet->base, event->time_msec,
-                        BTN_LEFT, WLR_BUTTON_RELEASED);
+                        BTN_LEFT, WL_POINTER_BUTTON_STATE_RELEASED);
                 wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat);
         } else if (!surface || !wlr_surface_accepts_tablet_v2(tablet_v2, surface)) {
                 // If we started holding the tool tip down on a surface that accepts
@@ -749,7 +673,7 @@ static void handle_tool_tip(struct wl_listener *listener, void *data) {
                 } else {
                         cursor->simulating_pointer_from_tool_tip = true;
                         dispatch_cursor_button(cursor, &event->tablet->base,
-                                event->time_msec, BTN_LEFT, WLR_BUTTON_PRESSED);
+                                event->time_msec, BTN_LEFT, WL_POINTER_BUTTON_STATE_PRESSED);
                         wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat);
                 }
         } else {
@@ -818,31 +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->tablet->base,
-                                                event->time_msec, BTN_RIGHT, event->state);
+                                        event->time_msec, BTN_RIGHT, WL_POINTER_BUTTON_STATE_PRESSED);
                         }
-                        cursor->tool_buttons++;
                         break;
                 case WLR_BUTTON_RELEASED:
-                        if (cursor->tool_buttons == 1) {
+                        if (cursor->tool_buttons <= 1) {
                                 dispatch_cursor_button(cursor, &event->tablet->base,
-                                                event->time_msec, BTN_RIGHT, event->state);
+                                        event->time_msec, BTN_RIGHT, WL_POINTER_BUTTON_STATE_RELEASED);
                         }
-                        cursor->tool_buttons--;
                         break;
                 }
                 wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat);
-                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) {
@@ -1028,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);
         }
 }
 
@@ -1078,6 +1041,7 @@ 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);
@@ -1114,9 +1078,6 @@ 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;
 
-        // gesture events
-        cursor->pointer_gestures = wlr_pointer_gestures_v1_create(server.wl_display);
-
         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);
@@ -1159,6 +1120,9 @@ 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;
@@ -1251,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;
@@ -1277,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;
@@ -1316,12 +1271,15 @@ 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->pending.content_x - view->geometry.x;
@@ -1372,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 && node_is_view(focus)) {
-                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);
         }
 }
 
@@ -1435,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 4a0bce0e..248ca34e 100644
--- a/sway/input/input-manager.c
+++ b/sway/input/input-manager.c
@@ -1,12 +1,12 @@
-#define _POSIX_C_SOURCE 200809L
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
+#include <assert.h>
+#include <wlr/config.h>
 #include <wlr/backend/libinput.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 +22,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;
@@ -63,8 +67,15 @@ struct sway_seat *input_manager_sway_seat_from_wlr_seat(struct wlr_seat *wlr_sea
 }
 
 char *input_device_get_identifier(struct wlr_input_device *device) {
-        int vendor = device->vendor;
-        int product = device->product;
+        int vendor = 0, product = 0;
+#if WLR_HAS_LIBINPUT_BACKEND
+        if (wlr_input_device_is_libinput(device)) {
+                struct libinput_device *libinput_dev = wlr_libinput_get_device_handle(device);
+                vendor = libinput_device_get_id_vendor(libinput_dev);
+                product = libinput_device_get_id_product(libinput_dev);
+        }
+#endif
+
         char *name = strdup(device->name ? device->name : "");
         strip_whitespace(name);
 
@@ -76,20 +87,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 +103,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) {
@@ -113,7 +120,7 @@ const char *input_device_get_type(struct sway_input_device *device) {
                 return "keyboard";
         case WLR_INPUT_DEVICE_TOUCH:
                 return "touch";
-        case WLR_INPUT_DEVICE_TABLET_TOOL:
+        case WLR_INPUT_DEVICE_TABLET:
                 return "tablet_tool";
         case WLR_INPUT_DEVICE_TABLET_PAD:
                 return "tablet_pad";
@@ -236,7 +243,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,33 +285,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;
-        if (server.session_lock.locked) {
-                // Don't deactivate the grab of a screenlocker
-                return;
-        }
-        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);
         }
 }
 
@@ -446,6 +433,20 @@ void handle_virtual_pointer(struct wl_listener *listener, void *data) {
         }
 }
 
+static void handle_transient_seat_manager_create_seat(
+                struct wl_listener *listener, void *data) {
+        struct wlr_transient_seat_v1 *transient_seat = data;
+        static uint64_t i;
+        char name[256];
+        snprintf(name, sizeof(name), "transient-%"PRIx64, i++);
+        struct sway_seat *seat = seat_create(name);
+        if (seat && seat->wlr_seat) {
+                wlr_transient_seat_v1_ready(transient_seat, seat->wlr_seat);
+        } else {
+                wlr_transient_seat_v1_deny(transient_seat);
+        }
+}
+
 struct sway_input_manager *input_manager_create(struct sway_server *server) {
         struct sway_input_manager *input =
                 calloc(1, sizeof(struct sway_input_manager));
@@ -472,14 +473,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 =
@@ -487,6 +480,17 @@ 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);
+
+        input->transient_seat_manager =
+                wlr_transient_seat_manager_v1_create(server->wl_display);
+        assert(input->transient_seat_manager);
+
+        input->transient_seat_create.notify =
+                handle_transient_seat_manager_create_seat;
+        wl_signal_add(&input->transient_seat_manager->events.create_seat,
+                        &input->transient_seat_create);
+
         return input;
 }
 
@@ -524,21 +528,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
         }
 }
 
@@ -560,7 +593,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);
@@ -568,6 +603,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);
@@ -576,7 +618,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 5e5692f1..f74d0658 100644
--- a/sway/input/keyboard.c
+++ b/sway/input/keyboard.c
@@ -1,10 +1,9 @@
 #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>
@@ -16,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;
@@ -29,6 +32,7 @@ static struct modifier_key {
         { XKB_MOD_NAME_NUM, WLR_MODIFIER_MOD2 },
         { "Mod3", WLR_MODIFIER_MOD3 },
         { XKB_MOD_NAME_LOGO, WLR_MODIFIER_LOGO },
+        { "Super", WLR_MODIFIER_LOGO },
         { "Mod5", WLR_MODIFIER_MOD5 },
 };
 
@@ -264,14 +268,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;
                 }
         }
@@ -404,8 +406,7 @@ static void handle_key_event(struct sway_keyboard *keyboard,
         char *device_identifier = input_device_get_identifier(wlr_device);
         bool exact_identifier = keyboard->wlr->group != NULL;
         seat_idle_notify_activity(seat, IDLE_SOURCE_KEYBOARD);
-        bool input_inhibited = seat->exclusive_client != NULL ||
-                server.session_lock.locked;
+        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;
@@ -423,17 +424,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);
 
@@ -455,17 +456,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);
         }
@@ -715,23 +716,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;
@@ -752,7 +741,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;
         }
@@ -766,13 +755,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;
                 }
@@ -1068,8 +1052,12 @@ void sway_keyboard_configure(struct sway_keyboard *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, keyboard->wlr);
+        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(&keyboard->wlr->events.key, &keyboard->keyboard_key);
diff --git a/sway/input/libinput.c b/sway/input/libinput.c
index 3c0f359d..0266c7a9 100644
--- a/sway/input/libinput.c
+++ b/sway/input/libinput.c
@@ -79,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) ||
@@ -156,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) {
@@ -166,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;
@@ -187,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);
         }
@@ -231,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);
         }
@@ -252,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);
         }
@@ -287,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,
@@ -304,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);
diff --git a/sway/input/seat.c b/sway/input/seat.c
index b21e1b86..0c5672bc 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -1,12 +1,12 @@
-#define _POSIX_C_SOURCE 200809L
 #include <assert.h>
 #include <linux/input-event-codes.h>
 #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>
@@ -17,7 +17,7 @@
 #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"
@@ -67,6 +67,12 @@ static void seat_node_destroy(struct sway_seat_node *seat_node) {
 }
 
 void seat_destroy(struct sway_seat *seat) {
+        wlr_seat_destroy(seat->wlr_seat);
+}
+
+static void handle_seat_destroy(struct wl_listener *listener, void *data) {
+        struct sway_seat *seat = wl_container_of(listener, seat, destroy);
+
         if (seat == config->handler_context.seat) {
                 config->handler_context.seat = input_manager_get_default_seat();
         }
@@ -87,10 +93,11 @@ void seat_destroy(struct sway_seat *seat) {
         wl_list_remove(&seat->request_set_selection.link);
         wl_list_remove(&seat->request_set_primary_selection.link);
         wl_list_remove(&seat->link);
-        wlr_seat_destroy(seat->wlr_seat);
+        wl_list_remove(&seat->destroy.link);
         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);
@@ -98,21 +105,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);
 }
 
 /**
@@ -174,11 +170,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);
         }
 }
 
@@ -202,7 +198,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 =
@@ -212,15 +208,6 @@ static void seat_send_focus(struct sway_node *node, struct sway_seat *seat) {
         }
 }
 
-void sway_force_focus(struct wlr_surface *surface) {
-        struct sway_seat *seat;
-        wl_list_for_each(seat, &server.input->seats, link) {
-                seat_keyboard_notify_enter(seat, surface);
-                seat_tablet_pads_notify_enter(seat, surface);
-                sway_input_method_relay_set_focus(&seat->im_relay, surface);
-        }
-}
-
 void seat_for_each_node(struct sway_seat *seat,
                 void (*f)(struct sway_node *node, void *data), void *data) {
         struct sway_seat_node *current = NULL;
@@ -372,25 +359,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 + wlr_icon->surface->sx;
-                icon->y = cursor->y + wlr_icon->surface->sy;
+                wlr_scene_node_set_position(node, cursor->x, cursor->y);
                 break;
         case WLR_DRAG_GRAB_KEYBOARD_TOUCH:;
                 struct wlr_touch_point *point =
@@ -398,39 +375,15 @@ void drag_icon_update_position(struct sway_drag_icon *icon) {
                 if (point == NULL) {
                         return;
                 }
-                icon->x = seat->touch_x + wlr_icon->surface->sx;
-                icon->y = seat->touch_y + wlr_icon->surface->sy;
+                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) {
@@ -502,27 +455,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);
 }
@@ -569,8 +515,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;
         }
@@ -578,11 +534,15 @@ 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;
         }
 
+        seat->destroy.notify = handle_seat_destroy;
+        wl_signal_add(&seat->wlr_seat->events.destroy, &seat->destroy);
+
         seat->idle_inhibit_sources = seat->idle_wake_sources =
                 IDLE_SOURCE_KEYBOARD |
                 IDLE_SOURCE_POINTER |
@@ -656,7 +616,7 @@ static void seat_update_capabilities(struct sway_seat *seat) {
                 case WLR_INPUT_DEVICE_TOUCH:
                         caps |= WL_SEAT_CAPABILITY_TOUCH;
                         break;
-                case WLR_INPUT_DEVICE_TABLET_TOOL:
+                case WLR_INPUT_DEVICE_TABLET:
                         caps |= WL_SEAT_CAPABILITY_POINTER;
                         break;
                 case WLR_INPUT_DEVICE_SWITCH:
@@ -674,7 +634,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);
                 }
         }
 }
@@ -714,19 +674,28 @@ static const char *get_builtin_output_name(void) {
 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:
+        case WLR_INPUT_DEVICE_TABLET:
                 return true;
         default:
                 return false;
         }
 }
 
-static void seat_apply_input_config(struct sway_seat *seat,
+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:
+                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;
@@ -754,6 +723,7 @@ static void seat_apply_input_config(struct sway_seat *seat,
                         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();
@@ -762,6 +732,10 @@ static void seat_apply_input_config(struct sway_seat *seat,
                                         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;
                 }
@@ -805,12 +779,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));
 }
@@ -821,8 +792,15 @@ 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,
-                wlr_keyboard_from_input_device(seat_device->input_device->wlr_device));
+
+        // 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.
@@ -838,7 +816,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);
 }
 
@@ -846,7 +823,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,
@@ -857,7 +833,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,
@@ -907,13 +882,25 @@ void seat_configure_device(struct sway_seat *seat,
                 case WLR_INPUT_DEVICE_TOUCH:
                         seat_configure_touch(seat, seat_device);
                         break;
-                case WLR_INPUT_DEVICE_TABLET_TOOL:
+                case WLR_INPUT_DEVICE_TABLET:
                         seat_configure_tablet_tool(seat, seat_device);
                         break;
                 case WLR_INPUT_DEVICE_TABLET_PAD:
                         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,
@@ -934,7 +921,7 @@ void seat_reset_device(struct sway_seat *seat,
                 case WLR_INPUT_DEVICE_TOUCH:
                         seat_reset_input_config(seat, seat_device);
                         break;
-                case WLR_INPUT_DEVICE_TABLET_TOOL:
+                case WLR_INPUT_DEVICE_TABLET:
                         seat_reset_input_config(seat, seat_device);
                         break;
                 case WLR_INPUT_DEVICE_TABLET_PAD:
@@ -1030,7 +1017,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(
@@ -1056,33 +1043,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 == client ||
-                (seat->exclusive_client == NULL && !server.session_lock.locked);
+        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) {
@@ -1141,15 +1130,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;
@@ -1183,11 +1164,6 @@ void seat_set_focus(struct sway_seat *seat, struct sway_node *node) {
                 return;
         }
 
-        // Deny setting focus when an input grab or lockscreen is active
-        if (container && container->view && !seat_is_input_allowed(seat, container->view->surface)) {
-                return;
-        }
-
         struct sway_output *new_output =
                 new_workspace ? new_workspace->output : NULL;
 
@@ -1287,6 +1263,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);
@@ -1312,7 +1306,7 @@ void seat_set_focus_surface(struct sway_seat *seat,
         }
 
         sway_input_method_relay_set_focus(&seat->im_relay, surface);
-        seat_tablet_pads_notify_enter(seat, surface);
+        seat_tablet_pads_set_focus(seat, surface);
 }
 
 void seat_set_focus_layer(struct sway_seat *seat,
@@ -1326,28 +1320,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);
@@ -1374,7 +1363,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,
@@ -1541,7 +1529,7 @@ struct seat_config *seat_get_config_by_name(const char *name) {
 }
 
 void seat_pointer_notify_button(struct sway_seat *seat, uint32_t time_msec,
-                uint32_t button, enum wlr_button_state state) {
+                uint32_t button, enum wl_pointer_button_state state) {
         seat->last_button_serial = wlr_seat_pointer_notify_button(seat->wlr_seat,
                         time_msec, button, state);
 }
@@ -1578,7 +1566,7 @@ void seatop_unref(struct sway_seat *seat, struct sway_container *con) {
 
 void seatop_button(struct sway_seat *seat, uint32_t time_msec,
                 struct wlr_input_device *device, uint32_t button,
-                enum wlr_button_state state) {
+                enum wl_pointer_button_state state) {
         if (seat->seatop_impl->button) {
                 seat->seatop_impl->button(seat, time_msec, device, button, state);
         }
@@ -1597,6 +1585,32 @@ void seatop_pointer_axis(struct sway_seat *seat,
         }
 }
 
+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) {
@@ -1685,13 +1699,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 875426bf..0c6f7c5e 100644
--- a/sway/input/seatop_default.c
+++ b/sway/input/seatop_default.c
@@ -1,7 +1,7 @@
-#define _POSIX_C_SOURCE 200809L
 #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"
@@ -9,7 +9,9 @@
 #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"
@@ -53,6 +55,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;
@@ -228,14 +233,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);
-                        transaction_commit_dirty();
-                }
+                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);
@@ -260,20 +266,17 @@ static void handle_tablet_tool_tip(struct sway_seat *seat,
 
                 // 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);
-                        transaction_commit_dirty();
-                }
+        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
 
@@ -287,7 +290,7 @@ static void handle_tablet_tool_tip(struct sway_seat *seat,
 
 static bool trigger_pointer_button_binding(struct sway_seat *seat,
                 struct wlr_input_device *device, uint32_t button,
-                enum wlr_button_state state, uint32_t modifiers,
+                enum wl_pointer_button_state state, uint32_t modifiers,
                 bool on_titlebar, bool on_border, bool on_contents, bool on_workspace) {
         // We can reach this for non-pointer devices if we're currently emulating
         // pointer input for one. Emulated input should not trigger bindings. The
@@ -301,7 +304,7 @@ static bool trigger_pointer_button_binding(struct sway_seat *seat,
         char *device_identifier = device ? input_device_get_identifier(device)
                 : strdup("*");
         struct sway_binding *binding = NULL;
-        if (state == WLR_BUTTON_PRESSED) {
+        if (state == WL_POINTER_BUTTON_STATE_PRESSED) {
                 state_add_button(e, button);
                 binding = get_active_mouse_binding(e,
                         config->current_mode->mouse_bindings, modifiers, false,
@@ -326,7 +329,7 @@ static bool trigger_pointer_button_binding(struct sway_seat *seat,
 
 static void handle_button(struct sway_seat *seat, uint32_t time_msec,
                 struct wlr_input_device *device, uint32_t button,
-                enum wlr_button_state state) {
+                enum wl_pointer_button_state state) {
         struct sway_cursor *cursor = seat->cursor;
 
         // Determine what's under the cursor
@@ -359,7 +362,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
 
         // Handle clicking an empty workspace
         if (node && node->type == N_WORKSPACE) {
-                if (state == WLR_BUTTON_PRESSED) {
+                if (state == WL_POINTER_BUTTON_STATE_PRESSED) {
                         seat_set_focus(seat, node);
                         transaction_commit_dirty();
                 }
@@ -367,16 +370,15 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
                 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, time_msec, sx, sy);
+                if (state == WL_POINTER_BUTTON_STATE_PRESSED) {
+                        seatop_begin_down_on_surface(seat, surface, sx, sy);
                 }
                 seat_pointer_notify_button(seat, time_msec, button, state);
                 return;
@@ -384,7 +386,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
 
         // Handle tiling resize via border
         if (cont && resize_edge && button == BTN_LEFT &&
-                        state == WLR_BUTTON_PRESSED && !is_floating) {
+                        state == WL_POINTER_BUTTON_STATE_PRESSED && !is_floating) {
                 // If a resize is triggered on a tabbed or stacked container, change
                 // focus to the tab which already had inactive focus -- otherwise, we'd
                 // change the active tab when the user probably just wanted to resize.
@@ -402,7 +404,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
         // Handle tiling resize via mod
         bool mod_pressed = modifiers & config->floating_mod;
         if (cont && !is_floating_or_child && mod_pressed &&
-                        state == WLR_BUTTON_PRESSED) {
+                        state == WL_POINTER_BUTTON_STATE_PRESSED) {
                 uint32_t btn_resize = config->floating_mod_inverse ?
                         BTN_LEFT : BTN_RIGHT;
                 if (button == btn_resize) {
@@ -429,13 +431,31 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
                 }
         }
 
+        // Handle changing focus when clicking on a container
+        if (cont && state == WL_POINTER_BUTTON_STATE_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) {
+                        state == WL_POINTER_BUTTON_STATE_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;
                 }
@@ -443,9 +463,10 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
 
         // Handle beginning floating resize
         if (cont && is_floating_or_child && !is_fullscreen_or_child &&
-                        state == WLR_BUTTON_PRESSED) {
+                        state == WL_POINTER_BUTTON_STATE_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;
                 }
@@ -460,6 +481,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
                                 WLR_EDGE_RIGHT : WLR_EDGE_LEFT;
                         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;
                 }
@@ -467,55 +489,43 @@ 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 &&
+                        state == WL_POINTER_BUTTON_STATE_PRESSED && !is_floating_or_child &&
                         cont && cont->pending.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 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);
-                seat_pointer_notify_button(seat, time_msec, button, WLR_BUTTON_PRESSED);
+        if (surface && cont && state == WL_POINTER_BUTTON_STATE_PRESSED) {
+                seatop_begin_down(seat, cont, sx, sy);
+                seat_pointer_notify_button(seat, time_msec, button, WL_POINTER_BUTTON_STATE_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);
-                transaction_commit_dirty();
+        if (cont && state == WL_POINTER_BUTTON_STATE_PRESSED) {
                 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);
-                        transaction_commit_dirty();
-                        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
 
@@ -538,6 +548,21 @@ 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);
@@ -598,12 +623,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;
 }
@@ -633,25 +653,50 @@ 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, WL_POINTER_BUTTON_STATE_PRESSED);
+        }
+}
+
 /*----------------------------------------\
  * Functions used by handle_pointer_axis  /
  *--------------------------------------*/
 
 static uint32_t wl_axis_to_button(struct wlr_pointer_axis_event *event) {
         switch (event->orientation) {
-        case WLR_AXIS_ORIENTATION_VERTICAL:
+        case WL_POINTER_AXIS_VERTICAL_SCROLL:
                 return event->delta < 0 ? SWAY_SCROLL_UP : SWAY_SCROLL_DOWN;
-        case WLR_AXIS_ORIENTATION_HORIZONTAL:
+        case WL_POINTER_AXIS_HORIZONTAL_SCROLL:
                 return event->delta < 0 ? SWAY_SCROLL_LEFT : SWAY_SCROLL_RIGHT;
         default:
                 sway_log(SWAY_DEBUG, "Unknown axis orientation");
@@ -708,6 +753,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);
@@ -715,7 +761,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 / WLR_POINTER_AXIS_DISCRETE_STEP);
+                                roundf(scroll_factor * event->delta_discrete / WLR_POINTER_AXIS_DISCRETE_STEP);
                         if (desired < 0) {
                                 desired = 0;
                         } else if (desired >= siblings->length) {
@@ -724,14 +770,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);
-                        transaction_commit_dirty();
-                        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
@@ -747,8 +795,9 @@ 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);
         }
 }
 
@@ -894,7 +943,7 @@ static void handle_hold_begin(struct sway_seat *seat,
                 // ... otherwise forward to client
                 struct sway_cursor *cursor = seat->cursor;
                 wlr_pointer_gestures_v1_send_hold_begin(
-                        cursor->pointer_gestures, cursor->seat->wlr_seat,
+                        server.input->pointer_gestures, cursor->seat->wlr_seat,
                         event->time_msec, event->fingers);
         }
 }
@@ -906,7 +955,7 @@ static void handle_hold_end(struct sway_seat *seat,
         if (!gesture_tracker_check(&seatop->gestures, GESTURE_TYPE_HOLD)) {
                 struct sway_cursor *cursor = seat->cursor;
                 wlr_pointer_gestures_v1_send_hold_end(
-                        cursor->pointer_gestures, cursor->seat->wlr_seat,
+                        server.input->pointer_gestures, cursor->seat->wlr_seat,
                         event->time_msec, event->cancelled);
                 return;
         }
@@ -939,7 +988,7 @@ static void handle_pinch_begin(struct sway_seat *seat,
                 // ... otherwise forward to client
                 struct sway_cursor *cursor = seat->cursor;
                 wlr_pointer_gestures_v1_send_pinch_begin(
-                        cursor->pointer_gestures, cursor->seat->wlr_seat,
+                        server.input->pointer_gestures, cursor->seat->wlr_seat,
                         event->time_msec, event->fingers);
         }
 }
@@ -955,7 +1004,7 @@ static void handle_pinch_update(struct sway_seat *seat,
                 // ... otherwise forward to client
                 struct sway_cursor *cursor = seat->cursor;
                 wlr_pointer_gestures_v1_send_pinch_update(
-                        cursor->pointer_gestures,
+                        server.input->pointer_gestures,
                         cursor->seat->wlr_seat,
                         event->time_msec, event->dx, event->dy,
                         event->scale, event->rotation);
@@ -969,7 +1018,7 @@ static void handle_pinch_end(struct sway_seat *seat,
         if (!gesture_tracker_check(&seatop->gestures, GESTURE_TYPE_PINCH)) {
                 struct sway_cursor *cursor = seat->cursor;
                 wlr_pointer_gestures_v1_send_pinch_end(
-                        cursor->pointer_gestures, cursor->seat->wlr_seat,
+                        server.input->pointer_gestures, cursor->seat->wlr_seat,
                         event->time_msec, event->cancelled);
                 return;
         }
@@ -1002,7 +1051,7 @@ static void handle_swipe_begin(struct sway_seat *seat,
                 // ... otherwise forward to client
                 struct sway_cursor *cursor = seat->cursor;
                 wlr_pointer_gestures_v1_send_swipe_begin(
-                        cursor->pointer_gestures, cursor->seat->wlr_seat,
+                        server.input->pointer_gestures, cursor->seat->wlr_seat,
                         event->time_msec, event->fingers);
         }
 }
@@ -1019,7 +1068,7 @@ static void handle_swipe_update(struct sway_seat *seat,
                 // ... otherwise forward to client
                 struct sway_cursor *cursor = seat->cursor;
                 wlr_pointer_gestures_v1_send_swipe_update(
-                        cursor->pointer_gestures, cursor->seat->wlr_seat,
+                        server.input->pointer_gestures, cursor->seat->wlr_seat,
                         event->time_msec, event->dx, event->dy);
         }
 }
@@ -1030,7 +1079,7 @@ static void handle_swipe_end(struct sway_seat *seat,
         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(cursor->pointer_gestures,
+                wlr_pointer_gestures_v1_send_swipe_end(server.input->pointer_gestures,
                         cursor->seat->wlr_seat, event->time_msec, event->cancelled);
                 return;
         }
@@ -1087,6 +1136,7 @@ static const struct sway_seatop_impl seatop_impl = {
         .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,
 };
diff --git a/sway/input/seatop_down.c b/sway/input/seatop_down.c
index b40773d0..340e334b 100644
--- a/sway/input/seatop_down.c
+++ b/sway/input/seatop_down.c
@@ -1,13 +1,20 @@
-#define _POSIX_C_SOURCE 200809L
 #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;
@@ -15,8 +22,113 @@ struct seatop_down_event {
         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) {
+                struct wl_client *client = wl_resource_get_client(e->surface->resource);
+                struct wlr_seat_client *seat_client = wlr_seat_client_for_wl_client(seat->wlr_seat, client);
+                if (seat_client != NULL) {
+                        wlr_seat_touch_notify_cancel(seat->wlr_seat, seat_client);
+                }
+        }
+
+        if (wl_list_empty(&e->point_events)) {
+                seatop_begin_default(seat);
+        }
+}
+
 static void handle_pointer_axis(struct sway_seat *seat,
                 struct wlr_pointer_axis_event *event) {
         struct sway_input_device *input_device =
@@ -28,12 +140,13 @@ 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,
                 struct wlr_input_device *device, uint32_t button,
-                enum wlr_button_state state) {
+                enum wl_pointer_button_state state) {
         seat_pointer_notify_button(seat, time_msec, button, state);
 
         if (seat->cursor->pressed_button_count == 0) {
@@ -99,14 +212,18 @@ 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,
+        .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, double sx, double sy) {
-        seatop_begin_down_on_surface(seat, con->view->surface, time_msec, sx, 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;
 
@@ -114,13 +231,20 @@ void seatop_begin_down(struct sway_seat *seat, struct sway_container *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, uint32_t time_msec, double sx, double sy) {
+                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 = NULL;
@@ -132,6 +256,7 @@ void seatop_begin_down_on_surface(struct sway_seat *seat,
         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;
diff --git a/sway/input/seatop_move_floating.c b/sway/input/seatop_move_floating.c
index ddcd4c53..83668d88 100644
--- a/sway/input/seatop_move_floating.c
+++ b/sway/input/seatop_move_floating.c
@@ -1,6 +1,4 @@
-#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"
@@ -23,7 +21,7 @@ static void finalize_move(struct sway_seat *seat) {
 
 static void handle_button(struct sway_seat *seat, uint32_t time_msec,
                 struct wlr_input_device *device, uint32_t button,
-                enum wlr_button_state state) {
+                enum wl_pointer_button_state state) {
         if (seat->cursor->pressed_button_count == 0) {
                 finalize_move(seat);
         }
@@ -39,9 +37,7 @@ 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();
 }
 
diff --git a/sway/input/seatop_move_tiling.c b/sway/input/seatop_move_tiling.c
index 223c6c08..c525b77a 100644
--- a/sway/input/seatop_move_tiling.c
+++ b/sway/input/seatop_move_tiling.c
@@ -1,8 +1,6 @@
-#define _POSIX_C_SOURCE 200809L
 #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"
@@ -24,29 +22,17 @@ 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) {
@@ -67,6 +53,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);
         }
@@ -165,6 +152,11 @@ static bool split_titlebar(struct sway_node *node, struct sway_container *avoid,
         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;
@@ -173,8 +165,6 @@ static void handle_motion_postthreshold(struct sway_seat *seat) {
         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
@@ -187,8 +177,10 @@ 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;
         }
 
@@ -201,11 +193,18 @@ static void handle_motion_postthreshold(struct sway_seat *seat) {
                 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,
-                                &e->drop_box, &e->insert_after_target)) {
+                                &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) {
@@ -215,6 +214,7 @@ static void handle_motion_postthreshold(struct sway_seat *seat) {
                         e->split_target = true;
                 }
                 e->target_edge = WLR_EDGE_NONE;
+                update_indicator(e, &drop_box);
                 return;
         }
 
@@ -256,8 +256,7 @@ static void handle_motion_postthreshold(struct sway_seat *seat) {
                                 e->target_node = node_get_parent(e->target_node);
                         }
                         e->target_edge = edge;
-                        e->drop_box = box;
-                        desktop_damage_box(&e->drop_box);
+                        update_indicator(e, &box);
                         return;
                 }
                 con = con->pending.parent;
@@ -299,12 +298,8 @@ static void handle_motion_postthreshold(struct sway_seat *seat) {
         }
 
         e->target_node = node;
-        e->drop_box.x = con->pending.content_x;
-        e->drop_box.y = con->pending.content_y;
-        e->drop_box.width = con->pending.content_width;
-        e->drop_box.height = con->pending.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) {
@@ -410,7 +405,7 @@ static void finalize_move(struct sway_seat *seat) {
 
 static void handle_button(struct sway_seat *seat, uint32_t time_msec,
                 struct wlr_input_device *device, uint32_t button,
-                enum wlr_button_state state) {
+                enum wl_pointer_button_state state) {
         if (seat->cursor->pressed_button_count == 0) {
                 finalize_move(seat);
         }
@@ -439,7 +434,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,
@@ -451,6 +446,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;
diff --git a/sway/input/seatop_resize_floating.c b/sway/input/seatop_resize_floating.c
index df683026..bec86e33 100644
--- a/sway/input/seatop_resize_floating.c
+++ b/sway/input/seatop_resize_floating.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <limits.h>
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_xcursor_manager.h>
@@ -21,7 +20,7 @@ struct seatop_resize_floating_event {
 
 static void handle_button(struct sway_seat *seat, uint32_t time_msec,
                 struct wlr_input_device *device, uint32_t button,
-                enum wlr_button_state state) {
+                enum wl_pointer_button_state state) {
         struct seatop_resize_floating_event *e = seat->seatop_data;
         struct sway_container *con = e->con;
 
diff --git a/sway/input/seatop_resize_tiling.c b/sway/input/seatop_resize_tiling.c
index 869d11b5..15fd333b 100644
--- a/sway/input/seatop_resize_tiling.c
+++ b/sway/input/seatop_resize_tiling.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/util/edges.h>
 #include "sway/commands.h"
@@ -46,7 +45,7 @@ static struct sway_container *container_get_resize_sibling(
 
 static void handle_button(struct sway_seat *seat, uint32_t time_msec,
                 struct wlr_input_device *device, uint32_t button,
-                enum wlr_button_state state) {
+                enum wl_pointer_button_state state) {
         struct seatop_resize_tiling_event *e = seat->seatop_data;
 
         if (seat->cursor->pressed_button_count == 0) {
diff --git a/sway/input/switch.c b/sway/input/switch.c
index fc7dfaff..831f4dbf 100644
--- a/sway/input/switch.c
+++ b/sway/input/switch.c
@@ -1,6 +1,5 @@
 #include "sway/config.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,
@@ -34,9 +33,8 @@ static bool sway_switch_trigger_test(enum sway_switch_trigger trigger,
 }
 
 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 ||
-                server.session_lock.locked;
+        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;
@@ -53,13 +51,13 @@ static void execute_binding(struct sway_switch *sway_switch) {
                         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;
                 }
         }
diff --git a/sway/input/tablet.c b/sway/input/tablet.c
index 92ede3fa..2863642a 100644
--- a/sway/input/tablet.c
+++ b/sway/input/tablet.c
@@ -1,6 +1,5 @@
-#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 +8,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 +57,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 +89,7 @@ void sway_configure_tablet(struct sway_tablet *tablet) {
                         break;
                 }
         }
+#endif
 }
 
 void sway_tablet_destroy(struct sway_tablet *tablet) {
@@ -287,6 +290,7 @@ void sway_configure_tablet_pad(struct sway_tablet_pad *tablet_pad) {
         tablet_pad->ring.notify = handle_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(wlr_device)) {
                 /* We can only do this on libinput devices */
@@ -311,6 +315,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) {
@@ -334,14 +339,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;
@@ -360,7 +361,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;
         }
 
@@ -368,7 +370,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 58911c2d..c38a3bb2 100644
--- a/sway/input/text_input.c
+++ b/sway/input/text_input.c
@@ -2,7 +2,14 @@
 #include <stdlib.h>
 #include "log.h"
 #include "sway/input/seat.h"
+#include "sway/scene_descriptor.h"
+#include "sway/tree/root.h"
+#include "sway/tree/view.h"
+#include "sway/output.h"
 #include "sway/input/text_input.h"
+#include "sway/input/text_input_popup.h"
+#include "sway/layers.h"
+static void input_popup_update(struct sway_input_popup *popup);
 
 static struct sway_text_input *relay_get_focusable_text_input(
                 struct sway_input_method_relay *relay) {
@@ -102,6 +109,10 @@ static void handle_im_destroy(struct wl_listener *listener, void *data) {
                 input_method_destroy);
         struct wlr_input_method_v2 *context = data;
         assert(context == relay->input_method);
+        wl_list_remove(&relay->input_method_commit.link);
+        wl_list_remove(&relay->input_method_grab_keyboard.link);
+        wl_list_remove(&relay->input_method_destroy.link);
+        wl_list_remove(&relay->input_method_new_popup_surface.link);
         relay->input_method = NULL;
         struct sway_text_input *text_input = relay_get_focused_text_input(relay);
         if (text_input) {
@@ -133,6 +144,11 @@ static void relay_send_im_state(struct sway_input_method_relay *relay,
                         input->current.content_type.hint,
                         input->current.content_type.purpose);
         }
+        struct sway_input_popup *popup;
+        wl_list_for_each(popup, &relay->input_popups, link) {
+                // send_text_input_rectangle is called in this function
+                input_popup_update(popup);
+        }
         wlr_input_method_v2_send_done(input_method);
         // TODO: pass intent, display popup size
 }
@@ -255,6 +271,211 @@ static void relay_handle_text_input(struct wl_listener *listener,
         sway_text_input_create(relay, wlr_text_input);
 }
 
+static void input_popup_update(struct sway_input_popup *popup) {
+        struct sway_text_input *text_input =
+                relay_get_focused_text_input(popup->relay);
+
+        if (text_input == NULL || text_input->input->focused_surface == NULL) {
+                return;
+        }
+
+        if (popup->scene_tree != NULL) {
+                wlr_scene_node_destroy(&popup->scene_tree->node);
+                popup->scene_tree = NULL;
+        }
+        if (popup->desc.relative != NULL) {
+                wlr_scene_node_destroy(popup->desc.relative);
+                popup->desc.relative = NULL;
+        }
+        popup->desc.view = NULL;
+
+        if (!popup->popup_surface->surface->mapped) {
+                return;
+        }
+
+        bool cursor_rect = text_input->input->current.features
+                & WLR_TEXT_INPUT_V3_FEATURE_CURSOR_RECTANGLE;
+        struct wlr_surface *focused_surface = text_input->input->focused_surface;
+        struct wlr_box cursor_area = text_input->input->current.cursor_rectangle;
+
+        struct wlr_box output_box;
+        struct wlr_box parent = {0};
+        struct wlr_layer_surface_v1 *layer_surface =
+                wlr_layer_surface_v1_try_from_wlr_surface(focused_surface);
+        struct wlr_scene_tree *relative_parent;
+
+        struct wlr_box geo = {0};
+
+        popup->scene_tree = wlr_scene_subsurface_tree_create(root->layers.popup, popup->popup_surface->surface);
+        if (layer_surface != NULL) {
+                struct sway_layer_surface *layer =
+                        layer_surface->data;
+                if (layer == NULL) {
+                        return;
+                }
+
+                relative_parent = layer->scene->tree;
+                struct wlr_output *output = layer->layer_surface->output;
+                wlr_output_layout_get_box(root->output_layout, output, &output_box);
+                int lx, ly;
+                wlr_scene_node_coords(&layer->tree->node, &lx, &ly);
+                parent.x = lx;
+                parent.y = ly;
+                popup->desc.view = NULL;
+        } else {
+                struct sway_view *view = view_from_wlr_surface(focused_surface);
+                relative_parent = view->scene_tree;
+                geo = view->geometry;
+                int lx, ly;
+                wlr_scene_node_coords(&view->scene_tree->node, &lx, &ly);
+                struct wlr_output *output = wlr_output_layout_output_at(root->output_layout,
+                        view->container->pending.content_x + view->geometry.x,
+                        view->container->pending.content_y + view->geometry.y);
+                wlr_output_layout_get_box(root->output_layout, output, &output_box);
+                parent.x = lx;
+                parent.y = ly;
+
+                parent.width = view->geometry.width;
+                parent.height = view->geometry.height;
+                popup->desc.view = view;
+        }
+
+        struct wlr_scene_tree *relative = wlr_scene_tree_create(relative_parent);
+
+        popup->desc.relative = &relative->node;
+        if (!scene_descriptor_assign(&popup->scene_tree->node,
+                        SWAY_SCENE_DESC_POPUP, &popup->desc)) {
+                wlr_scene_node_destroy(&popup->scene_tree->node);
+                popup->scene_tree = NULL;
+                return;
+        }
+
+        if (!cursor_rect) {
+                cursor_area.x = 0;
+                cursor_area.y = 0;
+                cursor_area.width = parent.width;
+                cursor_area.height = parent.height;
+        }
+
+        int popup_width = popup->popup_surface->surface->current.width;
+        int popup_height = popup->popup_surface->surface->current.height;
+        int x1 = parent.x + cursor_area.x;
+        int x2 = parent.x + cursor_area.x + cursor_area.width;
+        int y1 = parent.y + cursor_area.y;
+        int y2 = parent.y + cursor_area.y + cursor_area.height;
+        int x = x1;
+        int y = y2;
+
+        int available_right = output_box.x + output_box.width - x1;
+        int available_left = x2 - output_box.x;
+        if (available_right < popup_width && available_left > available_right) {
+                x = x2 - popup_width;
+        }
+
+        int available_down = output_box.y + output_box.height - y2;
+        int available_up = y1 - output_box.y;
+        if (available_down < popup_height && available_up > available_down) {
+                y = y1 - popup_height;
+        }
+
+        wlr_scene_node_set_position(&relative->node, x - parent.x - geo.x, y - parent.y - geo.y);
+        if (cursor_rect) {
+                struct wlr_box box = {
+                        .x = x1 - x,
+                        .y = y1 - y,
+                        .width = cursor_area.width,
+                        .height = cursor_area.height,
+                };
+                wlr_input_popup_surface_v2_send_text_input_rectangle(
+                        popup->popup_surface, &box);
+        }
+        wlr_scene_node_set_position(&popup->scene_tree->node, x - geo.x, y - geo.y);
+}
+
+static void input_popup_set_focus(struct sway_input_popup *popup,
+                struct wlr_surface *surface) {
+        wl_list_remove(&popup->focused_surface_unmap.link);
+
+        if (surface == NULL) {
+                wl_list_init(&popup->focused_surface_unmap.link);
+                input_popup_update(popup);
+                return;
+        }
+        struct wlr_layer_surface_v1 *layer_surface =
+                wlr_layer_surface_v1_try_from_wlr_surface(surface);
+        if (layer_surface != NULL) {
+                wl_signal_add(
+                        &layer_surface->surface->events.unmap, &popup->focused_surface_unmap);
+                input_popup_update(popup);
+                return;
+        }
+
+        struct sway_view *view = view_from_wlr_surface(surface);
+        wl_signal_add(&view->events.unmap, &popup->focused_surface_unmap);
+}
+
+static void handle_im_popup_destroy(struct wl_listener *listener, void *data) {
+        struct sway_input_popup *popup =
+                wl_container_of(listener, popup, popup_destroy);
+        wl_list_remove(&popup->focused_surface_unmap.link);
+        wl_list_remove(&popup->popup_surface_commit.link);
+        wl_list_remove(&popup->popup_destroy.link);
+        wl_list_remove(&popup->link);
+
+        free(popup);
+}
+
+static void handle_im_popup_surface_commit(struct wl_listener *listener,
+                void *data) {
+        struct sway_input_popup *popup =
+                wl_container_of(listener, popup, popup_surface_commit);
+        input_popup_update(popup);
+}
+
+static void handle_im_focused_surface_unmap(
+                struct wl_listener *listener, void *data) {
+        struct sway_input_popup *popup =
+                wl_container_of(listener, popup, focused_surface_unmap);
+        input_popup_update(popup);
+}
+
+static void handle_im_new_popup_surface(struct wl_listener *listener,
+                void *data) {
+        struct sway_input_method_relay *relay = wl_container_of(listener, relay,
+                input_method_new_popup_surface);
+        struct sway_input_popup *popup = calloc(1, sizeof(*popup));
+        popup->relay = relay;
+        popup->popup_surface = data;
+        popup->popup_surface->data = popup;
+
+        wl_signal_add(
+                &popup->popup_surface->events.destroy, &popup->popup_destroy);
+        popup->popup_destroy.notify = handle_im_popup_destroy;
+        wl_signal_add(&popup->popup_surface->surface->events.commit,
+                &popup->popup_surface_commit);
+        popup->popup_surface_commit.notify = handle_im_popup_surface_commit;
+        wl_list_init(&popup->focused_surface_unmap.link);
+        popup->focused_surface_unmap.notify = handle_im_focused_surface_unmap;
+
+        struct sway_text_input *text_input = relay_get_focused_text_input(relay);
+        if (text_input != NULL) {
+                input_popup_set_focus(popup, text_input->input->focused_surface);
+        } else {
+                input_popup_set_focus(popup, NULL);
+        }
+
+        wl_list_insert(&relay->input_popups, &popup->link);
+}
+
+static void text_input_send_enter(struct sway_text_input *text_input,
+                struct wlr_surface *surface) {
+        wlr_text_input_v3_send_enter(text_input->input, surface);
+        struct sway_input_popup *popup;
+        wl_list_for_each(popup, &text_input->relay->input_popups, link) {
+                input_popup_set_focus(popup, surface);
+        }
+}
+
 static void relay_handle_input_method(struct wl_listener *listener,
                 void *data) {
         struct sway_input_method_relay *relay = wl_container_of(listener, relay,
@@ -280,10 +501,13 @@ static void relay_handle_input_method(struct wl_listener *listener,
         wl_signal_add(&relay->input_method->events.destroy,
                 &relay->input_method_destroy);
         relay->input_method_destroy.notify = handle_im_destroy;
+        wl_signal_add(&relay->input_method->events.new_popup_surface,
+                &relay->input_method_new_popup_surface);
+        relay->input_method_new_popup_surface.notify = handle_im_new_popup_surface;
 
         struct sway_text_input *text_input = relay_get_focusable_text_input(relay);
         if (text_input) {
-                wlr_text_input_v3_send_enter(text_input->input,
+                text_input_send_enter(text_input,
                         text_input->pending_focused_surface);
                 text_input_set_pending_focused_surface(text_input, NULL);
         }
@@ -293,6 +517,7 @@ void sway_input_method_relay_init(struct sway_seat *seat,
                 struct sway_input_method_relay *relay) {
         relay->seat = seat;
         wl_list_init(&relay->text_inputs);
+        wl_list_init(&relay->input_popups);
 
         relay->text_input_new.notify = relay_handle_text_input;
         wl_signal_add(&server.text_input->events.text_input,
diff --git a/sway/ipc-json.c b/sway/ipc-json.c
index e422b24d..81ca3483 100644
--- a/sway/ipc-json.c
+++ b/sway/ipc-json.c
@@ -3,7 +3,8 @@
 #include <json.h>
 #include <libevdev/libevdev.h>
 #include <stdio.h>
-#include <wlr/backend/libinput.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"
@@ -20,6 +21,10 @@
 #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;
 
@@ -112,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;
@@ -170,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();
@@ -238,14 +288,13 @@ static json_object *ipc_json_create_node(int id, const char* type, char *name,
         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));
+        json_object_object_add(object, "floating", NULL);
+        json_object_object_add(object, "scratchpad_state", NULL);
 
         return object;
 }
 
-static void ipc_json_describe_output(struct sway_output *output,
-                json_object *object) {
-        struct wlr_output *wlr_output = output->wlr_output;
-
+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"));
@@ -269,11 +318,17 @@ static void ipc_json_describe_output(struct sway_output *output,
         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, "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));
@@ -307,25 +362,26 @@ static void ipc_json_describe_enabled_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);
@@ -351,6 +407,7 @@ json_object *ipc_json_describe_disabled_output(struct sway_output *output) {
 
         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));
@@ -372,6 +429,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);
@@ -507,7 +579,7 @@ static void ipc_json_describe_view(struct sway_container *c, json_object *object
 
         struct wlr_box window_box = {
                 c->pending.content_x - c->pending.x,
-                (c->current.border == B_PIXEL) ? c->current.border_thickness : 0,
+                (c->current.border == B_PIXEL) ? c->pending.content_y - c->pending.y : 0,
                 c->pending.content_width,
                 c->pending.content_height
         };
@@ -551,6 +623,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",
@@ -595,7 +677,8 @@ 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);
-        if (container_is_floating(c)) {
+        bool floating = container_is_floating(c);
+        if (floating) {
                 json_object_object_add(object, "type",
                                 json_object_new_string("floating_con"));
         }
@@ -613,9 +696,17 @@ static void ipc_json_describe_container(struct sway_container *c, json_object *o
         json_object_object_add(object, "urgent", json_object_new_boolean(urgent));
         json_object_object_add(object, "sticky", json_object_new_boolean(c->is_sticky));
 
+        // sway doesn't track the floating reason, so we can't use "auto_on" or "user_off"
+        json_object_object_add(object, "floating",
+                        json_object_new_string(floating ? "user_on" : "auto_off"));
+
         json_object_object_add(object, "fullscreen_mode",
                         json_object_new_int(c->pending.fullscreen_mode));
 
+        // sway doesn't track if window was resized in scratchpad, so we can't use "changed"
+        json_object_object_add(object, "scratchpad_state",
+                        json_object_new_string(!c->scratchpad ? "none" : "fresh"));
+
         struct sway_node *parent = node_get_parent(&c->node);
         struct wlr_box parent_box = {0, 0, 0, 0};
 
@@ -771,6 +862,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();
 
@@ -854,6 +946,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));
@@ -933,6 +1030,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));
                 }
         }
 
@@ -949,6 +1057,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);
@@ -963,6 +1084,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"))) {
@@ -975,10 +1097,6 @@ json_object *ipc_json_describe_input(struct sway_input_device *device) {
                 json_object_new_string(device->identifier));
         json_object_object_add(object, "name",
                 json_object_new_string(device->wlr_device->name));
-        json_object_object_add(object, "vendor",
-                json_object_new_int(device->wlr_device->vendor));
-        json_object_object_add(object, "product",
-                json_object_new_int(device->wlr_device->product));
         json_object_object_add(object, "type",
                 json_object_new_string(
                         input_device_get_type(device)));
@@ -1026,12 +1144,18 @@ json_object *ipc_json_describe_input(struct sway_input_device *device) {
                                 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));
+                json_object_object_add(object, "vendor",
+                        json_object_new_int(libinput_device_get_id_vendor(libinput_dev)));
+                json_object_object_add(object, "product",
+                        json_object_new_int(libinput_device_get_id_product(libinput_dev)));
         }
+#endif
 
         return object;
 }
diff --git a/sway/ipc-server.c b/sway/ipc-server.c
index 3cbf7889..7f353c0e 100644
--- a/sway/ipc-server.c
+++ b/sway/ipc-server.c
@@ -1,5 +1,4 @@
 // See https://i3wm.org/docs/ipc.html for protocol information
-#define _POSIX_C_SOURCE 200112L
 #include <linux/input-event-codes.h>
 #include <assert.h>
 #include <errno.h>
@@ -56,7 +55,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);
@@ -509,6 +507,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;
 
@@ -685,6 +697,12 @@ void ipc_client_handle_command(struct ipc_client *client, uint32_t payload_lengt
                                                 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));
@@ -720,6 +738,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) {
@@ -904,7 +924,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,
diff --git a/sway/lock.c b/sway/lock.c
index 04f80079..289e8ca4 100644
--- a/sway/lock.c
+++ b/sway/lock.c
@@ -1,101 +1,229 @@
-#define _POSIX_C_SOURCE 200809L
 #include <assert.h>
+#include <wlr/types/wlr_scene.h>
+#include <wlr/types/wlr_session_lock_v1.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_surface {
-        struct wlr_session_lock_surface_v1 *lock_surface;
+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 wlr_surface *surface;
-        struct wl_listener map;
+
+        struct wl_list link; // sway_session_lock::outputs
+
         struct wl_listener destroy;
-        struct wl_listener surface_commit;
-        struct wl_listener output_mode;
-        struct wl_listener output_commit;
+        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_surface *surf = wl_container_of(listener, surf, map);
-        sway_force_focus(surf->surface);
-        output_damage_whole(surf->output);
+        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 handle_surface_commit(struct wl_listener *listener, void *data) {
-        struct sway_session_lock_surface *surf = wl_container_of(listener, surf, surface_commit);
-        output_damage_surface(surf->output, 0, 0, surf->surface, false);
+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 handle_output_mode(struct wl_listener *listener, void *data) {
-        struct sway_session_lock_surface *surf = wl_container_of(listener, surf, output_mode);
-        wlr_session_lock_surface_v1_configure(surf->lock_surface,
-                surf->output->width, surf->output->height);
+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 handle_output_commit(struct wl_listener *listener, void *data) {
+static void lock_output_handle_commit(struct wl_listener *listener, void *data) {
         struct wlr_output_event_commit *event = data;
-        struct sway_session_lock_surface *surf = wl_container_of(listener, surf, output_commit);
-        if (event->committed & (
+        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)) {
-                wlr_session_lock_surface_v1_configure(surf->lock_surface,
-                        surf->output->width, surf->output->height);
+                lock_output_reconfigure(output);
         }
 }
 
-static void handle_surface_destroy(struct wl_listener *listener, void *data) {
-        struct sway_session_lock_surface *surf = wl_container_of(listener, surf, destroy);
-        wl_list_remove(&surf->map.link);
-        wl_list_remove(&surf->destroy.link);
-        wl_list_remove(&surf->surface_commit.link);
-        wl_list_remove(&surf->output_mode.link);
-        wl_list_remove(&surf->output_commit.link);
-        output_damage_whole(surf->output);
-        free(surf);
+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 handle_new_surface(struct wl_listener *listener, void *data) {
-        struct wlr_session_lock_surface_v1 *lock_surface = data;
-        struct sway_session_lock_surface *surf = calloc(1, sizeof(*surf));
-        if (surf == NULL) {
-                return;
+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);
         }
 
-        sway_log(SWAY_DEBUG, "new lock layer surface");
+        if (server.session_lock.lock == lock) {
+                server.session_lock.lock = NULL;
+        }
 
-        struct sway_output *output = lock_surface->output->data;
-        wlr_session_lock_surface_v1_configure(lock_surface, output->width, output->height);
-
-        surf->lock_surface = lock_surface;
-        surf->surface = lock_surface->surface;
-        surf->output = output;
-        surf->map.notify = handle_surface_map;
-        wl_signal_add(&lock_surface->events.map, &surf->map);
-        surf->destroy.notify = handle_surface_destroy;
-        wl_signal_add(&lock_surface->events.destroy, &surf->destroy);
-        surf->surface_commit.notify = handle_surface_commit;
-        wl_signal_add(&surf->surface->events.commit, &surf->surface_commit);
-        surf->output_mode.notify = handle_output_mode;
-        wl_signal_add(&output->wlr_output->events.mode, &surf->output_mode);
-        surf->output_commit.notify = handle_output_commit;
-        wl_signal_add(&output->wlr_output->events.commit, &surf->output_commit);
+        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");
-        server.session_lock.locked = false;
-        server.session_lock.lock = NULL;
 
-        wl_list_remove(&server.session_lock.lock_new_surface.link);
-        wl_list_remove(&server.session_lock.lock_unlock.link);
-        wl_list_remove(&server.session_lock.lock_destroy.link);
+        sway_session_lock_destroy(lock);
 
         struct sway_seat *seat;
         wl_list_for_each(seat, &server.input->seats, link) {
-                seat_set_exclusive_client(seat, NULL);
                 // copied from seat_set_focus_layer -- deduplicate?
                 struct sway_node *previous = seat_get_focus_inactive(seat, &root->node);
                 if (previous) {
@@ -105,31 +233,28 @@ static void handle_unlock(struct wl_listener *listener, void *data) {
                 }
         }
 
-        // redraw everything
+        // 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];
-                output_damage_whole(output);
+                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");
-        server.session_lock.lock = NULL;
-
-        wl_list_remove(&server.session_lock.lock_new_surface.link);
-        wl_list_remove(&server.session_lock.lock_unlock.link);
-        wl_list_remove(&server.session_lock.lock_destroy.link);
 
-        struct sway_seat *seat;
-        wl_list_for_each(seat, &server.input->seats, link) {
-                seat->exclusive_client = NULL;
+        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 });
         }
 
-        // redraw everything
-        for (int i = 0; i < root->outputs->length; ++i) {
-                struct sway_output *output = root->outputs->items[i];
-                output_damage_whole(output);
-        }
+        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) {
@@ -137,44 +262,89 @@ static void handle_session_lock(struct wl_listener *listener, void *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");
-        server.session_lock.locked = true;
-        server.session_lock.lock = lock;
 
         struct sway_seat *seat;
         wl_list_for_each(seat, &server.input->seats, link) {
-                seat_set_exclusive_client(seat, client);
+                seat_unfocus_unless_client(seat, client);
         }
 
-        wl_signal_add(&lock->events.new_surface, &server.session_lock.lock_new_surface);
-        wl_signal_add(&lock->events.unlock, &server.session_lock.lock_unlock);
-        wl_signal_add(&lock->events.destroy, &server.session_lock.lock_destroy);
+        struct sway_output *output;
+        wl_list_for_each(output, &root->all_outputs, link) {
+                sway_session_lock_add_output(sway_lock, output);
+        }
 
-        wlr_session_lock_v1_send_locked(lock);
+        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);
 
-        // redraw everything
-        for (int i = 0; i < root->outputs->length; ++i) {
-                struct sway_output *output = root->outputs->items[i];
-                output_damage_whole(output);
-        }
+        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) {
-        assert(server.session_lock.lock == NULL);
+        // 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.lock_new_surface.notify = handle_new_surface;
-        server.session_lock.lock_unlock.notify = handle_unlock;
-        server.session_lock.lock_destroy.notify = handle_abandon;
         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,
diff --git a/sway/main.c b/sway/main.c
index 85bc2f1c..1c4939aa 100644
--- a/sway/main.c
+++ b/sway/main.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <getopt.h>
 #include <pango/pangocairo.h>
 #include <signal.h>
@@ -49,44 +48,6 @@ void sig_handler(int signal) {
         sway_terminate(EXIT_SUCCESS);
 }
 
-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 "
-                                        "--unsupported-gpu 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);
@@ -192,11 +153,7 @@ void restore_nofile_limit(void) {
 }
 
 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;
@@ -204,8 +161,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, "noscanout") == 0) {
-                debug.noscanout = true;
+        } else if (strcmp(flag, "legacy-wl-drm") == 0) {
+                debug.legacy_wl_drm = true;
         } else {
                 sway_log(SWAY_ERROR, "Unknown debug flag: %s", flag);
         }
@@ -255,7 +212,7 @@ static const char usage[] =
         "\n";
 
 int main(int argc, char **argv) {
-        static bool verbose = false, debug = false, validate = false, allow_unsupported_gpu = false;
+        static bool verbose = false, debug = false, validate = false;
 
         char *config_path = NULL;
 
@@ -363,7 +320,6 @@ int main(int argc, char **argv) {
                 return 0;
         }
 
-        detect_proprietary(allow_unsupported_gpu);
         increase_nofile_limit();
 
         // handle SIGTERM signals
@@ -375,12 +331,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);
diff --git a/sway/meson.build b/sway/meson.build
index ced7419c..d937e425 100644
--- a/sway/meson.build
+++ b/sway/meson.build
@@ -8,24 +8,23 @@ sway_sources = files(
         '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',
@@ -86,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',
@@ -157,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',
@@ -165,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',
@@ -198,6 +201,7 @@ sway_sources = files(
         'commands/output/subpixel.c',
         'commands/output/toggle.c',
         'commands/output/transform.c',
+        'commands/output/unplug.c',
 
         'tree/arrange.c',
         'tree/container.c',
@@ -218,24 +222,26 @@ sway_deps = [
         math,
         pango,
         pcre2,
-        glesv2,
         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/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 a87fc7cf..d159dc9b 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <assert.h>
 #include <stdbool.h>
 #include <stdlib.h>
@@ -7,24 +6,34 @@
 #include <wlr/backend.h>
 #include <wlr/backend/headless.h>
 #include <wlr/backend/multi.h>
-#include <wlr/backend/session.h>
 #include <wlr/config.h>
+#include <wlr/render/allocator.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_lease_v1.h>
+#include <wlr/types/wlr_data_device.h>
 #include <wlr/types/wlr_drm.h>
 #include <wlr/types/wlr_export_dmabuf_v1.h>
+#include <wlr/types/wlr_ext_foreign_toplevel_list_v1.h>
+#include <wlr/types/wlr_foreign_toplevel_management_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_output_management_v1.h>
+#include <wlr/types/wlr_output_power_management_v1.h>
 #include <wlr/types/wlr_pointer_constraints_v1.h>
+#include <wlr/types/wlr_presentation_time.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_single_pixel_buffer_v1.h>
+#include <wlr/types/wlr_security_context_v1.h>
 #include <wlr/types/wlr_server_decoration.h>
+#include <wlr/types/wlr_session_lock_v1.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>
@@ -35,6 +44,7 @@
 #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"
@@ -43,11 +53,25 @@
 #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
 
+#if WLR_HAS_DRM_BACKEND
+#include <wlr/types/wlr_drm_lease_v1.h>
+#endif
+
+#define SWAY_XDG_SHELL_VERSION 5
+#define SWAY_LAYER_SHELL_VERSION 4
+#define SWAY_FOREIGN_TOPLEVEL_LIST_VERSION 1
+
+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. */
@@ -59,32 +83,170 @@ static void handle_drm_lease_request(struct wl_listener *listener, void *data) {
                 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_list->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 ||
+                global == server.input->transient_seat_manager->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);
+}
+
+static void handle_renderer_lost(struct wl_listener *listener, void *data) {
+        struct sway_server *server = wl_container_of(listener, server, renderer_lost);
+
+        sway_log(SWAY_INFO, "Re-creating renderer after GPU reset");
+
+        struct wlr_renderer *renderer = wlr_renderer_autocreate(server->backend);
+        if (renderer == NULL) {
+                sway_log(SWAY_ERROR, "Unable to create renderer");
+                return;
+        }
+
+        struct wlr_allocator *allocator =
+                wlr_allocator_autocreate(server->backend, renderer);
+        if (allocator == NULL) {
+                sway_log(SWAY_ERROR, "Unable to create allocator");
+                wlr_renderer_destroy(renderer);
+                return;
+        }
+
+        struct wlr_renderer *old_renderer = server->renderer;
+        struct wlr_allocator *old_allocator = server->allocator;
+        server->renderer = renderer;
+        server->allocator = allocator;
 
-#define SWAY_XDG_SHELL_VERSION  2
+        wl_list_remove(&server->renderer_lost.link);
+        wl_signal_add(&server->renderer->events.lost, &server->renderer_lost);
+
+        wlr_compositor_set_renderer(server->compositor, renderer);
+
+        for (int i = 0; i < root->outputs->length; ++i) {
+                struct sway_output *output = root->outputs->items[i];
+                wlr_output_init_render(output->wlr_output,
+                        server->allocator, server->renderer);
+        }
+
+        wlr_allocator_destroy(old_allocator);
+        wlr_renderer_destroy(old_renderer);
+}
 
 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;
         }
 
+        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;
         }
 
+        server->renderer_lost.notify = handle_renderer_lost;
+        wl_signal_add(&server->renderer->events.lost, &server->renderer_lost);
+
         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);
-                server->linux_dmabuf_v1 =
-                        wlr_linux_dmabuf_v1_create(server->wl_display, server->renderer);
         }
 
         server->allocator = wlr_allocator_autocreate(server->backend,
@@ -94,18 +256,19 @@ bool server_init(struct sway_server *server) {
                 return false;
         }
 
-        server->compositor = wlr_compositor_create(server->wl_display,
+        server->compositor = wlr_compositor_create(server->wl_display, 6,
                 server->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);
@@ -115,20 +278,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,
                 SWAY_XDG_SHELL_VERSION);
-        wl_signal_add(&server->xdg_shell->events.new_surface,
-                &server->xdg_shell_surface);
-        server->xdg_shell_surface.notify = handle_xdg_shell_surface;
+        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);
 
@@ -159,8 +322,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);
@@ -179,11 +341,14 @@ bool server_init(struct sway_server *server) {
                 &server->output_power_manager_set_mode);
         server->input_method = wlr_input_method_manager_v2_create(server->wl_display);
         server->text_input = wlr_text_input_manager_v3_create(server->wl_display);
+        server->foreign_toplevel_list =
+                wlr_ext_foreign_toplevel_list_v1_create(server->wl_display, SWAY_FOREIGN_TOPLEVEL_LIST_VERSION);
         server->foreign_toplevel_manager =
                 wlr_foreign_toplevel_manager_v1_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) {
@@ -194,13 +359,17 @@ bool server_init(struct sway_server *server) {
                 sway_log(SWAY_DEBUG, "Failed to create wlr_drm_lease_device_v1");
                 sway_log(SWAY_INFO, "VR will not be available");
         }
+#endif
 
-        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);
+        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);
@@ -212,6 +381,17 @@ bool server_init(struct sway_server *server) {
                 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];
@@ -229,7 +409,7 @@ bool server_init(struct sway_server *server) {
                 return false;
         }
 
-        server->headless_backend = wlr_headless_backend_create(server->wl_display);
+        server->headless_backend = wlr_headless_backend_create(server->wl_event_loop);
         if (!server->headless_backend) {
                 sway_log(SWAY_ERROR, "Failed to create secondary headless backend");
                 wlr_backend_destroy(server->backend);
@@ -262,6 +442,7 @@ void server_fini(struct sway_server *server) {
         wlr_xwayland_destroy(server->xwayland.wlr_xwayland);
 #endif
         wl_display_destroy_clients(server->wl_display);
+        wlr_backend_destroy(server->backend);
         wl_display_destroy(server->wl_display);
         list_free(server->dirty_nodes);
 }
@@ -292,6 +473,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)) {
diff --git a/sway/sway-input.5.scd b/sway/sway-input.5.scd
index 8b702b77..442311bb 100644
--- a/sway/sway-input.5.scd
+++ b/sway/sway-input.5.scd
@@ -121,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
 
@@ -147,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.
@@ -171,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.
@@ -220,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
@@ -228,6 +246,8 @@ 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).
@@ -243,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
diff --git a/sway/sway-ipc.7.scd b/sway/sway-ipc.7.scd
index c7a2c473..2f697248 100644
--- a/sway/sway-ipc.7.scd
+++ b/sway/sway-ipc.7.scd
@@ -337,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
@@ -375,6 +376,12 @@ node and will have the following properties:
 :  integer
 :  (Only containers and views) The fullscreen mode of the node. 0 means none, 1 means
    full workspace, and 2 means global fullscreen
+|- floating
+:  string
+:  Floating state of container. Can be either "auto_off" or "user_on"
+|- scratchpad_state
+:  string
+:  Whether the window is in the scratchpad. Can be either "none" or "fresh"
 |- app_id
 :  string
 :  (Only views) For an xdg-shell view, the name of the application, if set.
@@ -1039,7 +1046,7 @@ An object with a single string property containing the contents of the config
 *Example Reply:*
 ```
 {
-        "config": "set $mod Mod4\nbindsym $mod+q exit\n"
+        "config": "set $mod Mod4\\nbindsym $mod+q exit\\n"
 }
 ```
 
@@ -1194,9 +1201,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
@@ -1236,7 +1250,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"
                 }
         },
         {
@@ -1363,7 +1378,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"
                                 }
                         },
                         {
@@ -1439,6 +1455,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
@@ -1559,6 +1578,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 b7d5e577..7d088d5d 100644
--- a/sway/sway-output.5.scd
+++ b/sway/sway-output.5.scd
@@ -72,13 +72,11 @@ must be separated by one space. For example:
 
 *output* <name> scale <factor>
         Scales the specified output by the specified scale _factor_. An integer is
-        recommended, but fractional values are also supported. If a fractional
-        value are specified, be warned that it is not possible to faithfully
-        represent the contents of your windows - they will be rendered at the next
-        highest integer scale factor and downscaled. You may be better served by
-        setting an integer scale factor and adjusting the font size of your
-        applications to taste. HiDPI isn't supported with Xwayland clients (windows
-        will blur).
+        recommended, but fractional values are also supported. You may be better
+        served by setting an integer scale factor and adjusting the font size of
+        your applications to taste. HiDPI isn't supported with Xwayland clients
+        (windows will blur). A fractional scale may be slightly adjusted to match
+        requirements of the protocol.
 
 *output* <name> scale_filter linear|nearest|smart
         Indicates how to scale application buffers that are rendered at a scale
@@ -119,7 +117,7 @@ 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 loose its current
+        As opposed to the _power_ command, the output will lose its current
         workspace and windows.
 
 *output* <name> toggle
diff --git a/sway/sway.5.scd b/sway/sway.5.scd
index d8a462d3..9f823947 100644
--- a/sway/sway.5.scd
+++ b/sway/sway.5.scd
@@ -389,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
@@ -400,6 +400,12 @@ runtime.
         only be available for that group. By default, if you overwrite a binding,
         swaynag will give you a warning. To silence this, use the _--no-warn_ flag.
 
+        For specifying modifier keys, you can use the XKB modifier names _Shift_,
+        _Lock_ (for Caps Lock), _Control_, _Mod1_ (for Alt), _Mod2_ (for Num Lock),
+        _Mod3_ (for XKB modifier Mod3), _Mod4_ (for the Logo key), and _Mod5_ (for
+        AltGr). In addition, you can use the aliases  _Ctrl_ (for Control), _Alt_
+        (for Alt), and _Super_ (for the Logo key).
+
         Unless the flag _--locked_ is set, the command will not be run when a
         screen locking program is active. If there is a matching binding with
         and without _--locked_, the one with will be preferred when locked and the
@@ -454,7 +460,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>
@@ -648,7 +655,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
@@ -807,6 +815,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
@@ -957,6 +969,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
@@ -965,7 +980,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
@@ -979,12 +995,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.
@@ -1009,12 +1027,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..5eba53ba
--- /dev/null
+++ b/sway/sway_text_node.c
@@ -0,0 +1,302 @@
+#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) {
+        int width = props->width;
+        if (props->max_width) {
+                width = MIN(width, props->max_width);
+        }
+        return MAX(width, 0);
+}
+
+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 4a0a6d30..bc5e23ea 100644
--- a/sway/swaynag.c
+++ b/sway/swaynag.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <signal.h>
 #include <stdbool.h>
 #include <stdlib.h>
@@ -145,22 +144,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 9c1a11e5..d4003fe6 100644
--- a/sway/tree/arrange.c
+++ b/sway/tree/arrange.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <ctype.h>
 #include <stdbool.h>
 #include <stdlib.h>
@@ -264,6 +263,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 +279,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->pending.x + floater->pending.width / 2;
-                        double center_y = floater->pending.y + floater->pending.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;
                         }
                 }
         }
diff --git a/sway/tree/container.c b/sway/tree/container.c
index 04ef965f..9224b4fb 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -1,25 +1,20 @@
-#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 <sys/stat.h>
 #include <wayland-server-core.h>
+#include <wlr/types/wlr_foreign_toplevel_management_v1.h>
 #include <wlr/types/wlr_linux_dmabuf_v1.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_subcompositor.h>
-#include <wlr/render/drm_format_set.h>
 #include "linux-dmabuf-unstable-v1-protocol.h"
-#include "cairo_util.h"
-#include "pango.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"
@@ -30,6 +25,53 @@
 #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) {
@@ -37,23 +79,411 @@ struct sway_container *container_create(struct sway_view *view) {
                 return NULL;
         }
         node_init(&c->node, N_CONTAINER, c);
-        c->pending.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->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")) {
@@ -65,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);
-        wlr_texture_destroy(con->title_focused_tab_title);
         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);
-        wlr_texture_destroy(con->marks_focused_tab_title);
 
         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);
 }
 
@@ -104,7 +526,7 @@ void container_begin_destroy(struct sway_container *con) {
                 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);
 
@@ -174,265 +596,6 @@ 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_toplevel->base,
-                                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;
-                }
-        }
-
-        // 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;
-}
-
-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;
-                                }
-                        }
-                }
-        }
-        return NULL;
-}
-
-static struct sway_container *view_container_content_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->pending.content_x,
-                .y = container->pending.content_y,
-                .width = container->pending.content_width,
-                .height = container->pending.content_height,
-        };
-
-        if (wlr_box_contains_point(&box, lx, ly)) {
-                surface_at_view(parent->sway_container, lx, ly, surface, sx, sy);
-                return container;
-        }
-
-        return NULL;
-}
-
-static 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->pending.x,
-                .y = container->pending.y,
-                .width = container->pending.width,
-                .height = container->pending.height,
-        };
-
-        if (wlr_box_contains_point(&box, lx, ly)) {
-                surface_at_view(parent->sway_container, lx, ly, surface, sx, sy);
-                return container;
-        }
-
-        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) {
-        while (!wlr_surface_is_xdg_surface(surface)) {
-                if (!wlr_surface_is_subsurface(surface)) {
-                        return false;
-                }
-                struct wlr_subsurface *subsurface =
-                        wlr_subsurface_from_wlr_surface(surface);
-                surface = subsurface->parent;
-        }
-        struct wlr_xdg_surface *xdg_surface =
-                wlr_xdg_surface_from_wlr_surface(surface);
-        return xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP;
-}
-
-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 = view_container_content_at(&focus->node, 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) {
@@ -478,127 +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 render_titlebar_text_texture(struct sway_output *output,
-                struct sway_container *con, struct wlr_texture **texture,
-                struct border_colors *class, bool pango_markup, char *text) {
-        double scale = output->wlr_output->scale;
-        int width = 0;
-        int height = config->font_height * scale;
-        int baseline;
-
-        // 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_description, &width, NULL, &baseline, scale,
-                        config->pango_markup, "%s", text);
-        cairo_surface_destroy(dummy_surface);
-        cairo_destroy(c);
-
-        if (width == 0 || height == 0) {
-                return;
-        }
-
-        if (height > config->font_height * scale) {
-                height = config->font_height * scale;
-        }
-
-        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));
-                return;
-        }
-
-        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, config->font_baseline * scale - baseline);
-
-        render_text(cairo, config->font_description, scale, pango_markup, "%s", text);
-
-        cairo_surface_flush(surface);
-        unsigned char *data = cairo_image_surface_get_data(surface);
-        int stride = cairo_image_surface_get_stride(surface);
-        struct wlr_renderer *renderer = output->wlr_output->renderer;
-        *texture = wlr_texture_from_pixels(
-                        renderer, DRM_FORMAT_ARGB8888, stride, width, height, data);
-        cairo_surface_destroy(surface);
-        g_object_unref(pango);
-        cairo_destroy(cairo);
-}
-
-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;
-        }
-
-        render_titlebar_text_texture(output, con, texture, class,
-                config->pango_markup, con->formatted_title);
-}
-
-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);
-        update_title_texture(container, &container->title_focused_tab_title,
-                        &config->border_colors.focused_tab_title);
-        container_damage_whole(container);
-}
-
 /**
  * Calculate and return the length of the tree representation.
  * An example tree representation is: V[Terminal, Firefox]
@@ -664,7 +706,13 @@ void container_update_representation(struct sway_container *con) {
                 }
                 container_build_representation(con->pending.layout, con->pending.children,
                                 con->formatted_title);
-                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->pending.parent) {
                 container_update_representation(con->pending.parent);
@@ -716,6 +764,21 @@ void floating_calculate_constraints(int *min_width, int *max_width,
 
 }
 
+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,
@@ -787,11 +850,11 @@ void container_floating_set_default_size(struct sway_container *con) {
         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->pending.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->pending.width = width;
                 con->pending.height = height;
@@ -800,8 +863,6 @@ void container_floating_set_default_size(struct sway_container *con) {
                 con->pending.content_height = height;
                 container_set_geometry_from_content(con);
         }
-
-        free(box);
 }
 
 
@@ -937,17 +998,6 @@ bool container_is_floating(struct sway_container *container) {
         return false;
 }
 
-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;
-}
-
 void container_get_box(struct sway_container *container, struct wlr_box *box) {
         box->x = container->pending.x;
         box->y = container->pending.y;
@@ -1031,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);
         }
@@ -1062,16 +1119,6 @@ void container_end_mouse_operation(struct sway_container *container) {
         }
 }
 
-static bool devid_from_fd(int fd, dev_t *devid) {
-        struct stat stat;
-        if (fstat(fd, &stat) != 0) {
-                sway_log_errno(SWAY_ERROR, "fstat failed");
-                return false;
-        }
-        *devid = stat.st_rdev;
-        return true;
-}
-
 static void set_fullscreen(struct sway_container *con, bool enable) {
         if (!con->view) {
                 return;
@@ -1083,75 +1130,6 @@ static void set_fullscreen(struct sway_container *con, bool enable) {
                                 con->view->foreign_toplevel, enable);
                 }
         }
-
-        if (!server.linux_dmabuf_v1 || !con->view->surface) {
-                return;
-        }
-        if (!enable) {
-                wlr_linux_dmabuf_v1_set_surface_feedback(server.linux_dmabuf_v1,
-                        con->view->surface, NULL);
-                return;
-        }
-
-        if (!con->pending.workspace || !con->pending.workspace->output) {
-                return;
-        }
-
-        struct sway_output *output = con->pending.workspace->output;
-        struct wlr_output *wlr_output = output->wlr_output;
-
-        // TODO: add wlroots helpers for all of this stuff
-
-        const struct wlr_drm_format_set *renderer_formats =
-                wlr_renderer_get_dmabuf_texture_formats(server.renderer);
-        assert(renderer_formats);
-
-        int renderer_drm_fd = wlr_renderer_get_drm_fd(server.renderer);
-        int backend_drm_fd = wlr_backend_get_drm_fd(wlr_output->backend);
-        if (renderer_drm_fd < 0 || backend_drm_fd < 0) {
-                return;
-        }
-
-        dev_t render_dev, scanout_dev;
-        if (!devid_from_fd(renderer_drm_fd, &render_dev) ||
-                        !devid_from_fd(backend_drm_fd, &scanout_dev)) {
-                return;
-        }
-
-        const struct wlr_drm_format_set *output_formats =
-                wlr_output_get_primary_formats(output->wlr_output,
-                WLR_BUFFER_CAP_DMABUF);
-        if (!output_formats) {
-                return;
-        }
-
-        struct wlr_drm_format_set scanout_formats = {0};
-        if (!wlr_drm_format_set_intersect(&scanout_formats,
-                        output_formats, renderer_formats)) {
-                return;
-        }
-
-        struct wlr_linux_dmabuf_feedback_v1_tranche tranches[] = {
-                {
-                        .target_device = scanout_dev,
-                        .flags = ZWP_LINUX_DMABUF_FEEDBACK_V1_TRANCHE_FLAGS_SCANOUT,
-                        .formats = &scanout_formats,
-                },
-                {
-                        .target_device = render_dev,
-                        .formats = renderer_formats,
-                },
-        };
-
-        const struct wlr_linux_dmabuf_feedback_v1 feedback = {
-                .main_device = render_dev,
-                .tranches = tranches,
-                .tranches_len = sizeof(tranches) / sizeof(tranches[0]),
-        };
-        wlr_linux_dmabuf_v1_set_surface_feedback(server.linux_dmabuf_v1,
-                con->view->surface, &feedback);
-
-        wlr_drm_format_set_finish(&scanout_formats);
 }
 
 static void container_fullscreen_workspace(struct sway_container *con) {
@@ -1321,72 +1299,6 @@ bool container_is_fullscreen_or_child(struct sway_container *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->pending.parent) {
                 return con->pending.parent->pending.layout;
@@ -1397,19 +1309,11 @@ enum sway_container_layout container_parent_layout(struct sway_container *con) {
         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->pending.parent) {
                 return container->pending.parent->pending.children;
         }
-        if (container_is_scratchpad_hidden(container)) {
+        if (!container->pending.workspace) {
                 return NULL;
         }
         if (list_find(container->pending.workspace->tiling, container) != -1) {
@@ -1422,13 +1326,6 @@ 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->pending.fullscreen_mode != FULLSCREEN_WORKSPACE || !con->pending.workspace ||
                         con->pending.workspace->fullscreen == con) {
@@ -1643,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;
                 }
@@ -1674,70 +1571,15 @@ 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] != '_') {
-                        snprintf(part, len + 1, "[%s]", mark);
-                        strcat(buffer, part);
-                }
-        }
-        free(part);
-
-        render_titlebar_text_texture(output, con, texture, class, false, buffer);
-
-        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);
-        update_marks_texture(con, &con->marks_focused_tab_title,
-                        &config->border_colors.focused_tab_title);
-        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->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);
         }
@@ -1821,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 bc7e2aa5..7aaf9762 100644
--- a/sway/tree/node.c
+++ b/sway/tree/node.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include "sway/output.h"
 #include "sway/server.h"
 #include "sway/tree/container.h"
@@ -18,13 +17,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 "";
 }
@@ -159,3 +158,32 @@ bool node_has_ancestor(struct sway_node *node, struct sway_node *ancestor) {
         }
         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 52826c91..2d11195e 100644
--- a/sway/tree/output.c
+++ b/sway/tree/output.c
@@ -1,14 +1,13 @@
-#define _POSIX_C_SOURCE 200809L
 #include <assert.h>
 #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"
 
@@ -87,9 +86,51 @@ 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;
@@ -102,11 +143,6 @@ struct sway_output *output_create(struct wlr_output *wlr_output) {
         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 +182,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();
@@ -238,20 +274,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 +292,20 @@ void output_disable(struct sway_output *output) {
         }
 
         sway_log(SWAY_DEBUG, "Disabling output '%s'", output->wlr_output->name);
-        wl_signal_emit(&output->events.disable, 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,7 +313,7 @@ void output_begin_destroy(struct sway_output *output) {
                 return;
         }
         sway_log(SWAY_DEBUG, "Destroying output '%s'", output->wlr_output->name);
-        wl_signal_emit(&output->node.events.destroy, &output->node);
+        wl_signal_emit_mutable(&output->node.events.destroy, &output->node);
 
         output->node.destroying = true;
         node_set_dirty(&output->node);
@@ -390,6 +417,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 8508e9eb..ae3c3cb2 100644
--- a/sway/tree/root.c
+++ b/sway/tree/root.c
@@ -1,12 +1,14 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdbool.h>
 #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 +25,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,11 +90,22 @@ 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;
@@ -62,6 +114,8 @@ void root_scratchpad_add_container(struct sway_container *con, struct sway_works
         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->pending.fullscreen_mode != FULLSCREEN_NONE) {
                 container_fullscreen_disable(con);
@@ -131,7 +185,10 @@ 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->pending.parent) {
@@ -140,18 +197,18 @@ void root_scratchpad_show(struct sway_container *con) {
         }
         workspace_add_floating(new_ws, con);
 
-        // Make sure the container's center point overlaps this workspace
-        double center_lx = con->pending.x + con->pending.width / 2;
-        double center_ly = con->pending.y + con->pending.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) {
@@ -171,6 +228,8 @@ void root_scratchpad_hide(struct sway_container *con) {
                 return;
         }
 
+        set_container_transform(con->pending.workspace, con);
+
         disable_fullscreen(con, NULL);
         container_for_each_child(con, disable_fullscreen, NULL);
         container_detach(con);
@@ -183,172 +242,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;
-
-        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;
-}
-
-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);
-
-                        struct sway_output *output = pw->output;
-                        if (pw->output && !pw->output->enabled) {
-                                sway_log(SWAY_DEBUG,
-                                                "Workspace output %s is disabled, trying another one",
-                                                pw->output->wlr_output->name);
-                                output = NULL;
-                        }
-
-                        ws = workspace_create(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) {
@@ -443,17 +336,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 7d9e038d..35b4b73f 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -1,9 +1,10 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <strings.h>
 #include <wayland-server-core.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_buffer.h>
+#include <wlr/types/wlr_ext_foreign_toplevel_list_v1.h>
+#include <wlr/types/wlr_foreign_toplevel_management_v1.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_server_decoration.h>
 #include <wlr/types/wlr_subcompositor.h>
@@ -16,14 +17,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"
@@ -33,15 +36,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) {
@@ -58,11 +75,10 @@ void view_destroy(struct sway_view *view) {
                 return;
         }
         wl_list_remove(&view->events.unmap.listener_list);
-        if (!wl_list_empty(&view->saved_buffers)) {
-                view_remove_saved_buffer(view);
-        }
         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) {
@@ -363,17 +379,17 @@ void view_set_activated(struct sway_view *view, bool activated) {
         }
 }
 
-void view_request_activate(struct sway_view *view) {
+void view_request_activate(struct sway_view *view, struct sway_seat *seat) {
         struct sway_workspace *ws = view->container->pending.workspace;
-        if (!ws) { // hidden scratchpad container
-                return;
+        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);
                 }
@@ -382,11 +398,23 @@ 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_request_urgent(struct sway_view *view) {
+        if (config->focus_on_window_activation != FOWA_NONE) {
+                view_set_urgent(view, true);
+        }
 }
 
 void view_set_csd_from_server(struct sway_view *view, bool enabled) {
@@ -433,52 +461,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_child_init_subsurfaces(struct sway_view_child *view_child,
-        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) {
@@ -520,7 +502,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
@@ -533,6 +515,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();
 
@@ -568,13 +564,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;
         }
 
@@ -592,6 +589,14 @@ static struct sway_workspace *select_workspace(struct sway_view *view) {
         return NULL;
 }
 
+static void update_ext_foreign_toplevel(struct sway_view *view) {
+        struct wlr_ext_foreign_toplevel_handle_v1_state toplevel_state = {
+                .app_id = view_get_app_id(view),
+                .title = view_get_title(view),
+        };
+        wlr_ext_foreign_toplevel_handle_v1_update_state(view->ext_foreign_toplevel, &toplevel_state);
+}
+
 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);
@@ -717,6 +722,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
@@ -754,6 +766,13 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
                 }
         }
 
+        struct wlr_ext_foreign_toplevel_handle_v1_state foreign_toplevel_state = {
+                .app_id = view_get_app_id(view),
+                .title = view_get_title(view),
+        };
+        view->ext_foreign_toplevel =
+                wlr_ext_foreign_toplevel_handle_v1_create(server.foreign_toplevel_list, &foreign_toplevel_state);
+
         view->foreign_toplevel =
                 wlr_foreign_toplevel_handle_v1_create(server.foreign_toplevel_manager);
         view->foreign_activate_request.notify = handle_foreign_activate_request;
@@ -777,11 +796,6 @@ 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);
         }
@@ -825,9 +839,8 @@ 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);
+        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;
         }
@@ -837,6 +850,10 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
                 input_manager_set_focus(&view->container->node);
         }
 
+        if (view->ext_foreign_toplevel) {
+                update_ext_foreign_toplevel(view);
+        }
+
         const char *app_id;
         const char *class;
         if ((app_id = view_get_app_id(view)) != NULL) {
@@ -847,15 +864,20 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
 }
 
 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);
                 view->urgent_timer = NULL;
         }
 
+        if (view->ext_foreign_toplevel) {
+                wlr_ext_foreign_toplevel_handle_v1_destroy(view->ext_foreign_toplevel);
+                view->ext_foreign_toplevel = NULL;
+        }
+
         if (view->foreign_toplevel) {
                 wlr_foreign_toplevel_handle_v1_destroy(view->foreign_toplevel);
                 view->foreign_toplevel = NULL;
@@ -902,291 +924,47 @@ void view_update_size(struct sway_view *view) {
         container_set_geometry_from_content(con);
 }
 
-void view_center_surface(struct sway_view *view) {
+void view_center_and_clip_surface(struct sway_view *view) {
         struct sway_container *con = view->container;
-        // We always center the current coordinates rather than the next, as the
-        // geometry immediately affects the currently active rendering.
-        con->surface_x = fmax(con->current.content_x, con->current.content_x +
-                        (con->current.content_width - view->geometry.width) / 2);
-        con->surface_y = fmax(con->current.content_y, con->current.content_y +
-                        (con->current.content_height - view->geometry.height) / 2);
-}
 
-static const struct sway_view_child_impl subsurface_impl;
+        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);
 
-static void subsurface_get_view_coords(struct sway_view_child *child,
-                int *sx, int *sy) {
-        struct wlr_surface *surface = child->surface;
-        if (child->parent && child->parent->impl &&
-                        child->parent->impl->get_view_coords) {
-                child->parent->impl->get_view_coords(child->parent, sx, sy);
+                wlr_scene_node_set_position(&view->content_tree->node, x, y);
         } else {
-                *sx = *sy = 0;
+                wlr_scene_node_set_position(&view->content_tree->node, 0, 0);
         }
-        struct wlr_subsurface *subsurface =
-                wlr_subsurface_from_wlr_surface(surface);
-        *sx += subsurface->current.x;
-        *sy += subsurface->current.y;
-}
 
-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_view_coords = subsurface_get_view_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 bool view_child_is_mapped(struct sway_view_child *child) {
-        while (child) {
-                if (!child->mapped) {
-                        return false;
-                }
-                child = child->parent;
-        }
-        return true;
-}
-
-static void view_child_damage(struct sway_view_child *child, bool whole) {
-        if (!child || !view_child_is_mapped(child) || !child->view || !child->view->container) {
-                return;
-        }
-        int sx, sy;
-        child->impl->get_view_coords(child, &sx, &sy);
-        desktop_damage_surface(child->surface,
-                        child->view->container->pending.content_x -
-                                child->view->geometry.x + sx,
-                        child->view->container->pending.content_y -
-                                child->view->geometry.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->current.subsurfaces_below,
-                        current.link) {
-                view_subsurface_create(view, subsurface);
-        }
-        wl_list_for_each(subsurface, &surface->current.subsurfaces_above,
-                        current.link) {
-                view_subsurface_create(view, subsurface);
-        }
-}
-
-static void view_child_init_subsurfaces(struct sway_view_child *view_child,
-                struct wlr_surface *surface) {
-        struct wlr_subsurface *subsurface;
-        wl_list_for_each(subsurface, &surface->current.subsurfaces_below,
-                        current.link) {
-                view_child_subsurface_create(view_child, subsurface);
-        }
-        wl_list_for_each(subsurface, &surface->current.subsurfaces_above,
-                        current.link) {
-                view_child_subsurface_create(view_child, 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_container *container = child->view->container;
-        if (container != NULL) {
-                struct sway_workspace *workspace = container->pending.workspace;
-                if (workspace) {
-                        wlr_surface_send_enter(child->surface, workspace->output->wlr_output);
-                }
-        }
-
-        view_child_init_subsurfaces(child, surface);
-}
-
-void view_child_destroy(struct sway_view_child *child) {
-        if (view_child_is_mapped(child) && 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;
-                // The subchild lost its parent link, so it cannot see that the parent
-                // is unmapped. Unmap it directly.
-                subchild->mapped = false;
-        }
-
-        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);
-                if (xdg_surface == NULL) {
-                        return NULL;
-                }
+        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);
-                if (xsurface == NULL) {
-                        return NULL;
-                }
+        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);
-                if (subsurface == NULL) {
-                        return NULL;
-                }
+        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;
         }
 
@@ -1267,6 +1045,18 @@ static size_t parse_title_format(struct sway_view *view, char *buffer) {
         return len;
 }
 
+void view_update_app_id(struct sway_view *view) {
+        const char *app_id = view_get_app_id(view);
+
+        if (view->foreign_toplevel && app_id) {
+                wlr_foreign_toplevel_handle_v1_set_app_id(view->foreign_toplevel, app_id);
+        }
+
+        if (view->ext_foreign_toplevel) {
+                update_ext_foreign_toplevel(view);
+        }
+}
+
 void view_update_title(struct sway_view *view, bool force) {
         const char *title = view_get_title(view);
 
@@ -1282,29 +1072,41 @@ 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;
         }
 
+        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");
 
         if (view->foreign_toplevel && title) {
                 wlr_foreign_toplevel_handle_v1_set_title(view->foreign_toplevel, title);
         }
+
+        if (view->ext_foreign_toplevel) {
+                update_ext_foreign_toplevel(view);
+        }
 }
 
 bool view_is_visible(struct sway_view *view) {
@@ -1365,6 +1167,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) {
@@ -1372,7 +1175,6 @@ 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");
 
@@ -1386,40 +1188,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 = view->container->surface_x + sx;
-                saved_buffer->y = view->container->surface_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.prev, &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,
@@ -1427,3 +1243,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 c84320bd..a68dc927 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809
 #include <ctype.h>
 #include <limits.h>
 #include <stdbool.h>
@@ -56,6 +55,8 @@ struct sway_output *workspace_get_initial_output(const char *name) {
 
 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 +70,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 +127,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 +142,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 +160,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 +192,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;
                 }
         }
@@ -284,13 +296,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;
@@ -310,9 +319,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);
@@ -652,15 +659,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;
                 }
 
@@ -684,7 +685,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);
         }
 }
 
diff --git a/sway/xdg_activation_v1.c b/sway/xdg_activation_v1.c
index 6c70c785..b7c80dd4 100644
--- a/sway/xdg_activation_v1.c
+++ b/sway/xdg_activation_v1.c
@@ -1,20 +1,65 @@
 #include <wlr/types/wlr_xdg_activation_v1.h>
+#include <wlr/types/wlr_xdg_shell.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;
 
-        if (!wlr_surface_is_xdg_surface(event->surface)) {
+        struct wlr_xdg_surface *xdg_surface =
+                wlr_xdg_surface_try_from_wlr_surface(event->surface);
+        if (xdg_surface == NULL) {
                 return;
         }
-
-        struct wlr_xdg_surface *xdg_surface =
-                wlr_xdg_surface_from_wlr_surface(event->surface);
         struct sway_view *view = xdg_surface->data;
-        if (!xdg_surface->mapped || view == NULL) {
+        if (view == NULL) {
+                return;
+        }
+
+        struct launcher_ctx *ctx = event->token->data;
+        if (ctx == NULL) {
+                return;
+        }
+
+        if (!xdg_surface->surface->mapped) {
+                // This is a startup notification. If we are tracking it, the data
+                // field is a launcher_ctx.
+                if (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;
         }
 
-        view_request_activate(view);
+        // This is an activation request. If this context is internal we have ctx->seat.
+        struct sway_seat *seat = ctx->seat;
+        if (!seat) {
+                // Otherwise, use the seat indicated by the launcher client in set_serial
+                seat = ctx->token->seat ? ctx->token->seat->data : NULL;
+        }
+
+        if (seat && ctx->had_focused_surface) {
+                view_request_activate(view, seat);
+        } else {
+                // The token is valid, but cannot be used to activate a window
+                view_request_urgent(view);
+        }
+}
+
+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 ec9e8d68..fa8c6279 100644
--- a/sway/xdg_decoration.c
+++ b/sway/xdg_decoration.c
@@ -23,37 +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);
-        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;
-        }
-
-        wlr_xdg_toplevel_decoration_v1_set_mode(deco->wlr_xdg_decoration,
-                        mode);
+        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) {
@@ -72,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 5e4ebd97..5b1213a8 100644
--- a/swaybar/bar.c
+++ b/swaybar/bar.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -362,6 +361,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);
         }
 }
 
@@ -425,15 +427,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) {
diff --git a/swaybar/config.c b/swaybar/config.c
index 5e828773..55bfcb72 100644
--- a/swaybar/config.c
+++ b/swaybar/config.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <string.h>
 #include "swaybar/config.h"
diff --git a/swaybar/i3bar.c b/swaybar/i3bar.c
index 6d00befb..62c22d43 100644
--- a/swaybar/i3bar.c
+++ b/swaybar/i3bar.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <json.h>
 #include <linux/input-event-codes.h>
 #include <ctype.h>
@@ -269,11 +268,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 994a0805..ed24b9f9 100644
--- a/common/background-image.c
+++ b/swaybar/image.c
@@ -1,29 +1,12 @@
 #include <assert.h>
-#include "background-image.h"
-#include "cairo_util.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 c8c8f0d4..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,
@@ -103,7 +111,7 @@ static void wl_pointer_enter(void *data, struct wl_pointer *wl_pointer,
         struct swaybar_pointer *pointer = &seat->pointer;
         seat->pointer.x = wl_fixed_to_double(surface_x);
         seat->pointer.y = wl_fixed_to_double(surface_y);
-        pointer->serial = serial;
+
         struct swaybar_output *output;
         wl_list_for_each(output, &seat->bar->outputs, link) {
                 if (output->surface == surface) {
@@ -111,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,
@@ -141,14 +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 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 (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;
         }
 
@@ -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 9d81a9fb..03500bdf 100644
--- a/swaybar/ipc.c
+++ b/swaybar/ipc.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809
 #include <limits.h>
 #include <poll.h>
 #include <stdio.h>
@@ -426,12 +425,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;
diff --git a/swaybar/main.c b/swaybar/main.c
index a44c1e63..3dc67233 100644
--- a/swaybar/main.c
+++ b/swaybar/main.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
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 a878805e..879a4e42 100644
--- a/swaybar/render.c
+++ b/swaybar/render.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <assert.h>
 #include <linux/input-event-codes.h>
 #include <limits.h>
@@ -160,7 +159,7 @@ 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,
@@ -168,7 +167,7 @@ static enum hotspot_event_handling block_hotspot_callback(
                         y - (double)hotspot->y,
                         (double)hotspot->width,
                         (double)hotspot->height,
-                        output->scale, button);
+                        output->scale, button, released);
 }
 
 static void i3bar_block_unref_callback(void *data) {
@@ -292,7 +291,7 @@ static uint32_t render_status_block(struct render_context *ctx,
         }
 
         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;
@@ -599,10 +598,15 @@ static uint32_t render_binding_mode_indicator(struct render_context *ctx,
 
 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;
 }
@@ -688,15 +692,6 @@ static uint32_t render_to_cairo(struct render_context *ctx) {
         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) {
-                ctx->background_color = config->colors.focused_background;
-        } else {
-                ctx->background_color = config->colors.background;
-        }
-
-        cairo_set_source_u32(cairo, ctx->background_color);
-        cairo_paint(cairo);
 
         int th;
         get_text_size(cairo, config->font_description, NULL, &th, NULL, 1, false, "");
@@ -758,8 +753,17 @@ 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);
@@ -769,24 +773,23 @@ void render_frame(struct swaybar_output *output) {
         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) {
                 ctx.textaa_sharp = ctx.textaa_safe;
         } else {
                 fo = cairo_font_options_create();
-                cairo_font_options_set_hint_style(fo, CAIRO_HINT_STYLE_FULL);
                 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_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(&ctx);
         int config_height = output->bar->config->height;
         if (config_height > 0) {
@@ -831,13 +834,15 @@ void render_frame(struct swaybar_output *output) {
                 wl_surface_damage(output->surface, 0, 0,
                                 output->width, output->height);
 
-                uint32_t bg_alpha = ctx.background_color & 0xFF;
+                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);
diff --git a/swaybar/status_line.c b/swaybar/status_line.c
index 2e9bb7f1..e542e606 100644
--- a/swaybar/status_line.c
+++ b/swaybar/status_line.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <assert.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
diff --git a/swaybar/tray/host.c b/swaybar/tray/host.c
index ddf2416d..79b54606 100644
--- a/swaybar/tray/host.c
+++ b/swaybar/tray/host.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -10,6 +9,7 @@
 #include "swaybar/tray/tray.h"
 #include "list.h"
 #include "log.h"
+#include "stringop.h"
 
 static const char *watcher_path = "/StatusNotifierWatcher";
 
@@ -138,12 +138,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 +171,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..659edd86 100644
--- a/swaybar/tray/icon.c
+++ b/swaybar/tray/icon.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <ctype.h>
 #include <dirent.h>
 #include <stdbool.h>
@@ -40,9 +39,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 +203,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 +407,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 0cb5ee9d..ca6c03ad 100644
--- a/swaybar/tray/item.c
+++ b/swaybar/tray/item.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <arpa/inet.h>
 #include <cairo.h>
 #include <limits.h>
@@ -7,12 +6,12 @@
 #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_util.h"
 #include "list.h"
 #include "log.h"
@@ -385,13 +384,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;
@@ -426,7 +430,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;
                 }
diff --git a/swaybar/tray/watcher.c b/swaybar/tray/watcher.c
index 16afc27c..3cfea8d8 100644
--- a/swaybar/tray/watcher.c
+++ b/swaybar/tray/watcher.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -6,6 +5,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 +76,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 +105,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 +157,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 c08406e2..573a7b16 100644
--- a/swaymsg/main.c
+++ b/swaymsg/main.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 
 #include <limits.h>
 #include <stdio.h>
@@ -60,7 +59,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));
                 }
@@ -185,12 +184,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);
@@ -213,10 +214,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"
@@ -231,6 +241,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),
@@ -247,7 +258,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),
@@ -262,14 +273,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");
                 }
         }
 
diff --git a/swaymsg/swaymsg.1.scd b/swaymsg/swaymsg.1.scd
index 24a9d6c9..abee1bb9 100644
--- a/swaymsg/swaymsg.1.scd
+++ b/swaymsg/swaymsg.1.scd
@@ -107,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 a0bf3197..efd71ce7 100644
--- a/swaynag/config.c
+++ b/swaynag/config.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -166,7 +165,7 @@ 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 = calloc(sizeof(struct swaynag_button), 1);
+                                struct swaynag_button *button = calloc(1, sizeof(struct swaynag_button));
                                 if (!button) {
                                         perror("calloc");
                                         return EXIT_FAILURE;
@@ -226,10 +225,8 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag,
                         break;
                 case 'f': // Font
                         if (type) {
-                                free(type->font);
                                 pango_font_description_free(type->font_description);
-                                type->font = strdup(optarg);
-                                type->font_description = pango_font_description_from_string(type->font);
+                                type->font_description = pango_font_description_from_string(optarg);
                         }
                         break;
                 case 'l': // Detailed Message
@@ -245,8 +242,8 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag,
                         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
diff --git a/swaynag/main.c b/swaynag/main.c
index 2ce37831..634bddbf 100644
--- a/swaynag/main.c
+++ b/swaynag/main.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <signal.h>
 #include "log.h"
@@ -29,10 +28,12 @@ int main(int argc, char **argv) {
         wl_list_init(&swaynag.outputs);
         wl_list_init(&swaynag.seats);
 
-        struct swaynag_button button_close = { 0 };
-        button_close.text = strdup("X");
-        button_close.type = SWAYNAG_ACTION_DISMISS;
-        list_add(swaynag.buttons, &button_close);
+        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.details_text = strdup("Toggle details");
 
         char *config_path = NULL;
         bool debug = false;
@@ -54,8 +55,6 @@ int main(int argc, char **argv) {
                 }
         }
 
-        swaynag.details.button_details.text = strdup("Toggle details");
-        swaynag.details.button_details.type = SWAYNAG_ACTION_EXPAND;
 
         if (argc > 1) {
                 struct swaynag_type *type_args = swaynag_type_new("<args>");
@@ -88,17 +87,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) {
-                list_add(swaynag.buttons, &swaynag.details.button_details);
+                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);
         }
 
         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];
@@ -109,11 +111,9 @@ int main(int argc, char **argv) {
 
         swaynag_setup(&swaynag);
         swaynag_run(&swaynag);
-        return status;
 
 cleanup:
         swaynag_types_free(types);
-        free(swaynag.details.button_details.text);
         swaynag_destroy(&swaynag);
         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/swaynag.c b/swaynag/swaynag.c
index 5620155d..50eea148 100644
--- a/swaynag/swaynag.c
+++ b/swaynag/swaynag.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <assert.h>
 #include <sys/stat.h>
@@ -153,8 +152,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);
@@ -182,11 +188,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->x = wl_fixed_to_int(surface_x);
         pointer->y = wl_fixed_to_int(surface_y);
-        pointer->serial = serial;
-        update_cursor(seat);
+
+        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,
@@ -378,6 +395,9 @@ static void handle_global(void *data, struct wl_registry *registry,
         } 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, wp_cursor_shape_manager_v1_interface.name) == 0) {
+                swaynag->cursor_shape_manager = wl_registry_bind(
+                                registry, name, &wp_cursor_shape_manager_v1_interface, 1);
         }
 }
 
@@ -456,7 +476,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);
@@ -483,10 +505,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) {
@@ -501,6 +519,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);
 
@@ -541,4 +560,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 7bef0f87..821e5b21 100644
--- a/swaynag/types.c
+++ b/swaynag/types.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <getopt.h>
 #include <stdbool.h>
 #include <stdlib.h>
@@ -32,7 +31,8 @@ struct swaynag_type *swaynag_type_new(const char *name) {
 
 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;
@@ -90,8 +90,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) {
@@ -172,7 +172,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);
 }