85 files changed, 1065 insertions, 634 deletions
diff --git a/sway/commands/assign.c b/sway/commands/assign.c
index 976bc3cc..bf95cf00 100644
--- a/sway/commands/assign.c
+++ b/sway/commands/assign.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdio.h>
 #include <string.h>
 #include "sway/commands.h"
@@ -17,7 +16,7 @@ struct cmd_results *cmd_assign(int argc, char **argv) {
        char *err_str = NULL;
        struct criteria *criteria = criteria_parse(argv[0], &err_str);
        if (!criteria) {
-                error = cmd_results_new(CMD_INVALID, err_str);
+                error = cmd_results_new(CMD_INVALID, "%s", err_str);
                free(err_str);
                return error;
        }
diff --git a/sway/commands/bar.c b/sway/commands/bar.c
index d42b7fc2..635e895b 100644
--- a/sway/commands/bar.c
+++ b/sway/commands/bar.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809
 #include <stdio.h>
 #include <string.h>
 #include <strings.h>
@@ -8,7 +7,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 +40,7 @@ static struct cmd_handler bar_handlers[] = {
 };
 // Must be in alphabetical order for bsearch
-static struct cmd_handler bar_config_handlers[] = {
+static const struct cmd_handler bar_config_handlers[] = {
        { "id", bar_cmd_id },
        { "swaybar_command", bar_cmd_swaybar_command },
 };
@@ -73,12 +72,10 @@ struct cmd_results *cmd_bar(int argc, char **argv) {
                }
                ++argv; --argc;
        } else if (config->reading && !config->current_bar) {
-                int len = snprintf(NULL, 0, "bar-%d", config->bars->length) + 1;
+                id = format_str("bar-%d", config->bars->length);
-                id = malloc(len * sizeof(char));
                if (!id) {
                        return cmd_results_new(CMD_FAILURE, "Unable to allocate bar id");
                }
-                snprintf(id, len, "bar-%d", config->bars->length);
        } else if (!config->reading && strcmp(argv[0], "mode") != 0 &&
                        strcmp(argv[0], "hidden_state") != 0) {
                if (is_subcommand(argv[0])) {
@@ -116,6 +113,7 @@ struct cmd_results *cmd_bar(int argc, char **argv) {
        if (res && res->status != CMD_SUCCESS) {
                if (id) {
                        free_bar_config(config->current_bar);
+                        config->current_bar = NULL;
                        id = NULL;
                }
                return res;
diff --git a/sway/commands/bar/bind.c b/sway/commands/bar/bind.c
index b4b5bc45..8a837e3f 100644
--- a/sway/commands/bar/bind.c
+++ b/sway/commands/bar/bind.c
@@ -96,7 +96,7 @@ static struct cmd_results *bar_cmd_bind(int argc, char **argv, bool code,
        }
        if (message) {
                free_bar_binding(binding);
-                error = cmd_results_new(CMD_INVALID, message);
+                error = cmd_results_new(CMD_INVALID, "%s", message);
                free(message);
                return error;
        } else if (!binding->button) {
diff --git a/sway/commands/bar/colors.c b/sway/commands/bar/colors.c
index 2d5b22bf..275fa3c6 100644
--- a/sway/commands/bar/colors.c
+++ b/sway/commands/bar/colors.c
@@ -4,7 +4,7 @@
 #include "util.h"
 // Must be in alphabetical order for bsearch
-static struct cmd_handler bar_colors_handlers[] = {
+static const struct cmd_handler bar_colors_handlers[] = {
        { "active_workspace", bar_colors_cmd_active_workspace },
        { "background", bar_colors_cmd_background },
        { "binding_mode", bar_colors_cmd_binding_mode },
diff --git a/sway/commands/bar/font.c b/sway/commands/bar/font.c
index 62987f3e..0c074679 100644
--- a/sway/commands/bar/font.c
+++ b/sway/commands/bar/font.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "log.h"
@@ -11,7 +10,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..7b38831e 100644
--- a/sway/commands/bar/hidden_state.c
+++ b/sway/commands/bar/hidden_state.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include <strings.h>
 #include "sway/commands.h"
@@ -54,7 +53,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/icon_theme.c b/sway/commands/bar/icon_theme.c
index 6ac07843..fee21709 100644
--- a/sway/commands/bar/icon_theme.c
+++ b/sway/commands/bar/icon_theme.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "config.h"
 #include "sway/commands.h"
diff --git a/sway/commands/bar/id.c b/sway/commands/bar/id.c
index a9a61743..46cf4ca9 100644
--- a/sway/commands/bar/id.c
+++ b/sway/commands/bar/id.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "log.h"
diff --git a/sway/commands/bar/mode.c b/sway/commands/bar/mode.c
index 8b3fb275..d69e910b 100644
--- a/sway/commands/bar/mode.c
+++ b/sway/commands/bar/mode.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include <strings.h>
 #include "sway/commands.h"
@@ -58,7 +57,7 @@ struct cmd_results *bar_cmd_mode(int argc, char **argv) {
        }
        const char *mode = argv[0];
-        if (config->reading) {
+        if (config->current_bar) {
                error = bar_set_mode(config->current_bar, mode);
        } else {
                const char *id = argc == 2 ? argv[1] : NULL;
diff --git a/sway/commands/bar/output.c b/sway/commands/bar/output.c
index cac1d056..51730176 100644
--- a/sway/commands/bar/output.c
+++ b/sway/commands/bar/output.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdbool.h>
 #include <string.h>
 #include "sway/commands.h"
diff --git a/sway/commands/bar/position.c b/sway/commands/bar/position.c
index b207de0b..94f530ec 100644
--- a/sway/commands/bar/position.c
+++ b/sway/commands/bar/position.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include <strings.h>
 #include "sway/commands.h"
diff --git a/sway/commands/bar/separator_symbol.c b/sway/commands/bar/separator_symbol.c
index 6737d4d2..50e9a873 100644
--- a/sway/commands/bar/separator_symbol.c
+++ b/sway/commands/bar/separator_symbol.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "log.h"
diff --git a/sway/commands/bar/tray_bind.c b/sway/commands/bar/tray_bind.c
index 243834ba..3dc9bc4c 100644
--- a/sway/commands/bar/tray_bind.c
+++ b/sway/commands/bar/tray_bind.c
@@ -26,7 +26,7 @@ static struct cmd_results *tray_bind(int argc, char **argv, bool code) {
        }
        if (message) {
                free(binding);
-                error = cmd_results_new(CMD_INVALID, message);
+                error = cmd_results_new(CMD_INVALID, "%s", message);
                free(message);
                return error;
        } else if (!binding->button) {
diff --git a/sway/commands/bar/tray_output.c b/sway/commands/bar/tray_output.c
index eb3b486e..679facf7 100644
--- a/sway/commands/bar/tray_output.c
+++ b/sway/commands/bar/tray_output.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "config.h"
 #include "sway/commands.h"
diff --git a/sway/commands/bind.c b/sway/commands/bind.c
index f6e58d99..268f2855 100644
--- a/sway/commands/bind.c
+++ b/sway/commands/bind.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <libevdev/libevdev.h>
 #include <linux/input-event-codes.h>
 #include <string.h>
@@ -8,6 +7,7 @@
 #include <wlr/types/wlr_cursor.h>
 #include "sway/commands.h"
 #include "sway/config.h"
+#include "sway/desktop/transaction.h"
 #include "sway/input/cursor.h"
 #include "sway/input/keyboard.h"
 #include "sway/ipc-server.h"
@@ -46,7 +46,7 @@ static bool binding_switch_compare(struct sway_switch_binding *binding_a,
        if (binding_a->type != binding_b->type) {
                return false;
        }
-        if (binding_a->state != binding_b->state) {
+        if (binding_a->trigger != binding_b->trigger) {
                return false;
        }
        if ((binding_a->flags & BINDING_LOCKED) !=
@@ -126,7 +126,7 @@ static struct cmd_results *identify_key(const char* name, bool first_key,
                if (!button) {
                        if (message) {
                                struct cmd_results *error =
-                                        cmd_results_new(CMD_INVALID, message);
+                                        cmd_results_new(CMD_INVALID, "%s", message);
                                free(message);
                                return error;
                        } else {
@@ -142,7 +142,7 @@ static struct cmd_results *identify_key(const char* name, bool first_key,
                if (!button) {
                        if (message) {
                                struct cmd_results *error =
-                                        cmd_results_new(CMD_INVALID, message);
+                                        cmd_results_new(CMD_INVALID, "%s", message);
                                free(message);
                                return error;
                        } else {
@@ -181,7 +181,7 @@ static struct cmd_results *identify_key(const char* name, bool first_key,
                        uint32_t button = get_mouse_bindsym(name, &message);
                        if (message) {
                                struct cmd_results *error =
-                                        cmd_results_new(CMD_INVALID, message);
+                                        cmd_results_new(CMD_INVALID, "%s", message);
                                free(message);
                                return error;
                        } else if (button) {
@@ -371,6 +371,7 @@ static struct cmd_results *cmd_bindsym_or_bindcode(int argc, char **argv,
                                        strlen("--input-device=")) == 0) {
                        free(binding->input);
                        binding->input = strdup(argv[0] + strlen("--input-device="));
+                        strip_quotes(binding->input);
                } else if (strcmp("--no-warn", argv[0]) == 0) {
                        warn = false;
                } else if (strcmp("--no-repeat", argv[0]) == 0) {
@@ -537,7 +538,7 @@ struct cmd_results *cmd_bind_or_unbind_switch(int argc, char **argv,
                free_switch_binding(binding);
                return cmd_results_new(CMD_FAILURE,
                                "Invalid %s command (expected binding with the form "
-                                "<switch>:<state>)", bindtype, argc);
+                                "<switch>:<state>)", bindtype);
        }
        if (strcmp(split->items[0], "tablet") == 0) {
                binding->type = WLR_SWITCH_TYPE_TABLET_MODE;
@@ -547,20 +548,21 @@ struct cmd_results *cmd_bind_or_unbind_switch(int argc, char **argv,
                free_switch_binding(binding);
                return cmd_results_new(CMD_FAILURE,
                                "Invalid %s command (expected switch binding: "
-                                "unknown switch %s)", bindtype, split->items[0]);
+                                "unknown switch %s)", bindtype,
+                                (const char *)split->items[0]);
        }
        if (strcmp(split->items[1], "on") == 0) {
-                binding->state = WLR_SWITCH_STATE_ON;
+                binding->trigger = SWAY_SWITCH_TRIGGER_ON;
        } else if (strcmp(split->items[1], "off") == 0) {
-                binding->state = WLR_SWITCH_STATE_OFF;
+                binding->trigger = SWAY_SWITCH_TRIGGER_OFF;
        } else if (strcmp(split->items[1], "toggle") == 0) {
-                binding->state = WLR_SWITCH_STATE_TOGGLE;
+                binding->trigger = SWAY_SWITCH_TRIGGER_TOGGLE;
        } else {
                free_switch_binding(binding);
                return cmd_results_new(CMD_FAILURE,
                                "Invalid %s command "
-                                "(expected switch state: unknown state %d)",
+                                "(expected switch state: unknown state %s)",
-                                bindtype, split->items[0]);
+                                bindtype, (const char *)split->items[1]);
        }
        list_free_items_and_destroy(split);
@@ -642,6 +644,8 @@ void seat_execute_command(struct sway_seat *seat, struct sway_binding *binding)
        if (success) {
                ipc_event_binding(binding);
        }
+        transaction_commit_dirty();
 }
 /**
diff --git a/sway/commands/border.c b/sway/commands/border.c
index 647663ac..7818fc96 100644
--- a/sway/commands/border.c
+++ b/sway/commands/border.c
@@ -19,11 +19,11 @@ static void set_border(struct sway_container *con,
                        view_set_csd_from_server(con->view, false);
                } else if (!con->view->using_csd && new_border == B_CSD) {
                        view_set_csd_from_server(con->view, true);
-                        con->saved_border = con->border;
+                        con->saved_border = con->pending.border;
                }
        }
        if (new_border != B_CSD || container_is_floating(con)) {
-                con->border = new_border;
+                con->pending.border = new_border;
        }
        if (con->view) {
                con->view->using_csd = new_border == B_CSD;
@@ -35,7 +35,7 @@ static void border_toggle(struct sway_container *con) {
                set_border(con, B_NONE);
                return;
        }
-        switch (con->border) {
+        switch (con->pending.border) {
        case B_NONE:
                set_border(con, B_PIXEL);
                break;
@@ -88,7 +88,7 @@ struct cmd_results *cmd_border(int argc, char **argv) {
                                "or 'border pixel <px>'");
        }
        if (argc == 2) {
-                container->border_thickness = atoi(argv[1]);
+                container->pending.border_thickness = atoi(argv[1]);
        }
        if (container_is_floating(container)) {
diff --git a/sway/commands/client.c b/sway/commands/client.c
index dd0694df..fd2ac7a8 100644
--- a/sway/commands/client.c
+++ b/sway/commands/client.c
@@ -5,9 +5,8 @@
 #include "sway/tree/container.h"
 #include "util.h"
-static void rebuild_textures_iterator(struct sway_container *con, void *data) {
+static void container_update_iterator(struct sway_container *con, void *data) {
-        container_update_marks_textures(con);
+        container_update(con);
-        container_update_title_textures(con);
 }
 static struct cmd_results *handle_command(int argc, char **argv, char *cmd_name,
@@ -18,6 +17,12 @@ static struct cmd_results *handle_command(int argc, char **argv, char *cmd_name,
                return error;
        }
+        if (argc > 3 && strcmp(cmd_name, "client.focused_tab_title") == 0) {
+                sway_log(SWAY_ERROR,
+                                "Warning: indicator and child_border colors have no effect for %s",
+                                cmd_name);
+        }
        struct border_colors colors = {0};
        const char *ind_hex = argc > 3 ? argv[3] : default_indicator;
        const char *child_hex = argc > 4 ? argv[4] : argv[1];  // def to background
@@ -45,12 +50,7 @@ static struct cmd_results *handle_command(int argc, char **argv, char *cmd_name,
        memcpy(class, &colors, sizeof(struct border_colors));
        if (config->active) {
-                root_for_each_container(rebuild_textures_iterator, NULL);
+                root_for_each_container(container_update_iterator, NULL);
-                for (int i = 0; i < root->outputs->length; ++i) {
-                        struct sway_output *output = root->outputs->items[i];
-                        output_damage_whole(output);
-                }
        }
        return cmd_results_new(CMD_SUCCESS, NULL);
@@ -80,3 +80,13 @@ struct cmd_results *cmd_client_noop(int argc, char **argv) {
        sway_log(SWAY_INFO, "Warning: %s is ignored by sway", argv[-1]);
        return cmd_results_new(CMD_SUCCESS, NULL);
 }
+struct cmd_results *cmd_client_focused_tab_title(int argc, char **argv) {
+        struct cmd_results *result =  handle_command(argc, argv,
+                        "client.focused_tab_title",
+                        &config->border_colors.focused_tab_title, "#2e9ef4ff");
+        if (result && result->status == CMD_SUCCESS) {
+                config->has_focused_tab_title = true;
+        }
+        return result;
+}
diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c
index 39e48a44..8bc1048c 100644
--- a/sway/commands/exec_always.c
+++ b/sway/commands/exec_always.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
@@ -7,6 +6,8 @@
 #include <signal.h>
 #include "sway/commands.h"
 #include "sway/config.h"
+#include "sway/server.h"
+#include "sway/desktop/launcher.h"
 #include "sway/tree/container.h"
 #include "sway/tree/root.h"
 #include "sway/tree/workspace.h"
@@ -24,11 +25,22 @@ struct cmd_results *cmd_exec_validate(int argc, char **argv) {
        return error;
 }
+static void export_xdga_token(struct launcher_ctx *ctx) {
+        const char *token = launcher_ctx_get_token_name(ctx);
+        setenv("XDG_ACTIVATION_TOKEN", token, 1);
+}
+static void export_startup_id(struct launcher_ctx *ctx) {
+        const char *token = launcher_ctx_get_token_name(ctx);
+        setenv("DESKTOP_STARTUP_ID", token, 1);
+}
 struct cmd_results *cmd_exec_process(int argc, char **argv) {
        struct cmd_results *error = NULL;
-        char *tmp = NULL;
+        char *cmd = NULL;
+        bool no_startup_id = false;
        if (strcmp(argv[0], "--no-startup-id") == 0) {
-                sway_log(SWAY_INFO, "exec switch '--no-startup-id' not supported, ignored.");
+                no_startup_id = true;
                --argc; ++argv;
                if ((error = checkarg(argc, argv[-1], EXPECTED_AT_LEAST, 1))) {
                        return error;
@@ -36,17 +48,12 @@ struct cmd_results *cmd_exec_process(int argc, char **argv) {
        }
        if (argc == 1 && (argv[0][0] == '\'' || argv[0][0] == '"')) {
-                tmp = strdup(argv[0]);
+                cmd = strdup(argv[0]);
-                strip_quotes(tmp);
+                strip_quotes(cmd);
        } else {
-                tmp = join_args(argv, argc);
+                cmd = join_args(argv, argc);
        }
-        // Put argument into cmd array
-        char cmd[4096];
-        strncpy(cmd, tmp, sizeof(cmd) - 1);
-        cmd[sizeof(cmd) - 1] = 0;
-        free(tmp);
        sway_log(SWAY_DEBUG, "Executing %s", cmd);
        int fd[2];
@@ -55,18 +62,28 @@ struct cmd_results *cmd_exec_process(int argc, char **argv) {
        }
        pid_t pid, child;
+        struct launcher_ctx *ctx = launcher_ctx_create_internal();
        // Fork process
        if ((pid = fork()) == 0) {
                // Fork child process again
+                restore_nofile_limit();
                setsid();
                sigset_t set;
                sigemptyset(&set);
                sigprocmask(SIG_SETMASK, &set, NULL);
+                signal(SIGPIPE, SIG_DFL);
                close(fd[0]);
                if ((child = fork()) == 0) {
                        close(fd[1]);
-                        execl("/bin/sh", "/bin/sh", "-c", cmd, (void *)NULL);
+                        if (ctx) {
-                        _exit(0);
+                                export_xdga_token(ctx);
+                        }
+                        if (ctx && !no_startup_id) {
+                                export_startup_id(ctx);
+                        }
+                        execlp("sh", "sh", "-c", cmd, (void *)NULL);
+                        sway_log_errno(SWAY_ERROR, "execlp failed");
+                        _exit(1);
                }
                ssize_t s = 0;
                while ((size_t)s < sizeof(pid_t)) {
@@ -75,10 +92,12 @@ struct cmd_results *cmd_exec_process(int argc, char **argv) {
                close(fd[1]);
                _exit(0); // Close child process
        } else if (pid < 0) {
+                free(cmd);
                close(fd[0]);
                close(fd[1]);
                return cmd_results_new(CMD_FAILURE, "fork() failed");
        }
+        free(cmd);
        close(fd[1]); // close write
        ssize_t s = 0;
        while ((size_t)s < sizeof(pid_t)) {
@@ -89,8 +108,12 @@ struct cmd_results *cmd_exec_process(int argc, char **argv) {
        waitpid(pid, NULL, 0);
        if (child > 0) {
                sway_log(SWAY_DEBUG, "Child process created with pid %d", child);
-                root_record_workspace_pid(child);
+                if (ctx != NULL) {
+                        sway_log(SWAY_DEBUG, "Recording workspace for process %d", child);
+                        ctx->pid = child;
+                }
        } else {
+                launcher_ctx_destroy(ctx);
                return cmd_results_new(CMD_FAILURE, "Second fork() failed");
        }
diff --git a/sway/commands/floating.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) {
+                while (container->pending.parent) {
-                        container = container->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) {
+        if (container->pending.workspace) {
-                arrange_workspace(container->workspace);
+                arrange_workspace(container->pending.workspace);
        }
        return cmd_results_new(CMD_SUCCESS, NULL);
diff --git a/sway/commands/floating_minmax_size.c b/sway/commands/floating_minmax_size.c
index 3a1d606a..e8c24ace 100644
--- a/sway/commands/floating_minmax_size.c
+++ b/sway/commands/floating_minmax_size.c
@@ -23,16 +23,16 @@ static struct cmd_results *handle_command(int argc, char **argv, char *cmd_name,
        char *err;
        int width = (int)strtol(argv[0], &err, 10);
        if (*err) {
-                return cmd_results_new(CMD_INVALID, cmd_name, usage);
+                return cmd_results_new(CMD_INVALID, "%s", usage);
        }
        if (strcmp(argv[1], "x") != 0) {
-                return cmd_results_new(CMD_INVALID, cmd_name, usage);
+                return cmd_results_new(CMD_INVALID, "%s", usage);
        }
        int height = (int)strtol(argv[2], &err, 10);
        if (*err) {
-                return cmd_results_new(CMD_INVALID, cmd_name, usage);
+                return cmd_results_new(CMD_INVALID, "%s", usage);
        }
        *config_width = width;
diff --git a/sway/commands/focus.c b/sway/commands/focus.c
index 79b7aed5..facd82de 100644
--- a/sway/commands/focus.c
+++ b/sway/commands/focus.c
@@ -54,7 +54,7 @@ static bool get_direction_from_next_prev(struct sway_container *container,
        } else {
                return false;
        }
-         
        return true;
 }
@@ -141,9 +141,9 @@ static struct sway_node *node_get_in_direction_tiling(
        struct sway_container *wrap_candidate = NULL;
        struct sway_container *current = container;
        while (current) {
-                if (current->fullscreen_mode == FULLSCREEN_WORKSPACE) {
+                if (current->pending.fullscreen_mode == FULLSCREEN_WORKSPACE) {
                        // Fullscreen container with a direction - go straight to outputs
-                        struct sway_output *output = current->workspace->output;
+                        struct sway_output *output = current->pending.workspace->output;
                        struct sway_output *new_output =
                                output_get_in_direction(output, dir);
                        if (!new_output) {
@@ -151,7 +151,7 @@ static struct sway_node *node_get_in_direction_tiling(
                        }
                        return get_node_in_output_direction(new_output, dir);
                }
-                if (current->fullscreen_mode == FULLSCREEN_GLOBAL) {
+                if (current->pending.fullscreen_mode == FULLSCREEN_GLOBAL) {
                        return NULL;
                }
@@ -202,11 +202,11 @@ static struct sway_node *node_get_in_direction_tiling(
                        }
                }
-                current = current->parent;
+                current = current->pending.parent;
        }
        // Check a different output
-        struct sway_output *output = container->workspace->output;
+        struct sway_output *output = container->pending.workspace->output;
        struct sway_output *new_output = output_get_in_direction(output, dir);
        if ((config->focus_wrapping != WRAP_WORKSPACE ||
                                container->node.type == N_WORKSPACE) && new_output) {
@@ -226,23 +226,23 @@ static struct sway_node *node_get_in_direction_tiling(
 static struct sway_node *node_get_in_direction_floating(
                struct sway_container *con, struct sway_seat *seat,
                enum wlr_direction dir) {
-        double ref_lx = con->x + con->width / 2;
+        double ref_lx = con->pending.x + con->pending.width / 2;
-        double ref_ly = con->y + con->height / 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++) {
+        for (int i = 0; i < con->pending.workspace->floating->length; i++) {
-                struct sway_container *floater = con->workspace->floating->items[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->pending.x + floater->pending.width / 2) - ref_lx
-                        : (floater->y + floater->height / 2) - ref_ly;
+                        : (floater->pending.y + floater->pending.height / 2) - ref_ly;
                if (dir == WLR_DIRECTION_LEFT || dir == WLR_DIRECTION_UP) {
                        distance = -distance;
                }
@@ -267,6 +267,11 @@ static struct cmd_results *focus_mode(struct sway_workspace *ws,
                new_focus = seat_get_focus_inactive_tiling(seat, ws);
        }
        if (new_focus) {
+                struct sway_container *new_focus_view =
+                        seat_get_focus_inactive_view(seat, &new_focus->node);
+                if (new_focus_view) {
+                        new_focus = new_focus_view;
+                }
                seat_set_focus_container(seat, new_focus);
                // If we're on the floating layer and the floating container area
@@ -280,7 +285,7 @@ static struct cmd_results *focus_mode(struct sway_workspace *ws,
                }
        } else {
                return cmd_results_new(CMD_FAILURE,
-                                "Failed to find a %s container in workspace",
+                                "Failed to find a %s container in workspace.",
                                floating ? "floating" : "tiling");
        }
        return cmd_results_new(CMD_SUCCESS, NULL);
@@ -290,7 +295,7 @@ static struct cmd_results *focus_output(struct sway_seat *seat,
                int argc, char **argv) {
        if (!argc) {
                return cmd_results_new(CMD_INVALID,
-                        "Expected 'focus output <direction|name>'");
+                        "Expected 'focus output <direction|name>'.");
        }
        char *identifier = join_args(argv, argc);
        struct sway_output *output = output_by_name_or_id(identifier);
@@ -300,13 +305,13 @@ static struct cmd_results *focus_output(struct sway_seat *seat,
                if (!parse_direction(identifier, &direction)) {
                        free(identifier);
                        return cmd_results_new(CMD_INVALID,
-                                "There is no output with that name");
+                                "There is no output with that name.");
                }
                struct sway_workspace *ws = seat_get_focused_workspace(seat);
                if (!ws) {
                        free(identifier);
                        return cmd_results_new(CMD_FAILURE,
-                                "No focused workspace to base directions off of");
+                                "No focused workspace to base directions off of.");
                }
                output = output_get_in_direction(ws->output, direction);
@@ -334,7 +339,7 @@ static struct cmd_results *focus_output(struct sway_seat *seat,
 static struct cmd_results *focus_parent(void) {
        struct sway_seat *seat = config->handler_context.seat;
        struct sway_container *con = config->handler_context.container;
-        if (!con || con->fullscreen_mode) {
+        if (!con || con->pending.fullscreen_mode) {
                return cmd_results_new(CMD_SUCCESS, NULL);
        }
        struct sway_node *parent = node_get_parent(&con->node);
@@ -370,13 +375,24 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
        struct sway_seat *seat = config->handler_context.seat;
        if (node->type < N_WORKSPACE) {
                return cmd_results_new(CMD_FAILURE,
-                        "Command 'focus' cannot be used above the workspace level");
+                        "Command 'focus' cannot be used above the workspace level.");
        }
-        if (argc == 0 && container) {
+        if (argc == 0) {
+                if (!container) {
+                        return cmd_results_new(CMD_FAILURE, "No container to focus was specified.");
+                }
                if (container_is_scratchpad_hidden_or_child(container)) {
                        root_scratchpad_show(container);
                }
+                // if we are switching to a container under a fullscreen window, we first
+                // need to exit fullscreen so that the newly focused container becomes visible
+                struct sway_container *obstructing = container_obstructing_fullscreen_container(container);
+                if (obstructing) {
+                        container_fullscreen_disable(obstructing);
+                        arrange_root();
+                }
                seat_set_focus_container(seat, container);
                seat_consider_warp_to_focus(seat);
                container_raise_floating(container);
@@ -439,7 +455,8 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
                return cmd_results_new(CMD_FAILURE, "");
        }
        struct sway_node *next_focus = NULL;
-        if (container_is_floating(container)) {
+        if (container_is_floating(container) &&
+                        container->pending.fullscreen_mode == FULLSCREEN_NONE) {
                next_focus = node_get_in_direction_floating(container, seat, direction);
        } else {
                next_focus = node_get_in_direction_tiling(container, seat, direction, descend);
diff --git a/sway/commands/font.c b/sway/commands/font.c
index c54365b5..9920d03e 100644
--- a/sway/commands/font.c
+++ b/sway/commands/font.c
@@ -1,9 +1,9 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "log.h"
 #include "stringop.h"
+#include <pango/pangocairo.h>
 struct cmd_results *cmd_font(int argc, char **argv) {
        struct cmd_results *error = NULL;
@@ -16,12 +16,34 @@ struct cmd_results *cmd_font(int argc, char **argv) {
        if (strncmp(font, "pango:", 6) == 0) {
                config->pango_markup = true;
                config->font = strdup(font + 6);
+                free(font);
        } else {
                config->pango_markup = false;
-                config->font = strdup(font);
+                config->font = font;
        }
-        free(font);
+        // Parse the font early so we can reject it if it's not valid for pango.
-        config_update_font_height(true);
+        // Also avoids re-parsing each time we render text.
+        PangoFontDescription *font_description = pango_font_description_from_string(config->font);
+        const char *family = pango_font_description_get_family(font_description);
+        if (family == NULL) {
+                pango_font_description_free(font_description);
+                return cmd_results_new(CMD_FAILURE, "Invalid font family.");
+        }
+        const gint size = pango_font_description_get_size(font_description);
+        if (size == 0) {
+                pango_font_description_free(font_description);
+                return cmd_results_new(CMD_FAILURE, "Invalid font size.");
+        }
+        if (config->font_description != NULL) {
+                pango_font_description_free(config->font_description);
+        }
+        config->font_description = font_description;
+        config_update_font_height();
        return cmd_results_new(CMD_SUCCESS, NULL);
 }
diff --git a/sway/commands/for_window.c b/sway/commands/for_window.c
index ee9f4647..905e6776 100644
--- a/sway/commands/for_window.c
+++ b/sway/commands/for_window.c
@@ -14,7 +14,7 @@ struct cmd_results *cmd_for_window(int argc, char **argv) {
        char *err_str = NULL;
        struct criteria *criteria = criteria_parse(argv[0], &err_str);
        if (!criteria) {
-                error = cmd_results_new(CMD_INVALID, err_str);
+                error = cmd_results_new(CMD_INVALID, "%s", err_str);
                free(err_str);
                return error;
        }
diff --git a/sway/commands/fullscreen.c b/sway/commands/fullscreen.c
index 3392a7f7..21c1e9a0 100644
--- a/sway/commands/fullscreen.c
+++ b/sway/commands/fullscreen.c
@@ -18,30 +18,19 @@ struct cmd_results *cmd_fullscreen(int argc, char **argv) {
                return cmd_results_new(CMD_FAILURE,
                                "Can't run this command while there's no outputs connected.");
        }
-        struct sway_node *node = config->handler_context.node;
        struct sway_container *container = config->handler_context.container;
-        struct sway_workspace *workspace = config->handler_context.workspace;
-        if (node->type == N_WORKSPACE && workspace->tiling->length == 0) {
-                return cmd_results_new(CMD_FAILURE,
-                                "Can't fullscreen an empty workspace");
-        }
-        // If in the scratchpad, operate on the highest container
+        if (!container) {
-        if (container && !container->workspace) {
+                // If the focus is not a container, do nothing successfully
-                while (container->parent) {
+                return cmd_results_new(CMD_SUCCESS, NULL);
-                        container = container->parent;
+        } 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 = false;
-        for (struct sway_container *curr = container; curr; curr = curr->parent) {
-                if (curr->fullscreen_mode != FULLSCREEN_NONE) {
-                        container = curr;
-                        is_fullscreen = true;
-                        break;
                }
        }
+        bool is_fullscreen = container->pending.fullscreen_mode != FULLSCREEN_NONE;
        bool global = false;
        bool enable = !is_fullscreen;
@@ -57,13 +46,6 @@ struct cmd_results *cmd_fullscreen(int argc, char **argv) {
                global = strcasecmp(argv[1], "global") == 0;
        }
-        if (enable && node->type == N_WORKSPACE) {
-                // Wrap the workspace's children in a container so we can fullscreen it
-                container = workspace_wrap_children(workspace);
-                workspace->layout = L_HORIZ;
-                seat_set_focus_container(config->handler_context.seat, container);
-        }
        enum sway_fullscreen_mode mode = FULLSCREEN_NONE;
        if (enable) {
                mode = global ? FULLSCREEN_GLOBAL : FULLSCREEN_WORKSPACE;
diff --git a/sway/commands/gaps.c b/sway/commands/gaps.c
index 021df843..1deeb56e 100644
--- a/sway/commands/gaps.c
+++ b/sway/commands/gaps.c
@@ -11,7 +11,8 @@
 enum gaps_op {
        GAPS_OP_SET,
        GAPS_OP_ADD,
-        GAPS_OP_SUBTRACT
+        GAPS_OP_SUBTRACT,
+        GAPS_OP_TOGGLE
 };
 struct gaps_data {
@@ -102,6 +103,9 @@ static void apply_gaps_op(int *prop, enum gaps_op op, int amount) {
        case GAPS_OP_SUBTRACT:
                *prop -= amount;
                break;
+        case GAPS_OP_TOGGLE:
+                *prop = *prop ? 0 : amount;
+                break;
        }
 }
@@ -133,9 +137,9 @@ static void configure_gaps(struct sway_workspace *ws, void *_data) {
 }
 // gaps inner|outer|horizontal|vertical|top|right|bottom|left current|all
-// set|plus|minus <px>
+// set|plus|minus|toggle <px>
 static const char expected_runtime[] = "'gaps inner|outer|horizontal|vertical|"
-        "top|right|bottom|left current|all set|plus|minus <px>'";
+        "top|right|bottom|left current|all set|plus|minus|toggle <px>'";
 static struct cmd_results *gaps_set_runtime(int argc, char **argv) {
        struct cmd_results *error = checkarg(argc, "gaps", EXPECTED_EQUAL_TO, 4);
        if (error) {
@@ -180,6 +184,8 @@ static struct cmd_results *gaps_set_runtime(int argc, char **argv) {
                data.operation = GAPS_OP_ADD;
        } else if (strcasecmp(argv[2], "minus") == 0) {
                data.operation = GAPS_OP_SUBTRACT;
+        } else if (strcasecmp(argv[2], "toggle") == 0) {
+                data.operation = GAPS_OP_TOGGLE;
        } else {
                return cmd_results_new(CMD_INVALID, "Expected %s", expected_runtime);
        }
@@ -200,7 +206,7 @@ static struct cmd_results *gaps_set_runtime(int argc, char **argv) {
 }
 // gaps inner|outer|<dir>|<side> <px> - sets defaults for workspaces
-// gaps inner|outer|<dir>|<side> current|all set|plus|minus <px> - runtime only
+// gaps inner|outer|<dir>|<side> current|all set|plus|minus|toggle <px> - runtime only
 // <dir> = horizontal|vertical
 // <side> = top|right|bottom|left
 struct cmd_results *cmd_gaps(int argc, char **argv) {
diff --git a/sway/commands/gesture.c b/sway/commands/gesture.c
new file mode 100644
index 00000000..90a20716
--- /dev/null
+++ b/sway/commands/gesture.c
@@ -0,0 +1,165 @@
+#include "sway/config.h"
+#include "gesture.h"
+#include "log.h"
+#include "stringop.h"
+#include "sway/commands.h"
+void free_gesture_binding(struct sway_gesture_binding *binding) {
+        if (!binding) {
+                return;
+        }
+        free(binding->input);
+        free(binding->command);
+        free(binding);
+}
+/**
+ * Returns true if the bindings have the same gesture type, direction, etc
+ */
+static bool binding_gesture_equal(struct sway_gesture_binding *binding_a,
+                                                                  struct sway_gesture_binding *binding_b) {
+        if (strcmp(binding_a->input, binding_b->input) != 0) {
+                return false;
+        }
+        if (!gesture_equal(&binding_a->gesture, &binding_b->gesture)) {
+                return false;
+        }
+        if ((binding_a->flags & BINDING_EXACT) !=
+                (binding_b->flags & BINDING_EXACT)) {
+                return false;
+        }
+        return true;
+}
+/**
+ * Add gesture binding to config
+ */
+static struct cmd_results *gesture_binding_add(
+                struct sway_gesture_binding *binding,
+                const char *gesturecombo, bool warn) {
+        list_t *mode_bindings = config->current_mode->gesture_bindings;
+        // overwrite the binding if it already exists
+        bool overwritten = false;
+        for (int i = 0; i < mode_bindings->length; ++i) {
+                struct sway_gesture_binding *config_binding = mode_bindings->items[i];
+                if (binding_gesture_equal(binding, config_binding)) {
+                        sway_log(SWAY_INFO, "Overwriting binding '%s' to `%s` from `%s`",
+                                        gesturecombo, binding->command, config_binding->command);
+                        if (warn) {
+                                config_add_swaynag_warning("Overwriting binding"
+                                                "'%s' to `%s` from `%s`",
+                                                gesturecombo, binding->command,
+                                                config_binding->command);
+                        }
+                        free_gesture_binding(config_binding);
+                        mode_bindings->items[i] = binding;
+                        overwritten = true;
+                }
+        }
+        if (!overwritten) {
+                list_add(mode_bindings, binding);
+                sway_log(SWAY_DEBUG, "bindgesture - Bound %s to command `%s`",
+                                gesturecombo, binding->command);
+        }
+        return cmd_results_new(CMD_SUCCESS, NULL);
+}
+/**
+ * Remove gesture binding from config
+ */
+static struct cmd_results *gesture_binding_remove(
+                struct sway_gesture_binding *binding, const char *gesturecombo) {
+        list_t *mode_bindings = config->current_mode->gesture_bindings;
+        for (int i = 0; i < mode_bindings->length; ++i) {
+                struct sway_gesture_binding *config_binding = mode_bindings->items[i];
+                if (binding_gesture_equal(binding, config_binding)) {
+                        free_gesture_binding(config_binding);
+                        free_gesture_binding(binding);
+                        list_del(mode_bindings, i);
+                        sway_log(SWAY_DEBUG, "unbindgesture - Unbound %s gesture",
+                                        gesturecombo);
+                        return cmd_results_new(CMD_SUCCESS, NULL);
+                }
+        }
+        free_gesture_binding(binding);
+        return cmd_results_new(CMD_FAILURE, "Could not find gesture binding `%s`",
+                        gesturecombo);
+}
+/**
+ * Parse and execute bindgesture or unbindgesture command.
+ */
+static struct cmd_results *cmd_bind_or_unbind_gesture(int argc, char **argv, bool unbind) {
+        int minargs = 2;
+        char *bindtype = "bindgesture";
+        if (unbind) {
+                minargs--;
+                bindtype = "unbindgesture";
+        }
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, bindtype, EXPECTED_AT_LEAST, minargs))) {
+                return error;
+        }
+        struct sway_gesture_binding *binding = calloc(1, sizeof(struct sway_gesture_binding));
+        if (!binding) {
+                return cmd_results_new(CMD_FAILURE, "Unable to allocate binding");
+        }
+        binding->input = strdup("*");
+        bool warn = true;
+        // Handle flags
+        while (argc > 0) {
+                if (strcmp("--exact", argv[0]) == 0) {
+                        binding->flags |= BINDING_EXACT;
+                } else if (strcmp("--no-warn", argv[0]) == 0) {
+                        warn = false;
+                } else if (strncmp("--input-device=", argv[0],
+                                        strlen("--input-device=")) == 0) {
+                        free(binding->input);
+                        binding->input = strdup(argv[0] + strlen("--input-device="));
+                } else {
+                        break;
+                }
+                argv++;
+                argc--;
+        }
+        if (argc < minargs) {
+                free(binding);
+                return cmd_results_new(CMD_FAILURE,
+                                "Invalid %s command (expected at least %d "
+                                "non-option arguments, got %d)", bindtype, minargs, argc);
+        }
+        char* errmsg = NULL;
+        if ((errmsg = gesture_parse(argv[0], &binding->gesture))) {
+                free(binding);
+                struct cmd_results *final = cmd_results_new(CMD_FAILURE,
+                                "Invalid %s command (%s)",
+                                bindtype, errmsg);
+                free(errmsg);
+                return final;
+        }
+        if (unbind) {
+                return gesture_binding_remove(binding, argv[0]);
+        }
+        binding->command = join_args(argv + 1, argc - 1);
+        return gesture_binding_add(binding, argv[0], warn);
+}
+struct cmd_results *cmd_bindgesture(int argc, char **argv) {
+        return cmd_bind_or_unbind_gesture(argc, argv, false);
+}
+struct cmd_results *cmd_unbindgesture(int argc, char **argv) {
+        return cmd_bind_or_unbind_gesture(argc, argv, true);
+}
diff --git a/sway/commands/hide_edge_borders.c b/sway/commands/hide_edge_borders.c
index 9a1d8445..43bd6dc8 100644
--- a/sway/commands/hide_edge_borders.c
+++ b/sway/commands/hide_edge_borders.c
@@ -20,7 +20,7 @@ struct cmd_results *cmd_hide_edge_borders(int argc, char **argv) {
        }
        if (!argc) {
-                return cmd_results_new(CMD_INVALID, expected_syntax);
+                return cmd_results_new(CMD_INVALID, "%s", expected_syntax);
        }
        if (strcmp(argv[0], "none") == 0) {
@@ -38,7 +38,7 @@ struct cmd_results *cmd_hide_edge_borders(int argc, char **argv) {
                config->hide_edge_borders = E_NONE;
                config->hide_edge_borders_smart = ESMART_NO_GAPS;
        } else {
-                return cmd_results_new(CMD_INVALID, expected_syntax);
+                return cmd_results_new(CMD_INVALID, "%s", expected_syntax);
        }
        config->hide_lone_tab = hide_lone_tab;
diff --git a/sway/commands/inhibit_idle.c b/sway/commands/inhibit_idle.c
index aebc2bf9..6125736a 100644
--- a/sway/commands/inhibit_idle.c
+++ b/sway/commands/inhibit_idle.c
@@ -41,7 +41,7 @@ struct cmd_results *cmd_inhibit_idle(int argc, char **argv) {
                        sway_idle_inhibit_v1_user_inhibitor_destroy(inhibitor);
                } else {
                        inhibitor->mode = mode;
-                        sway_idle_inhibit_v1_check_active(server.idle_inhibit_manager_v1);
+                        sway_idle_inhibit_v1_check_active();
                }
        } else if (!clear) {
                sway_idle_inhibit_v1_user_inhibitor_register(con->view, mode);
diff --git a/sway/commands/input.c b/sway/commands/input.c
index c9bb8e06..306c40f7 100644
--- a/sway/commands/input.c
+++ b/sway/commands/input.c
@@ -7,13 +7,14 @@
 #include "stringop.h"
 // must be in order for the bsearch
-static struct cmd_handler input_handlers[] = {
+static const struct cmd_handler input_handlers[] = {
        { "accel_profile", input_cmd_accel_profile },
        { "calibration_matrix", input_cmd_calibration_matrix },
        { "click_method", input_cmd_click_method },
        { "drag", input_cmd_drag },
        { "drag_lock", input_cmd_drag_lock },
        { "dwt", input_cmd_dwt },
+        { "dwtp", input_cmd_dwtp },
        { "events", input_cmd_events },
        { "left_handed", input_cmd_left_handed },
        { "map_from_region", input_cmd_map_from_region },
@@ -24,7 +25,9 @@ static struct cmd_handler input_handlers[] = {
        { "pointer_accel", input_cmd_pointer_accel },
        { "repeat_delay", input_cmd_repeat_delay },
        { "repeat_rate", input_cmd_repeat_rate },
+        { "rotation_angle", input_cmd_rotation_angle },
        { "scroll_button", input_cmd_scroll_button },
+        { "scroll_button_lock", input_cmd_scroll_button_lock },
        { "scroll_factor", input_cmd_scroll_factor },
        { "scroll_method", input_cmd_scroll_method },
        { "tap", input_cmd_tap },
@@ -40,7 +43,7 @@ static struct cmd_handler input_handlers[] = {
 };
 // must be in order for the bsearch
-static struct cmd_handler input_config_handlers[] = {
+static const struct cmd_handler input_config_handlers[] = {
        { "xkb_capslock", input_cmd_xkb_capslock },
        { "xkb_numlock", input_cmd_xkb_numlock },
 };
diff --git a/sway/commands/input/calibration_matrix.c b/sway/commands/input/calibration_matrix.c
index 38749fbb..53fe2c35 100644
--- a/sway/commands/input/calibration_matrix.c
+++ b/sway/commands/input/calibration_matrix.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include <strings.h>
 #include "sway/config.h"
diff --git a/sway/commands/input/dwtp.c b/sway/commands/input/dwtp.c
new file mode 100644
index 00000000..232e2b26
--- /dev/null
+++ b/sway/commands/input/dwtp.c
@@ -0,0 +1,25 @@
+#include <string.h>
+#include <strings.h>
+#include "sway/config.h"
+#include "sway/commands.h"
+#include "sway/input/input-manager.h"
+#include "util.h"
+struct cmd_results *input_cmd_dwtp(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "dwtp", EXPECTED_AT_LEAST, 1))) {
+                return error;
+        }
+        struct input_config *ic = config->handler_context.input_config;
+        if (!ic) {
+                return cmd_results_new(CMD_FAILURE, "No input device defined.");
+        }
+        if (parse_boolean(argv[0], true)) {
+                ic->dwtp = LIBINPUT_CONFIG_DWTP_ENABLED;
+        } else {
+                ic->dwtp = LIBINPUT_CONFIG_DWTP_DISABLED;
+        }
+        return cmd_results_new(CMD_SUCCESS, NULL);
+}
diff --git a/sway/commands/input/events.c b/sway/commands/input/events.c
index 9405181a..08d99bf0 100644
--- a/sway/commands/input/events.c
+++ b/sway/commands/input/events.c
@@ -1,14 +1,19 @@
 #include <limits.h>
 #include <string.h>
 #include <strings.h>
-#include <wlr/backend/libinput.h>
+#include <wlr/config.h>
 #include "sway/config.h"
 #include "sway/commands.h"
 #include "sway/input/input-manager.h"
 #include "log.h"
+#if WLR_HAS_LIBINPUT_BACKEND
+#include <wlr/backend/libinput.h>
+#endif
 static void toggle_supported_send_events_for_device(struct input_config *ic,
                struct sway_input_device *input_device) {
+#if WLR_HAS_LIBINPUT_BACKEND
        struct wlr_input_device *wlr_device = input_device->wlr_device;
        if (!wlr_input_device_is_libinput(wlr_device)) {
                return;
@@ -41,6 +46,7 @@ static void toggle_supported_send_events_for_device(struct input_config *ic,
        }
        ic->send_events = mode;
+#endif
 }
 static int mode_for_name(const char *name) {
@@ -56,6 +62,7 @@ static int mode_for_name(const char *name) {
 static void toggle_select_send_events_for_device(struct input_config *ic,
                struct sway_input_device *input_device, int argc, char **argv) {
+#if WLR_HAS_LIBINPUT_BACKEND
        if (!wlr_input_device_is_libinput(input_device->wlr_device)) {
                return;
        }
@@ -72,6 +79,7 @@ static void toggle_select_send_events_for_device(struct input_config *ic,
                }
        }
        ic->send_events = mode_for_name(argv[index % argc]);
+#endif
 }
 static void toggle_send_events(int argc, char **argv) {
diff --git a/sway/commands/input/map_from_region.c b/sway/commands/input/map_from_region.c
index de00b714..2f8f753d 100644
--- a/sway/commands/input/map_from_region.c
+++ b/sway/commands/input/map_from_region.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdbool.h>
 #include <string.h>
 #include <strings.h>
@@ -11,11 +10,21 @@ static bool parse_coords(const char *str, double *x, double *y, bool *mm) {
        *mm = false;
        char *end;
-        *x = strtod(str, &end);
-        if (end[0] != 'x') {
+        // Check for "0x" prefix to avoid strtod treating the string as hex
-                return false;
+        if (str[0] == '0' && str[1] == 'x') {
+                if (strlen(str) < 3) {
+                        return false;
+                }
+                *x = 0;
+                end = (char *)str + 2;
+        } else {
+                *x = strtod(str, &end);
+                if (end[0] != 'x') {
+                        return false;
+                }
+                ++end;
        }
-        ++end;
        *y = strtod(end, &end);
        if (end[0] == 'm') {
diff --git a/sway/commands/input/map_to_output.c b/sway/commands/input/map_to_output.c
index f60fb7d5..a7266baa 100644
--- a/sway/commands/input/map_to_output.c
+++ b/sway/commands/input/map_to_output.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include <strings.h>
 #include "sway/config.h"
diff --git a/sway/commands/input/map_to_region.c b/sway/commands/input/map_to_region.c
index e85495e5..9087c589 100644
--- a/sway/commands/input/map_to_region.c
+++ b/sway/commands/input/map_to_region.c
@@ -1,7 +1,5 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <string.h>
-#include <wlr/types/wlr_box.h>
 #include "sway/commands.h"
 #include "sway/config.h"
@@ -50,5 +48,5 @@ struct cmd_results *input_cmd_map_to_region(int argc, char **argv) {
 error:
        free(ic->mapped_to_region);
        ic->mapped_to_region = NULL;
-        return cmd_results_new(CMD_FAILURE, errstr);
+        return cmd_results_new(CMD_FAILURE, "%s", errstr);
 }
diff --git a/sway/commands/input/rotation_angle.c b/sway/commands/input/rotation_angle.c
new file mode 100644
index 00000000..5e278fff
--- /dev/null
+++ b/sway/commands/input/rotation_angle.c
@@ -0,0 +1,29 @@
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+#include "sway/config.h"
+#include "sway/commands.h"
+#include "sway/input/input-manager.h"
+#include "util.h"
+struct cmd_results *input_cmd_rotation_angle(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "rotation_angle", EXPECTED_AT_LEAST, 1))) {
+                return error;
+        }
+        struct input_config *ic = config->handler_context.input_config;
+        if (!ic) {
+                return cmd_results_new(CMD_FAILURE, "No input device defined.");
+        }
+        float rotation_angle = parse_float(argv[0]);
+        if (isnan(rotation_angle)) {
+                return cmd_results_new(CMD_INVALID,
+                        "Invalid rotation_angle; expected float.");
+        } if (rotation_angle < 0 || rotation_angle > 360) {
+                return cmd_results_new(CMD_INVALID, "Input out of range [0, 360)");
+        }
+        ic->rotation_angle = rotation_angle;
+        return cmd_results_new(CMD_SUCCESS, NULL);
+}
diff --git a/sway/commands/input/scroll_button.c b/sway/commands/input/scroll_button.c
index 6b331419..81f69a6d 100644
--- a/sway/commands/input/scroll_button.c
+++ b/sway/commands/input/scroll_button.c
@@ -21,7 +21,7 @@ struct cmd_results *input_cmd_scroll_button(int argc, char **argv) {
        char *message = NULL;
        uint32_t button = get_mouse_button(*argv, &message);
        if (message) {
-                error = cmd_results_new(CMD_INVALID, message);
+                error = cmd_results_new(CMD_INVALID, "%s", message);
                free(message);
                return error;
        } else if (button == SWAY_SCROLL_UP || button == SWAY_SCROLL_DOWN
diff --git a/sway/commands/input/scroll_button_lock.c b/sway/commands/input/scroll_button_lock.c
new file mode 100644
index 00000000..f96b6514
--- /dev/null
+++ b/sway/commands/input/scroll_button_lock.c
@@ -0,0 +1,26 @@
+#include <libinput.h>
+#include <string.h>
+#include <strings.h>
+#include "sway/config.h"
+#include "sway/commands.h"
+#include "sway/input/input-manager.h"
+#include "util.h"
+struct cmd_results *input_cmd_scroll_button_lock(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "scroll_button_lock", EXPECTED_AT_LEAST, 1))) {
+                return error;
+        }
+        struct input_config *ic = config->handler_context.input_config;
+        if (!ic) {
+                return cmd_results_new(CMD_FAILURE, "No input device defined.");
+        }
+        if (parse_boolean(argv[0], true)) {
+                ic->scroll_button_lock = LIBINPUT_CONFIG_SCROLL_BUTTON_LOCK_ENABLED;
+        } else {
+                ic->scroll_button_lock = LIBINPUT_CONFIG_SCROLL_BUTTON_LOCK_DISABLED;
+        }
+        return cmd_results_new(CMD_SUCCESS, NULL);
+}
diff --git a/sway/commands/input/xkb_file.c b/sway/commands/input/xkb_file.c
index 493f94fb..056f00e5 100644
--- a/sway/commands/input/xkb_file.c
+++ b/sway/commands/input/xkb_file.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <unistd.h>
 #include <errno.h>
 #include "sway/config.h"
diff --git a/sway/commands/input/xkb_layout.c b/sway/commands/input/xkb_layout.c
index 22626517..1d01886c 100644
--- a/sway/commands/input/xkb_layout.c
+++ b/sway/commands/input/xkb_layout.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include "sway/config.h"
 #include "sway/commands.h"
 #include "log.h"
diff --git a/sway/commands/input/xkb_model.c b/sway/commands/input/xkb_model.c
index f4a33de3..a9144a8a 100644
--- a/sway/commands/input/xkb_model.c
+++ b/sway/commands/input/xkb_model.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include "sway/config.h"
 #include "sway/commands.h"
 #include "log.h"
diff --git a/sway/commands/input/xkb_numlock.c b/sway/commands/input/xkb_numlock.c
index 87d3e60c..bbe848fe 100644
--- a/sway/commands/input/xkb_numlock.c
+++ b/sway/commands/input/xkb_numlock.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include "sway/config.h"
 #include "sway/commands.h"
 #include "util.h"
diff --git a/sway/commands/input/xkb_options.c b/sway/commands/input/xkb_options.c
index d609293f..7ca20777 100644
--- a/sway/commands/input/xkb_options.c
+++ b/sway/commands/input/xkb_options.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include "sway/config.h"
 #include "sway/commands.h"
 #include "log.h"
diff --git a/sway/commands/input/xkb_rules.c b/sway/commands/input/xkb_rules.c
index 3b59622c..8fbd26fb 100644
--- a/sway/commands/input/xkb_rules.c
+++ b/sway/commands/input/xkb_rules.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include "sway/config.h"
 #include "sway/commands.h"
 #include "log.h"
diff --git a/sway/commands/input/xkb_switch_layout.c b/sway/commands/input/xkb_switch_layout.c
index d6548a68..ecac8e6c 100644
--- a/sway/commands/input/xkb_switch_layout.c
+++ b/sway/commands/input/xkb_switch_layout.c
@@ -1,10 +1,15 @@
-#define _POSIX_C_SOURCE 200809L
 #include <assert.h>
+#include <wlr/interfaces/wlr_keyboard.h>
 #include "sway/config.h"
 #include "sway/commands.h"
 #include "sway/input/input-manager.h"
 #include "log.h"
+struct xkb_switch_layout_action {
+        struct wlr_keyboard *keyboard;
+        xkb_layout_index_t layout;
+};
 static void switch_layout(struct wlr_keyboard *kbd, xkb_layout_index_t idx) {
        xkb_layout_index_t num_layouts = xkb_keymap_num_layouts(kbd->keymap);
        if (idx >= num_layouts) {
@@ -28,10 +33,10 @@ static xkb_layout_index_t get_current_layout_index(struct wlr_keyboard *kbd) {
        return layout_idx;
 }
-static void switch_layout_relative(struct wlr_keyboard *kbd, int dir) {
+static xkb_layout_index_t get_layout_relative(struct wlr_keyboard *kbd, int dir) {
        xkb_layout_index_t num_layouts = xkb_keymap_num_layouts(kbd->keymap);
        xkb_layout_index_t idx = get_current_layout_index(kbd);
-        switch_layout(kbd, (idx + num_layouts + dir) % num_layouts);
+        return (idx + num_layouts + dir) % num_layouts;
 }
 struct cmd_results *input_cmd_xkb_switch_layout(int argc, char **argv) {
@@ -66,6 +71,18 @@ struct cmd_results *input_cmd_xkb_switch_layout(int argc, char **argv) {
                relative = 0;
        }
+        struct xkb_switch_layout_action *actions = calloc(
+                wl_list_length(&server.input->devices),
+                sizeof(struct xkb_switch_layout_action));
+        size_t actions_len = 0;
+        if (!actions) {
+                return cmd_results_new(CMD_FAILURE, "Unable to allocate actions");
+        }
+        /* Calculate new indexes first because switching a layout in one
+           keyboard may result in a change on other keyboards as well because
+           of keyboard groups. */
        struct sway_input_device *dev;
        wl_list_for_each(dev, &server.input->devices, link) {
                if (strcmp(ic->identifier, "*") != 0 &&
@@ -76,12 +93,22 @@ struct cmd_results *input_cmd_xkb_switch_layout(int argc, char **argv) {
                if (dev->wlr_device->type != WLR_INPUT_DEVICE_KEYBOARD) {
                        continue;
                }
+                struct xkb_switch_layout_action *action =
+                        &actions[actions_len++];
+                action->keyboard = wlr_keyboard_from_input_device(dev->wlr_device);
                if (relative) {
-                        switch_layout_relative(dev->wlr_device->keyboard, relative);
+                        action->layout = get_layout_relative(action->keyboard, relative);
                } else {
-                        switch_layout(dev->wlr_device->keyboard, layout);
+                        action->layout = layout;
                }
        }
+        for (size_t i = 0; i < actions_len; i++) {
+                switch_layout(actions[i].keyboard, actions[i].layout);
+        }
+        free(actions);
        return cmd_results_new(CMD_SUCCESS, NULL);
 }
diff --git a/sway/commands/input/xkb_variant.c b/sway/commands/input/xkb_variant.c
index d0e21d77..2d14ea9c 100644
--- a/sway/commands/input/xkb_variant.c
+++ b/sway/commands/input/xkb_variant.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include "sway/config.h"
 #include "sway/commands.h"
 #include "log.h"
diff --git a/sway/commands/layout.c b/sway/commands/layout.c
index f2af183b..12ce4839 100644
--- a/sway/commands/layout.c
+++ b/sway/commands/layout.c
@@ -133,7 +133,7 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
        // Operate on parent container, like i3.
        if (container) {
-                container = container->parent;
+                container = container->pending.parent;
        }
        // We could be working with a container OR a workspace. These are different
@@ -142,10 +142,10 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
        enum sway_container_layout new_layout = L_NONE;
        enum sway_container_layout old_layout = L_NONE;
        if (container) {
-                old_layout = container->layout;
+                old_layout = container->pending.layout;
                new_layout = get_layout(argc, argv,
-                                container->layout, container->prev_split_layout,
+                                container->pending.layout, container->prev_split_layout,
-                                container->workspace->output);
+                                container->pending.workspace->output);
        } else {
                old_layout = workspace->layout;
                new_layout = get_layout(argc, argv,
@@ -153,20 +153,20 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
                                workspace->output);
        }
        if (new_layout == L_NONE) {
-                return cmd_results_new(CMD_INVALID, expected_syntax);
+                return cmd_results_new(CMD_INVALID, "%s", expected_syntax);
        }
        if (new_layout != old_layout) {
                if (container) {
                        if (old_layout != L_TABBED && old_layout != L_STACKED) {
                                container->prev_split_layout = old_layout;
                        }
-                        container->layout = new_layout;
+                        container->pending.layout = new_layout;
                        container_update_representation(container);
                } else if (config->handler_context.container) {
                        // i3 avoids changing workspace layouts with a new container
                        // https://github.com/i3/i3/blob/3cd1c45eba6de073bc4300eebb4e1cc1a0c4479a/src/con.c#L1817
                        container = workspace_wrap_children(workspace);
-                        container->layout = new_layout;
+                        container->pending.layout = new_layout;
                        container_update_representation(container);
                } else {
                        if (old_layout != L_TABBED && old_layout != L_STACKED) {
diff --git a/sway/commands/mark.c b/sway/commands/mark.c
index aa5f185c..2bfc86b3 100644
--- a/sway/commands/mark.c
+++ b/sway/commands/mark.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "sway/config.h"
@@ -59,7 +58,7 @@ struct cmd_results *cmd_mark(int argc, char **argv) {
        }
        free(mark);
-        container_update_marks_textures(container);
+        container_update_marks(container);
        if (container->view) {
                view_execute_criteria(container->view);
        }
diff --git a/sway/commands/mode.c b/sway/commands/mode.c
index a5871dab..b3216967 100644
--- a/sway/commands/mode.c
+++ b/sway/commands/mode.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdbool.h>
 #include <string.h>
 #include "sway/commands.h"
@@ -9,12 +8,14 @@
 #include "stringop.h"
 // Must be in order for the bsearch
-static struct cmd_handler mode_handlers[] = {
+static const struct cmd_handler mode_handlers[] = {
        { "bindcode", cmd_bindcode },
+        { "bindgesture", cmd_bindgesture },
        { "bindswitch", cmd_bindswitch },
        { "bindsym", cmd_bindsym },
        { "set", cmd_set },
        { "unbindcode", cmd_unbindcode },
+        { "unbindgesture", cmd_unbindgesture },
        { "unbindswitch", cmd_unbindswitch },
        { "unbindsym", cmd_unbindsym },
 };
@@ -59,6 +60,7 @@ struct cmd_results *cmd_mode(int argc, char **argv) {
                mode->keycode_bindings = create_list();
                mode->mouse_bindings = create_list();
                mode->switch_bindings = create_list();
+                mode->gesture_bindings = create_list();
                mode->pango = pango;
                list_add(config->modes, mode);
        }
diff --git a/sway/commands/move.c b/sway/commands/move.c
index f8f89f18..8addf26e 100644
--- a/sway/commands/move.c
+++ b/sway/commands/move.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <ctype.h>
 #include <math.h>
 #include <stdbool.h>
@@ -113,8 +112,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 &&
+                if (destination->pending.parent == container->pending.parent &&
-                                destination->workspace == container->workspace) {
+                                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 +125,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) {
+                        if (destination->pending.parent) {
-                                container_insert_child(destination->parent, container, index);
+                                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 +167,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 +187,8 @@ static void container_move_to_workspace_from_direction(
                workspace_add_tiling(workspace, container);
                return;
        }
-        while (focus_inactive->parent) {
+        while (focus_inactive->pending.parent) {
-                focus_inactive = focus_inactive->parent;
+                focus_inactive = focus_inactive->pending.parent;
        }
        container_move_to_container_from_direction(container, focus_inactive,
                        move_dir);
@@ -197,25 +196,33 @@ static void container_move_to_workspace_from_direction(
 static void container_move_to_workspace(struct sway_container *container,
                struct sway_workspace *workspace) {
-        if (container->workspace == workspace) {
+        if (container->pending.workspace == workspace) {
                return;
        }
-        struct sway_workspace *old_workspace = container->workspace;
+        struct sway_workspace *old_workspace = container->pending.workspace;
        if (container_is_floating(container)) {
-                struct sway_output *old_output = container->workspace->output;
+                struct sway_output *old_output = container->pending.workspace->output;
                container_detach(container);
                workspace_add_floating(workspace, container);
                container_handle_fullscreen_reparent(container);
-                // If changing output, center it within the workspace
+                // If changing output, adjust the coordinates of the window.
-                if (old_output != workspace->output && !container->fullscreen_mode) {
+                if (old_output != workspace->output && !container->pending.fullscreen_mode) {
-                        container_floating_move_to_center(container);
+                        struct wlr_box workspace_box, old_workspace_box;
+                        workspace_get_box(workspace, &workspace_box);
+                        workspace_get_box(old_workspace, &old_workspace_box);
+                        floating_fix_coordinates(container, &old_workspace_box, &workspace_box);
+                        if (container->scratchpad && workspace->output) {
+                                struct wlr_box output_box;
+                                output_get_box(workspace->output, &output_box);
+                                container->transform = workspace_box;
+                        }
                }
        } else {
                container_detach(container);
-                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 +244,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 +263,12 @@ static void container_move_to_container(struct sway_container *container,
                ipc_event_window(container, "move");
        }
-        if (destination->workspace) {
+        if (destination->pending.workspace) {
-                workspace_focus_fullscreen(destination->workspace);
+                workspace_focus_fullscreen(destination->pending.workspace);
-                workspace_detect_urgent(destination->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 +282,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 +300,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 +324,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_wrap_children(current->pending.workspace);
-                                current->workspace->layout =
+                                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 +363,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 +384,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 &&
+        } else if (!wrapped && !container->pending.parent->pending.parent &&
-                        container->parent->children->length == 1) {
+                        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;
+                struct sway_container *old_parent = container->pending.parent;
-                if (ancestor->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 +434,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_container *old_parent = container->pending.parent;
-        struct sway_workspace *old_ws = container->workspace;
+        struct sway_workspace *old_ws = container->pending.workspace;
        struct sway_output *old_output = old_ws ? old_ws->output : NULL;
        struct sway_node *destination = NULL;
@@ -462,7 +469,7 @@ static struct cmd_results *cmd_move_container(bool no_auto_back_and_forth,
                        if (strcasecmp(argv[1], "number") == 0) {
                                // move [window|container] [to] "workspace number x"
                                if (argc < 3) {
-                                        return cmd_results_new(CMD_INVALID, expected_syntax);
+                                        return cmd_results_new(CMD_INVALID, "%s", expected_syntax);
                                }
                                if (!isdigit(argv[2][0])) {
                                        return cmd_results_new(CMD_INVALID,
@@ -508,7 +515,7 @@ static struct cmd_results *cmd_move_container(bool no_auto_back_and_forth,
                destination = dst ? &dst->node : &ws->node;
        } else if (strcasecmp(argv[0], "output") == 0) {
                struct sway_output *new_output = output_in_direction(argv[1],
-                                old_output, container->x, container->y);
+                                old_output, container->pending.x, container->pending.y);
                if (!new_output) {
                        return cmd_results_new(CMD_FAILURE,
                                "Can't find output with name/direction '%s'", argv[1]);
@@ -522,7 +529,7 @@ static struct cmd_results *cmd_move_container(bool no_auto_back_and_forth,
                }
                destination = &dest_con->node;
        } else {
-                return cmd_results_new(CMD_INVALID, expected_syntax);
+                return cmd_results_new(CMD_INVALID, "%s", expected_syntax);
        }
        if (destination->type == N_CONTAINER &&
@@ -686,6 +693,9 @@ static struct cmd_results *cmd_move_workspace(int argc, char **argv) {
        arrange_output(old_output);
        arrange_output(new_output);
+        struct sway_seat *seat = config->handler_context.seat;
+        seat_consider_warp_to_focus(seat);
        return cmd_results_new(CMD_SUCCESS, NULL);
 }
@@ -706,12 +716,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 lx = container->pending.x;
-                double ly = container->y;
+                double ly = container->pending.y;
                switch (direction) {
                case WLR_DIRECTION_LEFT:
                        lx -= move_amt;
@@ -729,8 +739,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_workspace *old_ws = container->pending.workspace;
-        struct sway_container *old_parent = container->parent;
+        struct sway_container *old_parent = container->pending.parent;
        if (!container_move_in_direction(container, direction)) {
                // Container didn't move
@@ -744,7 +754,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();
@@ -759,15 +769,6 @@ static struct cmd_results *cmd_move_in_direction(
                ipc_event_window(container, "move");
        }
-        // Hack to re-focus container
-        seat_set_raw_focus(config->handler_context.seat, &new_ws->node);
-        seat_set_focus_container(config->handler_context.seat, container);
-        if (old_ws != new_ws) {
-                ipc_event_workspace(old_ws, new_ws, "focus");
-                workspace_detect_urgent(old_ws);
-                workspace_detect_urgent(new_ws);
-        }
        container_end_mouse_operation(container);
        return cmd_results_new(CMD_SUCCESS, NULL);
@@ -781,22 +782,22 @@ static struct cmd_results *cmd_move_to_position_pointer(
        }
        struct wlr_cursor *cursor = seat->cursor->cursor;
        /* Determine where to put the window. */
-        double lx = cursor->x - container->width / 2;
+        double lx = cursor->x - container->pending.width / 2;
-        double ly = cursor->y - container->height / 2;
+        double ly = cursor->y - container->pending.height / 2;
        /* Correct target coordinates to be in bounds (on screen). */
        struct wlr_output *output = wlr_output_layout_output_at(
                        root->output_layout, cursor->x, cursor->y);
        if (output) {
-                struct wlr_box *box =
+                struct wlr_box box;
-                                wlr_output_layout_get_box(root->output_layout, output);
+                wlr_output_layout_get_box(root->output_layout, output, &box);
-                lx = fmax(lx, box->x);
+                lx = fmax(lx, box.x);
-                ly = fmax(ly, box->y);
+                ly = fmax(ly, box.y);
-                if (lx + container->width > box->x + box->width) {
+                if (lx + container->pending.width > box.x + box.width) {
-                        lx = box->x + box->width - container->width;
+                        lx = box.x + box.width - container->pending.width;
                }
-                if (ly + container->height > box->y + box->height) {
+                if (ly + container->pending.height > box.y + box.height) {
-                        ly = box->y + box->height - container->height;
+                        ly = box.y + box.height - container->pending.height;
                }
        }
@@ -818,7 +819,7 @@ static struct cmd_results *cmd_move_to_position(int argc, char **argv) {
        }
        if (!argc) {
-                return cmd_results_new(CMD_INVALID, expected_position_syntax);
+                return cmd_results_new(CMD_INVALID, "%s", expected_position_syntax);
        }
        bool absolute = false;
@@ -828,41 +829,41 @@ static struct cmd_results *cmd_move_to_position(int argc, char **argv) {
                ++argv;
        }
        if (!argc) {
-                return cmd_results_new(CMD_INVALID, expected_position_syntax);
+                return cmd_results_new(CMD_INVALID, "%s", expected_position_syntax);
        }
        if (strcmp(argv[0], "position") == 0) {
                --argc;
                ++argv;
        }
        if (!argc) {
-                return cmd_results_new(CMD_INVALID, expected_position_syntax);
+                return cmd_results_new(CMD_INVALID, "%s", expected_position_syntax);
        }
        if (strcmp(argv[0], "cursor") == 0 || strcmp(argv[0], "mouse") == 0 ||
                        strcmp(argv[0], "pointer") == 0) {
                if (absolute) {
-                        return cmd_results_new(CMD_INVALID, expected_position_syntax);
+                        return cmd_results_new(CMD_INVALID, "%s", expected_position_syntax);
                }
                return cmd_move_to_position_pointer(container);
        } else if (strcmp(argv[0], "center") == 0) {
                double lx, ly;
                if (absolute) {
-                        lx = root->x + (root->width - container->width) / 2;
+                        lx = root->x + (root->width - container->pending.width) / 2;
-                        ly = root->y + (root->height - container->height) / 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;
+                        lx = ws->x + (ws->width - container->pending.width) / 2;
-                        ly = ws->y + (ws->height - container->height) / 2;
+                        ly = ws->y + (ws->height - container->pending.height) / 2;
                }
                container_floating_move_to(container, lx, ly);
                return cmd_results_new(CMD_SUCCESS, NULL);
        }
        if (argc < 2) {
-                return cmd_results_new(CMD_FAILURE, expected_position_syntax);
+                return cmd_results_new(CMD_FAILURE, "%s", expected_position_syntax);
        }
        struct movement_amount lx = { .amount = 0, .unit = MOVEMENT_UNIT_INVALID };
@@ -874,19 +875,23 @@ static struct cmd_results *cmd_move_to_position(int argc, char **argv) {
                return cmd_results_new(CMD_INVALID, "Invalid x position specified");
        }
+        if (argc < 1) {
+                return cmd_results_new(CMD_FAILURE, "%s", expected_position_syntax);
+        }
        struct movement_amount ly = { .amount = 0, .unit = MOVEMENT_UNIT_INVALID };
        // Y direction
        num_consumed_args = parse_movement_amount(argc, argv, &ly);
        argc -= num_consumed_args;
        argv += num_consumed_args;
        if (argc > 0) {
-                return cmd_results_new(CMD_INVALID, expected_position_syntax);
+                return cmd_results_new(CMD_INVALID, "%s", expected_position_syntax);
        }
        if (ly.unit == MOVEMENT_UNIT_INVALID) {
                return cmd_results_new(CMD_INVALID, "Invalid y position specified");
        }
-        struct sway_workspace *ws = container->workspace;
+        struct sway_workspace *ws = container->pending.workspace;
        if (!ws) {
                struct sway_seat *seat = config->handler_context.seat;
                ws = seat_get_focused_workspace(seat);
@@ -960,14 +965,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) {
+                while (con->pending.parent) {
-                        con = con->parent;
+                        con = con->pending.parent;
                }
        }
        if (!con->scratchpad) {
                root_scratchpad_add_container(con, NULL);
-        } else if (con->workspace) {
+        } else if (con->pending.workspace) {
                root_scratchpad_hide(con);
        }
        return cmd_results_new(CMD_SUCCESS, NULL);
@@ -1026,13 +1031,13 @@ struct cmd_results *cmd_move(int argc, char **argv) {
        }
        if (!argc) {
-                return cmd_results_new(CMD_INVALID, expected_full_syntax);
+                return cmd_results_new(CMD_INVALID, "%s", expected_full_syntax);
        }
        // Only `move [window|container] [to] workspace` supports
        // `--no-auto-back-and-forth` so treat others as invalid syntax
        if (no_auto_back_and_forth && strcasecmp(argv[0], "workspace") != 0) {
-                return cmd_results_new(CMD_INVALID, expected_full_syntax);
+                return cmd_results_new(CMD_INVALID, "%s", expected_full_syntax);
        }
        if (strcasecmp(argv[0], "workspace") == 0 ||
@@ -1046,5 +1051,5 @@ struct cmd_results *cmd_move(int argc, char **argv) {
                        strcasecmp(argv[1], "position") == 0)) {
                return cmd_move_to_position(argc, argv);
        }
-        return cmd_results_new(CMD_INVALID, expected_full_syntax);
+        return cmd_results_new(CMD_INVALID, "%s", expected_full_syntax);
 }
diff --git a/sway/commands/no_focus.c b/sway/commands/no_focus.c
index 2001e04f..ccfdec82 100644
--- a/sway/commands/no_focus.c
+++ b/sway/commands/no_focus.c
@@ -13,7 +13,7 @@ struct cmd_results *cmd_no_focus(int argc, char **argv) {
        char *err_str = NULL;
        struct criteria *criteria = criteria_parse(argv[0], &err_str);
        if (!criteria) {
-                error = cmd_results_new(CMD_INVALID, err_str);
+                error = cmd_results_new(CMD_INVALID, "%s", err_str);
                free(err_str);
                return error;
        }
diff --git a/sway/commands/opacity.c b/sway/commands/opacity.c
index 96e6228e..610cecc6 100644
--- a/sway/commands/opacity.c
+++ b/sway/commands/opacity.c
@@ -37,6 +37,7 @@ struct cmd_results *cmd_opacity(int argc, char **argv) {
        }
        con->alpha = val;
-        container_damage_whole(con);
+        container_update(con);
        return cmd_results_new(CMD_SUCCESS, NULL);
 }
diff --git a/sway/commands/output.c b/sway/commands/output.c
index 5186a2ba..5e5d31b3 100644
--- a/sway/commands/output.c
+++ b/sway/commands/output.c
@@ -6,7 +6,7 @@
 #include "log.h"
 // must be in order for the bsearch
-static struct cmd_handler output_handlers[] = {
+static const struct cmd_handler output_handlers[] = {
        { "adaptive_sync", output_cmd_adaptive_sync },
        { "background", output_cmd_background },
        { "bg", output_cmd_background },
@@ -15,8 +15,11 @@ static struct cmd_handler output_handlers[] = {
        { "enable", output_cmd_enable },
        { "max_render_time", output_cmd_max_render_time },
        { "mode", output_cmd_mode },
+        { "modeline", output_cmd_modeline },
        { "pos", output_cmd_position },
        { "position", output_cmd_position },
+        { "power", output_cmd_power },
+        { "render_bit_depth", output_cmd_render_bit_depth },
        { "res", output_cmd_mode },
        { "resolution", output_cmd_mode },
        { "scale", output_cmd_scale },
@@ -24,6 +27,7 @@ static struct cmd_handler output_handlers[] = {
        { "subpixel", output_cmd_subpixel },
        { "toggle", output_cmd_toggle },
        { "transform", output_cmd_transform },
+        { "unplug", output_cmd_unplug },
 };
 struct cmd_results *cmd_output(int argc, char **argv) {
@@ -32,9 +36,9 @@ struct cmd_results *cmd_output(int argc, char **argv) {
                return error;
        }
-        // The NOOP-1 output is a dummy output used when there's no outputs
+        // The HEADLESS-1 output is a dummy output used when there's no outputs
        // connected. It should never be configured.
-        if (strcasecmp(argv[0], root->noop_output->wlr_output->name) == 0) {
+        if (strcasecmp(argv[0], root->fallback_output->wlr_output->name) == 0) {
                return cmd_results_new(CMD_FAILURE,
                                "Refusing to configure the no op output");
        }
@@ -51,7 +55,7 @@ struct cmd_results *cmd_output(int argc, char **argv) {
                if (!sway_output) {
                        return cmd_results_new(CMD_FAILURE, "Unknown output");
                }
-                if (sway_output == root->noop_output) {
+                if (sway_output == root->fallback_output) {
                        return cmd_results_new(CMD_FAILURE,
                                        "Refusing to configure the no op output");
                }
@@ -99,15 +103,18 @@ struct cmd_results *cmd_output(int argc, char **argv) {
        bool background = output->background;
-        output = store_output_config(output);
+        store_output_config(output);
        // If reloading, the output configs will be applied after reading the
        // entire config and before the deferred commands so that an auto generated
        // workspace name is not given to re-enabled outputs.
        if (!config->reloading && !config->validating) {
-                apply_output_config_to_outputs(output);
+                apply_all_output_configs();
                if (background) {
-                        spawn_swaybg();
+                        if (!spawn_swaybg()) {
+                                return cmd_results_new(CMD_FAILURE,
+                                        "Failed to apply background configuration");
+                        }
                }
        }
diff --git a/sway/commands/output/background.c b/sway/commands/output/background.c
index 68ee9fe1..55bd7671 100644
--- a/sway/commands/output/background.c
+++ b/sway/commands/output/background.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <libgen.h>
 #include <stdio.h>
 #include <string.h>
@@ -102,19 +101,19 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
                        }
                        char *conf_path = dirname(conf);
-                        char *rel_path = src;
+                        char *real_src = malloc(strlen(conf_path) + strlen(src) + 2);
-                        src = malloc(strlen(conf_path) + strlen(src) + 2);
+                        if (!real_src) {
-                        if (!src) {
+                                free(src);
-                                free(rel_path);
                                free(conf);
                                sway_log(SWAY_ERROR, "Unable to allocate memory");
                                return cmd_results_new(CMD_FAILURE,
                                                "Unable to allocate resources");
                        }
-                        sprintf(src, "%s/%s", conf_path, rel_path);
+                        snprintf(real_src, strlen(conf_path) + strlen(src) + 2, "%s/%s", conf_path, src);
-                        free(rel_path);
+                        free(src);
                        free(conf);
+                        src = real_src;
                }
                bool can_access = access(src, F_OK) != -1;
@@ -123,7 +122,10 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
                                        src);
                        config_add_swaynag_warning("Unable to access background file '%s'",
                                        src);
+                        struct cmd_results *result = cmd_results_new(CMD_FAILURE,
+                                        "unable to access background file '%s'", src);
                        free(src);
+                        return result;
                } else {
                        output->background = src;
                        output->background_option = strdup(mode);
diff --git a/sway/commands/output/dpms.c b/sway/commands/output/dpms.c
index 9d75a80e..c7adbd58 100644
--- a/sway/commands/output/dpms.c
+++ b/sway/commands/output/dpms.c
@@ -1,22 +1,8 @@
+#include "log.h"
 #include "sway/commands.h"
-#include "sway/config.h"
-#include "util.h"
 struct cmd_results *output_cmd_dpms(int argc, char **argv) {
-        if (!config->handler_context.output_config) {
+        sway_log(SWAY_INFO, "The \"output dpms\" command is deprecated, "
-                return cmd_results_new(CMD_FAILURE, "Missing output config");
+                "use \"output power\" instead");
-        }
+        return output_cmd_power(argc, argv);
-        if (!argc) {
-                return cmd_results_new(CMD_INVALID, "Missing dpms argument.");
-        }
-        if (parse_boolean(argv[0], true)) {
-                config->handler_context.output_config->dpms_state = DPMS_ON;
-        } else {
-                config->handler_context.output_config->dpms_state = DPMS_OFF;
-        }
-        config->handler_context.leftovers.argc = argc - 1;
-        config->handler_context.leftovers.argv = argv + 1;
-        return NULL;
 }
diff --git a/sway/commands/output/mode.c b/sway/commands/output/mode.c
index 5b710713..019d625a 100644
--- a/sway/commands/output/mode.c
+++ b/sway/commands/output/mode.c
@@ -20,6 +20,9 @@ struct cmd_results *output_cmd_mode(int argc, char **argv) {
                output->custom_mode = 0;
        }
+        // Reset custom modeline, if any
+        output->drm_mode.type = 0;
        char *end;
        output->width = strtol(*argv, &end, 10);
        if (*end) {
@@ -58,3 +61,58 @@ struct cmd_results *output_cmd_mode(int argc, char **argv) {
        return NULL;
 }
+static bool parse_modeline(char **argv, drmModeModeInfo *mode) {
+        mode->type = DRM_MODE_TYPE_USERDEF;
+        mode->clock = strtof(argv[0], NULL) * 1000;
+        mode->hdisplay = strtol(argv[1], NULL, 10);
+        mode->hsync_start = strtol(argv[2], NULL, 10);
+        mode->hsync_end = strtol(argv[3], NULL, 10);
+        mode->htotal = strtol(argv[4], NULL, 10);
+        mode->vdisplay = strtol(argv[5], NULL, 10);
+        mode->vsync_start = strtol(argv[6], NULL, 10);
+        mode->vsync_end = strtol(argv[7], NULL, 10);
+        mode->vtotal = strtol(argv[8], NULL, 10);
+        mode->vrefresh = mode->clock * 1000.0 * 1000.0
+                / mode->htotal / mode->vtotal;
+        if (strcasecmp(argv[9], "+hsync") == 0) {
+                mode->flags |= DRM_MODE_FLAG_PHSYNC;
+        } else if (strcasecmp(argv[9], "-hsync") == 0) {
+                mode->flags |= DRM_MODE_FLAG_NHSYNC;
+        } else {
+                return false;
+        }
+        if (strcasecmp(argv[10], "+vsync") == 0) {
+                mode->flags |= DRM_MODE_FLAG_PVSYNC;
+        } else if (strcasecmp(argv[10], "-vsync") == 0) {
+                mode->flags |= DRM_MODE_FLAG_NVSYNC;
+        } else {
+                return false;
+        }
+        snprintf(mode->name, sizeof(mode->name), "%dx%d@%d",
+                 mode->hdisplay, mode->vdisplay, mode->vrefresh / 1000);
+        return true;
+}
+struct cmd_results *output_cmd_modeline(int argc, char **argv) {
+        if (!config->handler_context.output_config) {
+                return cmd_results_new(CMD_FAILURE, "Missing output config");
+        }
+        if (!argc) {
+                return cmd_results_new(CMD_INVALID, "Missing modeline argument.");
+        }
+        struct output_config *output = config->handler_context.output_config;
+        if (argc != 11 || !parse_modeline(argv, &output->drm_mode)) {
+                return cmd_results_new(CMD_INVALID, "Invalid modeline");
+        }
+        config->handler_context.leftovers.argc = argc - 12;
+        config->handler_context.leftovers.argv = argv + 12;
+        return NULL;
+}
diff --git a/sway/commands/output/power.c b/sway/commands/output/power.c
new file mode 100644
index 00000000..e6ae2852
--- /dev/null
+++ b/sway/commands/output/power.c
@@ -0,0 +1,43 @@
+#include <strings.h>
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/output.h"
+#include "util.h"
+struct cmd_results *output_cmd_power(int argc, char **argv) {
+        if (!config->handler_context.output_config) {
+                return cmd_results_new(CMD_FAILURE, "Missing output config");
+        }
+        if (argc == 0) {
+                return cmd_results_new(CMD_INVALID, "Missing power argument");
+        }
+        bool current = true;
+        if (strcasecmp(argv[0], "toggle") == 0) {
+                const char *oc_name = config->handler_context.output_config->name;
+                if (strcmp(oc_name, "*") == 0) {
+                        return cmd_results_new(CMD_INVALID,
+                                "Cannot apply toggle to all outputs");
+                }
+                struct sway_output *sway_output = all_output_by_name_or_id(oc_name);
+                if (!sway_output || !sway_output->wlr_output) {
+                        return cmd_results_new(CMD_FAILURE,
+                                "Cannot apply toggle to unknown output %s", oc_name);
+                }
+                if (sway_output->enabled && !sway_output->wlr_output->enabled) {
+                        current = false;
+                }
+        }
+        if (parse_boolean(argv[0], current)) {
+                config->handler_context.output_config->power = 1;
+        } else {
+                config->handler_context.output_config->power = 0;
+        }
+        config->handler_context.leftovers.argc = argc - 1;
+        config->handler_context.leftovers.argv = argv + 1;
+        return NULL;
+}
diff --git a/sway/commands/output/render_bit_depth.c b/sway/commands/output/render_bit_depth.c
new file mode 100644
index 00000000..c419321e
--- /dev/null
+++ b/sway/commands/output/render_bit_depth.c
@@ -0,0 +1,29 @@
+#include <drm_fourcc.h>
+#include <strings.h>
+#include "sway/commands.h"
+#include "sway/config.h"
+struct cmd_results *output_cmd_render_bit_depth(int argc, char **argv) {
+        if (!config->handler_context.output_config) {
+                return cmd_results_new(CMD_FAILURE, "Missing output config");
+        }
+        if (!argc) {
+                return cmd_results_new(CMD_INVALID, "Missing bit depth argument.");
+        }
+        if (strcmp(*argv, "8") == 0) {
+                config->handler_context.output_config->render_bit_depth =
+                        RENDER_BIT_DEPTH_8;
+        } else if (strcmp(*argv, "10") == 0) {
+                config->handler_context.output_config->render_bit_depth =
+                        RENDER_BIT_DEPTH_10;
+        } else {
+                return cmd_results_new(CMD_INVALID,
+                        "Invalid bit depth. Must be a value in (8|10).");
+        }
+        config->handler_context.leftovers.argc = argc - 1;
+        config->handler_context.leftovers.argv = argv + 1;
+        return NULL;
+}
diff --git a/sway/commands/output/toggle.c b/sway/commands/output/toggle.c
index 6342d526..c6b72845 100644
--- a/sway/commands/output/toggle.c
+++ b/sway/commands/output/toggle.c
@@ -29,7 +29,7 @@ struct cmd_results *output_cmd_toggle(int argc, char **argv) {
                config->handler_context.output_config->enabled = 1;
        }
-        free(oc);
+        free_output_config(oc);
        config->handler_context.leftovers.argc = argc;
        config->handler_context.leftovers.argv = argv;
        return NULL;
diff --git a/sway/commands/output/transform.c b/sway/commands/output/transform.c
index f4fcc8c9..8db71bb3 100644
--- a/sway/commands/output/transform.c
+++ b/sway/commands/output/transform.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <wlr/util/transform.h>
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "log.h"
diff --git a/sway/commands/output/unplug.c b/sway/commands/output/unplug.c
new file mode 100644
index 00000000..dfef626f
--- /dev/null
+++ b/sway/commands/output/unplug.c
@@ -0,0 +1,54 @@
+#include <strings.h>
+#include <wlr/config.h>
+#include <wlr/backend/headless.h>
+#include <wlr/backend/wayland.h>
+#if WLR_HAS_X11_BACKEND
+#include <wlr/backend/x11.h>
+#endif
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/output.h"
+static bool is_backend_allowed(struct wlr_backend *backend) {
+        if (wlr_backend_is_headless(backend)) {
+                return true;
+        }
+        if (wlr_backend_is_wl(backend)) {
+                return true;
+        }
+#if WLR_HAS_X11_BACKEND
+        if (wlr_backend_is_x11(backend)) {
+                return true;
+        }
+#endif
+        return false;
+}
+/**
+ * This command is intended for developer use only.
+ */
+struct cmd_results *output_cmd_unplug(int argc, char **argv) {
+        if (!config->handler_context.output_config) {
+                return cmd_results_new(CMD_FAILURE, "Missing output config");
+        }
+        const char *oc_name = config->handler_context.output_config->name;
+        if (strcmp(oc_name, "*") == 0) {
+                return cmd_results_new(CMD_INVALID, "Won't unplug all outputs");
+        }
+        struct sway_output *sway_output = all_output_by_name_or_id(oc_name);
+        if (!sway_output) {
+                return cmd_results_new(CMD_INVALID,
+                        "Cannot unplug unknown output %s", oc_name);
+        }
+        if (!is_backend_allowed(sway_output->wlr_output->backend)) {
+                return cmd_results_new(CMD_INVALID,
+                        "Can only unplug outputs with headless, wayland or x11 backend");
+        }
+        wlr_output_destroy(sway_output->wlr_output);
+        return cmd_results_new(CMD_SUCCESS, NULL);
+}
diff --git a/sway/commands/primary_selection.c b/sway/commands/primary_selection.c
new file mode 100644
index 00000000..9e2689c2
--- /dev/null
+++ b/sway/commands/primary_selection.c
@@ -0,0 +1,25 @@
+#include <string.h>
+#include <strings.h>
+#include "sway/config.h"
+#include "sway/commands.h"
+#include "util.h"
+struct cmd_results *cmd_primary_selection(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "primary_selection", EXPECTED_EQUAL_TO, 1))) {
+                return error;
+        }
+        bool primary_selection = parse_boolean(argv[0], true);
+        // config->primary_selection is reset to the previous value on reload in
+        // load_main_config()
+        if (config->reloading && config->primary_selection != primary_selection) {
+                return cmd_results_new(CMD_FAILURE,
+                                "primary_selection can only be enabled/disabled at launch");
+        }
+        config->primary_selection = primary_selection;
+        return cmd_results_new(CMD_SUCCESS, NULL);
+}
diff --git a/sway/commands/reload.c b/sway/commands/reload.c
index 3c994d54..6c0aac26 100644
--- a/sway/commands/reload.c
+++ b/sway/commands/reload.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "sway/config.h"
@@ -9,9 +8,8 @@
 #include "list.h"
 #include "log.h"
-static void rebuild_textures_iterator(struct sway_container *con, void *data) {
+static void title_bar_update_iterator(struct sway_container *con, void *data) {
-        container_update_marks_textures(con);
+        container_update_title_bar(con);
-        container_update_title_textures(con);
 }
 static void do_reload(void *data) {
@@ -48,8 +46,7 @@ static void do_reload(void *data) {
        }
        list_free_items_and_destroy(bar_ids);
-        config_update_font_height(true);
+        root_for_each_container(title_bar_update_iterator, NULL);
-        root_for_each_container(rebuild_textures_iterator, NULL);
        arrange_root();
 }
diff --git a/sway/commands/rename.c b/sway/commands/rename.c
index 3b855fdf..0d36cc21 100644
--- a/sway/commands/rename.c
+++ b/sway/commands/rename.c
@@ -7,6 +7,7 @@
 #include "sway/config.h"
 #include "sway/ipc-server.h"
 #include "sway/output.h"
+#include "sway/desktop/launcher.h"
 #include "sway/tree/container.h"
 #include "sway/tree/workspace.h"
 #include "sway/tree/root.h"
@@ -25,7 +26,7 @@ struct cmd_results *cmd_rename(int argc, char **argv) {
                                "Can't run this command while there's no outputs connected.");
        }
        if (strcasecmp(argv[0], "workspace") != 0) {
-                return cmd_results_new(CMD_INVALID, expected_syntax);
+                return cmd_results_new(CMD_INVALID, "%s", expected_syntax);
        }
        int argn = 1;
@@ -64,7 +65,7 @@ struct cmd_results *cmd_rename(int argc, char **argv) {
        ++argn; // move past "to"
        if (argn >= argc) {
-                return cmd_results_new(CMD_INVALID, expected_syntax);
+                return cmd_results_new(CMD_INVALID, "%s", expected_syntax);
        }
        char *new_name = join_args(argv + argn, argc - argn);
@@ -91,8 +92,6 @@ struct cmd_results *cmd_rename(int argc, char **argv) {
        sway_log(SWAY_DEBUG, "renaming workspace '%s' to '%s'", workspace->name, new_name);
-        root_rename_pid_workspaces(workspace->name, new_name);
        free(workspace->name);
        workspace->name = new_name;
diff --git a/sway/commands/resize.c b/sway/commands/resize.c
index ca36e858..32b746ea 100644
--- a/sway/commands/resize.c
+++ b/sway/commands/resize.c
@@ -57,7 +57,7 @@ struct sway_container *container_find_resize_parent(struct sway_container *con,
                                (allow_last || index < siblings->length - 1)) {
                        return con;
                }
-                con = con->parent;
+                con = con->pending.parent;
        }
        return NULL;
@@ -75,6 +75,10 @@ void container_resize_tiled(struct sway_container *con,
                return;
        }
+        if (container_is_scratchpad_hidden_or_child(con)) {
+                return;
+        }
        // For HORIZONTAL or VERTICAL, we are growing in two directions so select
        // both adjacent siblings. For RIGHT or DOWN, just select the next sibling.
        // For LEFT or UP, convert it to a RIGHT or DOWN resize and reassign con to
@@ -115,13 +119,13 @@ void container_resize_tiled(struct sway_container *con,
        int sibling_amount = prev ? ceil((double)amount / 2.0) : amount;
        if (is_horizontal(axis)) {
-                if (con->width + amount < MIN_SANE_W) {
+                if (con->pending.width + amount < MIN_SANE_W) {
                        return;
                }
-                if (next->width - sibling_amount < MIN_SANE_W) {
+                if (next->pending.width - sibling_amount < MIN_SANE_W) {
                        return;
                }
-                if (prev && prev->width - sibling_amount < MIN_SANE_W) {
+                if (prev && prev->pending.width - sibling_amount < MIN_SANE_W) {
                        return;
                }
                if (con->child_total_width <= 0) {
@@ -133,7 +137,7 @@ void container_resize_tiled(struct sway_container *con,
                list_t *siblings = container_get_siblings(con);
                for (int i = 0; i < siblings->length; ++i) {
                        struct sway_container *con = siblings->items[i];
-                        con->width_fraction = con->width / con->child_total_width;
+                        con->width_fraction = con->pending.width / con->child_total_width;
                }
                double amount_fraction = (double)amount / con->child_total_width;
@@ -146,13 +150,13 @@ void container_resize_tiled(struct sway_container *con,
                        prev->width_fraction -= sibling_amount_fraction;
                }
        } else {
-                if (con->height + amount < MIN_SANE_H) {
+                if (con->pending.height + amount < MIN_SANE_H) {
                        return;
                }
-                if (next->height - sibling_amount < MIN_SANE_H) {
+                if (next->pending.height - sibling_amount < MIN_SANE_H) {
                        return;
                }
-                if (prev && prev->height - sibling_amount < MIN_SANE_H) {
+                if (prev && prev->pending.height - sibling_amount < MIN_SANE_H) {
                        return;
                }
                if (con->child_total_height <= 0) {
@@ -164,7 +168,7 @@ void container_resize_tiled(struct sway_container *con,
                list_t *siblings = container_get_siblings(con);
                for (int i = 0; i < siblings->length; ++i) {
                        struct sway_container *con = siblings->items[i];
-                        con->height_fraction = con->height / con->child_total_height;
+                        con->height_fraction = con->pending.height / con->child_total_height;
                }
                double amount_fraction = (double)amount / con->child_total_height;
@@ -178,10 +182,10 @@ void container_resize_tiled(struct sway_container *con,
                }
        }
-        if (con->parent) {
+        if (con->pending.parent) {
-                arrange_container(con->parent);
+                arrange_container(con->pending.parent);
        } else {
-                arrange_workspace(con->workspace);
+                arrange_workspace(con->pending.workspace);
        }
 }
@@ -203,15 +207,15 @@ static struct cmd_results *resize_adjust_floating(uint32_t axis,
        int min_width, max_width, min_height, max_height;
        floating_calculate_constraints(&min_width, &max_width,
                        &min_height, &max_height);
-        if (con->width + grow_width < min_width) {
+        if (con->pending.width + grow_width < min_width) {
-                grow_width = min_width - con->width;
+                grow_width = min_width - con->pending.width;
-        } else if (con->width + grow_width > max_width) {
+        } else if (con->pending.width + grow_width > max_width) {
-                grow_width = max_width - con->width;
+                grow_width = max_width - con->pending.width;
        }
-        if (con->height + grow_height < min_height) {
+        if (con->pending.height + grow_height < min_height) {
-                grow_height = min_height - con->height;
+                grow_height = min_height - con->pending.height;
-        } else if (con->height + grow_height > max_height) {
+        } else if (con->pending.height + grow_height > max_height) {
-                grow_height = max_height - con->height;
+                grow_height = max_height - con->pending.height;
        }
        int grow_x = 0, grow_y = 0;
@@ -227,15 +231,15 @@ static struct cmd_results *resize_adjust_floating(uint32_t axis,
        if (grow_width == 0 && grow_height == 0) {
                return cmd_results_new(CMD_INVALID, "Cannot resize any further");
        }
-        con->x += grow_x;
+        con->pending.x += grow_x;
-        con->y += grow_y;
+        con->pending.y += grow_y;
-        con->width += grow_width;
+        con->pending.width += grow_width;
-        con->height += grow_height;
+        con->pending.height += grow_height;
-        con->content_x += grow_x;
+        con->pending.content_x += grow_x;
-        con->content_y += grow_y;
+        con->pending.content_y += grow_y;
-        con->content_width += grow_width;
+        con->pending.content_width += grow_width;
-        con->content_height += grow_height;
+        con->pending.content_height += grow_height;
        arrange_container(con);
@@ -249,16 +253,35 @@ static struct cmd_results *resize_adjust_tiled(uint32_t axis,
                struct movement_amount *amount) {
        struct sway_container *current = config->handler_context.container;
+        if (container_is_scratchpad_hidden_or_child(current)) {
+                return cmd_results_new(CMD_FAILURE, "Cannot resize a hidden scratchpad container");
+        }
        if (amount->unit == MOVEMENT_UNIT_DEFAULT) {
                amount->unit = MOVEMENT_UNIT_PPT;
        }
        if (amount->unit == MOVEMENT_UNIT_PPT) {
+        struct sway_container *parent = current->pending.parent;
                float pct = amount->amount / 100.0f;
                if (is_horizontal(axis)) {
-                        amount->amount = (float)current->width * pct;
+            while (parent && parent->pending.layout != L_HORIZ) {
+                parent = parent->pending.parent;
+            }
+            if (parent) {
+                amount->amount = (float)parent->pending.width * pct;
+            } else {
+                amount->amount = (float)current->pending.workspace->width * pct;
+            }
                } else {
-                        amount->amount = (float)current->height * pct;
+            while (parent && parent->pending.layout != L_VERT) {
+                parent = parent->pending.parent;
+            }
+            if (parent) {
+                amount->amount = (float)parent->pending.height * pct;
+            } else {
+                amount->amount = (float)current->pending.workspace->height * pct;
+            }
                }
        }
@@ -277,24 +300,29 @@ static struct cmd_results *resize_adjust_tiled(uint32_t axis,
 */
 static struct cmd_results *resize_set_tiled(struct sway_container *con,
                struct movement_amount *width, struct movement_amount *height) {
+        if (container_is_scratchpad_hidden_or_child(con)) {
+                return cmd_results_new(CMD_FAILURE, "Cannot resize a hidden scratchpad container");
+        }
        if (width->amount) {
                if (width->unit == MOVEMENT_UNIT_PPT ||
                                width->unit == MOVEMENT_UNIT_DEFAULT) {
                        // Convert to px
-                        struct sway_container *parent = con->parent;
+                        struct sway_container *parent = con->pending.parent;
-                        while (parent && parent->layout != L_HORIZ) {
+                        while (parent && parent->pending.layout != L_HORIZ) {
-                                parent = parent->parent;
+                                parent = parent->pending.parent;
                        }
                        if (parent) {
-                                width->amount = parent->width * width->amount / 100;
+                                width->amount = parent->pending.width * width->amount / 100;
                        } else {
-                                width->amount = con->workspace->width * width->amount / 100;
+                                width->amount = con->pending.workspace->width * width->amount / 100;
                        }
                        width->unit = MOVEMENT_UNIT_PX;
                }
                if (width->unit == MOVEMENT_UNIT_PX) {
                        container_resize_tiled(con, AXIS_HORIZONTAL,
-                                        width->amount - con->width);
+                                        width->amount - con->pending.width);
                }
        }
@@ -302,20 +330,20 @@ static struct cmd_results *resize_set_tiled(struct sway_container *con,
                if (height->unit == MOVEMENT_UNIT_PPT ||
                                height->unit == MOVEMENT_UNIT_DEFAULT) {
                        // Convert to px
-                        struct sway_container *parent = con->parent;
+                        struct sway_container *parent = con->pending.parent;
-                        while (parent && parent->layout != L_VERT) {
+                        while (parent && parent->pending.layout != L_VERT) {
-                                parent = parent->parent;
+                                parent = parent->pending.parent;
                        }
                        if (parent) {
-                                height->amount = parent->height * height->amount / 100;
+                                height->amount = parent->pending.height * height->amount / 100;
                        } else {
-                                height->amount = con->workspace->height * height->amount / 100;
+                                height->amount = con->pending.workspace->height * height->amount / 100;
                        }
                        height->unit = MOVEMENT_UNIT_PX;
                }
                if (height->unit == MOVEMENT_UNIT_PX) {
                        container_resize_tiled(con, AXIS_VERTICAL,
-                                        height->amount - con->height);
+                                        height->amount - con->pending.height);
                }
        }
@@ -339,15 +367,15 @@ static struct cmd_results *resize_set_floating(struct sway_container *con,
                                                "Cannot resize a hidden scratchpad container by ppt");
                        }
                        // Convert to px
-                        width->amount = con->workspace->width * width->amount / 100;
+                        width->amount = con->pending.workspace->width * width->amount / 100;
                        width->unit = MOVEMENT_UNIT_PX;
                        // Falls through
                case MOVEMENT_UNIT_PX:
                case MOVEMENT_UNIT_DEFAULT:
                        width->amount = fmax(min_width, fmin(width->amount, max_width));
-                        grow_width = width->amount - con->width;
+                        grow_width = width->amount - con->pending.width;
-                        con->x -= grow_width / 2;
+                        con->pending.x -= grow_width / 2;
-                        con->width = width->amount;
+                        con->pending.width = width->amount;
                        break;
                case MOVEMENT_UNIT_INVALID:
                        sway_assert(false, "invalid width unit");
@@ -363,15 +391,15 @@ static struct cmd_results *resize_set_floating(struct sway_container *con,
                                                "Cannot resize a hidden scratchpad container by ppt");
                        }
                        // Convert to px
-                        height->amount = con->workspace->height * height->amount / 100;
+                        height->amount = con->pending.workspace->height * height->amount / 100;
                        height->unit = MOVEMENT_UNIT_PX;
                        // Falls through
                case MOVEMENT_UNIT_PX:
                case MOVEMENT_UNIT_DEFAULT:
                        height->amount = fmax(min_height, fmin(height->amount, max_height));
-                        grow_height = height->amount - con->height;
+                        grow_height = height->amount - con->pending.height;
-                        con->y -= grow_height / 2;
+                        con->pending.y -= grow_height / 2;
-                        con->height = height->amount;
+                        con->pending.height = height->amount;
                        break;
                case MOVEMENT_UNIT_INVALID:
                        sway_assert(false, "invalid height unit");
@@ -379,10 +407,10 @@ static struct cmd_results *resize_set_floating(struct sway_container *con,
                }
        }
-        con->content_x -= grow_width / 2;
+        con->pending.content_x -= grow_width / 2;
-        con->content_y -= grow_height / 2;
+        con->pending.content_y -= grow_height / 2;
-        con->content_width += grow_width;
+        con->pending.content_width += grow_width;
-        con->content_height += grow_height;
+        con->pending.content_height += grow_height;
        arrange_container(con);
@@ -415,7 +443,7 @@ static struct cmd_results *cmd_resize_set(int argc, char **argv) {
                argc -= num_consumed_args;
                argv += num_consumed_args;
                if (width.unit == MOVEMENT_UNIT_INVALID) {
-                        return cmd_results_new(CMD_INVALID, usage);
+                        return cmd_results_new(CMD_INVALID, "%s", usage);
                }
        }
@@ -427,20 +455,20 @@ static struct cmd_results *cmd_resize_set(int argc, char **argv) {
                }
                int num_consumed_args = parse_movement_amount(argc, argv, &height);
                if (argc > num_consumed_args) {
-                        return cmd_results_new(CMD_INVALID, usage);
+                        return cmd_results_new(CMD_INVALID, "%s", usage);
                }
                if (width.unit == MOVEMENT_UNIT_INVALID) {
-                        return cmd_results_new(CMD_INVALID, usage);
+                        return cmd_results_new(CMD_INVALID, "%s", usage);
                }
        }
        // If 0, don't resize that dimension
        struct sway_container *con = config->handler_context.container;
        if (width.amount <= 0) {
-                width.amount = con->width;
+                width.amount = con->pending.width;
        }
        if (height.amount <= 0) {
-                height.amount = con->height;
+                height.amount = con->pending.height;
        }
        if (container_is_floating(con)) {
@@ -462,7 +490,7 @@ static struct cmd_results *cmd_resize_adjust(int argc, char **argv,
                "[<amount> px|ppt [or <amount> px|ppt]]'";
        uint32_t axis = parse_resize_axis(*argv);
        if (axis == WLR_EDGE_NONE) {
-                return cmd_results_new(CMD_INVALID, usage);
+                return cmd_results_new(CMD_INVALID, "%s", usage);
        }
        --argc; ++argv;
@@ -473,7 +501,7 @@ static struct cmd_results *cmd_resize_adjust(int argc, char **argv,
                argc -= num_consumed_args;
                argv += num_consumed_args;
                if (first_amount.unit == MOVEMENT_UNIT_INVALID) {
-                        return cmd_results_new(CMD_INVALID, usage);
+                        return cmd_results_new(CMD_INVALID, "%s", usage);
                }
        } else {
                first_amount.amount = 10;
@@ -483,7 +511,7 @@ static struct cmd_results *cmd_resize_adjust(int argc, char **argv,
        // "or"
        if (argc) {
                if (strcmp(*argv, "or") != 0) {
-                        return cmd_results_new(CMD_INVALID, usage);
+                        return cmd_results_new(CMD_INVALID, "%s", usage);
                }
                --argc; ++argv;
        }
@@ -493,10 +521,10 @@ static struct cmd_results *cmd_resize_adjust(int argc, char **argv,
        if (argc) {
                int num_consumed_args = parse_movement_amount(argc, argv, &second_amount);
                if (argc > num_consumed_args) {
-                        return cmd_results_new(CMD_INVALID, usage);
+                        return cmd_results_new(CMD_INVALID, "%s", usage);
                }
                if (second_amount.unit == MOVEMENT_UNIT_INVALID) {
-                        return cmd_results_new(CMD_INVALID, usage);
+                        return cmd_results_new(CMD_INVALID, "%s", usage);
                }
        } else {
                second_amount.amount = 0;
@@ -566,5 +594,5 @@ struct cmd_results *cmd_resize(int argc, char **argv) {
        const char usage[] = "Expected 'resize <shrink|grow> "
                "<width|height|up|down|left|right> [<amount>] [px|ppt]'";
-        return cmd_results_new(CMD_INVALID, usage);
+        return cmd_results_new(CMD_INVALID, "%s", usage);
 }
diff --git a/sway/commands/scratchpad.c b/sway/commands/scratchpad.c
index 34871bc6..c995f2f0 100644
--- a/sway/commands/scratchpad.c
+++ b/sway/commands/scratchpad.c
@@ -21,8 +21,8 @@ static void scratchpad_toggle_auto(void) {
        // If the focus is in a floating split container,
        // operate on the split container instead of the child.
        if (focus && container_is_floating_or_child(focus)) {
-                while (focus->parent) {
+                while (focus->pending.parent) {
-                        focus = focus->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)) {
+                if (con && container_is_floating_or_child(con)) {
-                        while (con->parent) {
+                        while (con->pending.parent) {
-                                con = con->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.
+                // we'll just silently return a success. The same is true if the
-                if (!con->scratchpad) {
+                // 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..47d18546 100644
--- a/sway/commands/seat/attach.c
+++ b/sway/commands/seat/attach.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "sway/config.h"
@@ -12,7 +11,7 @@ struct cmd_results *seat_cmd_attach(int argc, char **argv) {
        if (!config->handler_context.seat_config) {
                return cmd_results_new(CMD_FAILURE, "No seat defined");
        }
-        if (config->reading) {
+        if (!config->active) {
                return cmd_results_new(CMD_DEFER, NULL);
        }
diff --git a/sway/commands/seat/cursor.c b/sway/commands/seat/cursor.c
index 749235eb..df7c379d 100644
--- a/sway/commands/seat/cursor.c
+++ b/sway/commands/seat/cursor.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <linux/input-event-codes.h>
 #include <strings.h>
@@ -18,7 +17,7 @@ static struct cmd_results *handle_command(struct sway_cursor *cursor,
                int argc, char **argv) {
        if (strcasecmp(argv[0], "move") == 0) {
                if (argc < 3) {
-                        return cmd_results_new(CMD_INVALID, expected_syntax);
+                        return cmd_results_new(CMD_INVALID, "%s", expected_syntax);
                }
                int delta_x = strtol(argv[1], NULL, 10);
                int delta_y = strtol(argv[2], NULL, 10);
@@ -27,7 +26,7 @@ static struct cmd_results *handle_command(struct sway_cursor *cursor,
                wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat);
        } else if (strcasecmp(argv[0], "set") == 0) {
                if (argc < 3) {
-                        return cmd_results_new(CMD_INVALID, expected_syntax);
+                        return cmd_results_new(CMD_INVALID, "%s", expected_syntax);
                }
                // map absolute coords (0..1,0..1) to root container coords
                float x = strtof(argv[1], NULL) / root->width;
@@ -37,7 +36,7 @@ static struct cmd_results *handle_command(struct sway_cursor *cursor,
                wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat);
        } else {
                if (argc < 2) {
-                        return cmd_results_new(CMD_INVALID, expected_syntax);
+                        return cmd_results_new(CMD_INVALID, "%s", expected_syntax);
                }
                struct cmd_results *error = NULL;
                if ((error = press_or_release(cursor, argv[0], argv[1]))) {
@@ -85,36 +84,36 @@ struct cmd_results *seat_cmd_cursor(int argc, char **argv) {
 static struct cmd_results *press_or_release(struct sway_cursor *cursor,
                char *action, char *button_str) {
-        enum wlr_button_state state;
+        enum wl_pointer_button_state state;
        uint32_t button;
        if (strcasecmp(action, "press") == 0) {
-                state = WLR_BUTTON_PRESSED;
+                state = WL_POINTER_BUTTON_STATE_PRESSED;
        } else if (strcasecmp(action, "release") == 0) {
-                state = WLR_BUTTON_RELEASED;
+                state = WL_POINTER_BUTTON_STATE_RELEASED;
        } else {
-                return cmd_results_new(CMD_INVALID, expected_syntax);
+                return cmd_results_new(CMD_INVALID, "%s", expected_syntax);
        }
        char *message = NULL;
        button = get_mouse_button(button_str, &message);
        if (message) {
                struct cmd_results *error =
-                        cmd_results_new(CMD_INVALID, message);
+                        cmd_results_new(CMD_INVALID, "%s", message);
                free(message);
                return error;
        } else if (button == SWAY_SCROLL_UP || button == SWAY_SCROLL_DOWN
                        || button == SWAY_SCROLL_LEFT || button == SWAY_SCROLL_RIGHT) {
                // Dispatch axis event
-                enum wlr_axis_orientation orientation =
+                enum wl_pointer_axis orientation =
                        (button == SWAY_SCROLL_UP || button == SWAY_SCROLL_DOWN)
-                        ? WLR_AXIS_ORIENTATION_VERTICAL
+                        ? WL_POINTER_AXIS_VERTICAL_SCROLL
-                        : WLR_AXIS_ORIENTATION_HORIZONTAL;
+                        : WL_POINTER_AXIS_HORIZONTAL_SCROLL;
                double delta = (button == SWAY_SCROLL_UP || button == SWAY_SCROLL_LEFT)
                        ? -1 : 1;
-                struct wlr_event_pointer_axis event = {
+                struct wlr_pointer_axis_event event = {
-                        .device = NULL,
+                        .pointer = NULL,
                        .time_msec = 0,
-                        .source = WLR_AXIS_SOURCE_WHEEL,
+                        .source = WL_POINTER_AXIS_SOURCE_WHEEL,
                        .orientation = orientation,
                        .delta = delta * 15,
                        .delta_discrete = delta
diff --git a/sway/commands/seat/hide_cursor.c b/sway/commands/seat/hide_cursor.c
index e09b82d9..f5177a47 100644
--- a/sway/commands/seat/hide_cursor.c
+++ b/sway/commands/seat/hide_cursor.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "sway/config.h"
diff --git a/sway/commands/seat/idle.c b/sway/commands/seat/idle.c
index 82428f2c..2974453e 100644
--- a/sway/commands/seat/idle.c
+++ b/sway/commands/seat/idle.c
@@ -1,8 +1,8 @@
-#define _POSIX_C_SOURCE 200809L
 #include <limits.h>
 #include <string.h>
 #include <strings.h>
 #include <stdint.h>
+#include "log.h"
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/input/seat.h"
@@ -69,5 +69,10 @@ struct cmd_results *seat_cmd_idle_wake(int argc, char **argv) {
                return cmd_results_new(CMD_FAILURE, "Invalid idle source");
        }
        config->handler_context.seat_config->idle_wake_sources = sources;
+        sway_log(SWAY_INFO, "Warning: seat idle_wake is deprecated");
+        if (config->reading) {
+                config_add_swaynag_warning("seat idle_wake is deprecated. "
+                        "Only seat idle_inhibit is supported.");
+        }
        return cmd_results_new(CMD_SUCCESS, NULL);
 }
diff --git a/sway/commands/seat/xcursor_theme.c b/sway/commands/seat/xcursor_theme.c
index 202f35b9..61322a57 100644
--- a/sway/commands/seat/xcursor_theme.c
+++ b/sway/commands/seat/xcursor_theme.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "sway/config.h"
diff --git a/sway/commands/set.c b/sway/commands/set.c
index c539e9fc..ba384c7c 100644
--- a/sway/commands/set.c
+++ b/sway/commands/set.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdio.h>
 #include <string.h>
 #include <strings.h>
diff --git a/sway/commands/show_marks.c b/sway/commands/show_marks.c
index 0d373b80..60cef9fa 100644
--- a/sway/commands/show_marks.c
+++ b/sway/commands/show_marks.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "sway/config.h"
@@ -10,8 +9,8 @@
 #include "stringop.h"
 #include "util.h"
-static void rebuild_marks_iterator(struct sway_container *con, void *data) {
+static void title_bar_update_iterator(struct sway_container *con, void *data) {
-        container_update_marks_textures(con);
+        container_update_marks(con);
 }
 struct cmd_results *cmd_show_marks(int argc, char **argv) {
@@ -23,12 +22,7 @@ struct cmd_results *cmd_show_marks(int argc, char **argv) {
        config->show_marks = parse_boolean(argv[0], config->show_marks);
        if (config->show_marks) {
-                root_for_each_container(rebuild_marks_iterator, NULL);
+                root_for_each_container(title_bar_update_iterator, NULL);
-        }
-        for (int i = 0; i < root->outputs->length; ++i) {
-                struct sway_output *output = root->outputs->items[i];
-                output_damage_whole(output);
        }
        return cmd_results_new(CMD_SUCCESS, NULL);
diff --git a/sway/commands/smart_gaps.c b/sway/commands/smart_gaps.c
index b27f9ccd..a6d165dc 100644
--- a/sway/commands/smart_gaps.c
+++ b/sway/commands/smart_gaps.c
@@ -15,7 +15,12 @@ struct cmd_results *cmd_smart_gaps(int argc, char **argv) {
                return error;
        }
-        config->smart_gaps = parse_boolean(argv[0], config->smart_gaps);
+        if (strcmp(argv[0], "inverse_outer") == 0) {
+                config->smart_gaps = SMART_GAPS_INVERSE_OUTER;
+        } else {
+                config->smart_gaps = parse_boolean(argv[0], config->smart_gaps)
+                        ? SMART_GAPS_ON : SMART_GAPS_OFF;
+        }
        arrange_root();
diff --git a/sway/commands/split.c b/sway/commands/split.c
index 782bab02..500a497d 100644
--- a/sway/commands/split.c
+++ b/sway/commands/split.c
@@ -14,7 +14,7 @@ static struct cmd_results *do_split(int layout) {
        struct sway_workspace *ws = config->handler_context.workspace;
        if (con) {
                if (container_is_scratchpad_hidden_or_child(con) &&
-                                con->fullscreen_mode != FULLSCREEN_GLOBAL) {
+                                con->pending.fullscreen_mode != FULLSCREEN_GLOBAL) {
                        return cmd_results_new(CMD_FAILURE,
                                        "Cannot split a hidden scratchpad container");
                }
@@ -32,6 +32,24 @@ static struct cmd_results *do_split(int layout) {
        return cmd_results_new(CMD_SUCCESS, NULL);
 }
+static struct cmd_results *do_unsplit(void) {
+        struct sway_container *con = config->handler_context.container;
+        struct sway_workspace *ws = config->handler_context.workspace;
+        if (con && con->pending.parent && con->pending.parent->pending.children->length == 1) {
+                container_flatten(con->pending.parent);
+        } else {
+                return cmd_results_new(CMD_FAILURE, "Can only flatten a child container with no siblings");
+        }
+        if (root->fullscreen_global) {
+                arrange_root();
+        } else {
+                arrange_workspace(ws);
+        }
+        return cmd_results_new(CMD_SUCCESS, NULL);
+}
 struct cmd_results *cmd_split(int argc, char **argv) {
        struct cmd_results *error = NULL;
        if ((error = checkarg(argc, "split", EXPECTED_EQUAL_TO, 1))) {
@@ -55,6 +73,9 @@ struct cmd_results *cmd_split(int argc, char **argv) {
                } else {
                        return do_split(L_VERT);
                }
+        } else if (strcasecmp(argv[0], "n") == 0 ||
+                        strcasecmp(argv[0], "none") == 0) {
+                return do_unsplit();
        } else {
                return cmd_results_new(CMD_FAILURE,
                        "Invalid split command (expected either horizontal or vertical).");
diff --git a/sway/commands/sticky.c b/sway/commands/sticky.c
index 3c93a276..9b09a0f9 100644
--- a/sway/commands/sticky.c
+++ b/sway/commands/sticky.c
@@ -29,14 +29,14 @@ struct cmd_results *cmd_sticky(int argc, char **argv) {
                        !container_is_scratchpad_hidden(container)) {
                // move container to active workspace
                struct sway_workspace *active_workspace =
-                        output_get_active_workspace(container->workspace->output);
+                        output_get_active_workspace(container->pending.workspace->output);
                if (!sway_assert(active_workspace,
                                        "Expected output to have a workspace")) {
                        return cmd_results_new(CMD_FAILURE,
                                        "Expected output to have a workspace");
                }
-                if (container->workspace != active_workspace) {
+                if (container->pending.workspace != active_workspace) {
-                        struct sway_workspace *old_workspace = container->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..c0b0d0b9 100644
--- a/sway/commands/swap.c
+++ b/sway/commands/swap.c
@@ -1,10 +1,10 @@
-#define _POSIX_C_SOURCE 200809L
 #include <strings.h>
 #include "config.h"
 #include "log.h"
 #include "sway/commands.h"
 #include "sway/output.h"
 #include "sway/tree/arrange.h"
+#include "sway/tree/container.h"
 #include "sway/tree/root.h"
 #include "sway/tree/view.h"
 #include "sway/tree/workspace.h"
@@ -13,186 +13,12 @@
 static const char expected_syntax[] =
        "Expected 'swap container with id|con_id|mark <arg>'";
-static void swap_places(struct sway_container *con1,
-                struct sway_container *con2) {
-        struct sway_container *temp = malloc(sizeof(struct sway_container));
-        temp->x = con1->x;
-        temp->y = con1->y;
-        temp->width = con1->width;
-        temp->height = con1->height;
-        temp->width_fraction = con1->width_fraction;
-        temp->height_fraction = con1->height_fraction;
-        temp->parent = con1->parent;
-        temp->workspace = con1->workspace;
-        bool temp_floating = container_is_floating(con1);
-        con1->x = con2->x;
-        con1->y = con2->y;
-        con1->width = con2->width;
-        con1->height = con2->height;
-        con1->width_fraction = con2->width_fraction;
-        con1->height_fraction = con2->height_fraction;
-        con2->x = temp->x;
-        con2->y = temp->y;
-        con2->width = temp->width;
-        con2->height = temp->height;
-        con2->width_fraction = temp->width_fraction;
-        con2->height_fraction = temp->height_fraction;
-        int temp_index = container_sibling_index(con1);
-        if (con2->parent) {
-                container_insert_child(con2->parent, con1,
-                                container_sibling_index(con2));
-        } else if (container_is_floating(con2)) {
-                workspace_add_floating(con2->workspace, con1);
-        } else {
-                workspace_insert_tiling(con2->workspace, con1,
-                                container_sibling_index(con2));
-        }
-        if (temp->parent) {
-                container_insert_child(temp->parent, con2, temp_index);
-        } else if (temp_floating) {
-                workspace_add_floating(temp->workspace, con2);
-        } else {
-                workspace_insert_tiling(temp->workspace, con2, temp_index);
-        }
-        free(temp);
-}
-static void swap_focus(struct sway_container *con1,
-                struct sway_container *con2, struct sway_seat *seat,
-                struct sway_container *focus) {
-        if (focus == con1 || focus == con2) {
-                struct sway_workspace *ws1 = con1->workspace;
-                struct sway_workspace *ws2 = con2->workspace;
-                enum sway_container_layout layout1 = container_parent_layout(con1);
-                enum sway_container_layout layout2 = container_parent_layout(con2);
-                if (focus == con1 && (layout2 == L_TABBED || layout2 == L_STACKED)) {
-                        if (workspace_is_visible(ws2)) {
-                                seat_set_focus(seat, &con2->node);
-                        }
-                        seat_set_focus_container(seat, ws1 != ws2 ? con2 : con1);
-                } else if (focus == con2 && (layout1 == L_TABBED
-                                        || layout1 == L_STACKED)) {
-                        if (workspace_is_visible(ws1)) {
-                                seat_set_focus(seat, &con1->node);
-                        }
-                        seat_set_focus_container(seat, ws1 != ws2 ? con1 : con2);
-                } else if (ws1 != ws2) {
-                        seat_set_focus_container(seat, focus == con1 ? con2 : con1);
-                } else {
-                        seat_set_focus_container(seat, focus);
-                }
-        } else {
-                seat_set_focus_container(seat, focus);
-        }
-        if (root->fullscreen_global) {
-                seat_set_focus(seat,
-                                seat_get_focus_inactive(seat, &root->fullscreen_global->node));
-        }
-}
-void container_swap(struct sway_container *con1, struct sway_container *con2) {
-        if (!sway_assert(con1 && con2, "Cannot swap with nothing")) {
-                return;
-        }
-        if (!sway_assert(!container_has_ancestor(con1, con2)
-                                && !container_has_ancestor(con2, con1),
-                                "Cannot swap ancestor and descendant")) {
-                return;
-        }
-        sway_log(SWAY_DEBUG, "Swapping containers %zu and %zu",
-                        con1->node.id, con2->node.id);
-        bool scratch1 = con1->scratchpad;
-        bool hidden1 = container_is_scratchpad_hidden(con1);
-        bool scratch2 = con2->scratchpad;
-        bool hidden2 = container_is_scratchpad_hidden(con2);
-        if (scratch1) {
-                if (hidden1) {
-                        root_scratchpad_show(con1);
-                }
-                root_scratchpad_remove_container(con1);
-        }
-        if (scratch2) {
-                if (hidden2) {
-                        root_scratchpad_show(con2);
-                }
-                root_scratchpad_remove_container(con2);
-        }
-        enum sway_fullscreen_mode fs1 = con1->fullscreen_mode;
-        enum sway_fullscreen_mode fs2 = con2->fullscreen_mode;
-        if (fs1) {
-                container_fullscreen_disable(con1);
-        }
-        if (fs2) {
-                container_fullscreen_disable(con2);
-        }
-        struct sway_seat *seat = config->handler_context.seat;
-        struct sway_container *focus = seat_get_focused_container(seat);
-        struct sway_workspace *vis1 =
-                output_get_active_workspace(con1->workspace->output);
-        struct sway_workspace *vis2 =
-                output_get_active_workspace(con2->workspace->output);
-        if (!sway_assert(vis1 && vis2, "con1 or con2 are on an output without a"
-                                "workspace. This should not happen")) {
-                return;
-        }
-        char *stored_prev_name = NULL;
-        if (seat->prev_workspace_name) {
-                stored_prev_name = strdup(seat->prev_workspace_name);
-        }
-        swap_places(con1, con2);
-        if (!workspace_is_visible(vis1)) {
-                seat_set_focus(seat, seat_get_focus_inactive(seat, &vis1->node));
-        }
-        if (!workspace_is_visible(vis2)) {
-                seat_set_focus(seat, seat_get_focus_inactive(seat, &vis2->node));
-        }
-        swap_focus(con1, con2, seat, focus);
-        if (stored_prev_name) {
-                free(seat->prev_workspace_name);
-                seat->prev_workspace_name = stored_prev_name;
-        }
-        if (scratch1) {
-                root_scratchpad_add_container(con2, NULL);
-                if (!hidden1) {
-                        root_scratchpad_show(con2);
-                }
-        }
-        if (scratch2) {
-                root_scratchpad_add_container(con1, NULL);
-                if (!hidden2) {
-                        root_scratchpad_show(con1);
-                }
-        }
-        if (fs1) {
-                container_set_fullscreen(con2, fs1);
-        }
-        if (fs2) {
-                container_set_fullscreen(con1, fs2);
-        }
-}
 static bool test_con_id(struct sway_container *container, void *data) {
        size_t *con_id = data;
        return container->node.id == *con_id;
 }
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
 static bool test_id(struct sway_container *container, void *data) {
        xcb_window_t *wid = data;
        return (container->view && container->view->type == SWAY_VIEW_XWAYLAND
@@ -219,7 +45,7 @@ struct cmd_results *cmd_swap(int argc, char **argv) {
        }
        if (strcasecmp(argv[0], "container") || strcasecmp(argv[1], "with")) {
-                return cmd_results_new(CMD_INVALID, expected_syntax);
+                return cmd_results_new(CMD_INVALID, "%s", expected_syntax);
        }
        struct sway_container *current = config->handler_context.container;
@@ -227,7 +53,7 @@ struct cmd_results *cmd_swap(int argc, char **argv) {
        char *value = join_args(argv + 3, argc - 3);
        if (strcasecmp(argv[2], "id") == 0) {
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
                xcb_window_t id = strtol(value, NULL, 0);
                other = root_find_container(test_id, &id);
 #endif
@@ -238,7 +64,7 @@ struct cmd_results *cmd_swap(int argc, char **argv) {
                other = root_find_container(test_mark, value);
        } else {
                free(value);
-                return cmd_results_new(CMD_INVALID, expected_syntax);
+                return cmd_results_new(CMD_INVALID, "%s", expected_syntax);
        }
        if (!other) {
@@ -247,6 +73,9 @@ struct cmd_results *cmd_swap(int argc, char **argv) {
        } else if (!current) {
                error = cmd_results_new(CMD_FAILURE,
                                "Can only swap with containers and views");
+        } else if (current == other) {
+                error = cmd_results_new(CMD_FAILURE,
+                                "Cannot swap a container with itself");
        } else if (container_has_ancestor(current, other)
                        || container_has_ancestor(other, current)) {
                error = cmd_results_new(CMD_FAILURE,
diff --git a/sway/commands/title_align.c b/sway/commands/title_align.c
index c30355de..be298a29 100644
--- a/sway/commands/title_align.c
+++ b/sway/commands/title_align.c
@@ -4,6 +4,10 @@
 #include "sway/tree/container.h"
 #include "sway/tree/root.h"
+static void arrange_title_bar_iterator(struct sway_container *con, void *data) {
+        container_arrange_title_bar(con);
+}
 struct cmd_results *cmd_title_align(int argc, char **argv) {
        struct cmd_results *error = NULL;
        if ((error = checkarg(argc, "title_align", EXPECTED_AT_LEAST, 1))) {
@@ -21,10 +25,7 @@ struct cmd_results *cmd_title_align(int argc, char **argv) {
                                "Expected 'title_align left|center|right'");
        }
-        for (int i = 0; i < root->outputs->length; ++i) {
+        root_for_each_container(arrange_title_bar_iterator, NULL);
-                struct sway_output *output = root->outputs->items[i];
-                output_damage_whole(output);
-        }
        return cmd_results_new(CMD_SUCCESS, NULL);
 }
diff --git a/sway/commands/title_format.c b/sway/commands/title_format.c
index 9d312470..0b2ea265 100644
--- a/sway/commands/title_format.c
+++ b/sway/commands/title_format.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "sway/config.h"
@@ -23,6 +22,5 @@ struct cmd_results *cmd_title_format(int argc, char **argv) {
        }
        view->title_format = format;
        view_update_title(view, true);
-        config_update_font_height(true);
        return cmd_results_new(CMD_SUCCESS, NULL);
 }
diff --git a/sway/commands/titlebar_border_thickness.c b/sway/commands/titlebar_border_thickness.c
index 7c27c163..fa3db3c5 100644
--- a/sway/commands/titlebar_border_thickness.c
+++ b/sway/commands/titlebar_border_thickness.c
@@ -27,7 +27,6 @@ struct cmd_results *cmd_titlebar_border_thickness(int argc, char **argv) {
                                        "Expected output to have a workspace");
                }
                arrange_workspace(ws);
-                output_damage_whole(output);
        }
        return cmd_results_new(CMD_SUCCESS, NULL);
diff --git a/sway/commands/titlebar_padding.c b/sway/commands/titlebar_padding.c
index 29ce59ff..6999f7a2 100644
--- a/sway/commands/titlebar_padding.c
+++ b/sway/commands/titlebar_padding.c
@@ -33,7 +33,6 @@ struct cmd_results *cmd_titlebar_padding(int argc, char **argv) {
        for (int i = 0; i < root->outputs->length; ++i) {
                struct sway_output *output = root->outputs->items[i];
                arrange_workspace(output_get_active_workspace(output));
-                output_damage_whole(output);
        }
        return cmd_results_new(CMD_SUCCESS, NULL);
diff --git a/sway/commands/unmark.c b/sway/commands/unmark.c
index cedfcfb2..4aba5bae 100644
--- a/sway/commands/unmark.c
+++ b/sway/commands/unmark.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "sway/config.h"
@@ -8,9 +7,13 @@
 #include "log.h"
 #include "stringop.h"
-static void remove_all_marks_iterator(struct sway_container *con, void *data) {
+static void remove_mark(struct sway_container *con) {
        container_clear_marks(con);
-        container_update_marks_textures(con);
+        container_update_marks(con);
+}
+static void remove_all_marks_iterator(struct sway_container *con, void *data) {
+        remove_mark(con);
 }
 // unmark                  Remove all marks from all views
@@ -21,7 +24,7 @@ static void remove_all_marks_iterator(struct sway_container *con, void *data) {
 struct cmd_results *cmd_unmark(int argc, char **argv) {
        // Determine the container
        struct sway_container *con = NULL;
-        if (config->handler_context.using_criteria) {
+        if (config->handler_context.node_overridden) {
                con = config->handler_context.container;
        }
@@ -38,8 +41,7 @@ struct cmd_results *cmd_unmark(int argc, char **argv) {
                }
        } else if (con && !mark) {
                // Clear all marks from the given container
-                container_clear_marks(con);
+                remove_mark(con);
-                container_update_marks_textures(con);
        } else if (!con && mark) {
                // Remove mark from whichever container has it
                container_find_and_unmark(mark);
diff --git a/sway/commands/workspace.c b/sway/commands/workspace.c
index 9ff1c97d..37a201b4 100644
--- a/sway/commands/workspace.c
+++ b/sway/commands/workspace.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <ctype.h>
 #include <limits.h>
 #include <string.h>
@@ -61,7 +60,7 @@ static struct cmd_results *cmd_workspace_gaps(int argc, char **argv,
        const char expected[] = "Expected 'workspace <name> gaps "
                "inner|outer|horizontal|vertical|top|right|bottom|left <px>'";
        if (gaps_location == 0) {
-                return cmd_results_new(CMD_INVALID, expected);
+                return cmd_results_new(CMD_INVALID, "%s", expected);
        }
        struct cmd_results *error = NULL;
        if ((error = checkarg(argc, "workspace", EXPECTED_EQUAL_TO,
@@ -79,7 +78,7 @@ static struct cmd_results *cmd_workspace_gaps(int argc, char **argv,
        char *end;
        int amount = strtol(argv[gaps_location + 2], &end, 10);
        if (strlen(end)) {
-                return cmd_results_new(CMD_FAILURE, expected);
+                return cmd_results_new(CMD_FAILURE, "%s", expected);
        }
        bool valid = false;
@@ -110,7 +109,7 @@ static struct cmd_results *cmd_workspace_gaps(int argc, char **argv,
                }
        }
        if (!valid) {
-                return cmd_results_new(CMD_INVALID, expected);
+                return cmd_results_new(CMD_INVALID, "%s", expected);
        }
        // Prevent invalid gaps configurations.
@@ -178,25 +177,20 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
                }
                if (root->fullscreen_global) {
-                        return cmd_results_new(CMD_FAILURE, "workspace",
+                        return cmd_results_new(CMD_FAILURE,
                                "Can't switch workspaces while fullscreen global");
                }
-                bool no_auto_back_and_forth = false;
+                bool auto_back_and_forth = true;
                while (strcasecmp(argv[0], "--no-auto-back-and-forth") == 0) {
-                        no_auto_back_and_forth = true;
+                        auto_back_and_forth = false;
                        if ((error = checkarg(--argc, "workspace", EXPECTED_AT_LEAST, 1))) {
                                return error;
                        }
                        ++argv;
                }
-                bool create = argc > 1 && strcasecmp(argv[1], "--create") == 0;
                struct sway_seat *seat = config->handler_context.seat;
-                struct sway_workspace *current = seat_get_focused_workspace(seat);
-                if (!current) {
-                        return cmd_results_new(CMD_FAILURE, "No workspace to switch from");
-                }
                struct sway_workspace *ws = NULL;
                if (strcasecmp(argv[0], "number") == 0) {
@@ -213,14 +207,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 +230,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/commands/xwayland.c b/sway/commands/xwayland.c
index 6ca26923..c0b175fc 100644
--- a/sway/commands/xwayland.c
+++ b/sway/commands/xwayland.c
@@ -10,7 +10,7 @@ struct cmd_results *cmd_xwayland(int argc, char **argv) {
                return error;
        }
-#ifdef HAVE_XWAYLAND
+#ifdef WLR_HAS_XWAYLAND
        enum xwayland_mode xwayland;
        if (strcmp(argv[0], "force") == 0) {
                xwayland = XWAYLAND_MODE_IMMEDIATE;
@@ -20,6 +20,8 @@ struct cmd_results *cmd_xwayland(int argc, char **argv) {
                xwayland = XWAYLAND_MODE_DISABLED;
        }
+        // config->xwayland is reset to the previous value on reload in
+        // load_main_config()
        if (config->reloading && config->xwayland != xwayland) {
                return cmd_results_new(CMD_FAILURE,
                                "xwayland can only be enabled/disabled at launch");