164 files changed, 4092 insertions, 2505 deletions

diff --git a/.builds/alpine.yml b/.builds/alpine.yml
index dc5e7c11..abf636ab 100644
--- a/.builds/alpine.yml
+++ b/.builds/alpine.yml
@@ -6,6 +6,7 @@ packages:
   - json-c-dev
   - libevdev-dev
   - libinput-dev
+  - libseat-dev
   - libxcb-dev
   - libxkbcommon-dev
   - mesa-dev
@@ -16,10 +17,11 @@ packages:
   - wayland-dev
   - wayland-protocols
   - xcb-util-image-dev
-  - xorg-server-xwayland
+  - xcb-util-wm-dev
+  - xwayland
 sources:
   - https://github.com/swaywm/sway
-  - https://github.com/swaywm/wlroots
+  - https://gitlab.freedesktop.org/wlroots/wlroots.git
 tasks:
   - wlroots: |
       cd wlroots
@@ -28,7 +30,7 @@ tasks:
       sudo ninja -C build install
   - setup: |
       cd sway
-      meson build -Dauto_features=enabled -Dtray=disabled
+      meson build --fatal-meson-warnings -Dauto_features=enabled -Dtray=disabled
   - build: |
       cd sway
       ninja -C build
@@ -36,3 +38,10 @@ tasks:
       cd sway
       meson configure build -Dxwayland=disabled
       ninja -C build
+  - build-static: |
+      cd sway
+      mkdir subprojects
+      ln -s ../../wlroots subprojects/wlroots
+      rm -rf build
+      meson build --fatal-meson-warnings --default-library=static --force-fallback-for=wlroots
+      ninja -C build
diff --git a/.builds/archlinux.yml b/.builds/archlinux.yml
index c0f70186..ac4cdb4d 100644
--- a/.builds/archlinux.yml
+++ b/.builds/archlinux.yml
@@ -13,10 +13,12 @@ packages:
   - wayland
   - wayland-protocols
   - xcb-util-image
+  - xcb-util-wm
   - xorg-xwayland
+  - seatd
 sources:
   - https://github.com/swaywm/sway
-  - https://github.com/swaywm/wlroots
+  - https://gitlab.freedesktop.org/wlroots/wlroots.git
 tasks:
   - wlroots: |
       cd wlroots
@@ -25,7 +27,7 @@ tasks:
       sudo ninja -C build install
   - setup: |
       cd sway
-      meson build -Dauto_features=enabled -Dsd-bus-provider=libsystemd
+      meson build --fatal-meson-warnings -Dauto_features=enabled -Dsd-bus-provider=libsystemd
   - build: |
       cd sway
       ninja -C build
diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml
index 273badbc..97e7eccc 100644
--- a/.builds/freebsd.yml
+++ b/.builds/freebsd.yml
@@ -19,13 +19,14 @@ packages:
 - devel/libudev-devd
 - graphics/libdrm
 - graphics/mesa-libs
+- sysutils/seatd
 - x11/libinput
 - x11/libX11
 - x11/pixman
 - x11/xcb-util-wm
 sources:
 - https://github.com/swaywm/sway
-- https://github.com/swaywm/wlroots
+- https://gitlab.freedesktop.org/wlroots/wlroots.git
 tasks:
 - setup: |
     cd sway
@@ -33,7 +34,7 @@ tasks:
     cd subprojects
     ln -s ../../wlroots wlroots
     cd ..
-    meson build -Dtray=enabled -Dsd-bus-provider=basu
+    meson build --fatal-meson-warnings -Dtray=enabled -Dsd-bus-provider=basu
 - build: |
     cd sway
     ninja -C build
diff --git a/.clang-format b/.clang-format
deleted file mode 100644
index 5818da3c..00000000
--- a/.clang-format
+++ /dev/null
@@ -1,16 +0,0 @@
-BasedOnStyle: LLVM
-IndentWidth: 4
-TabWidth: 4
-UseTab: Always
-BreakBeforeBraces: Attach
-AllowShortIfStatementsOnASingleLine: false
-IndentCaseLabels: false
-SortIncludes: false
-ColumnLimit: 80
-AlignAfterOpenBracket: DontAlign
-BinPackParameters: false
-BinPackArguments: false
-ContinuationIndentWidth: 8
-AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortLoopsOnASingleLine: true
-ReflowComments: false
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 156accde..eba606e6 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -6,10 +6,9 @@ labels: 'bug'
 ---
 
 ### Please read the following before submitting:
-- Please do NOT submit bug reports for questions. Ask questions on IRC at #sway on irc.freenode.net.
+- Please do NOT submit bug reports for questions. Ask questions on IRC at #sway on Libera Chat.
 - Proprietary graphics drivers, including nvidia, are not supported. Please use the open source equivalents, such as nouveau, if you would like to use Sway.
-- Problems with the Wayland version of Firefox are likely to be Firefox bugs. Start by submitting your issue to the Firefox Bugzilla and come back here only after they confirm otherwise.
-- Please do NOT submit issues for information from the github wiki. The github wiki is community maintained and therefore may contain outdated information, scripts that don't work or osbolete workarounds.
+- Please do NOT submit issues for information from the github wiki. The github wiki is community maintained and therefore may contain outdated information, scripts that don't work or obsolete workarounds.
   If you fix a script or find outdated information, don't hesitate to adjust the wiki page.
 
 ### Please fill out the following:
@@ -19,6 +18,7 @@ labels: 'bug'
 - **Debug Log:**
   - Run `sway -d 2> ~/sway.log` from a TTY and upload it to a pastebin, such as gist.github.com.
   - This will record information about sway's activity. Please try to keep the reproduction as brief as possible and exit sway.
+  - Attach the **full** file, do not truncate it.
 
 - **Configuration File:**
   - Please try to produce with the default configuration.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index f09cdf5b..0092609b 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
   - name: Questions
-    url: "http://webchat.freenode.net/?channels=sway&uio=d4"
-    about: "Please ask questions on IRC in #sway on irc.freenode.net"
+    url: "https://libera.chat"
+    about: "Please ask questions on IRC in #sway on Libera Chat"
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c17afdda..4f043f7a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,9 +1,8 @@
 # Contributing to sway
 
 Contributing just involves sending a pull request. You will probably be more
-successful with your contribution if you visit
-[#sway-devel](https://webchat.freenode.net/?channels=sway-devel) on
-irc.freenode.net upfront and discuss your plans.
+successful with your contribution if you visit #sway-devel on Libera Chat
+upfront and discuss your plans.
 
 Note: rules are made to be broken. Adjust or ignore any/all of these as you see
 fit, but be prepared to justify it to your peers.
diff --git a/README.de.md b/README.de.md
index 24e66a60..01b5e9ad 100644
--- a/README.de.md
+++ b/README.de.md
@@ -1,8 +1,8 @@
 # Sway
-Sway ist ein [i3](https://i3wm.org/)-kompatibler [Wayland](http://wayland.freedesktop.org/)-Compositor. Lies die [FAQ](https://github.com/swaywm/sway/wiki). Tritt dem [IRC Channel](http://webchat.freenode.net/?channels=sway&uio=d4) bei (#sway on irc.freenode.net; Englisch).
+Sway ist ein [i3](https://i3wm.org/)-kompatibler [Wayland](http://wayland.freedesktop.org/)-Compositor. Lies die [FAQ](https://github.com/swaywm/sway/wiki). Tritt dem [IRC Channel](https://web.libera.chat/gamja/?channels=#sway) bei (#sway on irc.libera.chat; Englisch).
 
 ## Signaturen
-Jedes Release wird mit dem PGP-Schlüssel [B22DA89A](http://pgp.mit.edu/pks/lookup?op=vindex&search=0x52CB6609B22DA89A) signiert und auf GitHub veröffentlicht.
+Jedes Release wird mit dem PGP-Schlüssel [E88F5E48](https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48) signiert und auf GitHub veröffentlicht.
 
 ## Installation
 ### Mit der Paketverwaltung
@@ -15,7 +15,7 @@ Falls du sway für deine eigene Distribution als Paket bereitstellen möchtest,
 sway benötigt die folgenden Pakete:
 
 * meson\*
-* [wlroots](https://github.com/swaywm/wlroots)
+* [wlroots](https://gitlab.freedesktop.org/wlroots/wlroots)
 * wayland
 * wayland-protocols\*
 * pcre
diff --git a/README.dk.md b/README.dk.md
index 535000c3..f712e96b 100644
--- a/README.dk.md
+++ b/README.dk.md
@@ -1,41 +1,43 @@
 # Sway
 
-Sway er en [i3](https://i3wm.org/)-kompatibel [Wayland](http://wayland.freedesktop.org/) compositor.
-Læs [Ofte stillede spørgsmål](https://github.com/swaywm/sway/wiki).
-Deltag på [IRC kanalen](http://webchat.freenode.net/?channels=sway&uio=d4) (#sway på irc.freenode.net).
+Sway er en [i3]-kompatibel [Wayland] compositor. Læs [Ofte stillede spørgsmål].
+Deltag på [IRC kanalen][IRC kanal] \(#sway på irc.libera.chat).
 
 ## Udgivelses Signaturer
 
-Udgivelser er signeret med [B22DA89A](http://pgp.mit.edu/pks/lookup?op=vindex&search=0x52CB6609B22DA89A)
-og publiseret på [GitHub](https://github.com/swaywm/sway/releases).
+Udgivelser er signeret med [E88F5E48] og publiceret [på GitHub][GitHub
+releases].
 
 ## Installation
 
-### Fra Pakker
+### Fra pakker
 
-Sway er tilgængelig i mange distributioner. Prøv at installere pakken "svay". Hvis den ikke er tilgængelig, så tjek [denne wiki-side](https://github.com/swaywm/sway/wiki/Unsupported-packages)
-for information om installation til din(e) distribution(er).
+Sway er tilgængelig i mange distributioner. Prøv at installere "sway" pakken
+fra din.
 
-Hvis du er interesseret i at lave en Sway pakke til din distribution, burde du besøge IRC
-kanalen eller sende en e-mail til sir@cmpwn.com for rådgivning.
+Hvis du er interesseret i at pakke Sway til din distribution, kan du tage forbi
+IRC kanalen eller sende en email til sir@cmpwn.com for rådgivning.
 
 ### Kompilering fra kildekode
 
-Installation afhænger af følgende programmer:
+Se [denne wiki-side][Opsætning til udvikling] hvis du vil bygge HEAD af sway og
+wlroots til test eller udvikling.
+
+Installationsafhængigheder:
 
 * meson \*
-* [wlroots](https://github.com/swaywm/wlroots)
+* [wlroots]
 * wayland
 * wayland-protocols \*
 * pcre
 * json-c
 * pango
 * cairo
-* gdk-pixbuf2 (valgfrit tillæg: system tray)
-* [scdoc](https://git.sr.ht/~sircmpwn/scdoc) (valgfrit tillæg: man pages) \*
+* gdk-pixbuf2 (valgfrit: system tray)
+* [scdoc] (valgfrit: man pages) \*
 * git \*
 
-_\*Kompiler krav_
+_\*Kompileringsafhængighed_
 
 Kør følgende kommandoer:
 
@@ -43,21 +45,30 @@ Kør følgende kommandoer:
     ninja -C build
     sudo ninja -C build install
 
-På systemer uden 'logind', behøver du at sætte ejerens bruger-id for Sways eksekverbare filer - såkaldt SUID (Set owner User ID):
+På systemer uden logind eller seatd skal du sætte SUID bit på sway filen:
 
     sudo chmod a+s /usr/local/bin/sway
 
-Sway vil frasige sig 'root' tilladelser kort efter opstart
+Sway dropper 'root' tilladelser kort efter opstart.
 
 ## Konfiguration
 
-Hvis du allerede bruger i3, bør du kopiere din i3-konfiguration til `~/.config/sway/config` og
-det vil bare fungerer. Ellers skal du kopiere eksempel konfigurations filen til
-`~/.config/sway/config`. Den er normalt placeret i `/etc/sway/config`.
-Kør `man 5 sway` for at få oplysninger om konfigurationen.
-
-## Kører
-
-Kør `sway` fra en TTY. Nogle display managers fungerer muligvis, men understøttes ikke af
-Sway (gdm er kendt for at fungere temmelig godt).
-
+Hvis du allerede bruger i3 kan du bare kopiere din i3 konfiguration til
+`~/.config/sway/config`. Ellers skal du kopiere eksempelkonfigurationsfilen til
+`~/.config/sway/config`. Den er normalt placeret i `/etc/sway/config`.  Kør
+`man 5 sway` for at få oplysninger om konfigurationen.
+
+## Eksekvering
+
+Kør `sway` fra en TTY. Nogle display managers kan fungere, men Sway yder ikke
+support til dem (gdm er kendt for at fungere temmelig godt).
+
+[i3]: https://i3wm.org/
+[Wayland]: http://wayland.freedesktop.org/
+[Ofte stillede spørgsmål]: https://github.com/swaywm/sway/wiki
+[IRC kanal]: https://web.libera.chat/gamja/?channels=#sway
+[E88F5E48]: https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48
+[GitHub releases]: https://github.com/swaywm/sway/releases
+[Opsætning til udvikling]: https://github.com/swaywm/sway/wiki/Development-Setup
+[wlroots]: https://gitlab.freedesktop.org/wlroots/wlroots
+[scdoc]: https://git.sr.ht/~sircmpwn/scdoc
diff --git a/README.es.md b/README.es.md
index 53f11f68..7af7d90b 100644
--- a/README.es.md
+++ b/README.es.md
@@ -1,12 +1,12 @@
 # sway
 
 sway es un compositor de [Wayland](http://wayland.freedesktop.org/) compatible con [i3](https://i3wm.org/).
-Lea el [FAQ](https://github.com/swaywm/sway/wiki). Únase al [canal de IRC](http://webchat.freenode.net/?channels=sway&uio=d4) (#sway on
-irc.freenode.net).
+Lea el [FAQ](https://github.com/swaywm/sway/wiki). Únase al [canal de IRC](https://web.libera.chat/gamja/?channels=#sway) (#sway on
+irc.libera.chat).
 
 ## Firmas de las versiones
 
-Las distintas versiones están firmadas con [B22DA89A](http://pgp.mit.edu/pks/lookup?op=vindex&search=0x52CB6609B22DA89A)
+Las distintas versiones están firmadas con [E88F5E48](https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48)
 y publicadas [en GitHub](https://github.com/swaywm/sway/releases).
 
 ## Instalación
@@ -25,7 +25,7 @@ escriba un email a sir@cmpwn.com
 Instale las dependencias:
 
 * meson \*
-* [wlroots](https://github.com/swaywm/wlroots)
+* [wlroots](https://gitlab.freedesktop.org/wlroots/wlroots)
 * wayland
 * wayland-protocols \*
 * pcre
diff --git a/README.fr.md b/README.fr.md
index a72696d6..359a30f9 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -1,48 +1,49 @@
 # sway
 
-Sway est un compositeur [Wayland](http://wayland.freedesktop.org/) compatible
-avec [i3](https://i3wm.org/), **en cours de développement**.  Lisez la
-[FAQ](https://github.com/swaywm/sway/wiki). Rejoignez le [canal
-IRC](http://webchat.freenode.net/?channels=sway&uio=d4) (#sway sur
-irc.freenode.net).
+Sway est un compositeur [Wayland] compatible avec [i3]. Lisez la
+[FAQ]. Rejoignez le [canal IRC] (#sway sur irc.libera.chat).
 
 ## Aide en français
 
-[abdelq](//github.com/abdelq) fournit du support en français sur IRC et Github, dans le fuseau horaire UTC-4 (EST).
+[abdelq] fournit du support en français sur IRC et Github, dans le fuseau
+horaire UTC-4 (EST).
 
 ## Signatures de nouvelles versions
 
-Les nouvelles versions sont signées avec [B22DA89A](http://pgp.mit.edu/pks/lookup?op=vindex&search=0x52CB6609B22DA89A)
-et publiées [sur GitHub](https://github.com/swaywm/sway/releases).
+Les nouvelles versions sont signées avec [E88F5E48] et publiées
+[sur GitHub][versions GitHub].
 
 ## Installation
 
 ### À partir de paquets
 
-Sway est disponible sur plusieurs distributions. Essayez d'installer le paquet "sway" pour
-la vôtre. Si ce n'est pas disponible, consultez [cette page wiki](https://github.com/swaywm/sway/wiki/Unsupported-packages)
-pour de l'information sur l'installation pour vos distributions.
+Sway est disponible sur beaucoup de distributions. Essayez d'installer le
+paquet "sway" pour la vôtre.
 
-Si vous êtes intéressé à maintenir Sway pour votre distribution, passez par le canal
-IRC ou envoyez un e-mail à sir@cmpwn.com (en anglais seulement) pour des conseils.
+Si vous êtes intéressé à maintenir Sway pour votre distribution, passez sur le
+canal IRC ou envoyez un e-mail à sir@cmpwn.com (en anglais seulement) pour des
+conseils.
 
-### Compilation depuis la source
+### Compilation depuis les sources
+
+Consultez [cette page wiki][Configuration de développement] si vous souhaitez
+compiler la révision HEAD de sway et wlroots pour tester ou développer.
 
 Installez les dépendances :
 
 * meson \*
-* [wlroots](https://github.com/swaywm/wlroots)
+* [wlroots]
 * wayland
 * wayland-protocols \*
 * pcre
 * json-c
 * pango
 * cairo
-* gdk-pixbuf2 (optionnel: system tray)
-* [scdoc](https://git.sr.ht/~sircmpwn/scdoc) (optionnel: requis pour les pages man) \*
-* git \*
+* gdk-pixbuf2 (optionnel : system tray)
+* [scdoc] (optionnel : requis pour les pages man) \*
+* git (optionnel : information de version) \*
 
-_\*Requis uniquement pour la compilation_
+_\* Requis uniquement pour la compilation_
 
 Exécutez ces commandes :
 
@@ -58,12 +59,25 @@ Sway se débarassera des permissions *root* peu de temps après le démarrage.
 
 ## Configuration
 
-Si vous utilisez déjà i3, copiez votre configuration i3 à `~/.config/sway/config` et
-cela va fonctionner. Sinon, copiez l'exemple de fichier de configuration à
-`~/.config/sway/config`. Il se trouve généralement dans `/etc/sway/config`.
-Exécutez `man 5 sway` pour l'information sur la configuration.
+Si vous utilisez déjà i3, copiez votre configuration i3 vers
+`~/.config/sway/config` et sway fonctionnera directement. Sinon, copiez
+l'exemple de fichier de configuration vers `~/.config/sway/config`. Il se
+trouve généralement dans `/etc/sway/config`. Exécutez `man 5 sway` pour lire la
+documentation pour la configuration de sway.
 
 ## Exécution
 
-Exécutez `sway` à partir d'un TTY. Certains gestionnaires d'affichage peuvent fonctionner,
-mais ne sont pas supportés par Sway (gdm est réputé pour assez bien fonctionner).
+Exécutez `sway` à partir d'un TTY. Certains gestionnaires d'affichage peuvent
+fonctionner, mais ne sont pas supportés par Sway (gdm est réputé pour assez
+bien fonctionner).
+
+[Wayland]: http://wayland.freedesktop.org/
+[i3]: https://i3wm.org/
+[FAQ]: https://github.com/swaywm/sway/wiki
+[canal IRC]: https://web.libera.chat/gamja/?channels=#sway
+[abdelq]: https://github.com/abdelq
+[E88F5E48]: https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48
+[versions GitHub]: https://github.com/swaywm/sway/releases
+[Configuration de développement]: https://github.com/swaywm/sway/wiki/Development-Setup
+[wlroots]: https://gitlab.freedesktop.org/wlroots/wlroots
+[scdoc]: https://git.sr.ht/~sircmpwn/scdoc
diff --git a/README.gr.md b/README.gr.md
new file mode 100644
index 00000000..4c30e29d
--- /dev/null
+++ b/README.gr.md
@@ -0,0 +1,73 @@
+# Sway
+
+Το sway ένα [i3]-συμβατό [Wayland] compositor. Διαβάστε το [FAQ]. Μπείτε στο
+[IRC channel] \(#sway on irc.libera.chat).
+
+## Υπογ�αφές δημοσιε�σεων
+
+Οι εκδόσεις είναι υπογε�αμμένες με [E88F5E48] και δημοσιευμένες [στο GitHub][GitHub releases].
+
+## Εγκατάσταση
+
+### Από πακέτα
+
+Το Sway είναι διαθέσιμο σε πολλά distributions. Δοκιμάστε εγκαταστώντας το "sway" package για
+το δικό σας.
+
+Εάν ενδιαφέ�εστε για packaging του sway για το distribution σας, να πάτε στο IRC
+channel ή στείλτε ένα email στο sir@cmpwn.com για συμβουλές.
+
+### Compiling από πηγή
+
+Τσεκά�ετε [αυτό το wiki page][Development setup] εάμα θέλετε να κάνετε build το HEAD του
+sway και wlroots γιά τεστά�ισμα ή development.
+
+Εγκατάσταση των dependencies:
+
+* meson \*
+* [wlroots]
+* wayland
+* wayland-protocols \*
+* pcre
+* json-c
+* pango
+* cairo
+* gdk-pixbuf2 (π�οαι�ετικό: system tray)
+* [scdoc] (π�οαι�ετικό: man pages) \*
+* git (π�οαι�ετικό: πλη�οφο�ίες εκδώσεων) \*
+
+_\*Compile-time dep_
+
+Τ�έξτε αυτά τα commands:
+
+    meson build/
+    ninja -C build/
+    sudo ninja -C build/ install
+
+Σε συστήματα χω�ίς logind ή seatd, π�έπει να κάνετε suid το sway binary:
+
+    sudo chmod a+s /usr/local/bin/sway
+
+Το Sway θα κάνει drop root δικαιώματα λίγο μετά την εκκίνηση.
+
+## Configuration
+
+Εάν ήδη χ�ησιμοποιήτε το i3, αντιγ�άψτε το i3 config σας στο `~/.config/sway/config` και
+θα δουλέψει out of the box. Αλλιώς, αντιγ�άψτε το sample configuration α�χείο στο
+`~/.config/sway/config`. Το οποίο συνήθως β�ίσκεται στο `/etc/sway/config`.
+Κάντε run `man 5 sway` για πλη�οφο�ίες το� configuration.
+
+## Τ�έχοντας
+
+Τ�έξτε `sway` από ένα TTY. Με�ίκα display managers μπο�εί να δουλέψουν αλλά δέν είναι συμβατά με
+το sway (το gdm γνω�ίζεται να δουλέβει σχετικά καλά).
+
+[i3]: https://i3wm.org/
+[Wayland]: http://wayland.freedesktop.org/
+[FAQ]: https://github.com/swaywm/sway/wiki
+[IRC channel]: https://web.libera.chat/gamja/?channels=#sway
+[E88F5E48]: https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48
+[GitHub releases]: https://github.com/swaywm/sway/releases
+[Development setup]: https://github.com/swaywm/sway/wiki/Development-Setup
+[wlroots]: https://gitlab.freedesktop.org/wlroots/wlroots
+[scdoc]: https://git.sr.ht/~sircmpwn/scdoc
\ No newline at end of file
diff --git a/README.hu.md b/README.hu.md
new file mode 100644
index 00000000..4e006f25
--- /dev/null
+++ b/README.hu.md
@@ -0,0 +1,77 @@
+# sway
+
+A Sway egy [i3]-kompatibilis [Wayland] kompozitor. Olvasd el a [Gyarkan Ismételt Kérdéseket][FAQ]. Csatlakozz az [IRC csatornához][IRC channel] \(`#sway` az `irc.libera.chat`-en).
+
+## Csomag aláírások
+
+A kiadott csomagok az [E88F5E48] kulccsal vannak aláírva és [GitHub-on][GitHub releases] publikálva.
+
+## Telepítés
+
+### Csomagból
+
+A Sway sok disztribúció csomagkezelőjéből elérhető, próbáld meg a "sway"
+csomagot telepíteni az általad használt eszközzel.
+
+Ha szeretnél csomagot készíteni a saját disztribúciódhoz, ugorj be az IRC
+csatornára, vagy küldj levelet a sir@cmpwn.com címre tanácsokért.
+
+### Fordítás forráskódból
+
+Olvasd el [ezt a wiki oldalt][Development setup], ha szeretnéd tesztelési vagy
+fejlesztési célokból lefordítani az aktuális (HEAD) állapotát a `sway`-nek és a
+`wlroots`-nak.
+
+Telepítsd a függőségeket:
+
+* meson \*
+* [wlroots]
+* wayland
+* wayland-protocols \*
+* pcre
+* json-c
+* pango
+* cairo
+* gdk-pixbuf2 (opcionális: system tray)
+* [scdoc] (opcionális: man pages) \*
+* git (opcionális: version info) \*
+
+_\*Fordításidejű függőség_
+
+Futtasd ezeket a parancsokat:
+
+    meson build
+    ninja -C build
+    sudo ninja -C build install
+
+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
+`~/.config/sway/config` file-ba és ugyanúgy működni fognak. Egyéb esetben másold
+le kiindulási alapnak a mintát, ami általában az `etc/sway/config` elérési
+útvonalon található.
+Futtasd a `man 5 sway` parancsot további információért a konfigurációval
+kapcsolatban.
+
+## Futtatás
+
+Futtasd a `sway` parancsot egy TTY felületről. Néhány bejelentkezéskezelő
+(display manager) működhet, de alapvetően nem támogatottak a sway által. (A
+gdm-ről ismeretes, hogy egész jól működik.)
+
+[i3]: https://i3wm.org/
+[Wayland]: http://wayland.freedesktop.org/
+[FAQ]: https://github.com/swaywm/sway/wiki
+[IRC channel]: https://web.libera.chat/gamja/?channels=#sway
+[E88F5E48]: https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48
+[GitHub releases]: https://github.com/swaywm/sway/releases
+[Development setup]: https://github.com/swaywm/sway/wiki/Development-Setup
+[wlroots]: https://gitlab.freedesktop.org/wlroots/wlroots
+[scdoc]: https://git.sr.ht/~sircmpwn/scdoc
diff --git a/README.ir.md b/README.ir.md
new file mode 100644
index 00000000..4542b93b
--- /dev/null
+++ b/README.ir.md
@@ -0,0 +1,60 @@
+# sway
+
+‏sway یک کامپوزیتور الهام گرÙ�ته از [i3](https://i3wm.org/) بر روی [Wayland](http://wayland.freedesktop.org/) است. [سوال‌های متداول](https://github.com/swaywm/sway/wiki) را بخوانید. در [کانال
+IRC](http://web.libera.chat/gamja/?channels=sway&uio=d4) عضو شوید (‎#sway‏ در
+irc.libera.chat).
+
+برای حمایت از تیم توسعه sway به [ص�حه
+Patreon با نام کاربری SirCmpwn](https://patreon.com/sircmpwn) مراجعه کنید.
+
+## امضای نسخه‌ها
+
+امضای نسخه‌ها با [B22DA89A](http://pgp.mit.edu/pks/lookup?op=vindex&search=0x52CB6609B22DA89A) در [GitHub](https://github.com/swaywm/sway/releases) منتشر می‌شود.
+
+## شیوه نصب
+
+### از بسته‌های رسمی
+
+‏sway در بسته‌های رسمی توزیع‌های مختلÙ� وجود دارد. بسته «sway» را نصب کنید. در صورتی Ú©Ù‡ بسته رسمی وجود نداشت، برای آگاهی بیشتر درباره نصب روی توزیعتان به این [صÙ�حه راهنما](https://github.com/swaywm/sway/wiki/Unsupported-packages) مراجعه کنید.
+
+اگر به ایجاد بسته sway برای توزیعتان علاقه‌مند هستید، از کانال IRC است�اده کنید یا به sir@cmpwn.com ایمیل بزنید.
+
+### کامپایل کردن کد
+
+چنانچه می‌خواهید آخرین نسخه کد sway و wlroots را برای آزمایش یا توسعه بسازید به این [ص�حه راهنما](https://github.com/swaywm/sway/wiki/Development-Setup) مراجعه کنید.
+
+بسته‌های مورد نیاز:
+
+* meson \*
+* [wlroots](https://gitlab.freedesktop.org/wlroots/wlroots)
+* wayland
+* wayland-protocols \*
+* pcre
+* json-c
+* pango
+* cairo
+* gdk-pixbuf2 (انتخابی: برای system tray)
+* [scdoc](https://git.sr.ht/~sircmpwn/scdoc) (انتخابی: برای ص�حه‌های راهنما) \*
+* git (انتخابی: برای اطلاع در خصوص نسخه‌ها) \*
+
+_\*نیازمندی‌های زمان کامپایل برنامه_
+
+این �رمان‌ها را اجرا کنید:
+
+    meson build
+    ninja -C build
+    sudo ninja -C build install
+
+روی سیستم‌های بدون logind، باید �رمان زیر را برای suid کردن باینری sway اجرا کنید:
+
+    sudo chmod a+s /usr/local/bin/sway
+
+‏sway پس از startup مجوزهای دسترسی root را رها می‌کند.
+
+### شخصی سازی و تنظیمات
+
+اگر در حال حاضر از i3 است�اده می‌کنید، تنظیمات i3 خودتان را در �ایل ‪`~/.config/sway/config`‬ کپی کنید و بدون نیاز به تغییر کار خواهد کرد. در غیر این‌صورت، �ایل نمونه تنظیمات را است�اده کنید. این �ایل عموما در ‪`/etc/sway/config`‬ قرار دارد. برای آگاهی بیشتر `man 5 sway` را اجرا کنید.
+
+## اجرا
+
+در محیط TTY کا�یست `sway` را اجرا کنید. ممکن است ابزارهای مدیریت نمایشگری نیز برای این کار وجود داشته باشند اما از طر� sway پشتیبانی نمی‌شوند (gdm عملکرد خوبی در این زمینه دارد).
diff --git a/README.ja.md b/README.ja.md
index fa28f3da..786e169c 100644
--- a/README.ja.md
+++ b/README.ja.md
@@ -2,7 +2,7 @@
 
 Sway�[i3](https://i3wm.org/)互��[Wayland](http://wayland.freedesktop.org/)コン�ジタ��。
 [FAQ](https://github.com/swaywm/sway/wiki)も�����覧����。
-[IRC �ャン�ル](http://webchat.freenode.net/?channels=sway&uio=d4) (irc.freenode.net�#sway)も�り��。
+[IRC �ャン�ル](https://web.libera.chat/gamja/?channels=#sway) (irc.libera.chat�#sway)も�り��。
 
 [![](https://sr.ht/ICd5.png)](https://sr.ht/ICd5.png)
 
@@ -12,7 +12,7 @@ SirCmpwn��日本語��サ�ートをIRC�GitHub�行���。タイ
 
 ## リリース�署�
 
-Sway�リリース�[B22DA89A](http://pgp.mit.edu/pks/lookup?op=vindex&search=0x52CB6609B22DA89A)�署��れ�[GitHub](https://github.com/swaywm/sway/releases)�公開�れ����。
+Sway�リリース�[E88F5E48](https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48)�署��れ�[GitHub](https://github.com/swaywm/sway/releases)�公開�れ����。
 
 ## インストール
 
@@ -27,7 +27,7 @@ Sway�沢山�ディストリビューション��供�れ����。"
 次��存パッケージをインストール������:
 
 * meson \*
-* [wlroots](https://github.com/swaywm/wlroots)
+* [wlroots](https://gitlab.freedesktop.org/wlroots/wlroots)
 * wayland
 * wayland-protocols \*
 * pcre
diff --git a/README.ko.md b/README.ko.md
index 9c3dd323..1086da0c 100644
--- a/README.ko.md
+++ b/README.ko.md
@@ -1,11 +1,11 @@
 # sway
 
 sway는 [i3](https://i3wm.org/)-호환 [Wayland](http://wayland.freedesktop.org/) 컴�지터입니다.
-[FAQ](https://github.com/swaywm/sway/wiki)를 �어보세요. [IRC 채�](http://webchat.freenode.net/?channels=sway&uio=d4) (#sway on irc.freenode.net)� 있습니다.
+[FAQ](https://github.com/swaywm/sway/wiki)를 �어보세요. [IRC 채�](https://web.libera.chat/gamja/?channels=#sway) (#sway on irc.libera.chat)� 있습니다.
 
 ## 릴리즈 서명
 
-릴리즈는 [B22DA89A](http://pgp.mit.edu/pks/lookup?op=vindex&search=0x52CB6609B22DA89A)�서 서명�고,
+릴리즈는 [E88F5E48](https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48)�서 서명�고,
 [GitHub�서](https://github.com/swaywm/sway/releases) 공개�고 있습니다.
 
 ## 설치
@@ -24,7 +24,7 @@ IRC 채�� 방문하거나 sir@cmpwn.com으로 �메�� 보내 �담 받
 다� �존 패키지들� 설치해 주세요:
 
 * meson \*
-* [wlroots](https://github.com/swaywm/wlroots)
+* [wlroots](https://gitlab.freedesktop.org/wlroots/wlroots)
 * wayland
 * wayland-protocols \*
 * pcre
diff --git a/README.md b/README.md
index 4698afbe..8c252e9e 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 # sway
 
-**[English][en]** - [日本語][ja] - [Français][fr] - [Україн�ька][uk] - [Español][es] - [Polski][pl] - [中文-简体][zh-CN] - [Deutsch][de] - [Nederlands][nl] - [Ру��кий][ru] - [中文-�體][zh-TW] - [Português][pt] - [Danish][dk] - [한국어][ko] - [Română][ro]
+**[English][en]** - [日本語][ja] - [Français][fr] - [Україн�ька][uk] - [Español][es] - [Polski][pl] - [中文-简体][zh-CN] - [Deutsch][de] - [Nederlands][nl] - [Ру��кий][ru] - [中文-�體][zh-TW] - [Português][pt] - [Dansk][dk] - [한국어][ko] - [Română][ro] - [Magyar][hu] - [Türkçe][tr] - [�ارسی][ir] - [Ελληνικά][gr]
 
 sway is an [i3]-compatible [Wayland] compositor. Read the [FAQ]. Join the
-[IRC channel] \(#sway on irc.freenode.net).
+[IRC channel] \(#sway on irc.libera.chat).
 
 ## Release Signatures
 
@@ -16,9 +16,6 @@ Releases are signed with [E88F5E48] and published [on GitHub][GitHub releases].
 Sway is available in many distributions. Try installing the "sway" package for
 yours.
 
-If you're interested in packaging sway for your distribution, stop by the IRC
-channel or shoot an email to sir@cmpwn.com for advice.
-
 ### Compiling from Source
 
 Check out [this wiki page][Development setup] if you want to build the HEAD of
@@ -38,15 +35,15 @@ Install dependencies:
 * [scdoc] (optional: man pages) \*
 * git (optional: version info) \*
 
-_\*Compile-time dep_
+_\* Compile-time dep_
 
 Run these commands:
 
-    meson build
-    ninja -C build
-    sudo ninja -C build install
+    meson build/
+    ninja -C build/
+    sudo ninja -C build/ install
 
-On systems without logind, you need to suid the sway binary:
+On systems without logind nor seatd, you need to suid the sway binary:
 
     sudo chmod a+s /usr/local/bin/sway
 
@@ -79,12 +76,16 @@ sway (gdm is known to work fairly well).
 [dk]: https://github.com/swaywm/sway/blob/master/README.dk.md
 [ko]: https://github.com/swaywm/sway/blob/master/README.ko.md
 [ro]: https://github.com/swaywm/sway/blob/master/README.ro.md
+[hu]: https://github.com/swaywm/sway/blob/master/README.hu.md
+[tr]: https://github.com/swaywm/sway/blob/master/README.tr.md
+[ir]: https://github.com/swaywm/sway/blob/master/README.ir.md
+[gr]: https://github.com/swaywm/sway/blob/master/README.gr.md
 [i3]: https://i3wm.org/
 [Wayland]: http://wayland.freedesktop.org/
 [FAQ]: https://github.com/swaywm/sway/wiki
-[IRC channel]: http://webchat.freenode.net/?channels=sway&uio=d4
+[IRC channel]: https://web.libera.chat/gamja/?channels=#sway
 [E88F5E48]: https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48
 [GitHub releases]: https://github.com/swaywm/sway/releases
 [Development setup]: https://github.com/swaywm/sway/wiki/Development-Setup
-[wlroots]: https://github.com/swaywm/wlroots
+[wlroots]: https://gitlab.freedesktop.org/wlroots/wlroots
 [scdoc]: https://git.sr.ht/~sircmpwn/scdoc
diff --git a/README.nl.md b/README.nl.md
index 86ebe398..c0a93063 100644
--- a/README.nl.md
+++ b/README.nl.md
@@ -2,12 +2,12 @@
 
 Sway is een [i3](https://i3wm.org/)-compatibele [Wayland](http://wayland.freedesktop.org/) compositor.
 Lees de [FAQ](https://github.com/swaywm/sway/wiki). Word lid van het [IRC
-kanaal](http://webchat.freenode.net/?channels=sway&uio=d4) (#sway op
-irc.freenode.net).
+kanaal](https://web.libera.chat/gamja/?channels=#sway) (#sway op
+irc.libera.chat).
 
 ## Releasehandtekeningen
 
-Releases worden ondertekend met [B22DA89A](http://pgp.mit.edu/pks/lookup?op=vindex&search=0x52CB6609B22DA89A)
+Releases worden ondertekend met [E88F5E48](https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48)
 en gepubliceerd [op GitHub](https://github.com/swaywm/sway/releases).
 
 ## Installatie
@@ -25,7 +25,7 @@ kanaal of stuur een e-mail naar sir@cmpwn.com voor advies.
 Afhankelijkheden installeren:
 
 * meson \*
-* [wlroots](https://github.com/swaywm/wlroots)
+* [wlroots](https://gitlab.freedesktop.org/wlroots/wlroots)
 * wayland
 * wayland-protocols \*
 * pcre
diff --git a/README.pl.md b/README.pl.md
index b63b8567..6d376b68 100644
--- a/README.pl.md
+++ b/README.pl.md
@@ -1,12 +1,12 @@
 # sway
 
 sway jest kompozytorem [Wayland](http://wayland.freedesktop.org/) kompatybilnym z [i3](https://i3wm.org/).
-Przeczytaj [FAQ](https://github.com/swaywm/sway/wiki). Dołącz do [kanału IRC](http://webchat.freenode.net/?channels=sway&uio=d4)
-(#sway na irc.freenode.net).
+Przeczytaj [FAQ](https://github.com/swaywm/sway/wiki). Dołącz do [kanału IRC](https://web.libera.chat/gamja/?channels=#sway)
+(#sway na irc.libera.chat).
 
 ## Podpisy cyfrowe wydań
 
-Wydania sÄ… podpisywane przy pomocy klucza [B22DA89A](http://pgp.mit.edu/pks/lookup?op=vindex&search=0x52CB6609B22DA89A)
+Wydania sÄ… podpisywane przy pomocy klucza [E88F5E48](https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48)
 i publikowane [na GitHubie](https://github.com/swaywm/sway/releases).
 
 ## Instalacja
@@ -25,7 +25,7 @@ adres sir@cmpwn.com w celu uzyskania wskazówek.
 Zainstaluj zależności:
 
 * meson \*
-* [wlroots](https://github.com/swaywm/wlroots)
+* [wlroots](https://gitlab.freedesktop.org/wlroots/wlroots)
 * wayland
 * wayland-protocols \*
 * pcre
diff --git a/README.pt.md b/README.pt.md
index ad7cab65..92a4b54d 100644
--- a/README.pt.md
+++ b/README.pt.md
@@ -2,12 +2,12 @@
 
 O sway é um compositor do [Wayland](http://wayland.freedesktop.org/) compatível com o [i3](https://i3wm.org/).
 Leia o [FAQ](https://github.com/swaywm/sway/wiki). Junte-se ao [canal do    
-IRC](http://webchat.freenode.net/?channels=sway&uio=d4) (#sway em
-irc.freenode.net).
+IRC](https://web.libera.chat/gamja/?channels=#sway) (#sway em
+irc.libera.chat).
 
 ## Assinatura das versões
 
-As versões são assinadas com [B22DA89A](http://pgp.mit.edu/pks/lookup?op=vindex&search=0x52CB6609B22DA89A)
+As versões são assinadas com [E88F5E48](https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48)
 e publicadas [no GitHub](https://github.com/swaywm/sway/releases).
 
 ## Instalação
@@ -27,7 +27,7 @@ Verifique [essa página da wiki](https://github.com/swaywm/sway/wiki/Development
 Instale as dependências:
 
 * meson \*
-* [wlroots](https://github.com/swaywm/wlroots)
+* [wlroots](https://gitlab.freedesktop.org/wlroots/wlroots)
 * wayland
 * wayland-protocols \*
 * pcre
diff --git a/README.ro.md b/README.ro.md
index dd895b56..f7785b8f 100644
--- a/README.ro.md
+++ b/README.ro.md
@@ -1,11 +1,11 @@
 # sway
 
 sway este un compositor pentru [Wayland](http://wayland.freedesktop.org/) compatibil cu [i3](https://i3wm.org/).
-Citiți [FAQ](https://github.com/swaywm/sway/wiki)-ul. Connectați-vă la canalul nostru [IRC](http://webchat.freenode.net/?channels=sway&uio=d4) (#sway pe irc.freenode.net).
+Citiți [FAQ](https://github.com/swaywm/sway/wiki)-ul. Connectați-vă la canalul nostru [IRC](https://web.libera.chat/gamja/?channels=#sway) (#sway pe irc.libera.chat).
 
 ## Semnarea digitală
 
-Noile versiuni sunt semnate cu [B22DA89A](http://pgp.mit.edu/pks/lookup?op=vindex&search=0x52CB6609B22DA89A)
+Noile versiuni sunt semnate cu [E88F5E48](https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48)
 și postate [pe GitHub](https://github.com/swaywm/sway/releases).
 
 ## Instalare
@@ -22,7 +22,7 @@ Dacă sunteți interesați in a crea pachete pentru distribuția voastră, infor
 Dependențe pentru instalare:
 
 * meson \*
-* [wlroots](https://github.com/swaywm/wlroots)
+* [wlroots](https://gitlab.freedesktop.org/wlroots/wlroots)
 * wayland
 * wayland-protocols \*
 * pcre
diff --git a/README.ru.md b/README.ru.md
index a870ec89..d563859c 100644
--- a/README.ru.md
+++ b/README.ru.md
@@ -1,42 +1,41 @@
 # sway
 
-sway - �то [i3](https://i3wm.org/)-�овме�тимый композитор [Wayland](http://wayland.freedesktop.org/).
-Больше информации в [FAQ](https://github.com/swaywm/sway/wiki). При�оедин�йте�ь к
-[IRC-каналу](http://webchat.freenode.net/?channels=sway&uio=d4) (#sway на
-irc.freenode.net).
+sway - �то [i3]-�овме�тимый композитор [Wayland].
+Больше информации в [FAQ]. При�оедин�йте�ь к
+[IRC-каналу][IRC channel] (#sway на
+irc.libera.chat).
 
 ## Подпи�и релизов
 
-Релизы подпи�ывают�� ключом [B22DA89A](http://pgp.mit.edu/pks/lookup?op=vindex&search=0x52CB6609B22DA89A)
-и публикуют�� [на GitHub](https://github.com/swaywm/sway/releases).
+Релизы подпи�ывают�� ключом [E88F5E48] и публикуют�� [на GitHub][GitHub releases].
 
 ## У�тановка
 
 ### Из репозиториев
 
-sway до�тупен во многих ди�трибутивах. Попробуйте у�тановить пакет "sway".
-Е�ли он вдруг недо�тупен, проверьте [�ту �траницу на wiki](https://github.com/swaywm/sway/wiki/Unsupported-packages)
-дл� получени� информации о подробно�т�х у�тановки дл� вашего
-ди�трибутива.
+Sway до�тупен во многих ди�трибутивах. Попробуйте у�тановить пакет "sway".
 
-Е�ли вы заинтере�ованы поддерживать sway в вашем ди�трибутиве, загл�ните в наш IRC-канал
-или обратите�ь на sir@cmpwn.com за �оветом.
+Е�ли ва� интере�ует �оздание пакета sway дл� вашего ди�трибутива, зайдите на [IRC-канал][IRC channel]
+или отправьте пи�ьмо на sir@cmpwn.com за �оветом.
 
 ### Сборка из и�ходников
 
+По�етите [�ту �траницу на вики][Development setup], е�ли вы хотите по�троить по�леднюю вер�ию
+sway и wlroots дл� те�тировани� или разработки. 
+
 У�тановите зави�имо�ти:
 
 * meson \*
-* [wlroots](https://github.com/swaywm/wlroots)
+* [wlroots]
 * wayland
 * wayland-protocols \*
 * pcre
 * json-c
 * pango
 * cairo
-* gdk-pixbuf2 (необ�зательно: дл� работы тре�)
-* [scdoc](https://git.sr.ht/~sircmpwn/scdoc) (необ�зательно: дл� �борки man-�траниц) \*
-* git \*
+* gdk-pixbuf2 (опционально: дл� работы тре�)
+* [scdoc] (опционально: дл� man-�траниц) \*
+* git (опционально: дл� информации о вер�ии) \*
 
 _\*Зави�имо�ти дл� �борки_
 
@@ -63,3 +62,13 @@ sway �бро�ит root-права при запу�ке.
 
 Выполните команду `sway` пр�мо из TTY. �екоторые ди�плейные менеджеры могут работать, но они не поддерживают�� �о �тороны
 sway (gdm работает довольно неплохо).
+
+[i3]: https://i3wm.org/
+[Wayland]: http://wayland.freedesktop.org/
+[FAQ]: https://github.com/swaywm/sway/wiki
+[IRC channel]: https://web.libera.chat/gamja/?channels=#sway
+[E88F5E48]: https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48
+[GitHub releases]: https://github.com/swaywm/sway/releases
+[Development setup]: https://github.com/swaywm/sway/wiki/Development-Setup
+[wlroots]: https://gitlab.freedesktop.org/wlroots/wlroots
+[scdoc]: https://git.sr.ht/~sircmpwn/scdoc
diff --git a/README.tr.md b/README.tr.md
new file mode 100644
index 00000000..5c98a538
--- /dev/null
+++ b/README.tr.md
@@ -0,0 +1,68 @@
+# sway
+
+
+Sway, [i3]-uyumlu bir [Wayland] dizgicisidir. [SSS][FAQ]'yi okuyun. 
+[IRC kanalı][IRC channel]na katılın \(irc.libera.chat'te #sway (İngilizce)).
+
+## Sürüm imzaları
+
+Sürümler [E88F5E48] ile imzalandı ve [GitHub][GitHub releases]'da yayınlandı.
+
+## Kurulum
+
+### Paketler ile
+
+Sway birçok dağıtımda mevcuttur. Sizinki için "sway" paketini yüklemeyi deneyin.
+
+Dağıtımınız için sway'i paketlemekle ilgileniyorsanız, IRC kanalına uğrayın veya tavsiye için sir@cmpwn.com adresine bir e-posta gönderin.
+
+### Kaynak koddan derleme
+
+Test veya geliştirme için sway ve wlroots'un HEAD'ini oluşturmak istiyorsanız [bu wiki sayfası][Development setup]na göz atın.
+
+Aşağıdaki bağımlılıkları yükleyin:
+
+* meson \*
+* [wlroots]
+* wayland
+* wayland-protocols \*
+* pcre
+* json-c
+* pango
+* cairo
+* gdk-pixbuf2 (isteğe bağlı: system tray)
+* [scdoc] (isteğe bağlı: man pages) \*
+* git (isteğe bağlı: version info) \*
+
+_\*Derleme-anı bağımlılıkları_
+
+Şu komutları çalıştırın:
+
+    meson build
+    ninja -C build
+    sudo ninja -C build install
+
+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.
+Yapılandırma hakkında bilgi almak için `man 5 sway` komutunu çalıştırın.
+
+## Çalıştırma
+
+TTY'den `sway` çalıştırın. Bazı  görüntü yöneticileriyle(display manager) çalışabilir ama Sway tarafından desteklenmez. (gdm'nin oldukça iyi çalıştığı bilinmektedir.)
+
+[i3]: https://i3wm.org/
+[Wayland]: http://wayland.freedesktop.org/
+[FAQ]: https://github.com/swaywm/sway/wiki
+[IRC channel]: https://web.libera.chat/gamja/?channels=#sway
+[E88F5E48]: https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48
+[GitHub releases]: https://github.com/swaywm/sway/releases
+[Development setup]: https://github.com/swaywm/sway/wiki/Development-Setup
+[wlroots]: https://gitlab.freedesktop.org/wlroots/wlroots
+[scdoc]: https://git.sr.ht/~sircmpwn/scdoc
diff --git a/README.uk.md b/README.uk.md
index 95047cb8..ff9ebec3 100644
--- a/README.uk.md
+++ b/README.uk.md
@@ -2,8 +2,8 @@
 
 Sway це �умі�ний з [i3](https://i3wm.org/) композитор [Wayland](http://wayland.freedesktop.org/).
 Ознайомте�ь з [ЧаПами](https://github.com/swaywm/sway/wiki). Приєднуйте�ь до [�пільноти в
-IRC](http://webchat.freenode.net/?channels=sway&uio=d4) (#sway на
-irc.freenode.net).
+IRC](https://web.libera.chat/gamja/?channels=#sway) (#sway на
+irc.libera.chat).
 
 ## Підтримка україн�ькою мовою
 
@@ -15,7 +15,7 @@ Hummer12007 у IRC-Ñ�пільноті. Будьте терплÑ�чі, вам оÐ
 
 ## Підпи�и випу�ків
 
-Випу�ки підпи�ані ключем [B22DA89A](http://pgp.mit.edu/pks/lookup?op=vindex&search=0x52CB6609B22DA89A)
+Випу�ки підпи�ані ключем [E88F5E48](https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48)
 та публікують�� на �торінці [GitHub](https://github.com/swaywm/sway/releases).
 
 ## В�тановленн�
@@ -36,7 +36,7 @@ Sway до�тупний у багатьох ди�трибутивах Linux (а
 В�тановіть залежно�ті:
 
 * meson \*
-* [wlroots](https://github.com/swaywm/wlroots)
+* [wlroots](https://gitlab.freedesktop.org/wlroots/wlroots)
 * wayland
 * wayland-protocols \*
 * pcre
diff --git a/README.zh-CN.md b/README.zh-CN.md
index 9a3337ce..561d6c14 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -2,12 +2,12 @@
 
 sway 是和 [i3](https://i3wm.org/) 兼容的 [Wayland](http://wayland.freedesktop.org/) compositor.
 阅读 [FAQ](https://github.com/swaywm/sway/wiki). 加入 [IRC
-频�](http://webchat.freenode.net/?channels=sway&uio=d4) (#sway on
-irc.freenode.net).
+频�](https://web.libera.chat/gamja/?channels=#sway) (#sway on
+irc.libera.chat).
 
 ## �布签�
 
-�布是以 [B22DA89A](http://pgp.mit.edu/pks/lookup?op=vindex&search=0x52CB6609B22DA89A) 签�
+�布是以 [E88F5E48](https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48) 签�
 并�布在 [GitHub](https://github.com/swaywm/sway/releases).
 
 ## 安装
@@ -25,7 +25,7 @@ Sway 在很多�行版中�用. �试在你的�行版中安装 "sway" 包.
 安装�赖:
 
 * meson \*
-* [wlroots](https://github.com/swaywm/wlroots)
+* [wlroots](https://gitlab.freedesktop.org/wlroots/wlroots)
 * wayland
 * wayland-protocols \*
 * pcre
diff --git a/README.zh-TW.md b/README.zh-TW.md
index 13a9d2f4..bc30b903 100644
--- a/README.zh-TW.md
+++ b/README.zh-TW.md
@@ -2,12 +2,12 @@
 
 sway 是一個與 [i3](https://i3wm.org/) 相容的 [Wayland](http://wayland.freedesktop.org/) compositor。
 閱讀 [FAQ](https://github.com/swaywm/sway/wiki)。 加入 [IRC
-頻�](http://webchat.freenode.net/?channels=sway&uio=d4) (#sway on
-irc.freenode.net)
+頻�](https://web.libera.chat/gamja/?channels=#sway) (#sway on
+irc.libera.chat)
 
 ## 發行簽章
 
-所有發行的版本都會以 [B22DA89A](http://pgp.mit.edu/pks/lookup?op=vindex&search=0x52CB6609B22DA89A) 簽署
+所有發行的版本都會以 [E88F5E48](https://keys.openpgp.org/search?q=34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48) 簽署
 並發佈於 [GitHub](https://github.com/swaywm/sway/releases)
 
 ## 安�
@@ -25,7 +25,7 @@ Sway 在許多發行版都有æ��供。請自己嘗試於你的發行版安è£� ã€
 相�套件:
 
 * meson \*
-* [wlroots](https://github.com/swaywm/wlroots)
+* [wlroots](https://gitlab.freedesktop.org/wlroots/wlroots)
 * wayland
 * wayland-protocols \*
 * pcre
diff --git a/client/pool-buffer.c b/client/pool-buffer.c
index fd500c49..ea31edd3 100644
--- a/client/pool-buffer.c
+++ b/client/pool-buffer.c
@@ -1,6 +1,6 @@
 #define _POSIX_C_SOURCE 200809
 #include <assert.h>
-#include <cairo/cairo.h>
+#include <cairo.h>
 #include <fcntl.h>
 #include <pango/pangocairo.h>
 #include <stdio.h>
diff --git a/common/background-image.c b/common/background-image.c
index de42e8e9..994a0805 100644
--- a/common/background-image.c
+++ b/common/background-image.c
@@ -1,6 +1,6 @@
 #include <assert.h>
 #include "background-image.h"
-#include "cairo.h"
+#include "cairo_util.h"
 #include "log.h"
 #if HAVE_GDK_PIXBUF
 #include <gdk-pixbuf/gdk-pixbuf.h>
diff --git a/common/cairo.c b/common/cairo.c
index 403dcf49..7c59d48c 100644
--- a/common/cairo.c
+++ b/common/cairo.c
@@ -1,6 +1,6 @@
 #include <stdint.h>
-#include <cairo/cairo.h>
-#include "cairo.h"
+#include <cairo.h>
+#include "cairo_util.h"
 
 void cairo_set_source_u32(cairo_t *cairo, uint32_t color) {
         cairo_set_source_rgba(cairo,
diff --git a/common/pango.c b/common/pango.c
index fc3d0688..abc18281 100644
--- a/common/pango.c
+++ b/common/pango.c
@@ -1,4 +1,4 @@
-#include <cairo/cairo.h>
+#include <cairo.h>
 #include <pango/pangocairo.h>
 #include <stdarg.h>
 #include <stdbool.h>
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "cairo.h"
+#include "cairo_util.h"
 #include "log.h"
 #include "stringop.h"
 
@@ -109,7 +109,23 @@ void get_text_size(cairo_t *cairo, const char *font, int *width, int *height,
         free(buf);
 }
 
-void pango_printf(cairo_t *cairo, const char *font,
+void get_text_metrics(const char *font, int *height, int *baseline) {
+        cairo_t *cairo = cairo_create(NULL);
+        PangoContext *pango = pango_cairo_create_context(cairo);
+        PangoFontDescription *description = pango_font_description_from_string(font);
+        // When passing NULL as a language, pango uses the current locale.
+        PangoFontMetrics *metrics = pango_context_get_metrics(pango, description, NULL);
+
+        *baseline = pango_font_metrics_get_ascent(metrics) / PANGO_SCALE;
+        *height = *baseline + pango_font_metrics_get_descent(metrics) / PANGO_SCALE;
+
+        pango_font_metrics_unref(metrics);
+        pango_font_description_free(description);
+        g_object_unref(pango);
+        cairo_destroy(cairo);
+}
+
+void render_text(cairo_t *cairo, const char *font,
                 double scale, bool markup, const char *fmt, ...) {
         va_list args;
         va_start(args, fmt);
diff --git a/common/util.c b/common/util.c
index 5ea94f48..5d4c0673 100644
--- a/common/util.c
+++ b/common/util.c
@@ -10,12 +10,6 @@
 #include "log.h"
 #include "util.h"
 
-uint32_t get_current_time_msec(void) {
-        struct timespec now;
-        clock_gettime(CLOCK_MONOTONIC, &now);
-        return now.tv_sec * 1000 + now.tv_nsec / 1000000;
-}
-
 int wrap(int i, int max) {
         return ((i % max) + max) % max;
 }
@@ -86,6 +80,12 @@ enum movement_unit parse_movement_unit(const char *unit) {
 
 int parse_movement_amount(int argc, char **argv,
                 struct movement_amount *amount) {
+        if (!sway_assert(argc > 0, "Expected args in parse_movement_amount")) {
+                amount->amount = 0;
+                amount->unit = MOVEMENT_UNIT_INVALID;
+                return 0;
+        }
+
         char *err;
         amount->amount = (int)strtol(argv[0], &err, 10);
         if (*err) {
diff --git a/config.in b/config.in
index 08703bef..94050ba6 100644
--- a/config.in
+++ b/config.in
@@ -14,7 +14,7 @@ set $down j
 set $up k
 set $right l
 # Your preferred terminal emulator
-set $term alacritty
+set $term foot
 # Your preferred application launcher
 # Note: pass the final command to swaymsg so that the resulting window can be opened
 # on the original workspace that the command was run on.
@@ -82,7 +82,7 @@ output * bg @datadir@/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
     bindsym $mod+Shift+c reload
 
     # Exit sway (logs you out of your Wayland session)
-    bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'
+    bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'
 #
 # Moving around:
 #
@@ -205,7 +205,7 @@ bar {
 
     # When the status_command prints a new line to stdout, swaybar updates.
     # The default just shows the current date and time.
-    status_command while date +'%Y-%m-%d %l:%M:%S %p'; do sleep 1; done
+    status_command while date +'%Y-%m-%d %I:%M:%S %p'; do sleep 1; done
 
     colors {
         statusline #ffffff
diff --git a/contrib/_incr_version b/contrib/_incr_version
deleted file mode 100755
index a4fa2654..00000000
--- a/contrib/_incr_version
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh -eu
-old_version="$1"
-new_version="$2"
-
-if [ "$new_version" != "${new_version#v}" ]
-then
-        echo "Error: The new version shouldn't be prefixed with a \"v\"." >&2
-        exit 1
-fi
-
-sed -i meson.build -e "s/^      version: .*#release_version/    version: '$new_version', #release_version/g"
-
-printf "Minimum wlroots version? "
-read wlr_version_min
-printf "Maximum wlroots version? "
-read wlr_version_max
-
-sed -i meson.build -e "s/wlroots_version =.*/wlroots_version = ['>=$wlr_version_min', '<$wlr_version_max']/"
-
-git add meson.build
-git commit -m "Update version to $new_version"
diff --git a/contrib/autoname-workspaces.py b/contrib/autoname-workspaces.py
index 297d91b2..3ec39928 100755
--- a/contrib/autoname-workspaces.py
+++ b/contrib/autoname-workspaces.py
@@ -22,24 +22,17 @@ DEFAULT_ICON = "�"
 
 
 def icon_for_window(window):
-    app_id = window.app_id
-    if app_id is not None and len(app_id) > 0:
-        app_id = app_id.lower()
-        if app_id in WINDOW_ICONS:
-            return WINDOW_ICONS[app_id]
-        logging.info("No icon available for window with app_id: %s" % str(app_id))
-    else:
-        # xwayland support
-        class_name = window.window_class
-        if len(class_name) > 0:
-            class_name = class_name.lower()
-            if class_name in WINDOW_ICONS:
-                return WINDOW_ICONS[class_name]
-            logging.info(
-                "No icon available for window with class_name: %s" % str(class_name)
-            )
-    return DEFAULT_ICON
+    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():
@@ -128,3 +121,4 @@ if __name__ == "__main__":
     rename_workspaces(ipc)
 
     ipc.main()
+
diff --git a/contrib/grimshot b/contrib/grimshot
index 461a5eef..4ce31f29 100755
--- a/contrib/grimshot
+++ b/contrib/grimshot
@@ -32,13 +32,13 @@ FILE=${3:-$(getTargetDirectory)/$(date -Ins).png}
 
 if [ "$ACTION" != "save" ] && [ "$ACTION" != "copy" ] && [ "$ACTION" != "check" ]; then
   echo "Usage:"
-  echo "  grimshot [--notify] (copy|save) [active|screen|output|area|window] [FILE]"
+  echo "  grimshot [--notify] (copy|save) [active|screen|output|area|window] [FILE|-]"
   echo "  grimshot check"
   echo "  grimshot usage"
   echo ""
   echo "Commands:"
   echo "  copy: Copy the screenshot data into the clipboard."
-  echo "  save: Save the screenshot to a regular file."
+  echo "  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 ""
@@ -113,7 +113,7 @@ elif [ "$SUBJECT" = "area" ] ; then
   GEOM=$(slurp -d)
   # Check if user exited slurp without selecting the area
   if [ -z "$GEOM" ]; then
-    exit
+    exit 1
   fi
   WHAT="Area"
 elif [ "$SUBJECT" = "active" ] ; then
@@ -132,7 +132,7 @@ 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
+   exit 1
   fi
   WHAT="Window"
 else
diff --git a/contrib/grimshot.1 b/contrib/grimshot.1
index f6c8a377..e4baccfd 100644
--- a/contrib/grimshot.1
+++ b/contrib/grimshot.1
@@ -5,7 +5,7 @@
 .nh
 .ad l
 .\" Begin generated content:
-.TH "grimshot" "1" "2020-12-20"
+.TH "grimshot" "1" "2021-02-23"
 .P
 .SH NAME
 .P
@@ -31,6 +31,7 @@ Show notifications to the user that a screenshot has been taken.\&
 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
diff --git a/contrib/grimshot.1.scd b/contrib/grimshot.1.scd
index 4ab58532..d2a57759 100644
--- a/contrib/grimshot.1.scd
+++ b/contrib/grimshot.1.scd
@@ -19,6 +19,7 @@ grimshot - a helper for screenshots within sway
         Save the screenshot into a regular file. Grimshot will write images
         files to *XDG_SCREENSHOTS_DIR* if this is set (or defined
         in *user-dirs.dir*), or otherwise fall back to *XDG_PICTURES_DIR*.
+        Set FILE to '-' to pipe the output to STDOUT.
 
 *copy*
         Copy the screenshot data (as image/png) into the clipboard.
diff --git a/contrib/inactive-windows-transparency.py b/contrib/inactive-windows-transparency.py
index 77b1f221..b81134dd 100755
--- a/contrib/inactive-windows-transparency.py
+++ b/contrib/inactive-windows-transparency.py
@@ -15,8 +15,13 @@ 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 = ipc.get_tree().find_focused().workspace().num
+    workspace = focused_workspace.workspace().num
 
     if focused.id != prev_focused.id:  # https://github.com/swaywm/sway/issues/2859
         focused.command("opacity 1")
diff --git a/include/background-image.h b/include/background-image.h
index 15935ffd..a97ef375 100644
--- a/include/background-image.h
+++ b/include/background-image.h
@@ -1,6 +1,6 @@
 #ifndef _SWAY_BACKGROUND_IMAGE_H
 #define _SWAY_BACKGROUND_IMAGE_H
-#include "cairo.h"
+#include "cairo_util.h"
 
 enum background_mode {
         BACKGROUND_MODE_STRETCH,
diff --git a/include/cairo.h b/include/cairo_util.h
index c1275db2..dc049c6d 100644
--- a/include/cairo.h
+++ b/include/cairo_util.h
@@ -1,8 +1,8 @@
-#ifndef _SWAY_CAIRO_H
-#define _SWAY_CAIRO_H
+#ifndef _SWAY_CAIRO_UTIL_H
+#define _SWAY_CAIRO_UTIL_H
 #include "config.h"
 #include <stdint.h>
-#include <cairo/cairo.h>
+#include <cairo.h>
 #include <wayland-client-protocol.h>
 
 void cairo_set_source_u32(cairo_t *cairo, uint32_t color);
diff --git a/include/ipc-client.h b/include/ipc-client.h
index d3895023..9c5712d7 100644
--- a/include/ipc-client.h
+++ b/include/ipc-client.h
@@ -1,6 +1,9 @@
 #ifndef _SWAY_IPC_CLIENT_H
 #define _SWAY_IPC_CLIENT_H
 
+// arbitrary number, it's probably sufficient, higher number = more memory usage
+#define JSON_MAX_DEPTH 512
+
 #include <stdbool.h>
 #include <stdint.h>
 #include <sys/time.h>
diff --git a/include/pango.h b/include/pango.h
index 6ab83c16..93affc23 100644
--- a/include/pango.h
+++ b/include/pango.h
@@ -3,7 +3,7 @@
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <cairo/cairo.h>
+#include <cairo.h>
 #include <pango/pangocairo.h>
 
 /**
@@ -17,7 +17,8 @@ PangoLayout *get_pango_layout(cairo_t *cairo, const char *font,
                 const char *text, double scale, bool markup);
 void get_text_size(cairo_t *cairo, const char *font, int *width, int *height,
                 int *baseline, double scale, bool markup, const char *fmt, ...);
-void pango_printf(cairo_t *cairo, const char *font,
+void get_text_metrics(const char *font, int *height, int *baseline);
+void render_text(cairo_t *cairo, const char *font,
                 double scale, bool markup, const char *fmt, ...);
 
 #endif
diff --git a/include/pool-buffer.h b/include/pool-buffer.h
index 54f5be06..b7a95afe 100644
--- a/include/pool-buffer.h
+++ b/include/pool-buffer.h
@@ -1,6 +1,6 @@
 #ifndef _SWAY_BUFFERS_H
 #define _SWAY_BUFFERS_H
-#include <cairo/cairo.h>
+#include <cairo.h>
 #include <pango/pangocairo.h>
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/include/sway/commands.h b/include/sway/commands.h
index 964b3661..2746ef28 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -46,8 +46,8 @@ enum expected_args {
 struct cmd_results *checkarg(int argc, const char *name,
                 enum expected_args type, int val);
 
-struct cmd_handler *find_handler(char *line, struct cmd_handler *cmd_handlers,
-                size_t handlers_size);
+const struct cmd_handler *find_handler(char *line,
+                const struct cmd_handler *cmd_handlers, size_t handlers_size);
 
 /**
  * Parse and executes a command.
@@ -68,7 +68,7 @@ struct cmd_results *config_command(char *command, char **new_block);
  * Parse and handle a sub command
  */
 struct cmd_results *config_subcommand(char **argv, int argc,
-                struct cmd_handler *handlers, size_t handlers_size);
+                const struct cmd_handler *handlers, size_t handlers_size);
 /*
  * Parses a command policy rule.
  */
@@ -112,6 +112,7 @@ sway_cmd cmd_border;
 sway_cmd cmd_client_noop;
 sway_cmd cmd_client_focused;
 sway_cmd cmd_client_focused_inactive;
+sway_cmd cmd_client_focused_tab_title;
 sway_cmd cmd_client_unfocused;
 sway_cmd cmd_client_urgent;
 sway_cmd cmd_client_placeholder;
@@ -282,7 +283,9 @@ sway_cmd output_cmd_dpms;
 sway_cmd output_cmd_enable;
 sway_cmd output_cmd_max_render_time;
 sway_cmd output_cmd_mode;
+sway_cmd output_cmd_modeline;
 sway_cmd output_cmd_position;
+sway_cmd output_cmd_render_bit_depth;
 sway_cmd output_cmd_scale;
 sway_cmd output_cmd_scale_filter;
 sway_cmd output_cmd_subpixel;
diff --git a/include/sway/config.h b/include/sway/config.h
index 59f22ae2..fda0e83f 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -5,9 +5,10 @@
 #include <string.h>
 #include <time.h>
 #include <wlr/interfaces/wlr_switch.h>
-#include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_tablet_tool.h>
+#include <wlr/util/box.h>
 #include <xkbcommon/xkbcommon.h>
+#include <xf86drmMode.h>
 #include "../include/config.h"
 #include "list.h"
 #include "swaynag.h"
@@ -246,6 +247,12 @@ enum scale_filter_mode {
         SCALE_FILTER_SMART,
 };
 
+enum render_bit_depth {
+        RENDER_BIT_DEPTH_DEFAULT, // the default is currently 8
+        RENDER_BIT_DEPTH_8,
+        RENDER_BIT_DEPTH_10,
+};
+
 /**
  * Size and position configuration for a particular output.
  *
@@ -257,6 +264,7 @@ struct output_config {
         int width, height;
         float refresh_rate;
         int custom_mode;
+        drmModeModeInfo drm_mode;
         int x, y;
         float scale;
         enum scale_filter_mode scale_filter;
@@ -264,6 +272,7 @@ struct output_config {
         enum wl_output_subpixel subpixel;
         int max_render_time; // In milliseconds
         int adaptive_sync;
+        enum render_bit_depth render_bit_depth;
 
         char *background;
         char *background_option;
@@ -281,6 +290,12 @@ struct side_gaps {
         int left;
 };
 
+enum smart_gaps_mode {
+        SMART_GAPS_OFF,
+        SMART_GAPS_ON,
+        SMART_GAPS_INVERSE_OUTER,
+};
+
 /**
  * Stores configuration for a workspace, regardless of whether the workspace
  * exists.
@@ -292,6 +307,12 @@ struct workspace_config {
         struct side_gaps gaps_outer;
 };
 
+enum pango_markup_config {
+        PANGO_MARKUP_DISABLED = false,
+        PANGO_MARKUP_ENABLED = true,
+        PANGO_MARKUP_DEFAULT // The default is font dependent ("pango:" prefix)
+};
+
 struct bar_config {
         char *swaybar_command;
         struct wl_client *client;
@@ -323,7 +344,7 @@ struct bar_config {
         char *position;
         list_t *bindings;
         char *status_command;
-        bool pango_markup;
+        enum pango_markup_config pango_markup;
         char *font;
         int height; // -1 not defined
         bool workspace_buttons;
@@ -410,14 +431,6 @@ enum sway_popup_during_fullscreen {
         POPUP_LEAVE,
 };
 
-enum command_context {
-        CONTEXT_CONFIG = 1 << 0,
-        CONTEXT_BINDING = 1 << 1,
-        CONTEXT_IPC = 1 << 2,
-        CONTEXT_CRITERIA = 1 << 3,
-        CONTEXT_ALL = 0xFFFFFFFF,
-};
-
 enum focus_follows_mouse_mode {
         FOLLOWS_NO,
         FOLLOWS_YES,
@@ -480,8 +493,8 @@ struct sway_config {
         enum sway_container_layout default_orientation;
         enum sway_container_layout default_layout;
         char *font;
-        size_t font_height;
-        size_t font_baseline;
+        int font_height;
+        int font_baseline;
         bool pango_markup;
         int titlebar_border_thickness;
         int titlebar_h_padding;
@@ -512,7 +525,7 @@ struct sway_config {
         bool tiling_drag;
         int tiling_drag_threshold;
 
-        bool smart_gaps;
+        enum smart_gaps_mode smart_gaps;
         int gaps_inner;
         struct side_gaps gaps_outer;
 
@@ -535,12 +548,15 @@ struct sway_config {
         struct {
                 struct border_colors focused;
                 struct border_colors focused_inactive;
+                struct border_colors focused_tab_title;
                 struct border_colors unfocused;
                 struct border_colors urgent;
                 struct border_colors placeholder;
                 float background[4];
         } border_colors;
 
+        bool has_focused_tab_title;
+
         // floating view
         int32_t floating_maximum_width;
         int32_t floating_maximum_height;
@@ -559,7 +575,7 @@ struct sway_config {
                 struct sway_node *node;
                 struct sway_container *container;
                 struct sway_workspace *workspace;
-                bool using_criteria;
+                bool node_overridden; // True if the node is selected by means other than focus
                 struct {
                         int argc;
                         char **argv;
@@ -690,14 +706,13 @@ void free_bar_binding(struct bar_binding *binding);
 void free_workspace_config(struct workspace_config *wsc);
 
 /**
- * Updates the value of config->font_height based on the max title height
- * reported by each container. If recalculate is true, the containers will
- * recalculate their heights before reporting.
- *
+ * Updates the value of config->font_height based on the metrics for title's
+ * font as reported by pango.
+ * 
  * If the height has changed, all containers will be rearranged to take on the
  * new size.
  */
-void config_update_font_height(bool recalculate);
+void config_update_font_height(void);
 
 /**
  * Convert bindsym into bindcode using the first configured layout.
diff --git a/include/sway/desktop.h b/include/sway/desktop.h
index c969a76b..7f2f5b3e 100644
--- a/include/sway/desktop.h
+++ b/include/sway/desktop.h
@@ -1,4 +1,4 @@
-#include <wlr/types/wlr_surface.h>
+#include <wlr/types/wlr_compositor.h>
 
 struct sway_container;
 struct sway_view;
diff --git a/include/sway/desktop/idle_inhibit_v1.h b/include/sway/desktop/idle_inhibit_v1.h
index 0adafdb9..58d54c68 100644
--- a/include/sway/desktop/idle_inhibit_v1.h
+++ b/include/sway/desktop/idle_inhibit_v1.h
@@ -22,6 +22,7 @@ struct sway_idle_inhibit_manager_v1 {
 
 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;
 
diff --git a/include/sway/desktop/transaction.h b/include/sway/desktop/transaction.h
index 175489c5..7dd58ba8 100644
--- a/include/sway/desktop/transaction.h
+++ b/include/sway/desktop/transaction.h
@@ -28,6 +28,12 @@ struct sway_view;
  */
 void transaction_commit_dirty(void);
 
+/*
+ * Same as transaction_commit_dirty, but signalling that this is a
+ * client-initiated change has already taken effect.
+ */
+void transaction_commit_dirty_client(void);
+
 /**
  * Notify the transaction system that a view is ready for the new layout.
  *
@@ -45,10 +51,4 @@ void transaction_notify_view_ready_by_serial(struct sway_view *view,
 void transaction_notify_view_ready_by_geometry(struct sway_view *view,
                 double x, double y, int width, int height);
 
-/**
- * Unconditionally notify the transaction system that a view is ready for the
- * new layout.
- */
-void transaction_notify_view_ready_immediately(struct sway_view *view);
-
 #endif
diff --git a/include/sway/input/cursor.h b/include/sway/input/cursor.h
index 6a38190b..853f8838 100644
--- a/include/sway/input/cursor.h
+++ b/include/sway/input/cursor.h
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <wlr/types/wlr_pointer_constraints_v1.h>
 #include <wlr/types/wlr_pointer_gestures_v1.h>
-#include <wlr/types/wlr_surface.h>
+#include <wlr/types/wlr_compositor.h>
 #include "sway/input/seat.h"
 #include "config.h"
 
@@ -52,7 +52,9 @@ struct sway_cursor {
         struct wl_listener touch_down;
         struct wl_listener touch_up;
         struct wl_listener touch_motion;
+        struct wl_listener touch_frame;
         bool simulating_pointer_from_touch;
+        bool pointer_touch_up;
         int32_t pointer_touch_id;
 
         struct wl_listener tool_axis;
diff --git a/include/sway/input/libinput.h b/include/sway/input/libinput.h
index de019976..890d632e 100644
--- a/include/sway/input/libinput.h
+++ b/include/sway/input/libinput.h
@@ -6,4 +6,6 @@ void sway_input_configure_libinput_device(struct sway_input_device *device);
 
 void sway_input_reset_libinput_device(struct sway_input_device *device);
 
+bool sway_libinput_device_is_builtin(struct sway_input_device *device);
+
 #endif
diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
index 4118df66..77c2278d 100644
--- a/include/sway/input/seat.h
+++ b/include/sway/input/seat.h
@@ -239,7 +239,10 @@ enum wlr_edges find_resize_edge(struct sway_container *cont,
 void seatop_begin_default(struct sway_seat *seat);
 
 void seatop_begin_down(struct sway_seat *seat, struct sway_container *con,
-                uint32_t time_msec, int sx, int sy);
+                uint32_t time_msec, 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);
 
 void seatop_begin_move_floating(struct sway_seat *seat,
                 struct sway_container *con);
diff --git a/include/sway/input/text_input.h b/include/sway/input/text_input.h
index 6cf9bdb3..c70fd935 100644
--- a/include/sway/input/text_input.h
+++ b/include/sway/input/text_input.h
@@ -3,7 +3,7 @@
 
 #include <wlr/types/wlr_text_input_v3.h>
 #include <wlr/types/wlr_input_method_v2.h>
-#include <wlr/types/wlr_surface.h>
+#include <wlr/types/wlr_compositor.h>
 #include "sway/input/seat.h"
 
 /**
@@ -28,7 +28,10 @@ struct sway_input_method_relay {
 
         struct wl_listener input_method_new;
         struct wl_listener input_method_commit;
+        struct wl_listener input_method_grab_keyboard;
         struct wl_listener input_method_destroy;
+
+        struct wl_listener input_method_keyboard_grab_destroy;
 };
 
 struct sway_text_input {
diff --git a/include/sway/layers.h b/include/sway/layers.h
index 457634c2..f8508493 100644
--- a/include/sway/layers.h
+++ b/include/sway/layers.h
@@ -1,8 +1,7 @@
 #ifndef _SWAY_LAYERS_H
 #define _SWAY_LAYERS_H
 #include <stdbool.h>
-#include <wlr/types/wlr_box.h>
-#include <wlr/types/wlr_surface.h>
+#include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_layer_shell_v1.h>
 
 enum layer_parent {
@@ -23,7 +22,11 @@ struct sway_layer_surface {
         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 sway_layer_popup {
@@ -43,6 +46,7 @@ struct sway_layer_popup {
 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;
diff --git a/include/sway/output.h b/include/sway/output.h
index 96986700..26b9709f 100644
--- a/include/sway/output.h
+++ b/include/sway/output.h
@@ -3,7 +3,6 @@
 #include <time.h>
 #include <unistd.h>
 #include <wayland-server-core.h>
-#include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_output.h>
 #include "config.h"
 #include "sway/tree/node.h"
@@ -49,7 +48,7 @@ struct sway_output {
         struct wl_listener damage_frame;
 
         struct {
-                struct wl_signal destroy;
+                struct wl_signal disable;
         } events;
 
         struct timespec last_presentation;
@@ -72,8 +71,8 @@ struct sway_output *output_get_in_direction(struct sway_output *reference,
 void output_add_workspace(struct sway_output *output,
                 struct sway_workspace *workspace);
 
-typedef void (*sway_surface_iterator_func_t)(struct sway_output *output, struct sway_view *view,
-        struct wlr_surface *surface, struct wlr_box *box, float rotation,
+typedef void (*sway_surface_iterator_func_t)(struct sway_output *output,
+        struct sway_view *view, struct wlr_surface *surface, struct wlr_box *box,
         void *user_data);
 
 void output_damage_whole(struct sway_output *output);
diff --git a/include/sway/server.h b/include/sway/server.h
index 0f5e3ab2..0bd860b2 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -4,11 +4,13 @@
 #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>
@@ -23,19 +25,24 @@
 #include "sway/xwayland.h"
 #endif
 
+struct sway_transaction;
+
 struct sway_server {
         struct wl_display *wl_display;
         struct wl_event_loop *wl_event_loop;
         const char *socket;
 
         struct wlr_backend *backend;
-        struct wlr_backend *noop_backend;
         // secondary headless backend used for creating virtual outputs on-the-fly
         struct wlr_backend *headless_backend;
+        struct wlr_renderer *renderer;
+        struct wlr_allocator *allocator;
 
         struct wlr_compositor *compositor;
         struct wl_listener compositor_new_surface;
 
+        struct wlr_linux_dmabuf_v1 *linux_dmabuf_v1;
+
         struct wlr_data_device_manager *data_device_manager;
 
         struct sway_input_manager *input;
@@ -70,6 +77,9 @@ struct sway_server {
         struct wl_listener xdg_decoration;
         struct wl_list xdg_decorations; // sway_xdg_decoration::link
 
+        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;
@@ -85,8 +95,25 @@ struct sway_server {
         struct wlr_text_input_manager_v3 *text_input;
         struct wlr_foreign_toplevel_manager_v1 *foreign_toplevel_manager;
 
+        struct wlr_xdg_activation_v1 *xdg_activation_v1;
+        struct wl_listener xdg_activation_v1_request_activate;
+
+        // The timeout for transactions, after which a transaction is applied
+        // regardless of readiness.
         size_t txn_timeout_ms;
-        list_t *transactions;
+
+        // Stores a transaction after it has been committed, but is waiting for
+        // views to ack the new dimensions before being applied. A queued
+        // transaction is frozen and must not have new instructions added to it.
+        struct sway_transaction *queued_transaction;
+
+        // Stores a pending transaction that will be committed once the existing
+        // queued transaction is applied and freed. The pending transaction can be
+        // updated with new instructions as needed.
+        struct sway_transaction *pending_transaction;
+
+        // Stores the nodes that have been marked as "dirty" and will be put into
+        // the pending transaction.
         list_t *dirty_nodes;
 };
 
@@ -96,6 +123,7 @@ 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
@@ -113,6 +141,8 @@ void server_fini(struct sway_server *server);
 bool server_start(struct sway_server *server);
 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);
 
@@ -125,5 +155,7 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data);
 void handle_server_decoration(struct wl_listener *listener, void *data);
 void handle_xdg_decoration(struct wl_listener *listener, void *data);
 void handle_pointer_constraint(struct wl_listener *listener, void *data);
+void xdg_activation_v1_handle_request_activate(struct wl_listener *listener,
+        void *data);
 
 #endif
diff --git a/include/sway/surface.h b/include/sway/surface.h
index 4da96c02..fb1cd775 100644
--- a/include/sway/surface.h
+++ b/include/sway/surface.h
@@ -1,6 +1,6 @@
 #ifndef _SWAY_SURFACE_H
 #define _SWAY_SURFACE_H
-#include <wlr/types/wlr_surface.h>
+#include <wlr/types/wlr_compositor.h>
 
 struct sway_surface {
         struct wlr_surface *wlr_surface;
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 7e9df59f..a5f74de9 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -2,8 +2,7 @@
 #define _SWAY_CONTAINER_H
 #include <stdint.h>
 #include <sys/types.h>
-#include <wlr/types/wlr_box.h>
-#include <wlr/types/wlr_surface.h>
+#include <wlr/types/wlr_compositor.h>
 #include "list.h"
 #include "sway/tree/node.h"
 
@@ -46,9 +45,9 @@ struct sway_container_state {
 
         enum sway_fullscreen_mode fullscreen_mode;
 
-        struct sway_workspace *workspace;
-        struct sway_container *parent;
-        list_t *children;
+        struct sway_workspace *workspace; // NULL when hidden in the scratchpad
+        struct sway_container *parent;    // NULL if container in root of workspace
+        list_t *children;                 // struct sway_container
 
         struct sway_container *focused_inactive_child;
         bool focused;
@@ -60,6 +59,7 @@ struct sway_container_state {
         bool border_left;
         bool border_right;
 
+        // These are in layout coordinates.
         double content_x, content_y;
         double content_width, content_height;
 };
@@ -68,14 +68,12 @@ struct sway_container {
         struct sway_node node;
         struct sway_view *view;
 
-        // The pending state is the main container properties, and the current state is in the below struct.
-        // This means most places of the code can refer to the main variables (pending state) and it'll just work.
         struct 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
 
-        enum sway_container_layout layout;
         enum sway_container_layout prev_split_layout;
 
         // Whether stickiness has been enabled on this container. Use
@@ -86,11 +84,13 @@ struct sway_container {
         // For C_ROOT, this has no meaning
         // For other types, this is the position in layout coordinates
         // Includes borders
-        double x, y;
-        double width, height;
         double saved_x, saved_y;
         double saved_width, saved_height;
 
+        // Used when the view changes to CSD unexpectedly. This will be a non-B_CSD
+        // border which we use to restore when the view returns to SSD.
+        enum sway_container_border saved_border;
+
         // The share of the space of parent container this container occupies
         double width_fraction;
         double height_fraction;
@@ -100,33 +100,11 @@ struct sway_container {
         double child_total_width;
         double child_total_height;
 
-        // These are in layout coordinates.
-        double content_x, content_y;
-        int content_width, content_height;
-
         // In most cases this is the same as the content x and y, but if the view
         // refuses to resize to the content dimensions then it can be smaller.
         // These are in layout coordinates.
         double surface_x, surface_y;
 
-        enum sway_fullscreen_mode fullscreen_mode;
-
-        enum sway_container_border border;
-
-        // Used when the view changes to CSD unexpectedly. This will be a non-B_CSD
-        // border which we use to restore when the view returns to SSD.
-        enum sway_container_border saved_border;
-
-        int border_thickness;
-        bool border_top;
-        bool border_bottom;
-        bool border_left;
-        bool border_right;
-
-        struct sway_workspace *workspace; // NULL when hidden in the scratchpad
-        struct sway_container *parent;    // NULL if container in root of workspace
-        list_t *children;                 // struct sway_container
-
         // Outputs currently being intersected
         list_t *outputs; // struct sway_output
 
@@ -139,14 +117,14 @@ struct sway_container {
 
         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;
-        size_t title_height;
-        size_t title_baseline;
 
         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;
 
@@ -185,6 +163,11 @@ void container_for_each_child(struct sway_container *container,
                 void (*f)(struct sway_container *container, void *data), void *data);
 
 /**
+ * Returns the fullscreen container obstructing this container if it exists.
+ */
+struct sway_container *container_obstructing_fullscreen_container(struct sway_container *container);
+
+/**
  * Returns true if the given container is an ancestor of this container.
  */
 bool container_has_ancestor(struct sway_container *container,
@@ -200,11 +183,6 @@ struct sway_container *container_flatten(struct sway_container *container);
 
 void container_update_title_textures(struct sway_container *container);
 
-/**
- * Calculate the container's title_height property.
- */
-void container_calculate_title_height(struct sway_container *container);
-
 size_t container_build_representation(enum sway_container_layout layout,
                 list_t *children, char *buffer);
 
@@ -231,10 +209,17 @@ void container_set_geometry_from_content(struct sway_container *con);
 /**
  * Determine if the given container is itself floating.
  * This will return false for any descendants of a floating container.
+ *
+ * Uses pending container state.
  */
 bool container_is_floating(struct sway_container *container);
 
 /**
+ * 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);
@@ -299,6 +284,7 @@ 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);
 
diff --git a/include/sway/tree/root.h b/include/sway/tree/root.h
index e8f4d573..5d4a2f2d 100644
--- a/include/sway/tree/root.h
+++ b/include/sway/tree/root.h
@@ -31,7 +31,7 @@ struct sway_root {
         list_t *scratchpad; // struct sway_container
 
         // For when there's no connected outputs
-        struct sway_output *noop_output;
+        struct sway_output *fallback_output;
 
         struct sway_container *fullscreen_global;
 
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index e071e6c9..789a67c0 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -1,7 +1,7 @@
 #ifndef _SWAY_VIEW_H
 #define _SWAY_VIEW_H
 #include <wayland-server-core.h>
-#include <wlr/types/wlr_surface.h>
+#include <wlr/types/wlr_compositor.h>
 #include "config.h"
 #if HAVE_XWAYLAND
 #include <wlr/xwayland.h>
@@ -112,7 +112,6 @@ struct sway_view {
 #if HAVE_XWAYLAND
                 struct wlr_xwayland_surface *wlr_xwayland_surface;
 #endif
-                struct wlr_wl_shell_surface *wlr_wl_shell_surface;
         };
 
         struct {
@@ -132,7 +131,6 @@ struct sway_xdg_shell_view {
         struct wl_listener commit;
         struct wl_listener request_move;
         struct wl_listener request_resize;
-        struct wl_listener request_maximize;
         struct wl_listener request_fullscreen;
         struct wl_listener set_title;
         struct wl_listener set_app_id;
@@ -184,7 +182,7 @@ struct sway_xwayland_unmanaged {
 struct sway_view_child;
 
 struct sway_view_child_impl {
-        void (*get_root_coords)(struct sway_view_child *child, int *sx, int *sy);
+        void (*get_view_coords)(struct sway_view_child *child, int *sx, int *sy);
         void (*destroy)(struct sway_view_child *child);
 };
 
@@ -311,12 +309,22 @@ void view_destroy(struct sway_view *view);
 
 void view_begin_destroy(struct sway_view *view);
 
+/**
+ * Map a view, ie. make it visible in the tree.
+ *
+ * `fullscreen` should be set to true (and optionally `fullscreen_output`
+ * should be populated) if the view should be made fullscreen immediately.
+ *
+ * `decoration` should be set to true if the client prefers CSD. The client's
+ * preference may be ignored.
+ */
 void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
         bool fullscreen, struct wlr_output *fullscreen_output, bool decoration);
 
 void view_unmap(struct sway_view *view);
 
-void view_update_size(struct sway_view *view, int width, int height);
+void view_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,
diff --git a/include/sway/tree/workspace.h b/include/sway/tree/workspace.h
index fdd92f64..b3d93a81 100644
--- a/include/sway/tree/workspace.h
+++ b/include/sway/tree/workspace.h
@@ -60,20 +60,20 @@ void workspace_consider_destroy(struct sway_workspace *ws);
 
 char *workspace_next_name(const char *output_name);
 
-bool workspace_switch(struct sway_workspace *workspace,
-                bool no_auto_back_and_forth);
+struct sway_workspace *workspace_auto_back_and_forth(
+                struct sway_workspace *workspace);
+
+bool workspace_switch(struct sway_workspace *workspace);
 
 struct sway_workspace *workspace_by_number(const char* name);
 
 struct sway_workspace *workspace_by_name(const char*);
 
-struct sway_workspace *workspace_output_next(
-                struct sway_workspace *current, bool create);
+struct sway_workspace *workspace_output_next(struct sway_workspace *current);
 
 struct sway_workspace *workspace_next(struct sway_workspace *current);
 
-struct sway_workspace *workspace_output_prev(
-                struct sway_workspace *current, bool create);
+struct sway_workspace *workspace_output_prev(struct sway_workspace *current);
 
 struct sway_workspace *workspace_prev(struct sway_workspace *current);
 
diff --git a/include/swaybar/i3bar.h b/include/swaybar/i3bar.h
index df8cdd09..1aec6d6c 100644
--- a/include/swaybar/i3bar.h
+++ b/include/swaybar/i3bar.h
@@ -19,6 +19,7 @@ struct i3bar_block {
         // Airblader features
         uint32_t background;
         uint32_t border;
+        bool border_set;
         int border_top;
         int border_bottom;
         int border_left;
diff --git a/include/swaynag/swaynag.h b/include/swaynag/swaynag.h
index 9e39e716..baa6ee8b 100644
--- a/include/swaynag/swaynag.h
+++ b/include/swaynag/swaynag.h
@@ -5,7 +5,6 @@
 #include "list.h"
 #include "pool-buffer.h"
 #include "swaynag/types.h"
-#include "xdg-output-unstable-v1-client-protocol.h"
 
 #define SWAYNAG_MAX_HEIGHT 500
 
@@ -75,13 +74,11 @@ struct swaynag_details {
 
 struct swaynag {
         bool run_display;
-        int querying_outputs;
 
         struct wl_display *display;
         struct wl_compositor *compositor;
         struct wl_seat *seat;
         struct wl_shm *shm;
-        struct zxdg_output_manager_v1 *xdg_output_manager;
         struct wl_list outputs;  // swaynag_output::link
         struct wl_list seats;  // swaynag_seat::link
         struct swaynag_output *output;
diff --git a/include/swaynag/types.h b/include/swaynag/types.h
index 24da9418..3c3b2754 100644
--- a/include/swaynag/types.h
+++ b/include/swaynag/types.h
@@ -7,6 +7,7 @@ struct swaynag_type {
         char *font;
         char *output;
         uint32_t anchors;
+        int32_t layer; // enum zwlr_layer_shell_v1_layer or -1 if unset
 
         // Colors
         uint32_t button_text;
diff --git a/include/util.h b/include/util.h
index c80da1cb..f887d489 100644
--- a/include/util.h
+++ b/include/util.h
@@ -30,12 +30,6 @@ int parse_movement_amount(int argc, char **argv,
                 struct movement_amount *amount);
 
 /**
- * Get the current time, in milliseconds.
- */
-
-uint32_t get_current_time_msec(void);
-
-/**
  * Wrap i into the range [0, max]
  */
 int wrap(int i, int max);
diff --git a/meson.build b/meson.build
index 38a55678..71183007 100644
--- a/meson.build
+++ b/meson.build
@@ -1,9 +1,9 @@
 project(
         'sway',
         'c',
-        version: '1.5', #release_version
+        version: '1.8-dev',
         license: 'MIT',
-        meson_version: '>=0.53.0',
+        meson_version: '>=0.60.0',
         default_options: [
                 'c_std=c11',
                 'warning_level=2',
@@ -35,56 +35,49 @@ if is_freebsd
         add_project_arguments('-D_C11_SOURCE', language: 'c')
 endif
 
-jsonc          = dependency('json-c', version: '>=0.13')
-pcre           = dependency('libpcre')
-wayland_server = dependency('wayland-server')
-wayland_client = dependency('wayland-client')
-wayland_cursor = dependency('wayland-cursor')
-wayland_egl    = dependency('wayland-egl')
-wayland_protos = dependency('wayland-protocols', version: '>=1.14')
-xkbcommon      = dependency('xkbcommon')
-cairo          = dependency('cairo')
-pango          = dependency('pango')
-pangocairo     = dependency('pangocairo')
-gdk_pixbuf     = dependency('gdk-pixbuf-2.0', required: get_option('gdk-pixbuf'))
-pixman         = dependency('pixman-1')
-glesv2         = dependency('glesv2')
-libevdev       = dependency('libevdev')
-libinput       = dependency('libinput', version: '>=1.6.0')
-xcb            = dependency('xcb', required: get_option('xwayland'))
-bash_comp      = dependency('bash-completion', required: false)
-fish_comp      = dependency('fish', required: false)
-math           = cc.find_library('m')
-rt             = cc.find_library('rt')
-
-# Try first to find wlroots as a subproject, then as a system dependency
-wlroots_version = ['>=0.12.0', '<0.13.0']
-wlroots_proj = subproject(
+# Execute the wlroots subproject, if any
+wlroots_version = ['>=0.16.0', '<0.17.0']
+subproject(
         'wlroots',
         default_options: ['examples=false'],
         required: false,
         version: wlroots_version,
 )
+
+jsonc = dependency('json-c', version: '>=0.13')
+pcre = dependency('libpcre')
+wayland_server = dependency('wayland-server', version: '>=1.20.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')
+cairo = dependency('cairo')
+pango = dependency('pango')
+pangocairo = dependency('pangocairo')
+gdk_pixbuf = dependency('gdk-pixbuf-2.0', required: get_option('gdk-pixbuf'))
+pixman = dependency('pixman-1')
+glesv2 = dependency('glesv2')
+libevdev = dependency('libevdev')
+libinput = dependency('libinput', version: '>=1.6.0')
+xcb = dependency('xcb', required: get_option('xwayland'))
+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)
+math = cc.find_library('m')
+rt = cc.find_library('rt')
+
 wlroots_features = {
         'xwayland': false,
-        'systemd': false,
-        'elogind': false,
-        'libseat': false,
 }
-if wlroots_proj.found()
-        wlroots = wlroots_proj.get_variable('wlroots')
-        wlroots_conf = wlroots_proj.get_variable('conf_data')
-        foreach name, _ : wlroots_features
-                has = wlroots_conf.get('WLR_HAS_' + name.to_upper()) == 1
-                wlroots_features += { name: has }
-        endforeach
-else
-        wlroots = dependency('wlroots', version: wlroots_version)
-        foreach name, _ : wlroots_features
-                has = cc.get_define('WLR_HAS_' + name.to_upper(), prefix: '#include <wlr/config.h>', dependencies: wlroots) == '1'
-                wlroots_features += { name: has }
-        endforeach
-endif
+foreach name, _ : wlroots_features
+        var_name = 'have_' + name.underscorify()
+        have = wlroots.get_variable(pkgconfig: var_name, internal: var_name) == 'true'
+        wlroots_features += { name: have }
+endforeach
 
 if get_option('xwayland').enabled() and not wlroots_features['xwayland']
         error('Cannot enable Xwayland in sway: wlroots has been built without Xwayland support')
@@ -95,19 +88,11 @@ if get_option('sd-bus-provider') == 'auto'
         if not get_option('tray').disabled()
                 assert(get_option('auto_features').auto(), 'sd-bus-provider must not be set to auto since auto_features != auto')
         endif
-        sdbus = dependency('libsystemd',
+        sdbus = dependency(['libsystemd', 'libelogind'],
                 required: false,
                 version: '>=239',
-                not_found_message: 'libsystemd not found, trying libelogind',
         )
         if not sdbus.found()
-                sdbus = dependency('libelogind',
-                        required: false,
-                        version: '>=239',
-                        not_found_message: 'libelogind not found, trying basu',
-                )
-        endif
-        if not sdbus.found()
                 sdbus = dependency('basu', required: false)
         endif
 else
@@ -131,8 +116,7 @@ conf_data.set10('HAVE_TRAY', have_tray)
 
 scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_option('man-pages'))
 if scdoc.found()
-        scdoc_prog = find_program(scdoc.get_pkgconfig_variable('scdoc'), native: true)
-        sh = find_program('sh', native: true)
+        scdoc_prog = find_program(scdoc.get_variable(pkgconfig: 'scdoc'), native: true)
         mandir = get_option('mandir')
         man_files = [
                 'sway/sway.1.scd',
@@ -143,9 +127,15 @@ if scdoc.found()
                 'sway/sway-output.5.scd',
                 'swaybar/swaybar-protocol.7.scd',
                 'swaymsg/swaymsg.1.scd',
-                'swaynag/swaynag.1.scd',
-                'swaynag/swaynag.5.scd',
         ]
+
+        if get_option('swaynag')
+                man_files += [
+                        'swaynag/swaynag.1.scd',
+                        'swaynag/swaynag.5.scd',
+                ]
+        endif
+
         foreach filename : man_files
                 topic = filename.split('.')[-3].split('/')[-1]
                 section = filename.split('.')[-2]
@@ -155,10 +145,10 @@ if scdoc.found()
                         output,
                         input: filename,
                         output: output,
-                        command: [
-                                sh, '-c', '@0@ < @INPUT@ > @1@'.format(scdoc_prog.path(), output)
-                        ],
+                        command: scdoc_prog,
                         install: true,
+                        feed: true,
+                        capture: true,
                         install_dir: '@0@/man@1@'.format(mandir, section)
                 )
         endforeach
@@ -169,8 +159,8 @@ add_project_arguments('-DSYSCONFDIR="/@0@"'.format(join_paths(prefix, sysconfdir
 version = '"@0@"'.format(meson.project_version())
 git = find_program('git', native: true, required: false)
 if git.found()
-        git_commit = run_command([git, 'rev-parse', '--short', 'HEAD'])
-        git_branch = run_command([git, 'rev-parse', '--abbrev-ref', 'HEAD'])
+        git_commit = run_command([git, 'rev-parse', '--short', 'HEAD'], check: false)
+        git_branch = run_command([git, 'rev-parse', '--abbrev-ref', 'HEAD'], check: false)
         if git_commit.returncode() == 0 and git_branch.returncode() == 0
                 version = '"@0@-@1@ (" __DATE__ ", branch \'@2@\')"'.format(
                         meson.project_version(),
@@ -183,7 +173,7 @@ add_project_arguments('-DSWAY_VERSION=@0@'.format(version), language: 'c')
 
 # Compute the relative path used by compiler invocations.
 source_root = meson.current_source_dir().split('/')
-build_root = meson.build_root().split('/')
+build_root = meson.global_build_root().split('/')
 relative_dir_parts = []
 i = 0
 in_prefix = true
@@ -227,9 +217,15 @@ subdir('common')
 subdir('sway')
 subdir('swaymsg')
 
-subdir('client')
-subdir('swaybar')
-subdir('swaynag')
+if get_option('swaybar') or get_option('swaynag')
+        subdir('client')
+endif
+if get_option('swaybar')
+        subdir('swaybar')
+endif
+if get_option('swaynag')
+        subdir('swaynag')
+endif
 
 config = configuration_data()
 config.set('datadir', join_paths(prefix, datadir))
@@ -277,13 +273,17 @@ endif
 if get_option('bash-completions')
         bash_files = files(
                 'completions/bash/sway',
-                'completions/bash/swaybar',
                 'completions/bash/swaymsg',
         )
+
+        if get_option('swaybar')
+                bash_files += files('completions/bash/swaybar')
+        endif
+
         if bash_comp.found()
-                bash_install_dir = bash_comp.get_pkgconfig_variable(
-                        'completionsdir',
-                        define_variable: ['datadir', datadir]
+                bash_install_dir = bash_comp.get_variable(
+                        pkgconfig: 'completionsdir',
+                        pkgconfig_define: ['datadir', datadir]
                 )
         else
                 bash_install_dir = join_paths(datadir, 'bash-completion', 'completions')
@@ -296,12 +296,16 @@ if get_option('fish-completions')
         fish_files = files(
                 'completions/fish/sway.fish',
                 'completions/fish/swaymsg.fish',
-                'completions/fish/swaynag.fish',
         )
+
+        if get_option('swaynag')
+                fish_files += files('completions/fish/swaynag.fish')
+        endif
+
         if fish_comp.found()
-                fish_install_dir = fish_comp.get_pkgconfig_variable(
-                        'completionsdir',
-                        define_variable: ['datadir', datadir]
+                fish_install_dir = fish_comp.get_variable(
+                        pkgconfig: 'completionsdir',
+                        pkgconfig_define: ['datadir', datadir]
                 )
         else
                 fish_install_dir = join_paths(datadir, 'fish', 'vendor_completions.d')
@@ -313,12 +317,7 @@ endif
 summary({
         'xwayland': have_xwayland,
         'gdk-pixbuf': gdk_pixbuf.found(),
-        'sd-bus': sdbus.found(),
         'tray': have_tray,
         'man-pages': scdoc.found(),
 }, bool_yn: true)
 
-if not wlroots_features['systemd'] and not wlroots_features['elogind'] and not wlroots_features['libseat']
-        warning('The sway binary must be setuid when compiled without (e)logind or libseat')
-        warning('You must do this manually post-install: chmod a+s /path/to/sway')
-endif
diff --git a/meson_options.txt b/meson_options.txt
index e36900b6..6ba67554 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -2,6 +2,8 @@ option('default-wallpaper', type: 'boolean', value: true, description: 'Install
 option('zsh-completions', type: 'boolean', value: true, description: 'Install zsh shell completions.')
 option('bash-completions', type: 'boolean', value: true, description: 'Install bash shell completions.')
 option('fish-completions', type: 'boolean', value: true, description: 'Install fish shell completions.')
+option('swaybar', type: 'boolean', value: true, description: 'Enable support for swaybar')
+option('swaynag', type: 'boolean', value: true, description: 'Enable support for swaynag')
 option('xwayland', type: 'feature', value: 'auto', description: 'Enable support for X11 applications')
 option('tray', type: 'feature', value: 'auto', description: 'Enable support for swaybar tray')
 option('gdk-pixbuf', type: 'feature', value: 'auto', description: 'Enable support for more image formats in swaybg')
diff --git a/protocols/meson.build b/protocols/meson.build
index 124e9777..df24a4e5 100644
--- a/protocols/meson.build
+++ b/protocols/meson.build
@@ -1,9 +1,9 @@
-wl_protocol_dir = wayland_protos.get_pkgconfig_variable('pkgdatadir')
+wl_protocol_dir = wayland_protos.get_variable('pkgdatadir')
 
 wayland_scanner_dep = dependency('wayland-scanner', required: false, native: true)
 if wayland_scanner_dep.found()
         wayland_scanner = find_program(
-                wayland_scanner_dep.get_pkgconfig_variable('wayland_scanner'),
+                wayland_scanner_dep.get_variable(pkgconfig: 'wayland_scanner'),
                 native: true,
         )
 else
@@ -15,6 +15,7 @@ protocols = [
         [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'],
diff --git a/sway/commands.c b/sway/commands.c
index fe1e98b5..5a1fd32e 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -42,7 +42,7 @@ struct cmd_results *checkarg(int argc, const char *name, enum expected_args type
 }
 
 /* Keep alphabetized */
-static struct cmd_handler handlers[] = {
+static const struct cmd_handler handlers[] = {
         { "assign", cmd_assign },
         { "bar", cmd_bar },
         { "bindcode", cmd_bindcode },
@@ -51,6 +51,7 @@ static struct cmd_handler handlers[] = {
         { "client.background", cmd_client_noop },
         { "client.focused", cmd_client_focused },
         { "client.focused_inactive", cmd_client_focused_inactive },
+        { "client.focused_tab_title", cmd_client_focused_tab_title },
         { "client.placeholder", cmd_client_noop },
         { "client.unfocused", cmd_client_unfocused },
         { "client.urgent", cmd_client_urgent },
@@ -98,7 +99,7 @@ static struct cmd_handler handlers[] = {
 };
 
 /* Config-time only commands. Keep alphabetized */
-static struct cmd_handler config_handlers[] = {
+static const struct cmd_handler config_handlers[] = {
         { "default_orientation", cmd_default_orientation },
         { "include", cmd_include },
         { "swaybg_command", cmd_swaybg_command },
@@ -108,7 +109,7 @@ static struct cmd_handler config_handlers[] = {
 };
 
 /* Runtime-only commands. Keep alphabetized */
-static struct cmd_handler command_handlers[] = {
+static const struct cmd_handler command_handlers[] = {
         { "border", cmd_border },
         { "create_output", cmd_create_output },
         { "exit", cmd_exit },
@@ -144,22 +145,22 @@ static int handler_compare(const void *_a, const void *_b) {
         return strcasecmp(a->command, b->command);
 }
 
-struct cmd_handler *find_handler(char *line, struct cmd_handler *handlers,
-                size_t handlers_size) {
+const struct cmd_handler *find_handler(char *line,
+                const struct cmd_handler *handlers, size_t handlers_size) {
         if (!handlers || !handlers_size) {
                 return NULL;
         }
-        struct cmd_handler query = { .command = line };
+        const struct cmd_handler query = { .command = line };
         return bsearch(&query, handlers,
                         handlers_size / sizeof(struct cmd_handler),
                         sizeof(struct cmd_handler), handler_compare);
 }
 
-static struct cmd_handler *find_handler_ex(char *line,
-                struct cmd_handler *config_handlers, size_t config_handlers_size,
-                struct cmd_handler *command_handlers, size_t command_handlers_size,
-                struct cmd_handler *handlers, size_t handlers_size) {
-        struct cmd_handler *handler = NULL;
+static const struct cmd_handler *find_handler_ex(char *line,
+                const struct cmd_handler *config_handlers, size_t config_handlers_size,
+                const struct cmd_handler *command_handlers, size_t command_handlers_size,
+                const struct cmd_handler *handlers, size_t handlers_size) {
+        const struct cmd_handler *handler = NULL;
         if (config->reading) {
                 handler = find_handler(line, config_handlers, config_handlers_size);
         } else if (config->active) {
@@ -168,16 +169,17 @@ static struct cmd_handler *find_handler_ex(char *line,
         return handler ? handler : find_handler(line, handlers, handlers_size);
 }
 
-static struct cmd_handler *find_core_handler(char *line) {
+static const struct cmd_handler *find_core_handler(char *line) {
         return find_handler_ex(line, config_handlers, sizeof(config_handlers),
                         command_handlers, sizeof(command_handlers),
                         handlers, sizeof(handlers));
 }
 
-static void set_config_node(struct sway_node *node) {
+static void set_config_node(struct sway_node *node, bool node_overridden) {
         config->handler_context.node = node;
         config->handler_context.container = NULL;
         config->handler_context.workspace = NULL;
+        config->handler_context.node_overridden = node_overridden;
 
         if (node == NULL) {
                 return;
@@ -186,7 +188,7 @@ static void set_config_node(struct sway_node *node) {
         switch (node->type) {
         case N_CONTAINER:
                 config->handler_context.container = node->sway_container;
-                config->handler_context.workspace = node->sway_container->workspace;
+                config->handler_context.workspace = node->sway_container->pending.workspace;
                 break;
         case N_WORKSPACE:
                 config->handler_context.workspace = node->sway_workspace;
@@ -202,6 +204,7 @@ list_t *execute_command(char *_exec, struct sway_seat *seat,
         char *cmd;
         char matched_delim = ';';
         list_t *containers = NULL;
+        bool using_criteria = false;
 
         if (seat == NULL) {
                 // passing a NULL seat means we just pick the default seat
@@ -225,7 +228,7 @@ list_t *execute_command(char *_exec, struct sway_seat *seat,
                 for (; isspace(*head); ++head) {}
                 // Extract criteria (valid for this command list only).
                 if (matched_delim == ';') {
-                        config->handler_context.using_criteria = false;
+                        using_criteria = false;
                         if (*head == '[') {
                                 char *error = NULL;
                                 struct criteria *criteria = criteria_parse(head, &error);
@@ -239,7 +242,7 @@ list_t *execute_command(char *_exec, struct sway_seat *seat,
                                 containers = criteria_get_containers(criteria);
                                 head += strlen(criteria->raw);
                                 criteria_destroy(criteria);
-                                config->handler_context.using_criteria = true;
+                                using_criteria = true;
                                 // Skip leading whitespace
                                 for (; isspace(*head); ++head) {}
                         }
@@ -265,7 +268,7 @@ list_t *execute_command(char *_exec, struct sway_seat *seat,
                                 }
                         }
                 }
-                struct cmd_handler *handler = find_core_handler(argv[0]);
+                const struct cmd_handler *handler = find_core_handler(argv[0]);
                 if (!handler) {
                         list_add(res_list, cmd_results_new(CMD_INVALID,
                                         "Unknown/invalid command '%s'", argv[0]));
@@ -278,11 +281,14 @@ list_t *execute_command(char *_exec, struct sway_seat *seat,
                         argv[i] = do_var_replacement(argv[i]);
                 }
 
-                if (!config->handler_context.using_criteria) {
-                        // The container or workspace which this command will run on.
-                        struct sway_node *node = con ? &con->node :
-                                        seat_get_focus_inactive(seat, &root->node);
-                        set_config_node(node);
+
+                if (!using_criteria) {
+                        if (con) {
+                                set_config_node(&con->node, true);
+                        } else {
+                                set_config_node(seat_get_focus_inactive(seat, &root->node),
+                                                false);
+                        }
                         struct cmd_results *res = handler->handle(argc-1, argv+1);
                         list_add(res_list, res);
                         if (res->status == CMD_INVALID) {
@@ -296,7 +302,7 @@ list_t *execute_command(char *_exec, struct sway_seat *seat,
                         struct cmd_results *fail_res = NULL;
                         for (int i = 0; i < containers->length; ++i) {
                                 struct sway_container *container = containers->items[i];
-                                set_config_node(&container->node);
+                                set_config_node(&container->node, true);
                                 struct cmd_results *res = handler->handle(argc-1, argv+1);
                                 if (res->status == CMD_SUCCESS) {
                                         free_cmd_results(res);
@@ -370,7 +376,7 @@ struct cmd_results *config_command(char *exec, char **new_block) {
 
         // Determine the command handler
         sway_log(SWAY_INFO, "Config command: %s", exec);
-        struct cmd_handler *handler = find_core_handler(argv[0]);
+        const struct cmd_handler *handler = find_core_handler(argv[0]);
         if (!handler || !handler->handle) {
                 const char *error = handler
                         ? "Command '%s' is shimmed, but unimplemented"
@@ -418,12 +424,12 @@ cleanup:
 }
 
 struct cmd_results *config_subcommand(char **argv, int argc,
-                struct cmd_handler *handlers, size_t handlers_size) {
+                const struct cmd_handler *handlers, size_t handlers_size) {
         char *command = join_args(argv, argc);
         sway_log(SWAY_DEBUG, "Subcommand: %s", command);
         free(command);
 
-        struct cmd_handler *handler = find_handler(argv[0], handlers,
+        const struct cmd_handler *handler = find_handler(argv[0], handlers,
                         handlers_size);
         if (!handler) {
                 return cmd_results_new(CMD_INVALID,
@@ -453,41 +459,13 @@ struct cmd_results *config_commands_command(char *exec) {
                 goto cleanup;
         }
 
-        struct cmd_handler *handler = find_handler(cmd, NULL, 0);
+        const struct cmd_handler *handler = find_handler(cmd, NULL, 0);
         if (!handler && strcmp(cmd, "*") != 0) {
                 results = cmd_results_new(CMD_INVALID,
                         "Unknown/invalid command '%s'", cmd);
                 goto cleanup;
         }
 
-        enum command_context context = 0;
-
-        struct {
-                char *name;
-                enum command_context context;
-        } context_names[] = {
-                { "config", CONTEXT_CONFIG },
-                { "binding", CONTEXT_BINDING },
-                { "ipc", CONTEXT_IPC },
-                { "criteria", CONTEXT_CRITERIA },
-                { "all", CONTEXT_ALL },
-        };
-
-        for (int i = 1; i < argc; ++i) {
-                size_t j;
-                for (j = 0; j < sizeof(context_names) / sizeof(context_names[0]); ++j) {
-                        if (strcmp(context_names[j].name, argv[i]) == 0) {
-                                break;
-                        }
-                }
-                if (j == sizeof(context_names) / sizeof(context_names[0])) {
-                        results = cmd_results_new(CMD_INVALID,
-                                        "Invalid command context %s", argv[i]);
-                        goto cleanup;
-                }
-                context |= context_names[j].context;
-        }
-
         results = cmd_results_new(CMD_SUCCESS, NULL);
 
 cleanup:
diff --git a/sway/commands/bar.c b/sway/commands/bar.c
index d42b7fc2..8571d282 100644
--- a/sway/commands/bar.c
+++ b/sway/commands/bar.c
@@ -8,7 +8,7 @@
 #include "log.h"
 
 // Must be in alphabetical order for bsearch
-static struct cmd_handler bar_handlers[] = {
+static const struct cmd_handler bar_handlers[] = {
         { "bindcode", bar_cmd_bindcode },
         { "binding_mode_indicator", bar_cmd_binding_mode_indicator },
         { "bindsym", bar_cmd_bindsym },
@@ -41,7 +41,7 @@ static struct cmd_handler bar_handlers[] = {
 };
 
 // Must be in alphabetical order for bsearch
-static struct cmd_handler bar_config_handlers[] = {
+static const struct cmd_handler bar_config_handlers[] = {
         { "id", bar_cmd_id },
         { "swaybar_command", bar_cmd_swaybar_command },
 };
@@ -116,6 +116,7 @@ struct cmd_results *cmd_bar(int argc, char **argv) {
         if (res && res->status != CMD_SUCCESS) {
                 if (id) {
                         free_bar_config(config->current_bar);
+                        config->current_bar = NULL;
                         id = NULL;
                 }
                 return res;
diff --git a/sway/commands/bar/colors.c b/sway/commands/bar/colors.c
index 2d5b22bf..275fa3c6 100644
--- a/sway/commands/bar/colors.c
+++ b/sway/commands/bar/colors.c
@@ -4,7 +4,7 @@
 #include "util.h"
 
 // Must be in alphabetical order for bsearch
-static struct cmd_handler bar_colors_handlers[] = {
+static const struct cmd_handler bar_colors_handlers[] = {
         { "active_workspace", bar_colors_cmd_active_workspace },
         { "background", bar_colors_cmd_background },
         { "binding_mode", bar_colors_cmd_binding_mode },
diff --git a/sway/commands/bar/font.c b/sway/commands/bar/font.c
index 62987f3e..891c87af 100644
--- a/sway/commands/bar/font.c
+++ b/sway/commands/bar/font.c
@@ -11,7 +11,20 @@ struct cmd_results *bar_cmd_font(int argc, char **argv) {
         }
         char *font = join_args(argv, argc);
         free(config->current_bar->font);
-        config->current_bar->font = font;
+
+        if (strncmp(font, "pango:", 6) == 0) {
+                if (config->current_bar->pango_markup == PANGO_MARKUP_DEFAULT) {
+                        config->current_bar->pango_markup = true;
+                }
+                config->current_bar->font = strdup(font + 6);
+        } else {
+                if (config->current_bar->pango_markup == PANGO_MARKUP_DEFAULT) {
+                        config->current_bar->pango_markup = false;
+                }
+                config->current_bar->font = strdup(font);
+        }
+
+        free(font);
         sway_log(SWAY_DEBUG, "Settings font '%s' for bar: %s",
                         config->current_bar->font, config->current_bar->id);
         return cmd_results_new(CMD_SUCCESS, NULL);
diff --git a/sway/commands/bar/hidden_state.c b/sway/commands/bar/hidden_state.c
index 1f08a5d2..8b661e3a 100644
--- a/sway/commands/bar/hidden_state.c
+++ b/sway/commands/bar/hidden_state.c
@@ -54,7 +54,7 @@ struct cmd_results *bar_cmd_hidden_state(int argc, char **argv) {
         }
 
         const char *state = argv[0];
-        if (config->reading) {
+        if (config->current_bar) {
                 error = bar_set_hidden_state(config->current_bar, state);
         } else {
                 const char *id = argc == 2 ? argv[1] : NULL;
diff --git a/sway/commands/bar/mode.c b/sway/commands/bar/mode.c
index 8b3fb275..7c2f423b 100644
--- a/sway/commands/bar/mode.c
+++ b/sway/commands/bar/mode.c
@@ -58,7 +58,7 @@ struct cmd_results *bar_cmd_mode(int argc, char **argv) {
         }
 
         const char *mode = argv[0];
-        if (config->reading) {
+        if (config->current_bar) {
                 error = bar_set_mode(config->current_bar, mode);
         } else {
                 const char *id = argc == 2 ? argv[1] : NULL;
diff --git a/sway/commands/bind.c b/sway/commands/bind.c
index f6e58d99..25be415e 100644
--- a/sway/commands/bind.c
+++ b/sway/commands/bind.c
@@ -8,6 +8,7 @@
 #include <wlr/types/wlr_cursor.h>
 #include "sway/commands.h"
 #include "sway/config.h"
+#include "sway/desktop/transaction.h"
 #include "sway/input/cursor.h"
 #include "sway/input/keyboard.h"
 #include "sway/ipc-server.h"
@@ -559,8 +560,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 state: unknown state %d)",
-                                bindtype, split->items[0]);
+                                "(expected switch state: unknown state %s)",
+                                bindtype, split->items[1]);
         }
         list_free_items_and_destroy(split);
 
@@ -642,6 +643,8 @@ void seat_execute_command(struct sway_seat *seat, struct sway_binding *binding)
         if (success) {
                 ipc_event_binding(binding);
         }
+
+        transaction_commit_dirty();
 }
 
 /**
diff --git a/sway/commands/border.c b/sway/commands/border.c
index 647663ac..7818fc96 100644
--- a/sway/commands/border.c
+++ b/sway/commands/border.c
@@ -19,11 +19,11 @@ static void set_border(struct sway_container *con,
                         view_set_csd_from_server(con->view, false);
                 } else if (!con->view->using_csd && new_border == B_CSD) {
                         view_set_csd_from_server(con->view, true);
-                        con->saved_border = con->border;
+                        con->saved_border = con->pending.border;
                 }
         }
         if (new_border != B_CSD || container_is_floating(con)) {
-                con->border = new_border;
+                con->pending.border = new_border;
         }
         if (con->view) {
                 con->view->using_csd = new_border == B_CSD;
@@ -35,7 +35,7 @@ static void border_toggle(struct sway_container *con) {
                 set_border(con, B_NONE);
                 return;
         }
-        switch (con->border) {
+        switch (con->pending.border) {
         case B_NONE:
                 set_border(con, B_PIXEL);
                 break;
@@ -88,7 +88,7 @@ struct cmd_results *cmd_border(int argc, char **argv) {
                                 "or 'border pixel <px>'");
         }
         if (argc == 2) {
-                container->border_thickness = atoi(argv[1]);
+                container->pending.border_thickness = atoi(argv[1]);
         }
 
         if (container_is_floating(container)) {
diff --git a/sway/commands/client.c b/sway/commands/client.c
index dd0694df..77263145 100644
--- a/sway/commands/client.c
+++ b/sway/commands/client.c
@@ -18,6 +18,12 @@ static struct cmd_results *handle_command(int argc, char **argv, char *cmd_name,
                 return error;
         }
 
+        if (argc > 3 && strcmp(cmd_name, "client.focused_tab_title") == 0) {
+                sway_log(SWAY_ERROR,
+                                "Warning: indicator and child_border colors have no effect for %s",
+                                cmd_name);
+        }
+
         struct border_colors colors = {0};
         const char *ind_hex = argc > 3 ? argv[3] : default_indicator;
         const char *child_hex = argc > 4 ? argv[4] : argv[1];  // def to background
@@ -80,3 +86,13 @@ struct cmd_results *cmd_client_noop(int argc, char **argv) {
         sway_log(SWAY_INFO, "Warning: %s is ignored by sway", argv[-1]);
         return cmd_results_new(CMD_SUCCESS, NULL);
 }
+
+struct cmd_results *cmd_client_focused_tab_title(int argc, char **argv) {
+        struct cmd_results *result =  handle_command(argc, argv,
+                        "client.focused_tab_title",
+                        &config->border_colors.focused_tab_title, "#2e9ef4ff");
+        if (result && result->status == CMD_SUCCESS) {
+                config->has_focused_tab_title = true;
+        }
+        return result;
+}
diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c
index 39e48a44..b35065c1 100644
--- a/sway/commands/exec_always.c
+++ b/sway/commands/exec_always.c
@@ -7,6 +7,7 @@
 #include <signal.h>
 #include "sway/commands.h"
 #include "sway/config.h"
+#include "sway/server.h"
 #include "sway/tree/container.h"
 #include "sway/tree/root.h"
 #include "sway/tree/workspace.h"
@@ -26,7 +27,7 @@ struct cmd_results *cmd_exec_validate(int argc, char **argv) {
 
 struct cmd_results *cmd_exec_process(int argc, char **argv) {
         struct cmd_results *error = NULL;
-        char *tmp = NULL;
+        char *cmd = NULL;
         if (strcmp(argv[0], "--no-startup-id") == 0) {
                 sway_log(SWAY_INFO, "exec switch '--no-startup-id' not supported, ignored.");
                 --argc; ++argv;
@@ -36,17 +37,12 @@ struct cmd_results *cmd_exec_process(int argc, char **argv) {
         }
 
         if (argc == 1 && (argv[0][0] == '\'' || argv[0][0] == '"')) {
-                tmp = strdup(argv[0]);
-                strip_quotes(tmp);
+                cmd = strdup(argv[0]);
+                strip_quotes(cmd);
         } else {
-                tmp = join_args(argv, argc);
+                cmd = join_args(argv, argc);
         }
 
-        // Put argument into cmd array
-        char cmd[4096];
-        strncpy(cmd, tmp, sizeof(cmd) - 1);
-        cmd[sizeof(cmd) - 1] = 0;
-        free(tmp);
         sway_log(SWAY_DEBUG, "Executing %s", cmd);
 
         int fd[2];
@@ -58,15 +54,18 @@ struct cmd_results *cmd_exec_process(int argc, char **argv) {
         // Fork process
         if ((pid = fork()) == 0) {
                 // Fork child process again
+                restore_nofile_limit();
                 setsid();
                 sigset_t set;
                 sigemptyset(&set);
                 sigprocmask(SIG_SETMASK, &set, NULL);
+                signal(SIGPIPE, SIG_DFL);
                 close(fd[0]);
                 if ((child = fork()) == 0) {
                         close(fd[1]);
-                        execl("/bin/sh", "/bin/sh", "-c", cmd, (void *)NULL);
-                        _exit(0);
+                        execlp("sh", "sh", "-c", cmd, (void *)NULL);
+                        sway_log_errno(SWAY_ERROR, "execlp failed");
+                        _exit(1);
                 }
                 ssize_t s = 0;
                 while ((size_t)s < sizeof(pid_t)) {
@@ -75,10 +74,12 @@ struct cmd_results *cmd_exec_process(int argc, char **argv) {
                 close(fd[1]);
                 _exit(0); // Close child process
         } else if (pid < 0) {
+                free(cmd);
                 close(fd[0]);
                 close(fd[1]);
                 return cmd_results_new(CMD_FAILURE, "fork() failed");
         }
+        free(cmd);
         close(fd[1]); // close write
         ssize_t s = 0;
         while ((size_t)s < sizeof(pid_t)) {
diff --git a/sway/commands/floating.c b/sway/commands/floating.c
index ce123345..74f6522c 100644
--- a/sway/commands/floating.c
+++ b/sway/commands/floating.c
@@ -40,8 +40,8 @@ struct cmd_results *cmd_floating(int argc, char **argv) {
         // If the container is in a floating split container,
         // operate on the split container instead of the child.
         if (container_is_floating_or_child(container)) {
-                while (container->parent) {
-                        container = container->parent;
+                while (container->pending.parent) {
+                        container = container->pending.parent;
                 }
         }
 
@@ -51,8 +51,8 @@ struct cmd_results *cmd_floating(int argc, char **argv) {
         container_set_floating(container, wants_floating);
 
         // Floating containers in the scratchpad should be ignored
-        if (container->workspace) {
-                arrange_workspace(container->workspace);
+        if (container->pending.workspace) {
+                arrange_workspace(container->pending.workspace);
         }
 
         return cmd_results_new(CMD_SUCCESS, NULL);
diff --git a/sway/commands/focus.c b/sway/commands/focus.c
index 79b7aed5..2e8584c9 100644
--- a/sway/commands/focus.c
+++ b/sway/commands/focus.c
@@ -54,7 +54,7 @@ static bool get_direction_from_next_prev(struct sway_container *container,
         } else {
                 return false;
         }
-         
+
         return true;
 }
 
@@ -141,9 +141,9 @@ static struct sway_node *node_get_in_direction_tiling(
         struct sway_container *wrap_candidate = NULL;
         struct sway_container *current = container;
         while (current) {
-                if (current->fullscreen_mode == FULLSCREEN_WORKSPACE) {
+                if (current->pending.fullscreen_mode == FULLSCREEN_WORKSPACE) {
                         // Fullscreen container with a direction - go straight to outputs
-                        struct sway_output *output = current->workspace->output;
+                        struct sway_output *output = current->pending.workspace->output;
                         struct sway_output *new_output =
                                 output_get_in_direction(output, dir);
                         if (!new_output) {
@@ -151,7 +151,7 @@ static struct sway_node *node_get_in_direction_tiling(
                         }
                         return get_node_in_output_direction(new_output, dir);
                 }
-                if (current->fullscreen_mode == FULLSCREEN_GLOBAL) {
+                if (current->pending.fullscreen_mode == FULLSCREEN_GLOBAL) {
                         return NULL;
                 }
 
@@ -202,11 +202,11 @@ static struct sway_node *node_get_in_direction_tiling(
                         }
                 }
 
-                current = current->parent;
+                current = current->pending.parent;
         }
 
         // Check a different output
-        struct sway_output *output = container->workspace->output;
+        struct sway_output *output = container->pending.workspace->output;
         struct sway_output *new_output = output_get_in_direction(output, dir);
         if ((config->focus_wrapping != WRAP_WORKSPACE ||
                                 container->node.type == N_WORKSPACE) && new_output) {
@@ -226,23 +226,23 @@ static struct sway_node *node_get_in_direction_tiling(
 static struct sway_node *node_get_in_direction_floating(
                 struct sway_container *con, struct sway_seat *seat,
                 enum wlr_direction dir) {
-        double ref_lx = con->x + con->width / 2;
-        double ref_ly = con->y + con->height / 2;
+        double ref_lx = con->pending.x + con->pending.width / 2;
+        double ref_ly = con->pending.y + con->pending.height / 2;
         double closest_distance = DBL_MAX;
         struct sway_container *closest_con = NULL;
 
-        if (!con->workspace) {
+        if (!con->pending.workspace) {
                 return NULL;
         }
 
-        for (int i = 0; i < con->workspace->floating->length; i++) {
-                struct sway_container *floater = con->workspace->floating->items[i];
+        for (int i = 0; i < con->pending.workspace->floating->length; i++) {
+                struct sway_container *floater = con->pending.workspace->floating->items[i];
                 if (floater == con) {
                         continue;
                 }
                 float distance = dir == WLR_DIRECTION_LEFT || dir == WLR_DIRECTION_RIGHT
-                        ? (floater->x + floater->width / 2) - ref_lx
-                        : (floater->y + floater->height / 2) - ref_ly;
+                        ? (floater->pending.x + floater->pending.width / 2) - ref_lx
+                        : (floater->pending.y + floater->pending.height / 2) - ref_ly;
                 if (dir == WLR_DIRECTION_LEFT || dir == WLR_DIRECTION_UP) {
                         distance = -distance;
                 }
@@ -267,6 +267,11 @@ static struct cmd_results *focus_mode(struct sway_workspace *ws,
                 new_focus = seat_get_focus_inactive_tiling(seat, ws);
         }
         if (new_focus) {
+                struct sway_container *new_focus_view =
+                        seat_get_focus_inactive_view(seat, &new_focus->node);
+                if (new_focus_view) {
+                        new_focus = new_focus_view;
+                }
                 seat_set_focus_container(seat, new_focus);
 
                 // If we're on the floating layer and the floating container area
@@ -334,7 +339,7 @@ static struct cmd_results *focus_output(struct sway_seat *seat,
 static struct cmd_results *focus_parent(void) {
         struct sway_seat *seat = config->handler_context.seat;
         struct sway_container *con = config->handler_context.container;
-        if (!con || con->fullscreen_mode) {
+        if (!con || con->pending.fullscreen_mode) {
                 return cmd_results_new(CMD_SUCCESS, NULL);
         }
         struct sway_node *parent = node_get_parent(&con->node);
@@ -377,6 +382,13 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
                 if (container_is_scratchpad_hidden_or_child(container)) {
                         root_scratchpad_show(container);
                 }
+                // if we are switching to a container under a fullscreen window, we first
+                // need to exit fullscreen so that the newly focused container becomes visible
+                struct sway_container *obstructing = container_obstructing_fullscreen_container(container);
+                if (obstructing) {
+                        container_fullscreen_disable(obstructing);
+                        arrange_root();
+                }
                 seat_set_focus_container(seat, container);
                 seat_consider_warp_to_focus(seat);
                 container_raise_floating(container);
@@ -439,7 +451,8 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
                 return cmd_results_new(CMD_FAILURE, "");
         }
         struct sway_node *next_focus = NULL;
-        if (container_is_floating(container)) {
+        if (container_is_floating(container) &&
+                        container->pending.fullscreen_mode == FULLSCREEN_NONE) {
                 next_focus = node_get_in_direction_floating(container, seat, direction);
         } else {
                 next_focus = node_get_in_direction_tiling(container, seat, direction, descend);
diff --git a/sway/commands/font.c b/sway/commands/font.c
index c54365b5..cea720f5 100644
--- a/sway/commands/font.c
+++ b/sway/commands/font.c
@@ -22,6 +22,6 @@ struct cmd_results *cmd_font(int argc, char **argv) {
         }
 
         free(font);
-        config_update_font_height(true);
+        config_update_font_height();
         return cmd_results_new(CMD_SUCCESS, NULL);
 }
diff --git a/sway/commands/fullscreen.c b/sway/commands/fullscreen.c
index 3392a7f7..21c1e9a0 100644
--- a/sway/commands/fullscreen.c
+++ b/sway/commands/fullscreen.c
@@ -18,30 +18,19 @@ struct cmd_results *cmd_fullscreen(int argc, char **argv) {
                 return cmd_results_new(CMD_FAILURE,
                                 "Can't run this command while there's no outputs connected.");
         }
-        struct sway_node *node = config->handler_context.node;
         struct sway_container *container = config->handler_context.container;
-        struct sway_workspace *workspace = config->handler_context.workspace;
-        if (node->type == N_WORKSPACE && workspace->tiling->length == 0) {
-                return cmd_results_new(CMD_FAILURE,
-                                "Can't fullscreen an empty workspace");
-        }
 
-        // If in the scratchpad, operate on the highest container
-        if (container && !container->workspace) {
-                while (container->parent) {
-                        container = container->parent;
-                }
-        }
-
-        bool is_fullscreen = false;
-        for (struct sway_container *curr = container; curr; curr = curr->parent) {
-                if (curr->fullscreen_mode != FULLSCREEN_NONE) {
-                        container = curr;
-                        is_fullscreen = true;
-                        break;
+        if (!container) {
+                // If the focus is not a container, do nothing successfully
+                return cmd_results_new(CMD_SUCCESS, NULL);
+        } else if (!container->pending.workspace) {
+                // If in the scratchpad, operate on the highest container
+                while (container->pending.parent) {
+                        container = container->pending.parent;
                 }
         }
 
+        bool is_fullscreen = container->pending.fullscreen_mode != FULLSCREEN_NONE;
         bool global = false;
         bool enable = !is_fullscreen;
 
@@ -57,13 +46,6 @@ struct cmd_results *cmd_fullscreen(int argc, char **argv) {
                 global = strcasecmp(argv[1], "global") == 0;
         }
 
-        if (enable && node->type == N_WORKSPACE) {
-                // Wrap the workspace's children in a container so we can fullscreen it
-                container = workspace_wrap_children(workspace);
-                workspace->layout = L_HORIZ;
-                seat_set_focus_container(config->handler_context.seat, container);
-        }
-
         enum sway_fullscreen_mode mode = FULLSCREEN_NONE;
         if (enable) {
                 mode = global ? FULLSCREEN_GLOBAL : FULLSCREEN_WORKSPACE;
diff --git a/sway/commands/gaps.c b/sway/commands/gaps.c
index 021df843..1deeb56e 100644
--- a/sway/commands/gaps.c
+++ b/sway/commands/gaps.c
@@ -11,7 +11,8 @@
 enum gaps_op {
         GAPS_OP_SET,
         GAPS_OP_ADD,
-        GAPS_OP_SUBTRACT
+        GAPS_OP_SUBTRACT,
+        GAPS_OP_TOGGLE
 };
 
 struct gaps_data {
@@ -102,6 +103,9 @@ static void apply_gaps_op(int *prop, enum gaps_op op, int amount) {
         case GAPS_OP_SUBTRACT:
                 *prop -= amount;
                 break;
+        case GAPS_OP_TOGGLE:
+                *prop = *prop ? 0 : amount;
+                break;
         }
 }
 
@@ -133,9 +137,9 @@ static void configure_gaps(struct sway_workspace *ws, void *_data) {
 }
 
 // gaps inner|outer|horizontal|vertical|top|right|bottom|left current|all
-// set|plus|minus <px>
+// set|plus|minus|toggle <px>
 static const char expected_runtime[] = "'gaps inner|outer|horizontal|vertical|"
-        "top|right|bottom|left current|all set|plus|minus <px>'";
+        "top|right|bottom|left current|all set|plus|minus|toggle <px>'";
 static struct cmd_results *gaps_set_runtime(int argc, char **argv) {
         struct cmd_results *error = checkarg(argc, "gaps", EXPECTED_EQUAL_TO, 4);
         if (error) {
@@ -180,6 +184,8 @@ static struct cmd_results *gaps_set_runtime(int argc, char **argv) {
                 data.operation = GAPS_OP_ADD;
         } else if (strcasecmp(argv[2], "minus") == 0) {
                 data.operation = GAPS_OP_SUBTRACT;
+        } else if (strcasecmp(argv[2], "toggle") == 0) {
+                data.operation = GAPS_OP_TOGGLE;
         } else {
                 return cmd_results_new(CMD_INVALID, "Expected %s", expected_runtime);
         }
@@ -200,7 +206,7 @@ static struct cmd_results *gaps_set_runtime(int argc, char **argv) {
 }
 
 // gaps inner|outer|<dir>|<side> <px> - sets defaults for workspaces
-// gaps inner|outer|<dir>|<side> current|all set|plus|minus <px> - runtime only
+// gaps inner|outer|<dir>|<side> current|all set|plus|minus|toggle <px> - runtime only
 // <dir> = horizontal|vertical
 // <side> = top|right|bottom|left
 struct cmd_results *cmd_gaps(int argc, char **argv) {
diff --git a/sway/commands/input.c b/sway/commands/input.c
index c9bb8e06..77acb671 100644
--- a/sway/commands/input.c
+++ b/sway/commands/input.c
@@ -7,7 +7,7 @@
 #include "stringop.h"
 
 // must be in order for the bsearch
-static struct cmd_handler input_handlers[] = {
+static const struct cmd_handler input_handlers[] = {
         { "accel_profile", input_cmd_accel_profile },
         { "calibration_matrix", input_cmd_calibration_matrix },
         { "click_method", input_cmd_click_method },
@@ -40,7 +40,7 @@ static struct cmd_handler input_handlers[] = {
 };
 
 // must be in order for the bsearch
-static struct cmd_handler input_config_handlers[] = {
+static const struct cmd_handler input_config_handlers[] = {
         { "xkb_capslock", input_cmd_xkb_capslock },
         { "xkb_numlock", input_cmd_xkb_numlock },
 };
diff --git a/sway/commands/input/map_to_region.c b/sway/commands/input/map_to_region.c
index e85495e5..284b57d0 100644
--- a/sway/commands/input/map_to_region.c
+++ b/sway/commands/input/map_to_region.c
@@ -1,7 +1,6 @@
 #define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <string.h>
-#include <wlr/types/wlr_box.h>
 #include "sway/commands.h"
 #include "sway/config.h"
 
diff --git a/sway/commands/layout.c b/sway/commands/layout.c
index f2af183b..2ba61b38 100644
--- a/sway/commands/layout.c
+++ b/sway/commands/layout.c
@@ -133,7 +133,7 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
 
         // Operate on parent container, like i3.
         if (container) {
-                container = container->parent;
+                container = container->pending.parent;
         }
 
         // We could be working with a container OR a workspace. These are different
@@ -142,10 +142,10 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
         enum sway_container_layout new_layout = L_NONE;
         enum sway_container_layout old_layout = L_NONE;
         if (container) {
-                old_layout = container->layout;
+                old_layout = container->pending.layout;
                 new_layout = get_layout(argc, argv,
-                                container->layout, container->prev_split_layout,
-                                container->workspace->output);
+                                container->pending.layout, container->prev_split_layout,
+                                container->pending.workspace->output);
         } else {
                 old_layout = workspace->layout;
                 new_layout = get_layout(argc, argv,
@@ -160,13 +160,13 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
                         if (old_layout != L_TABBED && old_layout != L_STACKED) {
                                 container->prev_split_layout = old_layout;
                         }
-                        container->layout = new_layout;
+                        container->pending.layout = new_layout;
                         container_update_representation(container);
                 } else if (config->handler_context.container) {
                         // i3 avoids changing workspace layouts with a new container
                         // https://github.com/i3/i3/blob/3cd1c45eba6de073bc4300eebb4e1cc1a0c4479a/src/con.c#L1817
                         container = workspace_wrap_children(workspace);
-                        container->layout = new_layout;
+                        container->pending.layout = new_layout;
                         container_update_representation(container);
                 } else {
                         if (old_layout != L_TABBED && old_layout != L_STACKED) {
diff --git a/sway/commands/mode.c b/sway/commands/mode.c
index a5871dab..e23e4ee4 100644
--- a/sway/commands/mode.c
+++ b/sway/commands/mode.c
@@ -9,7 +9,7 @@
 #include "stringop.h"
 
 // Must be in order for the bsearch
-static struct cmd_handler mode_handlers[] = {
+static const struct cmd_handler mode_handlers[] = {
         { "bindcode", cmd_bindcode },
         { "bindswitch", cmd_bindswitch },
         { "bindsym", cmd_bindsym },
diff --git a/sway/commands/move.c b/sway/commands/move.c
index f8f89f18..1a05a7a6 100644
--- a/sway/commands/move.c
+++ b/sway/commands/move.c
@@ -113,8 +113,8 @@ static void container_move_to_container_from_direction(
                 struct sway_container *container, struct sway_container *destination,
                 enum wlr_direction move_dir) {
         if (destination->view) {
-                if (destination->parent == container->parent &&
-                                destination->workspace == container->workspace) {
+                if (destination->pending.parent == container->pending.parent &&
+                                destination->pending.workspace == container->pending.workspace) {
                         sway_log(SWAY_DEBUG, "Swapping siblings");
                         list_t *siblings = container_get_siblings(container);
                         int container_index = list_find(siblings, container);
@@ -126,28 +126,28 @@ static void container_move_to_container_from_direction(
                         int offset =
                                 move_dir == WLR_DIRECTION_LEFT || move_dir == WLR_DIRECTION_UP;
                         int index = container_sibling_index(destination) + offset;
-                        if (destination->parent) {
-                                container_insert_child(destination->parent, container, index);
+                        if (destination->pending.parent) {
+                                container_insert_child(destination->pending.parent, container, index);
                         } else {
-                                workspace_insert_tiling(destination->workspace,
+                                workspace_insert_tiling(destination->pending.workspace,
                                                 container, index);
                         }
-                        container->width = container->height = 0;
+                        container->pending.width = container->pending.height = 0;
                         container->width_fraction = container->height_fraction = 0;
-                        workspace_squash(destination->workspace);
+                        workspace_squash(destination->pending.workspace);
                 }
                 return;
         }
 
-        if (is_parallel(destination->layout, move_dir)) {
+        if (is_parallel(destination->pending.layout, move_dir)) {
                 sway_log(SWAY_DEBUG, "Reparenting container (parallel)");
                 int index =
                         move_dir == WLR_DIRECTION_RIGHT || move_dir == WLR_DIRECTION_DOWN ?
-                        0 : destination->children->length;
+                        0 : destination->pending.children->length;
                 container_insert_child(destination, container, index);
-                container->width = container->height = 0;
+                container->pending.width = container->pending.height = 0;
                 container->width_fraction = container->height_fraction = 0;
-                workspace_squash(destination->workspace);
+                workspace_squash(destination->pending.workspace);
                 return;
         }
 
@@ -168,7 +168,7 @@ static void container_move_to_container_from_direction(
 static void container_move_to_workspace_from_direction(
                 struct sway_container *container, struct sway_workspace *workspace,
                 enum wlr_direction move_dir) {
-        container->width = container->height = 0;
+        container->pending.width = container->pending.height = 0;
         container->width_fraction = container->height_fraction = 0;
 
         if (is_parallel(workspace->layout, move_dir)) {
@@ -188,8 +188,8 @@ static void container_move_to_workspace_from_direction(
                 workspace_add_tiling(workspace, container);
                 return;
         }
-        while (focus_inactive->parent) {
-                focus_inactive = focus_inactive->parent;
+        while (focus_inactive->pending.parent) {
+                focus_inactive = focus_inactive->pending.parent;
         }
         container_move_to_container_from_direction(container, focus_inactive,
                         move_dir);
@@ -197,25 +197,25 @@ static void container_move_to_workspace_from_direction(
 
 static void container_move_to_workspace(struct sway_container *container,
                 struct sway_workspace *workspace) {
-        if (container->workspace == workspace) {
+        if (container->pending.workspace == workspace) {
                 return;
         }
-        struct sway_workspace *old_workspace = container->workspace;
+        struct sway_workspace *old_workspace = container->pending.workspace;
         if (container_is_floating(container)) {
-                struct sway_output *old_output = container->workspace->output;
+                struct sway_output *old_output = container->pending.workspace->output;
                 container_detach(container);
                 workspace_add_floating(workspace, container);
                 container_handle_fullscreen_reparent(container);
                 // If changing output, center it within the workspace
-                if (old_output != workspace->output && !container->fullscreen_mode) {
+                if (old_output != workspace->output && !container->pending.fullscreen_mode) {
                         container_floating_move_to_center(container);
                 }
         } else {
                 container_detach(container);
-                if (workspace_is_empty(workspace) && container->children) {
+                if (workspace_is_empty(workspace) && container->pending.children) {
                         workspace_unwrap_children(workspace, container);
                 } else {
-                        container->width = container->height = 0;
+                        container->pending.width = container->pending.height = 0;
                         container->width_fraction = container->height_fraction = 0;
                         workspace_add_tiling(workspace, container);
                 }
@@ -237,13 +237,13 @@ static void container_move_to_container(struct sway_container *container,
                 return;
         }
         if (container_is_floating(container)) {
-                container_move_to_workspace(container, destination->workspace);
+                container_move_to_workspace(container, destination->pending.workspace);
                 return;
         }
-        struct sway_workspace *old_workspace = container->workspace;
+        struct sway_workspace *old_workspace = container->pending.workspace;
 
         container_detach(container);
-        container->width = container->height = 0;
+        container->pending.width = container->pending.height = 0;
         container->width_fraction = container->height_fraction = 0;
 
         if (destination->view) {
@@ -256,12 +256,12 @@ static void container_move_to_container(struct sway_container *container,
                 ipc_event_window(container, "move");
         }
 
-        if (destination->workspace) {
-                workspace_focus_fullscreen(destination->workspace);
-                workspace_detect_urgent(destination->workspace);
+        if (destination->pending.workspace) {
+                workspace_focus_fullscreen(destination->pending.workspace);
+                workspace_detect_urgent(destination->pending.workspace);
         }
 
-        if (old_workspace && old_workspace != destination->workspace) {
+        if (old_workspace && old_workspace != destination->pending.workspace) {
                 workspace_detect_urgent(old_workspace);
         }
 }
@@ -275,7 +275,7 @@ static bool container_move_to_next_output(struct sway_container *container,
                 if (!sway_assert(ws, "Expected output to have a workspace")) {
                         return false;
                 }
-                switch (container->fullscreen_mode) {
+                switch (container->pending.fullscreen_mode) {
                 case FULLSCREEN_NONE:
                         container_move_to_workspace_from_direction(container, ws, move_dir);
                         return true;
@@ -293,12 +293,12 @@ static bool container_move_to_next_output(struct sway_container *container,
 static bool container_move_in_direction(struct sway_container *container,
                 enum wlr_direction move_dir) {
         // If moving a fullscreen view, only consider outputs
-        switch (container->fullscreen_mode) {
+        switch (container->pending.fullscreen_mode) {
         case FULLSCREEN_NONE:
                 break;
         case FULLSCREEN_WORKSPACE:
                 return container_move_to_next_output(container,
-                                container->workspace->output, move_dir);
+                                container->pending.workspace->output, move_dir);
         case FULLSCREEN_GLOBAL:
                 return false;
         }
@@ -317,26 +317,26 @@ static bool container_move_in_direction(struct sway_container *container,
         while (!ancestor) {
                 // Don't allow containers to move out of their
                 // fullscreen or floating parent
-                if (current->fullscreen_mode || container_is_floating(current)) {
+                if (current->pending.fullscreen_mode || container_is_floating(current)) {
                         return false;
                 }
 
                 enum sway_container_layout parent_layout = container_parent_layout(current);
                 if (!is_parallel(parent_layout, move_dir)) {
-                        if (!current->parent) {
+                        if (!current->pending.parent) {
                                 // No parallel parent, so we reorient the workspace
-                                current = workspace_wrap_children(current->workspace);
-                                current->workspace->layout =
+                                current = workspace_wrap_children(current->pending.workspace);
+                                current->pending.workspace->layout =
                                         move_dir == WLR_DIRECTION_LEFT ||
                                         move_dir == WLR_DIRECTION_RIGHT ?
                                         L_HORIZ : L_VERT;
-                                container->height = container->width = 0;
+                                container->pending.height = container->pending.width = 0;
                                 container->height_fraction = container->width_fraction = 0;
-                                workspace_update_representation(current->workspace);
+                                workspace_update_representation(current->pending.workspace);
                                 wrapped = true;
                         } else {
                                 // Keep looking for a parallel parent
-                                current = current->parent;
+                                current = current->pending.parent;
                         }
                         continue;
                 }
@@ -356,14 +356,14 @@ static bool container_move_in_direction(struct sway_container *container,
                                 container_move_to_container_from_direction(container,
                                                 target, move_dir);
                                 return true;
-                        } else if (!container->parent) {
+                        } else if (!container->pending.parent) {
                                 // Container is at workspace level so we move it to the
                                 // next workspace if possible
                                 return container_move_to_next_output(container,
-                                                current->workspace->output, move_dir);
+                                                current->pending.workspace->output, move_dir);
                         } else {
                                 // Container has escaped its immediate parallel parent
-                                current = current->parent;
+                                current = current->pending.parent;
                                 continue;
                         }
                 }
@@ -377,31 +377,31 @@ static bool container_move_in_direction(struct sway_container *container,
                 container_move_to_container_from_direction(container,
                                 target, move_dir);
                 return true;
-        } else if (!wrapped && !container->parent->parent &&
-                        container->parent->children->length == 1) {
+        } else if (!wrapped && !container->pending.parent->pending.parent &&
+                        container->pending.parent->pending.children->length == 1) {
                 // Treat singleton children as if they are at workspace level like i3
                 // https://github.com/i3/i3/blob/1d9160f2d247dbaa83fb62f02fd7041dec767fc2/src/move.c#L367
                 return container_move_to_next_output(container,
-                                ancestor->workspace->output, move_dir);
+                                ancestor->pending.workspace->output, move_dir);
         } else {
                 // Container will be promoted
-                struct sway_container *old_parent = container->parent;
-                if (ancestor->parent) {
+                struct sway_container *old_parent = container->pending.parent;
+                if (ancestor->pending.parent) {
                         // Container will move in with its parent
-                        container_insert_child(ancestor->parent, container,
+                        container_insert_child(ancestor->pending.parent, container,
                                         index + (offs < 0 ? 0 : 1));
                 } else {
                         // Container will move to workspace level,
                         // may be re-split by workspace_layout
-                        workspace_insert_tiling(ancestor->workspace, container,
+                        workspace_insert_tiling(ancestor->pending.workspace, container,
                                         index + (offs < 0 ? 0 : 1));
                 }
-                ancestor->height = ancestor->width = 0;
+                ancestor->pending.height = ancestor->pending.width = 0;
                 ancestor->height_fraction = ancestor->width_fraction = 0;
                 if (old_parent) {
                         container_reap_empty(old_parent);
                 }
-                workspace_squash(container->workspace);
+                workspace_squash(container->pending.workspace);
                 return true;
         }
 }
@@ -427,14 +427,14 @@ static struct cmd_results *cmd_move_container(bool no_auto_back_and_forth,
                 container = workspace_wrap_children(workspace);
         }
 
-        if (container->fullscreen_mode == FULLSCREEN_GLOBAL) {
+        if (container->pending.fullscreen_mode == FULLSCREEN_GLOBAL) {
                 return cmd_results_new(CMD_FAILURE,
                                 "Can't move fullscreen global container");
         }
 
         struct sway_seat *seat = config->handler_context.seat;
-        struct sway_container *old_parent = container->parent;
-        struct sway_workspace *old_ws = container->workspace;
+        struct sway_container *old_parent = container->pending.parent;
+        struct sway_workspace *old_ws = container->pending.workspace;
         struct sway_output *old_output = old_ws ? old_ws->output : NULL;
         struct sway_node *destination = NULL;
 
@@ -508,7 +508,7 @@ static struct cmd_results *cmd_move_container(bool no_auto_back_and_forth,
                 destination = dst ? &dst->node : &ws->node;
         } else if (strcasecmp(argv[0], "output") == 0) {
                 struct sway_output *new_output = output_in_direction(argv[1],
-                                old_output, container->x, container->y);
+                                old_output, container->pending.x, container->pending.y);
                 if (!new_output) {
                         return cmd_results_new(CMD_FAILURE,
                                 "Can't find output with name/direction '%s'", argv[1]);
@@ -706,12 +706,12 @@ static struct cmd_results *cmd_move_in_direction(
                                 "Cannot move workspaces in a direction");
         }
         if (container_is_floating(container)) {
-                if (container->fullscreen_mode) {
+                if (container->pending.fullscreen_mode) {
                         return cmd_results_new(CMD_FAILURE,
                                         "Cannot move fullscreen floating container");
                 }
-                double lx = container->x;
-                double ly = container->y;
+                double lx = container->pending.x;
+                double ly = container->pending.y;
                 switch (direction) {
                 case WLR_DIRECTION_LEFT:
                         lx -= move_amt;
@@ -729,8 +729,8 @@ static struct cmd_results *cmd_move_in_direction(
                 container_floating_move_to(container, lx, ly);
                 return cmd_results_new(CMD_SUCCESS, NULL);
         }
-        struct sway_workspace *old_ws = container->workspace;
-        struct sway_container *old_parent = container->parent;
+        struct sway_workspace *old_ws = container->pending.workspace;
+        struct sway_container *old_parent = container->pending.parent;
 
         if (!container_move_in_direction(container, direction)) {
                 // Container didn't move
@@ -744,7 +744,7 @@ static struct cmd_results *cmd_move_in_direction(
                 workspace_consider_destroy(old_ws);
         }
 
-        struct sway_workspace *new_ws = container->workspace;
+        struct sway_workspace *new_ws = container->pending.workspace;
 
         if (root->fullscreen_global) {
                 arrange_root();
@@ -781,8 +781,8 @@ static struct cmd_results *cmd_move_to_position_pointer(
         }
         struct wlr_cursor *cursor = seat->cursor->cursor;
         /* Determine where to put the window. */
-        double lx = cursor->x - container->width / 2;
-        double ly = cursor->y - container->height / 2;
+        double lx = cursor->x - container->pending.width / 2;
+        double ly = cursor->y - container->pending.height / 2;
 
         /* Correct target coordinates to be in bounds (on screen). */
         struct wlr_output *output = wlr_output_layout_output_at(
@@ -792,11 +792,11 @@ static struct cmd_results *cmd_move_to_position_pointer(
                                 wlr_output_layout_get_box(root->output_layout, output);
                 lx = fmax(lx, box->x);
                 ly = fmax(ly, box->y);
-                if (lx + container->width > box->x + box->width) {
-                        lx = box->x + box->width - container->width;
+                if (lx + container->pending.width > box->x + box->width) {
+                        lx = box->x + box->width - container->pending.width;
                 }
-                if (ly + container->height > box->y + box->height) {
-                        ly = box->y + box->height - container->height;
+                if (ly + container->pending.height > box->y + box->height) {
+                        ly = box->y + box->height - container->pending.height;
                 }
         }
 
@@ -846,16 +846,16 @@ static struct cmd_results *cmd_move_to_position(int argc, char **argv) {
         } else if (strcmp(argv[0], "center") == 0) {
                 double lx, ly;
                 if (absolute) {
-                        lx = root->x + (root->width - container->width) / 2;
-                        ly = root->y + (root->height - container->height) / 2;
+                        lx = root->x + (root->width - container->pending.width) / 2;
+                        ly = root->y + (root->height - container->pending.height) / 2;
                 } else {
-                        struct sway_workspace *ws = container->workspace;
+                        struct sway_workspace *ws = container->pending.workspace;
                         if (!ws) {
                                 struct sway_seat *seat = config->handler_context.seat;
                                 ws = seat_get_focused_workspace(seat);
                         }
-                        lx = ws->x + (ws->width - container->width) / 2;
-                        ly = ws->y + (ws->height - container->height) / 2;
+                        lx = ws->x + (ws->width - container->pending.width) / 2;
+                        ly = ws->y + (ws->height - container->pending.height) / 2;
                 }
                 container_floating_move_to(container, lx, ly);
                 return cmd_results_new(CMD_SUCCESS, NULL);
@@ -874,6 +874,10 @@ static struct cmd_results *cmd_move_to_position(int argc, char **argv) {
                 return cmd_results_new(CMD_INVALID, "Invalid x position specified");
         }
 
+        if (argc < 1) {
+                return cmd_results_new(CMD_FAILURE, expected_position_syntax);
+        }
+
         struct movement_amount ly = { .amount = 0, .unit = MOVEMENT_UNIT_INVALID };
         // Y direction
         num_consumed_args = parse_movement_amount(argc, argv, &ly);
@@ -886,7 +890,7 @@ static struct cmd_results *cmd_move_to_position(int argc, char **argv) {
                 return cmd_results_new(CMD_INVALID, "Invalid y position specified");
         }
 
-        struct sway_workspace *ws = container->workspace;
+        struct sway_workspace *ws = container->pending.workspace;
         if (!ws) {
                 struct sway_seat *seat = config->handler_context.seat;
                 ws = seat_get_focused_workspace(seat);
@@ -960,14 +964,14 @@ static struct cmd_results *cmd_move_to_scratchpad(void) {
         // If the container is in a floating split container,
         // operate on the split container instead of the child.
         if (container_is_floating_or_child(con)) {
-                while (con->parent) {
-                        con = con->parent;
+                while (con->pending.parent) {
+                        con = con->pending.parent;
                 }
         }
 
         if (!con->scratchpad) {
                 root_scratchpad_add_container(con, NULL);
-        } else if (con->workspace) {
+        } else if (con->pending.workspace) {
                 root_scratchpad_hide(con);
         }
         return cmd_results_new(CMD_SUCCESS, NULL);
diff --git a/sway/commands/output.c b/sway/commands/output.c
index 5186a2ba..125df5a7 100644
--- a/sway/commands/output.c
+++ b/sway/commands/output.c
@@ -6,7 +6,7 @@
 #include "log.h"
 
 // must be in order for the bsearch
-static struct cmd_handler output_handlers[] = {
+static const struct cmd_handler output_handlers[] = {
         { "adaptive_sync", output_cmd_adaptive_sync },
         { "background", output_cmd_background },
         { "bg", output_cmd_background },
@@ -15,8 +15,10 @@ static struct cmd_handler output_handlers[] = {
         { "enable", output_cmd_enable },
         { "max_render_time", output_cmd_max_render_time },
         { "mode", output_cmd_mode },
+        { "modeline", output_cmd_modeline },
         { "pos", output_cmd_position },
         { "position", output_cmd_position },
+        { "render_bit_depth", output_cmd_render_bit_depth },
         { "res", output_cmd_mode },
         { "resolution", output_cmd_mode },
         { "scale", output_cmd_scale },
@@ -32,9 +34,9 @@ struct cmd_results *cmd_output(int argc, char **argv) {
                 return error;
         }
 
-        // The NOOP-1 output is a dummy output used when there's no outputs
+        // The HEADLESS-1 output is a dummy output used when there's no outputs
         // connected. It should never be configured.
-        if (strcasecmp(argv[0], root->noop_output->wlr_output->name) == 0) {
+        if (strcasecmp(argv[0], root->fallback_output->wlr_output->name) == 0) {
                 return cmd_results_new(CMD_FAILURE,
                                 "Refusing to configure the no op output");
         }
@@ -51,7 +53,7 @@ struct cmd_results *cmd_output(int argc, char **argv) {
                 if (!sway_output) {
                         return cmd_results_new(CMD_FAILURE, "Unknown output");
                 }
-                if (sway_output == root->noop_output) {
+                if (sway_output == root->fallback_output) {
                         return cmd_results_new(CMD_FAILURE,
                                         "Refusing to configure the no op output");
                 }
diff --git a/sway/commands/output/dpms.c b/sway/commands/output/dpms.c
index 9d75a80e..638c0ade 100644
--- a/sway/commands/output/dpms.c
+++ b/sway/commands/output/dpms.c
@@ -1,6 +1,8 @@
 #include "sway/commands.h"
 #include "sway/config.h"
+#include "sway/output.h"
 #include "util.h"
+#include <strings.h>
 
 struct cmd_results *output_cmd_dpms(int argc, char **argv) {
         if (!config->handler_context.output_config) {
@@ -10,7 +12,28 @@ struct cmd_results *output_cmd_dpms(int argc, char **argv) {
                 return cmd_results_new(CMD_INVALID, "Missing dpms argument.");
         }
 
-        if (parse_boolean(argv[0], true)) {
+        enum config_dpms current_dpms = DPMS_ON;
+
+        if (strcasecmp(argv[0], "toggle") == 0) {
+
+                const char *oc_name = config->handler_context.output_config->name;
+                if (strcmp(oc_name, "*") == 0) {
+                        return cmd_results_new(CMD_INVALID,
+                                        "Cannot apply toggle to all outputs.");
+                }
+
+                struct sway_output *sway_output = all_output_by_name_or_id(oc_name);
+                if (!sway_output || !sway_output->wlr_output) {
+                        return cmd_results_new(CMD_FAILURE,
+                                        "Cannot apply toggle to unknown output %s", oc_name);
+                }
+
+                if (sway_output->enabled && !sway_output->wlr_output->enabled) {
+                        current_dpms = DPMS_OFF;
+                }
+        }
+
+        if (parse_boolean(argv[0], current_dpms == DPMS_ON)) {
                 config->handler_context.output_config->dpms_state = DPMS_ON;
         } else {
                 config->handler_context.output_config->dpms_state = DPMS_OFF;
diff --git a/sway/commands/output/mode.c b/sway/commands/output/mode.c
index 5b710713..019d625a 100644
--- a/sway/commands/output/mode.c
+++ b/sway/commands/output/mode.c
@@ -20,6 +20,9 @@ struct cmd_results *output_cmd_mode(int argc, char **argv) {
                 output->custom_mode = 0;
         }
 
+        // Reset custom modeline, if any
+        output->drm_mode.type = 0;
+
         char *end;
         output->width = strtol(*argv, &end, 10);
         if (*end) {
@@ -58,3 +61,58 @@ struct cmd_results *output_cmd_mode(int argc, char **argv) {
         return NULL;
 }
 
+static bool parse_modeline(char **argv, drmModeModeInfo *mode) {
+        mode->type = DRM_MODE_TYPE_USERDEF;
+        mode->clock = strtof(argv[0], NULL) * 1000;
+        mode->hdisplay = strtol(argv[1], NULL, 10);
+        mode->hsync_start = strtol(argv[2], NULL, 10);
+        mode->hsync_end = strtol(argv[3], NULL, 10);
+        mode->htotal = strtol(argv[4], NULL, 10);
+        mode->vdisplay = strtol(argv[5], NULL, 10);
+        mode->vsync_start = strtol(argv[6], NULL, 10);
+        mode->vsync_end = strtol(argv[7], NULL, 10);
+        mode->vtotal = strtol(argv[8], NULL, 10);
+
+        mode->vrefresh = mode->clock * 1000.0 * 1000.0
+                / mode->htotal / mode->vtotal;
+        if (strcasecmp(argv[9], "+hsync") == 0) {
+                mode->flags |= DRM_MODE_FLAG_PHSYNC;
+        } else if (strcasecmp(argv[9], "-hsync") == 0) {
+                mode->flags |= DRM_MODE_FLAG_NHSYNC;
+        } else {
+                return false;
+        }
+
+        if (strcasecmp(argv[10], "+vsync") == 0) {
+                mode->flags |= DRM_MODE_FLAG_PVSYNC;
+        } else if (strcasecmp(argv[10], "-vsync") == 0) {
+                mode->flags |= DRM_MODE_FLAG_NVSYNC;
+        } else {
+                return false;
+        }
+
+        snprintf(mode->name, sizeof(mode->name), "%dx%d@%d",
+                 mode->hdisplay, mode->vdisplay, mode->vrefresh / 1000);
+
+        return true;
+}
+
+struct cmd_results *output_cmd_modeline(int argc, char **argv) {
+        if (!config->handler_context.output_config) {
+                return cmd_results_new(CMD_FAILURE, "Missing output config");
+        }
+        if (!argc) {
+                return cmd_results_new(CMD_INVALID, "Missing modeline argument.");
+        }
+
+        struct output_config *output = config->handler_context.output_config;
+
+        if (argc != 11 || !parse_modeline(argv, &output->drm_mode)) {
+                return cmd_results_new(CMD_INVALID, "Invalid modeline");
+        }
+
+        config->handler_context.leftovers.argc = argc - 12;
+        config->handler_context.leftovers.argv = argv + 12;
+        return NULL;
+}
+
diff --git a/sway/commands/output/render_bit_depth.c b/sway/commands/output/render_bit_depth.c
new file mode 100644
index 00000000..c419321e
--- /dev/null
+++ b/sway/commands/output/render_bit_depth.c
@@ -0,0 +1,29 @@
+#include <drm_fourcc.h>
+#include <strings.h>
+#include "sway/commands.h"
+#include "sway/config.h"
+
+struct cmd_results *output_cmd_render_bit_depth(int argc, char **argv) {
+        if (!config->handler_context.output_config) {
+                return cmd_results_new(CMD_FAILURE, "Missing output config");
+        }
+        if (!argc) {
+                return cmd_results_new(CMD_INVALID, "Missing bit depth argument.");
+        }
+
+        if (strcmp(*argv, "8") == 0) {
+                config->handler_context.output_config->render_bit_depth =
+                        RENDER_BIT_DEPTH_8;
+        } else if (strcmp(*argv, "10") == 0) {
+                config->handler_context.output_config->render_bit_depth =
+                        RENDER_BIT_DEPTH_10;
+        } else {
+                return cmd_results_new(CMD_INVALID,
+                        "Invalid bit depth. Must be a value in (8|10).");
+        }
+
+        config->handler_context.leftovers.argc = argc - 1;
+        config->handler_context.leftovers.argv = argv + 1;
+        return NULL;
+}
+
diff --git a/sway/commands/reload.c b/sway/commands/reload.c
index 3c994d54..76f14bba 100644
--- a/sway/commands/reload.c
+++ b/sway/commands/reload.c
@@ -48,7 +48,6 @@ static void do_reload(void *data) {
         }
         list_free_items_and_destroy(bar_ids);
 
-        config_update_font_height(true);
         root_for_each_container(rebuild_textures_iterator, NULL);
 
         arrange_root();
diff --git a/sway/commands/resize.c b/sway/commands/resize.c
index ca36e858..425069de 100644
--- a/sway/commands/resize.c
+++ b/sway/commands/resize.c
@@ -57,7 +57,7 @@ struct sway_container *container_find_resize_parent(struct sway_container *con,
                                 (allow_last || index < siblings->length - 1)) {
                         return con;
                 }
-                con = con->parent;
+                con = con->pending.parent;
         }
 
         return NULL;
@@ -115,13 +115,13 @@ void container_resize_tiled(struct sway_container *con,
         int sibling_amount = prev ? ceil((double)amount / 2.0) : amount;
 
         if (is_horizontal(axis)) {
-                if (con->width + amount < MIN_SANE_W) {
+                if (con->pending.width + amount < MIN_SANE_W) {
                         return;
                 }
-                if (next->width - sibling_amount < MIN_SANE_W) {
+                if (next->pending.width - sibling_amount < MIN_SANE_W) {
                         return;
                 }
-                if (prev && prev->width - sibling_amount < MIN_SANE_W) {
+                if (prev && prev->pending.width - sibling_amount < MIN_SANE_W) {
                         return;
                 }
                 if (con->child_total_width <= 0) {
@@ -133,7 +133,7 @@ void container_resize_tiled(struct sway_container *con,
                 list_t *siblings = container_get_siblings(con);
                 for (int i = 0; i < siblings->length; ++i) {
                         struct sway_container *con = siblings->items[i];
-                        con->width_fraction = con->width / con->child_total_width;
+                        con->width_fraction = con->pending.width / con->child_total_width;
                 }
 
                 double amount_fraction = (double)amount / con->child_total_width;
@@ -146,13 +146,13 @@ void container_resize_tiled(struct sway_container *con,
                         prev->width_fraction -= sibling_amount_fraction;
                 }
         } else {
-                if (con->height + amount < MIN_SANE_H) {
+                if (con->pending.height + amount < MIN_SANE_H) {
                         return;
                 }
-                if (next->height - sibling_amount < MIN_SANE_H) {
+                if (next->pending.height - sibling_amount < MIN_SANE_H) {
                         return;
                 }
-                if (prev && prev->height - sibling_amount < MIN_SANE_H) {
+                if (prev && prev->pending.height - sibling_amount < MIN_SANE_H) {
                         return;
                 }
                 if (con->child_total_height <= 0) {
@@ -164,7 +164,7 @@ void container_resize_tiled(struct sway_container *con,
                 list_t *siblings = container_get_siblings(con);
                 for (int i = 0; i < siblings->length; ++i) {
                         struct sway_container *con = siblings->items[i];
-                        con->height_fraction = con->height / con->child_total_height;
+                        con->height_fraction = con->pending.height / con->child_total_height;
                 }
 
                 double amount_fraction = (double)amount / con->child_total_height;
@@ -178,10 +178,10 @@ void container_resize_tiled(struct sway_container *con,
                 }
         }
 
-        if (con->parent) {
-                arrange_container(con->parent);
+        if (con->pending.parent) {
+                arrange_container(con->pending.parent);
         } else {
-                arrange_workspace(con->workspace);
+                arrange_workspace(con->pending.workspace);
         }
 }
 
@@ -203,15 +203,15 @@ static struct cmd_results *resize_adjust_floating(uint32_t axis,
         int min_width, max_width, min_height, max_height;
         floating_calculate_constraints(&min_width, &max_width,
                         &min_height, &max_height);
-        if (con->width + grow_width < min_width) {
-                grow_width = min_width - con->width;
-        } else if (con->width + grow_width > max_width) {
-                grow_width = max_width - con->width;
+        if (con->pending.width + grow_width < min_width) {
+                grow_width = min_width - con->pending.width;
+        } else if (con->pending.width + grow_width > max_width) {
+                grow_width = max_width - con->pending.width;
         }
-        if (con->height + grow_height < min_height) {
-                grow_height = min_height - con->height;
-        } else if (con->height + grow_height > max_height) {
-                grow_height = max_height - con->height;
+        if (con->pending.height + grow_height < min_height) {
+                grow_height = min_height - con->pending.height;
+        } else if (con->pending.height + grow_height > max_height) {
+                grow_height = max_height - con->pending.height;
         }
         int grow_x = 0, grow_y = 0;
 
@@ -227,15 +227,15 @@ static struct cmd_results *resize_adjust_floating(uint32_t axis,
         if (grow_width == 0 && grow_height == 0) {
                 return cmd_results_new(CMD_INVALID, "Cannot resize any further");
         }
-        con->x += grow_x;
-        con->y += grow_y;
-        con->width += grow_width;
-        con->height += grow_height;
+        con->pending.x += grow_x;
+        con->pending.y += grow_y;
+        con->pending.width += grow_width;
+        con->pending.height += grow_height;
 
-        con->content_x += grow_x;
-        con->content_y += grow_y;
-        con->content_width += grow_width;
-        con->content_height += grow_height;
+        con->pending.content_x += grow_x;
+        con->pending.content_y += grow_y;
+        con->pending.content_width += grow_width;
+        con->pending.content_height += grow_height;
 
         arrange_container(con);
 
@@ -256,9 +256,9 @@ static struct cmd_results *resize_adjust_tiled(uint32_t axis,
                 float pct = amount->amount / 100.0f;
 
                 if (is_horizontal(axis)) {
-                        amount->amount = (float)current->width * pct;
+                        amount->amount = (float)current->pending.width * pct;
                 } else {
-                        amount->amount = (float)current->height * pct;
+                        amount->amount = (float)current->pending.height * pct;
                 }
         }
 
@@ -281,20 +281,20 @@ static struct cmd_results *resize_set_tiled(struct sway_container *con,
                 if (width->unit == MOVEMENT_UNIT_PPT ||
                                 width->unit == MOVEMENT_UNIT_DEFAULT) {
                         // Convert to px
-                        struct sway_container *parent = con->parent;
-                        while (parent && parent->layout != L_HORIZ) {
-                                parent = parent->parent;
+                        struct sway_container *parent = con->pending.parent;
+                        while (parent && parent->pending.layout != L_HORIZ) {
+                                parent = parent->pending.parent;
                         }
                         if (parent) {
-                                width->amount = parent->width * width->amount / 100;
+                                width->amount = parent->pending.width * width->amount / 100;
                         } else {
-                                width->amount = con->workspace->width * width->amount / 100;
+                                width->amount = con->pending.workspace->width * width->amount / 100;
                         }
                         width->unit = MOVEMENT_UNIT_PX;
                 }
                 if (width->unit == MOVEMENT_UNIT_PX) {
                         container_resize_tiled(con, AXIS_HORIZONTAL,
-                                        width->amount - con->width);
+                                        width->amount - con->pending.width);
                 }
         }
 
@@ -302,20 +302,20 @@ static struct cmd_results *resize_set_tiled(struct sway_container *con,
                 if (height->unit == MOVEMENT_UNIT_PPT ||
                                 height->unit == MOVEMENT_UNIT_DEFAULT) {
                         // Convert to px
-                        struct sway_container *parent = con->parent;
-                        while (parent && parent->layout != L_VERT) {
-                                parent = parent->parent;
+                        struct sway_container *parent = con->pending.parent;
+                        while (parent && parent->pending.layout != L_VERT) {
+                                parent = parent->pending.parent;
                         }
                         if (parent) {
-                                height->amount = parent->height * height->amount / 100;
+                                height->amount = parent->pending.height * height->amount / 100;
                         } else {
-                                height->amount = con->workspace->height * height->amount / 100;
+                                height->amount = con->pending.workspace->height * height->amount / 100;
                         }
                         height->unit = MOVEMENT_UNIT_PX;
                 }
                 if (height->unit == MOVEMENT_UNIT_PX) {
                         container_resize_tiled(con, AXIS_VERTICAL,
-                                        height->amount - con->height);
+                                        height->amount - con->pending.height);
                 }
         }
 
@@ -339,15 +339,15 @@ static struct cmd_results *resize_set_floating(struct sway_container *con,
                                                 "Cannot resize a hidden scratchpad container by ppt");
                         }
                         // Convert to px
-                        width->amount = con->workspace->width * width->amount / 100;
+                        width->amount = con->pending.workspace->width * width->amount / 100;
                         width->unit = MOVEMENT_UNIT_PX;
                         // Falls through
                 case MOVEMENT_UNIT_PX:
                 case MOVEMENT_UNIT_DEFAULT:
                         width->amount = fmax(min_width, fmin(width->amount, max_width));
-                        grow_width = width->amount - con->width;
-                        con->x -= grow_width / 2;
-                        con->width = width->amount;
+                        grow_width = width->amount - con->pending.width;
+                        con->pending.x -= grow_width / 2;
+                        con->pending.width = width->amount;
                         break;
                 case MOVEMENT_UNIT_INVALID:
                         sway_assert(false, "invalid width unit");
@@ -363,15 +363,15 @@ static struct cmd_results *resize_set_floating(struct sway_container *con,
                                                 "Cannot resize a hidden scratchpad container by ppt");
                         }
                         // Convert to px
-                        height->amount = con->workspace->height * height->amount / 100;
+                        height->amount = con->pending.workspace->height * height->amount / 100;
                         height->unit = MOVEMENT_UNIT_PX;
                         // Falls through
                 case MOVEMENT_UNIT_PX:
                 case MOVEMENT_UNIT_DEFAULT:
                         height->amount = fmax(min_height, fmin(height->amount, max_height));
-                        grow_height = height->amount - con->height;
-                        con->y -= grow_height / 2;
-                        con->height = height->amount;
+                        grow_height = height->amount - con->pending.height;
+                        con->pending.y -= grow_height / 2;
+                        con->pending.height = height->amount;
                         break;
                 case MOVEMENT_UNIT_INVALID:
                         sway_assert(false, "invalid height unit");
@@ -379,10 +379,10 @@ static struct cmd_results *resize_set_floating(struct sway_container *con,
                 }
         }
 
-        con->content_x -= grow_width / 2;
-        con->content_y -= grow_height / 2;
-        con->content_width += grow_width;
-        con->content_height += grow_height;
+        con->pending.content_x -= grow_width / 2;
+        con->pending.content_y -= grow_height / 2;
+        con->pending.content_width += grow_width;
+        con->pending.content_height += grow_height;
 
         arrange_container(con);
 
@@ -437,10 +437,10 @@ static struct cmd_results *cmd_resize_set(int argc, char **argv) {
         // If 0, don't resize that dimension
         struct sway_container *con = config->handler_context.container;
         if (width.amount <= 0) {
-                width.amount = con->width;
+                width.amount = con->pending.width;
         }
         if (height.amount <= 0) {
-                height.amount = con->height;
+                height.amount = con->pending.height;
         }
 
         if (container_is_floating(con)) {
diff --git a/sway/commands/scratchpad.c b/sway/commands/scratchpad.c
index 34871bc6..c995f2f0 100644
--- a/sway/commands/scratchpad.c
+++ b/sway/commands/scratchpad.c
@@ -21,8 +21,8 @@ static void scratchpad_toggle_auto(void) {
         // If the focus is in a floating split container,
         // operate on the split container instead of the child.
         if (focus && container_is_floating_or_child(focus)) {
-                while (focus->parent) {
-                        focus = focus->parent;
+                while (focus->pending.parent) {
+                        focus = focus->pending.parent;
                 }
         }
 
@@ -52,7 +52,7 @@ static void scratchpad_toggle_auto(void) {
         // In this case we move it to the current workspace.
         for (int i = 0; i < root->scratchpad->length; ++i) {
                 struct sway_container *con = root->scratchpad->items[i];
-                if (con->parent) {
+                if (con->pending.parent) {
                         sway_log(SWAY_DEBUG,
                                         "Moving a visible scratchpad window (%s) to this workspace",
                                         con->title);
@@ -80,7 +80,7 @@ static void scratchpad_toggle_container(struct sway_container *con) {
         struct sway_seat *seat = input_manager_current_seat();
         struct sway_workspace *ws = seat_get_focused_workspace(seat);
         // Check if it matches a currently visible scratchpad window and hide it.
-        if (con->workspace && ws == con->workspace) {
+        if (con->pending.workspace && ws == con->pending.workspace) {
                 root_scratchpad_hide(con);
                 return;
         }
@@ -105,21 +105,22 @@ struct cmd_results *cmd_scratchpad(int argc, char **argv) {
                 return cmd_results_new(CMD_INVALID, "Scratchpad is empty");
         }
 
-        if (config->handler_context.using_criteria) {
+        if (config->handler_context.node_overridden) {
                 struct sway_container *con = config->handler_context.container;
 
                 // If the container is in a floating split container,
                 // operate on the split container instead of the child.
-                if (container_is_floating_or_child(con)) {
-                        while (con->parent) {
-                                con = con->parent;
+                if (con && container_is_floating_or_child(con)) {
+                        while (con->pending.parent) {
+                                con = con->pending.parent;
                         }
                 }
 
                 // If using criteria, this command is executed for every container which
                 // matches the criteria. If this container isn't in the scratchpad,
-                // we'll just silently return a success.
-                if (!con->scratchpad) {
+                // we'll just silently return a success. The same is true if the
+                // overridden node is not a container.
+                if (!con || !con->scratchpad) {
                         return cmd_results_new(CMD_SUCCESS, NULL);
                 }
                 scratchpad_toggle_container(con);
diff --git a/sway/commands/seat.c b/sway/commands/seat.c
index 84c6ba53..2d197b69 100644
--- a/sway/commands/seat.c
+++ b/sway/commands/seat.c
@@ -8,13 +8,13 @@
 
 // must be in order for the bsearch
 // these handlers perform actions on the seat
-static struct cmd_handler seat_action_handlers[] = {
+static const struct cmd_handler seat_action_handlers[] = {
         { "cursor", seat_cmd_cursor },
 };
 
 // must be in order for the bsearch
 // these handlers alter the seat config
-static struct cmd_handler seat_handlers[] = {
+static const struct cmd_handler seat_handlers[] = {
         { "attach", seat_cmd_attach },
         { "fallback", seat_cmd_fallback },
         { "hide_cursor", seat_cmd_hide_cursor },
diff --git a/sway/commands/seat/attach.c b/sway/commands/seat/attach.c
index 7615eef9..00bfdab6 100644
--- a/sway/commands/seat/attach.c
+++ b/sway/commands/seat/attach.c
@@ -12,7 +12,7 @@ struct cmd_results *seat_cmd_attach(int argc, char **argv) {
         if (!config->handler_context.seat_config) {
                 return cmd_results_new(CMD_FAILURE, "No seat defined");
         }
-        if (config->reading) {
+        if (!config->active) {
                 return cmd_results_new(CMD_DEFER, NULL);
         }
 
diff --git a/sway/commands/smart_gaps.c b/sway/commands/smart_gaps.c
index b27f9ccd..a6d165dc 100644
--- a/sway/commands/smart_gaps.c
+++ b/sway/commands/smart_gaps.c
@@ -15,7 +15,12 @@ struct cmd_results *cmd_smart_gaps(int argc, char **argv) {
                 return error;
         }
 
-        config->smart_gaps = parse_boolean(argv[0], config->smart_gaps);
+        if (strcmp(argv[0], "inverse_outer") == 0) {
+                config->smart_gaps = SMART_GAPS_INVERSE_OUTER;
+        } else {
+                config->smart_gaps = parse_boolean(argv[0], config->smart_gaps)
+                        ? SMART_GAPS_ON : SMART_GAPS_OFF;
+        }
 
         arrange_root();
 
diff --git a/sway/commands/split.c b/sway/commands/split.c
index 782bab02..c8a2cfc1 100644
--- a/sway/commands/split.c
+++ b/sway/commands/split.c
@@ -14,7 +14,7 @@ static struct cmd_results *do_split(int layout) {
         struct sway_workspace *ws = config->handler_context.workspace;
         if (con) {
                 if (container_is_scratchpad_hidden_or_child(con) &&
-                                con->fullscreen_mode != FULLSCREEN_GLOBAL) {
+                                con->pending.fullscreen_mode != FULLSCREEN_GLOBAL) {
                         return cmd_results_new(CMD_FAILURE,
                                         "Cannot split a hidden scratchpad container");
                 }
@@ -32,6 +32,24 @@ static struct cmd_results *do_split(int layout) {
         return cmd_results_new(CMD_SUCCESS, NULL);
 }
 
+static struct cmd_results *do_unsplit() {
+        struct sway_container *con = config->handler_context.container;
+        struct sway_workspace *ws = config->handler_context.workspace;
+
+        if (con && con->pending.parent && con->pending.parent->pending.children->length == 1) {
+                container_flatten(con->pending.parent);
+        } else {
+                return cmd_results_new(CMD_FAILURE, "Can only flatten a child container with no siblings");
+        }
+
+        if (root->fullscreen_global) {
+                arrange_root();
+        } else {
+                arrange_workspace(ws);
+        }
+        return cmd_results_new(CMD_SUCCESS, NULL);
+}
+
 struct cmd_results *cmd_split(int argc, char **argv) {
         struct cmd_results *error = NULL;
         if ((error = checkarg(argc, "split", EXPECTED_EQUAL_TO, 1))) {
@@ -55,6 +73,9 @@ struct cmd_results *cmd_split(int argc, char **argv) {
                 } else {
                         return do_split(L_VERT);
                 }
+        } else if (strcasecmp(argv[0], "n") == 0 ||
+                        strcasecmp(argv[0], "none") == 0) {
+                return do_unsplit();
         } else {
                 return cmd_results_new(CMD_FAILURE,
                         "Invalid split command (expected either horizontal or vertical).");
diff --git a/sway/commands/sticky.c b/sway/commands/sticky.c
index 3c93a276..9b09a0f9 100644
--- a/sway/commands/sticky.c
+++ b/sway/commands/sticky.c
@@ -29,14 +29,14 @@ struct cmd_results *cmd_sticky(int argc, char **argv) {
                         !container_is_scratchpad_hidden(container)) {
                 // move container to active workspace
                 struct sway_workspace *active_workspace =
-                        output_get_active_workspace(container->workspace->output);
+                        output_get_active_workspace(container->pending.workspace->output);
                 if (!sway_assert(active_workspace,
                                         "Expected output to have a workspace")) {
                         return cmd_results_new(CMD_FAILURE,
                                         "Expected output to have a workspace");
                 }
-                if (container->workspace != active_workspace) {
-                        struct sway_workspace *old_workspace = container->workspace;
+                if (container->pending.workspace != active_workspace) {
+                        struct sway_workspace *old_workspace = container->pending.workspace;
                         container_detach(container);
                         workspace_add_floating(active_workspace, container);
                         container_handle_fullscreen_reparent(container);
diff --git a/sway/commands/swap.c b/sway/commands/swap.c
index a7f9691b..ce5e5128 100644
--- a/sway/commands/swap.c
+++ b/sway/commands/swap.c
@@ -16,46 +16,46 @@ static const char expected_syntax[] =
 static void swap_places(struct sway_container *con1,
                 struct sway_container *con2) {
         struct sway_container *temp = malloc(sizeof(struct sway_container));
-        temp->x = con1->x;
-        temp->y = con1->y;
-        temp->width = con1->width;
-        temp->height = con1->height;
+        temp->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->parent = con1->parent;
-        temp->workspace = con1->workspace;
+        temp->pending.parent = con1->pending.parent;
+        temp->pending.workspace = con1->pending.workspace;
         bool temp_floating = container_is_floating(con1);
 
-        con1->x = con2->x;
-        con1->y = con2->y;
-        con1->width = con2->width;
-        con1->height = con2->height;
+        con1->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->x = temp->x;
-        con2->y = temp->y;
-        con2->width = temp->width;
-        con2->height = temp->height;
+        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->parent) {
-                container_insert_child(con2->parent, 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->workspace, con1);
+                workspace_add_floating(con2->pending.workspace, con1);
         } else {
-                workspace_insert_tiling(con2->workspace, con1,
+                workspace_insert_tiling(con2->pending.workspace, con1,
                                 container_sibling_index(con2));
         }
-        if (temp->parent) {
-                container_insert_child(temp->parent, con2, temp_index);
+        if (temp->pending.parent) {
+                container_insert_child(temp->pending.parent, con2, temp_index);
         } else if (temp_floating) {
-                workspace_add_floating(temp->workspace, con2);
+                workspace_add_floating(temp->pending.workspace, con2);
         } else {
-                workspace_insert_tiling(temp->workspace, con2, temp_index);
+                workspace_insert_tiling(temp->pending.workspace, con2, temp_index);
         }
 
         free(temp);
@@ -65,8 +65,8 @@ static void swap_focus(struct sway_container *con1,
                 struct sway_container *con2, struct sway_seat *seat,
                 struct sway_container *focus) {
         if (focus == con1 || focus == con2) {
-                struct sway_workspace *ws1 = con1->workspace;
-                struct sway_workspace *ws2 = con2->workspace;
+                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)) {
@@ -125,8 +125,8 @@ void container_swap(struct sway_container *con1, struct sway_container *con2) {
                 root_scratchpad_remove_container(con2);
         }
 
-        enum sway_fullscreen_mode fs1 = con1->fullscreen_mode;
-        enum sway_fullscreen_mode fs2 = con2->fullscreen_mode;
+        enum sway_fullscreen_mode fs1 = con1->pending.fullscreen_mode;
+        enum sway_fullscreen_mode fs2 = con2->pending.fullscreen_mode;
         if (fs1) {
                 container_fullscreen_disable(con1);
         }
@@ -137,9 +137,9 @@ void container_swap(struct sway_container *con1, struct sway_container *con2) {
         struct sway_seat *seat = config->handler_context.seat;
         struct sway_container *focus = seat_get_focused_container(seat);
         struct sway_workspace *vis1 =
-                output_get_active_workspace(con1->workspace->output);
+                output_get_active_workspace(con1->pending.workspace->output);
         struct sway_workspace *vis2 =
-                output_get_active_workspace(con2->workspace->output);
+                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;
diff --git a/sway/commands/title_format.c b/sway/commands/title_format.c
index 9d312470..a2446b7e 100644
--- a/sway/commands/title_format.c
+++ b/sway/commands/title_format.c
@@ -23,6 +23,5 @@ struct cmd_results *cmd_title_format(int argc, char **argv) {
         }
         view->title_format = format;
         view_update_title(view, true);
-        config_update_font_height(true);
         return cmd_results_new(CMD_SUCCESS, NULL);
 }
diff --git a/sway/commands/unmark.c b/sway/commands/unmark.c
index cedfcfb2..19274dfb 100644
--- a/sway/commands/unmark.c
+++ b/sway/commands/unmark.c
@@ -21,7 +21,7 @@ static void remove_all_marks_iterator(struct sway_container *con, void *data) {
 struct cmd_results *cmd_unmark(int argc, char **argv) {
         // Determine the container
         struct sway_container *con = NULL;
-        if (config->handler_context.using_criteria) {
+        if (config->handler_context.node_overridden) {
                 con = config->handler_context.container;
         }
 
diff --git a/sway/commands/workspace.c b/sway/commands/workspace.c
index 9ff1c97d..79f3667a 100644
--- a/sway/commands/workspace.c
+++ b/sway/commands/workspace.c
@@ -182,21 +182,16 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
                                 "Can't switch workspaces while fullscreen global");
                 }
 
-                bool no_auto_back_and_forth = false;
+                bool auto_back_and_forth = true;
                 while (strcasecmp(argv[0], "--no-auto-back-and-forth") == 0) {
-                        no_auto_back_and_forth = true;
+                        auto_back_and_forth = false;
                         if ((error = checkarg(--argc, "workspace", EXPECTED_AT_LEAST, 1))) {
                                 return error;
                         }
                         ++argv;
                 }
 
-                bool create = argc > 1 && strcasecmp(argv[1], "--create") == 0;
                 struct sway_seat *seat = config->handler_context.seat;
-                struct sway_workspace *current = seat_get_focused_workspace(seat);
-                if (!current) {
-                        return cmd_results_new(CMD_FAILURE, "No workspace to switch from");
-                }
 
                 struct sway_workspace *ws = NULL;
                 if (strcasecmp(argv[0], "number") == 0) {
@@ -213,14 +208,15 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
                                 ws = workspace_create(NULL, name);
                                 free(name);
                         }
+                        if (ws && auto_back_and_forth) {
+                                ws = workspace_auto_back_and_forth(ws);
+                        }
                 } else if (strcasecmp(argv[0], "next") == 0 ||
                                 strcasecmp(argv[0], "prev") == 0 ||
+                                strcasecmp(argv[0], "next_on_output") == 0 ||
+                                strcasecmp(argv[0], "prev_on_output") == 0 ||
                                 strcasecmp(argv[0], "current") == 0) {
                         ws = workspace_by_name(argv[0]);
-                } else if (strcasecmp(argv[0], "next_on_output") == 0) {
-                        ws = workspace_output_next(current, create);
-                } else if (strcasecmp(argv[0], "prev_on_output") == 0) {
-                        ws = workspace_output_prev(current, create);
                 } else if (strcasecmp(argv[0], "back_and_forth") == 0) {
                         if (!seat->prev_workspace_name) {
                                 return cmd_results_new(CMD_INVALID,
@@ -235,11 +231,14 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
                                 ws = workspace_create(NULL, name);
                         }
                         free(name);
+                        if (ws && auto_back_and_forth) {
+                                ws = workspace_auto_back_and_forth(ws);
+                        }
                 }
                 if (!ws) {
                         return cmd_results_new(CMD_FAILURE, "No workspace to switch to");
                 }
-                workspace_switch(ws, no_auto_back_and_forth);
+                workspace_switch(ws);
                 seat_consider_warp_to_focus(seat);
         }
         return cmd_results_new(CMD_SUCCESS, NULL);
diff --git a/sway/config.c b/sway/config.c
index 6e665434..e4745a5c 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -26,7 +26,7 @@
 #include "sway/tree/arrange.h"
 #include "sway/tree/root.h"
 #include "sway/tree/workspace.h"
-#include "cairo.h"
+#include "cairo_util.h"
 #include "pango.h"
 #include "stringop.h"
 #include "list.h"
@@ -236,7 +236,6 @@ static void config_defaults(struct sway_config *config) {
         config->default_layout = L_NONE;
         config->default_orientation = L_NONE;
         if (!(config->font = strdup("monospace 10"))) goto cleanup;
-        config->font_height = 17; // height of monospace 10
         config->urgent_timeout = 500;
         config->focus_on_window_activation = FOWA_URGENT;
         config->popup_during_fullscreen = POPUP_SMART;
@@ -267,7 +266,7 @@ static void config_defaults(struct sway_config *config) {
         config->tiling_drag = true;
         config->tiling_drag_threshold = 9;
 
-        config->smart_gaps = false;
+        config->smart_gaps = SMART_GAPS_OFF;
         config->gaps_inner = 0;
         config->gaps_outer.top = 0;
         config->gaps_outer.right = 0;
@@ -291,6 +290,8 @@ static void config_defaults(struct sway_config *config) {
         config->hide_edge_borders_smart = ESMART_OFF;
         config->hide_lone_tab = false;
 
+        config->has_focused_tab_title = false;
+
         // border colors
         color_to_rgba(config->border_colors.focused.border, 0x4C7899FF);
         color_to_rgba(config->border_colors.focused.background, 0x285577FF);
@@ -338,35 +339,62 @@ static bool file_exists(const char *path) {
         return path && access(path, R_OK) != -1;
 }
 
+static char *config_path(const char *prefix, const char *config_folder) {
+        if (!prefix || !prefix[0] || !config_folder || !config_folder[0]) {
+                return NULL;
+        }
+
+        const char *filename = "config";
+
+        size_t size = 3 + strlen(prefix) + strlen(config_folder) + strlen(filename);
+        char *path = calloc(size, sizeof(char));
+        snprintf(path, size, "%s/%s/%s", prefix, config_folder, filename);
+        return path;
+}
+
 static char *get_config_path(void) {
-        static const char *config_paths[] = {
-                "$HOME/.sway/config",
-                "$XDG_CONFIG_HOME/sway/config",
-                "$HOME/.i3/config",
-                "$XDG_CONFIG_HOME/i3/config",
-                SYSCONFDIR "/sway/config",
-                SYSCONFDIR "/i3/config",
+        char *path = NULL;
+        const char *home = getenv("HOME");
+        char *config_home_fallback = NULL;
+
+        const char *config_home = getenv("XDG_CONFIG_HOME");
+        if ((config_home == NULL || config_home[0] == '\0') && home != NULL) {
+                size_t size_fallback = 1 + strlen(home) + strlen("/.config");
+                config_home_fallback = calloc(size_fallback, sizeof(char));
+                if (config_home_fallback != NULL)
+                        snprintf(config_home_fallback, size_fallback, "%s/.config", home);
+                config_home = config_home_fallback;
+        }
+
+        struct config_path {
+                const char *prefix;
+                const char *config_folder;
         };
 
-        char *config_home = getenv("XDG_CONFIG_HOME");
-        if (!config_home || !*config_home) {
-                config_paths[1] = "$HOME/.config/sway/config";
-                config_paths[3] = "$HOME/.config/i3/config";
-        }
+        struct config_path config_paths[] = {
+                { .prefix = home, .config_folder = ".sway"},
+                { .prefix = config_home, .config_folder = "sway"},
+                { .prefix = home, .config_folder = ".i3"},
+                { .prefix = config_home, .config_folder = "i3"},
+                { .prefix = SYSCONFDIR, .config_folder = "sway"},
+                { .prefix = SYSCONFDIR, .config_folder = "i3"}
+        };
 
-        for (size_t i = 0; i < sizeof(config_paths) / sizeof(char *); ++i) {
-                wordexp_t p;
-                if (wordexp(config_paths[i], &p, WRDE_UNDEF) == 0) {
-                        char *path = strdup(p.we_wordv[0]);
-                        wordfree(&p);
-                        if (file_exists(path)) {
-                                return path;
-                        }
-                        free(path);
+        size_t num_config_paths = sizeof(config_paths)/sizeof(config_paths[0]);
+        for (size_t i = 0; i < num_config_paths; i++) {
+                path = config_path(config_paths[i].prefix, config_paths[i].config_folder);
+                if (!path) {
+                        continue;
+                }
+                if (file_exists(path)) {
+                        break;
                 }
+                free(path);
+                path = NULL;
         }
 
-        return NULL;
+        free(config_home_fallback);
+        return path;
 }
 
 static bool load_config(const char *path, struct sway_config *config,
@@ -514,6 +542,9 @@ bool load_main_config(const char *file, bool is_active, bool validating) {
                 return success;
         }
 
+        // Only really necessary if not explicitly `font` is set in the config.
+        config_update_font_height();
+
         if (is_active && !validating) {
                 input_manager_verify_fallback_seat();
 
@@ -964,31 +995,11 @@ int workspace_output_cmp_workspace(const void *a, const void *b) {
         return lenient_strcmp(wsa->workspace, wsb->workspace);
 }
 
-static void find_font_height_iterator(struct sway_container *con, void *data) {
-        size_t amount_below_baseline = con->title_height - con->title_baseline;
-        size_t extended_height = config->font_baseline + amount_below_baseline;
-        if (extended_height > config->font_height) {
-                config->font_height = extended_height;
-        }
-}
-
-static void find_baseline_iterator(struct sway_container *con, void *data) {
-        bool *recalculate = data;
-        if (*recalculate) {
-                container_calculate_title_height(con);
-        }
-        if (con->title_baseline > config->font_baseline) {
-                config->font_baseline = con->title_baseline;
-        }
-}
 
-void config_update_font_height(bool recalculate) {
-        size_t prev_max_height = config->font_height;
-        config->font_height = 0;
-        config->font_baseline = 0;
+void config_update_font_height(void) {
+        int prev_max_height = config->font_height;
 
-        root_for_each_container(find_baseline_iterator, &recalculate);
-        root_for_each_container(find_font_height_iterator, NULL);
+        get_text_metrics(config->font, &config->font_height, &config->font_baseline);
 
         if (config->font_height != prev_max_height) {
                 arrange_root();
diff --git a/sway/config/bar.c b/sway/config/bar.c
index 767534a6..d1b342e6 100644
--- a/sway/config/bar.c
+++ b/sway/config/bar.c
@@ -91,7 +91,7 @@ struct bar_config *default_bar_config(void) {
         }
         bar->outputs = NULL;
         bar->position = strdup("bottom");
-        bar->pango_markup = false;
+        bar->pango_markup = PANGO_MARKUP_DEFAULT;
         bar->swaybar_command = NULL;
         bar->font = NULL;
         bar->height = 0;
@@ -217,6 +217,9 @@ static void invoke_swaybar(struct bar_config *bar) {
                 sigset_t set;
                 sigemptyset(&set);
                 sigprocmask(SIG_SETMASK, &set, NULL);
+                signal(SIGPIPE, SIG_DFL);
+
+                restore_nofile_limit();
 
                 pid = fork();
                 if (pid < 0) {
diff --git a/sway/config/output.c b/sway/config/output.c
index c9ec6745..fa509252 100644
--- a/sway/config/output.c
+++ b/sway/config/output.c
@@ -1,5 +1,6 @@
 #define _POSIX_C_SOURCE 200809L
 #include <assert.h>
+#include <drm_fourcc.h>
 #include <stdbool.h>
 #include <string.h>
 #include <sys/socket.h>
@@ -8,6 +9,7 @@
 #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 "sway/config.h"
 #include "sway/input/cursor.h"
 #include "sway/output.h"
@@ -58,6 +60,7 @@ struct output_config *new_output_config(const char *name) {
         oc->width = oc->height = -1;
         oc->refresh_rate = -1;
         oc->custom_mode = -1;
+        oc->drm_mode.type = -1;
         oc->x = oc->y = -1;
         oc->scale = -1;
         oc->scale_filter = SCALE_FILTER_DEFAULT;
@@ -65,6 +68,7 @@ struct output_config *new_output_config(const char *name) {
         oc->subpixel = WL_OUTPUT_SUBPIXEL_UNKNOWN;
         oc->max_render_time = -1;
         oc->adaptive_sync = -1;
+        oc->render_bit_depth = RENDER_BIT_DEPTH_DEFAULT;
         return oc;
 }
 
@@ -99,6 +103,9 @@ void merge_output_config(struct output_config *dst, struct output_config *src) {
         if (src->custom_mode != -1) {
                 dst->custom_mode = src->custom_mode;
         }
+        if (src->drm_mode.type != (uint32_t) -1) {
+                memcpy(&dst->drm_mode, &src->drm_mode, sizeof(src->drm_mode));
+        }
         if (src->transform != -1) {
                 dst->transform = src->transform;
         }
@@ -108,6 +115,9 @@ void merge_output_config(struct output_config *dst, struct output_config *src) {
         if (src->adaptive_sync != -1) {
                 dst->adaptive_sync = src->adaptive_sync;
         }
+        if (src->render_bit_depth != RENDER_BIT_DEPTH_DEFAULT) {
+                dst->render_bit_depth = src->render_bit_depth;
+        }
         if (src->background) {
                 free(dst->background);
                 dst->background = strdup(src->background);
@@ -271,6 +281,18 @@ static void set_mode(struct wlr_output *output, int width, int height,
         wlr_output_set_mode(output, best);
 }
 
+static void set_modeline(struct wlr_output *output, drmModeModeInfo *drm_mode) {
+        if (!wlr_output_is_drm(output)) {
+                sway_log(SWAY_ERROR, "Modeline can only be set to DRM output");
+                return;
+        }
+        sway_log(SWAY_DEBUG, "Assigning custom modeline to %s", output->name);
+        struct wlr_output_mode *mode = wlr_drm_connector_add_mode(output, drm_mode);
+        if (mode) {
+                wlr_output_set_mode(output, mode);
+        }
+}
+
 /* Some manufacturers hardcode the aspect-ratio of the output in the physical
  * size field. */
 static bool phys_size_is_aspect_ratio(struct wlr_output *output) {
@@ -334,9 +356,26 @@ static int compute_default_scale(struct wlr_output *output) {
         return 2;
 }
 
+/* Lists of formats to try, in order, when a specific render bit depth has
+ * been asked for. The second to last format in each list should always
+ * be XRGB8888, as a reliable backup in case the others are not available;
+ * the last should be DRM_FORMAT_INVALID, to indicate the end of the list. */
+static const uint32_t *bit_depth_preferences[] = {
+        [RENDER_BIT_DEPTH_8] = (const uint32_t []){
+                DRM_FORMAT_XRGB8888,
+                DRM_FORMAT_INVALID,
+        },
+        [RENDER_BIT_DEPTH_10] = (const uint32_t []){
+                DRM_FORMAT_XRGB2101010,
+                DRM_FORMAT_XBGR2101010,
+                DRM_FORMAT_XRGB8888,
+                DRM_FORMAT_INVALID,
+        },
+};
+
 static void queue_output_config(struct output_config *oc,
                 struct sway_output *output) {
-        if (output == root->noop_output) {
+        if (output == root->fallback_output) {
                 return;
         }
 
@@ -351,14 +390,36 @@ static void queue_output_config(struct output_config *oc,
         sway_log(SWAY_DEBUG, "Turning on output %s", wlr_output->name);
         wlr_output_enable(wlr_output, true);
 
-        if (oc && oc->width > 0 && oc->height > 0) {
+        if (oc && oc->drm_mode.type != 0 && oc->drm_mode.type != (uint32_t) -1) {
+                sway_log(SWAY_DEBUG, "Set %s modeline",
+                        wlr_output->name);
+                set_modeline(wlr_output, &oc->drm_mode);
+        } else if (oc && oc->width > 0 && oc->height > 0) {
                 sway_log(SWAY_DEBUG, "Set %s mode to %dx%d (%f Hz)",
                         wlr_output->name, oc->width, oc->height, oc->refresh_rate);
                 set_mode(wlr_output, oc->width, oc->height,
                         oc->refresh_rate, oc->custom_mode == 1);
         } else if (!wl_list_empty(&wlr_output->modes)) {
-                struct wlr_output_mode *mode = wlr_output_preferred_mode(wlr_output);
-                wlr_output_set_mode(wlr_output, mode);
+                sway_log(SWAY_DEBUG, "Set preferred mode");
+                struct wlr_output_mode *preferred_mode =
+                        wlr_output_preferred_mode(wlr_output);
+                wlr_output_set_mode(wlr_output, preferred_mode);
+
+                if (!wlr_output_test(wlr_output)) {
+                        sway_log(SWAY_DEBUG, "Preferred mode rejected, "
+                                "falling back to another mode");
+                        struct wlr_output_mode *mode;
+                        wl_list_for_each(mode, &wlr_output->modes, link) {
+                                if (mode == preferred_mode) {
+                                        continue;
+                                }
+
+                                wlr_output_set_mode(wlr_output, mode);
+                                if (wlr_output_test(wlr_output)) {
+                                        break;
+                                }
+                        }
+                }
         }
 
         if (oc && (oc->subpixel != WL_OUTPUT_SUBPIXEL_UNKNOWN || config->reloading)) {
@@ -367,9 +428,16 @@ static void queue_output_config(struct output_config *oc,
                 wlr_output_set_subpixel(wlr_output, oc->subpixel);
         }
 
+        enum wl_output_transform tr = WL_OUTPUT_TRANSFORM_NORMAL;
         if (oc && oc->transform >= 0) {
-                sway_log(SWAY_DEBUG, "Set %s transform to %d", oc->name, oc->transform);
-                wlr_output_set_transform(wlr_output, oc->transform);
+                tr = oc->transform;
+        } 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);
+        }
+        if (wlr_output->transform != tr) {
+                sway_log(SWAY_DEBUG, "Set %s transform to %d", oc->name, tr);
+                wlr_output_set_transform(wlr_output, tr);
         }
 
         // Apply the scale last before the commit, because the scale auto-detection
@@ -391,10 +459,26 @@ static void queue_output_config(struct output_config *oc,
                         oc->adaptive_sync);
                 wlr_output_enable_adaptive_sync(wlr_output, oc->adaptive_sync == 1);
         }
+
+        if (oc && oc->render_bit_depth != RENDER_BIT_DEPTH_DEFAULT) {
+                const uint32_t *fmts = bit_depth_preferences[oc->render_bit_depth];
+                assert(fmts);
+
+                for (size_t i = 0; fmts[i] != DRM_FORMAT_INVALID; i++) {
+                        wlr_output_set_render_format(wlr_output, fmts[i]);
+                        if (wlr_output_test(wlr_output)) {
+                                break;
+                        }
+
+                        sway_log(SWAY_DEBUG, "Preferred output format 0x%08x "
+                                "failed to work, falling back to next in "
+                                "list, 0x%08x", fmts[i], fmts[i + 1]);
+                }
+        }
 }
 
 bool apply_output_config(struct output_config *oc, struct sway_output *output) {
-        if (output == root->noop_output) {
+        if (output == root->fallback_output) {
                 return false;
         }
 
@@ -483,11 +567,13 @@ bool apply_output_config(struct output_config *oc, struct sway_output *output) {
         // 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->noop_output) {
+        if (output == root->fallback_output) {
                 return false;
         }
 
@@ -702,6 +788,8 @@ static bool _spawn_swaybg(char **command) {
                 sway_log_errno(SWAY_ERROR, "fork failed");
                 return false;
         } else if (pid == 0) {
+                restore_nofile_limit();
+
                 pid = fork();
                 if (pid < 0) {
                         sway_log_errno(SWAY_ERROR, "fork failed");
diff --git a/sway/criteria.c b/sway/criteria.c
index 409160c5..d2a5566f 100644
--- a/sway/criteria.c
+++ b/sway/criteria.c
@@ -351,7 +351,7 @@ static bool criteria_matches_view(struct criteria *criteria,
         }
 
         if (criteria->workspace) {
-                struct sway_workspace *ws = view->container->workspace;
+                struct sway_workspace *ws = view->container->pending.workspace;
                 if (!ws) {
                         return false;
                 }
@@ -359,7 +359,7 @@ static bool criteria_matches_view(struct criteria *criteria,
                 switch (criteria->workspace->match_type) {
                 case PATTERN_FOCUSED:
                         if (focused &&
-                                        strcmp(ws->name, focused->container->workspace->name)) {
+                                        strcmp(ws->name, focused->container->pending.workspace->name)) {
                                 return false;
                         }
                         break;
diff --git a/sway/desktop/idle_inhibit_v1.c b/sway/desktop/idle_inhibit_v1.c
index a5cfd5b2..82353038 100644
--- a/sway/desktop/idle_inhibit_v1.c
+++ b/sway/desktop/idle_inhibit_v1.c
@@ -36,7 +36,7 @@ void handle_idle_inhibitor_v1(struct wl_listener *listener, void *data) {
 
         inhibitor->manager = manager;
         inhibitor->mode = INHIBIT_IDLE_APPLICATION;
-        inhibitor->view = view_from_wlr_surface(wlr_inhibitor->surface);
+        inhibitor->wlr_inhibitor = wlr_inhibitor;
         wl_list_insert(&manager->inhibitors, &inhibitor->link);
 
         inhibitor->destroy.notify = handle_destroy;
@@ -69,8 +69,8 @@ struct sway_idle_inhibitor_v1 *sway_idle_inhibit_v1_user_inhibitor_for_view(
         struct sway_idle_inhibitor_v1 *inhibitor;
         wl_list_for_each(inhibitor, &server.idle_inhibit_manager_v1->inhibitors,
                         link) {
-                if (inhibitor->view == view &&
-                                inhibitor->mode != INHIBIT_IDLE_APPLICATION) {
+                if (inhibitor->mode != INHIBIT_IDLE_APPLICATION &&
+                                inhibitor->view == view) {
                         return inhibitor;
                 }
         }
@@ -82,8 +82,8 @@ struct sway_idle_inhibitor_v1 *sway_idle_inhibit_v1_application_inhibitor_for_vi
         struct sway_idle_inhibitor_v1 *inhibitor;
         wl_list_for_each(inhibitor, &server.idle_inhibit_manager_v1->inhibitors,
                         link) {
-                if (inhibitor->view == view &&
-                                inhibitor->mode == INHIBIT_IDLE_APPLICATION) {
+                if (inhibitor->mode == INHIBIT_IDLE_APPLICATION &&
+                                view_from_wlr_surface(inhibitor->wlr_inhibitor->surface) == view) {
                         return inhibitor;
                 }
         }
@@ -104,10 +104,10 @@ void sway_idle_inhibit_v1_user_inhibitor_destroy(
 
 bool sway_idle_inhibit_v1_is_active(struct sway_idle_inhibitor_v1 *inhibitor) {
         switch (inhibitor->mode) {
-        case INHIBIT_IDLE_APPLICATION:
+        case INHIBIT_IDLE_APPLICATION:;
                 // If there is no view associated with the inhibitor, assume visible
-                return !inhibitor->view || !inhibitor->view->container ||
-                        view_is_visible(inhibitor->view);
+                struct sway_view *view = view_from_wlr_surface(inhibitor->wlr_inhibitor->surface);
+                return !view || !view->container || view_is_visible(view);
         case INHIBIT_IDLE_FOCUS:;
                 struct sway_seat *seat = NULL;
                 wl_list_for_each(seat, &server.input->seats, link) {
diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c
index d4ca4fb4..1250415e 100644
--- a/sway/desktop/layer_shell.c
+++ b/sway/desktop/layer_shell.c
@@ -2,10 +2,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wayland-server-core.h>
-#include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_layer_shell_v1.h>
 #include <wlr/types/wlr_output_damage.h>
 #include <wlr/types/wlr_output.h>
+#include <wlr/types/wlr_subcompositor.h>
 #include "log.h"
 #include "sway/desktop/transaction.h"
 #include "sway/input/cursor.h"
@@ -115,9 +115,10 @@ static void arrange_layer(struct sway_output *output, struct wl_list *list,
                 // Horizontal axis
                 const uint32_t both_horiz = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT
                         | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
-                if ((state->anchor & both_horiz) && box.width == 0) {
+                if (box.width == 0) {
                         box.x = bounds.x;
-                        box.width = bounds.width;
+                } 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)) {
@@ -128,9 +129,10 @@ static void arrange_layer(struct sway_output *output, struct wl_list *list,
                 // Vertical axis
                 const uint32_t both_vert = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP
                         | ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
-                if ((state->anchor & both_vert) && box.height == 0) {
+                if (box.height == 0) {
                         box.y = bounds.y;
-                        box.height = bounds.height;
+                } 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)) {
@@ -139,25 +141,30 @@ static void arrange_layer(struct sway_output *output, struct wl_list *list,
                         box.y = bounds.y + ((bounds.height / 2) - (box.height / 2));
                 }
                 // Margin
-                if ((state->anchor & both_horiz) == both_horiz) {
+                if (box.width == 0) {
                         box.x += state->margin.left;
-                        box.width -= state->margin.left + state->margin.right;
+                        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 ((state->anchor & both_vert) == both_vert) {
+                if (box.height == 0) {
                         box.y += state->margin.top;
-                        box.height -= state->margin.top + state->margin.bottom;
+                        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 (box.width < 0 || box.height < 0) {
-                        // TODO: Bubble up a protocol error?
-                        wlr_layer_surface_v1_close(layer);
+                if (!sway_assert(box.width >= 0 && box.height >= 0,
+                                "Expected layer surface to have positive size")) {
                         continue;
                 }
                 // Apply
@@ -191,7 +198,7 @@ void arrange_layers(struct sway_output *output) {
                 arrange_output(output);
         }
 
-        // Arrange non-exlusive surfaces from top->bottom
+        // 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],
@@ -277,7 +284,7 @@ static void handle_output_destroy(struct wl_listener *listener, void *data) {
         }
 
         sway_layer->layer_surface->output = NULL;
-        wlr_layer_surface_v1_close(sway_layer->layer_surface);
+        wlr_layer_surface_v1_destroy(sway_layer->layer_surface);
 }
 
 static void handle_surface_commit(struct wl_listener *listener, void *data) {
@@ -290,21 +297,30 @@ static void handle_surface_commit(struct wl_listener *listener, void *data) {
         }
 
         struct sway_output *output = wlr_output->data;
-        struct wlr_box old_geo = layer->geo;
-        arrange_layers(output);
-
-        bool geo_changed =
-                memcmp(&old_geo, &layer->geo, sizeof(struct wlr_box)) != 0;
-        bool layer_changed = layer->layer != layer_surface->current.layer;
-        if (layer_changed) {
-                wl_list_remove(&layer->link);
-                wl_list_insert(&output->layers[layer_surface->current.layer],
-                        &layer->link);
-                layer->layer = layer_surface->current.layer;
+        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);
         }
-        if (geo_changed || layer_changed) {
-                output_damage_surface(output, old_geo.x, old_geo.y,
-                        layer_surface->surface, true);
+
+        wlr_surface_get_extends(layer_surface->surface, &layer->extent);
+        layer->extent.x += layer->geo.x;
+        layer->extent.y += layer->geo.y;
+
+        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 {
@@ -337,6 +353,8 @@ static void unmap(struct sway_layer_surface *sway_layer) {
                 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);
@@ -345,6 +363,12 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
         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);
+        }
+
         wl_list_remove(&sway_layer->link);
         wl_list_remove(&sway_layer->destroy.link);
         wl_list_remove(&sway_layer->map.link);
@@ -413,11 +437,8 @@ static void subsurface_handle_commit(struct wl_listener *listener, void *data) {
         subsurface_damage(subsurface, false);
 }
 
-static void subsurface_handle_destroy(struct wl_listener *listener,
-                void *data) {
-        struct sway_layer_subsurface *subsurface =
-                        wl_container_of(listener, subsurface, destroy);
-
+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);
@@ -425,17 +446,25 @@ static void subsurface_handle_destroy(struct wl_listener *listener,
         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 struct sway_layer_subsurface *create_subsurface(
                 struct wlr_subsurface *wlr_subsurface,
                 struct sway_layer_surface *layer_surface) {
         struct sway_layer_subsurface *subsurface =
-                        calloc(1, sizeof(struct sway_layer_surface));
+                        calloc(1, sizeof(struct sway_layer_subsurface));
         if (subsurface == NULL) {
                 return NULL;
         }
 
         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);
@@ -468,8 +497,8 @@ static struct sway_layer_surface *popup_get_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->geometry.x - popup->base->geometry.x;
-        int popup_sy = popup->geometry.y - popup->base->geometry.y;
+        int popup_sx = popup->geometry.x - popup->base->current.geometry.x;
+        int popup_sy = popup->geometry.y - popup->base->current.geometry.y;
         int ox = popup_sx, oy = popup_sy;
         struct sway_layer_surface *layer;
         while (true) {
@@ -590,14 +619,14 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
         sway_log(SWAY_DEBUG, "new layer surface: namespace %s layer %d anchor %" PRIu32
                         " size %" PRIu32 "x%" PRIu32 " margin %" PRIu32 ",%" PRIu32 ",%" PRIu32 ",%" PRIu32 ",",
                 layer_surface->namespace,
-                layer_surface->client_pending.layer,
-                layer_surface->client_pending.anchor,
-                layer_surface->client_pending.desired_width,
-                layer_surface->client_pending.desired_height,
-                layer_surface->client_pending.margin.top,
-                layer_surface->client_pending.margin.right,
-                layer_surface->client_pending.margin.bottom,
-                layer_surface->client_pending.margin.left);
+                layer_surface->pending.layer,
+                layer_surface->pending.anchor,
+                layer_surface->pending.desired_width,
+                layer_surface->pending.desired_height,
+                layer_surface->pending.margin.top,
+                layer_surface->pending.margin.right,
+                layer_surface->pending.margin.bottom,
+                layer_surface->pending.margin.left);
 
         if (!layer_surface->output) {
                 // Assign last active output
@@ -609,12 +638,12 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
                                 output = ws->output;
                         }
                 }
-                if (!output || output == root->noop_output) {
+                if (!output || output == root->fallback_output) {
                         if (!root->outputs->length) {
                                 sway_log(SWAY_ERROR,
                                                 "no output to auto-assign layer surface '%s' to",
                                                 layer_surface->namespace);
-                                wlr_layer_surface_v1_close(layer_surface);
+                                wlr_layer_surface_v1_destroy(layer_surface);
                                 return;
                         }
                         output = root->outputs->items[0];
@@ -628,6 +657,8 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
                 return;
         }
 
+        wl_list_init(&sway_layer->subsurfaces);
+
         sway_layer->surface_commit.notify = handle_surface_commit;
         wl_signal_add(&layer_surface->surface->events.commit,
                 &sway_layer->surface_commit);
@@ -649,15 +680,15 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
 
         struct sway_output *output = layer_surface->output->data;
         sway_layer->output_destroy.notify = handle_output_destroy;
-        wl_signal_add(&output->events.destroy, &sway_layer->output_destroy);
+        wl_signal_add(&output->events.disable, &sway_layer->output_destroy);
 
-        wl_list_insert(&output->layers[layer_surface->client_pending.layer],
+        wl_list_insert(&output->layers[layer_surface->pending.layer],
                         &sway_layer->link);
 
-        // Temporarily set the layer's current state to client_pending
+        // 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->client_pending;
+        layer_surface->current = layer_surface->pending;
         arrange_layers(output);
         layer_surface->current = old_state;
 }
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 5edc8f96..852671d2 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -4,15 +4,17 @@
 #include <strings.h>
 #include <time.h>
 #include <wayland-server-core.h>
+#include <wlr/backend/drm.h>
+#include <wlr/backend/headless.h>
 #include <wlr/render/wlr_renderer.h>
-#include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_buffer.h>
+#include <wlr/types/wlr_drm_lease_v1.h>
 #include <wlr/types/wlr_matrix.h>
 #include <wlr/types/wlr_output_damage.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_presentation_time.h>
-#include <wlr/types/wlr_surface.h>
+#include <wlr/types/wlr_compositor.h>
 #include <wlr/util/region.h>
 #include "config.h"
 #include "log.h"
@@ -56,26 +58,6 @@ struct sway_output *all_output_by_name_or_id(const char *name_or_id) {
         return NULL;
 }
 
-/**
- * Rotate a child's position relative to a parent. The parent size is (pw, ph),
- * the child position is (*sx, *sy) and its size is (sw, sh).
- */
-static void rotate_child_position(double *sx, double *sy, double sw, double sh,
-                double pw, double ph, float rotation) {
-        if (rotation == 0.0f) {
-                return;
-        }
-
-        // Coordinates relative to the center of the subsurface
-        double ox = *sx - pw/2 + sw/2,
-                oy = *sy - ph/2 + sh/2;
-        // Rotated coordinates
-        double rx = cos(-rotation)*ox - sin(-rotation)*oy,
-                ry = cos(-rotation)*oy + sin(-rotation)*ox;
-        *sx = rx + pw/2 - sw/2;
-        *sy = ry + ph/2 - sh/2;
-}
-
 struct surface_iterator_data {
         sway_surface_iterator_func_t user_iterator;
         void *user_data;
@@ -84,7 +66,6 @@ struct surface_iterator_data {
         struct sway_view *view;
         double ox, oy;
         int width, height;
-        float rotation;
 };
 
 static bool get_surface_box(struct surface_iterator_data *data,
@@ -99,14 +80,9 @@ static bool get_surface_box(struct surface_iterator_data *data,
         int sw = surface->current.width;
         int sh = surface->current.height;
 
-        double _sx = sx + surface->sx;
-        double _sy = sy + surface->sy;
-        rotate_child_position(&_sx, &_sy, sw, sh, data->width, data->height,
-                data->rotation);
-
         struct wlr_box box = {
-                .x = data->ox + _sx,
-                .y = data->oy + _sy,
+                .x = floor(data->ox + sx),
+                .y = floor(data->oy + sy),
                 .width = sw,
                 .height = sh,
         };
@@ -114,16 +90,13 @@ static bool get_surface_box(struct surface_iterator_data *data,
                 memcpy(surface_box, &box, sizeof(struct wlr_box));
         }
 
-        struct wlr_box rotated_box;
-        wlr_box_rotated_bounds(&rotated_box, &box, data->rotation);
-
         struct wlr_box output_box = {
                 .width = output->width,
                 .height = output->height,
         };
 
         struct wlr_box intersection;
-        return wlr_box_intersection(&intersection, &output_box, &rotated_box);
+        return wlr_box_intersection(&intersection, &output_box, &box);
 }
 
 static void output_for_each_surface_iterator(struct wlr_surface *surface,
@@ -136,7 +109,7 @@ static void output_for_each_surface_iterator(struct wlr_surface *surface,
                 return;
         }
 
-        data->user_iterator(data->output, data->view, surface, &box, data->rotation,
+        data->user_iterator(data->output, data->view, surface, &box,
                 data->user_data);
 }
 
@@ -152,7 +125,6 @@ void output_surface_for_each_surface(struct sway_output *output,
                 .oy = oy,
                 .width = surface->current.width,
                 .height = surface->current.height,
-                .rotation = 0,
         };
 
         wlr_surface_for_each_surface(surface,
@@ -173,7 +145,6 @@ void output_view_for_each_surface(struct sway_output *output,
                         - view->geometry.y,
                 .width = view->container->current.content_width,
                 .height = view->container->current.content_height,
-                .rotation = 0, // TODO
         };
 
         view_for_each_surface(view, output_for_each_surface_iterator, &data);
@@ -193,7 +164,6 @@ void output_view_for_each_popup_surface(struct sway_output *output,
                         - view->geometry.y,
                 .width = view->container->current.content_width,
                 .height = view->container->current.content_height,
-                .rotation = 0, // TODO
         };
 
         view_for_each_popup_surface(view, output_for_each_surface_iterator, &data);
@@ -206,40 +176,19 @@ void output_layer_for_each_surface(struct sway_output *output,
         wl_list_for_each(layer_surface, layer_surfaces, link) {
                 struct wlr_layer_surface_v1 *wlr_layer_surface_v1 =
                         layer_surface->layer_surface;
-                output_surface_for_each_surface(output, wlr_layer_surface_v1->surface,
-                        layer_surface->geo.x, layer_surface->geo.y, iterator,
-                        user_data);
-
-                struct wlr_xdg_popup *state;
-                wl_list_for_each(state, &wlr_layer_surface_v1->popups, link) {
-                        struct wlr_xdg_surface *popup = state->base;
-                        if (!popup->configured) {
-                                continue;
-                        }
-
-                        double popup_sx, popup_sy;
-                        popup_sx = layer_surface->geo.x +
-                                popup->popup->geometry.x - popup->geometry.x;
-                        popup_sy = layer_surface->geo.y +
-                                popup->popup->geometry.y - popup->geometry.y;
-
-                        struct wlr_surface *surface = popup->surface;
-
-                        struct surface_iterator_data data = {
-                                .user_iterator = iterator,
-                                .user_data = user_data,
-                                .output = output,
-                                .view = NULL,
-                                .ox = popup_sx,
-                                .oy = popup_sy,
-                                .width = surface->current.width,
-                                .height = surface->current.height,
-                                .rotation = 0,
-                        };
-
-                        wlr_xdg_surface_for_each_surface(
-                                        popup, output_for_each_surface_iterator, &data);
-                }
+                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);
         }
 }
 
@@ -264,37 +213,19 @@ void output_layer_for_each_popup_surface(struct sway_output *output,
         wl_list_for_each(layer_surface, layer_surfaces, link) {
                 struct wlr_layer_surface_v1 *wlr_layer_surface_v1 =
                         layer_surface->layer_surface;
-
-                struct wlr_xdg_popup *state;
-                wl_list_for_each(state, &wlr_layer_surface_v1->popups, link) {
-                        struct wlr_xdg_surface *popup = state->base;
-                        if (!popup->configured) {
-                                continue;
-                        }
-
-                        double popup_sx, popup_sy;
-                        popup_sx = layer_surface->geo.x +
-                                popup->popup->geometry.x - popup->geometry.x;
-                        popup_sy = layer_surface->geo.y +
-                                popup->popup->geometry.y - popup->geometry.y;
-
-                        struct wlr_surface *surface = popup->surface;
-
-                        struct surface_iterator_data data = {
-                                .user_iterator = iterator,
-                                .user_data = user_data,
-                                .output = output,
-                                .view = NULL,
-                                .ox = popup_sx,
-                                .oy = popup_sy,
-                                .width = surface->current.width,
-                                .height = surface->current.height,
-                                .rotation = 0,
-                        };
-
-                        wlr_xdg_surface_for_each_surface(
-                                        popup, output_for_each_surface_iterator, &data);
-                }
+                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);
         }
 }
 
@@ -463,9 +394,9 @@ struct send_frame_done_data {
         int msec_until_refresh;
 };
 
-static void send_frame_done_iterator(struct sway_output *output, struct sway_view *view,
-                struct wlr_surface *surface, struct wlr_box *box, float rotation,
-                void *user_data) {
+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;
@@ -488,9 +419,9 @@ static void send_frame_done(struct sway_output *output, struct send_frame_done_d
         output_for_each_surface(output, send_frame_done_iterator, data);
 }
 
-static void count_surface_iterator(struct sway_output *output, struct sway_view *view,
-                struct wlr_surface *surface, struct wlr_box *_box, float rotation,
-                void *data) {
+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)++;
 }
@@ -577,7 +508,7 @@ static int output_repaint_timer_handler(void *data) {
                 fullscreen_con = workspace->current.fullscreen;
         }
 
-        if (fullscreen_con && fullscreen_con->view) {
+        if (fullscreen_con && fullscreen_con->view && !debug.noscanout) {
                 // Try to scan-out the fullscreen view
                 static bool last_scanned_out = false;
                 bool scanned_out =
@@ -590,6 +521,7 @@ static int output_repaint_timer_handler(void *data) {
                 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);
                 }
                 last_scanned_out = scanned_out;
 
@@ -693,38 +625,30 @@ void output_damage_whole(struct sway_output *output) {
         }
 }
 
-static void damage_surface_iterator(struct sway_output *output, struct sway_view *view,
-                struct wlr_surface *surface, struct wlr_box *_box, float rotation,
-                void *_data) {
+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);
 
-        int center_x = box.x + box.width/2;
-        int center_y = box.y + box.height/2;
-
-        if (pixman_region32_not_empty(&surface->buffer_damage)) {
-                pixman_region32_t damage;
-                pixman_region32_init(&damage);
-                wlr_surface_get_effective_damage(surface, &damage);
-                wlr_region_scale(&damage, &damage, output->wlr_output->scale);
-                if (ceil(output->wlr_output->scale) > surface->current.scale) {
-                        // When scaling up a surface, it'll become blurry so we need to
-                        // expand the damage region
-                        wlr_region_expand(&damage, &damage,
-                                ceil(output->wlr_output->scale) - surface->current.scale);
-                }
-                pixman_region32_translate(&damage, box.x, box.y);
-                wlr_region_rotated_bounds(&damage, &damage, rotation,
-                        center_x, center_y);
-                wlr_output_damage_add(output->damage, &damage);
-                pixman_region32_fini(&damage);
-        }
+        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_box_rotated_bounds(&box, &box, rotation);
                 wlr_output_damage_add_box(output->damage, &box);
         }
 
@@ -808,7 +732,7 @@ static void update_output_manager_config(struct sway_server *server) {
 
         struct sway_output *output;
         wl_list_for_each(output, &root->all_outputs, link) {
-                if (output == root->noop_output) {
+                if (output == root->fallback_output) {
                         continue;
                 }
                 struct wlr_output_configuration_head_v1 *config_head =
@@ -816,7 +740,7 @@ static void update_output_manager_config(struct sway_server *server) {
                 struct wlr_box *output_box = wlr_output_layout_get_box(
                         root->output_layout, output->wlr_output);
                 // We mark the output enabled even if it is switched off by DPMS
-                config_head->state.enabled = output->enabled;
+                config_head->state.enabled = output->current_mode != NULL && output->enabled;
                 config_head->state.mode = output->current_mode;
                 if (output_box) {
                         config_head->state.x = output_box->x;
@@ -830,18 +754,22 @@ static void update_output_manager_config(struct sway_server *server) {
 static void handle_destroy(struct wl_listener *listener, void *data) {
         struct sway_output *output = wl_container_of(listener, output, destroy);
         struct sway_server *server = output->server;
-        wl_signal_emit(&output->events.destroy, output);
+        output_begin_destroy(output);
 
         if (output->enabled) {
                 output_disable(output);
         }
-        output_begin_destroy(output);
+
+        wl_list_remove(&output->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);
 
+        output->wlr_output->data = NULL;
+        output->wlr_output = NULL;
+
         transaction_commit_dirty();
 
         update_output_manager_config(server);
@@ -902,7 +830,7 @@ static void handle_present(struct wl_listener *listener, void *data) {
         struct sway_output *output = wl_container_of(listener, output, present);
         struct wlr_output_event_present *output_event = data;
 
-        if (!output->enabled) {
+        if (!output->enabled || !output_event->presented) {
                 return;
         }
 
@@ -910,10 +838,39 @@ static void handle_present(struct wl_listener *listener, void *data) {
         output->refresh_nsec = output_event->refresh;
 }
 
+static unsigned int last_headless_num = 0;
+
 void handle_new_output(struct wl_listener *listener, void *data) {
         struct sway_server *server = wl_container_of(listener, server, new_output);
         struct wlr_output *wlr_output = data;
-        sway_log(SWAY_DEBUG, "New output %p: %s", wlr_output, wlr_output->name);
+
+        if (wlr_output == root->fallback_output->wlr_output) {
+                return;
+        }
+
+        if (wlr_output_is_headless(wlr_output)) {
+                char name[64];
+                snprintf(name, sizeof(name), "HEADLESS-%u", ++last_headless_num);
+                wlr_output_set_name(wlr_output, name);
+        }
+
+        sway_log(SWAY_DEBUG, "New output %p: %s (non-desktop: %d)",
+                        wlr_output, wlr_output->name, wlr_output->non_desktop);
+
+        if (wlr_output->non_desktop) {
+                sway_log(SWAY_DEBUG, "Not configuring non-desktop output");
+                if (server->drm_lease_manager) {
+                        wlr_drm_lease_v1_manager_offer_output(server->drm_lease_manager,
+                                        wlr_output);
+                }
+                return;
+        }
+
+        if (!wlr_output_init_render(wlr_output, server->allocator,
+                        server->renderer)) {
+                sway_log(SWAY_ERROR, "Failed to init output render");
+                return;
+        }
 
         struct sway_output *output = output_create(wlr_output);
         if (!output) {
diff --git a/sway/desktop/render.c b/sway/desktop/render.c
index bd85282c..02397c05 100644
--- a/sway/desktop/render.c
+++ b/sway/desktop/render.c
@@ -7,13 +7,12 @@
 #include <wayland-server-core.h>
 #include <wlr/render/gles2.h>
 #include <wlr/render/wlr_renderer.h>
-#include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_buffer.h>
 #include <wlr/types/wlr_matrix.h>
 #include <wlr/types/wlr_output_damage.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_output.h>
-#include <wlr/types/wlr_surface.h>
+#include <wlr/types/wlr_compositor.h>
 #include <wlr/util/region.h>
 #include "log.h"
 #include "config.h"
@@ -32,6 +31,7 @@
 struct render_data {
         pixman_region32_t *damage;
         float alpha;
+        struct wlr_box *clip_box;
 };
 
 /**
@@ -52,7 +52,7 @@ static int scale_length(int length, int offset, float scale) {
 
 static void scissor_output(struct wlr_output *wlr_output,
                 pixman_box32_t *rect) {
-        struct wlr_renderer *renderer = wlr_backend_get_renderer(wlr_output->backend);
+        struct wlr_renderer *renderer = wlr_output->renderer;
         assert(renderer);
 
         struct wlr_box box = {
@@ -100,13 +100,9 @@ static void render_texture(struct wlr_output *wlr_output,
                 pixman_region32_t *output_damage, struct wlr_texture *texture,
                 const struct wlr_fbox *src_box, const struct wlr_box *dst_box,
                 const float matrix[static 9], float alpha) {
-        struct wlr_renderer *renderer =
-                wlr_backend_get_renderer(wlr_output->backend);
+        struct wlr_renderer *renderer = wlr_output->renderer;
         struct sway_output *output = wlr_output->data;
 
-        struct wlr_gles2_texture_attribs attribs;
-        wlr_gles2_texture_get_attribs(texture, &attribs);
-
         pixman_region32_t damage;
         pixman_region32_init(&damage);
         pixman_region32_union_rect(&damage, &damage, dst_box->x, dst_box->y,
@@ -133,9 +129,9 @@ damage_finish:
         pixman_region32_fini(&damage);
 }
 
-static void render_surface_iterator(struct sway_output *output, struct sway_view *view,
-                struct wlr_surface *surface, struct wlr_box *_box, float rotation,
-                void *_data) {
+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;
@@ -149,15 +145,23 @@ static void render_surface_iterator(struct sway_output *output, struct sway_view
         struct wlr_fbox src_box;
         wlr_surface_get_buffer_source_box(surface, &src_box);
 
-        struct wlr_box dst_box = *_box;
-        scale_box(&dst_box, wlr_output->scale);
+        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, &dst_box, transform, rotation,
+        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);
 
@@ -213,8 +217,7 @@ void render_rect(struct sway_output *output,
                 pixman_region32_t *output_damage, const struct wlr_box *_box,
                 float color[static 4]) {
         struct wlr_output *wlr_output = output->wlr_output;
-        struct wlr_renderer *renderer =
-                wlr_backend_get_renderer(wlr_output->backend);
+        struct wlr_renderer *renderer = wlr_output->renderer;
 
         struct wlr_box box;
         memcpy(&box, _box, sizeof(struct wlr_box));
@@ -256,6 +259,14 @@ static void render_view_toplevels(struct sway_view *view,
                 .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;
@@ -282,17 +293,18 @@ static void render_saved_view(struct sway_view *view,
         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 box = {
-                        .x = view->container->surface_x - output->lx -
-                                view->saved_geometry.x + saved_buf->x,
-                        .y = view->container->surface_y - output->ly -
-                                view->saved_geometry.y + saved_buf->y,
+                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,
                 };
@@ -303,20 +315,31 @@ static void render_saved_view(struct sway_view *view,
                 };
 
                 struct wlr_box intersection;
-                bool intersects = wlr_box_intersection(&intersection, &output_box, &box);
+                bool intersects = wlr_box_intersection(&intersection, &output_box, &proj_box);
                 if (!intersects) {
                         continue;
                 }
 
-                scale_box(&box, wlr_output->scale);
+                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, &box, transform, 0,
+                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, &box, matrix, alpha);
+                        &saved_buf->source_box, &dst_box, matrix, alpha);
         }
 
         // FIXME: we should set the surface that this saved buffer originates from
@@ -348,8 +371,8 @@ static void render_view(struct sway_output *output, pixman_region32_t *damage,
         if (state->border_left) {
                 memcpy(&color, colors->child_border, sizeof(float) * 4);
                 premultiply_alpha(color, con->alpha);
-                box.x = state->x;
-                box.y = state->content_y;
+                box.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);
@@ -361,14 +384,14 @@ static void render_view(struct sway_output *output, pixman_region32_t *damage,
                 container_current_parent_layout(con);
 
         if (state->border_right) {
-                if (!container_is_floating(con) && siblings->length == 1 && layout == L_HORIZ) {
+                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 = state->content_x + state->content_width;
-                box.y = state->content_y;
+                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);
@@ -376,14 +399,14 @@ static void render_view(struct sway_output *output, pixman_region32_t *damage,
         }
 
         if (state->border_bottom) {
-                if (!container_is_floating(con) && siblings->length == 1 && layout == L_VERT) {
+                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 = state->x;
-                box.y = state->content_y + state->content_height;
+                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);
@@ -464,9 +487,10 @@ static void render_titlebar(struct sway_output *output,
         int ob_marks_x = 0; // output-buffer-local
         int ob_marks_width = 0; // output-buffer-local
         if (config->show_marks && marks_texture) {
-                struct wlr_box texture_box;
-                wlr_texture_get_size(marks_texture,
-                        &texture_box.width, &texture_box.height);
+                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
@@ -517,15 +541,23 @@ static void render_titlebar(struct sway_output *output,
         int ob_title_x = 0;  // output-buffer-local
         int ob_title_width = 0; // output-buffer-local
         if (title_texture) {
-                struct wlr_box texture_box;
-                wlr_texture_get_size(title_texture,
-                        &texture_box.width, &texture_box.height);
+                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((config->font_baseline -
-                                        con->title_baseline + titlebar_v_padding -
+                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;
@@ -660,8 +692,8 @@ static void render_top_border(struct sway_output *output,
         // Child border - top edge
         memcpy(&color, colors->child_border, sizeof(float) * 4);
         premultiply_alpha(color, con->alpha);
-        box.x = state->x;
-        box.y = state->y;
+        box.x = floor(state->x);
+        box.y = floor(state->y);
         box.width = state->width;
         box.height = state->border_thickness;
         scale_box(&box, output_scale);
@@ -716,8 +748,8 @@ static void render_containers_linear(struct sway_output *output,
                         }
 
                         if (state->border == B_NORMAL) {
-                                render_titlebar(output, damage, child, state->x,
-                                                state->y, state->width, colors,
+                                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);
@@ -730,6 +762,14 @@ static void render_containers_linear(struct sway_output *output,
         }
 }
 
+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.
  */
@@ -761,6 +801,10 @@ static void render_containers_tabbed(struct sway_output *output,
                         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;
@@ -771,7 +815,7 @@ static void render_containers_tabbed(struct sway_output *output,
                         marks_texture = child->marks_unfocused;
                 }
 
-                int x = cstate->x + tab_width * i;
+                int x = floor(cstate->x + tab_width * i);
 
                 // Make last tab use the remaining width of the parent
                 if (i == parent->children->length - 1) {
@@ -826,7 +870,11 @@ static void render_containers_stacked(struct sway_output *output,
                         colors = &config->border_colors.focused;
                         title_texture = child->title_focused;
                         marks_texture = child->marks_focused;
-                } else if (child == parent->active_child) {
+                } 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;
@@ -884,8 +932,8 @@ static void render_container(struct sway_output *output,
         struct parent_data data = {
                 .layout = con->current.layout,
                 .box = {
-                        .x = con->current.x,
-                        .y = con->current.y,
+                        .x = floor(con->current.x),
+                        .y = floor(con->current.y),
                         .width = con->current.width,
                         .height = con->current.height,
                 },
@@ -901,8 +949,8 @@ static void render_workspace(struct sway_output *output,
         struct parent_data data = {
                 .layout = ws->current.layout,
                 .box = {
-                        .x = ws->current.x,
-                        .y = ws->current.y,
+                        .x = floor(ws->current.x),
+                        .y = floor(ws->current.y),
                         .width = ws->current.width,
                         .height = ws->current.height,
                 },
@@ -936,8 +984,8 @@ static void render_floating_container(struct sway_output *soutput,
                 }
 
                 if (con->current.border == B_NORMAL) {
-                        render_titlebar(soutput, damage, con, con->current.x,
-                                        con->current.y, con->current.width, colors,
+                        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);
@@ -959,7 +1007,7 @@ static void render_floating(struct sway_output *soutput,
                         }
                         for (int k = 0; k < ws->current.floating->length; ++k) {
                                 struct sway_container *floater = ws->current.floating->items[k];
-                                if (floater->fullscreen_mode != FULLSCREEN_NONE) {
+                                if (floater->current.fullscreen_mode != FULLSCREEN_NONE) {
                                         continue;
                                 }
                                 render_floating_container(soutput, damage, floater);
@@ -979,13 +1027,7 @@ static void render_seatops(struct sway_output *output,
 void output_render(struct sway_output *output, struct timespec *when,
                 pixman_region32_t *damage) {
         struct wlr_output *wlr_output = output->wlr_output;
-
-        struct wlr_renderer *renderer =
-                wlr_backend_get_renderer(wlr_output->backend);
-        if (!sway_assert(renderer != NULL,
-                        "expected the output backend to have a renderer")) {
-                return;
-        }
+        struct wlr_renderer *renderer = output->server->renderer;
 
         struct sway_workspace *workspace = output->current.active_workspace;
         if (workspace == NULL) {
@@ -999,6 +1041,12 @@ void output_render(struct sway_output *output, struct timespec *when,
 
         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;
@@ -1006,10 +1054,6 @@ void output_render(struct sway_output *output, struct timespec *when,
 
         if (debug.damage == DAMAGE_HIGHLIGHT) {
                 wlr_renderer_clear(renderer, (float[]){1, 1, 0, 1});
-        } else if (debug.damage == DAMAGE_RERENDER) {
-                int width, height;
-                wlr_output_transformed_resolution(wlr_output, &width, &height);
-                pixman_region32_union_rect(damage, damage, 0, 0, width, height);
         }
 
         if (output_has_opaque_overlay_layer_surface(output)) {
@@ -1110,7 +1154,7 @@ renderer_end:
         wlr_region_transform(&frame_damage, &output->damage->current,
                 transform, width, height);
 
-        if (debug.damage == DAMAGE_HIGHLIGHT) {
+        if (debug.damage != DAMAGE_DEFAULT) {
                 pixman_region32_union_rect(&frame_damage, &frame_damage,
                         0, 0, wlr_output->width, wlr_output->height);
         }
diff --git a/sway/desktop/surface.c b/sway/desktop/surface.c
index 767b2045..1d7b536d 100644
--- a/sway/desktop/surface.c
+++ b/sway/desktop/surface.c
@@ -1,7 +1,7 @@
 #define _POSIX_C_SOURCE 200112L
 #include <stdlib.h>
 #include <time.h>
-#include <wlr/types/wlr_surface.h>
+#include <wlr/types/wlr_compositor.h>
 #include "sway/server.h"
 #include "sway/surface.h"
 
diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c
index eac38991..f5a3a053 100644
--- a/sway/desktop/transaction.c
+++ b/sway/desktop/transaction.c
@@ -35,6 +35,8 @@ struct sway_transaction_instruction {
                 struct sway_container_state container_state;
         };
         uint32_t serial;
+        bool server_request;
+        bool waiting;
 };
 
 static struct sway_transaction *transaction_create(void) {
@@ -86,7 +88,11 @@ static void transaction_destroy(struct sway_transaction *transaction) {
 static void copy_output_state(struct sway_output *output,
                 struct sway_transaction_instruction *instruction) {
         struct sway_output_state *state = &instruction->output_state;
-        state->workspaces = create_list();
+        if (state->workspaces) {
+                state->workspaces->length = 0;
+        } else {
+                state->workspaces = create_list();
+        }
         list_cat(state->workspaces, output->workspaces);
 
         state->active_workspace = output_get_active_workspace(output);
@@ -104,8 +110,16 @@ static void copy_workspace_state(struct sway_workspace *ws,
         state->layout = ws->layout;
 
         state->output = ws->output;
-        state->floating = create_list();
-        state->tiling = create_list();
+        if (state->floating) {
+                state->floating->length = 0;
+        } else {
+                state->floating = create_list();
+        }
+        if (state->tiling) {
+                state->tiling->length = 0;
+        } else {
+                state->tiling = create_list();
+        }
         list_cat(state->floating, ws->floating);
         list_cat(state->tiling, ws->tiling);
 
@@ -115,8 +129,8 @@ static void copy_workspace_state(struct sway_workspace *ws,
         // Set focused_inactive_child to the direct tiling child
         struct sway_container *focus = seat_get_focus_inactive_tiling(seat, ws);
         if (focus) {
-                while (focus->parent) {
-                        focus = focus->parent;
+                while (focus->pending.parent) {
+                        focus = focus->pending.parent;
                 }
         }
         state->focused_inactive_child = focus;
@@ -126,28 +140,19 @@ static void copy_container_state(struct sway_container *container,
                 struct sway_transaction_instruction *instruction) {
         struct sway_container_state *state = &instruction->container_state;
 
-        state->layout = container->layout;
-        state->x = container->x;
-        state->y = container->y;
-        state->width = container->width;
-        state->height = container->height;
-        state->fullscreen_mode = container->fullscreen_mode;
-        state->parent = container->parent;
-        state->workspace = container->workspace;
-        state->border = container->border;
-        state->border_thickness = container->border_thickness;
-        state->border_top = container->border_top;
-        state->border_left = container->border_left;
-        state->border_right = container->border_right;
-        state->border_bottom = container->border_bottom;
-        state->content_x = container->content_x;
-        state->content_y = container->content_y;
-        state->content_width = container->content_width;
-        state->content_height = container->content_height;
+        if (state->children) {
+                list_free(state->children);
+        }
+
+        memcpy(state, &container->pending, sizeof(struct sway_container_state));
 
         if (!container->view) {
+                // We store a copy of the child list to avoid having it mutated after
+                // we copy the state.
                 state->children = create_list();
-                list_cat(state->children, container->children);
+                list_cat(state->children, container->pending.children);
+        } else {
+                state->children = NULL;
         }
 
         struct sway_seat *seat = input_manager_current_seat();
@@ -161,14 +166,36 @@ static void copy_container_state(struct sway_container *container,
 }
 
 static void transaction_add_node(struct sway_transaction *transaction,
-                struct sway_node *node) {
-        struct sway_transaction_instruction *instruction =
-                calloc(1, sizeof(struct sway_transaction_instruction));
-        if (!sway_assert(instruction, "Unable to allocate instruction")) {
-                return;
+                struct sway_node *node, bool server_request) {
+        struct sway_transaction_instruction *instruction = NULL;
+
+        // Check if we have an instruction for this node already, in which case we
+        // update that instead of creating a new one.
+        if (node->ntxnrefs > 0) {
+                for (int idx = 0; idx < transaction->instructions->length; idx++) {
+                        struct sway_transaction_instruction *other =
+                                transaction->instructions->items[idx];
+                        if (other->node == node) {
+                                instruction = other;
+                                break;
+                        }
+                }
+        }
+
+        if (!instruction) {
+                instruction = calloc(1, sizeof(struct sway_transaction_instruction));
+                if (!sway_assert(instruction, "Unable to allocate instruction")) {
+                        return;
+                }
+                instruction->transaction = transaction;
+                instruction->node = node;
+                instruction->server_request = server_request;
+
+                list_add(transaction->instructions, instruction);
+                node->ntxnrefs++;
+        } else if (server_request) {
+                instruction->server_request = true;
         }
-        instruction->transaction = transaction;
-        instruction->node = node;
 
         switch (node->type) {
         case N_ROOT:
@@ -183,9 +210,6 @@ static void transaction_add_node(struct sway_transaction *transaction,
                 copy_container_state(node->sway_container, instruction);
                 break;
         }
-
-        list_add(transaction->instructions, instruction);
-        node->ntxnrefs++;
 }
 
 static void apply_output_state(struct sway_output *output,
@@ -214,8 +238,8 @@ static void apply_container_state(struct sway_container *container,
                 struct sway_saved_buffer *saved_buf;
                 wl_list_for_each(saved_buf, &view->saved_buffers, link) {
                         struct wlr_box box = {
-                                .x = container->current.content_x - view->saved_geometry.x + saved_buf->x,
-                                .y = container->current.content_y - view->saved_geometry.y + saved_buf->y,
+                                .x = saved_buf->x - view->saved_geometry.x,
+                                .y = saved_buf->y - view->saved_geometry.y,
                                 .width = saved_buf->width,
                                 .height = saved_buf->height,
                         };
@@ -238,6 +262,13 @@ static void apply_container_state(struct sway_container *container,
                 }
         }
 
+        // 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);
+        }
+
         // Damage the new location
         desktop_damage_whole_container(container);
         if (view && view->surface) {
@@ -251,24 +282,6 @@ static void apply_container_state(struct sway_container *container,
                 desktop_damage_box(&box);
         }
 
-        // If the view hasn't responded to the configure, center it within
-        // the container. This is important for fullscreen views which
-        // refuse to resize to the size of the output.
-        if (view && view->surface) {
-                if (view->geometry.width < container->current.content_width) {
-                        container->surface_x = container->current.content_x +
-                                (container->current.content_width - view->geometry.width) / 2;
-                } else {
-                        container->surface_x = container->current.content_x;
-                }
-                if (view->geometry.height < container->current.content_height) {
-                        container->surface_y = container->current.content_y +
-                                (container->current.content_height - view->geometry.height) / 2;
-                } else {
-                        container->surface_y = container->current.content_y;
-                }
-        }
-
         if (!container->node.destroying) {
                 container_discover_outputs(container);
         }
@@ -317,70 +330,25 @@ static void transaction_apply(struct sway_transaction *transaction) {
         cursor_rebase_all();
 }
 
-static void transaction_commit(struct sway_transaction *transaction);
+static void transaction_commit_pending(void);
 
-// Return true if both transactions operate on the same nodes
-static bool transaction_same_nodes(struct sway_transaction *a,
-                struct sway_transaction *b) {
-        if (a->instructions->length != b->instructions->length) {
-                return false;
-        }
-        for (int i = 0; i < a->instructions->length; ++i) {
-                struct sway_transaction_instruction *a_inst = a->instructions->items[i];
-                struct sway_transaction_instruction *b_inst = b->instructions->items[i];
-                if (a_inst->node != b_inst->node) {
-                        return false;
-                }
-        }
-        return true;
-}
-
-static void transaction_progress_queue(void) {
-        if (!server.transactions->length) {
+static void transaction_progress(void) {
+        if (!server.queued_transaction) {
                 return;
         }
-        // Only the first transaction in the queue is committed, so that's the one
-        // we try to process.
-        struct sway_transaction *transaction = server.transactions->items[0];
-        if (transaction->num_waiting) {
+        if (server.queued_transaction->num_waiting > 0) {
                 return;
         }
-        transaction_apply(transaction);
-        transaction_destroy(transaction);
-        list_del(server.transactions, 0);
+        transaction_apply(server.queued_transaction);
+        transaction_destroy(server.queued_transaction);
+        server.queued_transaction = NULL;
 
-        if (server.transactions->length == 0) {
-                // The transaction queue is empty, so we're done.
+        if (!server.pending_transaction) {
                 sway_idle_inhibit_v1_check_active(server.idle_inhibit_manager_v1);
                 return;
         }
 
-        // If there's a bunch of consecutive transactions which all apply to the
-        // same views, skip all except the last one.
-        while (server.transactions->length >= 2) {
-                struct sway_transaction *txn = server.transactions->items[0];
-                struct sway_transaction *dup = NULL;
-
-                for (int i = 1; i < server.transactions->length; i++) {
-                        struct sway_transaction *maybe_dup = server.transactions->items[i];
-                        if (transaction_same_nodes(txn, maybe_dup)) {
-                                dup = maybe_dup;
-                                break;
-                        }
-                }
-
-                if (dup) {
-                        list_del(server.transactions, 0);
-                        transaction_destroy(txn);
-                } else {
-                        break;
-                }
-        }
-
-        // We again commit the first transaction in the queue to process it.
-        transaction = server.transactions->items[0];
-        transaction_commit(transaction);
-        transaction_progress_queue();
+        transaction_commit_pending();
 }
 
 static int handle_timeout(void *data) {
@@ -388,7 +356,7 @@ static int handle_timeout(void *data) {
         sway_log(SWAY_DEBUG, "Transaction %p timed out (%zi waiting)",
                         transaction, transaction->num_waiting);
         transaction->num_waiting = 0;
-        transaction_progress_queue();
+        transaction_progress();
         return 0;
 }
 
@@ -400,6 +368,9 @@ static bool should_configure(struct sway_node *node,
         if (node->destroying) {
                 return false;
         }
+        if (!instruction->server_request) {
+                return false;
+        }
         struct sway_container_state *cstate = &node->sway_container->current;
         struct sway_container_state *istate = &instruction->container_state;
 #if HAVE_XWAYLAND
@@ -431,13 +402,18 @@ static void transaction_commit(struct sway_transaction *transaction) {
                 struct sway_transaction_instruction *instruction =
                         transaction->instructions->items[i];
                 struct sway_node *node = instruction->node;
+                bool hidden = node_is_view(node) && !node->destroying &&
+                        !view_is_visible(node->sway_container->view);
                 if (should_configure(node, instruction)) {
                         instruction->serial = view_configure(node->sway_container->view,
                                         instruction->container_state.content_x,
                                         instruction->container_state.content_y,
                                         instruction->container_state.content_width,
                                         instruction->container_state.content_height);
-                        ++transaction->num_waiting;
+                        if (!hidden) {
+                                instruction->waiting = true;
+                                ++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
@@ -448,7 +424,8 @@ static void transaction_commit(struct sway_transaction *transaction) {
                         wlr_surface_send_frame_done(
                                         node->sway_container->view->surface, &now);
                 }
-                if (node_is_view(node) && wl_list_empty(&node->sway_container->view->saved_buffers)) {
+                if (!hidden && node_is_view(node) &&
+                                wl_list_empty(&node->sway_container->view->saved_buffers)) {
                         view_save_buffer(node->sway_container->view);
                         memcpy(&node->sway_container->view->saved_geometry,
                                         &node->sway_container->view->geometry,
@@ -483,6 +460,17 @@ static void transaction_commit(struct sway_transaction *transaction) {
         }
 }
 
+static void transaction_commit_pending(void) {
+        if (server.queued_transaction) {
+                return;
+        }
+        struct sway_transaction *transaction = server.pending_transaction;
+        server.pending_transaction = NULL;
+        server.queued_transaction = transaction;
+        transaction_commit(transaction);
+        transaction_progress();
+}
+
 static void set_instruction_ready(
                 struct sway_transaction_instruction *instruction) {
         struct sway_transaction *transaction = instruction->transaction;
@@ -501,13 +489,14 @@ static void set_instruction_ready(
         }
 
         // If the transaction has timed out then its num_waiting will be 0 already.
-        if (transaction->num_waiting > 0 && --transaction->num_waiting == 0) {
+        if (instruction->waiting && transaction->num_waiting > 0 &&
+                        --transaction->num_waiting == 0) {
                 sway_log(SWAY_DEBUG, "Transaction %p is ready", transaction);
                 wl_event_source_timer_update(transaction->timer, 0);
         }
 
         instruction->node->instruction = NULL;
-        transaction_progress_queue();
+        transaction_progress();
 }
 
 void transaction_notify_view_ready_by_serial(struct sway_view *view,
@@ -532,36 +521,32 @@ void transaction_notify_view_ready_by_geometry(struct sway_view *view,
         }
 }
 
-void transaction_notify_view_ready_immediately(struct sway_view *view) {
-        struct sway_transaction_instruction *instruction =
-                        view->container->node.instruction;
-        if (instruction != NULL) {
-                set_instruction_ready(instruction);
-        }
-}
-
-void transaction_commit_dirty(void) {
+static void _transaction_commit_dirty(bool server_request) {
         if (!server.dirty_nodes->length) {
                 return;
         }
-        struct sway_transaction *transaction = transaction_create();
-        if (!transaction) {
-                return;
+
+        if (!server.pending_transaction) {
+                server.pending_transaction = transaction_create();
+                if (!server.pending_transaction) {
+                        return;
+                }
         }
+
         for (int i = 0; i < server.dirty_nodes->length; ++i) {
                 struct sway_node *node = server.dirty_nodes->items[i];
-                transaction_add_node(transaction, node);
+                transaction_add_node(server.pending_transaction, node, server_request);
                 node->dirty = false;
         }
         server.dirty_nodes->length = 0;
 
-        list_add(server.transactions, transaction);
+        transaction_commit_pending();
+}
 
-        // We only commit the first transaction added to the queue.
-        if (server.transactions->length == 1) {
-                transaction_commit(transaction);
-                // Attempting to progress the queue here is useful
-                // if the transaction has nothing to wait for.
-                transaction_progress_queue();
-        }
+void transaction_commit_dirty(void) {
+        _transaction_commit_dirty(true);
+}
+
+void transaction_commit_dirty_client(void) {
+        _transaction_commit_dirty(false);
 }
diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c
index 667fb9e5..5fae8296 100644
--- a/sway/desktop/xdg_shell.c
+++ b/sway/desktop/xdg_shell.c
@@ -21,18 +21,15 @@
 
 static const struct sway_view_child_impl popup_impl;
 
-static void popup_get_root_coords(struct sway_view_child *child,
-                int *root_sx, int *root_sy) {
+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_surface *surface = popup->wlr_xdg_surface;
 
-        int x_offset = -child->view->geometry.x - surface->geometry.x;
-        int y_offset = -child->view->geometry.y - surface->geometry.y;
-
         wlr_xdg_popup_get_toplevel_coords(surface->popup,
-                x_offset + surface->popup->geometry.x,
-                y_offset + surface->popup->geometry.y,
-                root_sx, root_sy);
+                surface->popup->geometry.x - surface->current.geometry.x,
+                surface->popup->geometry.y - surface->current.geometry.y,
+                sx, sy);
 }
 
 static void popup_destroy(struct sway_view_child *child) {
@@ -47,7 +44,7 @@ static void popup_destroy(struct sway_view_child *child) {
 }
 
 static const struct sway_view_child_impl popup_impl = {
-        .get_root_coords = popup_get_root_coords,
+        .get_view_coords = popup_get_view_coords,
         .destroy = popup_destroy,
 };
 
@@ -70,13 +67,13 @@ static void popup_unconstrain(struct sway_xdg_popup *popup) {
         struct sway_view *view = popup->child.view;
         struct wlr_xdg_popup *wlr_popup = popup->wlr_xdg_surface->popup;
 
-        struct sway_output *output = view->container->workspace->output;
+        struct sway_output *output = view->container->pending.workspace->output;
 
         // the output box expressed in the coordinate system of the toplevel parent
         // of the popup
         struct wlr_box output_toplevel_sx_box = {
-                .x = output->lx - view->container->content_x,
-                .y = output->ly - view->container->content_y,
+                .x = output->lx - view->container->pending.content_x + view->geometry.x,
+                .y = output->ly - view->container->pending.content_y + view->geometry.y,
                 .width = output->width,
                 .height = output->height,
         };
@@ -293,19 +290,23 @@ static void handle_commit(struct wl_listener *listener, void *data) {
                         new_geo.y != view->geometry.y;
 
         if (new_size) {
-                // The view has unexpectedly sent a new size
+                // 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);
-                view_update_size(view, new_geo.width, new_geo.height);
                 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);
-                transaction_commit_dirty();
         }
 
         if (view->container->node.instruction) {
                 transaction_notify_view_ready_by_serial(view,
-                                xdg_surface->configure_serial);
-        } else if (new_size) {
-                transaction_notify_view_ready_immediately(view);
+                                xdg_surface->current.configure_serial);
         }
 
         view_damage_from(view);
@@ -354,7 +355,8 @@ static void handle_request_fullscreen(struct wl_listener *listener, void *data)
         if (e->fullscreen && e->output && e->output->data) {
                 struct sway_output *output = e->output->data;
                 struct sway_workspace *ws = output_get_active_workspace(output);
-                if (ws && !container_is_scratchpad_hidden(container)) {
+                if (ws && !container_is_scratchpad_hidden(container) &&
+                                container->pending.workspace != ws) {
                         if (container_is_floating(container)) {
                                 workspace_add_floating(ws, container);
                         } else {
@@ -369,11 +371,6 @@ static void handle_request_fullscreen(struct wl_listener *listener, void *data)
         transaction_commit_dirty();
 }
 
-static void handle_request_maximize(struct wl_listener *listener, void *data) {
-        struct wlr_xdg_surface *surface = data;
-        wlr_xdg_surface_schedule_configure(surface);
-}
-
 static void handle_request_move(struct wl_listener *listener, void *data) {
         struct sway_xdg_shell_view *xdg_shell_view =
                 wl_container_of(listener, xdg_shell_view, request_move);
@@ -416,7 +413,6 @@ static void handle_unmap(struct wl_listener *listener, void *data) {
         wl_list_remove(&xdg_shell_view->commit.link);
         wl_list_remove(&xdg_shell_view->new_popup.link);
         wl_list_remove(&xdg_shell_view->request_fullscreen.link);
-        wl_list_remove(&xdg_shell_view->request_maximize.link);
         wl_list_remove(&xdg_shell_view->request_move.link);
         wl_list_remove(&xdg_shell_view->request_resize.link);
         wl_list_remove(&xdg_shell_view->set_title.link);
@@ -429,8 +425,8 @@ static void handle_map(struct wl_listener *listener, void *data) {
         struct sway_view *view = &xdg_shell_view->view;
         struct wlr_xdg_surface *xdg_surface = view->wlr_xdg_surface;
 
-        view->natural_width = view->wlr_xdg_surface->geometry.width;
-        view->natural_height = view->wlr_xdg_surface->geometry.height;
+        view->natural_width = view->wlr_xdg_surface->current.geometry.width;
+        view->natural_height = view->wlr_xdg_surface->current.geometry.height;
         if (!view->natural_width && !view->natural_height) {
                 view->natural_width = view->wlr_xdg_surface->surface->current.width;
                 view->natural_height = view->wlr_xdg_surface->surface->current.height;
@@ -438,17 +434,20 @@ static void handle_map(struct wl_listener *listener, void *data) {
 
         bool csd = false;
 
-        if (!view->xdg_decoration) {
+        if (view->xdg_decoration) {
+                enum wlr_xdg_toplevel_decoration_v1_mode mode =
+                        view->xdg_decoration->wlr_xdg_decoration->requested_mode;
+                csd = mode == WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE;
+        } else {
                 struct sway_server_decoration *deco =
                                 decoration_from_surface(xdg_surface->surface);
                 csd = !deco || deco->wlr_server_decoration->mode ==
                         WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT;
-
         }
 
         view_map(view, view->wlr_xdg_surface->surface,
-                xdg_surface->toplevel->client_pending.fullscreen,
-                xdg_surface->toplevel->client_pending.fullscreen_output,
+                xdg_surface->toplevel->requested.fullscreen,
+                xdg_surface->toplevel->requested.fullscreen_output,
                 csd);
 
         transaction_commit_dirty();
@@ -465,10 +464,6 @@ static void handle_map(struct wl_listener *listener, void *data) {
         wl_signal_add(&xdg_surface->toplevel->events.request_fullscreen,
                         &xdg_shell_view->request_fullscreen);
 
-        xdg_shell_view->request_maximize.notify = handle_request_maximize;
-        wl_signal_add(&xdg_surface->toplevel->events.request_maximize,
-                        &xdg_shell_view->request_maximize);
-
         xdg_shell_view->request_move.notify = handle_request_move;
         wl_signal_add(&xdg_surface->toplevel->events.request_move,
                         &xdg_shell_view->request_move);
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index e1a2e463..40288f97 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -105,14 +105,10 @@ static void unmanaged_handle_unmap(struct wl_listener *listener, void *data) {
         if (seat->wlr_seat->keyboard_state.focused_surface == xsurface->surface) {
                 // This simply returns focus to the parent surface if there's one available.
                 // This seems to handle JetBrains issues.
-                if (xsurface->parent && xsurface->parent->surface &&
-                                wlr_surface_is_xwayland_surface(xsurface->parent->surface)) {
-                        struct wlr_xwayland_surface *next_surface =
-                                wlr_xwayland_surface_from_wlr_surface(xsurface->parent->surface);
-                        if (wlr_xwayland_or_surface_wants_focus(next_surface)) {
-                                seat_set_focus_surface(seat, xsurface->parent->surface, false);
-                                return;
-                        }
+                if (xsurface->parent && xsurface->parent->surface
+                                && wlr_xwayland_or_surface_wants_focus(xsurface->parent)) {
+                        seat_set_focus_surface(seat, xsurface->parent->surface, false);
+                        return;
                 }
 
                 // Restore focus
@@ -258,6 +254,7 @@ static void set_activated(struct sway_view *view, bool activated) {
         }
 
         wlr_xwayland_surface_activate(surface, activated);
+        wlr_xwayland_surface_restack(surface, NULL, XCB_STACK_MODE_ABOVE);
 }
 
 static void set_tiled(struct sway_view *view, bool tiled) {
@@ -399,30 +396,31 @@ 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);
+        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;
+
+        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);
+        }
+
         if (view->container->node.instruction) {
-                get_geometry(view, &view->geometry);
                 transaction_notify_view_ready_by_geometry(view,
                                 xsurface->x, xsurface->y, state->width, state->height);
-        } else {
-                struct wlr_box new_geo;
-                get_geometry(view, &new_geo);
-
-                if ((new_geo.width != view->geometry.width ||
-                                        new_geo.height != view->geometry.height ||
-                                        new_geo.x != view->geometry.x ||
-                                        new_geo.y != view->geometry.y)) {
-                        // The view has unexpectedly sent a new size
-                        // eg. The Firefox "Save As" dialog when downloading a file
-                        desktop_damage_view(view);
-                        view_update_size(view, new_geo.width, new_geo.height);
-                        memcpy(&view->geometry, &new_geo, sizeof(struct wlr_box));
-                        desktop_damage_view(view);
-                        transaction_commit_dirty();
-                        transaction_notify_view_ready_by_geometry(view,
-                                        xsurface->x, xsurface->y, new_geo.width, new_geo.height);
-                } else {
-                        memcpy(&view->geometry, &new_geo, sizeof(struct wlr_box));
-                }
         }
 
         view_damage_from(view);
@@ -438,6 +436,8 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
                 wl_list_remove(&xwayland_view->commit.link);
         }
 
+        xwayland_view->view.wlr_xwayland_surface = NULL;
+
         wl_list_remove(&xwayland_view->destroy.link);
         wl_list_remove(&xwayland_view->request_configure.link);
         wl_list_remove(&xwayland_view->request_fullscreen.link);
@@ -527,10 +527,10 @@ static void handle_request_configure(struct wl_listener *listener, void *data) {
                 view->natural_height = ev->height;
                 container_floating_resize_and_center(view->container);
 
-                configure(view, view->container->content_x,
-                                view->container->content_y,
-                                view->container->content_width,
-                                view->container->content_height);
+                configure(view, view->container->pending.content_x,
+                                view->container->pending.content_y,
+                                view->container->pending.content_width,
+                                view->container->pending.content_height);
                 node_set_dirty(&view->container->node);
         } else {
                 configure(view, view->container->current.content_x,
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index fa604426..6fddee90 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -4,8 +4,8 @@
 #include <libevdev/libevdev.h>
 #include <linux/input-event-codes.h>
 #include <errno.h>
+#include <time.h>
 #include <strings.h>
-#include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_idle.h>
 #include <wlr/types/wlr_pointer.h>
@@ -20,7 +20,6 @@
 #include "util.h"
 #include "sway/commands.h"
 #include "sway/desktop.h"
-#include "sway/desktop/transaction.h"
 #include "sway/input/cursor.h"
 #include "sway/input/keyboard.h"
 #include "sway/input/tablet.h"
@@ -32,6 +31,12 @@
 #include "sway/tree/workspace.h"
 #include "wlr-layer-shell-unstable-v1-protocol.h"
 
+static uint32_t get_current_time_msec(void) {
+        struct timespec now;
+        clock_gettime(CLOCK_MONOTONIC, &now);
+        return now.tv_sec * 1000 + now.tv_nsec / 1000000;
+}
+
 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;
@@ -78,7 +83,28 @@ static struct wlr_surface *layer_surface_popup_at(struct sway_output *output,
 struct sway_node *node_at_coords(
                 struct sway_seat *seat, double lx, double ly,
                 struct wlr_surface **surface, double *sx, double *sy) {
-        // check for unmanaged views first
+        // 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);
+
+        // 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;
+        }
+
+        // check for unmanaged views
 #if HAVE_XWAYLAND
         struct wl_list *unmanaged = &root->xwayland_unmanaged;
         struct sway_xwayland_unmanaged *unmanaged_surface;
@@ -96,19 +122,6 @@ struct sway_node *node_at_coords(
                 }
         }
 #endif
-        // 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);
 
         if (root->fullscreen_global) {
                 // Try fullscreen container
@@ -126,11 +139,6 @@ struct sway_node *node_at_coords(
                 return NULL;
         }
 
-        if ((*surface = layer_surface_at(output,
-                                &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY],
-                                ox, oy, sx, sy))) {
-                return NULL;
-        }
         if (ws->fullscreen) {
                 // Try transient containers
                 for (int i = 0; i < ws->floating->length; ++i) {
@@ -383,7 +391,6 @@ static void handle_pointer_motion_relative(
 
         pointer_motion(cursor, e->time_msec, e->device, e->delta_x, e->delta_y,
                         e->unaccel_dx, e->unaccel_dy);
-        transaction_commit_dirty();
 }
 
 static void handle_pointer_motion_absolute(
@@ -401,7 +408,6 @@ static void handle_pointer_motion_absolute(
         double dy = ly - cursor->cursor->y;
 
         pointer_motion(cursor, event->time_msec, event->device, dx, dy, dx, dy);
-        transaction_commit_dirty();
 }
 
 void dispatch_cursor_button(struct sway_cursor *cursor,
@@ -431,7 +437,6 @@ static void handle_pointer_button(struct wl_listener *listener, void *data) {
         cursor_handle_activity_from_device(cursor, event->device);
         dispatch_cursor_button(cursor, event->device,
                         event->time_msec, event->button, event->state);
-        transaction_commit_dirty();
 }
 
 void dispatch_cursor_axis(struct sway_cursor *cursor,
@@ -444,7 +449,6 @@ static void handle_pointer_axis(struct wl_listener *listener, void *data) {
         struct wlr_event_pointer_axis *event = data;
         cursor_handle_activity_from_device(cursor, event->device);
         dispatch_cursor_axis(cursor, event);
-        transaction_commit_dirty();
 }
 
 static void handle_pointer_frame(struct wl_listener *listener, void *data) {
@@ -494,8 +498,6 @@ static void handle_touch_down(struct wl_listener *listener, void *data) {
                 pointer_motion(cursor, event->time_msec, event->device, dx, dy, dx, dy);
                 dispatch_cursor_button(cursor, event->device, event->time_msec,
                                 BTN_LEFT, WLR_BUTTON_PRESSED);
-                wlr_seat_pointer_notify_frame(wlr_seat);
-                transaction_commit_dirty();
         }
 }
 
@@ -508,11 +510,9 @@ static void handle_touch_up(struct wl_listener *listener, void *data) {
 
         if (cursor->simulating_pointer_from_touch) {
                 if (cursor->pointer_touch_id == cursor->seat->touch_id) {
-                        cursor->simulating_pointer_from_touch = false;
+                        cursor->pointer_touch_up = true;
                         dispatch_cursor_button(cursor, event->device, event->time_msec,
                                         BTN_LEFT, WLR_BUTTON_RELEASED);
-                        wlr_seat_pointer_notify_frame(wlr_seat);
-                        transaction_commit_dirty();
                 }
         } else {
                 wlr_seat_touch_notify_up(wlr_seat, event->time_msec, event->touch_id);
@@ -553,7 +553,6 @@ static void handle_touch_motion(struct wl_listener *listener, void *data) {
                         dx = lx - cursor->cursor->x;
                         dy = ly - cursor->cursor->y;
                         pointer_motion(cursor, event->time_msec, event->device, dx, dy, dx, dy);
-                        transaction_commit_dirty();
                 }
         } else if (surface) {
                 wlr_seat_touch_notify_motion(wlr_seat, event->time_msec,
@@ -561,6 +560,24 @@ static void handle_touch_motion(struct wl_listener *listener, void *data) {
         }
 }
 
+static void handle_touch_frame(struct wl_listener *listener, void *data) {
+        struct sway_cursor *cursor =
+                wl_container_of(listener, cursor, touch_frame);
+
+        struct wlr_seat *wlr_seat = cursor->seat->wlr_seat;
+
+        if (cursor->simulating_pointer_from_touch) {
+                wlr_seat_pointer_notify_frame(wlr_seat);
+
+                if (cursor->pointer_touch_up) {
+                        cursor->pointer_touch_up = false;
+                        cursor->simulating_pointer_from_touch = false;
+                }
+        } else {
+                wlr_seat_touch_notify_frame(wlr_seat);
+        }
+}
+
 static double apply_mapping_from_coord(double low, double high, double value) {
         if (isnan(value)) {
                 return value;
@@ -639,8 +656,6 @@ static void handle_tablet_tool_position(struct sway_cursor *cursor,
                 wlr_tablet_v2_tablet_tool_notify_proximity_out(tool->tablet_v2_tool);
                 pointer_motion(cursor, time_msec, input_device->wlr_device, dx, dy, dx, dy);
         }
-
-        transaction_commit_dirty();
 }
 
 static void handle_tool_axis(struct wl_listener *listener, void *data) {
@@ -720,7 +735,6 @@ static void handle_tool_tip(struct wl_listener *listener, void *data) {
                 dispatch_cursor_button(cursor, event->device, event->time_msec,
                         BTN_LEFT, WLR_BUTTON_RELEASED);
                 wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat);
-                transaction_commit_dirty();
         } else if (!surface || !wlr_surface_accepts_tablet_v2(tablet_v2, surface)) {
                 // If we started holding the tool tip down on a surface that accepts
                 // tablet v2, we should notify that surface if it gets released over a
@@ -733,7 +747,6 @@ static void handle_tool_tip(struct wl_listener *listener, void *data) {
                         dispatch_cursor_button(cursor, event->device, event->time_msec,
                                 BTN_LEFT, WLR_BUTTON_PRESSED);
                         wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat);
-                        transaction_commit_dirty();
                 }
         } else {
                 seatop_tablet_tool_tip(seat, sway_tool, event->time_msec, event->state);
@@ -820,7 +833,6 @@ static void handle_tool_button(struct wl_listener *listener, void *data) {
                         break;
                 }
                 wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat);
-                transaction_commit_dirty();
                 return;
         }
 
@@ -837,8 +849,8 @@ static void check_constraint_region(struct sway_cursor *cursor) {
 
                 struct sway_container *con = view->container;
 
-                double sx = cursor->cursor->x - con->content_x + view->geometry.x;
-                double sy = cursor->cursor->y - con->content_y + view->geometry.y;
+                double sx = cursor->cursor->x - con->pending.content_x + view->geometry.x;
+                double sy = cursor->cursor->y - con->pending.content_y + view->geometry.y;
 
                 if (!pixman_region32_contains_point(region,
                                 floor(sx), floor(sy), NULL)) {
@@ -849,8 +861,8 @@ static void check_constraint_region(struct sway_cursor *cursor) {
                                 double sy = (boxes[0].y1 + boxes[0].y2) / 2.;
 
                                 wlr_cursor_warp_closest(cursor->cursor, NULL,
-                                        sx + con->content_x - view->geometry.x,
-                                        sy + con->content_y - view->geometry.y);
+                                        sx + con->pending.content_x - view->geometry.x,
+                                        sy + con->pending.content_y - view->geometry.y);
 
                                 cursor_rebase(cursor);
                         }
@@ -915,6 +927,7 @@ static void handle_pointer_pinch_begin(struct wl_listener *listener, void *data)
         struct sway_cursor *cursor = wl_container_of(
                         listener, cursor, pinch_begin);
         struct wlr_event_pointer_pinch_begin *event = data;
+        cursor_handle_activity_from_device(cursor, event->device);
         wlr_pointer_gestures_v1_send_pinch_begin(
                         cursor->pointer_gestures, cursor->seat->wlr_seat,
                         event->time_msec, event->fingers);
@@ -924,6 +937,7 @@ static void handle_pointer_pinch_update(struct wl_listener *listener, void *data
         struct sway_cursor *cursor = wl_container_of(
                         listener, cursor, pinch_update);
         struct wlr_event_pointer_pinch_update *event = data;
+        cursor_handle_activity_from_device(cursor, event->device);
         wlr_pointer_gestures_v1_send_pinch_update(
                         cursor->pointer_gestures, cursor->seat->wlr_seat,
                         event->time_msec, event->dx, event->dy,
@@ -934,6 +948,7 @@ static void handle_pointer_pinch_end(struct wl_listener *listener, void *data) {
         struct sway_cursor *cursor = wl_container_of(
                         listener, cursor, pinch_end);
         struct wlr_event_pointer_pinch_end *event = data;
+        cursor_handle_activity_from_device(cursor, event->device);
         wlr_pointer_gestures_v1_send_pinch_end(
                         cursor->pointer_gestures, cursor->seat->wlr_seat,
                         event->time_msec, event->cancelled);
@@ -943,6 +958,7 @@ static void handle_pointer_swipe_begin(struct wl_listener *listener, void *data)
         struct sway_cursor *cursor = wl_container_of(
                         listener, cursor, swipe_begin);
         struct wlr_event_pointer_swipe_begin *event = data;
+        cursor_handle_activity_from_device(cursor, event->device);
         wlr_pointer_gestures_v1_send_swipe_begin(
                         cursor->pointer_gestures, cursor->seat->wlr_seat,
                         event->time_msec, event->fingers);
@@ -952,6 +968,7 @@ static void handle_pointer_swipe_update(struct wl_listener *listener, void *data
         struct sway_cursor *cursor = wl_container_of(
                         listener, cursor, swipe_update);
         struct wlr_event_pointer_swipe_update *event = data;
+        cursor_handle_activity_from_device(cursor, event->device);
         wlr_pointer_gestures_v1_send_swipe_update(
                         cursor->pointer_gestures, cursor->seat->wlr_seat,
                         event->time_msec, event->dx, event->dy);
@@ -961,6 +978,7 @@ static void handle_pointer_swipe_end(struct wl_listener *listener, void *data) {
         struct sway_cursor *cursor = wl_container_of(
                         listener, cursor, swipe_end);
         struct wlr_event_pointer_swipe_end *event = data;
+        cursor_handle_activity_from_device(cursor, event->device);
         wlr_pointer_gestures_v1_send_swipe_end(
                         cursor->pointer_gestures, cursor->seat->wlr_seat,
                         event->time_msec, event->cancelled);
@@ -1051,6 +1069,7 @@ void sway_cursor_destroy(struct sway_cursor *cursor) {
         wl_list_remove(&cursor->touch_down.link);
         wl_list_remove(&cursor->touch_up.link);
         wl_list_remove(&cursor->touch_motion.link);
+        wl_list_remove(&cursor->touch_frame.link);
         wl_list_remove(&cursor->tool_axis.link);
         wl_list_remove(&cursor->tool_tip.link);
         wl_list_remove(&cursor->tool_button.link);
@@ -1126,6 +1145,9 @@ struct sway_cursor *sway_cursor_create(struct sway_seat *seat) {
                 &cursor->touch_motion);
         cursor->touch_motion.notify = handle_touch_motion;
 
+        wl_signal_add(&wlr_cursor->events.touch_frame, &cursor->touch_frame);
+        cursor->touch_frame.notify = handle_touch_frame;
+
         wl_signal_add(&wlr_cursor->events.tablet_tool_axis,
                 &cursor->tool_axis);
         cursor->tool_axis.notify = handle_tool_axis;
@@ -1170,8 +1192,8 @@ void cursor_warp_to_container(struct sway_cursor *cursor,
                 return;
         }
 
-        double x = container->x + container->width / 2.0;
-        double y = container->y + container->height / 2.0;
+        double x = container->pending.x + container->pending.width / 2.0;
+        double y = container->pending.y + container->pending.height / 2.0;
 
         wlr_cursor_warp(cursor->cursor, NULL, x, y);
         cursor_unhide(cursor);
@@ -1284,8 +1306,8 @@ static void warp_to_constraint_cursor_hint(struct sway_cursor *cursor) {
                 struct sway_view *view = view_from_wlr_surface(constraint->surface);
                 struct sway_container *con = view->container;
 
-                double lx = sx + con->content_x - view->geometry.x;
-                double ly = sy + con->content_y - view->geometry.y;
+                double lx = sx + con->pending.content_x - view->geometry.x;
+                double ly = sy + con->pending.content_y - view->geometry.y;
 
                 wlr_cursor_warp(cursor->cursor, NULL, lx, ly);
 
@@ -1333,7 +1355,7 @@ void handle_pointer_constraint(struct wl_listener *listener, void *data) {
         wl_signal_add(&constraint->events.destroy, &sway_constraint->destroy);
 
         struct sway_node *focus = seat_get_focus(seat);
-        if (focus && focus->type == N_CONTAINER && focus->sway_container->view) {
+        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);
diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
index ce259eb2..f258ac7d 100644
--- a/sway/input/keyboard.c
+++ b/sway/input/keyboard.c
@@ -9,7 +9,6 @@
 #include <wlr/types/wlr_keyboard_group.h>
 #include <xkbcommon/xkbcommon-names.h>
 #include "sway/commands.h"
-#include "sway/desktop/transaction.h"
 #include "sway/input/input-manager.h"
 #include "sway/input/keyboard.h"
 #include "sway/input/seat.h"
@@ -379,6 +378,28 @@ static void update_keyboard_state(struct sway_keyboard *keyboard,
         }
 }
 
+/**
+ * Get keyboard grab of the seat from sway_keyboard if we should forward events
+ * to it.
+ *
+ * Returns NULL if the keyboard is not grabbed by an input method,
+ * or if event is from virtual keyboard of the same client as grab.
+ * TODO: see swaywm/wlroots#2322
+ */
+static struct wlr_input_method_keyboard_grab_v2 *keyboard_get_im_grab(
+                struct sway_keyboard *keyboard) {
+        struct wlr_input_method_v2 *input_method = keyboard->seat_device->
+                sway_seat->im_relay.input_method;
+        struct wlr_virtual_keyboard_v1 *virtual_keyboard =
+                wlr_input_device_get_virtual_keyboard(keyboard->seat_device->input_device->wlr_device);
+        if (!input_method || !input_method->keyboard_grab || (virtual_keyboard &&
+                                wl_resource_get_client(virtual_keyboard->resource) ==
+                                wl_resource_get_client(input_method->keyboard_grab->resource))) {
+                return NULL;
+        }
+        return input_method->keyboard_grab;
+}
+
 static void handle_key_event(struct sway_keyboard *keyboard,
                 struct wlr_event_keyboard_key *event) {
         struct sway_seat *seat = keyboard->seat_device->sway_seat;
@@ -489,18 +510,42 @@ static void handle_key_event(struct sway_keyboard *keyboard,
                                 keyinfo.raw_keysyms_len);
         }
 
-        if (!handled || event->state == WL_KEYBOARD_KEY_STATE_RELEASED) {
+        if (event->state == WL_KEYBOARD_KEY_STATE_RELEASED) {
+                // If the pressed event was sent to a client, also send the released
+                // event. In particular, don't send the released event to the IM grab.
                 bool pressed_sent = update_shortcut_state(
-                                &keyboard->state_pressed_sent, event->keycode, event->state,
-                                keyinfo.keycode, 0);
-                if (pressed_sent || event->state == WL_KEYBOARD_KEY_STATE_PRESSED) {
+                        &keyboard->state_pressed_sent, event->keycode,
+                        event->state, keyinfo.keycode, 0);
+                if (pressed_sent) {
                         wlr_seat_set_keyboard(wlr_seat, wlr_device);
                         wlr_seat_keyboard_notify_key(wlr_seat, event->time_msec,
-                                        event->keycode, event->state);
+                                event->keycode, event->state);
+                        handled = true;
+                }
+        }
+
+        if (!handled) {
+                struct wlr_input_method_keyboard_grab_v2 *kb_grab = keyboard_get_im_grab(keyboard);
+
+                if (kb_grab) {
+                        wlr_input_method_keyboard_grab_v2_set_keyboard(kb_grab,
+                                wlr_device->keyboard);
+                        wlr_input_method_keyboard_grab_v2_send_key(kb_grab,
+                                event->time_msec, event->keycode, event->state);
+                        handled = true;
                 }
         }
 
-        transaction_commit_dirty();
+        if (!handled && event->state != WL_KEYBOARD_KEY_STATE_RELEASED) {
+                // If a released event failed pressed sent test, and not in sent to
+                // keyboard grab, it is still not handled. Don't handle released here.
+                update_shortcut_state(
+                        &keyboard->state_pressed_sent, event->keycode, event->state,
+                        keyinfo.keycode, 0);
+                wlr_seat_set_keyboard(wlr_seat, wlr_device);
+                wlr_seat_keyboard_notify_key(wlr_seat, event->time_msec,
+                                event->keycode, event->state);
+        }
 
         free(device_identifier);
 }
@@ -587,7 +632,6 @@ static int handle_keyboard_repeat(void *data) {
 
                 seat_execute_command(keyboard->seat_device->sway_seat,
                                 keyboard->repeat_binding);
-                transaction_commit_dirty();
         }
         return 0;
 }
@@ -617,10 +661,19 @@ static void handle_modifier_event(struct sway_keyboard *keyboard) {
         struct wlr_input_device *wlr_device =
                 keyboard->seat_device->input_device->wlr_device;
         if (!wlr_device->keyboard->group) {
-                struct wlr_seat *wlr_seat = keyboard->seat_device->sway_seat->wlr_seat;
-                wlr_seat_set_keyboard(wlr_seat, wlr_device);
-                wlr_seat_keyboard_notify_modifiers(wlr_seat,
-                                &wlr_device->keyboard->modifiers);
+                struct wlr_input_method_keyboard_grab_v2 *kb_grab = keyboard_get_im_grab(keyboard);
+
+                if (kb_grab) {
+                        wlr_input_method_keyboard_grab_v2_set_keyboard(kb_grab,
+                                        wlr_device->keyboard);
+                        wlr_input_method_keyboard_grab_v2_send_modifiers(kb_grab,
+                                        &wlr_device->keyboard->modifiers);
+                } else {
+                        struct wlr_seat *wlr_seat = keyboard->seat_device->sway_seat->wlr_seat;
+                        wlr_seat_set_keyboard(wlr_seat, wlr_device);
+                        wlr_seat_keyboard_notify_modifiers(wlr_seat,
+                                        &wlr_device->keyboard->modifiers);
+                }
 
                 uint32_t modifiers = wlr_keyboard_get_modifiers(wlr_device->keyboard);
                 determine_bar_visibility(modifiers);
diff --git a/sway/input/libinput.c b/sway/input/libinput.c
index 54520f9e..3c0f359d 100644
--- a/sway/input/libinput.c
+++ b/sway/input/libinput.c
@@ -1,5 +1,6 @@
 #include <float.h>
 #include <libinput.h>
+#include <libudev.h>
 #include <limits.h>
 #include <wlr/backend/libinput.h>
 #include "log.h"
@@ -312,3 +313,32 @@ void sway_input_reset_libinput_device(struct sway_input_device *input_device) {
                 ipc_event_input("libinput_config", input_device);
         }
 }
+
+bool sway_libinput_device_is_builtin(struct sway_input_device *sway_device) {
+        if (!wlr_input_device_is_libinput(sway_device->wlr_device)) {
+                return false;
+        }
+
+        struct libinput_device *device =
+                wlr_libinput_get_device_handle(sway_device->wlr_device);
+        struct udev_device *udev_device =
+                libinput_device_get_udev_device(device);
+        if (!udev_device) {
+                return false;
+        }
+
+        const char *id_path = udev_device_get_property_value(udev_device, "ID_PATH");
+        if (!id_path) {
+                return false;
+        }
+
+        const char prefix_platform[] = "platform-";
+        if (strncmp(id_path, prefix_platform, strlen(prefix_platform)) != 0) {
+                return false;
+        }
+
+        const char prefix_pci[] = "pci-";
+        const char infix_platform[] = "-platform-";
+        return (strncmp(id_path, prefix_pci, strlen(prefix_pci)) == 0) &&
+                strstr(id_path, infix_platform);
+}
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 1f5865ee..ce933b66 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -20,6 +20,7 @@
 #include "sway/input/cursor.h"
 #include "sway/input/input-manager.h"
 #include "sway/input/keyboard.h"
+#include "sway/input/libinput.h"
 #include "sway/input/seat.h"
 #include "sway/input/switch.h"
 #include "sway/input/tablet.h"
@@ -50,6 +51,16 @@ static void seat_device_destroy(struct sway_seat_device *seat_device) {
 static void seat_node_destroy(struct sway_seat_node *seat_node) {
         wl_list_remove(&seat_node->destroy.link);
         wl_list_remove(&seat_node->link);
+
+        /*
+         * This is the only time we remove items from the focus stack without
+         * immediately re-adding them. If we just removed the last thing,
+         * mark that nothing has focus anymore.
+         */
+        if (wl_list_empty(&seat_node->seat->focus_stack)) {
+                seat_node->seat->has_focus = false;
+        }
+
         free(seat_node);
 }
 
@@ -209,14 +220,13 @@ void seat_for_each_node(struct sway_seat *seat,
 
 struct sway_container *seat_get_focus_inactive_view(struct sway_seat *seat,
                 struct sway_node *ancestor) {
-        if (ancestor->type == N_CONTAINER && ancestor->sway_container->view) {
+        if (node_is_view(ancestor)) {
                 return ancestor->sway_container;
         }
         struct sway_seat_node *current;
         wl_list_for_each(current, &seat->focus_stack, link) {
                 struct sway_node *node = current->node;
-                if (node->type == N_CONTAINER && node->sway_container->view &&
-                                node_has_ancestor(node, ancestor)) {
+                if (node_is_view(node) && node_has_ancestor(node, ancestor)) {
                         return node->sway_container;
                 }
         }
@@ -309,8 +319,8 @@ static void handle_seat_node_destroy(struct wl_listener *listener, void *data) {
                 // Setting focus_inactive
                 focus = seat_get_focus_inactive(seat, &root->node);
                 seat_set_raw_focus(seat, next_focus);
-                if (focus->type == N_CONTAINER && focus->sway_container->workspace) {
-                        seat_set_raw_focus(seat, &focus->sway_container->workspace->node);
+                if (focus->type == N_CONTAINER && focus->sway_container->pending.workspace) {
+                        seat_set_raw_focus(seat, &focus->sway_container->pending.workspace->node);
                 }
                 seat_set_raw_focus(seat, focus);
         }
@@ -666,6 +676,40 @@ static void seat_reset_input_config(struct sway_seat *seat,
                 sway_device->input_device->wlr_device, NULL);
 }
 
+static bool has_prefix(const char *str, const char *prefix) {
+        return strncmp(str, prefix, strlen(prefix)) == 0;
+}
+
+/**
+ * Get the name of the built-in output, if any. Returns NULL if there isn't
+ * exactly one built-in output.
+ */
+static const char *get_builtin_output_name(void) {
+        const char *match = NULL;
+        for (int i = 0; i < root->outputs->length; ++i) {
+                struct sway_output *output = root->outputs->items[i];
+                const char *name = output->wlr_output->name;
+                if (has_prefix(name, "eDP-") || has_prefix(name, "LVDS-") ||
+                                has_prefix(name, "DSI-")) {
+                        if (match != NULL) {
+                                return NULL;
+                        }
+                        match = name;
+                }
+        }
+        return match;
+}
+
+static bool is_touch_or_tablet_tool(struct sway_seat_device *seat_device) {
+        switch (seat_device->input_device->wlr_device->type) {
+        case WLR_INPUT_DEVICE_TOUCH:
+        case WLR_INPUT_DEVICE_TABLET_TOOL:
+                return true;
+        default:
+                return false;
+        }
+}
+
 static void seat_apply_input_config(struct sway_seat *seat,
                 struct sway_seat_device *sway_device) {
         struct input_config *ic =
@@ -681,7 +725,21 @@ static void seat_apply_input_config(struct sway_seat *seat,
 
         switch (mapped_to) {
         case MAPPED_TO_DEFAULT:
+                /*
+                 * If the wlroots backend provides an output name, use that.
+                 *
+                 * Otherwise, try to map built-in touch and tablet tool devices to the
+                 * built-in output.
+                 */
                 mapped_to_output = sway_device->input_device->wlr_device->output_name;
+                if (mapped_to_output == NULL && is_touch_or_tablet_tool(sway_device) &&
+                                sway_libinput_device_is_builtin(sway_device->input_device)) {
+                        mapped_to_output = get_builtin_output_name();
+                        if (mapped_to_output) {
+                                sway_log(SWAY_DEBUG, "Auto-detected output '%s' for device '%s'",
+                                        mapped_to_output, sway_device->input_device->identifier);
+                        }
+                }
                 if (mapped_to_output == NULL) {
                         return;
                 }
@@ -1086,30 +1144,19 @@ void seat_set_focus(struct sway_seat *seat, struct sway_node *node) {
         }
 
         struct sway_workspace *new_workspace = node->type == N_WORKSPACE ?
-                node->sway_workspace : node->sway_container->workspace;
+                node->sway_workspace : node->sway_container->pending.workspace;
         struct sway_container *container = node->type == N_CONTAINER ?
                 node->sway_container : NULL;
 
-        // Deny setting focus to a view which is hidden by a fullscreen container
-        if (new_workspace && new_workspace->fullscreen && container &&
-                        !container_is_fullscreen_or_child(container)) {
-                // Unless it's a transient container
-                if (!container_is_transient_for(container, new_workspace->fullscreen)) {
-                        return;
-                }
+        // Deny setting focus to a view which is hidden by a fullscreen container or global
+        if (container && container_obstructing_fullscreen_container(container)) {
+                return;
         }
+
         // Deny setting focus to a workspace node when using fullscreen global
         if (root->fullscreen_global && !container && new_workspace) {
                 return;
         }
-        // Deny setting focus to a view which is hidden by a fullscreen global
-        if (root->fullscreen_global && container != root->fullscreen_global &&
-                                !container_has_ancestor(container, root->fullscreen_global)) {
-                // Unless it's a transient container
-                if (!container_is_transient_for(container, root->fullscreen_global)) {
-                        return;
-                }
-        }
 
         struct sway_output *new_output =
                 new_workspace ? new_workspace->output : NULL;
@@ -1135,10 +1182,10 @@ void seat_set_focus(struct sway_seat *seat, struct sway_node *node) {
         // Put the container parents on the focus stack, then the workspace, then
         // the focused container.
         if (container) {
-                struct sway_container *parent = container->parent;
+                struct sway_container *parent = container->pending.parent;
                 while (parent) {
                         seat_set_raw_focus(seat, &parent->node);
-                        parent = parent->parent;
+                        parent = parent->pending.parent;
                 }
         }
         if (new_workspace) {
@@ -1234,6 +1281,7 @@ void seat_set_focus_surface(struct sway_seat *seat,
                 wlr_seat_keyboard_notify_clear_focus(seat->wlr_seat);
         }
 
+        sway_input_method_relay_set_focus(&seat->im_relay, surface);
         seat_tablet_pads_notify_enter(seat, surface);
 }
 
@@ -1326,7 +1374,7 @@ struct sway_container *seat_get_focus_inactive_tiling(struct sway_seat *seat,
                 struct sway_node *node = current->node;
                 if (node->type == N_CONTAINER &&
                                 !container_is_floating_or_child(node->sway_container) &&
-                                node->sway_container->workspace == workspace) {
+                                node->sway_container->pending.workspace == workspace) {
                         return node->sway_container;
                 }
         }
@@ -1343,7 +1391,7 @@ struct sway_container *seat_get_focus_inactive_floating(struct sway_seat *seat,
                 struct sway_node *node = current->node;
                 if (node->type == N_CONTAINER &&
                                 container_is_floating_or_child(node->sway_container) &&
-                                node->sway_container->workspace == workspace) {
+                                node->sway_container->pending.workspace == workspace) {
                         return node->sway_container;
                 }
         }
@@ -1377,9 +1425,8 @@ struct sway_node *seat_get_focus(struct sway_seat *seat) {
         if (!seat->has_focus) {
                 return NULL;
         }
-        if (wl_list_empty(&seat->focus_stack)) {
-                return NULL;
-        }
+        sway_assert(!wl_list_empty(&seat->focus_stack),
+                        "focus_stack is empty, but has_focus is true");
         struct sway_seat_node *current =
                 wl_container_of(seat->focus_stack.next, current, link);
         return current->node;
@@ -1391,7 +1438,7 @@ struct sway_workspace *seat_get_focused_workspace(struct sway_seat *seat) {
                 return NULL;
         }
         if (focus->type == N_CONTAINER) {
-                return focus->sway_container->workspace;
+                return focus->sway_container->pending.workspace;
         }
         if (focus->type == N_WORKSPACE) {
                 return focus->sway_workspace;
@@ -1404,8 +1451,8 @@ struct sway_workspace *seat_get_last_known_workspace(struct sway_seat *seat) {
         wl_list_for_each(current, &seat->focus_stack, link) {
                 struct sway_node *node = current->node;
                 if (node->type == N_CONTAINER &&
-                                node->sway_container->workspace) {
-                        return node->sway_container->workspace;
+                                node->sway_container->pending.workspace) {
+                        return node->sway_container->pending.workspace;
                 } else if (node->type == N_WORKSPACE) {
                         return node->sway_workspace;
                 }
diff --git a/sway/input/seatop_default.c b/sway/input/seatop_default.c
index a583ed62..4320a3b4 100644
--- a/sway/input/seatop_default.c
+++ b/sway/input/seatop_default.c
@@ -4,6 +4,7 @@
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_tablet_v2.h>
 #include <wlr/types/wlr_xcursor_manager.h>
+#include "sway/desktop/transaction.h"
 #include "sway/input/cursor.h"
 #include "sway/input/seat.h"
 #include "sway/input/tablet.h"
@@ -59,7 +60,7 @@ static bool edge_is_external(struct sway_container *cont, enum wlr_edges edge) {
                                 return false;
                         }
                 }
-                cont = cont->parent;
+                cont = cont->pending.parent;
         }
         return true;
 }
@@ -69,25 +70,25 @@ static enum wlr_edges find_edge(struct sway_container *cont,
         if (!cont->view || (surface && cont->view->surface != surface)) {
                 return WLR_EDGE_NONE;
         }
-        if (cont->border == B_NONE || !cont->border_thickness ||
-                        cont->border == B_CSD) {
+        if (cont->pending.border == B_NONE || !cont->pending.border_thickness ||
+                        cont->pending.border == B_CSD) {
                 return WLR_EDGE_NONE;
         }
-        if (cont->fullscreen_mode) {
+        if (cont->pending.fullscreen_mode) {
                 return WLR_EDGE_NONE;
         }
 
         enum wlr_edges edge = 0;
-        if (cursor->cursor->x < cont->x + cont->border_thickness) {
+        if (cursor->cursor->x < cont->pending.x + cont->pending.border_thickness) {
                 edge |= WLR_EDGE_LEFT;
         }
-        if (cursor->cursor->y < cont->y + cont->border_thickness) {
+        if (cursor->cursor->y < cont->pending.y + cont->pending.border_thickness) {
                 edge |= WLR_EDGE_TOP;
         }
-        if (cursor->cursor->x >= cont->x + cont->width - cont->border_thickness) {
+        if (cursor->cursor->x >= cont->pending.x + cont->pending.width - cont->pending.border_thickness) {
                 edge |= WLR_EDGE_RIGHT;
         }
-        if (cursor->cursor->y >= cont->y + cont->height - cont->border_thickness) {
+        if (cursor->cursor->y >= cont->pending.y + cont->pending.height - cont->pending.border_thickness) {
                 edge |= WLR_EDGE_BOTTOM;
         }
 
@@ -231,6 +232,7 @@ static void handle_tablet_tool_tip(struct sway_seat *seat,
                                 wlr_layer_surface_v1_from_wlr_surface(surface);
                 if (layer->current.keyboard_interactive) {
                         seat_set_focus_layer(seat, layer);
+                        transaction_commit_dirty();
                 }
         } else if (cont) {
                 bool is_floating_or_child = container_is_floating_or_child(cont);
@@ -249,7 +251,7 @@ static void handle_tablet_tool_tip(struct sway_seat *seat,
 
                 // Handle moving a tiling container
                 if (config->tiling_drag && mod_pressed && !is_floating_or_child &&
-                                cont->fullscreen_mode == FULLSCREEN_NONE) {
+                                cont->pending.fullscreen_mode == FULLSCREEN_NONE) {
                         seatop_begin_move_tiling(seat, cont);
                         return;
                 }
@@ -268,6 +270,7 @@ static void handle_tablet_tool_tip(struct sway_seat *seat,
                         struct wlr_xwayland *xwayland = server.xwayland.wlr_xwayland;
                         wlr_xwayland_set_seat(xwayland, seat->wlr_seat);
                         seat_set_focus_surface(seat, xsurface->surface, false);
+                        transaction_commit_dirty();
                 }
         }
 #endif
@@ -356,6 +359,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
         if (node && node->type == N_WORKSPACE) {
                 if (state == WLR_BUTTON_PRESSED) {
                         seat_set_focus(seat, node);
+                        transaction_commit_dirty();
                 }
                 seat_pointer_notify_button(seat, time_msec, button, state);
                 return;
@@ -367,6 +371,10 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
                         wlr_layer_surface_v1_from_wlr_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);
                 }
                 seat_pointer_notify_button(seat, time_msec, button, state);
                 return;
@@ -381,7 +389,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
                 struct sway_container *cont_to_focus = cont;
                 enum sway_container_layout layout = container_parent_layout(cont);
                 if (layout == L_TABBED || layout == L_STACKED) {
-                        cont_to_focus = seat_get_focus_inactive_view(seat, &cont->parent->node);
+                        cont_to_focus = seat_get_focus_inactive_view(seat, &cont->pending.parent->node);
                 }
 
                 seat_set_focus_container(seat, cont_to_focus);
@@ -397,9 +405,9 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
                         BTN_LEFT : BTN_RIGHT;
                 if (button == btn_resize) {
                         edge = 0;
-                        edge |= cursor->cursor->x > cont->x + cont->width / 2 ?
+                        edge |= cursor->cursor->x > cont->pending.x + cont->pending.width / 2 ?
                                 WLR_EDGE_RIGHT : WLR_EDGE_LEFT;
-                        edge |= cursor->cursor->y > cont->y + cont->height / 2 ?
+                        edge |= cursor->cursor->y > cont->pending.y + cont->pending.height / 2 ?
                                 WLR_EDGE_BOTTOM : WLR_EDGE_TOP;
 
                         const char *image = NULL;
@@ -446,9 +454,9 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
                 if (mod_pressed && button == btn_resize) {
                         struct sway_container *floater = container_toplevel_ancestor(cont);
                         edge = 0;
-                        edge |= cursor->cursor->x > floater->x + floater->width / 2 ?
+                        edge |= cursor->cursor->x > floater->pending.x + floater->pending.width / 2 ?
                                 WLR_EDGE_RIGHT : WLR_EDGE_LEFT;
-                        edge |= cursor->cursor->y > floater->y + floater->height / 2 ?
+                        edge |= cursor->cursor->y > floater->pending.y + floater->pending.height / 2 ?
                                 WLR_EDGE_BOTTOM : WLR_EDGE_TOP;
                         seatop_begin_resize_floating(seat, floater, edge);
                         return;
@@ -458,7 +466,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
         // Handle moving a tiling container
         if (config->tiling_drag && (mod_pressed || on_titlebar) &&
                         state == WLR_BUTTON_PRESSED && !is_floating_or_child &&
-                        cont && cont->fullscreen_mode == FULLSCREEN_NONE) {
+                        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) {
@@ -487,6 +495,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
         if (cont && state == WLR_BUTTON_PRESSED) {
                 node = seat_get_focus_inactive(seat, &cont->node);
                 seat_set_focus(seat, node);
+                transaction_commit_dirty();
                 seat_pointer_notify_button(seat, time_msec, button, state);
                 return;
         }
@@ -501,6 +510,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
                         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;
                 }
@@ -530,6 +540,7 @@ static void check_focus_follows_mouse(struct sway_seat *seat,
                 if (focus && hovered_output != node_get_output(focus)) {
                         struct sway_workspace *ws = output_get_active_workspace(hovered_output);
                         seat_set_focus(seat, &ws->node);
+                        transaction_commit_dirty();
                 }
                 return;
         }
@@ -541,6 +552,7 @@ static void check_focus_follows_mouse(struct sway_seat *seat,
                 struct sway_output *hovered_output = node_get_output(hovered_node);
                 if (hovered_output != focused_output) {
                         seat_set_focus(seat, seat_get_focus_inactive(seat, hovered_node));
+                        transaction_commit_dirty();
                 }
                 return;
         }
@@ -556,6 +568,7 @@ static void check_focus_follows_mouse(struct sway_seat *seat,
                 if (hovered_node != e->previous_node ||
                                 config->focus_follows_mouse == FOLLOWS_ALWAYS) {
                         seat_set_focus(seat, hovered_node);
+                        transaction_commit_dirty();
                 }
         }
 }
@@ -664,7 +677,7 @@ static void handle_pointer_axis(struct sway_seat *seat,
         bool on_border = edge != WLR_EDGE_NONE;
         bool on_titlebar = cont && !on_border && !surface;
         bool on_titlebar_border = cont && on_border &&
-                cursor->cursor->y < cont->content_y;
+                cursor->cursor->y < cont->pending.content_y;
         bool on_contents = cont && !on_border && surface;
         bool on_workspace = node && node->type == N_WORKSPACE;
         float scroll_factor =
@@ -714,6 +727,7 @@ static void handle_pointer_axis(struct sway_seat *seat,
                         // 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;
                 }
         }
diff --git a/sway/input/seatop_down.c b/sway/input/seatop_down.c
index 17f619e3..ecc34fea 100644
--- a/sway/input/seatop_down.c
+++ b/sway/input/seatop_down.c
@@ -5,10 +5,14 @@
 #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_down_event {
         struct sway_container *con;
+        struct sway_seat *seat;
+        struct wl_listener surface_destroy;
+        struct wlr_surface *surface;
         double ref_lx, ref_ly;         // cursor's x/y at start of op
         double ref_con_lx, ref_con_ly; // container's x/y at start of op
 };
@@ -39,8 +43,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
 
 static void handle_pointer_motion(struct sway_seat *seat, uint32_t time_msec) {
         struct seatop_down_event *e = seat->seatop_data;
-        struct sway_container *con = e->con;
-        if (seat_is_input_allowed(seat, con->view->surface)) {
+        if (seat_is_input_allowed(seat, e->surface)) {
                 double moved_x = seat->cursor->cursor->x - e->ref_lx;
                 double moved_y = seat->cursor->cursor->y - e->ref_ly;
                 double sx = e->ref_con_lx + moved_x;
@@ -61,8 +64,7 @@ static void handle_tablet_tool_tip(struct sway_seat *seat,
 static void handle_tablet_tool_motion(struct sway_seat *seat,
                 struct sway_tablet_tool *tool, uint32_t time_msec) {
         struct seatop_down_event *e = seat->seatop_data;
-        struct sway_container *con = e->con;
-        if (seat_is_input_allowed(seat, con->view->surface)) {
+        if (seat_is_input_allowed(seat, e->surface)) {
                 double moved_x = seat->cursor->cursor->x - e->ref_lx;
                 double moved_y = seat->cursor->cursor->y - e->ref_ly;
                 double sx = e->ref_con_lx + moved_x;
@@ -71,6 +73,14 @@ static void handle_tablet_tool_motion(struct sway_seat *seat,
         }
 }
 
+static void handle_destroy(struct wl_listener *listener, void *data) {
+        struct seatop_down_event *e =
+                wl_container_of(listener, e, surface_destroy);
+        if (e) {
+                seatop_begin_default(e->seat);
+        }
+}
+
 static void handle_unref(struct sway_seat *seat, struct sway_container *con) {
         struct seatop_down_event *e = seat->seatop_data;
         if (e->con == con) {
@@ -78,6 +88,11 @@ static void handle_unref(struct sway_seat *seat, struct sway_container *con) {
         }
 }
 
+static void handle_end(struct sway_seat *seat) {
+        struct seatop_down_event *e = seat->seatop_data;
+        wl_list_remove(&e->surface_destroy.link);
+}
+
 static const struct sway_seatop_impl seatop_impl = {
         .button = handle_button,
         .pointer_motion = handle_pointer_motion,
@@ -85,11 +100,22 @@ static const struct sway_seatop_impl seatop_impl = {
         .tablet_tool_tip = handle_tablet_tool_tip,
         .tablet_tool_motion = handle_tablet_tool_motion,
         .unref = handle_unref,
+        .end = handle_end,
         .allow_set_cursor = true,
 };
 
 void seatop_begin_down(struct sway_seat *seat, struct sway_container *con,
-                uint32_t time_msec, int sx, int sy) {
+                uint32_t time_msec, double sx, double sy) {
+        seatop_begin_down_on_surface(seat, con->view->surface, time_msec, sx, sy);
+        struct seatop_down_event *e = seat->seatop_data;
+        e->con = con;
+
+        container_raise_floating(con);
+        transaction_commit_dirty();
+}
+
+void seatop_begin_down_on_surface(struct sway_seat *seat,
+                struct wlr_surface *surface, uint32_t time_msec, double sx, double sy) {
         seatop_end(seat);
 
         struct seatop_down_event *e =
@@ -97,7 +123,11 @@ void seatop_begin_down(struct sway_seat *seat, struct sway_container *con,
         if (!e) {
                 return;
         }
-        e->con = con;
+        e->con = NULL;
+        e->seat = seat;
+        e->surface = surface;
+        wl_signal_add(&e->surface->events.destroy, &e->surface_destroy);
+        e->surface_destroy.notify = handle_destroy;
         e->ref_lx = seat->cursor->cursor->x;
         e->ref_ly = seat->cursor->cursor->y;
         e->ref_con_lx = sx;
@@ -105,6 +135,4 @@ void seatop_begin_down(struct sway_seat *seat, struct sway_container *con,
 
         seat->seatop_impl = &seatop_impl;
         seat->seatop_data = e;
-
-        container_raise_floating(con);
 }
diff --git a/sway/input/seatop_move_floating.c b/sway/input/seatop_move_floating.c
index 7f501fc9..ddcd4c53 100644
--- a/sway/input/seatop_move_floating.c
+++ b/sway/input/seatop_move_floating.c
@@ -1,6 +1,7 @@
 #define _POSIX_C_SOURCE 200809L
 #include <wlr/types/wlr_cursor.h>
 #include "sway/desktop.h"
+#include "sway/desktop/transaction.h"
 #include "sway/input/cursor.h"
 #include "sway/input/seat.h"
 
@@ -14,7 +15,8 @@ static void finalize_move(struct sway_seat *seat) {
 
         // We "move" the container to its own location
         // so it discovers its output again.
-        container_floating_move_to(e->con, e->con->x, e->con->y);
+        container_floating_move_to(e->con, e->con->pending.x, e->con->pending.y);
+        transaction_commit_dirty();
 
         seatop_begin_default(seat);
 }
@@ -40,6 +42,7 @@ static void handle_pointer_motion(struct sway_seat *seat, uint32_t time_msec) {
         desktop_damage_whole_container(e->con);
         container_floating_move_to(e->con, cursor->x - e->dx, cursor->y - e->dy);
         desktop_damage_whole_container(e->con);
+        transaction_commit_dirty();
 }
 
 static void handle_unref(struct sway_seat *seat, struct sway_container *con) {
@@ -67,13 +70,14 @@ void seatop_begin_move_floating(struct sway_seat *seat,
                 return;
         }
         e->con = con;
-        e->dx = cursor->cursor->x - con->x;
-        e->dy = cursor->cursor->y - con->y;
+        e->dx = cursor->cursor->x - con->pending.x;
+        e->dy = cursor->cursor->y - con->pending.y;
 
         seat->seatop_impl = &seatop_impl;
         seat->seatop_data = e;
 
         container_raise_floating(con);
+        transaction_commit_dirty();
 
         cursor_set_image(cursor, "grab", NULL);
         wlr_seat_pointer_notify_clear_focus(seat->wlr_seat);
diff --git a/sway/input/seatop_move_tiling.c b/sway/input/seatop_move_tiling.c
index 704e7270..223c6c08 100644
--- a/sway/input/seatop_move_tiling.c
+++ b/sway/input/seatop_move_tiling.c
@@ -3,6 +3,7 @@
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/util/edges.h>
 #include "sway/desktop.h"
+#include "sway/desktop/transaction.h"
 #include "sway/input/cursor.h"
 #include "sway/input/seat.h"
 #include "sway/ipc-server.h"
@@ -15,6 +16,10 @@
 // Thickness of the dropzone when dragging to the edge of a layout container
 #define DROP_LAYOUT_BORDER 30
 
+// Thickness of indicator when dropping onto a titlebar.  This should be a
+// multiple of 2.
+#define DROP_SPLIT_INDICATOR 10
+
 struct seatop_move_tiling_event {
         struct sway_container *con;
         struct sway_node *target_node;
@@ -22,6 +27,8 @@ struct seatop_move_tiling_event {
         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;
 };
 
 static void handle_render(struct sway_seat *seat,
@@ -91,8 +98,76 @@ static void resize_box(struct wlr_box *box, enum wlr_edges edge,
         }
 }
 
+static void split_border(double pos, int offset, int len, int n_children,
+                int avoid, int *out_pos, bool *out_after) {
+        int region = 2 * n_children * (pos - offset) / len;
+        // If the cursor is over the right side of a left-adjacent titlebar, or the
+        // left side of a right-adjacent titlebar, it's position when dropped will
+        // be the same.  To avoid this, shift the region for adjacent containers.
+        if (avoid >= 0) {
+                if (region == 2 * avoid - 1 || region == 2 * avoid) {
+                        region--;
+                } else if (region == 2 * avoid + 1 || region == 2 * avoid + 2) {
+                        region++;
+                }
+        }
+
+        int child_index = (region + 1) / 2;
+        *out_after = region % 2;
+        // When dropping at the beginning or end of a container, show the drop
+        // region within the container boundary, otherwise show it on top of the
+        // border between two titlebars.
+        if (child_index == 0) {
+                *out_pos = offset;
+        } else if (child_index == n_children) {
+                *out_pos = offset + len - DROP_SPLIT_INDICATOR;
+        } else {
+                *out_pos = offset + child_index * len / n_children -
+                        DROP_SPLIT_INDICATOR / 2;
+        }
+}
+
+static bool split_titlebar(struct sway_node *node, struct sway_container *avoid,
+                struct wlr_cursor *cursor, struct wlr_box *title_box, bool *after) {
+        struct sway_container *con = node->sway_container;
+        struct sway_node *parent = &con->pending.parent->node;
+        int title_height = container_titlebar_height();
+        struct wlr_box box;
+        int n_children, avoid_index;
+        enum sway_container_layout layout =
+                parent ? node_get_layout(parent) : L_NONE;
+        if (layout == L_TABBED || layout == L_STACKED) {
+                node_get_box(parent, &box);
+                n_children = node_get_children(parent)->length;
+                avoid_index = list_find(node_get_children(parent), avoid);
+        } else {
+                node_get_box(node, &box);
+                n_children = 1;
+                avoid_index = -1;
+        }
+        if (layout == L_STACKED && cursor->y < box.y + title_height * n_children) {
+                // Drop into stacked titlebars.
+                title_box->width = box.width;
+                title_box->height = DROP_SPLIT_INDICATOR;
+                title_box->x = box.x;
+                split_border(cursor->y, box.y, title_height * n_children,
+                        n_children, avoid_index, &title_box->y, after);
+                return true;
+        } else if (layout != L_STACKED && cursor->y < box.y + title_height) {
+                // Drop into side-by-side titlebars.
+                title_box->width = DROP_SPLIT_INDICATOR;
+                title_box->height = title_height;
+                title_box->y = box.y;
+                split_border(cursor->x, box.x, box.width, n_children,
+                        avoid_index, &title_box->x, after);
+                return true;
+        }
+        return false;
+}
+
 static void handle_motion_postthreshold(struct sway_seat *seat) {
         struct seatop_move_tiling_event *e = seat->seatop_data;
+        e->split_target = false;
         struct wlr_surface *surface = NULL;
         double sx, sy;
         struct sway_cursor *cursor = seat->cursor;
@@ -119,34 +194,60 @@ static void handle_motion_postthreshold(struct sway_seat *seat) {
 
         // Deny moving within own workspace if this is the only child
         struct sway_container *con = node->sway_container;
-        if (workspace_num_tiling_views(e->con->workspace) == 1 &&
-                        con->workspace == e->con->workspace) {
+        if (workspace_num_tiling_views(e->con->pending.workspace) == 1 &&
+                        con->pending.workspace == e->con->pending.workspace) {
                 e->target_node = NULL;
                 e->target_edge = WLR_EDGE_NONE;
                 return;
         }
 
+        // 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)) {
+                // Don't allow dropping over the source container's titlebar
+                // to give users a chance to cancel a drag operation.
+                if (con == e->con) {
+                        e->target_node = NULL;
+                } else {
+                        e->target_node = node;
+                        e->split_target = true;
+                }
+                e->target_edge = WLR_EDGE_NONE;
+                return;
+        }
+
         // Traverse the ancestors, trying to find a layout container perpendicular
         // to the edge. Eg. close to the top or bottom of a horiz layout.
+        int thresh_top = con->pending.content_y + DROP_LAYOUT_BORDER;
+        int thresh_bottom = con->pending.content_y +
+                con->pending.content_height - DROP_LAYOUT_BORDER;
+        int thresh_left = con->pending.content_x + DROP_LAYOUT_BORDER;
+        int thresh_right = con->pending.content_x +
+                con->pending.content_width - DROP_LAYOUT_BORDER;
         while (con) {
                 enum wlr_edges edge = WLR_EDGE_NONE;
                 enum sway_container_layout layout = container_parent_layout(con);
-                struct wlr_box parent;
-                con->parent ? container_get_box(con->parent, &parent) :
-                        workspace_get_box(con->workspace, &parent);
+                struct wlr_box box;
+                node_get_box(node_get_parent(&con->node), &box);
                 if (layout == L_HORIZ || layout == L_TABBED) {
-                        if (cursor->cursor->y < parent.y + DROP_LAYOUT_BORDER) {
+                        if (cursor->cursor->y < thresh_top) {
                                 edge = WLR_EDGE_TOP;
-                        } else if (cursor->cursor->y > parent.y + parent.height
-                                        - DROP_LAYOUT_BORDER) {
+                                box.height = thresh_top - box.y;
+                        } else if (cursor->cursor->y > thresh_bottom) {
                                 edge = WLR_EDGE_BOTTOM;
+                                box.height = box.y + box.height - thresh_bottom;
+                                box.y = thresh_bottom;
                         }
                 } else if (layout == L_VERT || layout == L_STACKED) {
-                        if (cursor->cursor->x < parent.x + DROP_LAYOUT_BORDER) {
+                        if (cursor->cursor->x < thresh_left) {
                                 edge = WLR_EDGE_LEFT;
-                        } else if (cursor->cursor->x > parent.x + parent.width
-                                        - DROP_LAYOUT_BORDER) {
+                                box.width = thresh_left - box.x;
+                        } else if (cursor->cursor->x > thresh_right) {
                                 edge = WLR_EDGE_RIGHT;
+                                box.width = box.x + box.width - thresh_right;
+                                box.x = thresh_right;
                         }
                 }
                 if (edge) {
@@ -155,12 +256,11 @@ static void handle_motion_postthreshold(struct sway_seat *seat) {
                                 e->target_node = node_get_parent(e->target_node);
                         }
                         e->target_edge = edge;
-                        node_get_box(e->target_node, &e->drop_box);
-                        resize_box(&e->drop_box, edge, DROP_LAYOUT_BORDER);
+                        e->drop_box = box;
                         desktop_damage_box(&e->drop_box);
                         return;
                 }
-                con = con->parent;
+                con = con->pending.parent;
         }
 
         // Use the hovered view - but we must be over the actual surface
@@ -173,23 +273,23 @@ static void handle_motion_postthreshold(struct sway_seat *seat) {
         }
 
         // Find the closest edge
-        size_t thickness = fmin(con->content_width, con->content_height) * 0.3;
+        size_t thickness = fmin(con->pending.content_width, con->pending.content_height) * 0.3;
         size_t closest_dist = INT_MAX;
         size_t dist;
         e->target_edge = WLR_EDGE_NONE;
-        if ((dist = cursor->cursor->y - con->y) < closest_dist) {
+        if ((dist = cursor->cursor->y - con->pending.y) < closest_dist) {
                 closest_dist = dist;
                 e->target_edge = WLR_EDGE_TOP;
         }
-        if ((dist = cursor->cursor->x - con->x) < closest_dist) {
+        if ((dist = cursor->cursor->x - con->pending.x) < closest_dist) {
                 closest_dist = dist;
                 e->target_edge = WLR_EDGE_LEFT;
         }
-        if ((dist = con->x + con->width - cursor->cursor->x) < closest_dist) {
+        if ((dist = con->pending.x + con->pending.width - cursor->cursor->x) < closest_dist) {
                 closest_dist = dist;
                 e->target_edge = WLR_EDGE_RIGHT;
         }
-        if ((dist = con->y + con->height - cursor->cursor->y) < closest_dist) {
+        if ((dist = con->pending.y + con->pending.height - cursor->cursor->y) < closest_dist) {
                 closest_dist = dist;
                 e->target_edge = WLR_EDGE_BOTTOM;
         }
@@ -199,10 +299,10 @@ static void handle_motion_postthreshold(struct sway_seat *seat) {
         }
 
         e->target_node = node;
-        e->drop_box.x = con->content_x;
-        e->drop_box.y = con->content_y;
-        e->drop_box.width = con->content_width;
-        e->drop_box.height = con->content_height;
+        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);
 }
@@ -214,6 +314,7 @@ static void handle_pointer_motion(struct sway_seat *seat, uint32_t time_msec) {
         } else {
                 handle_motion_prethreshold(seat);
         }
+        transaction_commit_dirty();
 }
 
 static bool is_parallel(enum sway_container_layout layout,
@@ -232,14 +333,15 @@ static void finalize_move(struct sway_seat *seat) {
         }
 
         struct sway_container *con = e->con;
-        struct sway_container *old_parent = con->parent;
-        struct sway_workspace *old_ws = con->workspace;
+        struct sway_container *old_parent = con->pending.parent;
+        struct sway_workspace *old_ws = con->pending.workspace;
         struct sway_node *target_node = e->target_node;
         struct sway_workspace *new_ws = target_node->type == N_WORKSPACE ?
-                target_node->sway_workspace : target_node->sway_container->workspace;
+                target_node->sway_workspace : target_node->sway_container->pending.workspace;
         enum wlr_edges edge = e->target_edge;
         int after = edge != WLR_EDGE_TOP && edge != WLR_EDGE_LEFT;
-        bool swap = edge == WLR_EDGE_NONE && target_node->type == N_CONTAINER;
+        bool swap = edge == WLR_EDGE_NONE && target_node->type == N_CONTAINER &&
+                !e->split_target;
 
         if (!swap) {
                 container_detach(con);
@@ -248,6 +350,14 @@ static void finalize_move(struct sway_seat *seat) {
         // Moving container into empty workspace
         if (target_node->type == N_WORKSPACE && edge == WLR_EDGE_NONE) {
                 con = workspace_add_tiling(new_ws, con);
+        } else if (e->split_target) {
+                struct sway_container *target = target_node->sway_container;
+                enum sway_container_layout layout = container_parent_layout(target);
+                if (layout != L_TABBED && layout != L_STACKED) {
+                        container_split(target, L_TABBED);
+                }
+                container_add_sibling(target, con, e->insert_after_target);
+                ipc_event_window(con, "move");
         } else if (target_node->type == N_CONTAINER) {
                 // Moving container before/after another
                 struct sway_container *target = target_node->sway_container;
@@ -283,8 +393,8 @@ static void finalize_move(struct sway_seat *seat) {
                 int index = list_find(siblings, con);
                 struct sway_container *sibling = index == 0 ?
                         siblings->items[1] : siblings->items[index - 1];
-                con->width = sibling->width;
-                con->height = sibling->height;
+                con->pending.width = sibling->pending.width;
+                con->pending.height = sibling->pending.height;
                 con->width_fraction = sibling->width_fraction;
                 con->height_fraction = sibling->height_fraction;
         }
@@ -294,6 +404,7 @@ static void finalize_move(struct sway_seat *seat) {
                 arrange_workspace(new_ws);
         }
 
+        transaction_commit_dirty();
         seatop_begin_default(seat);
 }
 
@@ -348,6 +459,7 @@ void seatop_begin_move_tiling_threshold(struct sway_seat *seat,
         seat->seatop_data = e;
 
         container_raise_floating(con);
+        transaction_commit_dirty();
         wlr_seat_pointer_notify_clear_focus(seat->wlr_seat);
 }
 
diff --git a/sway/input/seatop_resize_floating.c b/sway/input/seatop_resize_floating.c
index 5da22e47..df683026 100644
--- a/sway/input/seatop_resize_floating.c
+++ b/sway/input/seatop_resize_floating.c
@@ -2,6 +2,7 @@
 #include <limits.h>
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_xcursor_manager.h>
+#include "sway/desktop/transaction.h"
 #include "sway/input/cursor.h"
 #include "sway/input/seat.h"
 #include "sway/tree/arrange.h"
@@ -27,6 +28,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
         if (seat->cursor->pressed_button_count == 0) {
                 container_set_resizing(con, false);
                 arrange_container(con); // Send configure w/o resizing hint
+                transaction_commit_dirty();
                 seatop_begin_default(seat);
         }
 }
@@ -78,17 +80,25 @@ static void handle_pointer_motion(struct sway_seat *seat, uint32_t time_msec) {
         double height = e->ref_height + grow_height;
         int min_width, max_width, min_height, max_height;
         floating_calculate_constraints(&min_width, &max_width,
-                        &min_height, &max_height);
-        width = fmax(min_width + border_width, fmin(width, max_width));
-        height = fmax(min_height + border_height, fmin(height, max_height));
+                &min_height, &max_height);
+        width = fmin(width, max_width - border_width);
+        width = fmax(width, min_width + border_width);
+        width = fmax(width, 1);
+        height = fmin(height, max_height - border_height);
+        height = fmax(height, min_height + border_height);
+        height = fmax(height, 1);
 
         // Apply the view's min/max size
         if (con->view) {
                 double view_min_width, view_max_width, view_min_height, view_max_height;
                 view_get_constraints(con->view, &view_min_width, &view_max_width,
                                 &view_min_height, &view_max_height);
-                width = fmax(view_min_width + border_width, fmin(width, view_max_width));
-                height = fmax(view_min_height + border_height, fmin(height, view_max_height));
+                width = fmin(width, view_max_width - border_width);
+                width = fmax(width, view_min_width + border_width);
+                width = fmax(width, 1);
+                height = fmin(height, view_max_height - border_height);
+                height = fmax(height, view_min_height + border_height);
+                height = fmax(height, 1);
 
         }
 
@@ -116,23 +126,24 @@ static void handle_pointer_motion(struct sway_seat *seat, uint32_t time_msec) {
 
         // Determine the amounts we need to bump everything relative to the current
         // size.
-        int relative_grow_width = width - con->width;
-        int relative_grow_height = height - con->height;
-        int relative_grow_x = (e->ref_con_lx + grow_x) - con->x;
-        int relative_grow_y = (e->ref_con_ly + grow_y) - con->y;
+        int relative_grow_width = width - con->pending.width;
+        int relative_grow_height = height - con->pending.height;
+        int relative_grow_x = (e->ref_con_lx + grow_x) - con->pending.x;
+        int relative_grow_y = (e->ref_con_ly + grow_y) - con->pending.y;
 
         // Actually resize stuff
-        con->x += relative_grow_x;
-        con->y += relative_grow_y;
-        con->width += relative_grow_width;
-        con->height += relative_grow_height;
+        con->pending.x += relative_grow_x;
+        con->pending.y += relative_grow_y;
+        con->pending.width += relative_grow_width;
+        con->pending.height += relative_grow_height;
 
-        con->content_x += relative_grow_x;
-        con->content_y += relative_grow_y;
-        con->content_width += relative_grow_width;
-        con->content_height += relative_grow_height;
+        con->pending.content_x += relative_grow_x;
+        con->pending.content_y += relative_grow_y;
+        con->pending.content_width += relative_grow_width;
+        con->pending.content_height += relative_grow_height;
 
         arrange_container(con);
+        transaction_commit_dirty();
 }
 
 static void handle_unref(struct sway_seat *seat, struct sway_container *con) {
@@ -166,16 +177,17 @@ void seatop_begin_resize_floating(struct sway_seat *seat,
         e->edge = edge == WLR_EDGE_NONE ? WLR_EDGE_BOTTOM | WLR_EDGE_RIGHT : edge;
         e->ref_lx = seat->cursor->cursor->x;
         e->ref_ly = seat->cursor->cursor->y;
-        e->ref_con_lx = con->x;
-        e->ref_con_ly = con->y;
-        e->ref_width = con->width;
-        e->ref_height = con->height;
+        e->ref_con_lx = con->pending.x;
+        e->ref_con_ly = con->pending.y;
+        e->ref_width = con->pending.width;
+        e->ref_height = con->pending.height;
 
         seat->seatop_impl = &seatop_impl;
         seat->seatop_data = e;
 
         container_set_resizing(con, true);
         container_raise_floating(con);
+        transaction_commit_dirty();
 
         const char *image = edge == WLR_EDGE_NONE ?
                 "se-resize" : wlr_xcursor_get_resize_name(edge);
diff --git a/sway/input/seatop_resize_tiling.c b/sway/input/seatop_resize_tiling.c
index 2cca805d..869d11b5 100644
--- a/sway/input/seatop_resize_tiling.c
+++ b/sway/input/seatop_resize_tiling.c
@@ -2,6 +2,7 @@
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/util/edges.h>
 #include "sway/commands.h"
+#include "sway/desktop/transaction.h"
 #include "sway/input/cursor.h"
 #include "sway/input/seat.h"
 #include "sway/tree/arrange.h"
@@ -52,21 +53,22 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
                 if (e->h_con) {
                         container_set_resizing(e->h_con, false);
                         container_set_resizing(e->h_sib, false);
-                        if (e->h_con->parent) {
-                                arrange_container(e->h_con->parent);
+                        if (e->h_con->pending.parent) {
+                                arrange_container(e->h_con->pending.parent);
                         } else {
-                                arrange_workspace(e->h_con->workspace);
+                                arrange_workspace(e->h_con->pending.workspace);
                         }
                 }
                 if (e->v_con) {
                         container_set_resizing(e->v_con, false);
                         container_set_resizing(e->v_sib, false);
-                        if (e->v_con->parent) {
-                                arrange_container(e->v_con->parent);
+                        if (e->v_con->pending.parent) {
+                                arrange_container(e->v_con->pending.parent);
                         } else {
-                                arrange_workspace(e->v_con->workspace);
+                                arrange_workspace(e->v_con->pending.workspace);
                         }
                 }
+                transaction_commit_dirty();
                 seatop_begin_default(seat);
         }
 }
@@ -80,16 +82,16 @@ static void handle_pointer_motion(struct sway_seat *seat, uint32_t time_msec) {
 
         if (e->h_con) {
                 if (e->edge & WLR_EDGE_LEFT) {
-                        amount_x = (e->h_con_orig_width - moved_x) - e->h_con->width;
+                        amount_x = (e->h_con_orig_width - moved_x) - e->h_con->pending.width;
                 } else if (e->edge & WLR_EDGE_RIGHT) {
-                        amount_x = (e->h_con_orig_width + moved_x) - e->h_con->width;
+                        amount_x = (e->h_con_orig_width + moved_x) - e->h_con->pending.width;
                 }
         }
         if (e->v_con) {
                 if (e->edge & WLR_EDGE_TOP) {
-                        amount_y = (e->v_con_orig_height - moved_y) - e->v_con->height;
+                        amount_y = (e->v_con_orig_height - moved_y) - e->v_con->pending.height;
                 } else if (e->edge & WLR_EDGE_BOTTOM) {
-                        amount_y = (e->v_con_orig_height + moved_y) - e->v_con->height;
+                        amount_y = (e->v_con_orig_height + moved_y) - e->v_con->pending.height;
                 }
         }
 
@@ -99,6 +101,7 @@ static void handle_pointer_motion(struct sway_seat *seat, uint32_t time_msec) {
         if (amount_y != 0) {
                 container_resize_tiled(e->v_con, e->edge_y, amount_y);
         }
+        transaction_commit_dirty();
 }
 
 static void handle_unref(struct sway_seat *seat, struct sway_container *con) {
@@ -140,7 +143,7 @@ void seatop_begin_resize_tiling(struct sway_seat *seat,
                 if (e->h_con) {
                         container_set_resizing(e->h_con, true);
                         container_set_resizing(e->h_sib, true);
-                        e->h_con_orig_width = e->h_con->width;
+                        e->h_con_orig_width = e->h_con->pending.width;
                 }
         }
         if (edge & (WLR_EDGE_TOP | WLR_EDGE_BOTTOM)) {
@@ -151,12 +154,13 @@ void seatop_begin_resize_tiling(struct sway_seat *seat,
                 if (e->v_con) {
                         container_set_resizing(e->v_con, true);
                         container_set_resizing(e->v_sib, true);
-                        e->v_con_orig_height = e->v_con->height;
+                        e->v_con_orig_height = e->v_con->pending.height;
                 }
         }
 
         seat->seatop_impl = &seatop_impl;
         seat->seatop_data = e;
 
+        transaction_commit_dirty();
         wlr_seat_pointer_notify_clear_focus(seat->wlr_seat);
 }
diff --git a/sway/input/switch.c b/sway/input/switch.c
index b7c28df1..9ea87a1a 100644
--- a/sway/input/switch.c
+++ b/sway/input/switch.c
@@ -1,5 +1,4 @@
 #include "sway/config.h"
-#include "sway/desktop/transaction.h"
 #include "sway/input/switch.h"
 #include <wlr/types/wlr_idle.h>
 #include "log.h"
@@ -61,9 +60,6 @@ static void execute_binding(struct sway_switch *sway_switch) {
                 seat_execute_command(seat, dummy_binding);
                 free(dummy_binding);
         }
-
-        transaction_commit_dirty();
-
 }
 
 static void handle_switch_toggle(struct wl_listener *listener, void *data) {
diff --git a/sway/input/text_input.c b/sway/input/text_input.c
index f83726ee..b8c19c17 100644
--- a/sway/input/text_input.c
+++ b/sway/input/text_input.c
@@ -55,6 +55,37 @@ static void handle_im_commit(struct wl_listener *listener, void *data) {
         wlr_text_input_v3_send_done(text_input->input);
 }
 
+static void handle_im_keyboard_grab_destroy(struct wl_listener *listener, void *data) {
+        struct sway_input_method_relay *relay = wl_container_of(listener, relay,
+                input_method_keyboard_grab_destroy);
+        struct wlr_input_method_keyboard_grab_v2 *keyboard_grab = data;
+        wl_list_remove(&relay->input_method_keyboard_grab_destroy.link);
+
+        if (keyboard_grab->keyboard) {
+                // send modifier state to original client
+                wlr_seat_keyboard_notify_modifiers(keyboard_grab->input_method->seat,
+                        &keyboard_grab->keyboard->modifiers);
+        }
+}
+
+static void handle_im_grab_keyboard(struct wl_listener *listener, void *data) {
+        struct sway_input_method_relay *relay = wl_container_of(listener, relay,
+                input_method_grab_keyboard);
+        struct wlr_input_method_keyboard_grab_v2 *keyboard_grab = data;
+
+        // send modifier state to grab
+        struct wlr_keyboard *active_keyboard = wlr_seat_get_keyboard(relay->seat->wlr_seat);
+        wlr_input_method_keyboard_grab_v2_set_keyboard(keyboard_grab,
+                active_keyboard);
+        wlr_input_method_keyboard_grab_v2_send_modifiers(keyboard_grab,
+                &active_keyboard->modifiers);
+
+        wl_signal_add(&keyboard_grab->events.destroy,
+                &relay->input_method_keyboard_grab_destroy);
+        relay->input_method_keyboard_grab_destroy.notify =
+                handle_im_keyboard_grab_destroy;
+}
+
 static void text_input_set_pending_focused_surface(
                 struct sway_text_input *text_input, struct wlr_surface *surface) {
         wl_list_remove(&text_input->pending_focused_surface_destroy.link);
@@ -92,13 +123,18 @@ static void relay_send_im_state(struct sway_input_method_relay *relay,
                 return;
         }
         // TODO: only send each of those if they were modified
-        wlr_input_method_v2_send_surrounding_text(input_method,
-                input->current.surrounding.text, input->current.surrounding.cursor,
-                input->current.surrounding.anchor);
+        if (input->active_features & WLR_TEXT_INPUT_V3_FEATURE_SURROUNDING_TEXT) {
+                wlr_input_method_v2_send_surrounding_text(input_method,
+                        input->current.surrounding.text, input->current.surrounding.cursor,
+                        input->current.surrounding.anchor);
+        }
         wlr_input_method_v2_send_text_change_cause(input_method,
                 input->current.text_change_cause);
-        wlr_input_method_v2_send_content_type(input_method,
-                input->current.content_type.hint, input->current.content_type.purpose);
+        if (input->active_features & WLR_TEXT_INPUT_V3_FEATURE_CONTENT_TYPE) {
+                wlr_input_method_v2_send_content_type(input_method,
+                        input->current.content_type.hint,
+                        input->current.content_type.purpose);
+        }
         wlr_input_method_v2_send_done(input_method);
         // TODO: pass intent, display popup size
 }
@@ -144,6 +180,10 @@ static void handle_text_input_disable(struct wl_listener *listener,
                 void *data) {
         struct sway_text_input *text_input = wl_container_of(listener, text_input,
                 text_input_disable);
+        if (text_input->input->focused_surface == NULL) {
+                sway_log(SWAY_DEBUG, "Disabling text input, but no longer focused");
+                return;
+        }
         relay_disable_text_input(text_input->relay, text_input);
 }
 
@@ -236,6 +276,9 @@ static void relay_handle_input_method(struct wl_listener *listener,
         wl_signal_add(&relay->input_method->events.commit,
                 &relay->input_method_commit);
         relay->input_method_commit.notify = handle_im_commit;
+        wl_signal_add(&relay->input_method->events.grab_keyboard,
+                &relay->input_method_grab_keyboard);
+        relay->input_method_grab_keyboard.notify = handle_im_grab_keyboard;
         wl_signal_add(&relay->input_method->events.destroy,
                 &relay->input_method_destroy);
         relay->input_method_destroy.notify = handle_im_destroy;
diff --git a/sway/ipc-json.c b/sway/ipc-json.c
index fceee84d..8357ae04 100644
--- a/sway/ipc-json.c
+++ b/sway/ipc-json.c
@@ -1,7 +1,11 @@
+#include <ctype.h>
+#include <float.h>
 #include <json.h>
 #include <libevdev/libevdev.h>
 #include <stdio.h>
-#include <ctype.h>
+#include <wlr/backend/libinput.h>
+#include <wlr/types/wlr_output.h>
+#include <xkbcommon/xkbcommon.h>
 #include "config.h"
 #include "log.h"
 #include "sway/config.h"
@@ -13,16 +17,26 @@
 #include "sway/input/input-manager.h"
 #include "sway/input/cursor.h"
 #include "sway/input/seat.h"
-#include <wlr/backend/libinput.h>
-#include <wlr/types/wlr_box.h>
-#include <wlr/types/wlr_output.h>
-#include <xkbcommon/xkbcommon.h>
 #include "wlr-layer-shell-unstable-v1-protocol.h"
 #include "sway/desktop/idle_inhibit_v1.h"
 
 static const int i3_output_id = INT32_MAX;
 static const int i3_scratch_id = INT32_MAX - 1;
 
+static const char *ipc_json_node_type_description(enum sway_node_type node_type) {
+        switch (node_type) {
+        case N_ROOT:
+                return "root";
+        case N_OUTPUT:
+                return "output";
+        case N_WORKSPACE:
+                return "workspace";
+        case N_CONTAINER:
+                return "con";
+        }
+        return "none";
+}
+
 static const char *ipc_json_layout_description(enum sway_container_layout l) {
         switch (l) {
         case L_VERT:
@@ -189,16 +203,22 @@ static json_object *ipc_json_create_empty_rect(void) {
         return ipc_json_create_rect(&empty);
 }
 
-static json_object *ipc_json_create_node(int id, char *name,
+static json_object *ipc_json_create_node(int id, const char* type, char *name,
                 bool focused, json_object *focus, struct wlr_box *box) {
         json_object *object = json_object_new_object();
 
         json_object_object_add(object, "id", json_object_new_int(id));
-        json_object_object_add(object, "name",
-                        name ? json_object_new_string(name) : NULL);
-        json_object_object_add(object, "rect", ipc_json_create_rect(box));
+        json_object_object_add(object, "type", json_object_new_string(type));
+        json_object_object_add(object, "orientation",
+                        json_object_new_string(
+                                ipc_json_orientation_description(L_HORIZ)));
+        json_object_object_add(object, "percent", NULL);
+        json_object_object_add(object, "urgent", json_object_new_boolean(false));
+        json_object_object_add(object, "marks", json_object_new_array());
         json_object_object_add(object, "focused", json_object_new_boolean(focused));
-        json_object_object_add(object, "focus", focus);
+        json_object_object_add(object, "layout",
+                        json_object_new_string(
+                                ipc_json_layout_description(L_HORIZ)));
 
         // set default values to be compatible with i3
         json_object_object_add(object, "border",
@@ -206,35 +226,25 @@ static json_object *ipc_json_create_node(int id, char *name,
                                 ipc_json_border_description(B_NONE)));
         json_object_object_add(object, "current_border_width",
                         json_object_new_int(0));
-        json_object_object_add(object, "layout",
-                        json_object_new_string(
-                                ipc_json_layout_description(L_HORIZ)));
-        json_object_object_add(object, "orientation",
-                        json_object_new_string(
-                                ipc_json_orientation_description(L_HORIZ)));
-        json_object_object_add(object, "percent", NULL);
-        json_object_object_add(object, "window_rect", ipc_json_create_empty_rect());
+        json_object_object_add(object, "rect", ipc_json_create_rect(box));
         json_object_object_add(object, "deco_rect", ipc_json_create_empty_rect());
+        json_object_object_add(object, "window_rect", ipc_json_create_empty_rect());
         json_object_object_add(object, "geometry", ipc_json_create_empty_rect());
+        json_object_object_add(object, "name",
+                        name ? json_object_new_string(name) : NULL);
         json_object_object_add(object, "window", NULL);
-        json_object_object_add(object, "urgent", json_object_new_boolean(false));
-        json_object_object_add(object, "marks", json_object_new_array());
-        json_object_object_add(object, "fullscreen_mode", json_object_new_int(0));
         json_object_object_add(object, "nodes", json_object_new_array());
         json_object_object_add(object, "floating_nodes", json_object_new_array());
+        json_object_object_add(object, "focus", focus);
+        json_object_object_add(object, "fullscreen_mode", json_object_new_int(0));
         json_object_object_add(object, "sticky", json_object_new_boolean(false));
 
         return object;
 }
 
-static void ipc_json_describe_root(struct sway_root *root, json_object *object) {
-        json_object_object_add(object, "type", json_object_new_string("root"));
-}
-
 static void ipc_json_describe_output(struct sway_output *output,
                 json_object *object) {
         struct wlr_output *wlr_output = output->wlr_output;
-        json_object_object_add(object, "type", json_object_new_string("output"));
         json_object_object_add(object, "active", json_object_new_boolean(true));
         json_object_object_add(object, "dpms",
                         json_object_new_boolean(wlr_output->enabled));
@@ -369,11 +379,9 @@ static json_object *ipc_json_describe_scratchpad_output(void) {
                                 json_object_new_int(container->node.id));
         }
 
-        json_object *workspace = ipc_json_create_node(i3_scratch_id,
+        json_object *workspace = ipc_json_create_node(i3_scratch_id, "workspace",
                                 "__i3_scratch", false, workspace_focus, &box);
         json_object_object_add(workspace, "fullscreen_mode", json_object_new_int(1));
-        json_object_object_add(workspace, "type",
-                        json_object_new_string("workspace"));
 
         // List all hidden scratchpad containers as floating nodes
         json_object *floating_array = json_object_new_array();
@@ -390,10 +398,8 @@ static json_object *ipc_json_describe_scratchpad_output(void) {
         json_object *output_focus = json_object_new_array();
         json_object_array_add(output_focus, json_object_new_int(i3_scratch_id));
 
-        json_object *output = ipc_json_create_node(i3_output_id,
+        json_object *output = ipc_json_create_node(i3_output_id, "output",
                                         "__i3", false, output_focus, &box);
-        json_object_object_add(output, "type",
-                        json_object_new_string("output"));
         json_object_object_add(output, "layout",
                         json_object_new_string("output"));
 
@@ -423,7 +429,6 @@ static void ipc_json_describe_workspace(struct sway_workspace *workspace,
         json_object_object_add(object, "fullscreen_mode", json_object_new_int(1));
         json_object_object_add(object, "output", workspace->output ?
                         json_object_new_string(workspace->output->wlr_output->name) : NULL);
-        json_object_object_add(object, "type", json_object_new_string("workspace"));
         json_object_object_add(object, "urgent",
                         json_object_new_boolean(workspace->urgent));
         json_object_object_add(object, "representation", workspace->representation ?
@@ -451,27 +456,27 @@ static void get_deco_rect(struct sway_container *c, struct wlr_box *deco_rect) {
         bool tab_or_stack = parent_layout == L_TABBED || parent_layout == L_STACKED;
         if (((!tab_or_stack || container_is_floating(c)) &&
                                 c->current.border != B_NORMAL) ||
-                        c->fullscreen_mode != FULLSCREEN_NONE ||
-                        c->workspace == NULL) {
+                        c->pending.fullscreen_mode != FULLSCREEN_NONE ||
+                        c->pending.workspace == NULL) {
                 deco_rect->x = deco_rect->y = deco_rect->width = deco_rect->height = 0;
                 return;
         }
 
-        if (c->parent) {
-                deco_rect->x = c->x - c->parent->x;
-                deco_rect->y = c->y - c->parent->y;
+        if (c->pending.parent) {
+                deco_rect->x = c->pending.x - c->pending.parent->pending.x;
+                deco_rect->y = c->pending.y - c->pending.parent->pending.y;
         } else {
-                deco_rect->x = c->x - c->workspace->x;
-                deco_rect->y = c->y - c->workspace->y;
+                deco_rect->x = c->pending.x - c->pending.workspace->x;
+                deco_rect->y = c->pending.y - c->pending.workspace->y;
         }
-        deco_rect->width = c->width;
+        deco_rect->width = c->pending.width;
         deco_rect->height = container_titlebar_height();
 
         if (!container_is_floating(c)) {
                 if (parent_layout == L_TABBED) {
-                        deco_rect->width = c->parent
-                                ? c->parent->width / c->parent->children->length
-                                : c->workspace->width / c->workspace->tiling->length;
+                        deco_rect->width = c->pending.parent
+                                ? c->pending.parent->pending.width / c->pending.parent->pending.children->length
+                                : c->pending.workspace->width / c->pending.workspace->tiling->length;
                         deco_rect->x += deco_rect->width * container_sibling_index(c);
                 } else if (parent_layout == L_STACKED) {
                         if (!c->view) {
@@ -494,10 +499,10 @@ static void ipc_json_describe_view(struct sway_container *c, json_object *object
         json_object_object_add(object, "visible", json_object_new_boolean(visible));
 
         struct wlr_box window_box = {
-                c->content_x - c->x,
+                c->pending.content_x - c->pending.x,
                 (c->current.border == B_PIXEL) ? c->current.border_thickness : 0,
-                c->content_width,
-                c->content_height
+                c->pending.content_width,
+                c->pending.content_height
         };
 
         json_object_object_add(object, "window_rect", ipc_json_create_rect(&window_box));
@@ -583,16 +588,18 @@ static void ipc_json_describe_view(struct sway_container *c, json_object *object
 static void ipc_json_describe_container(struct sway_container *c, json_object *object) {
         json_object_object_add(object, "name",
                         c->title ? json_object_new_string(c->title) : NULL);
-        json_object_object_add(object, "type",
-                        json_object_new_string(container_is_floating(c) ? "floating_con" : "con"));
+        if (container_is_floating(c)) {
+                json_object_object_add(object, "type",
+                                json_object_new_string("floating_con"));
+        }
 
         json_object_object_add(object, "layout",
                         json_object_new_string(
-                                ipc_json_layout_description(c->layout)));
+                                ipc_json_layout_description(c->pending.layout)));
 
         json_object_object_add(object, "orientation",
                         json_object_new_string(
-                                ipc_json_orientation_description(c->layout)));
+                                ipc_json_orientation_description(c->pending.layout)));
 
         bool urgent = c->view ?
                 view_is_urgent(c->view) : container_has_urgent_child(c);
@@ -600,7 +607,7 @@ static void ipc_json_describe_container(struct sway_container *c, json_object *o
         json_object_object_add(object, "sticky", json_object_new_boolean(c->is_sticky));
 
         json_object_object_add(object, "fullscreen_mode",
-                        json_object_new_int(c->fullscreen_mode));
+                        json_object_new_int(c->pending.fullscreen_mode));
 
         struct sway_node *parent = node_get_parent(&c->node);
         struct wlr_box parent_box = {0, 0, 0, 0};
@@ -610,8 +617,8 @@ static void ipc_json_describe_container(struct sway_container *c, json_object *o
         }
 
         if (parent_box.width != 0 && parent_box.height != 0) {
-                double percent = ((double)c->width / parent_box.width)
-                                * ((double)c->height / parent_box.height);
+                double percent = ((double)c->pending.width / parent_box.width)
+                                * ((double)c->pending.height / parent_box.height);
                 json_object_object_add(object, "percent", json_object_new_double(percent));
         }
 
@@ -692,12 +699,11 @@ json_object *ipc_json_describe_node(struct sway_node *node) {
         };
         seat_for_each_node(seat, focus_inactive_children_iterator, &data);
 
-        json_object *object = ipc_json_create_node(
-                                (int)node->id, name, focused, focus, &box);
+        json_object *object = ipc_json_create_node((int)node->id,
+                                ipc_json_node_type_description(node->type), name, focused, focus, &box);
 
         switch (node->type) {
         case N_ROOT:
-                ipc_json_describe_root(root, object);
                 break;
         case N_OUTPUT:
                 ipc_json_describe_output(node->sway_output, object);
@@ -743,10 +749,10 @@ json_object *ipc_json_describe_node_recursive(struct sway_node *node) {
                 }
                 break;
         case N_CONTAINER:
-                if (node->sway_container->children) {
-                        for (i = 0; i < node->sway_container->children->length; ++i) {
+                if (node->sway_container->pending.children) {
+                        for (i = 0; i < node->sway_container->pending.children->length; ++i) {
                                 struct sway_container *child =
-                                        node->sway_container->children->items[i];
+                                        node->sway_container->pending.children->items[i];
                                 json_object_array_add(children,
                                                 ipc_json_describe_node_recursive(&child->node));
                         }
@@ -974,6 +980,11 @@ json_object *ipc_json_describe_input(struct sway_input_device *device) {
                 struct wlr_keyboard *keyboard = device->wlr_device->keyboard;
                 struct xkb_keymap *keymap = keyboard->keymap;
                 struct xkb_state *state = keyboard->xkb_state;
+                
+                json_object_object_add(object, "repeat_delay", 
+                        json_object_new_int(keyboard->repeat_info.delay));
+                json_object_object_add(object, "repeat_rate", 
+                        json_object_new_int(keyboard->repeat_info.rate));
 
                 json_object *layouts_arr = json_object_new_array();
                 json_object_object_add(object, "xkb_layout_names", layouts_arr);
@@ -996,6 +1007,17 @@ json_object *ipc_json_describe_input(struct sway_input_device *device) {
                 }
         }
 
+        if (device->wlr_device->type == WLR_INPUT_DEVICE_POINTER) {
+                struct input_config *ic = input_device_get_config(device);
+                float scroll_factor = 1.0f;
+                if (ic != NULL && !isnan(ic->scroll_factor) && 
+                                ic->scroll_factor != FLT_MIN) {
+                        scroll_factor = ic->scroll_factor;
+                }
+                json_object_object_add(object, "scroll_factor", 
+                                json_object_new_double(scroll_factor));
+        }
+
         if (wlr_input_device_is_libinput(device->wlr_device)) {
                 struct libinput_device *libinput_dev;
                 libinput_dev = wlr_libinput_get_device_handle(device->wlr_device);
@@ -1109,7 +1131,9 @@ json_object *ipc_json_describe_bar_config(struct bar_config *bar) {
         json_object_object_add(json, "verbose",
                         json_object_new_boolean(bar->verbose));
         json_object_object_add(json, "pango_markup",
-                        json_object_new_boolean(bar->pango_markup));
+                        json_object_new_boolean(bar->pango_markup == PANGO_MARKUP_DEFAULT
+                                                                                        ? config->pango_markup
+                                                                                        : bar->pango_markup));
 
         json_object *colors = json_object_new_object();
         json_object_object_add(colors, "background",
diff --git a/sway/ipc-server.c b/sway/ipc-server.c
index aad9a7b5..1bf5a05f 100644
--- a/sway/ipc-server.c
+++ b/sway/ipc-server.c
@@ -687,7 +687,7 @@ void ipc_client_handle_command(struct ipc_client *client, uint32_t payload_lengt
                 }
                 struct sway_output *output;
                 wl_list_for_each(output, &root->all_outputs, link) {
-                        if (!output->enabled && output != root->noop_output) {
+                        if (!output->enabled && output != root->fallback_output) {
                                 json_object_array_add(outputs,
                                                 ipc_json_describe_disabled_output(output));
                         }
diff --git a/sway/main.c b/sway/main.c
index 0c219fb3..b6f8a8bf 100644
--- a/sway/main.c
+++ b/sway/main.c
@@ -6,12 +6,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/resource.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/un.h>
 #include <unistd.h>
 #include <wlr/util/log.h>
+#include <wlr/version.h>
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/server.h"
@@ -26,6 +28,7 @@
 
 static bool terminate_request = false;
 static int exit_value = 0;
+static struct rlimit original_nofile_rlimit = {0};
 struct sway_server server = {0};
 struct sway_debug debug = {0};
 
@@ -46,43 +49,6 @@ void sig_handler(int signal) {
         sway_terminate(EXIT_SUCCESS);
 }
 
-void detect_raspi(void) {
-        bool raspi = false;
-        FILE *f = fopen("/sys/firmware/devicetree/base/model", "r");
-        if (!f) {
-                return;
-        }
-        char *line = NULL;
-        size_t line_size = 0;
-        while (getline(&line, &line_size, f) != -1) {
-                if (strstr(line, "Raspberry Pi")) {
-                        raspi = true;
-                        break;
-                }
-        }
-        fclose(f);
-        FILE *g = fopen("/proc/modules", "r");
-        if (!g) {
-                free(line);
-                return;
-        }
-        bool vc4 = false;
-        while (getline(&line, &line_size, g) != -1) {
-                if (strstr(line, "vc4")) {
-                        vc4 = true;
-                        break;
-                }
-        }
-        free(line);
-        fclose(g);
-        if (!vc4 && raspi) {
-                fprintf(stderr, "\x1B[1;31mWarning: You have a "
-                                "Raspberry Pi, but the vc4 Module is "
-                                "not loaded! Set 'dtoverlay=vc4-kms-v3d'"
-                                "in /boot/config.txt and reboot.\x1B[0m\n");
-        }
-}
-
 void detect_proprietary(int allow_unsupported_gpu) {
         FILE *f = fopen("/proc/modules", "r");
         if (!f) {
@@ -99,7 +65,7 @@ void detect_proprietary(int allow_unsupported_gpu) {
                                 sway_log(SWAY_ERROR,
                                         "Proprietary Nvidia drivers are NOT supported. "
                                         "Use Nouveau. To launch sway anyway, launch with "
-                                        "--my-next-gpu-wont-be-nvidia and DO NOT report issues.");
+                                        "--unsupported-gpu and DO NOT report issues.");
                                 exit(EXIT_FAILURE);
                         }
                         break;
@@ -187,6 +153,9 @@ static void log_kernel(void) {
 
 static bool drop_permissions(void) {
         if (getuid() != geteuid() || getgid() != getegid()) {
+                sway_log(SWAY_ERROR, "!!! DEPRECATION WARNING: "
+                        "SUID privilege drop will be removed in a future release, please migrate to seatd-launch");
+
                 // Set the gid and uid in the correct order.
                 if (setgid(getgid()) != 0) {
                         sway_log(SWAY_ERROR, "Unable to drop root group, refusing to start");
@@ -205,6 +174,33 @@ static bool drop_permissions(void) {
         return true;
 }
 
+static void increase_nofile_limit(void) {
+        if (getrlimit(RLIMIT_NOFILE, &original_nofile_rlimit) != 0) {
+                sway_log_errno(SWAY_ERROR, "Failed to bump max open files limit: "
+                        "getrlimit(NOFILE) failed");
+                return;
+        }
+
+        struct rlimit new_rlimit = original_nofile_rlimit;
+        new_rlimit.rlim_cur = new_rlimit.rlim_max;
+        if (setrlimit(RLIMIT_NOFILE, &new_rlimit) != 0) {
+                sway_log_errno(SWAY_ERROR, "Failed to bump max open files limit: "
+                        "setrlimit(NOFILE) failed");
+                sway_log(SWAY_INFO, "Running with %d max open files",
+                        (int)original_nofile_rlimit.rlim_cur);
+        }
+}
+
+void restore_nofile_limit(void) {
+        if (original_nofile_rlimit.rlim_cur == 0) {
+                return;
+        }
+        if (setrlimit(RLIMIT_NOFILE, &original_nofile_rlimit) != 0) {
+                sway_log_errno(SWAY_ERROR, "Failed to restore max open files limit: "
+                        "setrlimit(NOFILE) failed");
+        }
+}
+
 void enable_debug_flag(const char *flag) {
         if (strcmp(flag, "damage=highlight") == 0) {
                 debug.damage = DAMAGE_HIGHLIGHT;
@@ -218,6 +214,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 {
                 sway_log(SWAY_ERROR, "Unknown debug flag: %s", flag);
         }
@@ -245,7 +243,7 @@ static void handle_wlr_log(enum wlr_log_importance importance,
 int main(int argc, char **argv) {
         static int verbose = 0, debug = 0, validate = 0, allow_unsupported_gpu = 0;
 
-        static struct option long_options[] = {
+        static const struct option long_options[] = {
                 {"help", no_argument, NULL, 'h'},
                 {"config", required_argument, NULL, 'c'},
                 {"validate", no_argument, NULL, 'C'},
@@ -254,7 +252,6 @@ int main(int argc, char **argv) {
                 {"verbose", no_argument, NULL, 'V'},
                 {"get-socketpath", no_argument, NULL, 'p'},
                 {"unsupported-gpu", no_argument, NULL, 'u'},
-                {"my-next-gpu-wont-be-nvidia", no_argument, NULL, 'u'},
                 {0, 0, 0, 0}
         };
 
@@ -344,11 +341,10 @@ int main(int argc, char **argv) {
         }
 
         sway_log(SWAY_INFO, "Sway version " SWAY_VERSION);
+        sway_log(SWAY_INFO, "wlroots version " WLR_VERSION_STR);
         log_kernel();
         log_distro();
         log_env();
-        detect_proprietary(allow_unsupported_gpu);
-        detect_raspi();
 
         if (optind < argc) { // Behave as IPC client
                 if (optind != 1) {
@@ -375,6 +371,8 @@ int main(int argc, char **argv) {
                 return 0;
         }
 
+        detect_proprietary(allow_unsupported_gpu);
+
         if (!server_privileged_prepare(&server)) {
                 return 1;
         }
@@ -384,6 +382,8 @@ int main(int argc, char **argv) {
                 exit(EXIT_FAILURE);
         }
 
+        increase_nofile_limit();
+
         // handle SIGTERM signals
         signal(SIGTERM, sig_handler);
         signal(SIGINT, sig_handler);
diff --git a/sway/meson.build b/sway/meson.build
index 6e138101..8eab31a2 100644
--- a/sway/meson.build
+++ b/sway/meson.build
@@ -8,6 +8,7 @@ sway_sources = files(
         'main.c',
         'server.c',
         'swaynag.c',
+        'xdg_activation_v1.c',
         'xdg_decoration.c',
 
         'desktop/desktop.c',
@@ -187,6 +188,7 @@ sway_sources = files(
         'commands/output/max_render_time.c',
         'commands/output/mode.c',
         'commands/output/position.c',
+        'commands/output/render_bit_depth.c',
         'commands/output/scale.c',
         'commands/output/scale_filter.c',
         'commands/output/subpixel.c',
@@ -204,9 +206,11 @@ sway_sources = files(
 
 sway_deps = [
         cairo,
+        drm,
         jsonc,
         libevdev,
         libinput,
+        libudev,
         math,
         pango,
         pcre,
diff --git a/sway/server.c b/sway/server.c
index f51fcfe2..567e6ae4 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -7,24 +7,32 @@
 #include <wlr/backend.h>
 #include <wlr/backend/headless.h>
 #include <wlr/backend/multi.h>
-#include <wlr/backend/noop.h>
 #include <wlr/backend/session.h>
+#include <wlr/config.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_data_control_v1.h>
+#include <wlr/types/wlr_drm_lease_v1.h>
+#include <wlr/types/wlr_drm.h>
 #include <wlr/types/wlr_export_dmabuf_v1.h>
 #include <wlr/types/wlr_gamma_control_v1.h>
 #include <wlr/types/wlr_idle.h>
 #include <wlr/types/wlr_layer_shell_v1.h>
+#include <wlr/types/wlr_linux_dmabuf_v1.h>
 #include <wlr/types/wlr_pointer_constraints_v1.h>
 #include <wlr/types/wlr_primary_selection_v1.h>
 #include <wlr/types/wlr_relative_pointer_v1.h>
 #include <wlr/types/wlr_screencopy_v1.h>
 #include <wlr/types/wlr_server_decoration.h>
+#include <wlr/types/wlr_subcompositor.h>
 #include <wlr/types/wlr_tablet_v2.h>
 #include <wlr/types/wlr_viewporter.h>
 #include <wlr/types/wlr_xcursor_manager.h>
+#include <wlr/types/wlr_xdg_activation_v1.h>
 #include <wlr/types/wlr_xdg_decoration_v1.h>
+#include <wlr/types/wlr_xdg_foreign_registry.h>
+#include <wlr/types/wlr_xdg_foreign_v1.h>
+#include <wlr/types/wlr_xdg_foreign_v2.h>
 #include <wlr/types/wlr_xdg_output_v1.h>
 #include "config.h"
 #include "list.h"
@@ -52,19 +60,50 @@ bool server_privileged_prepare(struct sway_server *server) {
         return true;
 }
 
+static void handle_drm_lease_request(struct wl_listener *listener, void *data) {
+        /* We only offer non-desktop outputs, but in the future we might want to do
+         * more logic here. */
+
+        struct wlr_drm_lease_request_v1 *req = data;
+        struct wlr_drm_lease_v1 *lease = wlr_drm_lease_request_v1_grant(req);
+        if (!lease) {
+                sway_log(SWAY_ERROR, "Failed to grant lease request");
+                wlr_drm_lease_request_v1_reject(req);
+        }
+}
+
 bool server_init(struct sway_server *server) {
         sway_log(SWAY_DEBUG, "Initializing Wayland server");
 
-        struct wlr_renderer *renderer = wlr_backend_get_renderer(server->backend);
-        assert(renderer);
+        server->renderer = wlr_renderer_autocreate(server->backend);
+        if (!server->renderer) {
+                sway_log(SWAY_ERROR, "Failed to create renderer");
+                return false;
+        }
+
+        wlr_renderer_init_wl_shm(server->renderer, server->wl_display);
+
+        if (wlr_renderer_get_dmabuf_texture_formats(server->renderer) != NULL) {
+                wlr_drm_create(server->wl_display, server->renderer);
+                server->linux_dmabuf_v1 =
+                        wlr_linux_dmabuf_v1_create(server->wl_display, server->renderer);
+        }
 
-        wlr_renderer_init_wl_display(renderer, server->wl_display);
+        server->allocator = wlr_allocator_autocreate(server->backend,
+                server->renderer);
+        if (!server->allocator) {
+                sway_log(SWAY_ERROR, "Failed to create allocator");
+                return false;
+        }
 
-        server->compositor = wlr_compositor_create(server->wl_display, renderer);
+        server->compositor = wlr_compositor_create(server->wl_display,
+                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);
 
@@ -144,12 +183,34 @@ bool server_init(struct sway_server *server) {
         server->foreign_toplevel_manager =
                 wlr_foreign_toplevel_manager_v1_create(server->wl_display);
 
+        server->drm_lease_manager=
+                wlr_drm_lease_v1_manager_create(server->wl_display, server->backend);
+        if (server->drm_lease_manager) {
+                server->drm_lease_request.notify = handle_drm_lease_request;
+                wl_signal_add(&server->drm_lease_manager->events.request,
+                                &server->drm_lease_request);
+        } else {
+                sway_log(SWAY_DEBUG, "Failed to create wlr_drm_lease_device_v1");
+                sway_log(SWAY_INFO, "VR will not be available");
+        }
+
         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);
         wlr_viewporter_create(server->wl_display);
 
+        struct wlr_xdg_foreign_registry *foreign_registry =
+                wlr_xdg_foreign_registry_create(server->wl_display);
+        wlr_xdg_foreign_v1_create(server->wl_display, foreign_registry);
+        wlr_xdg_foreign_v2_create(server->wl_display, foreign_registry);
+
+        server->xdg_activation_v1 = wlr_xdg_activation_v1_create(server->wl_display);
+        server->xdg_activation_v1_request_activate.notify =
+                xdg_activation_v1_handle_request_activate;
+        wl_signal_add(&server->xdg_activation_v1->events.request_activate,
+                &server->xdg_activation_v1_request_activate);
+
         // Avoid using "wayland-0" as display socket
         char name_candidate[16];
         for (int i = 1; i <= 32; ++i) {
@@ -166,27 +227,26 @@ bool server_init(struct sway_server *server) {
                 return false;
         }
 
-        server->noop_backend = wlr_noop_backend_create(server->wl_display);
-
-        struct wlr_output *wlr_output = wlr_noop_add_output(server->noop_backend);
-        root->noop_output = output_create(wlr_output);
-
-        server->headless_backend =
-                wlr_headless_backend_create_with_renderer(server->wl_display, renderer);
+        server->headless_backend = wlr_headless_backend_create(server->wl_display);
         if (!server->headless_backend) {
-                sway_log(SWAY_INFO, "Failed to create secondary headless backend, "
-                        "starting without it");
+                sway_log(SWAY_ERROR, "Failed to create secondary headless backend");
+                wlr_backend_destroy(server->backend);
+                return false;
         } else {
                 wlr_multi_backend_add(server->backend, server->headless_backend);
         }
 
+        struct wlr_output *wlr_output =
+                        wlr_headless_add_output(server->headless_backend, 800, 600);
+        wlr_output_set_name(wlr_output, "FALLBACK");
+        root->fallback_output = output_create(wlr_output);
+
         // This may have been set already via -Dtxn-timeout
         if (!server->txn_timeout_ms) {
                 server->txn_timeout_ms = 200;
         }
 
         server->dirty_nodes = create_list();
-        server->transactions = create_list();
 
         server->input = input_manager_create(server);
         input_manager_get_default_seat(); // create seat0
@@ -202,7 +262,6 @@ void server_fini(struct sway_server *server) {
         wl_display_destroy_clients(server->wl_display);
         wl_display_destroy(server->wl_display);
         list_free(server->dirty_nodes);
-        list_free(server->transactions);
 }
 
 bool server_start(struct sway_server *server) {
@@ -238,6 +297,7 @@ bool server_start(struct sway_server *server) {
                 wlr_backend_destroy(server->backend);
                 return false;
         }
+
         return true;
 }
 
diff --git a/sway/sway-bar.5.scd b/sway/sway-bar.5.scd
index 80d08449..42e59d57 100644
--- a/sway/sway-bar.5.scd
+++ b/sway/sway-bar.5.scd
@@ -40,7 +40,7 @@ runtime.
 *font* <font>
         Specifies the font to be used in the bar. _font_ should be specified as a
         pango font description. For more information on pango font descriptions,
-        see https://developer.gnome.org/pango/stable/pango-Fonts.html#pango-font-description-from-string
+        see https://docs.gtk.org/Pango/type_func.FontDescription.from_string.html#description
 
 *gaps* <all> | <horizontal> <vertical> | <top> <right> <bottom> <left>
         Sets the gaps from the edge of the screen for the bar. Gaps can either be
diff --git a/sway/sway-input.5.scd b/sway/sway-input.5.scd
index dbf21d93..8b702b77 100644
--- a/sway/sway-input.5.scd
+++ b/sway/sway-input.5.scd
@@ -111,6 +111,9 @@ The following commands may only be used in the configuration file.
         Maps inputs from this device to the specified output. Only meaningful if the
         device is a pointer, touch, or drawing tablet device.
 
+        The wildcard _\*_ can be used to map the input device to the whole desktop
+        layout.
+
 *input* <identifier> map_to_region <X> <Y> <width> <height>
         Maps inputs from this device to the specified region of the global output
         layout. Only meaningful if the device is a pointer, touch, or drawing tablet
@@ -230,7 +233,7 @@ correct seat.
         not explicitly attached to another seat (similar to a "default" seat).
 
 *seat* <name> hide_cursor <timeout>|when-typing [enable|disable]
-        Hides the cursor image after the specified event occured.
+        Hides the cursor image after the specified event occurred.
 
         If _timeout_ is specified, then the cursor will be hidden after _timeout_
         (in milliseconds) has elapsed with no activity on the cursor. A timeout of 0
@@ -274,7 +277,7 @@ correct seat.
         whether future inhibitors are honoured by default, i.e. activated
         automatically, the default being _enable_. When used at runtime,
         _disable_ also disables any currently active inhibitors. _activate_,
-        _deactivate_ and _toggle_ are only useable at runtime and change the
+        _deactivate_ and _toggle_ are only usable at runtime and change the
         state of a potentially existing inhibitor on the currently focused
         window. This can be used with the current seat alias (_-_) to affect
         only the currently focused window of the current seat. Subcommand
diff --git a/sway/sway-ipc.7.scd b/sway/sway-ipc.7.scd
index 1b855959..d90fe97a 100644
--- a/sway/sway-ipc.7.scd
+++ b/sway/sway-ipc.7.scd
@@ -294,7 +294,7 @@ following properties:
 Retrieve a JSON representation of the tree
 
 *REPLY*++
-An array of object the represent the current tree. Each object represents one
+An array of objects that represent the current tree. Each object represents one
 node and will have the following properties:
 
 [- *PROPERTY*
@@ -1131,6 +1131,9 @@ following properties:
 |- xkb_active_layout_index
 :  integer
 :  (Only keyboards) The index of the active keyboard layout in use
+|- scroll_factor
+:  floating
+:  (Only pointers) Multiplier applied on scroll event values.
 |- libinput
 :  object
 :  (Only libinput devices) An object describing the current device settings.
diff --git a/sway/sway-output.5.scd b/sway/sway-output.5.scd
index 69f529fe..4159a851 100644
--- a/sway/sway-output.5.scd
+++ b/sway/sway-output.5.scd
@@ -40,6 +40,16 @@ must be separated by one space. For example:
 
                 output HDMI-A-1 mode 1920x1080@60Hz
 
+*output* <name> modeline <clock> <hdisplay> <hsync_start> <hsync_end> <htotal> <vdisplay> <vsync_start> <vsync_end> <vtotal> <hsync> <vsync>
+        Configures the specified output to use the given modeline. It can be
+        generated using *cvt*(1) and *gtf*(1) commands. See *xorg.conf*(5).
+        Only supported on DRM backend.
+
+        Example:
+
+                output HDMI-A-1 modeline 173.00 1920 2048 2248 2576 1080 1083 1088 1120 -hsync +vsync
+
+
 *output* <name> position|pos <X> <Y>
         Places the specified output at the specific position in the global
         coordinate space. The cursor may only be moved between immediately
@@ -112,7 +122,7 @@ must be separated by one space. For example:
 *output* <name> toggle
         Toggle the specified output.
 
-*output* <name> dpms on|off
+*output* <name> dpms on|off|toggle
         Enables or disables the specified output via DPMS. To turn an output off
         (ie. blank the screen but keep workspaces as-is), one can set DPMS to off.
 
@@ -142,11 +152,26 @@ must be separated by one space. For example:
         Enables or disables adaptive synchronization (often referred to as Variable
         Refresh Rate, or by the vendor-specific names FreeSync/G-Sync).
 
-        Adaptive sync allows clients to submit frames a little to late without
+        Adaptive sync allows clients to submit frames a little too late without
         having to wait a whole refresh period to display it on screen. Enabling
         adaptive sync can improve latency, but can cause flickering on some
         hardware.
 
+*output* <name> render_bit_depth 8|10
+        Controls the color channel bit depth at which frames are rendered; the
+        default is currently 8 bits per channel.
+
+        Setting higher values will not have an effect if hardware and software lack
+        support for such bit depths. Successfully increasing the render bit depth
+        will not necessarily increase the bit depth of the frames sent to a display.
+        An increased render bit depth may provide smoother rendering of gradients,
+        and screenshots which can more precisely store the colors of programs
+        which display high bit depth colors.
+
+        Warnings: this can break screenshot/screencast programs which have not been
+        updated to work with different bit depths. This command is experimental,
+        and may be removed or changed in the future.
+
 # SEE ALSO
 
 *sway*(5) *sway-input*(5)
diff --git a/sway/sway.5.scd b/sway/sway.5.scd
index 02592b5f..641d0925 100644
--- a/sway/sway.5.scd
+++ b/sway/sway.5.scd
@@ -155,7 +155,7 @@ They are expected to be used with *bindsym* or at runtime through *swaymsg*(1).
         is specified, the view will be fullscreen across all outputs.
 
 *gaps* inner|outer|horizontal|vertical|top|right|bottom|left all|current
-set|plus|minus <amount>
+set|plus|minus|toggle <amount>
         Changes the _inner_ or _outer_ gaps for either _all_ workspaces or the
         _current_ workspace. _outer_ gaps can be altered per side with _top_,
         _right_, _bottom_, and _left_ or per direction with _horizontal_ and
@@ -215,7 +215,7 @@ set|plus|minus <amount>
         If unspecified, the default is 10 pixels. Pixels are ignored when moving
         tiled containers.
 
-*move* [absolute] position <pos_x> [px|ppt] <pos_y> [px|ptt]
+*move* [absolute] position <pos_x> [px|ppt] <pos_y> [px|ppt]
         Moves the focused container to the specified position in the workspace.
         The position can be specified in pixels or percentage points, omitting
         the unit defaults to pixels. If _absolute_ is used, the position is
@@ -319,8 +319,10 @@ set|plus|minus <amount>
         established by the *seat* subcommand of the same name. See
         *sway-input*(5) for more ways to affect inhibitors.
 
-*split* vertical|v|horizontal|h|toggle|t
-        Splits the current container, vertically or horizontally. When _toggle_ is
+*split* vertical|v|horizontal|h|none|n|toggle|t
+        Splits the current container, vertically or horizontally. When _none_ is
+        specified, the effect of a previous split is undone if the current
+        container is the only child of a split parent. When _toggle_ is
         specified, the current container is split opposite to the parent
         container's layout.
 
@@ -404,7 +406,7 @@ runtime.
         a keyboard shortcuts inhibitor is active for the currently focused
         window. Such inhibitors are usually requested by remote desktop and
         virtualization software to enable the user to send keyboard shortcuts
-        to the remote or virtual session. The _--inhibited_ flag allows to
+        to the remote or virtual session. The _--inhibited_ flag allows one to
         define bindings which will be exempt from pass-through to such
         software. The same preference logic as for _--locked_ applies.
 
@@ -497,6 +499,12 @@ runtime.
         *client.focused_inactive*
                 The most recently focused view within a container which is not focused.
 
+        *client.focused_tab_title*
+                A view that has focused descendant container.
+                Tab or stack container title that is the parent of the focused container
+                but is not directly focused. Defaults to focused_inactive if not
+                specified and does not use the indicator and child_border colors.
+
         *client.placeholder*
                 Ignored (present for i3 compatibility).
 
@@ -552,6 +560,12 @@ The default colors are:
 :  #ffffff
 :  #484e50
 :  #5f676a
+|  *focused_tab_title*
+:  #333333
+:  #5f676a
+:  #ffffff
+:  n/a
+:  n/a
 |  *unfocused*
 :  #333333
 :  #222222
@@ -630,14 +644,14 @@ The default colors are:
         should be used instead. Regardless of whether pango markup is enabled,
         _font_ should be specified as a pango font description. For more
         information on pango font descriptions, see
-        https://developer.gnome.org/pango/stable/pango-Fonts.html#pango-font-description-from-string
+        https://docs.gtk.org/Pango/type_func.FontDescription.from_string.html#description
 
 *force_display_urgency_hint* <timeout> [ms]
         If an application on another workspace sets an urgency hint, switching to this
         workspace may lead to immediate focus of the application, which also means the
-        window decoration color would be immediately resetted to *client.focused*. This
+        window decoration color would be immediately reset to *client.focused*. This
         may make it unnecessarily hard to tell which window originally raised the
-        event. This option allows to set a _timeout_ in ms to delay the urgency hint reset.
+        event. This option allows one to set a _timeout_ in ms to delay the urgency hint reset.
 
 *titlebar_border_thickness* <thickness>
         Thickness of the titlebar border in pixels
@@ -690,9 +704,10 @@ The default colors are:
         borders will only be enabled if the workspace has more than one visible
         child and gaps equal to zero.
 
-*smart_gaps* on|off
+*smart_gaps* on|off|toggle|inverse_outer
         If smart_gaps are _on_ gaps will only be enabled if a workspace has more
-        than one child.
+        than one child. If smart_gaps are _inverse_outer_ outer gaps will only
+        be enabled if a workspace has exactly one child.
 
 *mark* --add|--replace [--toggle] <identifier>
         Marks are arbitrary labels that can be used to identify certain windows and
diff --git a/sway/swaynag.c b/sway/swaynag.c
index db5a919a..4a0a6d30 100644
--- a/sway/swaynag.c
+++ b/sway/swaynag.c
@@ -64,6 +64,8 @@ bool swaynag_spawn(const char *swaynag_command,
                 sway_log(SWAY_ERROR, "Failed to create fork for swaynag");
                 goto failed;
         } else if (pid == 0) {
+                restore_nofile_limit();
+
                 pid = fork();
                 if (pid < 0) {
                         sway_log_errno(SWAY_ERROR, "fork failed");
@@ -87,8 +89,8 @@ bool swaynag_spawn(const char *swaynag_command,
                         size_t length = strlen(swaynag_command) + strlen(swaynag->args) + 2;
                         char *cmd = malloc(length);
                         snprintf(cmd, length, "%s %s", swaynag_command, swaynag->args);
-                        execl("/bin/sh", "/bin/sh", "-c", cmd, NULL);
-                        sway_log_errno(SWAY_ERROR, "execl failed");
+                        execlp("sh", "sh", "-c", cmd, NULL);
+                        sway_log_errno(SWAY_ERROR, "execlp failed");
                         _exit(EXIT_FAILURE);
                 }
                 _exit(EXIT_SUCCESS);
diff --git a/sway/tree/arrange.c b/sway/tree/arrange.c
index bac9f2fa..4aa82c35 100644
--- a/sway/tree/arrange.c
+++ b/sway/tree/arrange.c
@@ -55,7 +55,7 @@ static void apply_horiz_layout(list_t *children, struct wlr_box *parent) {
         // Calculate gap size
         double inner_gap = 0;
         struct sway_container *child = children->items[0];
-        struct sway_workspace *ws = child->workspace;
+        struct sway_workspace *ws = child->pending.workspace;
         if (ws) {
                 inner_gap = ws->gaps_inner;
         }
@@ -66,7 +66,7 @@ static void apply_horiz_layout(list_t *children, struct wlr_box *parent) {
                 if (layout == L_TABBED || layout == L_STACKED) {
                         inner_gap = 0;
                 }
-                temp = temp->parent;
+                temp = temp->pending.parent;
         }
         double total_gap = fmin(inner_gap * (children->length - 1),
                 fmax(0, parent->width - MIN_SANE_W * children->length));
@@ -79,15 +79,15 @@ static void apply_horiz_layout(list_t *children, struct wlr_box *parent) {
         for (int i = 0; i < children->length; ++i) {
                 struct sway_container *child = children->items[i];
                 child->child_total_width = child_total_width;
-                child->x = child_x;
-                child->y = parent->y;
-                child->width = round(child->width_fraction * child_total_width);
-                child->height = parent->height;
-                child_x += child->width + inner_gap;
+                child->pending.x = child_x;
+                child->pending.y = parent->y;
+                child->pending.width = round(child->width_fraction * child_total_width);
+                child->pending.height = parent->height;
+                child_x += child->pending.width + inner_gap;
 
                 // Make last child use remaining width of parent
                 if (i == children->length - 1) {
-                        child->width = parent->x + parent->width - child->x;
+                        child->pending.width = parent->x + parent->width - child->pending.x;
                 }
         }
 }
@@ -134,7 +134,7 @@ static void apply_vert_layout(list_t *children, struct wlr_box *parent) {
         // Calculate gap size
         double inner_gap = 0;
         struct sway_container *child = children->items[0];
-        struct sway_workspace *ws = child->workspace;
+        struct sway_workspace *ws = child->pending.workspace;
         if (ws) {
                 inner_gap = ws->gaps_inner;
         }
@@ -145,7 +145,7 @@ static void apply_vert_layout(list_t *children, struct wlr_box *parent) {
                 if (layout == L_TABBED || layout == L_STACKED) {
                         inner_gap = 0;
                 }
-                temp = temp->parent;
+                temp = temp->pending.parent;
         }
         double total_gap = fmin(inner_gap * (children->length - 1),
                 fmax(0, parent->height - MIN_SANE_H * children->length));
@@ -158,15 +158,15 @@ static void apply_vert_layout(list_t *children, struct wlr_box *parent) {
         for (int i = 0; i < children->length; ++i) {
                 struct sway_container *child = children->items[i];
                 child->child_total_height = child_total_height;
-                child->x = parent->x;
-                child->y = child_y;
-                child->width = parent->width;
-                child->height = round(child->height_fraction * child_total_height);
-                child_y += child->height + inner_gap;
+                child->pending.x = parent->x;
+                child->pending.y = child_y;
+                child->pending.width = parent->width;
+                child->pending.height = round(child->height_fraction * child_total_height);
+                child_y += child->pending.height + inner_gap;
 
                 // Make last child use remaining height of parent
                 if (i == children->length - 1) {
-                        child->height = parent->y + parent->height - child->y;
+                        child->pending.height = parent->y + parent->height - child->pending.y;
                 }
         }
 }
@@ -178,10 +178,10 @@ static void apply_tabbed_layout(list_t *children, struct wlr_box *parent) {
         for (int i = 0; i < children->length; ++i) {
                 struct sway_container *child = children->items[i];
                 int parent_offset = child->view ? 0 : container_titlebar_height();
-                child->x = parent->x;
-                child->y = parent->y + parent_offset;
-                child->width = parent->width;
-                child->height = parent->height - parent_offset;
+                child->pending.x = parent->x;
+                child->pending.y = parent->y + parent_offset;
+                child->pending.width = parent->width;
+                child->pending.height = parent->height - parent_offset;
         }
 }
 
@@ -193,10 +193,10 @@ static void apply_stacked_layout(list_t *children, struct wlr_box *parent) {
                 struct sway_container *child = children->items[i];
                 int parent_offset = child->view ?  0 :
                         container_titlebar_height() * children->length;
-                child->x = parent->x;
-                child->y = parent->y + parent_offset;
-                child->width = parent->width;
-                child->height = parent->height - parent_offset;
+                child->pending.x = parent->x;
+                child->pending.y = parent->y + parent_offset;
+                child->pending.width = parent->width;
+                child->pending.height = parent->height - parent_offset;
         }
 }
 
@@ -246,7 +246,7 @@ void arrange_container(struct sway_container *container) {
         }
         struct wlr_box box;
         container_get_box(container, &box);
-        arrange_children(container->children, container->layout, &box);
+        arrange_children(container->pending.children, container->pending.layout, &box);
         node_set_dirty(&container->node);
 }
 
@@ -278,8 +278,8 @@ void arrange_workspace(struct sway_workspace *workspace) {
                 for (int i = 0; i < workspace->floating->length; ++i) {
                         struct sway_container *floater = workspace->floating->items[i];
                         container_floating_translate(floater, diff_x, diff_y);
-                        double center_x = floater->x + floater->width / 2;
-                        double center_y = floater->y + floater->height / 2;
+                        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)) {
@@ -294,10 +294,10 @@ void arrange_workspace(struct sway_workspace *workspace) {
                         workspace->x, workspace->y);
         if (workspace->fullscreen) {
                 struct sway_container *fs = workspace->fullscreen;
-                fs->x = output->lx;
-                fs->y = output->ly;
-                fs->width = output->width;
-                fs->height = output->height;
+                fs->pending.x = output->lx;
+                fs->pending.y = output->ly;
+                fs->pending.width = output->width;
+                fs->pending.height = output->height;
                 arrange_container(fs);
         } else {
                 struct wlr_box box;
@@ -337,10 +337,10 @@ void arrange_root(void) {
 
         if (root->fullscreen_global) {
                 struct sway_container *fs = root->fullscreen_global;
-                fs->x = root->x;
-                fs->y = root->y;
-                fs->width = root->width;
-                fs->height = root->height;
+                fs->pending.x = root->x;
+                fs->pending.y = root->y;
+                fs->pending.width = root->width;
+                fs->pending.height = root->height;
                 arrange_container(fs);
         } else {
                 for (int i = 0; i < root->outputs->length; ++i) {
diff --git a/sway/tree/container.c b/sway/tree/container.c
index 6a9ce1c4..4756028c 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -1,12 +1,18 @@
 #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_linux_dmabuf_v1.h>
 #include <wlr/types/wlr_output_layout.h>
-#include "cairo.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"
@@ -19,6 +25,7 @@
 #include "sway/tree/arrange.h"
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
+#include "sway/xdg_decoration.h"
 #include "list.h"
 #include "log.h"
 #include "stringop.h"
@@ -30,12 +37,12 @@ struct sway_container *container_create(struct sway_view *view) {
                 return NULL;
         }
         node_init(&c->node, N_CONTAINER, c);
-        c->layout = L_NONE;
+        c->pending.layout = L_NONE;
         c->view = view;
         c->alpha = 1.0f;
 
         if (!view) {
-                c->children = create_list();
+                c->pending.children = create_list();
                 c->current.children = create_list();
         }
         c->marks = create_list();
@@ -62,7 +69,8 @@ void container_destroy(struct sway_container *con) {
         wlr_texture_destroy(con->title_focused_inactive);
         wlr_texture_destroy(con->title_unfocused);
         wlr_texture_destroy(con->title_urgent);
-        list_free(con->children);
+        wlr_texture_destroy(con->title_focused_tab_title);
+        list_free(con->pending.children);
         list_free(con->current.children);
         list_free(con->outputs);
 
@@ -71,11 +79,10 @@ void container_destroy(struct sway_container *con) {
         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) {
-                if (con->view->container == con) {
-                        con->view->container = NULL;
-                }
+        if (con->view && con->view->container == con) {
+                con->view->container = NULL;
                 if (con->view->destroying) {
                         view_destroy(con->view);
                 }
@@ -90,10 +97,10 @@ void container_begin_destroy(struct sway_container *con) {
         }
         // The workspace must have the fullscreen pointer cleared so that the
         // seat code can find an appropriate new focus.
-        if (con->fullscreen_mode == FULLSCREEN_WORKSPACE && con->workspace) {
-                con->workspace->fullscreen = NULL;
+        if (con->pending.fullscreen_mode == FULLSCREEN_WORKSPACE && con->pending.workspace) {
+                con->pending.workspace->fullscreen = NULL;
         }
-        if (con->scratchpad && con->fullscreen_mode == FULLSCREEN_GLOBAL) {
+        if (con->scratchpad && con->pending.fullscreen_mode == FULLSCREEN_GLOBAL) {
                 container_fullscreen_disable(con);
         }
 
@@ -108,11 +115,11 @@ void container_begin_destroy(struct sway_container *con) {
                 root_scratchpad_remove_container(con);
         }
 
-        if (con->fullscreen_mode == FULLSCREEN_GLOBAL) {
+        if (con->pending.fullscreen_mode == FULLSCREEN_GLOBAL) {
                 container_fullscreen_disable(con);
         }
 
-        if (con->parent || con->workspace) {
+        if (con->pending.parent || con->pending.workspace) {
                 container_detach(con);
         }
 }
@@ -121,12 +128,12 @@ void container_reap_empty(struct sway_container *con) {
         if (con->view) {
                 return;
         }
-        struct sway_workspace *ws = con->workspace;
+        struct sway_workspace *ws = con->pending.workspace;
         while (con) {
-                if (con->children->length) {
+                if (con->pending.children->length) {
                         return;
                 }
-                struct sway_container *parent = con->parent;
+                struct sway_container *parent = con->pending.parent;
                 container_begin_destroy(con);
                 con = parent;
         }
@@ -139,9 +146,9 @@ struct sway_container *container_flatten(struct sway_container *container) {
         if (container->view) {
                 return NULL;
         }
-        while (container && container->children->length == 1) {
-                struct sway_container *child = container->children->items[0];
-                struct sway_container *parent = container->parent;
+        while (container && container->pending.children->length == 1) {
+                struct sway_container *child = container->pending.children->items[0];
+                struct sway_container *parent = container->pending.parent;
                 container_replace(container, child);
                 container_begin_destroy(container);
                 container = parent;
@@ -151,11 +158,11 @@ struct sway_container *container_flatten(struct sway_container *container) {
 
 struct sway_container *container_find_child(struct sway_container *container,
                 bool (*test)(struct sway_container *con, void *data), void *data) {
-        if (!container->children) {
+        if (!container->pending.children) {
                 return NULL;
         }
-        for (int i = 0; i < container->children->length; ++i) {
-                struct sway_container *child = container->children->items[i];
+        for (int i = 0; i < container->pending.children->length; ++i) {
+                struct sway_container *child = container->pending.children->items[i];
                 if (test(child, data)) {
                         return child;
                 }
@@ -310,7 +317,7 @@ static struct sway_container *floating_container_at(double lx, double ly,
         return NULL;
 }
 
-struct sway_container *view_container_at(struct sway_node *parent,
+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")) {
@@ -319,10 +326,33 @@ struct sway_container *view_container_at(struct sway_node *parent,
 
         struct sway_container *container = parent->sway_container;
         struct wlr_box box = {
-                        .x = container->x,
-                        .y = container->y,
-                        .width = container->width,
-                        .height = container->height,
+                .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)) {
@@ -357,19 +387,17 @@ struct sway_container *tiling_container_at(struct sway_node *parent,
 }
 
 static bool surface_is_popup(struct wlr_surface *surface) {
-        if (wlr_surface_is_xdg_surface(surface)) {
-                struct wlr_xdg_surface *xdg_surface =
-                        wlr_xdg_surface_from_wlr_surface(surface);
-                while (xdg_surface && xdg_surface->role != WLR_XDG_SURFACE_ROLE_NONE) {
-                        if (xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP) {
-                                return true;
-                        }
-                        xdg_surface = xdg_surface->toplevel->parent;
+        while (!wlr_surface_is_xdg_surface(surface)) {
+                if (!wlr_surface_is_subsurface(surface)) {
+                        return false;
                 }
-                return false;
+                struct wlr_subsurface *subsurface =
+                        wlr_subsurface_from_wlr_surface(surface);
+                surface = subsurface->parent;
         }
-
-        return false;
+        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,
@@ -394,7 +422,7 @@ struct sway_container *container_at(struct sway_workspace *workspace,
         }
         // Tiling (focused)
         if (focus && focus->view && !is_floating) {
-                if ((c = surface_at_view(focus, lx, ly, surface, sx, sy))) {
+                if ((c = view_container_content_at(&focus->node, lx, ly, surface, sx, sy))) {
                         return c;
                 }
         }
@@ -408,19 +436,41 @@ struct sway_container *container_at(struct sway_workspace *workspace,
 void container_for_each_child(struct sway_container *container,
                 void (*f)(struct sway_container *container, void *data),
                 void *data) {
-        if (container->children)  {
-                for (int i = 0; i < container->children->length; ++i) {
-                        struct sway_container *child = container->children->items[i];
+        if (container->pending.children)  {
+                for (int i = 0; i < container->pending.children->length; ++i) {
+                        struct sway_container *child = container->pending.children->items[i];
                         f(child, data);
                         container_for_each_child(child, f, data);
                 }
         }
 }
 
+struct sway_container *container_obstructing_fullscreen_container(struct sway_container *container)
+{
+        struct sway_workspace *workspace = container->pending.workspace;
+
+        if (workspace && workspace->fullscreen && !container_is_fullscreen_or_child(container)) {
+                if (container_is_transient_for(container, workspace->fullscreen)) {
+                        return NULL;
+                }
+                return workspace->fullscreen;
+        }
+
+        struct sway_container *fullscreen_global = root->fullscreen_global;
+        if (fullscreen_global && container != fullscreen_global && !container_has_ancestor(container, fullscreen_global)) {
+                if (container_is_transient_for(container, fullscreen_global)) {
+                        return NULL;
+                }
+                return fullscreen_global;
+        }
+
+        return NULL;
+}
+
 bool container_has_ancestor(struct sway_container *descendant,
                 struct sway_container *ancestor) {
         while (descendant) {
-                descendant = descendant->parent;
+                descendant = descendant->pending.parent;
                 if (descendant == ancestor) {
                         return true;
                 }
@@ -446,23 +496,13 @@ struct sway_output *container_get_effective_output(struct sway_container *con) {
         return con->outputs->items[con->outputs->length - 1];
 }
 
-static void update_title_texture(struct sway_container *con,
-                struct wlr_texture **texture, struct border_colors *class) {
-        struct sway_output *output = container_get_effective_output(con);
-        if (!output) {
-                return;
-        }
-        if (*texture) {
-                wlr_texture_destroy(*texture);
-                *texture = NULL;
-        }
-        if (!con->formatted_title) {
-                return;
-        }
-
+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 = con->title_height * scale;
+        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).
@@ -480,13 +520,28 @@ static void update_title_texture(struct sway_container *con,
                         to_cairo_subpixel_order(output->wlr_output->subpixel));
         }
         cairo_set_font_options(c, fo);
-        get_text_size(c, config->font, &width, NULL, NULL, scale,
-                        config->pango_markup, "%s", con->formatted_title);
+        get_text_size(c, config->font, &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);
@@ -497,23 +552,39 @@ static void update_title_texture(struct sway_container *con,
         PangoContext *pango = pango_cairo_create_context(cairo);
         cairo_set_source_rgba(cairo, class->text[0], class->text[1],
                         class->text[2], class->text[3]);
-        cairo_move_to(cairo, 0, 0);
+        cairo_move_to(cairo, 0, config->font_baseline * scale - baseline);
 
-        pango_printf(cairo, config->font, scale, config->pango_markup,
-                        "%s", con->formatted_title);
+        render_text(cairo, config->font, scale, pango_markup, "%s", text);
 
         cairo_surface_flush(surface);
         unsigned char *data = cairo_image_surface_get_data(surface);
-        int stride = cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, width);
-        struct wlr_renderer *renderer = wlr_backend_get_renderer(
-                        output->wlr_output->backend);
+        int stride = cairo_image_surface_get_stride(surface);
+        struct wlr_renderer *renderer = output->wlr_output->renderer;
         *texture = wlr_texture_from_pixels(
-                        renderer, WL_SHM_FORMAT_ARGB8888, stride, width, height, data);
+                        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);
@@ -523,24 +594,11 @@ void container_update_title_textures(struct sway_container *container) {
                         &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);
 }
 
-void container_calculate_title_height(struct sway_container *container) {
-        if (!container->formatted_title) {
-                container->title_height = 0;
-                return;
-        }
-        cairo_t *cairo = cairo_create(NULL);
-        int height;
-        int baseline;
-        get_text_size(cairo, config->font, NULL, &height, &baseline, 1,
-                        config->pango_markup, "%s", container->formatted_title);
-        cairo_destroy(cairo);
-        container->title_height = height;
-        container->title_baseline = baseline;
-}
-
 /**
  * Calculate and return the length of the tree representation.
  * An example tree representation is: V[Terminal, Firefox]
@@ -596,23 +654,22 @@ size_t container_build_representation(enum sway_container_layout layout,
 
 void container_update_representation(struct sway_container *con) {
         if (!con->view) {
-                size_t len = container_build_representation(con->layout,
-                                con->children, NULL);
+                size_t len = container_build_representation(con->pending.layout,
+                                con->pending.children, NULL);
                 free(con->formatted_title);
                 con->formatted_title = calloc(len + 1, sizeof(char));
                 if (!sway_assert(con->formatted_title,
                                         "Unable to allocate title string")) {
                         return;
                 }
-                container_build_representation(con->layout, con->children,
+                container_build_representation(con->pending.layout, con->pending.children,
                                 con->formatted_title);
-                container_calculate_title_height(con);
                 container_update_title_textures(con);
         }
-        if (con->parent) {
-                container_update_representation(con->parent);
-        } else if (con->workspace) {
-                workspace_update_representation(con->workspace);
+        if (con->pending.parent) {
+                container_update_representation(con->pending.parent);
+        } else if (con->pending.workspace) {
+                workspace_update_representation(con->pending.workspace);
         }
 }
 
@@ -663,20 +720,20 @@ static void floating_natural_resize(struct sway_container *con) {
         floating_calculate_constraints(&min_width, &max_width,
                         &min_height, &max_height);
         if (!con->view) {
-                con->width = fmax(min_width, fmin(con->width, max_width));
-                con->height = fmax(min_height, fmin(con->height, max_height));
+                con->pending.width = fmax(min_width, fmin(con->pending.width, max_width));
+                con->pending.height = fmax(min_height, fmin(con->pending.height, max_height));
         } else {
                 struct sway_view *view = con->view;
-                con->content_width =
+                con->pending.content_width =
                         fmax(min_width, fmin(view->natural_width, max_width));
-                con->content_height =
+                con->pending.content_height =
                         fmax(min_height, fmin(view->natural_height, max_height));
                 container_set_geometry_from_content(con);
         }
 }
 
 void container_floating_resize_and_center(struct sway_container *con) {
-        struct sway_workspace *ws = con->workspace;
+        struct sway_workspace *ws = con->pending.workspace;
         if (!ws) {
                 // On scratchpad, just resize
                 floating_natural_resize(con);
@@ -687,42 +744,42 @@ void container_floating_resize_and_center(struct sway_container *con) {
                         ws->output->wlr_output);
         if (!ob) {
                 // On NOOP output. Will be called again when moved to an output
-                con->x = 0;
-                con->y = 0;
-                con->width = 0;
-                con->height = 0;
+                con->pending.x = 0;
+                con->pending.y = 0;
+                con->pending.width = 0;
+                con->pending.height = 0;
                 return;
         }
 
         floating_natural_resize(con);
         if (!con->view) {
-                if (con->width > ws->width || con->height > ws->height) {
-                        con->x = ob->x + (ob->width - con->width) / 2;
-                        con->y = ob->y + (ob->height - con->height) / 2;
+                if (con->pending.width > ws->width || con->pending.height > ws->height) {
+                        con->pending.x = ob->x + (ob->width - con->pending.width) / 2;
+                        con->pending.y = ob->y + (ob->height - con->pending.height) / 2;
                 } else {
-                        con->x = ws->x + (ws->width - con->width) / 2;
-                        con->y = ws->y + (ws->height - con->height) / 2;
+                        con->pending.x = ws->x + (ws->width - con->pending.width) / 2;
+                        con->pending.y = ws->y + (ws->height - con->pending.height) / 2;
                 }
         } else {
-                if (con->content_width > ws->width
-                                || con->content_height > ws->height) {
-                        con->content_x = ob->x + (ob->width - con->content_width) / 2;
-                        con->content_y = ob->y + (ob->height - con->content_height) / 2;
+                if (con->pending.content_width > ws->width
+                                || con->pending.content_height > ws->height) {
+                        con->pending.content_x = ob->x + (ob->width - con->pending.content_width) / 2;
+                        con->pending.content_y = ob->y + (ob->height - con->pending.content_height) / 2;
                 } else {
-                        con->content_x = ws->x + (ws->width - con->content_width) / 2;
-                        con->content_y = ws->y + (ws->height - con->content_height) / 2;
+                        con->pending.content_x = ws->x + (ws->width - con->pending.content_width) / 2;
+                        con->pending.content_y = ws->y + (ws->height - con->pending.content_height) / 2;
                 }
 
                 // If the view's border is B_NONE then these properties are ignored.
-                con->border_top = con->border_bottom = true;
-                con->border_left = con->border_right = true;
+                con->pending.border_top = con->pending.border_bottom = true;
+                con->pending.border_left = con->pending.border_right = true;
 
                 container_set_geometry_from_content(con);
         }
 }
 
 void container_floating_set_default_size(struct sway_container *con) {
-        if (!sway_assert(con->workspace, "Expected a container on a workspace")) {
+        if (!sway_assert(con->pending.workspace, "Expected a container on a workspace")) {
                 return;
         }
 
@@ -730,16 +787,16 @@ void container_floating_set_default_size(struct sway_container *con) {
         floating_calculate_constraints(&min_width, &max_width,
                         &min_height, &max_height);
         struct wlr_box *box = calloc(1, sizeof(struct wlr_box));
-        workspace_get_box(con->workspace, box);
+        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));
         if (!con->view) {
-                con->width = width;
-                con->height = height;
+                con->pending.width = width;
+                con->pending.height = height;
         } else {
-                con->content_width = width;
-                con->content_height = height;
+                con->pending.content_width = width;
+                con->pending.content_height = height;
                 container_set_geometry_from_content(con);
         }
 
@@ -761,8 +818,8 @@ void container_set_resizing(struct sway_container *con, bool resizing) {
                         con->view->impl->set_resizing(con->view, resizing);
                 }
         } else {
-                for (int i = 0; i < con->children->length; ++i ) {
-                        struct sway_container *child = con->children->items[i];
+                for (int i = 0; i < con->pending.children->length; ++i ) {
+                        struct sway_container *child = con->pending.children->items[i];
                         container_set_resizing(child, resizing);
                 }
         }
@@ -774,21 +831,33 @@ void container_set_floating(struct sway_container *container, bool enable) {
         }
 
         struct sway_seat *seat = input_manager_current_seat();
-        struct sway_workspace *workspace = container->workspace;
+        struct sway_workspace *workspace = container->pending.workspace;
+        struct sway_container *focus = seat_get_focused_container(seat);
+        bool set_focus = focus == container;
 
         if (enable) {
-                struct sway_container *old_parent = container->parent;
+                struct sway_container *old_parent = container->pending.parent;
                 container_detach(container);
                 workspace_add_floating(workspace, container);
                 if (container->view) {
                         view_set_tiled(container->view, false);
                         if (container->view->using_csd) {
-                                container->border = B_CSD;
+                                container->saved_border = container->pending.border;
+                                container->pending.border = B_CSD;
+                                if (container->view->xdg_decoration) {
+                                        struct sway_xdg_decoration *deco = container->view->xdg_decoration;
+                                        wlr_xdg_toplevel_decoration_v1_set_mode(deco->wlr_xdg_decoration,
+                                                        WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE);
+                                }
                         }
                 }
                 container_floating_set_default_size(container);
                 container_floating_resize_and_center(container);
                 if (old_parent) {
+                        if (set_focus) {
+                                seat_set_raw_focus(seat, &old_parent->node);
+                                seat_set_raw_focus(seat, &container->node);
+                        }
                         container_reap_empty(old_parent);
                 }
         } else {
@@ -800,19 +869,28 @@ void container_set_floating(struct sway_container *container, bool enable) {
                 struct sway_container *reference =
                         seat_get_focus_inactive_tiling(seat, workspace);
                 if (reference) {
-                        container_add_sibling(reference, container, 1);
-                        container->width = reference->width;
-                        container->height = reference->height;
+                        if (reference->view) {
+                                container_add_sibling(reference, container, 1);
+                        } else {
+                                container_add_child(reference, container);
+                        }
+                        container->pending.width = reference->pending.width;
+                        container->pending.height = reference->pending.height;
                 } else {
                         struct sway_container *other =
                                 workspace_add_tiling(workspace, container);
-                        other->width = workspace->width;
-                        other->height = workspace->height;
+                        other->pending.width = workspace->width;
+                        other->pending.height = workspace->height;
                 }
                 if (container->view) {
                         view_set_tiled(container->view, true);
                         if (container->view->using_csd) {
-                                container->border = container->saved_border;
+                                container->pending.border = container->saved_border;
+                                if (container->view->xdg_decoration) {
+                                        struct sway_xdg_decoration *deco = container->view->xdg_decoration;
+                                        wlr_xdg_toplevel_decoration_v1_set_mode(deco->wlr_xdg_decoration,
+                                                        WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE);
+                                }
                         }
                 }
                 container->width_fraction = 0;
@@ -834,22 +912,33 @@ void container_set_geometry_from_content(struct sway_container *con) {
         size_t border_width = 0;
         size_t top = 0;
 
-        if (con->border != B_CSD) {
-                border_width = con->border_thickness * (con->border != B_NONE);
-                top = con->border == B_NORMAL ?
+        if (con->pending.border != B_CSD && !con->pending.fullscreen_mode) {
+                border_width = con->pending.border_thickness * (con->pending.border != B_NONE);
+                top = con->pending.border == B_NORMAL ?
                         container_titlebar_height() : border_width;
         }
 
-        con->x = con->content_x - border_width;
-        con->y = con->content_y - top;
-        con->width = con->content_width + border_width * 2;
-        con->height = top + con->content_height + border_width;
+        con->pending.x = con->pending.content_x - border_width;
+        con->pending.y = con->pending.content_y - top;
+        con->pending.width = con->pending.content_width + border_width * 2;
+        con->pending.height = top + con->pending.content_height + border_width;
         node_set_dirty(&con->node);
 }
 
 bool container_is_floating(struct sway_container *container) {
-        if (!container->parent && container->workspace &&
-                        list_find(container->workspace->floating, container) != -1) {
+        if (!container->pending.parent && container->pending.workspace &&
+                        list_find(container->pending.workspace->floating, container) != -1) {
+                return true;
+        }
+        if (container->scratchpad) {
+                return true;
+        }
+        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) {
@@ -859,10 +948,10 @@ bool container_is_floating(struct sway_container *container) {
 }
 
 void container_get_box(struct sway_container *container, struct wlr_box *box) {
-        box->x = container->x;
-        box->y = container->y;
-        box->width = container->width;
-        box->height = container->height;
+        box->x = container->pending.x;
+        box->y = container->pending.y;
+        box->width = container->pending.width;
+        box->height = container->pending.height;
 }
 
 /**
@@ -870,14 +959,14 @@ void container_get_box(struct sway_container *container, struct wlr_box *box) {
  */
 void container_floating_translate(struct sway_container *con,
                 double x_amount, double y_amount) {
-        con->x += x_amount;
-        con->y += y_amount;
-        con->content_x += x_amount;
-        con->content_y += y_amount;
-
-        if (con->children) {
-                for (int i = 0; i < con->children->length; ++i) {
-                        struct sway_container *child = con->children->items[i];
+        con->pending.x += x_amount;
+        con->pending.y += y_amount;
+        con->pending.content_x += x_amount;
+        con->pending.content_y += y_amount;
+
+        if (con->pending.children) {
+                for (int i = 0; i < con->pending.children->length; ++i) {
+                        struct sway_container *child = con->pending.children->items[i];
                         container_floating_translate(child, x_amount, y_amount);
                 }
         }
@@ -893,8 +982,8 @@ void container_floating_translate(struct sway_container *con,
  * center.
  */
 struct sway_output *container_floating_find_output(struct sway_container *con) {
-        double center_x = con->x + con->width / 2;
-        double center_y = con->y + con->height / 2;
+        double center_x = con->pending.x + con->pending.width / 2;
+        double center_y = con->pending.y + con->pending.height / 2;
         struct sway_output *closest_output = NULL;
         double closest_distance = DBL_MAX;
         for (int i = 0; i < root->outputs->length; ++i) {
@@ -925,11 +1014,11 @@ void container_floating_move_to(struct sway_container *con,
                         "Expected a floating container")) {
                 return;
         }
-        container_floating_translate(con, lx - con->x, ly - con->y);
+        container_floating_translate(con, lx - con->pending.x, ly - con->pending.y);
         if (container_is_scratchpad_hidden(con)) {
                 return;
         }
-        struct sway_workspace *old_workspace = con->workspace;
+        struct sway_workspace *old_workspace = con->pending.workspace;
         struct sway_output *new_output = container_floating_find_output(con);
         if (!sway_assert(new_output, "Unable to find any output")) {
                 return;
@@ -951,10 +1040,10 @@ void container_floating_move_to_center(struct sway_container *con) {
                         "Expected a floating container")) {
                 return;
         }
-        struct sway_workspace *ws = con->workspace;
-        double new_lx = ws->x + (ws->width - con->width) / 2;
-        double new_ly = ws->y + (ws->height - con->height) / 2;
-        container_floating_translate(con, new_lx - con->x, new_ly - con->y);
+        struct sway_workspace *ws = con->pending.workspace;
+        double new_lx = ws->x + (ws->width - con->pending.width) / 2;
+        double new_ly = ws->y + (ws->height - con->pending.height) / 2;
+        container_floating_translate(con, new_lx - con->pending.x, new_ly - con->pending.y);
 }
 
 static bool find_urgent_iterator(struct sway_container *con, void *data) {
@@ -972,42 +1061,118 @@ void container_end_mouse_operation(struct sway_container *container) {
         }
 }
 
-static void set_fullscreen_iterator(struct sway_container *con, void *data) {
+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;
         }
         if (con->view->impl->set_fullscreen) {
-                bool *enable = data;
-                con->view->impl->set_fullscreen(con->view, *enable);
+                con->view->impl->set_fullscreen(con->view, enable);
                 if (con->view->foreign_toplevel) {
                         wlr_foreign_toplevel_handle_v1_set_fullscreen(
-                                con->view->foreign_toplevel, *enable);
+                                con->view->foreign_toplevel, enable);
                 }
         }
+
+        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) {
-        if (!sway_assert(con->fullscreen_mode == FULLSCREEN_NONE,
+        if (!sway_assert(con->pending.fullscreen_mode == FULLSCREEN_NONE,
                                 "Expected a non-fullscreen container")) {
                 return;
         }
-        bool enable = true;
-        set_fullscreen_iterator(con, &enable);
-        container_for_each_child(con, set_fullscreen_iterator, &enable);
-        con->fullscreen_mode = FULLSCREEN_WORKSPACE;
+        set_fullscreen(con, true);
+        con->pending.fullscreen_mode = FULLSCREEN_WORKSPACE;
 
-        con->saved_x = con->x;
-        con->saved_y = con->y;
-        con->saved_width = con->width;
-        con->saved_height = con->height;
+        con->saved_x = con->pending.x;
+        con->saved_y = con->pending.y;
+        con->saved_width = con->pending.width;
+        con->saved_height = con->pending.height;
 
-        if (con->workspace) {
-                con->workspace->fullscreen = con;
+        if (con->pending.workspace) {
+                con->pending.workspace->fullscreen = con;
                 struct sway_seat *seat;
                 struct sway_workspace *focus_ws;
                 wl_list_for_each(seat, &server.input->seats, link) {
                         focus_ws = seat_get_focused_workspace(seat);
-                        if (focus_ws == con->workspace) {
+                        if (focus_ws == con->pending.workspace) {
                                 seat_set_focus_container(seat, con);
                         } else {
                                 struct sway_node *focus =
@@ -1023,19 +1188,17 @@ static void container_fullscreen_workspace(struct sway_container *con) {
 }
 
 static void container_fullscreen_global(struct sway_container *con) {
-        if (!sway_assert(con->fullscreen_mode == FULLSCREEN_NONE,
+        if (!sway_assert(con->pending.fullscreen_mode == FULLSCREEN_NONE,
                                 "Expected a non-fullscreen container")) {
                 return;
         }
-        bool enable = true;
-        set_fullscreen_iterator(con, &enable);
-        container_for_each_child(con, set_fullscreen_iterator, &enable);
+        set_fullscreen(con, true);
 
         root->fullscreen_global = con;
-        con->saved_x = con->x;
-        con->saved_y = con->y;
-        con->saved_width = con->width;
-        con->saved_height = con->height;
+        con->saved_x = con->pending.x;
+        con->saved_y = con->pending.y;
+        con->saved_width = con->pending.width;
+        con->saved_height = con->pending.height;
 
         struct sway_seat *seat;
         wl_list_for_each(seat, &server.input->seats, link) {
@@ -1045,34 +1208,32 @@ static void container_fullscreen_global(struct sway_container *con) {
                 }
         }
 
-        con->fullscreen_mode = FULLSCREEN_GLOBAL;
+        con->pending.fullscreen_mode = FULLSCREEN_GLOBAL;
         container_end_mouse_operation(con);
         ipc_event_window(con, "fullscreen_mode");
 }
 
 void container_fullscreen_disable(struct sway_container *con) {
-        if (!sway_assert(con->fullscreen_mode != FULLSCREEN_NONE,
+        if (!sway_assert(con->pending.fullscreen_mode != FULLSCREEN_NONE,
                                 "Expected a fullscreen container")) {
                 return;
         }
-        bool enable = false;
-        set_fullscreen_iterator(con, &enable);
-        container_for_each_child(con, set_fullscreen_iterator, &enable);
+        set_fullscreen(con, false);
 
         if (container_is_floating(con)) {
-                con->x = con->saved_x;
-                con->y = con->saved_y;
-                con->width = con->saved_width;
-                con->height = con->saved_height;
+                con->pending.x = con->saved_x;
+                con->pending.y = con->saved_y;
+                con->pending.width = con->saved_width;
+                con->pending.height = con->saved_height;
         }
 
-        if (con->fullscreen_mode == FULLSCREEN_WORKSPACE) {
-                if (con->workspace) {
-                        con->workspace->fullscreen = NULL;
+        if (con->pending.fullscreen_mode == FULLSCREEN_WORKSPACE) {
+                if (con->pending.workspace) {
+                        con->pending.workspace->fullscreen = NULL;
                         if (container_is_floating(con)) {
                                 struct sway_output *output =
                                         container_floating_find_output(con);
-                                if (con->workspace->output != output) {
+                                if (con->pending.workspace->output != output) {
                                         container_floating_move_to_center(con);
                                 }
                         }
@@ -1084,11 +1245,11 @@ void container_fullscreen_disable(struct sway_container *con) {
         // If the container was mapped as fullscreen and set as floating by
         // criteria, it needs to be reinitialized as floating to get the proper
         // size and location
-        if (container_is_floating(con) && (con->width == 0 || con->height == 0)) {
+        if (container_is_floating(con) && (con->pending.width == 0 || con->pending.height == 0)) {
                 container_floating_resize_and_center(con);
         }
 
-        con->fullscreen_mode = FULLSCREEN_NONE;
+        con->pending.fullscreen_mode = FULLSCREEN_NONE;
         container_end_mouse_operation(con);
         ipc_event_window(con, "fullscreen_mode");
 
@@ -1106,7 +1267,7 @@ void container_fullscreen_disable(struct sway_container *con) {
 
 void container_set_fullscreen(struct sway_container *con,
                 enum sway_fullscreen_mode mode) {
-        if (con->fullscreen_mode == mode) {
+        if (con->pending.fullscreen_mode == mode) {
                 return;
         }
 
@@ -1118,8 +1279,8 @@ void container_set_fullscreen(struct sway_container *con,
                 if (root->fullscreen_global) {
                         container_fullscreen_disable(root->fullscreen_global);
                 }
-                if (con->workspace && con->workspace->fullscreen) {
-                        container_fullscreen_disable(con->workspace->fullscreen);
+                if (con->pending.workspace && con->pending.workspace->fullscreen) {
+                        container_fullscreen_disable(con->pending.workspace->fullscreen);
                 }
                 container_fullscreen_workspace(con);
                 break;
@@ -1127,7 +1288,7 @@ void container_set_fullscreen(struct sway_container *con,
                 if (root->fullscreen_global) {
                         container_fullscreen_disable(root->fullscreen_global);
                 }
-                if (con->fullscreen_mode == FULLSCREEN_WORKSPACE) {
+                if (con->pending.fullscreen_mode == FULLSCREEN_WORKSPACE) {
                         container_fullscreen_disable(con);
                 }
                 container_fullscreen_global(con);
@@ -1137,8 +1298,8 @@ void container_set_fullscreen(struct sway_container *con,
 
 struct sway_container *container_toplevel_ancestor(
                 struct sway_container *container) {
-        while (container->parent) {
-                container = container->parent;
+        while (container->pending.parent) {
+                container = container->pending.parent;
         }
 
         return container;
@@ -1150,10 +1311,10 @@ bool container_is_floating_or_child(struct sway_container *container) {
 
 bool container_is_fullscreen_or_child(struct sway_container *container) {
         do {
-                if (container->fullscreen_mode) {
+                if (container->pending.fullscreen_mode) {
                         return true;
                 }
-                container = container->parent;
+                container = container->pending.parent;
         } while (container);
 
         return false;
@@ -1226,11 +1387,11 @@ void container_discover_outputs(struct sway_container *con) {
 }
 
 enum sway_container_layout container_parent_layout(struct sway_container *con) {
-        if (con->parent) {
-                return con->parent->layout;
+        if (con->pending.parent) {
+                return con->pending.parent->pending.layout;
         }
-        if (con->workspace) {
-                return con->workspace->layout;
+        if (con->pending.workspace) {
+                return con->pending.workspace->layout;
         }
         return L_NONE;
 }
@@ -1244,16 +1405,16 @@ enum sway_container_layout container_current_parent_layout(
 }
 
 list_t *container_get_siblings(struct sway_container *container) {
-        if (container->parent) {
-                return container->parent->children;
+        if (container->pending.parent) {
+                return container->pending.parent->pending.children;
         }
         if (container_is_scratchpad_hidden(container)) {
                 return NULL;
         }
-        if (list_find(container->workspace->tiling, container) != -1) {
-                return container->workspace->tiling;
+        if (list_find(container->pending.workspace->tiling, container) != -1) {
+                return container->pending.workspace->tiling;
         }
-        return container->workspace->floating;
+        return container->pending.workspace->floating;
 }
 
 int container_sibling_index(struct sway_container *child) {
@@ -1268,30 +1429,30 @@ list_t *container_get_current_siblings(struct sway_container *container) {
 }
 
 void container_handle_fullscreen_reparent(struct sway_container *con) {
-        if (con->fullscreen_mode != FULLSCREEN_WORKSPACE || !con->workspace ||
-                        con->workspace->fullscreen == con) {
+        if (con->pending.fullscreen_mode != FULLSCREEN_WORKSPACE || !con->pending.workspace ||
+                        con->pending.workspace->fullscreen == con) {
                 return;
         }
-        if (con->workspace->fullscreen) {
-                container_fullscreen_disable(con->workspace->fullscreen);
+        if (con->pending.workspace->fullscreen) {
+                container_fullscreen_disable(con->pending.workspace->fullscreen);
         }
-        con->workspace->fullscreen = con;
+        con->pending.workspace->fullscreen = con;
 
-        arrange_workspace(con->workspace);
+        arrange_workspace(con->pending.workspace);
 }
 
 static void set_workspace(struct sway_container *container, void *data) {
-        container->workspace = container->parent->workspace;
+        container->pending.workspace = container->pending.parent->pending.workspace;
 }
 
 void container_insert_child(struct sway_container *parent,
                 struct sway_container *child, int i) {
-        if (child->workspace) {
+        if (child->pending.workspace) {
                 container_detach(child);
         }
-        list_insert(parent->children, i, child);
-        child->parent = parent;
-        child->workspace = parent->workspace;
+        list_insert(parent->pending.children, i, child);
+        child->pending.parent = parent;
+        child->pending.workspace = parent->pending.workspace;
         container_for_each_child(child, set_workspace, NULL);
         container_handle_fullscreen_reparent(child);
         container_update_representation(parent);
@@ -1299,14 +1460,14 @@ void container_insert_child(struct sway_container *parent,
 
 void container_add_sibling(struct sway_container *fixed,
                 struct sway_container *active, bool after) {
-        if (active->workspace) {
+        if (active->pending.workspace) {
                 container_detach(active);
         }
         list_t *siblings = container_get_siblings(fixed);
         int index = list_find(siblings, fixed);
         list_insert(siblings, index + after, active);
-        active->parent = fixed->parent;
-        active->workspace = fixed->workspace;
+        active->pending.parent = fixed->pending.parent;
+        active->pending.workspace = fixed->pending.workspace;
         container_for_each_child(active, set_workspace, NULL);
         container_handle_fullscreen_reparent(active);
         container_update_representation(active);
@@ -1314,17 +1475,13 @@ void container_add_sibling(struct sway_container *fixed,
 
 void container_add_child(struct sway_container *parent,
                 struct sway_container *child) {
-        if (child->workspace) {
+        if (child->pending.workspace) {
                 container_detach(child);
         }
-        list_add(parent->children, child);
-        child->parent = parent;
-        child->workspace = parent->workspace;
+        list_add(parent->pending.children, child);
+        child->pending.parent = parent;
+        child->pending.workspace = parent->pending.workspace;
         container_for_each_child(child, set_workspace, NULL);
-        bool fullscreen = child->fullscreen_mode != FULLSCREEN_NONE ||
-                parent->fullscreen_mode != FULLSCREEN_NONE;
-        set_fullscreen_iterator(child, &fullscreen);
-        container_for_each_child(child, set_fullscreen_iterator, &fullscreen);
         container_handle_fullscreen_reparent(child);
         container_update_representation(parent);
         node_set_dirty(&child->node);
@@ -1332,15 +1489,15 @@ void container_add_child(struct sway_container *parent,
 }
 
 void container_detach(struct sway_container *child) {
-        if (child->fullscreen_mode == FULLSCREEN_WORKSPACE) {
-                child->workspace->fullscreen = NULL;
+        if (child->pending.fullscreen_mode == FULLSCREEN_WORKSPACE) {
+                child->pending.workspace->fullscreen = NULL;
         }
-        if (child->fullscreen_mode == FULLSCREEN_GLOBAL) {
+        if (child->pending.fullscreen_mode == FULLSCREEN_GLOBAL) {
                 root->fullscreen_global = NULL;
         }
 
-        struct sway_container *old_parent = child->parent;
-        struct sway_workspace *old_workspace = child->workspace;
+        struct sway_container *old_parent = child->pending.parent;
+        struct sway_workspace *old_workspace = child->pending.workspace;
         list_t *siblings = container_get_siblings(child);
         if (siblings) {
                 int index = list_find(siblings, child);
@@ -1348,8 +1505,8 @@ void container_detach(struct sway_container *child) {
                         list_del(siblings, index);
                 }
         }
-        child->parent = NULL;
-        child->workspace = NULL;
+        child->pending.parent = NULL;
+        child->pending.workspace = NULL;
         container_for_each_child(child, set_workspace, NULL);
 
         if (old_parent) {
@@ -1364,18 +1521,18 @@ void container_detach(struct sway_container *child) {
 
 void container_replace(struct sway_container *container,
                 struct sway_container *replacement) {
-        enum sway_fullscreen_mode fullscreen = container->fullscreen_mode;
+        enum sway_fullscreen_mode fullscreen = container->pending.fullscreen_mode;
         bool scratchpad = container->scratchpad;
         struct sway_workspace *ws = NULL;
         if (fullscreen != FULLSCREEN_NONE) {
                 container_fullscreen_disable(container);
         }
         if (scratchpad) {
-                ws = container->workspace;
+                ws = container->pending.workspace;
                 root_scratchpad_show(container);
                 root_scratchpad_remove_container(container);
         }
-        if (container->parent || container->workspace) {
+        if (container->pending.parent || container->pending.workspace) {
                 float width_fraction = container->width_fraction;
                 float height_fraction = container->height_fraction;
                 container_add_sibling(container, replacement, 1);
@@ -1403,7 +1560,7 @@ struct sway_container *container_split(struct sway_container *child,
                 enum sway_container_layout layout) {
         // i3 doesn't split singleton H/V containers
         // https://github.com/i3/i3/blob/3cd1c45eba6de073bc4300eebb4e1cc1a0c4479a/src/tree.c#L354
-        if (child->parent || child->workspace) {
+        if (child->pending.parent || child->pending.workspace) {
                 list_t *siblings = container_get_siblings(child);
                 if (siblings->length == 1) {
                         enum sway_container_layout current = container_parent_layout(child);
@@ -1411,12 +1568,12 @@ struct sway_container *container_split(struct sway_container *child,
                                 current = L_NONE;
                         }
                         if (current == L_HORIZ || current == L_VERT) {
-                                if (child->parent) {
-                                        child->parent->layout = layout;
-                                        container_update_representation(child->parent);
+                                if (child->pending.parent) {
+                                        child->pending.parent->pending.layout = layout;
+                                        container_update_representation(child->pending.parent);
                                 } else {
-                                        child->workspace->layout = layout;
-                                        workspace_update_representation(child->workspace);
+                                        child->pending.workspace->layout = layout;
+                                        workspace_update_representation(child->pending.workspace);
                                 }
                                 return child;
                         }
@@ -1429,25 +1586,25 @@ struct sway_container *container_split(struct sway_container *child,
         if (container_is_floating(child) && child->view) {
                 view_set_tiled(child->view, true);
                 if (child->view->using_csd) {
-                        child->border = child->saved_border;
+                        child->pending.border = child->saved_border;
                 }
         }
 
         struct sway_container *cont = container_create(NULL);
-        cont->width = child->width;
-        cont->height = child->height;
+        cont->pending.width = child->pending.width;
+        cont->pending.height = child->pending.height;
         cont->width_fraction = child->width_fraction;
         cont->height_fraction = child->height_fraction;
-        cont->x = child->x;
-        cont->y = child->y;
-        cont->layout = layout;
+        cont->pending.x = child->pending.x;
+        cont->pending.y = child->pending.y;
+        cont->pending.layout = layout;
 
         container_replace(child, cont);
         container_add_child(cont, child);
 
         if (set_focus) {
                 seat_set_raw_focus(seat, &cont->node);
-                if (cont->fullscreen_mode == FULLSCREEN_GLOBAL) {
+                if (cont->pending.fullscreen_mode == FULLSCREEN_GLOBAL) {
                         seat_set_focus(seat, &child->node);
                 } else {
                         seat_set_raw_focus(seat, &child->node);
@@ -1554,39 +1711,8 @@ static void update_marks_texture(struct sway_container *con,
         }
         free(part);
 
-        double scale = output->wlr_output->scale;
-        int width = 0;
-        int height = con->title_height * scale;
-
-        cairo_t *c = cairo_create(NULL);
-        get_text_size(c, config->font, &width, NULL, NULL, scale, false,
-                        "%s", buffer);
-        cairo_destroy(c);
-
-        cairo_surface_t *surface = cairo_image_surface_create(
-                        CAIRO_FORMAT_ARGB32, width, height);
-        cairo_t *cairo = cairo_create(surface);
-        cairo_set_source_rgba(cairo, class->background[0], class->background[1],
-                        class->background[2], class->background[3]);
-        cairo_paint(cairo);
-        PangoContext *pango = pango_cairo_create_context(cairo);
-        cairo_set_antialias(cairo, CAIRO_ANTIALIAS_BEST);
-        cairo_set_source_rgba(cairo, class->text[0], class->text[1],
-                        class->text[2], class->text[3]);
-        cairo_move_to(cairo, 0, 0);
-
-        pango_printf(cairo, config->font, scale, false, "%s", buffer);
+        render_titlebar_text_texture(output, con, texture, class, false, buffer);
 
-        cairo_surface_flush(surface);
-        unsigned char *data = cairo_image_surface_get_data(surface);
-        int stride = cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, width);
-        struct wlr_renderer *renderer = wlr_backend_get_renderer(
-                        output->wlr_output->backend);
-        *texture = wlr_texture_from_pixels(
-                        renderer, WL_SHM_FORMAT_ARGB8888, stride, width, height, data);
-        cairo_surface_destroy(surface);
-        g_object_unref(pango);
-        cairo_destroy(cairo);
         free(buffer);
 }
 
@@ -1602,25 +1728,27 @@ void container_update_marks_textures(struct sway_container *con) {
                         &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->workspace) {
-                list_move_to_end(floater->workspace->floating, floater);
-                node_set_dirty(&floater->workspace->node);
+        if (container_is_floating(floater) && floater->pending.workspace) {
+                list_move_to_end(floater->pending.workspace->floating, floater);
+                node_set_dirty(&floater->pending.workspace->node);
         }
 }
 
 bool container_is_scratchpad_hidden(struct sway_container *con) {
-        return con->scratchpad && !con->workspace;
+        return con->scratchpad && !con->pending.workspace;
 }
 
 bool container_is_scratchpad_hidden_or_child(struct sway_container *con) {
         con = container_toplevel_ancestor(con);
-        return con->scratchpad && !con->workspace;
+        return con->scratchpad && !con->pending.workspace;
 }
 
 bool container_is_sticky(struct sway_container *con) {
@@ -1648,39 +1776,39 @@ static bool is_parallel(enum sway_container_layout first,
 static bool container_is_squashable(struct sway_container *con,
                 struct sway_container *child) {
         enum sway_container_layout gp_layout = container_parent_layout(con);
-        return (con->layout == L_HORIZ || con->layout == L_VERT) &&
-                (child->layout == L_HORIZ || child->layout == L_VERT) &&
-                !is_parallel(con->layout, child->layout) &&
-                is_parallel(gp_layout, child->layout);
+        return (con->pending.layout == L_HORIZ || con->pending.layout == L_VERT) &&
+                (child->pending.layout == L_HORIZ || child->pending.layout == L_VERT) &&
+                !is_parallel(con->pending.layout, child->pending.layout) &&
+                is_parallel(gp_layout, child->pending.layout);
 }
 
 static void container_squash_children(struct sway_container *con) {
-        for (int i = 0; i < con->children->length; i++) {
-                struct sway_container *child = con->children->items[i];
+        for (int i = 0; i < con->pending.children->length; i++) {
+                struct sway_container *child = con->pending.children->items[i];
                 i += container_squash(child);
         }
 }
 
 int container_squash(struct sway_container *con) {
-        if (!con->children) {
+        if (!con->pending.children) {
                 return 0;
         }
-        if (con->children->length != 1) {
+        if (con->pending.children->length != 1) {
                 container_squash_children(con);
                 return 0;
         }
-        struct sway_container *child = con->children->items[0];
+        struct sway_container *child = con->pending.children->items[0];
         int idx = container_sibling_index(con);
         int change = 0;
         if (container_is_squashable(con, child)) {
                 // con and child are a redundant H/V pair. Destroy them.
-                while (child->children->length) {
-                        struct sway_container *current = child->children->items[0];
+                while (child->pending.children->length) {
+                        struct sway_container *current = child->pending.children->items[0];
                         container_detach(current);
-                        if (con->parent) {
-                                container_insert_child(con->parent, current, idx);
+                        if (con->pending.parent) {
+                                container_insert_child(con->pending.parent, current, idx);
                         } else {
-                                workspace_insert_tiling_direct(con->workspace, current, idx);
+                                workspace_insert_tiling_direct(con->pending.workspace, current, idx);
                         }
                         change++;
                 }
diff --git a/sway/tree/node.c b/sway/tree/node.c
index ffa7f2cc..bc7e2aa5 100644
--- a/sway/tree/node.c
+++ b/sway/tree/node.c
@@ -75,7 +75,7 @@ void node_get_box(struct sway_node *node, struct wlr_box *box) {
 struct sway_output *node_get_output(struct sway_node *node) {
         switch (node->type) {
         case N_CONTAINER: {
-                struct sway_workspace *ws = node->sway_container->workspace;
+                struct sway_workspace *ws = node->sway_container->pending.workspace;
                 return ws ? ws->output : NULL;
     }
         case N_WORKSPACE:
@@ -91,7 +91,7 @@ struct sway_output *node_get_output(struct sway_node *node) {
 enum sway_container_layout node_get_layout(struct sway_node *node) {
         switch (node->type) {
         case N_CONTAINER:
-                return node->sway_container->layout;
+                return node->sway_container->pending.layout;
         case N_WORKSPACE:
                 return node->sway_workspace->layout;
         case N_OUTPUT:
@@ -105,11 +105,11 @@ struct sway_node *node_get_parent(struct sway_node *node) {
         switch (node->type) {
         case N_CONTAINER: {
                         struct sway_container *con = node->sway_container;
-                        if (con->parent) {
-                                return &con->parent->node;
+                        if (con->pending.parent) {
+                                return &con->pending.parent->node;
                         }
-                        if (con->workspace) {
-                                return &con->workspace->node;
+                        if (con->pending.workspace) {
+                                return &con->pending.workspace->node;
                         }
                 }
                 return NULL;
@@ -131,7 +131,7 @@ struct sway_node *node_get_parent(struct sway_node *node) {
 list_t *node_get_children(struct sway_node *node) {
         switch (node->type) {
         case N_CONTAINER:
-                return node->sway_container->children;
+                return node->sway_container->pending.children;
         case N_WORKSPACE:
                 return node->sway_workspace->tiling;
         case N_OUTPUT:
@@ -143,7 +143,7 @@ list_t *node_get_children(struct sway_node *node) {
 
 bool node_has_ancestor(struct sway_node *node, struct sway_node *ancestor) {
         if (ancestor->type == N_ROOT && node->type == N_CONTAINER &&
-                        node->sway_container->fullscreen_mode == FULLSCREEN_GLOBAL) {
+                        node->sway_container->pending.fullscreen_mode == FULLSCREEN_GLOBAL) {
                 return true;
         }
         struct sway_node *parent = node_get_parent(node);
@@ -152,7 +152,7 @@ bool node_has_ancestor(struct sway_node *node, struct sway_node *ancestor) {
                         return true;
                 }
                 if (ancestor->type == N_ROOT && parent->type == N_CONTAINER &&
-                                parent->sway_container->fullscreen_mode == FULLSCREEN_GLOBAL) {
+                                parent->sway_container->pending.fullscreen_mode == FULLSCREEN_GLOBAL) {
                         return true;
                 }
                 parent = node_get_parent(parent);
diff --git a/sway/tree/output.c b/sway/tree/output.c
index a8ae30f7..ad8d2482 100644
--- a/sway/tree/output.c
+++ b/sway/tree/output.c
@@ -56,8 +56,8 @@ static void restore_workspaces(struct sway_output *output) {
         }
 
         // Saved workspaces
-        while (root->noop_output->workspaces->length) {
-                struct sway_workspace *ws = root->noop_output->workspaces->items[0];
+        while (root->fallback_output->workspaces->length) {
+                struct sway_workspace *ws = root->fallback_output->workspaces->items[0];
                 workspace_detach(ws);
                 output_add_workspace(output, ws);
 
@@ -70,13 +70,13 @@ static void restore_workspaces(struct sway_output *output) {
                 // floater re-centered
                 for (int i = 0; i < ws->floating->length; i++) {
                         struct sway_container *floater = ws->floating->items[i];
-                        if (floater->width == 0 || floater->height == 0 ||
-                                        floater->width > output->width ||
-                                        floater->height > output->height ||
-                                        floater->x > output->lx + output->width ||
-                                        floater->y > output->ly + output->height ||
-                                        floater->x + floater->width < output->lx ||
-                                        floater->y + floater->height < output->ly) {
+                        if (floater->pending.width == 0 || floater->pending.height == 0 ||
+                                        floater->pending.width > output->width ||
+                                        floater->pending.height > output->height ||
+                                        floater->pending.x > output->lx + output->width ||
+                                        floater->pending.y > output->ly + output->height ||
+                                        floater->pending.x + floater->pending.width < output->lx ||
+                                        floater->pending.y + floater->pending.height < output->ly) {
                                 container_floating_resize_and_center(floater);
                         }
                 }
@@ -95,7 +95,7 @@ struct sway_output *output_create(struct wlr_output *wlr_output) {
         output->detected_subpixel = wlr_output->subpixel;
         output->scale_filter = SCALE_FILTER_NEAREST;
 
-        wl_signal_init(&output->events.destroy);
+        wl_signal_init(&output->events.disable);
 
         wl_list_insert(&root->all_outputs, &output->link);
 
@@ -192,7 +192,7 @@ static void output_evacuate(struct sway_output *output) {
                         new_output = fallback_output;
                 }
                 if (!new_output) {
-                        new_output = root->noop_output;
+                        new_output = root->fallback_output;
                 }
 
                 struct sway_workspace *new_output_ws =
@@ -262,7 +262,7 @@ void output_disable(struct sway_output *output) {
         }
 
         sway_log(SWAY_DEBUG, "Disabling output '%s'", output->wlr_output->name);
-        wl_signal_emit(&output->events.destroy, output);
+        wl_signal_emit(&output->events.disable, output);
 
         output_evacuate(output);
 
@@ -286,13 +286,10 @@ 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);
 
         output->node.destroying = true;
         node_set_dirty(&output->node);
-
-        wl_list_remove(&output->link);
-        output->wlr_output->data = NULL;
-        output->wlr_output = NULL;
 }
 
 struct sway_output *output_from_wlr_output(struct wlr_output *output) {
diff --git a/sway/tree/root.c b/sway/tree/root.c
index ebd185ec..73f3993c 100644
--- a/sway/tree/root.c
+++ b/sway/tree/root.c
@@ -59,11 +59,11 @@ void root_scratchpad_add_container(struct sway_container *con, struct sway_works
                 return;
         }
 
-        struct sway_container *parent = con->parent;
-        struct sway_workspace *workspace = con->workspace;
+        struct sway_container *parent = con->pending.parent;
+        struct sway_workspace *workspace = con->pending.workspace;
 
         // Clear the fullscreen mode when sending to the scratchpad
-        if (con->fullscreen_mode != FULLSCREEN_NONE) {
+        if (con->pending.fullscreen_mode != FULLSCREEN_NONE) {
                 container_fullscreen_disable(con);
         }
 
@@ -117,7 +117,7 @@ void root_scratchpad_show(struct sway_container *con) {
                 sway_log(SWAY_DEBUG, "No focused workspace to show scratchpad on");
                 return;
         }
-        struct sway_workspace *old_ws = con->workspace;
+        struct sway_workspace *old_ws = con->pending.workspace;
 
         // If the current con or any of its parents are in fullscreen mode, we
         // first need to disable it before showing the scratchpad con.
@@ -134,15 +134,15 @@ void root_scratchpad_show(struct sway_container *con) {
                 workspace_consider_destroy(old_ws);
         } else {
                 // Act on the ancestor of scratchpad hidden split containers
-                while (con->parent) {
-                        con = con->parent;
+                while (con->pending.parent) {
+                        con = con->pending.parent;
                 }
         }
         workspace_add_floating(new_ws, con);
 
         // Make sure the container's center point overlaps this workspace
-        double center_lx = con->x + con->width / 2;
-        double center_ly = con->y + con->height / 2;
+        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);
@@ -155,7 +155,7 @@ void root_scratchpad_show(struct sway_container *con) {
 }
 
 static void disable_fullscreen(struct sway_container *con, void *data) {
-        if (con->fullscreen_mode != FULLSCREEN_NONE) {
+        if (con->pending.fullscreen_mode != FULLSCREEN_NONE) {
                 container_fullscreen_disable(con);
         }
 }
@@ -163,9 +163,9 @@ static void disable_fullscreen(struct sway_container *con, void *data) {
 void root_scratchpad_hide(struct sway_container *con) {
         struct sway_seat *seat = input_manager_current_seat();
         struct sway_node *focus = seat_get_focus_inactive(seat, &root->node);
-        struct sway_workspace *ws = con->workspace;
+        struct sway_workspace *ws = con->pending.workspace;
 
-        if (con->fullscreen_mode == FULLSCREEN_GLOBAL && !con->workspace) {
+        if (con->pending.fullscreen_mode == FULLSCREEN_GLOBAL && !con->pending.workspace) {
                 // If the container was made fullscreen global while in the scratchpad,
                 // it should be shown until fullscreen has been disabled
                 return;
@@ -270,7 +270,16 @@ found:
                         sway_log(SWAY_DEBUG,
                                         "Creating workspace %s for pid %d because it disappeared",
                                         pw->workspace, pid);
-                        ws = workspace_create(pw->output, pw->workspace);
+
+                        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);
@@ -365,8 +374,8 @@ void root_for_each_container(void (*f)(struct sway_container *con, void *data),
         }
 
         // Saved workspaces
-        for (int i = 0; i < root->noop_output->workspaces->length; ++i) {
-                struct sway_workspace *ws = root->noop_output->workspaces->items[i];
+        for (int i = 0; i < root->fallback_output->workspaces->length; ++i) {
+                struct sway_workspace *ws = root->fallback_output->workspaces->items[i];
                 workspace_for_each_container(ws, f, data);
         }
 }
@@ -418,8 +427,8 @@ struct sway_container *root_find_container(
         }
 
         // Saved workspaces
-        for (int i = 0; i < root->noop_output->workspaces->length; ++i) {
-                struct sway_workspace *ws = root->noop_output->workspaces->items[i];
+        for (int i = 0; i < root->fallback_output->workspaces->length; ++i) {
+                struct sway_workspace *ws = root->fallback_output->workspaces->items[i];
                 if ((result = workspace_find_container(ws, test, data))) {
                         return result;
                 }
diff --git a/sway/tree/view.c b/sway/tree/view.c
index 7afcdf31..7d9e038d 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -6,6 +6,7 @@
 #include <wlr/types/wlr_buffer.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_server_decoration.h>
+#include <wlr/types/wlr_subcompositor.h>
 #include <wlr/types/wlr_xdg_decoration_v1.h>
 #include "config.h"
 #if HAVE_XWAYLAND
@@ -56,6 +57,7 @@ void view_destroy(struct sway_view *view) {
                                 "(might have a pending transaction?)")) {
                 return;
         }
+        wl_list_remove(&view->events.unmap.listener_list);
         if (!wl_list_empty(&view->saved_buffers)) {
                 view_remove_saved_buffer(view);
         }
@@ -206,7 +208,7 @@ bool view_ancestor_is_only_visible(struct sway_view *view) {
                 } else {
                         only_visible = true;
                 }
-                con = con->parent;
+                con = con->pending.parent;
         }
         return only_visible;
 }
@@ -222,72 +224,73 @@ static bool view_is_only_visible(struct sway_view *view) {
                         }
                 }
 
-                con = con->parent;
+                con = con->pending.parent;
         }
 
         return true;
 }
 
 static bool gaps_to_edge(struct sway_view *view) {
-        struct side_gaps gaps = view->container->workspace->current_gaps;
+        struct side_gaps gaps = view->container->pending.workspace->current_gaps;
         return gaps.top > 0 || gaps.right > 0 || gaps.bottom > 0 || gaps.left > 0;
 }
 
 void view_autoconfigure(struct sway_view *view) {
         struct sway_container *con = view->container;
-        struct sway_workspace *ws = con->workspace;
+        struct sway_workspace *ws = con->pending.workspace;
 
         if (container_is_scratchpad_hidden(con) &&
-                        con->fullscreen_mode != FULLSCREEN_GLOBAL) {
+                        con->pending.fullscreen_mode != FULLSCREEN_GLOBAL) {
                 return;
         }
         struct sway_output *output = ws ? ws->output : NULL;
 
-        if (con->fullscreen_mode == FULLSCREEN_WORKSPACE) {
-                con->content_x = output->lx;
-                con->content_y = output->ly;
-                con->content_width = output->width;
-                con->content_height = output->height;
+        if (con->pending.fullscreen_mode == FULLSCREEN_WORKSPACE) {
+                con->pending.content_x = output->lx;
+                con->pending.content_y = output->ly;
+                con->pending.content_width = output->width;
+                con->pending.content_height = output->height;
                 return;
-        } else if (con->fullscreen_mode == FULLSCREEN_GLOBAL) {
-                con->content_x = root->x;
-                con->content_y = root->y;
-                con->content_width = root->width;
-                con->content_height = root->height;
+        } else if (con->pending.fullscreen_mode == FULLSCREEN_GLOBAL) {
+                con->pending.content_x = root->x;
+                con->pending.content_y = root->y;
+                con->pending.content_width = root->width;
+                con->pending.content_height = root->height;
                 return;
         }
 
-        con->border_top = con->border_bottom = true;
-        con->border_left = con->border_right = true;
+        con->pending.border_top = con->pending.border_bottom = true;
+        con->pending.border_left = con->pending.border_right = true;
         double y_offset = 0;
 
-        if (!container_is_floating(con) && ws) {
+        if (!container_is_floating_or_child(con) && ws) {
                 if (config->hide_edge_borders == E_BOTH
                                 || config->hide_edge_borders == E_VERTICAL) {
-                        con->border_left = con->x != ws->x;
-                        int right_x = con->x + con->width;
-                        con->border_right = right_x != ws->x + ws->width;
+                        con->pending.border_left = con->pending.x != ws->x;
+                        int right_x = con->pending.x + con->pending.width;
+                        con->pending.border_right = right_x != ws->x + ws->width;
                 }
 
                 if (config->hide_edge_borders == E_BOTH
                                 || config->hide_edge_borders == E_HORIZONTAL) {
-                        con->border_top = con->y != ws->y;
-                        int bottom_y = con->y + con->height;
-                        con->border_bottom = bottom_y != ws->y + ws->height;
+                        con->pending.border_top = con->pending.y != ws->y;
+                        int bottom_y = con->pending.y + con->pending.height;
+                        con->pending.border_bottom = bottom_y != ws->y + ws->height;
                 }
 
                 bool smart = config->hide_edge_borders_smart == ESMART_ON ||
                         (config->hide_edge_borders_smart == ESMART_NO_GAPS &&
                         !gaps_to_edge(view));
                 if (smart) {
-                        bool show_border = container_is_floating_or_child(con) ||
-                                !view_is_only_visible(view);
-                        con->border_left &= show_border;
-                        con->border_right &= show_border;
-                        con->border_top &= show_border;
-                        con->border_bottom &= show_border;
+                        bool show_border = !view_is_only_visible(view);
+                        con->pending.border_left &= show_border;
+                        con->pending.border_right &= show_border;
+                        con->pending.border_top &= show_border;
+                        con->pending.border_bottom &= show_border;
                 }
+        }
 
+        if (!container_is_floating(con)) {
                 // In a tabbed or stacked container, the container's y is the top of the
                 // title area. We have to offset the surface y by the height of the title,
                 // bar, and disable any top border because we'll always have the title bar.
@@ -298,56 +301,56 @@ void view_autoconfigure(struct sway_view *view) {
                         enum sway_container_layout layout = container_parent_layout(con);
                         if (layout == L_TABBED) {
                                 y_offset = container_titlebar_height();
-                                con->border_top = false;
+                                con->pending.border_top = false;
                         } else if (layout == L_STACKED) {
                                 y_offset = container_titlebar_height() * siblings->length;
-                                con->border_top = false;
+                                con->pending.border_top = false;
                         }
                 }
         }
 
         double x, y, width, height;
-        switch (con->border) {
+        switch (con->pending.border) {
         default:
         case B_CSD:
         case B_NONE:
-                x = con->x;
-                y = con->y + y_offset;
-                width = con->width;
-                height = con->height - y_offset;
+                x = con->pending.x;
+                y = con->pending.y + y_offset;
+                width = con->pending.width;
+                height = con->pending.height - y_offset;
                 break;
         case B_PIXEL:
-                x = con->x + con->border_thickness * con->border_left;
-                y = con->y + con->border_thickness * con->border_top + y_offset;
-                width = con->width
-                        - con->border_thickness * con->border_left
-                        - con->border_thickness * con->border_right;
-                height = con->height - y_offset
-                        - con->border_thickness * con->border_top
-                        - con->border_thickness * con->border_bottom;
+                x = con->pending.x + con->pending.border_thickness * con->pending.border_left;
+                y = con->pending.y + con->pending.border_thickness * con->pending.border_top + y_offset;
+                width = con->pending.width
+                        - con->pending.border_thickness * con->pending.border_left
+                        - con->pending.border_thickness * con->pending.border_right;
+                height = con->pending.height - y_offset
+                        - con->pending.border_thickness * con->pending.border_top
+                        - con->pending.border_thickness * con->pending.border_bottom;
                 break;
         case B_NORMAL:
                 // Height is: 1px border + 3px pad + title height + 3px pad + 1px border
-                x = con->x + con->border_thickness * con->border_left;
-                width = con->width
-                        - con->border_thickness * con->border_left
-                        - con->border_thickness * con->border_right;
+                x = con->pending.x + con->pending.border_thickness * con->pending.border_left;
+                width = con->pending.width
+                        - con->pending.border_thickness * con->pending.border_left
+                        - con->pending.border_thickness * con->pending.border_right;
                 if (y_offset) {
-                        y = con->y + y_offset;
-                        height = con->height - y_offset
-                                - con->border_thickness * con->border_bottom;
+                        y = con->pending.y + y_offset;
+                        height = con->pending.height - y_offset
+                                - con->pending.border_thickness * con->pending.border_bottom;
                 } else {
-                        y = con->y + container_titlebar_height();
-                        height = con->height - container_titlebar_height()
-                                - con->border_thickness * con->border_bottom;
+                        y = con->pending.y + container_titlebar_height();
+                        height = con->pending.height - container_titlebar_height()
+                                - con->pending.border_thickness * con->pending.border_bottom;
                 }
                 break;
         }
 
-        con->content_x = x;
-        con->content_y = y;
-        con->content_width = width;
-        con->content_height = height;
+        con->pending.content_x = x;
+        con->pending.content_y = y;
+        con->pending.content_width = width;
+        con->pending.content_height = height;
 }
 
 void view_set_activated(struct sway_view *view, bool activated) {
@@ -361,7 +364,7 @@ void view_set_activated(struct sway_view *view, bool activated) {
 }
 
 void view_request_activate(struct sway_view *view) {
-        struct sway_workspace *ws = view->container->workspace;
+        struct sway_workspace *ws = view->container->pending.workspace;
         if (!ws) { // hidden scratchpad container
                 return;
         }
@@ -401,13 +404,13 @@ void view_set_csd_from_server(struct sway_view *view, bool enabled) {
 void view_update_csd_from_client(struct sway_view *view, bool enabled) {
         sway_log(SWAY_DEBUG, "View %p updated CSD to %i", view, enabled);
         struct sway_container *con = view->container;
-        if (enabled && con && con->border != B_CSD) {
-                con->saved_border = con->border;
+        if (enabled && con && con->pending.border != B_CSD) {
+                con->saved_border = con->pending.border;
                 if (container_is_floating(con)) {
-                        con->border = B_CSD;
+                        con->pending.border = B_CSD;
                 }
-        } else if (!enabled && con && con->border == B_CSD) {
-                con->border = con->saved_border;
+        } else if (!enabled && con && con->pending.border == B_CSD) {
+                con->pending.border = con->saved_border;
         }
         view->using_csd = enabled;
 }
@@ -465,6 +468,9 @@ static void view_subsurface_create(struct sway_view *view,
 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 =
@@ -577,7 +583,7 @@ static struct sway_workspace *select_workspace(struct sway_view *view) {
         if (node && node->type == N_WORKSPACE) {
                 return node->sway_workspace;
         } else if (node && node->type == N_CONTAINER) {
-                return node->sway_container->workspace;
+                return node->sway_container->pending.workspace;
         }
 
         // When there's no outputs connected, the above should match a workspace on
@@ -590,12 +596,17 @@ static bool should_focus(struct sway_view *view) {
         struct sway_seat *seat = input_manager_current_seat();
         struct sway_container *prev_con = seat_get_focused_container(seat);
         struct sway_workspace *prev_ws = seat_get_focused_workspace(seat);
-        struct sway_workspace *map_ws = view->container->workspace;
+        struct sway_workspace *map_ws = view->container->pending.workspace;
 
-        if (view->container->fullscreen_mode == FULLSCREEN_GLOBAL) {
+        if (view->container->pending.fullscreen_mode == FULLSCREEN_GLOBAL) {
                 return true;
         }
 
+        // View opened "under" fullscreen view should not be given focus.
+        if (root->fullscreen_global || !map_ws || map_ws->fullscreen) {
+                return false;
+        }
+
         // Views can only take focus if they are mapped into the active workspace
         if (prev_ws != map_ws) {
                 return false;
@@ -603,9 +614,9 @@ static bool should_focus(struct sway_view *view) {
 
         // If the view is the only one in the focused workspace, it'll get focus
         // regardless of any no_focus criteria.
-        if (!view->container->parent && !prev_con) {
-                size_t num_children = view->container->workspace->tiling->length +
-                        view->container->workspace->floating->length;
+        if (!view->container->pending.parent && !prev_con) {
+                size_t num_children = view->container->pending.workspace->tiling->length +
+                        view->container->pending.workspace->floating->length;
                 if (num_children == 1) {
                         return true;
                 }
@@ -635,6 +646,7 @@ static void handle_foreign_activate_request(
                         break;
                 }
         }
+        transaction_commit_dirty();
 }
 
 static void handle_foreign_fullscreen_request(
@@ -645,9 +657,21 @@ static void handle_foreign_fullscreen_request(
 
         // Match fullscreen command behavior for scratchpad hidden views
         struct sway_container *container = view->container;
-        if (!container->workspace) {
-                while (container->parent) {
-                        container = container->parent;
+        if (!container->pending.workspace) {
+                while (container->pending.parent) {
+                        container = container->pending.parent;
+                }
+        }
+
+        if (event->fullscreen && event->output && event->output->data) {
+                struct sway_output *output = event->output->data;
+                struct sway_workspace *ws = output_get_active_workspace(output);
+                if (ws && !container_is_scratchpad_hidden(view->container)) {
+                        if (container_is_floating(view->container)) {
+                                workspace_add_floating(ws, view->container);
+                        } else {
+                                workspace_add_tiling(ws, view->container);
+                        }
                 }
         }
 
@@ -656,12 +680,13 @@ static void handle_foreign_fullscreen_request(
         if (event->fullscreen) {
                 arrange_root();
         } else {
-                if (container->parent) {
-                        arrange_container(container->parent);
-                } else if (container->workspace) {
-                        arrange_workspace(container->workspace);
+                if (container->pending.parent) {
+                        arrange_container(container->pending.parent);
+                } else if (container->pending.workspace) {
+                        arrange_workspace(container->pending.workspace);
                 }
         }
+        transaction_commit_dirty();
 }
 
 static void handle_foreign_close_request(
@@ -705,10 +730,29 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
         }
 
         struct sway_seat *seat = input_manager_current_seat();
-        struct sway_node *node = ws ? seat_get_focus_inactive(seat, &ws->node)
-                : seat_get_focus_inactive(seat, &root->node);
-        struct sway_container *target_sibling = node->type == N_CONTAINER ?
-                node->sway_container : NULL;
+        struct sway_node *node =
+                seat_get_focus_inactive(seat, ws ? &ws->node : &root->node);
+        struct sway_container *target_sibling = NULL;
+        if (node && node->type == N_CONTAINER) {
+                if (container_is_floating(node->sway_container)) {
+                        // If we're about to launch the view into the floating container, then
+                        // launch it as a tiled view instead.
+                        if (ws) {
+                                target_sibling = seat_get_focus_inactive_tiling(seat, ws);
+                                if (target_sibling) {
+                                        struct sway_container *con =
+                                                seat_get_focus_inactive_view(seat, &target_sibling->node);
+                                        if (con)  {
+                                                target_sibling = con;
+                                        }
+                                }
+                        } else {
+                                ws = seat_get_last_known_workspace(seat);
+                        }
+                } else {
+                        target_sibling = node->sway_container;
+                }
+        }
 
         view->foreign_toplevel =
                 wlr_foreign_toplevel_handle_v1_create(server.foreign_toplevel_manager);
@@ -725,13 +769,6 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
         wl_signal_add(&view->foreign_toplevel->events.destroy,
                         &view->foreign_destroy);
 
-        // If we're about to launch the view into the floating container, then
-        // launch it as a tiled view in the root of the workspace instead.
-        if (target_sibling && container_is_floating(target_sibling)) {
-                target_sibling = NULL;
-                ws = seat_get_last_known_workspace(seat);
-        }
-
         struct sway_container *container = view->container;
         if (target_sibling) {
                 container_add_sibling(target_sibling, container, 1);
@@ -742,7 +779,7 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
 
         view_init_subsurfaces(view, wlr_surface);
         wl_signal_add(&wlr_surface->events.new_subsurface,
-                &view->surface_new_subsurface);
+                        &view->surface_new_subsurface);
         view->surface_new_subsurface.notify = view_handle_surface_new_subsurface;
 
         if (decoration) {
@@ -750,20 +787,20 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
         }
 
         if (view->impl->wants_floating && view->impl->wants_floating(view)) {
-                view->container->border = config->floating_border;
-                view->container->border_thickness = config->floating_border_thickness;
+                view->container->pending.border = config->floating_border;
+                view->container->pending.border_thickness = config->floating_border_thickness;
                 container_set_floating(view->container, true);
         } else {
-                view->container->border = config->border;
-                view->container->border_thickness = config->border_thickness;
+                view->container->pending.border = config->border;
+                view->container->pending.border_thickness = config->border_thickness;
                 view_set_tiled(view, true);
         }
 
         if (config->popup_during_fullscreen == POPUP_LEAVE &&
-                        container->workspace &&
-                        container->workspace->fullscreen &&
-                        container->workspace->fullscreen->view) {
-                struct sway_container *fs = container->workspace->fullscreen;
+                        container->pending.workspace &&
+                        container->pending.workspace->fullscreen &&
+                        container->pending.workspace->fullscreen->view) {
+                struct sway_container *fs = container->pending.workspace->fullscreen;
                 if (view_is_transient_for(view, fs->view)) {
                         container_set_fullscreen(fs, false);
                 }
@@ -774,12 +811,12 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
 
         if (fullscreen) {
                 container_set_fullscreen(view->container, true);
-                arrange_workspace(view->container->workspace);
+                arrange_workspace(view->container->pending.workspace);
         } else {
-                if (container->parent) {
-                        arrange_container(container->parent);
-                } else if (container->workspace) {
-                        arrange_workspace(container->workspace);
+                if (container->pending.parent) {
+                        arrange_container(container->pending.parent);
+                } else if (container->pending.workspace) {
+                        arrange_workspace(container->pending.workspace);
                 }
         }
 
@@ -790,9 +827,9 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_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);
-        set_focus = (wlr_xwayland_icccm_input_model(xsurface) !=
-                        WLR_ICCCM_INPUT_MODEL_NONE) && set_focus;
+                                wlr_xwayland_surface_from_wlr_surface(wlr_surface);
+                set_focus &= wlr_xwayland_icccm_input_model(xsurface) !=
+                                WLR_ICCCM_INPUT_MODEL_NONE;
         }
 #endif
 
@@ -803,11 +840,9 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
         const char *app_id;
         const char *class;
         if ((app_id = view_get_app_id(view)) != NULL) {
-                wlr_foreign_toplevel_handle_v1_set_app_id(
-                                view->foreign_toplevel, app_id);
+                wlr_foreign_toplevel_handle_v1_set_app_id(view->foreign_toplevel, app_id);
         } else if ((class = view_get_class(view)) != NULL) {
-                wlr_foreign_toplevel_handle_v1_set_app_id(
-                                view->foreign_toplevel, class);
+                wlr_foreign_toplevel_handle_v1_set_app_id(view->foreign_toplevel, class);
         }
 }
 
@@ -826,8 +861,8 @@ void view_unmap(struct sway_view *view) {
                 view->foreign_toplevel = NULL;
         }
 
-        struct sway_container *parent = view->container->parent;
-        struct sway_workspace *ws = view->container->workspace;
+        struct sway_container *parent = view->container->pending.parent;
+        struct sway_workspace *ws = view->container->pending.workspace;
         container_begin_destroy(view->container);
         if (parent) {
                 container_reap_empty(parent);
@@ -860,47 +895,38 @@ void view_unmap(struct sway_view *view) {
         view->surface = NULL;
 }
 
-void view_update_size(struct sway_view *view, int width, int height) {
+void view_update_size(struct sway_view *view) {
         struct sway_container *con = view->container;
+        con->pending.content_width = view->geometry.width;
+        con->pending.content_height = view->geometry.height;
+        container_set_geometry_from_content(con);
+}
 
-        if (container_is_floating(con)) {
-                con->content_width = width;
-                con->content_height = height;
-                container_set_geometry_from_content(con);
-        } else {
-                con->surface_x = con->content_x + (con->content_width - width) / 2;
-                con->surface_y = con->content_y + (con->content_height - height) / 2;
-                con->surface_x = fmax(con->surface_x, con->content_x);
-                con->surface_y = fmax(con->surface_y, con->content_y);
-        }
+void view_center_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;
 
-static void subsurface_get_root_coords(struct sway_view_child *child,
-                int *root_sx, int *root_sy) {
+static void subsurface_get_view_coords(struct sway_view_child *child,
+                int *sx, int *sy) {
         struct wlr_surface *surface = child->surface;
-        *root_sx = -child->view->geometry.x;
-        *root_sy = -child->view->geometry.y;
-
         if (child->parent && child->parent->impl &&
-                        child->parent->impl->get_root_coords) {
-                int sx, sy;
-                child->parent->impl->get_root_coords(child->parent, &sx, &sy);
-                *root_sx += sx;
-                *root_sy += sy;
+                        child->parent->impl->get_view_coords) {
+                child->parent->impl->get_view_coords(child->parent, sx, sy);
         } else {
-                while (surface && wlr_surface_is_subsurface(surface)) {
-                        struct wlr_subsurface *subsurface =
-                                wlr_subsurface_from_wlr_surface(surface);
-                        if (subsurface == NULL) {
-                                break;
-                        }
-                        *root_sx += subsurface->current.x;
-                        *root_sy += subsurface->current.y;
-                        surface = subsurface->parent;
-                }
+                *sx = *sy = 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) {
@@ -914,7 +940,7 @@ static void subsurface_destroy(struct sway_view_child *child) {
 }
 
 static const struct sway_view_child_impl subsurface_impl = {
-        .get_root_coords = subsurface_get_root_coords,
+        .get_view_coords = subsurface_get_view_coords,
         .destroy = subsurface_destroy,
 };
 
@@ -968,15 +994,27 @@ static void view_child_subsurface_create(struct sway_view_child *child,
         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 || !child->mapped || !child->view || !child->view->container) {
+        if (!child || !view_child_is_mapped(child) || !child->view || !child->view->container) {
                 return;
         }
         int sx, sy;
-        child->impl->get_root_coords(child, &sx, &sy);
+        child->impl->get_view_coords(child, &sx, &sy);
         desktop_damage_surface(child->surface,
-                        child->view->container->content_x + sx,
-                        child->view->container->content_y + sy, whole);
+                        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,
@@ -1004,11 +1042,29 @@ static void view_child_handle_surface_destroy(struct wl_listener *listener,
 static void view_init_subsurfaces(struct sway_view *view,
                 struct wlr_surface *surface) {
         struct wlr_subsurface *subsurface;
-        wl_list_for_each(subsurface, &surface->subsurfaces, parent_link) {
+        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 =
@@ -1059,16 +1115,19 @@ void view_child_init(struct sway_view_child *child,
         wl_signal_add(&view->events.unmap, &child->view_unmap);
         child->view_unmap.notify = view_child_handle_view_unmap;
 
-        struct sway_workspace *workspace = child->view->container->workspace;
-        if (workspace) {
-                wlr_surface_send_enter(child->surface, workspace->output->wlr_output);
+        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_init_subsurfaces(child->view, surface);
+        view_child_init_subsurfaces(child, surface);
 }
 
 void view_child_destroy(struct sway_view_child *child) {
-        if (child->mapped && child->view->container != NULL) {
+        if (view_child_is_mapped(child) && child->view->container != NULL) {
                 view_child_damage(child, true);
         }
 
@@ -1081,6 +1140,9 @@ void view_child_destroy(struct sway_view_child *child) {
         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);
@@ -1101,18 +1163,27 @@ 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;
+                }
                 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;
+                }
                 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;
+                }
                 return view_from_wlr_surface(subsurface->parent);
         }
         if (wlr_surface_is_layer_surface(wlr_surface)) {
@@ -1225,8 +1296,6 @@ void view_update_title(struct sway_view *view, bool force) {
                 view->container->title = NULL;
                 view->container->formatted_title = NULL;
         }
-        container_calculate_title_height(view->container);
-        config_update_font_height(false);
 
         // Update title after the global font height is updated
         container_update_title_textures(view->container);
@@ -1242,15 +1311,15 @@ bool view_is_visible(struct sway_view *view) {
         if (view->container->node.destroying) {
                 return false;
         }
-        struct sway_workspace *workspace = view->container->workspace;
-        if (!workspace && view->container->fullscreen_mode != FULLSCREEN_GLOBAL) {
+        struct sway_workspace *workspace = view->container->pending.workspace;
+        if (!workspace && view->container->pending.fullscreen_mode != FULLSCREEN_GLOBAL) {
                 bool fs_global_descendant = false;
-                struct sway_container *parent = view->container->parent;
+                struct sway_container *parent = view->container->pending.parent;
                 while (parent) {
-                        if (parent->fullscreen_mode == FULLSCREEN_GLOBAL) {
+                        if (parent->pending.fullscreen_mode == FULLSCREEN_GLOBAL) {
                                 fs_global_descendant = true;
                         }
-                        parent = parent->parent;
+                        parent = parent->pending.parent;
                 }
                 if (!fs_global_descendant) {
                         return false;
@@ -1268,13 +1337,13 @@ bool view_is_visible(struct sway_view *view) {
                 enum sway_container_layout layout = container_parent_layout(con);
                 if ((layout == L_TABBED || layout == L_STACKED)
                                 && !container_is_floating(con)) {
-                        struct sway_node *parent = con->parent ?
-                                &con->parent->node : &con->workspace->node;
+                        struct sway_node *parent = con->pending.parent ?
+                                &con->pending.parent->node : &con->pending.workspace->node;
                         if (seat_get_active_tiling_child(seat, parent) != &con->node) {
                                 return false;
                         }
                 }
-                con = con->parent;
+                con = con->pending.parent;
         }
         // Check view isn't hidden by another fullscreen view
         struct sway_container *fs = root->fullscreen_global ?
@@ -1308,7 +1377,7 @@ void view_set_urgent(struct sway_view *view, bool enable) {
         ipc_event_window(view->container, "urgent");
 
         if (!container_is_scratchpad_hidden(view->container)) {
-                workspace_detect_urgent(view->container->workspace);
+                workspace_detect_urgent(view->container->pending.workspace);
         }
 }
 
@@ -1338,11 +1407,11 @@ static void view_save_buffer_iterator(struct wlr_surface *surface,
                 saved_buffer->buffer = surface->buffer;
                 saved_buffer->width = surface->current.width;
                 saved_buffer->height = surface->current.height;
-                saved_buffer->x = sx;
-                saved_buffer->y = sy;
+                saved_buffer->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, &saved_buffer->link);
+                wl_list_insert(view->saved_buffers.prev, &saved_buffer->link);
         }
 }
 
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index 921b7d19..c84320bd 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -48,10 +48,10 @@ struct sway_output *workspace_get_initial_output(const char *name) {
         if (focus && focus->type == N_WORKSPACE) {
                 return focus->sway_workspace->output;
         } else if (focus && focus->type == N_CONTAINER) {
-                return focus->sway_container->workspace->output;
+                return focus->sway_container->pending.workspace->output;
         }
-        // Fallback to the first output or noop output for headless
-        return root->outputs->length ? root->outputs->items[0] : root->noop_output;
+        // Fallback to the first output or the headless output
+        return root->outputs->length ? root->outputs->items[0] : root->fallback_output;
 }
 
 struct sway_workspace *workspace_create(struct sway_output *output,
@@ -222,10 +222,8 @@ static void workspace_name_from_binding(const struct sway_binding * binding,
                 // not a command about workspaces
                 if (strcmp(_target, "next") == 0 ||
                                 strcmp(_target, "prev") == 0 ||
-                                strncmp(_target, "next_on_output",
-                                        strlen("next_on_output")) == 0 ||
-                                strncmp(_target, "prev_on_output",
-                                        strlen("next_on_output")) == 0 ||
+                                strcmp(_target, "next_on_output") == 0 ||
+                                strcmp(_target, "prev_on_output") == 0 ||
                                 strcmp(_target, "number") == 0 ||
                                 strcmp(_target, "back_and_forth") == 0 ||
                                 strcmp(_target, "current") == 0) {
@@ -363,11 +361,11 @@ struct sway_workspace *workspace_by_name(const char *name) {
         if (current && strcmp(name, "prev") == 0) {
                 return workspace_prev(current);
         } else if (current && strcmp(name, "prev_on_output") == 0) {
-                return workspace_output_prev(current, false);
+                return workspace_output_prev(current);
         } else if (current && strcmp(name, "next") == 0) {
                 return workspace_next(current);
         } else if (current && strcmp(name, "next_on_output") == 0) {
-                return workspace_output_next(current, false);
+                return workspace_output_next(current);
         } else if (strcmp(name, "current") == 0) {
                 return current;
         } else if (strcasecmp(name, "back_and_forth") == 0) {
@@ -530,7 +528,7 @@ struct sway_workspace *workspace_next(struct sway_workspace *workspace) {
  * otherwise the next one is returned.
  */
 static struct sway_workspace *workspace_output_prev_next_impl(
-                struct sway_output *output, int dir, bool create) {
+                struct sway_output *output, int dir) {
         struct sway_seat *seat = input_manager_current_seat();
         struct sway_workspace *workspace = seat_get_focused_workspace(seat);
         if (!workspace) {
@@ -540,46 +538,43 @@ static struct sway_workspace *workspace_output_prev_next_impl(
         }
 
         int index = list_find(output->workspaces, workspace);
-        if (!workspace_is_empty(workspace) && create &&
-                        (index + dir < 0 || index + dir == output->workspaces->length)) {
-                struct sway_output *output = workspace->output;
-                char *next = workspace_next_name(output->wlr_output->name);
-                workspace_create(output, next);
-                free(next);
-        }
         size_t new_index = wrap(index + dir, output->workspaces->length);
         return output->workspaces->items[new_index];
 }
 
-struct sway_workspace *workspace_output_next(
-                struct sway_workspace *current, bool create) {
-        return workspace_output_prev_next_impl(current->output, 1, create);
+
+struct sway_workspace *workspace_output_next(struct sway_workspace *current) {
+        return workspace_output_prev_next_impl(current->output, 1);
 }
 
-struct sway_workspace *workspace_output_prev(
-                struct sway_workspace *current, bool create) {
-        return workspace_output_prev_next_impl(current->output, -1, create);
+struct sway_workspace *workspace_output_prev(struct sway_workspace *current) {
+        return workspace_output_prev_next_impl(current->output, -1);
 }
 
-bool workspace_switch(struct sway_workspace *workspace,
-                bool no_auto_back_and_forth) {
+struct sway_workspace *workspace_auto_back_and_forth(
+                struct sway_workspace *workspace) {
         struct sway_seat *seat = input_manager_current_seat();
         struct sway_workspace *active_ws = NULL;
         struct sway_node *focus = seat_get_focus_inactive(seat, &root->node);
         if (focus && focus->type == N_WORKSPACE) {
                 active_ws = focus->sway_workspace;
         } else if (focus && focus->type == N_CONTAINER) {
-                active_ws = focus->sway_container->workspace;
+                active_ws = focus->sway_container->pending.workspace;
         }
 
-        if (!no_auto_back_and_forth && config->auto_back_and_forth && active_ws
-                        && active_ws == workspace && seat->prev_workspace_name) {
+        if (config->auto_back_and_forth && active_ws && active_ws == workspace &&
+                        seat->prev_workspace_name) {
                 struct sway_workspace *new_ws =
                         workspace_by_name(seat->prev_workspace_name);
                 workspace = new_ws ?
                         new_ws :
                         workspace_create(NULL, seat->prev_workspace_name);
         }
+        return workspace;
+}
+
+bool workspace_switch(struct sway_workspace *workspace) {
+        struct sway_seat *seat = input_manager_current_seat();
 
         sway_log(SWAY_DEBUG, "Switching to workspace %p:%s",
                 workspace, workspace->name);
@@ -736,13 +731,13 @@ struct sway_container *workspace_find_container(struct sway_workspace *ws,
 }
 
 static void set_workspace(struct sway_container *container, void *data) {
-        container->workspace = container->parent->workspace;
+        container->pending.workspace = container->pending.parent->pending.workspace;
 }
 
 static void workspace_attach_tiling(struct sway_workspace *ws,
                 struct sway_container *con) {
         list_add(ws->tiling, con);
-        con->workspace = ws;
+        con->pending.workspace = ws;
         container_for_each_child(con, set_workspace, NULL);
         container_handle_fullscreen_reparent(con);
         workspace_update_representation(ws);
@@ -753,7 +748,7 @@ static void workspace_attach_tiling(struct sway_workspace *ws,
 struct sway_container *workspace_wrap_children(struct sway_workspace *ws) {
         struct sway_container *fs = ws->fullscreen;
         struct sway_container *middle = container_create(NULL);
-        middle->layout = ws->layout;
+        middle->pending.layout = ws->layout;
         while (ws->tiling->length) {
                 struct sway_container *child = ws->tiling->items[0];
                 container_detach(child);
@@ -771,9 +766,9 @@ void workspace_unwrap_children(struct sway_workspace *ws,
                 return;
         }
 
-        ws->layout = wrap->layout;
-        while (wrap->children->length) {
-                struct sway_container *child = wrap->children->items[0];
+        ws->layout = wrap->pending.layout;
+        while (wrap->pending.children->length) {
+                struct sway_container *child = wrap->pending.children->items[0];
                 container_detach(child);
                 workspace_add_tiling(ws, child);
         }
@@ -793,14 +788,18 @@ void workspace_detach(struct sway_workspace *workspace) {
 
 struct sway_container *workspace_add_tiling(struct sway_workspace *workspace,
                 struct sway_container *con) {
-        if (con->workspace) {
+        if (con->pending.workspace) {
+                struct sway_container *old_parent = con->pending.parent;
                 container_detach(con);
+                if (old_parent) {
+                        container_reap_empty(old_parent);
+                }
         }
         if (config->default_layout != L_NONE) {
                 con = container_split(con, config->default_layout);
         }
         list_add(workspace->tiling, con);
-        con->workspace = workspace;
+        con->pending.workspace = workspace;
         container_for_each_child(con, set_workspace, NULL);
         container_handle_fullscreen_reparent(con);
         workspace_update_representation(workspace);
@@ -811,11 +810,11 @@ struct sway_container *workspace_add_tiling(struct sway_workspace *workspace,
 
 void workspace_add_floating(struct sway_workspace *workspace,
                 struct sway_container *con) {
-        if (con->workspace) {
+        if (con->pending.workspace) {
                 container_detach(con);
         }
         list_add(workspace->floating, con);
-        con->workspace = workspace;
+        con->pending.workspace = workspace;
         container_for_each_child(con, set_workspace, NULL);
         container_handle_fullscreen_reparent(con);
         node_set_dirty(&workspace->node);
@@ -825,7 +824,7 @@ void workspace_add_floating(struct sway_workspace *workspace,
 void workspace_insert_tiling_direct(struct sway_workspace *workspace,
                 struct sway_container *con, int index) {
         list_insert(workspace->tiling, index, con);
-        con->workspace = workspace;
+        con->pending.workspace = workspace;
         container_for_each_child(con, set_workspace, NULL);
         container_handle_fullscreen_reparent(con);
         workspace_update_representation(workspace);
@@ -835,7 +834,7 @@ void workspace_insert_tiling_direct(struct sway_workspace *workspace,
 
 struct sway_container *workspace_insert_tiling(struct sway_workspace *workspace,
                 struct sway_container *con, int index) {
-        if (con->workspace) {
+        if (con->pending.workspace) {
                 container_detach(con);
         }
         if (config->default_layout != L_NONE) {
@@ -845,24 +844,36 @@ struct sway_container *workspace_insert_tiling(struct sway_workspace *workspace,
         return con;
 }
 
+bool workspace_has_single_visible_container(struct sway_workspace *ws) {
+        struct sway_seat *seat = input_manager_get_default_seat();
+        struct sway_container *focus =
+                seat_get_focus_inactive_tiling(seat, ws);
+        if (focus && !focus->view) {
+                focus = seat_get_focus_inactive_view(seat, &focus->node);
+        }
+        return (focus && focus->view && view_ancestor_is_only_visible(focus->view));
+}
+
 void workspace_add_gaps(struct sway_workspace *ws) {
-        if (config->smart_gaps) {
-                struct sway_seat *seat = input_manager_get_default_seat();
-                struct sway_container *focus =
-                        seat_get_focus_inactive_tiling(seat, ws);
-                if (focus && !focus->view) {
-                        focus = seat_get_focus_inactive_view(seat, &focus->node);
-                }
-                if (focus && focus->view && view_ancestor_is_only_visible(focus->view)) {
-                        ws->current_gaps.top = 0;
-                        ws->current_gaps.right = 0;
-                        ws->current_gaps.bottom = 0;
-                        ws->current_gaps.left = 0;
-                        return;
-                }
+        if (config->smart_gaps == SMART_GAPS_ON
+                        && workspace_has_single_visible_container(ws)) {
+                ws->current_gaps.top = 0;
+                ws->current_gaps.right = 0;
+                ws->current_gaps.bottom = 0;
+                ws->current_gaps.left = 0;
+                return;
+        }
+
+        if (config->smart_gaps == SMART_GAPS_INVERSE_OUTER
+                        && !workspace_has_single_visible_container(ws)) {
+                ws->current_gaps.top = 0;
+                ws->current_gaps.right = 0;
+                ws->current_gaps.bottom = 0;
+                ws->current_gaps.left = 0;
+        } else {
+                ws->current_gaps = ws->gaps_outer;
         }
 
-        ws->current_gaps = ws->gaps_outer;
         // Add inner gaps and make sure we don't turn out negative
         ws->current_gaps.top = fmax(0, ws->current_gaps.top + ws->gaps_inner);
         ws->current_gaps.right = fmax(0, ws->current_gaps.right + ws->gaps_inner);
@@ -905,7 +916,7 @@ struct sway_container *workspace_split(struct sway_workspace *workspace,
         enum sway_container_layout old_layout = workspace->layout;
         struct sway_container *middle = workspace_wrap_children(workspace);
         workspace->layout = layout;
-        middle->layout = old_layout;
+        middle->pending.layout = old_layout;
 
         struct sway_seat *seat;
         wl_list_for_each(seat, &server.input->seats, link) {
diff --git a/sway/xdg_activation_v1.c b/sway/xdg_activation_v1.c
new file mode 100644
index 00000000..6c70c785
--- /dev/null
+++ b/sway/xdg_activation_v1.c
@@ -0,0 +1,20 @@
+#include <wlr/types/wlr_xdg_activation_v1.h>
+#include "sway/tree/view.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)) {
+                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) {
+                return;
+        }
+
+        view_request_activate(view);
+}
diff --git a/sway/xdg_decoration.c b/sway/xdg_decoration.c
index e7c3ea73..ec9e8d68 100644
--- a/sway/xdg_decoration.c
+++ b/sway/xdg_decoration.c
@@ -10,7 +10,7 @@ static void xdg_decoration_handle_destroy(struct wl_listener *listener,
                 void *data) {
         struct sway_xdg_decoration *deco =
                 wl_container_of(listener, deco, destroy);
-        if(deco->view) {
+        if (deco->view) {
                 deco->view->xdg_decoration = NULL;
         }
         wl_list_remove(&deco->destroy.link);
@@ -23,8 +23,32 @@ 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,
-                        WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE);
+                        mode);
 }
 
 void handle_xdg_decoration(struct wl_listener *listener, void *data) {
diff --git a/swaybar/bar.c b/swaybar/bar.c
index 231c1ad7..6ffdc9b4 100644
--- a/swaybar/bar.c
+++ b/swaybar/bar.c
@@ -54,7 +54,6 @@ static void swaybar_output_free(struct swaybar_output *output) {
         if (output->input_region != NULL) {
                 wl_region_destroy(output->input_region);
         }
-        zxdg_output_v1_destroy(output->xdg_output);
         wl_output_destroy(output->output);
         destroy_buffer(&output->buffers[0]);
         destroy_buffer(&output->buffers[1]);
@@ -90,7 +89,7 @@ static void layer_surface_closed(void *_output,
         swaybar_output_free(output);
 }
 
-struct zwlr_layer_surface_v1_listener layer_surface_listener = {
+static const struct zwlr_layer_surface_v1_listener layer_surface_listener = {
         .configure = layer_surface_configure,
         .closed = layer_surface_closed,
 };
@@ -172,7 +171,7 @@ bool determine_bar_visibility(struct swaybar *bar, bool moving_layer) {
                 if (bar->status) {
                         sway_log(SWAY_DEBUG, "Sending %s signal to status command",
                                         visible ? "cont" : "stop");
-                        kill(bar->status->pid, visible ?
+                        kill(-bar->status->pid, visible ?
                                         bar->status->cont_signal : bar->status->stop_signal);
                 }
         }
@@ -230,7 +229,7 @@ static void output_scale(void *data, struct wl_output *wl_output,
         }
 }
 
-struct wl_output_listener output_listener = {
+static const struct wl_output_listener output_listener = {
         .geometry = output_geometry,
         .mode = output_mode,
         .done = output_done,
@@ -307,7 +306,7 @@ static void xdg_output_handle_description(void *data,
         }
 }
 
-struct zxdg_output_v1_listener xdg_output_listener = {
+static const struct zxdg_output_v1_listener xdg_output_listener = {
         .logical_position = xdg_output_handle_logical_position,
         .logical_size = xdg_output_handle_logical_size,
         .done = xdg_output_handle_done,
@@ -461,13 +460,28 @@ bool bar_setup(struct swaybar *bar, const char *socket_path) {
 
 static void display_in(int fd, short mask, void *data) {
         struct swaybar *bar = data;
+        if (mask & (POLLHUP | POLLERR)) {
+                if (mask & POLLERR) {
+                        sway_log(SWAY_ERROR, "Wayland display poll error");
+                }
+                bar->running = false;
+                return;
+        }
         if (wl_display_dispatch(bar->display) == -1) {
+                sway_log(SWAY_ERROR, "wl_display_dispatch failed");
                 bar->running = false;
         }
 }
 
 static void ipc_in(int fd, short mask, void *data) {
         struct swaybar *bar = data;
+        if (mask & (POLLHUP | POLLERR)) {
+                if (mask & POLLERR) {
+                        sway_log(SWAY_ERROR, "IPC poll error");
+                }
+                bar->running = false;
+                return;
+        }
         if (handle_ipc_readable(bar)) {
                 set_bar_dirty(bar);
         }
diff --git a/swaybar/i3bar.c b/swaybar/i3bar.c
index 4bcd5843..6d00befb 100644
--- a/swaybar/i3bar.c
+++ b/swaybar/i3bar.c
@@ -28,6 +28,19 @@ void i3bar_block_unref(struct i3bar_block *block) {
         }
 }
 
+static bool i3bar_parse_json_color(json_object *json, uint32_t *color) {
+        if (!json) {
+                return false;
+        }
+
+        const char *hexstring = json_object_get_string(json);
+        bool color_set = parse_color(hexstring, color);
+        if (!color_set) {
+                sway_log(SWAY_ERROR, "Ignoring invalid block hexadecimal color string: %s", hexstring);
+        }
+        return color_set;
+}
+
 static void i3bar_parse_json(struct status_line *status,
                 struct json_object *json_array) {
         struct i3bar_block *block, *tmp;
@@ -68,13 +81,7 @@ static void i3bar_parse_json(struct status_line *status,
                         strdup(json_object_get_string(full_text)) : NULL;
                 block->short_text = short_text ?
                         strdup(json_object_get_string(short_text)) : NULL;
-                if (color) {
-                        const char *hexstring = json_object_get_string(color);
-                        block->color_set = parse_color(hexstring, &block->color);
-                        if (!block->color_set) {
-                                sway_log(SWAY_ERROR, "Invalid block color: %s", hexstring);
-                        }
-                }
+                block->color_set = i3bar_parse_json_color(color, &block->color);
                 if (min_width) {
                         json_type type = json_object_get_type(min_width);
                         if (type == json_type_int) {
@@ -100,14 +107,8 @@ static void i3bar_parse_json(struct status_line *status,
                 block->separator_block_width = separator_block_width ?
                         json_object_get_int(separator_block_width) : 9;
                 // Airblader features
-                const char *hex = background ? json_object_get_string(background) : NULL;
-                if (hex && !parse_color(hex, &block->background)) {
-                        sway_log(SWAY_ERROR, "Ignoring invalid block background: %s", hex);
-                }
-                hex = border ? json_object_get_string(border) : NULL;
-                if (hex && !parse_color(hex, &block->border)) {
-                        sway_log(SWAY_ERROR, "Ignoring invalid block border: %s", hex);
-                }
+                i3bar_parse_json_color(background, &block->background);
+                block->border_set = i3bar_parse_json_color(border, &block->border);
                 block->border_top = border_top ? json_object_get_int(border_top) : 1;
                 block->border_bottom = border_bottom ?
                         json_object_get_int(border_bottom) : 1;
diff --git a/swaybar/input.c b/swaybar/input.c
index 4fe6dd93..c8c8f0d4 100644
--- a/swaybar/input.c
+++ b/swaybar/input.c
@@ -101,6 +101,8 @@ static void wl_pointer_enter(void *data, struct wl_pointer *wl_pointer,
                 wl_fixed_t surface_x, wl_fixed_t surface_y) {
         struct swaybar_seat *seat = data;
         struct swaybar_pointer *pointer = &seat->pointer;
+        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) {
@@ -140,13 +142,11 @@ static bool check_bindings(struct swaybar *bar, uint32_t button,
 
 static bool process_hotspots(struct swaybar_output *output,
                 double x, double y, uint32_t button) {
-        double px = x * output->scale;
-        double py = y * output->scale;
         struct swaybar_hotspot *hotspot;
         wl_list_for_each(hotspot, &output->hotspots, link) {
-                if (px >= hotspot->x && py >= hotspot->y
-                                && px < hotspot->x + hotspot->width
-                                && py < hotspot->y + hotspot->height) {
+                if (x >= hotspot->x && y >= hotspot->y
+                                && x < hotspot->x + hotspot->width
+                                && y < hotspot->y + hotspot->height) {
                         if (HOTSPOT_IGNORE == hotspot->callback(output, hotspot, x, y,
                                         button, hotspot->data)) {
                                 return true;
@@ -339,7 +339,7 @@ static void wl_pointer_axis_discrete(void *data, struct wl_pointer *wl_pointer,
         seat->axis[axis].discrete_steps += abs(discrete);
 }
 
-static struct wl_pointer_listener pointer_listener = {
+static const struct wl_pointer_listener pointer_listener = {
         .enter = wl_pointer_enter,
         .leave = wl_pointer_leave,
         .motion = wl_pointer_motion,
diff --git a/swaybar/ipc.c b/swaybar/ipc.c
index 6bbe9408..2cb235bf 100644
--- a/swaybar/ipc.c
+++ b/swaybar/ipc.c
@@ -547,9 +547,23 @@ bool handle_ipc_readable(struct swaybar *bar) {
                 return false;
         }
 
-        json_object *result = json_tokener_parse(resp->payload);
-        if (!result) {
-                sway_log(SWAY_ERROR, "failed to parse payload as json");
+        // The default depth of 32 is too small to represent some nested layouts, but
+        // we can't pass INT_MAX here because json-c (as of this writing) prefaults
+        // all the memory for its stack.
+        json_tokener *tok = json_tokener_new_ex(JSON_MAX_DEPTH);
+        if (!tok) {
+                sway_log_errno(SWAY_ERROR, "failed to create tokener");
+                free_ipc_response(resp);
+                return false;
+        }
+
+        json_object *result = json_tokener_parse_ex(tok, resp->payload, -1);
+        enum json_tokener_error err = json_tokener_get_error(tok);
+        json_tokener_free(tok);
+
+        if (err != json_tokener_success) {
+                sway_log(SWAY_ERROR, "failed to parse payload as json: %s",
+                                json_tokener_error_desc(err));
                 free_ipc_response(resp);
                 return false;
         }
diff --git a/swaybar/main.c b/swaybar/main.c
index 5c36d66b..a44c1e63 100644
--- a/swaybar/main.c
+++ b/swaybar/main.c
@@ -18,7 +18,7 @@ int main(int argc, char **argv) {
         char *socket_path = NULL;
         bool debug = false;
 
-        static struct option long_options[] = {
+        static const struct option long_options[] = {
                 {"help", no_argument, NULL, 'h'},
                 {"version", no_argument, NULL, 'v'},
                 {"socket", required_argument, NULL, 's'},
diff --git a/swaybar/render.c b/swaybar/render.c
index df066622..dcde6b9e 100644
--- a/swaybar/render.c
+++ b/swaybar/render.c
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
-#include "cairo.h"
+#include "cairo_util.h"
 #include "pango.h"
 #include "pool-buffer.h"
 #include "swaybar/bar.h"
@@ -14,6 +14,7 @@
 #include "swaybar/ipc.h"
 #include "swaybar/render.h"
 #include "swaybar/status_line.h"
+#include "log.h"
 #if HAVE_TRAY
 #include "swaybar/tray/tray.h"
 #endif
@@ -23,28 +24,51 @@ static const int WS_HORIZONTAL_PADDING = 5;
 static const double WS_VERTICAL_PADDING = 1.5;
 static const double BORDER_WIDTH = 1;
 
-static uint32_t render_status_line_error(cairo_t *cairo,
-                struct swaybar_output *output, double *x) {
+struct render_context {
+        cairo_t *cairo;
+        struct swaybar_output *output;
+        cairo_font_options_t *textaa_sharp;
+        cairo_font_options_t *textaa_safe;
+        uint32_t background_color;
+};
+
+static void choose_text_aa_mode(struct render_context *ctx, uint32_t fontcolor) {
+        uint32_t salpha = fontcolor & 0xFF;
+        uint32_t balpha = ctx->background_color & 0xFF;
+
+        // Subpixel antialiasing requires blend be done in cairo, not compositor
+        cairo_font_options_t *fo = salpha == balpha ?
+                        ctx->textaa_sharp : ctx->textaa_safe;
+        cairo_set_font_options(ctx->cairo, fo);
+
+        // Color emojis, being semitransparent bitmaps, are leaky with 'SOURCE'
+        cairo_operator_t op = salpha == 0xFF ?
+                        CAIRO_OPERATOR_OVER : CAIRO_OPERATOR_SOURCE;
+        cairo_set_operator(ctx->cairo, op);
+}
+
+static uint32_t render_status_line_error(struct render_context *ctx, double *x) {
+        struct swaybar_output *output = ctx->output;
         const char *error = output->bar->status->text;
         if (!error) {
                 return 0;
         }
 
-        uint32_t height = output->height * output->scale;
+        uint32_t height = output->height;
 
+        cairo_t *cairo = ctx->cairo;
         cairo_set_source_u32(cairo, 0xFF0000FF);
 
-        int margin = 3 * output->scale;
-        double ws_vertical_padding =
-                output->bar->config->status_padding * output->scale;
+        int margin = 3;
+        double ws_vertical_padding = output->bar->config->status_padding;
 
         char *font = output->bar->config->font;
         int text_width, text_height;
         get_text_size(cairo, font, &text_width, &text_height, NULL,
-                        output->scale, false, "%s", error);
+                        1, false, "%s", error);
 
         uint32_t ideal_height = text_height + ws_vertical_padding * 2;
-        uint32_t ideal_surface_height = ideal_height / output->scale;
+        uint32_t ideal_surface_height = ideal_height;
         if (!output->bar->config->height &&
                         output->height < ideal_surface_height) {
                 return ideal_surface_height;
@@ -53,42 +77,45 @@ static uint32_t render_status_line_error(cairo_t *cairo,
 
         double text_y = height / 2.0 - text_height / 2.0;
         cairo_move_to(cairo, *x, (int)floor(text_y));
-        pango_printf(cairo, font, output->scale, false, "%s", error);
+        choose_text_aa_mode(ctx, 0xFF0000FF);
+        render_text(cairo, font, 1, false, "%s", error);
         *x -= margin;
         return output->height;
 }
 
-static uint32_t render_status_line_text(cairo_t *cairo,
-                struct swaybar_output *output, double *x) {
+static uint32_t render_status_line_text(struct render_context *ctx, double *x) {
+        struct swaybar_output *output = ctx->output;
         const char *text = output->bar->status->text;
         if (!text) {
                 return 0;
         }
 
+        cairo_t *cairo = ctx->cairo;
         struct swaybar_config *config = output->bar->config;
-        cairo_set_source_u32(cairo, output->focused ?
-                        config->colors.focused_statusline : config->colors.statusline);
+        uint32_t fontcolor = output->focused ?
+                        config->colors.focused_statusline : config->colors.statusline;
+        cairo_set_source_u32(cairo, fontcolor);
 
         int text_width, text_height;
         get_text_size(cairo, config->font, &text_width, &text_height, NULL,
-                        output->scale, config->pango_markup, "%s", text);
+                        1, config->pango_markup, "%s", text);
 
-        double ws_vertical_padding = config->status_padding * output->scale;
-        int margin = 3 * output->scale;
+        double ws_vertical_padding = config->status_padding;
+        int margin = 3;
 
         uint32_t ideal_height = text_height + ws_vertical_padding * 2;
-        uint32_t ideal_surface_height = ideal_height / output->scale;
+        uint32_t ideal_surface_height = ideal_height;
         if (!output->bar->config->height &&
                         output->height < ideal_surface_height) {
                 return ideal_surface_height;
         }
 
         *x -= text_width + margin;
-        uint32_t height = output->height * output->scale;
+        uint32_t height = output->height;
         double text_y = height / 2.0 - text_height / 2.0;
         cairo_move_to(cairo, *x, (int)floor(text_y));
-        pango_printf(cairo, config->font, output->scale,
-                        config->pango_markup, "%s", text);
+        choose_text_aa_mode(ctx, fontcolor);
+        render_text(cairo, config->font, 1, config->pango_markup, "%s", text);
         *x -= margin;
         return output->height;
 }
@@ -96,6 +123,7 @@ static uint32_t render_status_line_text(cairo_t *cairo,
 static void render_sharp_rectangle(cairo_t *cairo, uint32_t color,
                 double x, double y, double width, double height) {
         cairo_save(cairo);
+        cairo_set_operator(cairo, CAIRO_OPERATOR_SOURCE);
         cairo_set_source_u32(cairo, color);
         cairo_set_antialias(cairo, CAIRO_ANTIALIAS_NONE);
         cairo_rectangle(cairo, x, y, width, height);
@@ -109,6 +137,7 @@ static void render_sharp_line(cairo_t *cairo, uint32_t color,
                 render_sharp_rectangle(cairo, color, x, y, width, height);
         } else {
                 cairo_save(cairo);
+                cairo_set_operator(cairo, CAIRO_OPERATOR_SOURCE);
                 cairo_set_source_u32(cairo, color);
                 cairo_set_antialias(cairo, CAIRO_ANTIALIAS_NONE);
                 if (width == 1) {
@@ -135,10 +164,10 @@ static enum hotspot_event_handling block_hotspot_callback(
         struct i3bar_block *block = data;
         struct status_line *status = output->bar->status;
         return i3bar_block_send_click(status, block, x, y,
-                        x - (double)hotspot->x / output->scale,
-                        y - (double)hotspot->y / output->scale,
-                        (double)hotspot->width / output->scale,
-                        (double)hotspot->height / output->scale,
+                        x - (double)hotspot->x,
+                        y - (double)hotspot->y,
+                        (double)hotspot->width,
+                        (double)hotspot->height,
                         output->scale, button);
 }
 
@@ -146,9 +175,8 @@ static void i3bar_block_unref_callback(void *data) {
         i3bar_block_unref(data);
 }
 
-static uint32_t render_status_block(cairo_t *cairo,
-                struct swaybar_output *output, struct i3bar_block *block, double *x,
-                bool edge, bool use_short_text) {
+static uint32_t render_status_block(struct render_context *ctx,
+                struct i3bar_block *block, double *x, bool edge, bool use_short_text) {
         if (!block->full_text || !*block->full_text) {
                 return 0;
         }
@@ -158,20 +186,21 @@ static uint32_t render_status_block(cairo_t *cairo,
                 text = block->short_text;
         }
 
+        cairo_t *cairo = ctx->cairo;
+        struct swaybar_output *output = ctx->output;
         struct swaybar_config *config = output->bar->config;
-
         int text_width, text_height;
-        get_text_size(cairo, config->font, &text_width, &text_height, NULL,
-                        output->scale, block->markup, "%s", text);
+        get_text_size(cairo, config->font, &text_width, &text_height, NULL, 1,
+                        block->markup, "%s", text);
 
-        int margin = 3 * output->scale;
-        double ws_vertical_padding = config->status_padding * output->scale;
+        int margin = 3;
+        double ws_vertical_padding = config->status_padding;
 
         int width = text_width;
         if (block->min_width_str) {
                 int w;
-                get_text_size(cairo, config->font, &w, NULL, NULL,
-                                output->scale, block->markup, "%s", block->min_width_str);
+                get_text_size(cairo, config->font, &w, NULL, NULL, 1, block->markup,
+                                "%s", block->min_width_str);
                 block->min_width = w;
         }
         if (width < block->min_width) {
@@ -180,20 +209,20 @@ static uint32_t render_status_block(cairo_t *cairo,
 
         double block_width = width;
         uint32_t ideal_height = text_height + ws_vertical_padding * 2;
-        uint32_t ideal_surface_height = ideal_height / output->scale;
+        uint32_t ideal_surface_height = ideal_height;
         if (!output->bar->config->height &&
                         output->height < ideal_surface_height) {
                 return ideal_surface_height;
         }
 
         *x -= width;
-        if ((block->border || block->urgent) && block->border_left > 0) {
-                *x -= (block->border_left * output->scale + margin);
-                block_width += block->border_left * output->scale + margin;
+        if ((block->border_set || block->urgent) && block->border_left > 0) {
+                *x -= (block->border_left + margin);
+                block_width += block->border_left + margin;
         }
-        if ((block->border || block->urgent) && block->border_right > 0) {
-                *x -= (block->border_right * output->scale + margin);
-                block_width += block->border_right * output->scale + margin;
+        if ((block->border_set || block->urgent) && block->border_right > 0) {
+                *x -= (block->border_right + margin);
+                block_width += block->border_right + margin;
         }
 
         int sep_width, sep_height;
@@ -201,9 +230,9 @@ static uint32_t render_status_block(cairo_t *cairo,
         if (!edge) {
                 if (config->sep_symbol) {
                         get_text_size(cairo, config->font, &sep_width, &sep_height, NULL,
-                                        output->scale, false, "%s", config->sep_symbol);
+                                        1, false, "%s", config->sep_symbol);
                         uint32_t _ideal_height = sep_height + ws_vertical_padding * 2;
-                        uint32_t _ideal_surface_height = _ideal_height / output->scale;
+                        uint32_t _ideal_surface_height = _ideal_height;
                         if (!output->bar->config->height &&
                                         output->height < _ideal_surface_height) {
                                 return _ideal_surface_height;
@@ -214,10 +243,10 @@ static uint32_t render_status_block(cairo_t *cairo,
                 }
                 *x -= sep_block_width;
         } else if (config->status_edge_padding) {
-                *x -= config->status_edge_padding * output->scale;
+                *x -= config->status_edge_padding;
         }
 
-        uint32_t height = output->height * output->scale;
+        uint32_t height = output->height;
         if (output->bar->status->click_events) {
                 struct swaybar_hotspot *hotspot = calloc(1, sizeof(struct swaybar_hotspot));
                 hotspot->x = *x;
@@ -240,23 +269,26 @@ static uint32_t render_status_block(cairo_t *cairo,
         if (bg_color) {
                 render_sharp_rectangle(cairo, bg_color, x_pos, y_pos,
                                 block_width, render_height);
+                ctx->background_color = bg_color;
         }
 
         uint32_t border_color = block->urgent
                 ? config->colors.urgent_workspace.border : block->border;
-        if (border_color && block->border_top > 0) {
-                render_sharp_line(cairo, border_color, x_pos, y_pos,
-                                block_width, block->border_top * output->scale);
-        }
-        if (border_color && block->border_bottom > 0) {
-                render_sharp_line(cairo, border_color, x_pos,
-                                y_pos + render_height - block->border_bottom * output->scale,
-                                block_width, block->border_bottom * output->scale);
-        }
-        if (border_color && block->border_left > 0) {
-                render_sharp_line(cairo, border_color, x_pos, y_pos,
-                                block->border_left * output->scale, render_height);
-                x_pos += block->border_left * output->scale + margin;
+        if (block->border_set || block->urgent) {
+                if (block->border_top > 0) {
+                        render_sharp_line(cairo, border_color, x_pos, y_pos,
+                                        block_width, block->border_top);
+                }
+                if (block->border_bottom > 0) {
+                        render_sharp_line(cairo, border_color, x_pos,
+                                        y_pos + render_height - block->border_bottom,
+                                        block_width, block->border_bottom);
+                }
+                if (block->border_left > 0) {
+                        render_sharp_line(cairo, border_color, x_pos, y_pos,
+                                        block->border_left, render_height);
+                }
+                x_pos += block->border_left + margin;
         }
 
         double offset = 0;
@@ -274,30 +306,35 @@ static uint32_t render_status_block(cairo_t *cairo,
         color = block->color_set ? block->color : color;
         color = block->urgent ? config->colors.urgent_workspace.text : color;
         cairo_set_source_u32(cairo, color);
-        pango_printf(cairo, config->font, output->scale,
-                        block->markup, "%s", text);
+        choose_text_aa_mode(ctx, color);
+        render_text(cairo, config->font, 1, block->markup, "%s", text);
         x_pos += width;
 
-        if (block->border && block->border_right > 0) {
+        if (block->border_set || block->urgent) {
                 x_pos += margin;
-                render_sharp_line(cairo, border_color, x_pos, y_pos,
-                                block->border_right * output->scale, render_height);
-                x_pos += block->border_right * output->scale;
+                if (block->border_right > 0) {
+                        render_sharp_line(cairo, border_color, x_pos, y_pos,
+                                        block->border_right, render_height);
+                }
+                x_pos += block->border_right;
         }
 
         if (!edge && block->separator) {
                 if (output->focused) {
-                        cairo_set_source_u32(cairo, config->colors.focused_separator);
+                        color = config->colors.focused_separator;
                 } else {
-                        cairo_set_source_u32(cairo, config->colors.separator);
+                        color = config->colors.separator;
                 }
+                cairo_set_source_u32(cairo, color);
                 if (config->sep_symbol) {
                         offset = x_pos + (sep_block_width - sep_width) / 2;
                         double sep_y = height / 2.0 - sep_height / 2.0;
                         cairo_move_to(cairo, offset, (int)floor(sep_y));
-                        pango_printf(cairo, config->font, output->scale, false,
+                        choose_text_aa_mode(ctx, color);
+                        render_text(cairo, config->font, 1, false,
                                         "%s", config->sep_symbol);
                 } else {
+                        cairo_set_operator(cairo, CAIRO_OPERATOR_SOURCE);
                         cairo_set_line_width(cairo, 1);
                         cairo_move_to(cairo, x_pos + sep_block_width / 2, margin);
                         cairo_line_to(cairo, x_pos + sep_block_width / 2, height - margin);
@@ -317,18 +354,18 @@ static void predict_status_block_pos(cairo_t *cairo,
         struct swaybar_config *config = output->bar->config;
 
         int text_width, text_height;
-        get_text_size(cairo, config->font, &text_width, &text_height, NULL,
-                        output->scale, block->markup, "%s", block->full_text);
+        get_text_size(cairo, config->font, &text_width, &text_height, NULL, 1,
+                        block->markup, "%s", block->full_text);
 
-        int margin = 3 * output->scale;
-        double ws_vertical_padding = config->status_padding * output->scale;
+        int margin = 3;
+        double ws_vertical_padding = config->status_padding;
 
         int width = text_width;
 
         if (block->min_width_str) {
                 int w;
                 get_text_size(cairo, config->font, &w, NULL, NULL,
-                                output->scale, block->markup, "%s", block->min_width_str);
+                                1, block->markup, "%s", block->min_width_str);
                 block->min_width = w;
         }
         if (width < block->min_width) {
@@ -336,18 +373,18 @@ static void predict_status_block_pos(cairo_t *cairo,
         }
 
         uint32_t ideal_height = text_height + ws_vertical_padding * 2;
-        uint32_t ideal_surface_height = ideal_height / output->scale;
+        uint32_t ideal_surface_height = ideal_height;
         if (!output->bar->config->height &&
                         output->height < ideal_surface_height) {
                 return;
         }
 
         *x -= width;
-        if ((block->border || block->urgent) && block->border_left > 0) {
-                *x -= (block->border_left * output->scale + margin);
+        if ((block->border_set || block->urgent) && block->border_left > 0) {
+                *x -= (block->border_left + margin);
         }
-        if ((block->border || block->urgent) && block->border_right > 0) {
-                *x -= (block->border_right * output->scale + margin);
+        if ((block->border_set || block->urgent) && block->border_right > 0) {
+                *x -= (block->border_right + margin);
         }
 
         int sep_width, sep_height;
@@ -355,9 +392,9 @@ static void predict_status_block_pos(cairo_t *cairo,
         if (!edge) {
                 if (config->sep_symbol) {
                         get_text_size(cairo, config->font, &sep_width, &sep_height, NULL,
-                                        output->scale, false, "%s", config->sep_symbol);
+                                        1, false, "%s", config->sep_symbol);
                         uint32_t _ideal_height = sep_height + ws_vertical_padding * 2;
-                        uint32_t _ideal_surface_height = _ideal_height / output->scale;
+                        uint32_t _ideal_surface_height = _ideal_height;
                         if (!output->bar->config->height &&
                                         output->height < _ideal_surface_height) {
                                 return;
@@ -368,13 +405,13 @@ static void predict_status_block_pos(cairo_t *cairo,
                 }
                 *x -= sep_block_width;
         } else if (config->status_edge_padding) {
-                *x -= config->status_edge_padding * output->scale;
+                *x -= config->status_edge_padding;
         }
 }
 
 static double predict_status_line_pos(cairo_t *cairo,
                 struct swaybar_output *output, double x) {
-        bool edge = x == output->width * output->scale;
+        bool edge = x == output->width;
         struct i3bar_block *block;
         wl_list_for_each(block, &output->bar->status->blocks, link) {
                 predict_status_block_pos(cairo, output, block, &x, edge);
@@ -389,24 +426,24 @@ static uint32_t predict_workspace_button_length(cairo_t *cairo,
         struct swaybar_config *config = output->bar->config;
 
         int text_width, text_height;
-        get_text_size(cairo, config->font, &text_width, &text_height, NULL,
-                        output->scale, config->pango_markup, "%s", ws->label);
+        get_text_size(cairo, config->font, &text_width, &text_height, NULL, 1,
+                        config->pango_markup, "%s", ws->label);
 
-        int ws_vertical_padding = WS_VERTICAL_PADDING * output->scale;
-        int ws_horizontal_padding = WS_HORIZONTAL_PADDING * output->scale;
-        int border_width = BORDER_WIDTH * output->scale;
+        int ws_vertical_padding = WS_VERTICAL_PADDING;
+        int ws_horizontal_padding = WS_HORIZONTAL_PADDING;
+        int border_width = BORDER_WIDTH;
 
         uint32_t ideal_height = ws_vertical_padding * 2 + text_height
                 + border_width * 2;
-        uint32_t ideal_surface_height = ideal_height / output->scale;
+        uint32_t ideal_surface_height = ideal_height;
         if (!output->bar->config->height &&
                         output->height < ideal_surface_height) {
                 return 0;
         }
 
         uint32_t width = text_width + ws_horizontal_padding * 2 + border_width * 2;
-        if (width < config->workspace_min_width * output->scale) {
-                width = config->workspace_min_width * output->scale;
+        if (width < config->workspace_min_width) {
+                width = config->workspace_min_width;
         }
         return width;
 }
@@ -438,38 +475,39 @@ static uint32_t predict_binding_mode_indicator_length(cairo_t *cairo,
 
         int text_width, text_height;
         get_text_size(cairo, config->font, &text_width, &text_height, NULL,
-                        output->scale, output->bar->mode_pango_markup,
+                        1, output->bar->mode_pango_markup,
                         "%s", mode);
 
-        int ws_vertical_padding = WS_VERTICAL_PADDING * output->scale;
-        int ws_horizontal_padding = WS_HORIZONTAL_PADDING * output->scale;
-        int border_width = BORDER_WIDTH * output->scale;
+        int ws_vertical_padding = WS_VERTICAL_PADDING;
+        int ws_horizontal_padding = WS_HORIZONTAL_PADDING;
+        int border_width = BORDER_WIDTH;
 
         uint32_t ideal_height = text_height + ws_vertical_padding * 2
                 + border_width * 2;
-        uint32_t ideal_surface_height = ideal_height / output->scale;
+        uint32_t ideal_surface_height = ideal_height;
         if (!output->bar->config->height &&
                         output->height < ideal_surface_height) {
                 return 0;
         }
         uint32_t width = text_width + ws_horizontal_padding * 2 + border_width * 2;
-        if (width < config->workspace_min_width * output->scale) {
-                width = config->workspace_min_width * output->scale;
+        if (width < config->workspace_min_width) {
+                width = config->workspace_min_width;
         }
         return width;
 }
 
-static uint32_t render_status_line_i3bar(cairo_t *cairo,
-                struct swaybar_output *output, double *x) {
+static uint32_t render_status_line_i3bar(struct render_context *ctx, double *x) {
+        struct swaybar_output *output = ctx->output;
         uint32_t max_height = 0;
-        bool edge = *x == output->width * output->scale;
+        bool edge = *x == output->width;
         struct i3bar_block *block;
         bool use_short_text = false;
 
+        cairo_t *cairo = ctx->cairo;
         double reserved_width =
                         predict_workspace_buttons_length(cairo, output) +
                         predict_binding_mode_indicator_length(cairo, output) +
-                        3 * output->scale; // require a bit of space for margin
+                        3; // require a bit of space for margin
 
         double predicted_full_pos =
                         predict_status_line_pos(cairo, output, *x);
@@ -479,7 +517,7 @@ static uint32_t render_status_line_i3bar(cairo_t *cairo,
         }
 
         wl_list_for_each(block, &output->bar->status->blocks, link) {
-                uint32_t h = render_status_block(cairo, output, block, x, edge,
+                uint32_t h = render_status_block(ctx, block, x, edge,
                                         use_short_text);
                 max_height = h > max_height ? h : max_height;
                 edge = false;
@@ -487,53 +525,56 @@ static uint32_t render_status_line_i3bar(cairo_t *cairo,
         return max_height;
 }
 
-static uint32_t render_status_line(cairo_t *cairo,
-                struct swaybar_output *output, double *x) {
-        struct status_line *status = output->bar->status;
+static uint32_t render_status_line(struct render_context *ctx, double *x) {
+        struct status_line *status = ctx->output->bar->status;
         switch (status->protocol) {
         case PROTOCOL_ERROR:
-                return render_status_line_error(cairo, output, x);
+                return render_status_line_error(ctx, x);
         case PROTOCOL_TEXT:
-                return render_status_line_text(cairo, output, x);
+                return render_status_line_text(ctx, x);
         case PROTOCOL_I3BAR:
-                return render_status_line_i3bar(cairo, output, x);
+                return render_status_line_i3bar(ctx, x);
         case PROTOCOL_UNDEF:
                 return 0;
         }
         return 0;
 }
 
-static uint32_t render_binding_mode_indicator(cairo_t *cairo,
-                struct swaybar_output *output, double x) {
+static uint32_t render_binding_mode_indicator(struct render_context *ctx,
+                double x) {
+        struct swaybar_output *output = ctx->output;
         const char *mode = output->bar->mode;
         if (!mode) {
                 return 0;
         }
 
+        cairo_t *cairo = ctx->cairo;
         struct swaybar_config *config = output->bar->config;
         int text_width, text_height;
         get_text_size(cairo, config->font, &text_width, &text_height, NULL,
-                        output->scale, output->bar->mode_pango_markup,
+                        1, output->bar->mode_pango_markup,
                         "%s", mode);
 
-        int ws_vertical_padding = WS_VERTICAL_PADDING * output->scale;
-        int ws_horizontal_padding = WS_HORIZONTAL_PADDING * output->scale;
-        int border_width = BORDER_WIDTH * output->scale;
+        int ws_vertical_padding = WS_VERTICAL_PADDING;
+        int ws_horizontal_padding = WS_HORIZONTAL_PADDING;
+        int border_width = BORDER_WIDTH;
 
         uint32_t ideal_height = text_height + ws_vertical_padding * 2
                 + border_width * 2;
-        uint32_t ideal_surface_height = ideal_height / output->scale;
+        uint32_t ideal_surface_height = ideal_height;
         if (!output->bar->config->height &&
                         output->height < ideal_surface_height) {
                 return ideal_surface_height;
         }
         uint32_t width = text_width + ws_horizontal_padding * 2 + border_width * 2;
-        if (width < config->workspace_min_width * output->scale) {
-                width = config->workspace_min_width * output->scale;
+        if (width < config->workspace_min_width) {
+                width = config->workspace_min_width;
         }
 
-        uint32_t height = output->height * output->scale;
+        uint32_t height = output->height;
+        cairo_set_operator(cairo, CAIRO_OPERATOR_SOURCE);
         cairo_set_source_u32(cairo, config->colors.binding_mode.background);
+        ctx->background_color = config->colors.binding_mode.background;
         cairo_rectangle(cairo, x, 0, width, height);
         cairo_fill(cairo);
 
@@ -550,8 +591,9 @@ static uint32_t render_binding_mode_indicator(cairo_t *cairo,
         double text_y = height / 2.0 - text_height / 2.0;
         cairo_set_source_u32(cairo, config->colors.binding_mode.text);
         cairo_move_to(cairo, x + width / 2 - text_width / 2, (int)floor(text_y));
-        pango_printf(cairo, config->font, output->scale,
-                        output->bar->mode_pango_markup, "%s", mode);
+        choose_text_aa_mode(ctx, config->colors.binding_mode.text);
+        render_text(cairo, config->font, 1, output->bar->mode_pango_markup,
+                        "%s", mode);
         return output->height;
 }
 
@@ -565,9 +607,9 @@ static enum hotspot_event_handling workspace_hotspot_callback(
         return HOTSPOT_IGNORE;
 }
 
-static uint32_t render_workspace_button(cairo_t *cairo,
-                struct swaybar_output *output,
+static uint32_t render_workspace_button(struct render_context *ctx,
                 struct swaybar_workspace *ws, double *x) {
+        struct swaybar_output *output = ctx->output;
         struct swaybar_config *config = output->bar->config;
         struct box_colors box_colors;
         if (ws->urgent) {
@@ -580,30 +622,33 @@ static uint32_t render_workspace_button(cairo_t *cairo,
                 box_colors = config->colors.inactive_workspace;
         }
 
-        uint32_t height = output->height * output->scale;
+        uint32_t height = output->height;
 
+        cairo_t *cairo = ctx->cairo;
         int text_width, text_height;
         get_text_size(cairo, config->font, &text_width, &text_height, NULL,
-                        output->scale, config->pango_markup, "%s", ws->label);
+                        1, config->pango_markup, "%s", ws->label);
 
-        int ws_vertical_padding = WS_VERTICAL_PADDING * output->scale;
-        int ws_horizontal_padding = WS_HORIZONTAL_PADDING * output->scale;
-        int border_width = BORDER_WIDTH * output->scale;
+        int ws_vertical_padding = WS_VERTICAL_PADDING;
+        int ws_horizontal_padding = WS_HORIZONTAL_PADDING;
+        int border_width = BORDER_WIDTH;
 
         uint32_t ideal_height = ws_vertical_padding * 2 + text_height
                 + border_width * 2;
-        uint32_t ideal_surface_height = ideal_height / output->scale;
+        uint32_t ideal_surface_height = ideal_height;
         if (!output->bar->config->height &&
                         output->height < ideal_surface_height) {
                 return ideal_surface_height;
         }
 
         uint32_t width = text_width + ws_horizontal_padding * 2 + border_width * 2;
-        if (width < config->workspace_min_width * output->scale) {
-                width = config->workspace_min_width * output->scale;
+        if (width < config->workspace_min_width) {
+                width = config->workspace_min_width;
         }
 
+        cairo_set_operator(cairo, CAIRO_OPERATOR_SOURCE);
         cairo_set_source_u32(cairo, box_colors.background);
+        ctx->background_color = box_colors.background;
         cairo_rectangle(cairo, *x, 0, width, height);
         cairo_fill(cairo);
 
@@ -620,7 +665,8 @@ static uint32_t render_workspace_button(cairo_t *cairo,
         double text_y = height / 2.0 - text_height / 2.0;
         cairo_set_source_u32(cairo, box_colors.text);
         cairo_move_to(cairo, *x + width / 2 - text_width / 2, (int)floor(text_y));
-        pango_printf(cairo, config->font, output->scale, config->pango_markup,
+        choose_text_aa_mode(ctx, box_colors.text);
+        render_text(cairo, config->font, 1, config->pango_markup,
                         "%s", ws->label);
 
         struct swaybar_hotspot *hotspot = calloc(1, sizeof(struct swaybar_hotspot));
@@ -637,20 +683,24 @@ static uint32_t render_workspace_button(cairo_t *cairo,
         return output->height;
 }
 
-static uint32_t render_to_cairo(cairo_t *cairo, struct swaybar_output *output) {
+static uint32_t render_to_cairo(struct render_context *ctx) {
+        cairo_t *cairo = ctx->cairo;
+        struct swaybar_output *output = ctx->output;
         struct swaybar *bar = output->bar;
         struct swaybar_config *config = bar->config;
         cairo_set_operator(cairo, CAIRO_OPERATOR_SOURCE);
         if (output->focused) {
-                cairo_set_source_u32(cairo, config->colors.focused_background);
+                ctx->background_color = config->colors.focused_background;
         } else {
-                cairo_set_source_u32(cairo, config->colors.background);
+                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, NULL, &th, NULL, output->scale, false, "");
-        uint32_t max_height = (th + WS_VERTICAL_PADDING * 4) / output->scale;
+        get_text_size(cairo, config->font, NULL, &th, NULL, 1, false, "");
+        uint32_t max_height = (th + WS_VERTICAL_PADDING * 4);
         /*
          * Each render_* function takes the actual height of the bar, and returns
          * the ideal height. If the actual height is too short, the render function
@@ -658,7 +708,7 @@ static uint32_t render_to_cairo(cairo_t *cairo, struct swaybar_output *output) {
          * height is too tall, the render function should adapt its drawing to
          * utilize the available space.
          */
-        double x = output->width * output->scale;
+        double x = output->width;
 #if HAVE_TRAY
         if (bar->tray) {
                 uint32_t h = render_tray(cairo, output, &x);
@@ -666,19 +716,19 @@ static uint32_t render_to_cairo(cairo_t *cairo, struct swaybar_output *output) {
         }
 #endif
         if (bar->status) {
-                uint32_t h = render_status_line(cairo, output, &x);
+                uint32_t h = render_status_line(ctx, &x);
                 max_height = h > max_height ? h : max_height;
         }
         x = 0;
         if (config->workspace_buttons) {
                 struct swaybar_workspace *ws;
                 wl_list_for_each(ws, &output->workspaces, link) {
-                        uint32_t h = render_workspace_button(cairo, output, ws, &x);
+                        uint32_t h = render_workspace_button(ctx, ws, &x);
                         max_height = h > max_height ? h : max_height;
                 }
         }
         if (config->binding_mode_indicator) {
-                uint32_t h = render_binding_mode_indicator(cairo, output, x);
+                uint32_t h = render_binding_mode_indicator(ctx, x);
                 max_height = h > max_height ? h : max_height;
         }
 
@@ -708,26 +758,36 @@ void render_frame(struct swaybar_output *output) {
 
         free_hotspots(&output->hotspots);
 
+        struct render_context ctx = { 0 };
+        ctx.output = output;
+
         cairo_surface_t *recorder = cairo_recording_surface_create(
                         CAIRO_CONTENT_COLOR_ALPHA, NULL);
         cairo_t *cairo = cairo_create(recorder);
+        cairo_scale(cairo, output->scale, output->scale);
         cairo_set_antialias(cairo, CAIRO_ANTIALIAS_BEST);
+        ctx.cairo = cairo;
+
         cairo_font_options_t *fo = cairo_font_options_create();
         cairo_font_options_set_hint_style(fo, CAIRO_HINT_STYLE_FULL);
+        cairo_font_options_set_antialias(fo, CAIRO_ANTIALIAS_GRAY);
+        ctx.textaa_safe = fo;
         if (output->subpixel == WL_OUTPUT_SUBPIXEL_NONE) {
-                cairo_font_options_set_antialias(fo, CAIRO_ANTIALIAS_GRAY);
+                ctx.textaa_sharp = ctx.textaa_safe;
         } else {
+                fo = cairo_font_options_create();
+                cairo_font_options_set_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_set_font_options(cairo, fo);
-        cairo_font_options_destroy(fo);
+
         cairo_save(cairo);
         cairo_set_operator(cairo, CAIRO_OPERATOR_CLEAR);
         cairo_paint(cairo);
         cairo_restore(cairo);
-        uint32_t height = render_to_cairo(cairo, output);
+        uint32_t height = render_to_cairo(&ctx);
         int config_height = output->bar->config->height;
         if (config_height > 0) {
                 height = config_height;
@@ -753,9 +813,7 @@ void render_frame(struct swaybar_output *output) {
                                 output->width * output->scale,
                                 output->height * output->scale);
                 if (!output->current_buffer) {
-                        cairo_surface_destroy(recorder);
-                        cairo_destroy(cairo);
-                        return;
+                        goto cleanup;
                 }
                 cairo_t *shm = output->current_buffer->cairo;
 
@@ -779,6 +837,12 @@ void render_frame(struct swaybar_output *output) {
 
                 wl_surface_commit(output->surface);
         }
+
+cleanup:
+        if (ctx.textaa_sharp != ctx.textaa_safe) {
+                cairo_font_options_destroy(ctx.textaa_sharp);
+        }
+        cairo_font_options_destroy(ctx.textaa_safe);
         cairo_surface_destroy(recorder);
         cairo_destroy(cairo);
 }
diff --git a/swaybar/status_line.c b/swaybar/status_line.c
index ecd91032..2e9bb7f1 100644
--- a/swaybar/status_line.c
+++ b/swaybar/status_line.c
@@ -117,11 +117,11 @@ bool status_handle_readable(struct status_line *status) {
                 status->text = status->buffer;
                 // intentional fall-through
         case PROTOCOL_TEXT:
-                errno = 0;
                 while (true) {
                         if (status->buffer[read_bytes - 1] == '\n') {
                                 status->buffer[read_bytes - 1] = '\0';
                         }
+                        errno = 0;
                         read_bytes = getline(&status->buffer,
                                         &status->buffer_size, status->read);
                         if (errno == EAGAIN) {
@@ -157,7 +157,12 @@ struct status_line *status_line_init(char *cmd) {
         assert(!getenv("WAYLAND_SOCKET") && "display must be initialized before "
                 " starting `status-command`; WAYLAND_SOCKET should not be set");
         status->pid = fork();
-        if (status->pid == 0) {
+        if (status->pid < 0) {
+                sway_log_errno(SWAY_ERROR, "fork failed");
+                exit(1);
+        } else if (status->pid == 0) {
+                setpgid(0, 0);
+
                 dup2(pipe_read_fd[1], STDOUT_FILENO);
                 close(pipe_read_fd[0]);
                 close(pipe_read_fd[1]);
@@ -185,8 +190,8 @@ struct status_line *status_line_init(char *cmd) {
 
 void status_line_free(struct status_line *status) {
         status_line_close_fds(status);
-        kill(status->pid, status->cont_signal);
-        kill(status->pid, SIGTERM);
+        kill(-status->pid, status->cont_signal);
+        kill(-status->pid, SIGTERM);
         waitpid(status->pid, NULL, 0);
         if (status->protocol == PROTOCOL_I3BAR) {
                 struct i3bar_block *block, *tmp;
diff --git a/swaybar/tray/item.c b/swaybar/tray/item.c
index a5660f62..6d4b17bf 100644
--- a/swaybar/tray/item.c
+++ b/swaybar/tray/item.c
@@ -13,7 +13,7 @@
 #include "swaybar/tray/item.h"
 #include "swaybar/tray/tray.h"
 #include "background-image.h"
-#include "cairo.h"
+#include "cairo_util.h"
 #include "list.h"
 #include "log.h"
 #include "wlr-layer-shell-unstable-v1-client-protocol.h"
@@ -118,8 +118,13 @@ static int get_property_callback(sd_bus_message *msg, void *data,
 
         int ret;
         if (sd_bus_message_is_method_error(msg, NULL)) {
-                sway_log(SWAY_ERROR, "%s %s: %s", sni->watcher_id, prop,
-                                sd_bus_message_get_error(msg)->message);
+                const sd_bus_error *err = sd_bus_message_get_error(msg);
+                sway_log_importance_t log_lv = SWAY_ERROR;
+                if ((!strcmp(prop, "IconThemePath")) &&
+                                (!strcmp(err->name, SD_BUS_ERROR_UNKNOWN_PROPERTY))) {
+                        log_lv = SWAY_DEBUG;
+                }
+                sway_log(log_lv, "%s %s: %s", sni->watcher_id, prop, err->message);
                 ret = sd_bus_message_get_errno(msg);
                 goto cleanup;
         }
@@ -488,24 +493,36 @@ uint32_t render_sni(cairo_t *cairo, struct swaybar_output *output, double *x,
                 cairo_destroy(cairo_icon);
         }
 
-        int padded_size = icon_size + 2*padding;
-        *x -= padded_size;
-        int y = floor((height - padded_size) / 2.0);
+        double descaled_padding = (double)padding / output->scale;
+        double descaled_icon_size = (double)icon_size / output->scale;
+
+        int size = descaled_icon_size + 2 * descaled_padding;
+        *x -= size;
+        int icon_y = floor((output->height - size) / 2.0);
 
         cairo_operator_t op = cairo_get_operator(cairo);
         cairo_set_operator(cairo, CAIRO_OPERATOR_OVER);
-        cairo_set_source_surface(cairo, icon, *x + padding, y + padding);
-        cairo_rectangle(cairo, *x, y, padded_size, padded_size);
+
+        cairo_matrix_t scale_matrix;
+        cairo_pattern_t *icon_pattern = cairo_pattern_create_for_surface(icon);
+        // TODO: check cairo_pattern_status for "ENOMEM"
+        cairo_matrix_init_scale(&scale_matrix, output->scale, output->scale);
+        cairo_matrix_translate(&scale_matrix, -(*x + descaled_padding), -(icon_y + descaled_padding));
+        cairo_pattern_set_matrix(icon_pattern, &scale_matrix);
+        cairo_set_source(cairo, icon_pattern);
+        cairo_rectangle(cairo, *x, icon_y, size, size);
         cairo_fill(cairo);
+
         cairo_set_operator(cairo, op);
 
+        cairo_pattern_destroy(icon_pattern);
         cairo_surface_destroy(icon);
 
         struct swaybar_hotspot *hotspot = calloc(1, sizeof(struct swaybar_hotspot));
         hotspot->x = *x;
         hotspot->y = 0;
-        hotspot->width = height;
-        hotspot->height = height;
+        hotspot->width = size;
+        hotspot->height = output->height;
         hotspot->callback = icon_hotspot_callback;
         hotspot->destroy = free;
         hotspot->data = strdup(sni->watcher_id);
diff --git a/swaybar/tray/tray.c b/swaybar/tray/tray.c
index 5fe6f9c3..b0545f4a 100644
--- a/swaybar/tray/tray.c
+++ b/swaybar/tray/tray.c
@@ -116,8 +116,8 @@ uint32_t render_tray(cairo_t *cairo, struct swaybar_output *output, double *x) {
                 }
         } // else display on all
 
-        if ((int) output->height*output->scale <= 2*config->tray_padding) {
-                return 2*config->tray_padding + 1;
+        if ((int)(output->height * output->scale) <= 2 * config->tray_padding) {
+                return (2 * config->tray_padding + 1) / output->scale;
         }
 
         uint32_t max_height = 0;
diff --git a/swaymsg/main.c b/swaymsg/main.c
index 60536e48..02bb12c6 100644
--- a/swaymsg/main.c
+++ b/swaymsg/main.c
@@ -1,4 +1,6 @@
 #define _POSIX_C_SOURCE 200809L
+
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -286,28 +288,74 @@ static void pretty_print_config(json_object *c) {
         printf("%s\n", json_object_get_string(config));
 }
 
-static void pretty_print(int type, json_object *resp) {
-        if (type != IPC_COMMAND && type != IPC_GET_WORKSPACES &&
-                        type != IPC_GET_INPUTS && type != IPC_GET_OUTPUTS &&
-                        type != IPC_GET_VERSION && type != IPC_GET_SEATS &&
-                        type != IPC_GET_CONFIG && type != IPC_SEND_TICK) {
-                printf("%s\n", json_object_to_json_string_ext(resp,
-                        JSON_C_TO_STRING_PRETTY | JSON_C_TO_STRING_SPACED));
-                return;
+static void pretty_print_tree(json_object *obj, int indent) {
+        for (int i = 0; i < indent; i++) {
+                printf("  ");
         }
 
-        if (type == IPC_SEND_TICK) {
-                return;
+        int id = json_object_get_int(json_object_object_get(obj, "id"));
+        const char *name = json_object_get_string(json_object_object_get(obj, "name"));
+        const char *type = json_object_get_string(json_object_object_get(obj, "type"));
+        const char *shell = json_object_get_string(json_object_object_get(obj, "shell"));
+
+        printf("#%d: %s \"%s\"", id, type, name);
+
+        if (shell != NULL) {
+                int pid = json_object_get_int(json_object_object_get(obj, "pid"));
+                const char *app_id = json_object_get_string(json_object_object_get(obj, "app_id"));
+                json_object *window_props_obj = json_object_object_get(obj, "window_properties");
+                const char *instance = json_object_get_string(json_object_object_get(window_props_obj, "instance"));
+                const char *class = json_object_get_string(json_object_object_get(window_props_obj, "class"));
+                int x11_id = json_object_get_int(json_object_object_get(obj, "window"));
+
+                printf(" (%s, pid: %d", shell, pid);
+                if (app_id != NULL) {
+                        printf(", app_id: \"%s\"", app_id);
+                }
+                if (instance != NULL) {
+                        printf(", instance: \"%s\"", instance);
+                }
+                if (class != NULL) {
+                        printf(", class: \"%s\"", class);
+                }
+                if (x11_id != 0) {
+                        printf(", X11 window: 0x%X", x11_id);
+                }
+                printf(")");
         }
 
-        if (type == IPC_GET_VERSION) {
-                pretty_print_version(resp);
-                return;
+        printf("\n");
+
+        json_object *nodes_obj = json_object_object_get(obj, "nodes");
+        size_t len = json_object_array_length(nodes_obj);
+        for (size_t i = 0; i < len; i++) {
+                pretty_print_tree(json_object_array_get_idx(nodes_obj, i), indent + 1);
         }
+}
 
-        if (type == IPC_GET_CONFIG) {
+static void pretty_print(int type, json_object *resp) {
+        switch (type) {
+        case IPC_SEND_TICK:
+                return;
+        case IPC_GET_VERSION:
+                pretty_print_version(resp);
+                return;
+        case IPC_GET_CONFIG:
                 pretty_print_config(resp);
                 return;
+        case IPC_GET_TREE:
+                pretty_print_tree(resp, 0);
+                return;
+        case IPC_COMMAND:
+        case IPC_GET_WORKSPACES:
+        case IPC_GET_INPUTS:
+        case IPC_GET_OUTPUTS:
+        case IPC_GET_SEATS:
+                break;
+        default:
+                printf("%s\n", json_object_to_json_string_ext(resp,
+                        JSON_C_TO_STRING_PRETTY | JSON_C_TO_STRING_SPACED));
+                return;
         }
 
         json_object *obj;
@@ -343,7 +391,7 @@ int main(int argc, char **argv) {
 
         sway_log_init(SWAY_INFO, NULL);
 
-        static struct option long_options[] = {
+        static const struct option long_options[] = {
                 {"help", no_argument, NULL, 'h'},
                 {"monitor", no_argument, NULL, 'm'},
                 {"pretty", no_argument, NULL, 'p'},
@@ -480,12 +528,20 @@ int main(int argc, char **argv) {
         char *resp = ipc_single_command(socketfd, type, command, &len);
 
         // pretty print the json
-        json_object *obj = json_tokener_parse(resp);
-        if (obj == NULL) {
+        json_tokener *tok = json_tokener_new_ex(JSON_MAX_DEPTH);
+        if (tok == NULL) {
+                if (quiet) {
+                        exit(EXIT_FAILURE);
+                }
+                sway_abort("failed allocating json_tokener");
+        }
+        json_object *obj = json_tokener_parse_ex(tok, resp, -1);
+        enum json_tokener_error err = json_tokener_get_error(tok);
+        json_tokener_free(tok);
+        if (obj == NULL || err != json_tokener_success) {
                 if (!quiet) {
-                        fprintf(stderr, "ERROR: Could not parse json response from ipc. "
-                                        "This is a bug in sway.");
-                        printf("%s\n", resp);
+                        sway_log(SWAY_ERROR, "failed to parse payload as json: %s",
+                                json_tokener_error_desc(err));
                 }
                 ret = 1;
         } else {
@@ -517,13 +573,22 @@ int main(int argc, char **argv) {
                                 break;
                         }
 
-                        json_object *obj = json_tokener_parse(reply->payload);
-                        if (obj == NULL) {
+                        json_tokener *tok = json_tokener_new_ex(JSON_MAX_DEPTH);
+                        if (tok == NULL) {
+                                if (quiet) {
+                                        exit(EXIT_FAILURE);
+                                }
+                                sway_abort("failed allocating json_tokener");
+                        }
+                        json_object *obj = json_tokener_parse_ex(tok, reply->payload, -1);
+                        enum json_tokener_error err = json_tokener_get_error(tok);
+                        json_tokener_free(tok);
+                        if (obj == NULL || err != json_tokener_success) {
                                 if (!quiet) {
-                                        fprintf(stderr, "ERROR: Could not parse json response from"
-                                                        " ipc. This is a bug in sway.");
-                                        ret = 1;
+                                        sway_log(SWAY_ERROR, "failed to parse payload as json: %s",
+                                                json_tokener_error_desc(err));
                                 }
+                                ret = 1;
                                 break;
                         } else if (quiet) {
                                 json_object_put(obj);
diff --git a/swaymsg/swaymsg.1.scd b/swaymsg/swaymsg.1.scd
index b69013b5..24a9d6c9 100644
--- a/swaymsg/swaymsg.1.scd
+++ b/swaymsg/swaymsg.1.scd
@@ -21,12 +21,13 @@ _swaymsg_ [options...] [message]
 
 *-p, --pretty*
         Use pretty output even when not using a tty.
+        Not available for all message types.
 
 *-q, --quiet*
         Sends the IPC message but does not print the response from sway.
 
 *-r, --raw*
-        Use raw output even if using a tty.
+        Use raw JSON output even if using a tty.
 
 *-s, --socket* <path>
         Use the specified socket path. Otherwise, swaymsg will ask sway where the
@@ -46,6 +47,11 @@ _swaymsg_ [options...] [message]
 
         See *sway*(5) for a list of commands.
 
+        _swaymsg_ can return pretty printed (standalone-default) or JSON-formatted
+        (*--raw*) output. For detailed documentation on the returned JSON-data of
+        each message type listed below, refer to *sway-ipc*(7). The JSON-format can
+        contain more information than the pretty print.
+
         Tips:
         - Command expansion is performed twice: once by swaymsg, and again by sway.
           If you have quoted multi-word strings in your command, enclose the entire
@@ -60,20 +66,20 @@ _swaymsg_ [options...] [message]
           _swaymsg -- mark --add test_ instead of _swaymsg mark --add test_.
 
 *get\_workspaces*
-        Gets a JSON-encoded list of workspaces and their status.
+        Gets a list of workspaces and their status.
 
 *get\_inputs*
-        Gets a JSON-encoded list of current inputs.
+        Gets a list of current inputs.
 
 *get\_outputs*
-        Gets a JSON-encoded list of current outputs.
+        Gets a list of current outputs.
 
 *get\_tree*
         Gets a JSON-encoded layout tree of all open windows, containers, outputs,
         workspaces, and so on.
 
 *get\_seats*
-        Gets a JSON-encoded list of all seats,
+        Gets a list of all seats,
         its properties and all assigned devices.
 
 *get\_marks*
@@ -83,7 +89,7 @@ _swaymsg_ [options...] [message]
         Get a JSON-encoded configuration for swaybar.
 
 *get\_version*
-        Get JSON-encoded version information for the running instance of sway.
+        Get version information for the running instance of sway.
 
 *get\_binding\_modes*
         Gets a JSON-encoded list of currently configured binding modes.
@@ -92,7 +98,7 @@ _swaymsg_ [options...] [message]
         Gets JSON-encoded info about the current binding state.
 
 *get\_config*
-        Gets a JSON-encoded copy of the current configuration.
+        Gets a copy of the current configuration. Doesn't expand includes.
 
 *send\_tick*
         Sends a tick event to all subscribed clients.
diff --git a/swaynag/config.c b/swaynag/config.c
index ca7f4eb2..6db7cce5 100644
--- a/swaynag/config.c
+++ b/swaynag/config.c
@@ -51,7 +51,7 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag,
                 TO_PADDING_BTN,
         };
 
-        static struct option opts[] = {
+        static const struct option opts[] = {
                 {"button", required_argument, NULL, 'b'},
                 {"button-no-terminal", required_argument, NULL, 'B'},
                 {"button-dismiss", required_argument, NULL, 'z'},
@@ -59,6 +59,7 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag,
                 {"config", required_argument, NULL, 'c'},
                 {"debug", no_argument, NULL, 'd'},
                 {"edge", required_argument, NULL, 'e'},
+                {"layer", required_argument, NULL, 'y'},
                 {"font", required_argument, NULL, 'f'},
                 {"help", no_argument, NULL, 'h'},
                 {"detailed-message", no_argument, NULL, 'l'},
@@ -104,6 +105,8 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag,
                 "  -c, --config <path>             Path to config file.\n"
                 "  -d, --debug                     Enable debugging.\n"
                 "  -e, --edge top|bottom           Set the edge to use.\n"
+                "  -y, --layer overlay|top|bottom|background\n"
+            "                                  Set the layer to use.\n"
                 "  -f, --font <font>               Set the font to use.\n"
                 "  -h, --help                      Show help message and quit.\n"
                 "  -l, --detailed-message          Read a detailed message from stdin.\n"
@@ -133,7 +136,7 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag,
 
         optind = 1;
         while (1) {
-                int c = getopt_long(argc, argv, "b:B:z:Z:c:de:f:hlL:m:o:s:t:v", opts, NULL);
+                int c = getopt_long(argc, argv, "b:B:z:Z:c:de:y:f:hlL:m:o:s:t:v", opts, NULL);
                 if (c == -1) {
                         break;
                 }
@@ -184,6 +187,24 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag,
                                 }
                         }
                         break;
+                case 'y': // Layer
+                        if (type) {
+                                if (strcmp(optarg, "background") == 0) {
+                                        type->layer = ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND;
+                                } else if (strcmp(optarg, "bottom") == 0) {
+                                        type->layer = ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM;
+                                } else if (strcmp(optarg, "top") == 0) {
+                                        type->layer = ZWLR_LAYER_SHELL_V1_LAYER_TOP;
+                                } else if (strcmp(optarg, "overlay") == 0) {
+                                        type->layer = ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY;
+                                } else {
+                                        fprintf(stderr, "Invalid layer: %s\n"
+                                                        "Usage: --layer overlay|top|bottom|background\n",
+                                                        optarg);
+                                        return EXIT_FAILURE;
+                                }
+                        }
+                        break;
                 case 'f': // Font
                         if (type) {
                                 free(type->font);
diff --git a/swaynag/render.c b/swaynag/render.c
index cf2cc9e0..d72f42c2 100644
--- a/swaynag/render.c
+++ b/swaynag/render.c
@@ -1,5 +1,5 @@
 #include <stdint.h>
-#include "cairo.h"
+#include "cairo_util.h"
 #include "log.h"
 #include "pango.h"
 #include "pool-buffer.h"
@@ -10,19 +10,19 @@
 static uint32_t render_message(cairo_t *cairo, struct swaynag *swaynag) {
         int text_width, text_height;
         get_text_size(cairo, swaynag->type->font, &text_width, &text_height, NULL,
-                        swaynag->scale, true, "%s", swaynag->message);
+                        1, true, "%s", swaynag->message);
 
-        int padding = swaynag->type->message_padding * swaynag->scale;
+        int padding = swaynag->type->message_padding;
 
         uint32_t ideal_height = text_height + padding * 2;
-        uint32_t ideal_surface_height = ideal_height / swaynag->scale;
+        uint32_t ideal_surface_height = ideal_height;
         if (swaynag->height < ideal_surface_height) {
                 return ideal_surface_height;
         }
 
         cairo_set_source_u32(cairo, swaynag->type->text);
         cairo_move_to(cairo, padding, (int)(ideal_height - text_height) / 2);
-        pango_printf(cairo, swaynag->type->font, swaynag->scale, false,
+        render_text(cairo, swaynag->type->font, 1, false,
                         "%s", swaynag->message);
 
         return ideal_surface_height;
@@ -32,10 +32,10 @@ static void render_details_scroll_button(cairo_t *cairo,
                 struct swaynag *swaynag, struct swaynag_button *button) {
         int text_width, text_height;
         get_text_size(cairo, swaynag->type->font, &text_width, &text_height, NULL,
-                        swaynag->scale, true, "%s", button->text);
+                        1, true, "%s", button->text);
 
-        int border = swaynag->type->button_border_thickness * swaynag->scale;
-        int padding = swaynag->type->button_padding * swaynag->scale;
+        int border = swaynag->type->button_border_thickness;
+        int padding = swaynag->type->button_padding;
 
         cairo_set_source_u32(cairo, swaynag->type->details_background);
         cairo_rectangle(cairo, button->x, button->y,
@@ -50,7 +50,7 @@ static void render_details_scroll_button(cairo_t *cairo,
         cairo_set_source_u32(cairo, swaynag->type->button_text);
         cairo_move_to(cairo, button->x + border + padding,
                         button->y + border + (button->height - text_height) / 2);
-        pango_printf(cairo, swaynag->type->font, swaynag->scale, true,
+        render_text(cairo, swaynag->type->font, 1, true,
                         "%s", button->text);
 }
 
@@ -58,33 +58,33 @@ static int get_detailed_scroll_button_width(cairo_t *cairo,
                 struct swaynag *swaynag) {
         int up_width, down_width, temp_height;
         get_text_size(cairo, swaynag->type->font, &up_width, &temp_height, NULL,
-                        swaynag->scale, true,
+                        1, true,
                         "%s", swaynag->details.button_up.text);
         get_text_size(cairo, swaynag->type->font, &down_width, &temp_height, NULL,
-                        swaynag->scale, true,
+                        1, true,
                         "%s", swaynag->details.button_down.text);
 
         int text_width =  up_width > down_width ? up_width : down_width;
-        int border = swaynag->type->button_border_thickness * swaynag->scale;
-        int padding = swaynag->type->button_padding * swaynag->scale;
+        int border = swaynag->type->button_border_thickness;
+        int padding = swaynag->type->button_padding;
 
         return text_width + border * 2 + padding * 2;
 }
 
 static uint32_t render_detailed(cairo_t *cairo, struct swaynag *swaynag,
                 uint32_t y) {
-        uint32_t width = swaynag->width * swaynag->scale;
+        uint32_t width = swaynag->width;
 
-        int border = swaynag->type->details_border_thickness * swaynag->scale;
-        int padding = swaynag->type->message_padding * swaynag->scale;
+        int border = swaynag->type->details_border_thickness;
+        int padding = swaynag->type->message_padding;
         int decor = padding + border;
 
         swaynag->details.x = decor;
-        swaynag->details.y = y * swaynag->scale + decor;
+        swaynag->details.y = y + decor;
         swaynag->details.width = width - decor * 2;
 
         PangoLayout *layout = get_pango_layout(cairo, swaynag->type->font,
-                        swaynag->details.message, swaynag->scale, false);
+                        swaynag->details.message, 1, false);
         pango_layout_set_width(layout,
                         (swaynag->details.width - padding * 2) * PANGO_SCALE);
         pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
@@ -164,7 +164,7 @@ static uint32_t render_detailed(cairo_t *cairo, struct swaynag *swaynag,
         pango_cairo_show_layout(cairo, layout);
         g_object_unref(layout);
 
-        return ideal_height / swaynag->scale;
+        return ideal_height;
 }
 
 static uint32_t render_button(cairo_t *cairo, struct swaynag *swaynag,
@@ -173,13 +173,13 @@ static uint32_t render_button(cairo_t *cairo, struct swaynag *swaynag,
 
         int text_width, text_height;
         get_text_size(cairo, swaynag->type->font, &text_width, &text_height, NULL,
-                        swaynag->scale, true, "%s", button->text);
+                        1, true, "%s", button->text);
 
-        int border = swaynag->type->button_border_thickness * swaynag->scale;
-        int padding = swaynag->type->button_padding * swaynag->scale;
+        int border = swaynag->type->button_border_thickness;
+        int padding = swaynag->type->button_padding;
 
         uint32_t ideal_height = text_height + padding * 2 + border * 2;
-        uint32_t ideal_surface_height = ideal_height / swaynag->scale;
+        uint32_t ideal_surface_height = ideal_height;
         if (swaynag->height < ideal_surface_height) {
                 return ideal_surface_height;
         }
@@ -201,7 +201,7 @@ static uint32_t render_button(cairo_t *cairo, struct swaynag *swaynag,
 
         cairo_set_source_u32(cairo, swaynag->type->button_text);
         cairo_move_to(cairo, button->x + padding, button->y + padding);
-        pango_printf(cairo, swaynag->type->font, swaynag->scale, true,
+        render_text(cairo, swaynag->type->font, 1, true,
                         "%s", button->text);
 
         *x = button->x - border;
@@ -220,13 +220,12 @@ static uint32_t render_to_cairo(cairo_t *cairo, struct swaynag *swaynag) {
         max_height = h > max_height ? h : max_height;
 
         int x = swaynag->width - swaynag->type->button_margin_right;
-        x *= swaynag->scale;
         for (int i = 0; i < swaynag->buttons->length; i++) {
                 h = render_button(cairo, swaynag, i, &x);
                 max_height = h > max_height ? h : max_height;
-                x -= swaynag->type->button_gap * swaynag->scale;
+                x -= swaynag->type->button_gap;
                 if (i == 0) {
-                        x -= swaynag->type->button_gap_close * swaynag->scale;
+                        x -= swaynag->type->button_gap_close;
                 }
         }
 
@@ -235,14 +234,14 @@ static uint32_t render_to_cairo(cairo_t *cairo, struct swaynag *swaynag) {
                 max_height = h > max_height ? h : max_height;
         }
 
-        int border = swaynag->type->bar_border_thickness * swaynag->scale;
+        int border = swaynag->type->bar_border_thickness;
         if (max_height > swaynag->height) {
                 max_height += border;
         }
         cairo_set_source_u32(cairo, swaynag->type->border_bottom);
         cairo_rectangle(cairo, 0,
-                        swaynag->height * swaynag->scale - border,
-                        swaynag->width * swaynag->scale,
+                        swaynag->height - border,
+                        swaynag->width,
                         border);
         cairo_fill(cairo);
 
@@ -257,6 +256,7 @@ void render_frame(struct swaynag *swaynag) {
         cairo_surface_t *recorder = cairo_recording_surface_create(
                         CAIRO_CONTENT_COLOR_ALPHA, NULL);
         cairo_t *cairo = cairo_create(recorder);
+        cairo_scale(cairo, swaynag->scale, swaynag->scale);
         cairo_save(cairo);
         cairo_set_operator(cairo, CAIRO_OPERATOR_CLEAR);
         cairo_paint(cairo);
diff --git a/swaynag/swaynag.1.scd b/swaynag/swaynag.1.scd
index 4a03469e..1cc85db7 100644
--- a/swaynag/swaynag.1.scd
+++ b/swaynag/swaynag.1.scd
@@ -48,6 +48,9 @@ _swaynag_ [options...]
 *-e, --edge* top|bottom
         Set the edge to use.
 
+*-y, --layer* overlay|top|bottom|background
+        Set the layer to use.
+
 *-f, --font* <font>
         Set the font to use.
 
diff --git a/swaynag/swaynag.5.scd b/swaynag/swaynag.5.scd
index a078a4d7..3c367d0f 100644
--- a/swaynag/swaynag.5.scd
+++ b/swaynag/swaynag.5.scd
@@ -53,7 +53,7 @@ The following sizing options can also be set:
 *message-padding=<padding>*
         Set the padding for the message.
 
-*details-gackground=<color>*
+*details-background=<color>*
         The background color for the details.
 
 *details-border-size=<size>*
@@ -79,6 +79,9 @@ Additionally, the following options can be assigned a default per-type:
 *edge=top|bottom*
         Set the edge to use.
 
+*layer=overlay|top|bottom|background*
+        Set the layer to use.
+
 *font=<font>*
         Set the font to use.
 
diff --git a/swaynag/swaynag.c b/swaynag/swaynag.c
index d9bec368..9b57d578 100644
--- a/swaynag/swaynag.c
+++ b/swaynag/swaynag.c
@@ -30,8 +30,8 @@ static bool terminal_execute(char *terminal, char *command) {
         chmod(fname, S_IRUSR | S_IWUSR | S_IXUSR);
         char *cmd = malloc(sizeof(char) * (strlen(terminal) + strlen(" -e ") + strlen(fname) + 1));
         sprintf(cmd, "%s -e %s", terminal, fname);
-        execl("/bin/sh", "/bin/sh", "-c", cmd, NULL);
-        sway_log_errno(SWAY_ERROR, "Failed to run command, execl() returned.");
+        execlp("sh", "sh", "-c", cmd, NULL);
+        sway_log_errno(SWAY_ERROR, "Failed to run command, execlp() returned.");
         free(cmd);
         return false;
 }
@@ -69,8 +69,8 @@ static void swaynag_button_execute(struct swaynag *swaynag,
                                                 sway_log(SWAY_DEBUG,
                                                                 "$TERMINAL not found. Running directly");
                                         }
-                                        execl("/bin/sh", "/bin/sh", "-c", button->action, NULL);
-                                        sway_log_errno(SWAY_DEBUG, "execl failed");
+                                        execlp("sh", "sh", "-c", button->action, NULL);
+                                        sway_log_errno(SWAY_DEBUG, "execlp failed");
                                         _exit(EXIT_FAILURE);
                                 }
                         }
@@ -103,7 +103,7 @@ static void layer_surface_closed(void *data,
         swaynag_destroy(swaynag);
 }
 
-static struct zwlr_layer_surface_v1_listener layer_surface_listener = {
+static const struct zwlr_layer_surface_v1_listener layer_surface_listener = {
         .configure = layer_surface_configure,
         .closed = layer_surface_closed,
 };
@@ -124,7 +124,7 @@ static void surface_enter(void *data, struct wl_surface *surface,
         };
 }
 
-static struct wl_surface_listener surface_listener = {
+static const struct wl_surface_listener surface_listener = {
         .enter = surface_enter,
         .leave = nop,
 };
@@ -178,6 +178,8 @@ static void wl_pointer_enter(void *data, struct wl_pointer *wl_pointer,
                 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);
 }
@@ -198,8 +200,8 @@ static void wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
                 return;
         }
 
-        double x = seat->pointer.x * swaynag->scale;
-        double y = seat->pointer.y * swaynag->scale;
+        double x = seat->pointer.x;
+        double y = seat->pointer.y;
         for (int i = 0; i < swaynag->buttons->length; i++) {
                 struct swaynag_button *nagbutton = swaynag->buttons->items[i];
                 if (x >= nagbutton->x
@@ -263,7 +265,7 @@ static void wl_pointer_axis(void *data, struct wl_pointer *wl_pointer,
         render_frame(swaynag);
 }
 
-static struct wl_pointer_listener pointer_listener = {
+static const struct wl_pointer_listener pointer_listener = {
         .enter = wl_pointer_enter,
         .leave = nop,
         .motion = wl_pointer_motion,
@@ -289,7 +291,7 @@ static void seat_handle_capabilities(void *data, struct wl_seat *wl_seat,
         }
 }
 
-const struct wl_seat_listener seat_listener = {
+static const struct wl_seat_listener seat_listener = {
         .capabilities = seat_handle_capabilities,
         .name = nop,
 };
@@ -305,33 +307,25 @@ static void output_scale(void *data, struct wl_output *output,
         }
 }
 
-static struct wl_output_listener output_listener = {
-        .geometry = nop,
-        .mode = nop,
-        .done = nop,
-        .scale = output_scale,
-};
-
-static void xdg_output_handle_name(void *data,
-                struct zxdg_output_v1 *xdg_output, const char *name) {
+static void output_name(void *data, struct wl_output *output,
+                const char *name) {
         struct swaynag_output *swaynag_output = data;
-        char *outname = swaynag_output->swaynag->type->output;
-        sway_log(SWAY_DEBUG, "Checking against output %s for %s", name, outname);
-        if (!swaynag_output->swaynag->output && outname && name
-                        && strcmp(outname, name) == 0) {
+        swaynag_output->name = strdup(name);
+
+        const char *outname = swaynag_output->swaynag->type->output;
+        if (!swaynag_output->swaynag->output && outname &&
+                        strcmp(outname, name) == 0) {
                 sway_log(SWAY_DEBUG, "Using output %s", name);
                 swaynag_output->swaynag->output = swaynag_output;
         }
-        swaynag_output->name = strdup(name);
-        zxdg_output_v1_destroy(xdg_output);
-        swaynag_output->swaynag->querying_outputs--;
 }
 
-static struct zxdg_output_v1_listener xdg_output_listener = {
-        .logical_position = nop,
-        .logical_size = nop,
+static const struct wl_output_listener output_listener = {
+        .geometry = nop,
+        .mode = nop,
         .done = nop,
-        .name = xdg_output_handle_name,
+        .scale = output_scale,
+        .name = output_name,
         .description = nop,
 };
 
@@ -359,33 +353,21 @@ static void handle_global(void *data, struct wl_registry *registry,
         } else if (strcmp(interface, wl_shm_interface.name) == 0) {
                 swaynag->shm = wl_registry_bind(registry, name, &wl_shm_interface, 1);
         } else if (strcmp(interface, wl_output_interface.name) == 0) {
-                if (!swaynag->output && swaynag->xdg_output_manager) {
-                        swaynag->querying_outputs++;
+                if (!swaynag->output) {
                         struct swaynag_output *output =
                                 calloc(1, sizeof(struct swaynag_output));
                         output->wl_output = wl_registry_bind(registry, name,
-                                        &wl_output_interface, 3);
+                                        &wl_output_interface, 4);
                         output->wl_name = name;
                         output->scale = 1;
                         output->swaynag = swaynag;
                         wl_list_insert(&swaynag->outputs, &output->link);
                         wl_output_add_listener(output->wl_output,
                                         &output_listener, output);
-
-                        struct zxdg_output_v1 *xdg_output;
-                        xdg_output = zxdg_output_manager_v1_get_xdg_output(
-                                        swaynag->xdg_output_manager, output->wl_output);
-                        zxdg_output_v1_add_listener(xdg_output,
-                                        &xdg_output_listener, output);
                 }
         } else if (strcmp(interface, zwlr_layer_shell_v1_interface.name) == 0) {
                 swaynag->layer_shell = wl_registry_bind(
                                 registry, name, &zwlr_layer_shell_v1_interface, 1);
-        } else if (strcmp(interface, zxdg_output_manager_v1_interface.name) == 0
-                        && version >= ZXDG_OUTPUT_V1_NAME_SINCE_VERSION) {
-                swaynag->xdg_output_manager = wl_registry_bind(registry, name,
-                                &zxdg_output_manager_v1_interface,
-                                ZXDG_OUTPUT_V1_NAME_SINCE_VERSION);
         }
 }
 
@@ -451,12 +433,11 @@ void swaynag_setup(struct swaynag *swaynag) {
 
         assert(swaynag->compositor && swaynag->layer_shell && swaynag->shm);
 
-        while (swaynag->querying_outputs > 0) {
-                if (wl_display_roundtrip(swaynag->display) < 0) {
-                        sway_log(SWAY_ERROR, "Error during outputs init.");
-                        swaynag_destroy(swaynag);
-                        exit(EXIT_FAILURE);
-                }
+        // Second roundtrip to get wl_output properties
+        if (wl_display_roundtrip(swaynag->display) < 0) {
+                sway_log(SWAY_ERROR, "Error during outputs init.");
+                swaynag_destroy(swaynag);
+                exit(EXIT_FAILURE);
         }
 
         if (!swaynag->output && swaynag->type->output) {
@@ -474,7 +455,8 @@ void swaynag_setup(struct swaynag *swaynag) {
         swaynag->layer_surface = zwlr_layer_shell_v1_get_layer_surface(
                         swaynag->layer_shell, swaynag->surface,
                         swaynag->output ? swaynag->output->wl_output : NULL,
-                        ZWLR_LAYER_SHELL_V1_LAYER_TOP, "swaynag");
+                        swaynag->type->layer,
+                        "swaynag");
         assert(swaynag->layer_surface);
         zwlr_layer_surface_v1_add_listener(swaynag->layer_surface,
                         &layer_surface_listener, swaynag);
diff --git a/swaynag/types.c b/swaynag/types.c
index fa045532..7bef0f87 100644
--- a/swaynag/types.c
+++ b/swaynag/types.c
@@ -26,6 +26,7 @@ struct swaynag_type *swaynag_type_new(const char *name) {
         type->button_gap_close = -1;
         type->button_margin_right = -1;
         type->button_padding = -1;
+        type->layer = -1;
         return type;
 }
 
@@ -35,6 +36,7 @@ void swaynag_types_add_default(list_t *types) {
         type_defaults->anchors = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP
                 | ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT
                 | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
+        type_defaults->layer = ZWLR_LAYER_SHELL_V1_LAYER_TOP;
         type_defaults->button_background = 0x333333FF;
         type_defaults->details_background = 0x333333FF;
         type_defaults->background = 0x323232FF;
@@ -100,6 +102,10 @@ void swaynag_type_merge(struct swaynag_type *dest, struct swaynag_type *src) {
                 dest->anchors = src->anchors;
         }
 
+        if (src->layer >= 0) {
+                dest->layer = src->layer;
+        }
+
         // Colors
         if (src->button_background > 0) {
                 dest->button_background = src->button_background;