diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7f91f07d..7944284a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,7 +29,7 @@ jobs:
       matrix:
         name: [
           Arch,
-          Debian,
+#          Debian,
           FreeBSD,
           Void-musl
         ]
@@ -40,11 +40,11 @@ jobs:
             env:
               TARGET: 'sh -xe'
 
-          - name: Debian
-            os: ubuntu-latest
-            container: debian:testing
-            env:
-              TARGET: 'sh -xe'
+#          - name: Debian
+#            os: ubuntu-latest
+#            container: debian:testing
+#            env:
+#              TARGET: 'sh -xe'
 
           - name: FreeBSD
             os: ubuntu-latest
@@ -81,6 +81,7 @@ jobs:
           apt-get upgrade -y
           apt-get install -y git gcc clang gdb xwayland
           apt-get build-dep -y labwc
+          apt-get install libwlroots-0.18-dev
 
       - name: Install FreeBSD dependencies
         if: matrix.name == 'FreeBSD'
@@ -105,8 +106,8 @@ jobs:
           xbps-install -Syu
           xbps-install -y git meson gcc clang pkg-config scdoc \
             cairo-devel glib-devel libpng-devel librsvg-devel libxml2-devel \
-            pango-devel wlroots0.17-devel gdb bash xorg-server-xwayland \
-            dejavu-fonts-ttf
+            pango-devel wlroots0.18-devel gdb bash xorg-server-xwayland \
+            dejavu-fonts-ttf libsfdo-devel
 
       # These build are executed on all runners
       - name: Build with gcc
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 655376c5..0f79ef5f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,9 +14,10 @@
     - [4.3.3 The use of GNU extensions](#the-use-of-gnu-extensions)
     - [4.3.4 Naming Conventions](#naming-conventions)
 - [5. Commit Messages](#commit-messages)
-- [6. Submitting Patches](#submitting-patches)
-- [7. Native Language Support](#native-language-support)
-- [8. Upversion](#upversion)
+- [6. Unit Tests](#unit-tests)
+- [7. Submitting Patches](#submitting-patches)
+- [8. Native Language Support](#native-language-support)
+- [9. Upversion](#upversion)
 
 # How to Contribute
 
@@ -345,6 +346,29 @@ This first line should:
 And please wrap the commit message at max 74 characters, otherwise `git log`
 and similar look so weird. URLs and other references are exempt.
 
+# Unit Tests
+
+## Introduction
+
+The tests live in the `t/` directory.
+
+In the bigger scheme of validating that the compositor meets users' needs, unit
+tests do not contribute a great deal. However, they have a role to play in
+providing some verification that stand-alone functions behave as expected.
+
+On this project, writing unit-tests is not compulsory nor do we measure
+coverage. The inclusion of the t/ directory does not signifiy a move towards
+test-driven development. We intend to use unit tests sparingly and only when
+devs find them useful.
+
+## Usage
+
+From repo top level directory:
+
+    meson setup -Dtest=enabled build
+    meson compile -C build/
+    meson test --verbose -C build/
+
 # Submitting patches
 
 Base both bugfixes and new features on `master`.
diff --git a/NEWS.md b/NEWS.md
index 719785d7..307c6784 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -9,7 +9,9 @@ The format is based on [Keep a Changelog]
 
 | Date       | All Changes   | wlroots version | lines-of-code |
 |------------|---------------|-----------------|---------------|
-| 2024-06-09 | [unreleased]  | 0.17.3          |               |
+| 2024-08-16 | [0.8.0]       | 0.18.0          | 23320         |
+| 2024-06-19 | [0.7.4]       | 0.17.4          | 22746         |
+| 2024-06-12 | [0.7.3]       | 0.17.4          | 22731         |
 | 2024-05-10 | [0.7.2]       | 0.17.3          | 21368         |
 | 2024-03-01 | [0.7.1]       | 0.17.1          | 18624         |
 | 2023-12-22 | [0.7.0]       | 0.17.1          | 16576         |
@@ -31,13 +33,254 @@ The format is based on [Keep a Changelog]
 
 ## [unreleased]
 
+The most noteworthy additions in this release are:
+
+1. Titlebar window icons and layout configuration
+2. Support for the cosmic-workspace protocol and the openbox inspired
+   client-list-combined-menu for a better user experience with workspaces.
+
+Notes to package maintainers:
+
+- The SSD titlebar window icon support requires libsfdo to be added as a
+  dependency or statically linked. If this is not wanted, add -Dicon=disabled to
+  the `meson setup` command in the build script for the next release.
+- PRs #1716 and #2205 add labwc xdg-portal configuration, modify `labwc.desktop`
+  and amend `XDG_CURRENT_DESKTOP` which should enable better out-of-the-box
+  support for xdg-desktop-portal, but if you already ship a custom setup for
+  this you or have different requirements, please review this change.
+
 ### Added
 
+- Support dmabuf feedback (#2234, #1278)
+- Add initial implementation of cosmic-workspace-unstable-v1 (#2030)
+- Optionally support SSD titlebar window icons. When an icon file is not found
+  or could not be loaded, the window menu icon is shown as before. The icon
+  theme can be selected with `<theme><icon>` (#2128)
+- Add actions `ToggleSnapToEdge` and `ToggleSnapToRegion`. These behave like
+  `SnapToEdge` and `SnapToRegion`, except that they untile the window when
+  already being tiled to the given region or direction.
+  Written-by: @jp7677 and @tokyo4j (#2154)
+- Add action `UnSnap`. This behaves like `ToggleSnapToEdge/Region` but
+  unconditionally. Written-by: @jp7677 and @tokyo4j (#2154)
+- Handle xdg-shell `show_window_menu` requests (#2167)
+- Support the openbox style menus listed below. Written-by: @droc12345
+  1. `client-list-combined-menu` shows windows across all workspaces. This can
+     be used with a mouse/key bind using:
+     `<action name="ShowMenu" menu="client-list-combined-menu"/>` (#2101)
+  2. `client-send-to` shows all workspaces that the current window can be sent
+     to. This can additional be used within a client menu using:
+     `<menu id="client-send-to-menu" label="Send to Workspace..." />` (#2152)
+- Add theme option for titlebar padding and button spacing (#2189)
+
+```
+window.button.height: 26
+window.titlebar.padding.width: 0
+window.titlebar.padding.height: 0
+window.button.spacing: 0
+```
+
+- Set titlebar height based on the maximum height of any of the objects within
+  it, rather than just taking the font height into account (#2152)
+- Add theme option for setting button hover effect corner radius (#2127, #2231)
+
+```
+window.button.hover.bg.corner-radius: 0
+```
+
+- Add position arguments for menus. Written-by: @droc12345 (#2102)
+
+```
+<action name="ShowMenu">
+  <menu>root-menu</menu>
+  <position>
+    <x>0</x>
+    <y>0</y>
+  </position>
+</action>
+```
+
+- Allow interactive window movement when horizontally or vertically maximized
+  and add associated config option `<resistance><unMaximizeThreshold>` (#2052)
+- Add optional Shade (shade.xbm) and AllDesktops (desk.xbm) buttons and theme
+  options:
+
+```
+window.active.button.desk.unpressed.image.color
+window.inactive.button.desk.unpressed.image.color
+window.active.button.shade.unpressed.image.color
+window.inactive.button.shade.unpressed.image.color
+```
+
+- Make action `FocusOutput` behave like `MoveToOutput` by adding direction and
+  wrap arguments. Written-by: @orfeasxyz (#2100)
+- Add config option for titlebar layout. Written-by: @xi (#2088, #2150)
+
+```
+<titlebar>
+  <layout>icon:iconify,max,close</layout>
+  <showTitle>yes|no</showTitle>
+</titlebar>
+```
+
+- Add `Oblique` option to `<theme><font><style>`. Written-by: @droc12345 (#2097)
+- Support menu titles defined by `<separator label="">`.
+- Add the theme option `menu.title.bg.color: #589bda`
+- Add theme options `menu.title.text.color` and `menu.title.text.justify`.
+  Written-by: @droc12345 (#2097)
+- Add font place MenuHeader: `<font place="MenuHeader">`.
+  Written-by: @droc12345 (#2097)
+- Add actions `EnableTabletMouseEmulation` and `DisableTabletMouseEmulation`.
+  Written-by: @jp7677 (#2091)
+- Set 'labwc' as `app_id` and `title` for nested outputs (#2055)
+
+### Fixed
+
+- Fix button release events sometimes not being sent (#2226)
+- Fix xdg-shell popups appearing on wrong output with some Qt themes. (#2224)
+- Take into account xdg-shell minimum window size for resizing. This is
+  relevant when using `<resize drawContents="no">` (#2221)
+- Fix button scaling issues (#2207, #2225)
+- Add portals.conf file, amend `labwc.desktop` and modify `XDG_CURRENT_DESKTOP`
+  for better out-of-the-box xdg-desktop-portal support. This helps with for
+  example screensharing. Written-by: @rcalixte @jp7677 (#1503, #1716)
+- Disable the Inhibit D-BUS interface in xdg-portals configuration to fix an
+  issue with some clients (like Firefox) ignoring the idle-inhibit protocol.
+  Written-by: @jp7677 (#2205)
+- Prevent `Drag` mousebinds from running without button press (#2196)
+- Handle slow un-maximize with empty natural geometry better (#2191)
+- Fix de-synced SSD when shrinking Thunderbird xdg-shell window (#2190)
+- Fix xdg-shell out-of-sync configure state when clients time out
+  Written-by: @cillian64 (#2174)
+- Fix small flicker when client initially submits a window size smaller than the
+  minimum value (#2166)
+- Allow server-side decoration to be smaller than minimal size by hiding
+  buttons (#2116)
+- Fix incorrect cursor shape on titlebar corner without buttons (#2105)
+- Fix delayed pipe menu response on item destroy (#2094)
+- Destroy xdg-shell foreign toplevel handle on unmap (#2075)
+- Sync XWayland foreign-toplevel and associated outputs on re-map (#2075)
+
+### Changed
+
+- Theme options `padding.height` and `titlebar.height` have been removed to
+  minimize breaking changes with the visual appearance of the titlebar when
+  using openbox themes. As a result, and depending on your configuration,
+  the titlebar height may change by a small number of pixels (#2189)
+- Move input config `<scrollFactor>` to `<libinput>` section to allow
+  per-device configuration of scroll factor (e.g. setting different scroll
+  factors for mice and touchpads). (#2057)
+
+## [0.8.0]
+
+The main focus in this release has been to port labwc to wlroots 0.18 and to
+grind out associated regressions. Nonetheless, it contains a few non-related
+additions and fixes as described below.
+
+There are a couple of regression warnings when using wlroots 0.18:
+
+1. There appears to be an issue with increased commit failures, particularly
+   with intel drivers. If this turns out to be an issue for anyone please try
+   running with `WLR_DRM_NO_ATOMIC=1` or run the labwc v0.7 branch or its latest
+   release until this is resolved.
+2. Fullscreen VRR is broken but should be fixed once wlroots 0.18.1 is released.
+   Again, if that is a problem we advise to stay with the v0.7 branch in the
+   short term until fixed. PR #2079
+
+A v0.7 branch has been created for bug fixes beyond `0.7.3` (built with wlroots
+`0.17`).
+
+A big thank you goes to @Consolatis for carefully crafting the commits to port
+across to wlroots 0.18.0. Many thanks also to the other core devs @ahesford,
+@jlindgren90, @johanmalm and @tokyo4j for reviewing, merging as well as
+contributing many patches with fixes and new features. And in this release we
+have some great contributions from @jp7677, @kode54, @xi and @heroin-moose which
+have been attributed with a 'Written-by' against each relevant log entry.
+
+### Added
+
+- Add options `fullscreen` and `fullscreenForced` for `<core><allowTearing>`
+  Written-by: @jp7677 & @Consolatis PR #1941
+- Optionally allow keybindings when session is locked, which for example can be
+  useful for volume settings. Written-by: @xi PR #2041
+
+```xml
+<keyboard><keybind key="" allowWhenLocked="">
+```
+
+- Add resistance when dragging tiled/maximized windows with config option
+  `<resistance><unSnapThreshold>`. PR #2009 #2056
+- Implement support for renderer loss recovery. Written-by: @kode54 PR #1997
+- Support xinitrc scripts to configure XWayland server on launch. PR #1963
+- Add theme option `window.button.width` to set window button size.
+  Written-by: @heroin-moose PR #1965
+- Add `cascade` placement policy. PR #1890
+
+```xml
+<placement>
+  <policy>cascade</policy>
+  <cascadeOffset x="40" y="30"/>
+</placement>
+```
+
+- Support relative tablet motion. Written-by: @jp7677 PR #1962
+
+```xml
+<tabletTool motion="absolute|relative" relativeMotionSensitivity="1.0"/>
+```
+
+### Fixed
+
+- Make tablet rotation follow output rotation. Written-by: @jp7677. PR #2060
+- Fix error when launching windowed Chromium. PR #2069
+- Fix empty `XKB_DEFAULT_LAYOUT` bug. PR #2061
+- Take into account CSD borders when unconstraining XDG popups. PR #2016
+- Choose xdg-popup output depending on xdg-positioner PR #2016
+- Fix wlroots-0.18 regression causing flicker with some layer-shell clients like
+  fuzzel on launch. PR #2021
+- Fix incorrect condition in server-side-deco logic PR #2020
+- Fix flicker of snapped windows in nested session. PR #2010
+- Fix tearing with atomic mode setting. Written-by: @kode54 PR #1996
+- Handle initially maximized and fullscreen xdg-shell windows better.
+  PRs #1956 and #2007
+- Set initial geometry of maximized and fullscreen XWayland windows in the
+  `map_request` handler to avoid visual glitches with some apps. PR #1529
+- Disable pango glyph position rounding to avoid text geometry jump around when
+  changing scale.
+
+### Changed
+
+- Make windows stay fullscreen when associated output is disconnected. PR #2040
+
+## [0.7.4]
+
+### Fixed
+
+- Make SSD borders respect snapped state on Reconfigure. PR #2003
+- Fix magnifier by disabling direct scanout when active. PR #1989
+- Fix crash triggered by pipemenu without parent `<menu>` element. PR #1988
+
+## [0.7.3]
+
+Following a couple of big releases, this one feels like more steady with lots of
+focus on bug fixes and stability. In terms of new features the most noteworthy
+ones include improved tablet support (by @jp7677), `Super_L` on-release keybinds
+(by @spl237 from the Raspberry Pi teams) and the screen magnifier which was a
+joint effort by @spl237 and @Consolatis.
+
+### Added
+
+- Add config option `<core><xwaylandPersistence>` to support keeping XWayland
+  alive even when no clients are connected. PR #1961
+- Support xdg-shell protocol v3 with popup repositioning. #1950
+  Also see https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3514
+  which adds support on the wlroots side.
+- Add action `ToggleTabletMouseEmulation`. Written-by: jp7677 PR #1915
+- Implement `<resize><drawContents>`. With thanks to @tokyo4j PR #1863
 - Add `onRelease` option to `<keybind>` in support of binding `Super_L` to a
   menu. Written-by: @spl237 PR #1888
 - Add initial support for `security-context-v1` (user configurable blocklists
   are still missing). Written-by: @nesteroff PR #1817
-- Add partial support for `tablet-v2-manager`. Written-by: @jp7677 PR #1678
+- Add support for `tablet-v2-manager`. Written-by: @jp7677 PR #1678 #1882
 - Add action `UnMaximize`. PR #1831
 - Support multiple IME popups. PR #1823
 - Add `All` context for mouse bindings which need to be handled irrespective of
@@ -51,6 +294,33 @@ The format is based on [Keep a Changelog]
 
 ### Fixed
 
+- When looking for menu.xml, go through all paths rather than just giving up
+  if not found in the first path searched. This makes it consistent with how
+  other config/theme files are handled. PR #1971
+- Fix memory leaks in theme.c and menu.c. PR #1971
+- Fix session-lock bugs related to keyboard focus. PR #1952
+  - Clear focused surface on lock
+  - Restore focused view on unlock
+- Fix memory leak in ssd/ssd-shadow.c PR #1954
+- Respect `menu.overlap.x` when using pipemenus. PR #1940
+- Do not try to restore windows to very small width/height on unmaximize.
+  This fixes a bug with Thonny (Python IDE made with Tk). PR #1938
+- Conditially set squared server-side decoration (SSD) corners when a view is
+  tiled. Written-by: @jp7677 PR #1926
+- Remember initial direction when starting window-cycling with `PreviousView`.
+  Also make the toggling of direction when shift is pressed relative to the
+  initial direction. For example if W-j is bound to PreviousWindow, subsequent
+  key presses will continue to cycle backwards unless shift is also pressed.
+  Written-by: @droc12345 PR #1919
+- Show dnd icon above layer-shell surfaces. PR #1936
+- Initialize locale after reading environment files so that client-menu items
+  and workspace names follow the env var `LANG` should that be set in
+  `~/.config/labwc/environment` (which is not recommended, but we prefer to
+  handle it properly if it is). PR #1927
+- Fix crash on `menu.xml` containing `<item>` without a parent `<menu>`.
+  PR #1907
+- Reset XWayland cursor image on cursor theme reload to avoid trying to read
+  destroyed pixel data. PR #1895
 - Prevent child views from opening outside of usable area. PR #1878
 - Fix IME popups issues (flicker when popup surface is initially mapped
   and incorrectly showing multiple popups). PR #1872
@@ -74,15 +344,15 @@ The format is based on [Keep a Changelog]
 
 ### Changed
 
+- Remove subprojects/seatd.wrap as no longer needed
 - Action `MoveToCursor` is deprecated in favour of:
   `<action name="AutoPlace" policy="cursor"/>`.
 
 ## [0.7.2]
 
-This release is shaping up to be the second in a row that is larger than
-usual in terms of both fixes and new features. Significant additions
-include input-methods, pipemenus, snap-to-edge overlays and optionally
-drop-shadows.
+This release shaped up to be the second in a row that is larger than usual in
+terms of both fixes and new features. Significant additions include
+input-methods, pipemenus, snap-to-edge overlays and optionally drop-shadows.
 
 As usual, most of the commits are by the core devs: @ahesford, @Consolatis,
 @jlindgren90, @johanmalm and @tokyo4j, but we also have many great
@@ -1394,7 +1664,10 @@ Compile with wlroots 0.12.0 and wayland-server >=1.16
   ShowMenu
 
 [Keep a Changelog]: https://keepachangelog.com/en/1.0.0/
-[unreleased]: https://github.com/labwc/labwc/compare/0.7.2...HEAD
+[unreleased]: https://github.com/labwc/labwc/compare/0.8.0...HEAD
+[0.8.0]: https://github.com/labwc/labwc/compare/0.7.3...0.8.0
+[0.7.4]: https://github.com/labwc/labwc/compare/0.7.3...0.7.4
+[0.7.3]: https://github.com/labwc/labwc/compare/0.7.2...0.7.3
 [0.7.2]: https://github.com/labwc/labwc/compare/0.7.1...0.7.2
 [0.7.1]: https://github.com/labwc/labwc/compare/0.7.0...0.7.1
 [0.7.0]: https://github.com/labwc/labwc/compare/0.6.6...0.7.0
diff --git a/README.md b/README.md
index 88ed65ad..f6f206f1 100644
--- a/README.md
+++ b/README.md
@@ -182,7 +182,7 @@ prevent installing the wlroots headers:
 ## 3. Configuration
 
 User config files are located at `${XDG_CONFIG_HOME:-$HOME/.config/labwc/}`
-with the following five files being used: [rc.xml], [menu.xml], [autostart], [shutdown],
+with the following six files being used: [rc.xml], [menu.xml], [autostart], [shutdown],
 [environment] and [themerc-override].
 
 Run `labwc --reconfigure` to reload configuration and theme.
diff --git a/data/labwc-portals.conf b/data/labwc-portals.conf
new file mode 100644
index 00000000..4b08b588
--- /dev/null
+++ b/data/labwc-portals.conf
@@ -0,0 +1,3 @@
+[preferred]
+default=wlr;*
+org.freedesktop.impl.portal.Inhibit=none
diff --git a/data/labwc.desktop b/data/labwc.desktop
index 63ffcfff..5b25c814 100644
--- a/data/labwc.desktop
+++ b/data/labwc.desktop
@@ -4,4 +4,4 @@ Comment=A wayland stacking compositor
 Exec=labwc
 Icon=labwc
 Type=Application
-DesktopNames=wlroots
+DesktopNames=labwc;wlroots
diff --git a/docs/README b/docs/README
index b5f022fc..c90c047a 100644
--- a/docs/README
+++ b/docs/README
@@ -5,6 +5,7 @@ Config layout for ~/.config/labwc/
 - rc.xml
 - shutdown
 - themerc-override
+- xinitrc
 
 See `man labwc-config and `man labwc-theme` for further details.
 
diff --git a/docs/environment b/docs/environment
index ad574bd9..90d7456a 100644
--- a/docs/environment
+++ b/docs/environment
@@ -60,13 +60,13 @@
 
 ##
 ## This allows xdg-desktop-portal-wlr to function (e.g. for screen-recording).
-## It is automatically set to "wlroots" by labwc though, so it is only
+## It is automatically set to "labwc:wlroots" by labwc though, so it is only
 ## included here for completeness. Again, labwc will not over-write an
 ## already set environment variable, so if you need it set to something else,
 ## then uncomment and adjust.
 ##
 
-# XDG_CURRENT_DESKTOP=wlroots
+# XDG_CURRENT_DESKTOP=labwc:wlroots
 
 ##
 ## This causes a virtual output to be created automatically whenever there
diff --git a/docs/labwc-actions.5.scd b/docs/labwc-actions.5.scd
index a8d8bba5..8f37fdca 100644
--- a/docs/labwc-actions.5.scd
+++ b/docs/labwc-actions.5.scd
@@ -91,19 +91,35 @@ Actions are used in menus and keyboard/mouse bindings.
 	Move window relative to its current position. Positive value of x moves
 	it right, negative left. Positive value of y moves it down, negative up.
 
+*<action name="ToggleSnapToEdge" direction="value" />*++
 *<action name="SnapToEdge" direction="value" />*
 	Resize window to fill half the output in the given direction. Supports
 	directions "left", "up", "right", "down" and "center".
 
+	ToggleSnapToEdge additionally toggles the active window between
+	tiled to the given direction and its untiled position.
+
+*<action name="ToggleSnapToRegion" region="value" />*++
 *<action name="SnapToRegion" region="value" />*
 	Resize and move active window according to the given region.
+
+	ToggleSnapToRegion additionally toggles the active window between
+	tiled to the given region and its untiled position.
+
 	See labwc-config(5) for further information on how to define regions.
 
-*<action name="NextWindow" />*
-	Cycle focus to next window.
+*<action name="UnSnap" />*
+	Resize and move the active window back to its untiled or unmaximized
+	position if it had been maximized or tiled to a direction or region.
 
+*<action name="NextWindow" />*++
 *<action name="PreviousWindow" />*
-	Cycle focus to previous window.
+	Cycle focus to next/previous window respectively.++
+	Default keybind for NextWindow is Alt-Tab.
+
+	The shift key is used to reverse direction while cycling.
+
+	The arrow keys are used to move forwards/backwards while cycling.
 
 *<action name="Reconfigure" />*
 	Re-load configuration and theme files.
@@ -111,14 +127,26 @@ Actions are used in menus and keyboard/mouse bindings.
 *<action name="ShowMenu" menu="value" atCursor="yes" />*
 	Show a menu.
 
-	*menu* The name of the menu to show. The menus "root-menu" and
-	"client-menu" are guaranteed to exist, but others may be defined
-	explicitly. See labwc-menu(5) for more information.
+	*menu* The name of the menu to show. The menus "root-menu",
+	"client-menu", "client-send-to-menu" and "client-list-combined-menu"
+	are guaranteed to exist, but others may be defined explicitly.
+	See labwc-menu(5) for more information.
 
 	*atCursor* [yes|no] When opening a menu, open the menu at the location
 	of the mouse cursor. When set to no, the menu will appear at the
-	upper-left corner of the window associated with the action. Default is
-	yes.
+	upper-left corner of the window associated with the action or underneath
+	the window button that opened the menu. Default is yes.
+
+	*position* Show the menu in the specified position on the monitor
+	that has cursor focus, see below.
+
+	The position tag has two sub-tags. <x> and <y> specify a position and
+	take either a pixel value, the string "center" which will center the
+	menu in that dimension, or a relative value specified as a percentage
+	A relative value is interpreted in terms of the monitor the menu will
+	be shown on, and will be relative to the left/top edge of the menu
+	window and monitor for positive values, and to the right/bottom edge
+	for negative values.
 
 *<action name="SetDecorations" decorations="value" forceSSD="no" />*
 	Set decorations of focused window.
@@ -184,12 +212,27 @@ Actions are used in menus and keyboard/mouse bindings.
 	original window. There can be multiple windows with this mode set.
 
 *<action name="ToggleTearing" />*
-	Toggles tearing for the focused window.
+	Toggles tearing for the focused window between enabled and disabled.
+	This overrides the preference (tearing hint) from the focused window.
 
-*<action name="FocusOutput" output="HDMI-A-1" />*
-	Give focus to topmost window on given output and warp the cursor
-	to the center of the window. If the given output does not contain
-	any windows, the cursor is centered on the given output.
+	Requires the config option 'allowTearing'. When 'allowTearing' is set
+	to 'fullscreen' or 'fullscreenForced', tearing will still only be
+	enabled if the active window is in fullscreen mode.
+
+*<action name="FocusOutput" output="HDMI-A-1" direction="value" wrap="no" />*
+	Give focus to topmost window on other output and warp the cursor
+	to the center of the window.
+
+	If *output* is specified, the focus is given to the specified output and
+	*direction* is ignored. If *output* is omitted, *direction* may be one
+	of "left", "right", "up" or "down" to indicate that the focus should be
+	given to the next output in that direction (if one exists).
+
+	*wrap* [yes|no] When using the direction attribute, wrap around
+	from right-to-left or top-to-bottom, and vice versa. Default is no.
+
+	If the target output does not contain any windows, the cursor will
+	be centered on the output.
 
 *<action name="MoveToOutput" output="HDMI-A-1" direction="value" wrap="no" />*
 	Moves active window to other output, unless the window state is
@@ -273,9 +316,9 @@ Actions are used in menus and keyboard/mouse bindings.
 *<action name="AutoPlace" policy="value"/>*
 	Reposition the window according to the desired placement policy.
 
-	*policy* [automatic|cursor|center] Use the specified policy, which has
-	the same meaning as the corresponding value for *<placement><policy>*.
-	Default is automatic.
+	*policy* [automatic|cursor|center|cascade] Use the specified policy,
+	which has the same meaning as the corresponding value for
+	*<placement><policy>*. Default is automatic.
 
 *<action name="Shade" />*++
 *<action name="Unshade" />*++
@@ -286,6 +329,11 @@ Actions are used in menus and keyboard/mouse bindings.
 	decorations (including those for which the server-side titlebar has been
 	hidden) are not eligible for shading.
 
+*<action name="EnableTabletMouseEmulation" />*++
+*<action name="DisableTabletMouseEmulation" />*++
+*<action name="ToggleTabletMouseEmulation">*
+	Enable, disable or toggle mouse emulation for drawing tablets respectively.
+
 *<action name="ToggleMagnify">*
 	Toggle the screen magnifier on or off at the last magnification level
 	used.
diff --git a/docs/labwc-config.5.scd b/docs/labwc-config.5.scd
index 9a0fe7c0..97d684ac 100644
--- a/docs/labwc-config.5.scd
+++ b/docs/labwc-config.5.scd
@@ -8,7 +8,7 @@ labwc - configuration files
 
 Labwc uses openbox-3.6 specification for configuration and theming, but does not
 support all options. The following files form the basis of the labwc
-configuration: rc.xml, menu.xml, autostart, shutdown and environment.
+configuration: rc.xml, menu.xml, autostart, shutdown, environment and xinitrc.
 
 No configuration files are needed to start and run labwc.
 
@@ -78,6 +78,10 @@ in labwc-theme(5).
 *rc.xml* is the main configuration file and all its options are described in
 detail below.
 
+The *xinitrc* file is executed as a shell script whenever labwc launches the
+Xwayland X11 server. This may happen multiple times throughout the session if
+Xwayland is not configured to persist when no X11 clients are connected.
+
 # CONFIGURATION
 
 This section describes *rc.xml* configuration options.
@@ -181,11 +185,23 @@ this is for compatibility with Openbox.
 	*fullscreen* enables adaptive sync whenever a window is in fullscreen
 	mode.
 
-*<core><allowTearing>* [yes|no]
+*<core><allowTearing>* [yes|no|fullscreen|fullscreenForced]
 	Allow tearing to reduce input lag. Default is no.
-	This option requires setting the environment variable
-	WLR_DRM_NO_ATOMIC=1.
-	*yes* allow tearing if requested by the active window.
+
+	*yes* allows tearing if requested by the active window.
+
+	*fullscreen* allows tearing if requested by the active window, but
+	only when the window is in fullscreen mode.
+
+	*fullscreenForced* enables tearing whenever the active window is in
+	fullscreen mode, whether or not the application has requested tearing.
+
+	Use the *ToggleTearing* action for forcefully enable tearing.
+
+	Note: Enabling this option with atomic mode setting is experimental. If
+	you experience undesirable side effects when tearing is allowed,
+	consider setting the environment variable WLR_DRM_NO_ATOMIC=1 when
+	launching labwc.
 
 *<core><reuseOutputMode>* [yes|no]
 	Try to re-use the existing output mode (resolution / refresh rate).
@@ -194,14 +210,31 @@ this is for compatibility with Openbox.
 	be used with labwc the preferred mode of the monitor is used instead.
 	Default is no.
 
+*<core><xwaylandPersistence>* [yes|no]
+	Keep XWayland alive even when no clients are connected, rather than
+	using a "lazy" policy that allows the server to launch on demand and die
+	when it is no longer needed. Default is no.
+
+	Note: changing this setting requires a restart of labwc.
+
 ## PLACEMENT
 
-*<placement><policy>* [center|automatic|cursor]
+*<placement><policy>* [center|automatic|cursor|cascade]
 	Specify a placement policy for new windows. The "center" policy will
 	always place windows at the center of the active output. The "automatic"
 	policy will try to place new windows in such a way that they will
 	have minimal overlap with existing windows. The "cursor" policy will
-	center new windows under the cursor. Default is "center".
+	center new windows under the cursor. The "cascade" policy will try to
+	place new windows at the center of the active output, but possibly
+	shifts its position to bottom-right not to cover existing windows.
+	Default is "center".
+
+*<placement><cascadeOffset><x>*++
+*<placement><cascadeOffset><y>*
+	Specify the offset by which a new window can be shifted from an existing
+	window when <placement><policy> is "cascade". These values must be positive.
+	Default is the height of titlebar (the sum of *titlebar.height* and
+	*border.width* from theme) plus 5 for both *x* and *y*.
 
 ## WINDOW SWITCHER
 
@@ -293,6 +326,15 @@ this is for compatibility with Openbox.
 
 	The default value for both parameters is 20 pixels.
 
+*<resistance><unSnapThreshold>*
+	Sets the movement of cursor in pixel required for a tiled or maximized
+	window to be moved with an interactive move. Default is 20.
+
+*<resistance><unMaximizeThreshold>*
+	Sets the one-dimentional movement of cursor in pixel required for a
+	*vertically or horizontally* maximized window to be moved with an
+	interactive move. Default is 150.
+
 ## FOCUS
 
 *<focus><followMouse>* [yes|no]
@@ -395,6 +437,29 @@ extending outward from the snapped edge.
 *<theme><name>*
 	The name of the Openbox theme to use. It is not set by default.
 
+*<theme><icon>*
+	The name of the icon theme to use. It is not set by default.
+
+*<theme><titlebar><layout>*
+	Selection and order of buttons in a window's titlebar.
+	The following identifiers can be used, each only once:
+	- 'icon': window icon
+	- 'menu': window menu
+	- 'iconify': iconify
+	- 'max': maximize toggle
+	- 'close': close
+	- 'shade': shade toggle
+	- 'desk': all-desktops toggle
+
+	A colon deliminator is used to separate buttons on the left and right,
+	whereas commas are used to separate items within a section. It is
+	mandatory to use one colon.
+
+	Default: icon:iconify,max,close
+
+*<theme><titlebar><showTitle>* [yes|no]
+	Show the window title in the titlebar. Default is yes.
+
 *<theme><cornerRadius>*
 	The radius of server side decoration top corners. Default is 8.
 
@@ -411,6 +476,7 @@ extending outward from the snapped edge.
 	- ActiveWindow - titlebar of active window
 	- InactiveWindow - titlebar of all windows that aren't focused by the
 	  cursor
+	- MenuHeader - menu title
 	- MenuItem - menu item (currently only root menu)
 	- OnScreenDisplay - items in the on screen display
 	If no place attribute is provided, the setting will be applied to all
@@ -423,7 +489,7 @@ extending outward from the snapped edge.
 	Font size in pixels. Default is 10.
 
 *<theme><font place=""><slant>*
-	Font slant (normal or italic). Default is normal.
+	Font slant (normal, oblique or italic). Default is normal.
 
 *<theme><font place=""><weight>*
 	Font weight (normal or bold). Default is normal.
@@ -471,7 +537,7 @@ extending outward from the snapped edge.
 	Stores the keyboard layout either globally or per window and restores
 	it when switching back to the window. Default is global.
 
-*<keyboard><keybind key="" layoutDependent="">*
+*<keyboard><keybind key="" layoutDependent="" onRelease="" allowWhenLocked="">*
 	Define a *key* binding in the format *modifier-key*, where supported
 	modifiers are:
 	- S (shift)
@@ -497,8 +563,11 @@ extending outward from the snapped edge.
 	If set to "no" (or is absent) the keybind will be layout agnostic.
 	Default is no.
 
-*<keyboard><keybind key="" onRelease="yes|no">*
-	*onRelease*, when yes, fires the keybind action when the key or key
+	*allowWhenLocked* [yes|no]
+	Make this keybind work even if the screen is locked. Default is no.
+
+	*onRelease* [yes|no]
+	When yes, fires the keybind action when the key or key
 	combination is released, rather than first pressed. This is useful to
 	bind actions to only modifier keys, where the action should fire when
 	the modifier is used without another key. Default is no.
@@ -507,7 +576,6 @@ extending outward from the snapped edge.
 	pressed & released, without interference from other multi-key
 	combinations that include the super key:
 
-
 	```
 	<keybind key="Super_L" onRelease="yes">
 	  <action name="Execute" command="rofi -show drun"/>
@@ -551,9 +619,6 @@ extending outward from the snapped edge.
 *<mouse><doubleClickTime>*
 	Set double click time in milliseconds. Default is 500.
 
-*<mouse><scrollFactor>*
-	Set scroll factor. Default is 1.0.
-
 *<mouse><context name=""><mousebind button="" direction="" action=""><action>*
 	Multiple *<mousebind>* can exist within one *<context>*; and multiple
 	*<action>* can exist within one *<mousebind>*.
@@ -563,10 +628,13 @@ extending outward from the snapped edge.
 	  buttons and the window title are shown.
 	- Title: The area of the titlebar (including blank space) between
 	  the window buttons, where the window title is displayed.
-	- WindowMenu: The button on the left.
-	- Iconify: The button that looks like an underline.
-	- Maximize: The button that looks like a box.
-	- Close: The button that looks like an X.
+	- Icon: A window icon that, by default, displays a window menu.
+	- WindowMenu: A button that, by default, displays a window menu.
+	- Iconify: A button that, by default, iconifies a window.
+	- Maximize: A button that, by default, toggles maximization of a window.
+	- Shade: A button that, by default, toggles window shading.
+	- AllDesktops: A button that, by default, toggles omnipresence of a window.
+	- Close: A button that, by default, closses a window.
 	- Top: The top edge of the window's border.
 	- Bottom: The bottom edge of the window's border.
 	- Left: The left edge of the window's border.
@@ -656,9 +724,12 @@ extending outward from the snapped edge.
 	If the output name is left empty or the output does not exists, the
 	tablet will span all outputs.
 
+	The tablet cursor automatically applies the orientation/rotation of
+	a mapped output for absolute motion.
+
 *<tablet rotate="" />* [0|90|180|270]
 	The tablet orientation can be changed in 90 degree steps. Default is
-	no rotation (0). Rotation will be applied after applying tablet area
+	no rotation (0). Rotation will be applied before applying tablet area
 	transformation.
 
 	See also *calibrationMatrix* in libinput section below for advanced
@@ -688,6 +759,9 @@ extending outward from the snapped edge.
 	tablet specific restrictions, e.g. no support for drag-and-drop, but
 	also omits tablet specific features like reporting pen pressure.
 
+	Use the *ToggleTabletMouseEmulation* action for toggling between
+	mouse emulation on and off.
+
 *<tablet><map button="" to="" />*
 	Pen and pad buttons behave like regular mouse buttons.With mouse
 	emulation set to "no", which is the default, and if not	specified
@@ -724,6 +798,24 @@ extending outward from the snapped edge.
 
 	See mouse section above for all supported mouse buttons.
 
+## TABLET TOOL
+
+```
+<tabletTool motion="absolute" relativeMotionSensitivity="1" />
+```
+
+*<tabletTool motion="">* [absolute|relative]
+	All tablet tools, except of type mouse and lens, use "absolute"
+	positioning by default. The *motion* attribute allows to set tools
+	to relative motion instead. Positioning for a tablet mouse or
+	tablet lens cannot be changed, those tools always use relative mode.
+
+*<tabletTool relativeMotionSensitivity="">*
+	When using relative motion, *relativeMotionSensitivity* controls
+	the speed of the cursor. Using a value lower than 1.0 decreases the
+	speed, using a value greater than 1.0 increases the speed of the
+	cursor. The default is "1.0".
+
 ## LIBINPUT
 
 ```
@@ -742,6 +834,7 @@ extending outward from the snapped edge.
     <clickMethod></clickMethod>
     <sendEventsMode></sendEventsMode>
     <calibrationMatrix></calibrationMatrix>
+    <scrollFactor>1.0</scrollFactor>
   </device>
 </libinput>
 ```
@@ -867,6 +960,9 @@ The most common matrices are:
 	visit https://wayland.freedesktop.org/libinput/doc/latest/absolute-axes.html#calibration-of-absolute-devices
 	for more information.
 
+*<libinput><scrollFactor>*
+	Set scroll factor. Default is 1.0.
+
 ## WINDOW RULES
 
 Two types of window rules are supported, actions and properties. They are
@@ -960,7 +1056,7 @@ situation.
 *<menu><ignoreButtonReleasePeriod>*
 	How long (in milliseconds) the initial button release event is ignored
 	for. The reason for this logic and behaviour is to avoid a fast
-	press-move-release sequence indended to just open the menu resulting in
+	press-move-release sequence intended to just open the menu resulting in
 	the closure of the menu or the selection of (typically the first) menu
 	item. This behaviour only affects the first button-release. It is not
 	anticipated that most users will want to change this, but the config
diff --git a/docs/labwc-menu.5.scd b/docs/labwc-menu.5.scd
index b4688a07..072a7ea7 100644
--- a/docs/labwc-menu.5.scd
+++ b/docs/labwc-menu.5.scd
@@ -25,7 +25,7 @@ The menu file must be entirely enclosed within <openbox_menu> and
   <!-- A submenu defined elsewhere -->
   <menu id="" />
 
-  <!-- Horizontal line >
+  <!-- Horizontal line -->
   <separator />
 
   <!-- An inline submenu -->
@@ -33,6 +33,9 @@ The menu file must be entirely enclosed within <openbox_menu> and
     ...some content...
   </menu>
 
+  <!-- Title -->
+  <separator label=""/>
+
   <!-- Pipemenu -->
   <menu id="" label="" execute="COMMAND"/>
 
@@ -45,6 +48,12 @@ The menu file must be entirely enclosed within <openbox_menu> and
 	ShowMenu action. Default identifiers are
 		- "root-menu" for the root window context menu
 		- "client-menu" for a window's titlebar context menu
+		- "client-list-combined-menu" for a list of all windows across
+		  all workspaces. Will change focus to the app that gets
+		  selected or go to workspace without activating any app if
+		  "Go there" is selected.
+		- "client-send-to-menu" shows all workspaces and sends current
+		  view to that workspace when selected.
 
 *menu.id* (when nested under other *<menu>* element)
 	Link to a submenu defined elsewhere (by a *<menu id="">* at toplevel)
@@ -63,6 +72,11 @@ The menu file must be entirely enclosed within <openbox_menu> and
 *menu.separator*
 	Horizontal line.
 
+*menu.separator.label*
+	In a "separator" element, the label attribute transforms the separator
+	from a horizontal line to a menu title (heading) with the text specified
+	by label in it.
+
 *menu.execute*
 	Command to execute for pipe menu. See details below.
 
diff --git a/docs/labwc-theme.5.scd b/docs/labwc-theme.5.scd
index 72599523..7ecabe7a 100644
--- a/docs/labwc-theme.5.scd
+++ b/docs/labwc-theme.5.scd
@@ -47,17 +47,17 @@ labwc-config(5).
 # THEME ELEMENTS
 
 *border.width*
-	Line width (integer) of border border drawn around window frames.
+	Line width (integer) of border drawn around window frames.
 	Default is 1.
 
-*padding.height*
-	Vertical padding size, used for spacing out elements in the window
-	decorations. Default is 3.
+*window.titlebar.padding.width*
+	Horizontal titlebar padding size, in pixels, between border and first
+	button on the left/right.
+	Default is 0.
 
-*titlebar.height*
-	Window title bar height.
-	Default equals the vertical font extents of the title plus 2x
-	padding.height.
+*window.titlebar.padding.height*
+	Vertical titlebar padding size, in pixels.
+	Default is 0.
 
 *menu.items.padding.x*
 	Horizontal padding of menu text entries in pixels.
@@ -67,6 +67,10 @@ labwc-config(5).
 	Vertical padding of menu text entries in pixels.
 	Default is 4.
 
+*menu.title.text.justify*
+	Specifies how menu titles are aligned in the titlebar.
+	Type justification. Default Center.
+
 *menu.overlap.x*
 	Horizontal overlap in pixels between submenus and their parents. A
 	positive value move submenus over the top of their parents, whereas a
@@ -114,6 +118,22 @@ labwc-config(5).
 	Specifies how window titles are aligned in the titlebar for both
 	focused and unfocused windows. Type justification. Default Left.
 
+*window.button.width*
+	Width of a titlebar button, in pixels.
+	Default is 26.
+
+*window.button.spacing*
+	Space between titlebar buttons, in pixels.
+	Default is 0.
+
+*window.button.hover.bg.corner-radius*
+	Radius of the hover effect of a titlebar button, in pixels.
+	Default is 0.
+
+	Note: for a circular hover effect, set *window.button.width* and
+	*window.button.height* equal and *window.button.hover.bg.corner-radius* half
+	of them.
+
 *window.active.button.unpressed.image.color*
 	Color of the images in titlebar buttons in their default, unpressed,
 	state. This element is for the focused window.
@@ -122,13 +142,19 @@ labwc-config(5).
 	Color of the images in titlebar buttons in their default, unpressed,
 	state. This element is for non-focused windows.
 
-Note: The button elements (i.e. window.[in]active.button.\*) support defining
-different types of buttons individually by inserting the type ("menu",
-"iconify", "max" and "close") after the button node. For example:
-window.active.button.iconify.unpressed.image.color
-This syntax is not documented on the openbox.org wiki, but is supported by
-openbox and is used by many popular themes. For the sake of brevity, these
-elements are not listed here, but are supported.
+Note: Button elements (i.e. window.[in]active.button.\*) may be defined uniquely
+for each type of button ("menu", "iconify", "max", "shade", "desk" or "close")
+by appending the type after the "button" node. For example:
+
+- window.active.button.iconify.unpressed.image.color indicates the color of the
+iconify button for active windows; while
+
+- window.inactive.button.close.unpressed.image.color indicates the color of the
+close button for inactive windows.
+
+This syntax is not documented by Openbox, but is supported and is used by many
+popular themes. For the sake of brevity, these elements are not listed here, but
+all are supported.
 
 *window.active.shadow.size*
 	Size of the drop-shadow for the focused window, in pixels.
@@ -170,6 +196,13 @@ elements are not listed here, but are supported.
 *menu.separator.color*
 	Menu separator color. Default #888888.
 
+*menu.title.bg.color*
+	Menu title color. Default #589bda.
+	Note: A menu title is a separator with a label.
+
+*menu.title.text.color*
+	Text color of separator label.  Default #ffffff.
+
 *osd.bg.color*
 	Background color of on-screen-display. Inherits
 	*window.active.title.bg.color* if not set.
@@ -303,6 +336,10 @@ file within a particular theme. The following xbm buttons are supported:
 - close.xbm
 - menu.xbm
 - max_toggled.xbm
+- desk.xbm
+- desk_toggled.xbm
+- shade.xbm
+- shade_toggled.xbm
 
 Additional icons can be defined to be shown when the mouse pointer is hovering
 over the button in question:
@@ -312,6 +349,10 @@ over the button in question:
 - close_hover.xbm
 - menu_hover.xbm
 - max_toggled_hover.xbm
+- desk_hover.xbm
+- desk_toggle_hover.xbm
+- shade_hover.xbm
+- shade_toggle_hover.xbm
 
 One advantage of xbm buttons over other formats is that they change color based
 on the theme. Other formats use the suffices "-active" and "-inactive" to align
@@ -345,6 +386,22 @@ following icons should be added:
 - menu_hover-active.[png|svg]
 - menu_hover-inactive.[png|svg]
 - menu-inactive.[png|svg]
+- shade-active.[png|svg]
+- shade_hover-active.[png|svg]
+- shade_hover-inactive.[png|svg]
+- shade-inactive.[png|svg]
+- shade_toggled-active.[png|svg]
+- shade_toggled-inactive.[png|svg]
+- shade_toggled_hover-active.[png|svg]
+- shade_toggled_hover-inactive.[png|svg]
+- desk-active.[png|svg]
+- desk_hover-active.[png|svg]
+- desk_hover-inactive.[png|svg]
+- desk-inactive.[png|svg]
+- desk_toggled-active.[png|svg]
+- desk_toggled-inactive.[png|svg]
+- desk_toggled_hover-active.[png|svg]
+- desk_toggled_hover-inactive.[png|svg]
 
 # DEFINITIONS
 
diff --git a/docs/menu.xml b/docs/menu.xml
index a23f1b91..f64228a6 100644
--- a/docs/menu.xml
+++ b/docs/menu.xml
@@ -37,12 +37,24 @@
       <action name="ToggleOmnipresent" />
     </item>
   </menu>
+  <!--
+    openbox default workspace selector
+    to use replace above workspace menu with the example below
+    the label is required, but you can change the text.
+
+    <menu id="client-send-to-menu" label="Send to..." />
+  -->
   <item label="Close">
     <action name="Close" />
   </item>
 </menu>
 
 <menu id="root-menu">
+  <!-- Make client-list-combined-menu a submenu of root-menu 
+       You must supply a label or it will not appear in root-menu -->
+  <!--
+  <menu id="client-list-combined-menu" label="Running..." />
+  -->
   <item label="Web browser">
     <action name="Execute" command="firefox" />
   </item>
@@ -61,6 +73,12 @@
 </menu>
 
 <menu id="some-custom-menu">
+  <!--
+    Creates menu title.
+    To create an empty header with no text,
+    set label=" ", not label=""
+  -->
+  <separator label="custom menu" />
   <item label="Reconfigure">
     <action name="Reconfigure" />
   </item>
diff --git a/docs/rc.xml.all b/docs/rc.xml.all
index 566f9249..b1a8bae6 100644
--- a/docs/rc.xml.all
+++ b/docs/rc.xml.all
@@ -13,15 +13,26 @@
     <adaptiveSync>no</adaptiveSync>
     <allowTearing>no</allowTearing>
     <reuseOutputMode>no</reuseOutputMode>
+    <xwaylandPersistence>no</xwaylandPersistence>
   </core>
 
   <placement>
     <policy>center</policy>
+    <!--
+      When <placement><policy> is "cascade", the offset for cascading new
+      windows can be overwritten like this:
+      <cascadeOffset x="40" y="30" />
+    -->
   </placement>
 
   <!-- <font><theme> can be defined without an attribute to set all places -->
   <theme>
     <name></name>
+    <icon></icon>
+    <titlebar>
+      <layout>icon:iconify,max,close</layout>
+      <showTitle>yes</showTitle>
+    </titlebar>
     <cornerRadius>8</cornerRadius>
     <keepBorder>yes</keepBorder>
     <dropShadows>no</dropShadows>
@@ -37,6 +48,12 @@
       <slant>normal</slant>
       <weight>normal</weight>
     </font>
+    <font place="MenuHeader">
+      <name>sans</name>
+      <size>10</size>
+      <slant>normal</slant>
+      <weight>normal</weight>
+    </font>
     <font place="MenuItem">
       <name>sans</name>
       <size>10</size>
@@ -101,6 +118,10 @@
   <resistance>
     <screenEdgeStrength>20</screenEdgeStrength>
     <windowEdgeStrength>20</windowEdgeStrength>
+    <!-- resistance for maximized/tiled windows -->
+    <unSnapThreshold>20</unSnapThreshold>
+    <!-- resistance for vertically/horizontally maximized windows -->
+    <unMaximizeThreshold>150</unMaximizeThreshold>
   </resistance>
 
   <resize>
@@ -252,7 +273,7 @@
       <action name="SnapToEdge" direction="down" />
     </keybind>
     <keybind key="A-Space">
-      <action name="ShowMenu" menu="client-menu" />
+      <action name="ShowMenu" menu="client-menu" atCursor="no" />
     </keybind>
     <keybind key="XF86_AudioLowerVolume">
       <action name="Execute" command="amixer sset Master 5%-" />
@@ -299,6 +320,16 @@
       <action name="SnapToRegion" region="bottom-right" />
     </keybind>
   -->
+  <!-- keybind for client-list-combined-menu - will center in middle of screen -->
+  <!--
+    <keybind key="W-Space">
+      <action name="ShowMenu" menu="client-list-combined-menu" />
+      <position>
+        <x>center</x> 
+        <y>center</y>
+      </position>
+    </keybind>
+  -->
   </keyboard>
 
   <!--
@@ -316,7 +347,6 @@
 
     <!-- time is in ms -->
     <doubleClickTime>500</doubleClickTime>
-    <scrollFactor>1.0</scrollFactor>
 
     <context name="Frame">
       <mousebind button="A-Left" action="Press">
@@ -421,10 +451,31 @@
 
     <context name="WindowMenu">
       <mousebind button="Left" action="Click">
-        <action name="ShowMenu" menu="client-menu" />
+        <action name="ShowMenu" menu="client-menu" atCursor="no" />
       </mousebind>
       <mousebind button="Right" action="Click">
-        <action name="ShowMenu" menu="client-menu" />
+        <action name="ShowMenu" menu="client-menu" atCursor="no" />
+      </mousebind>
+    </context>
+
+    <context name="Icon">
+      <mousebind button="Left" action="Click">
+        <action name="ShowMenu" menu="client-menu" atCursor="no" />
+      </mousebind>
+      <mousebind button="Right" action="Click">
+        <action name="ShowMenu" menu="client-menu" atCursor="no" />
+      </mousebind>
+    </context>
+
+    <context name="Shade">
+      <mousebind button="Left" action="Click">
+        <action name="ToggleShade" />
+      </mousebind>
+    </context>
+
+    <context name="AllDesktops">
+      <mousebind button="Left" action="Click">
+        <action name="ToggleOmnipresent" />
       </mousebind>
     </context>
 
@@ -464,6 +515,8 @@
       </mousebind>
       <mousebind button="Middle" action="Press">
         <action name="ShowMenu" menu="root-menu" />
+	<!-- openbox default, swap with above line to activate -->
+        <!-- <action name="ShowMenu" menu="client-list-combined-menu" /> -->
       </mousebind>
       <mousebind direction="Up" action="Scroll">
         <action name="GoToDesktop" to="left" wrap="yes" />
@@ -523,6 +576,16 @@
     <map button="Stylus2" to="Middle" />
   </tablet>
 
+  <!--
+    All tablet tools, except of type mouse and lens, use absolute
+    positioning by default. The *motion* attribute allows to set tools
+    to relative motion instead. When using relative motion,
+    *relativeMotionSensitivity* controls the speed of the cursor. Using
+    a value lower than 1.0 decreases the speed, using a value greater than
+    1.0 increases the speed of the cursor.
+  -->
+  <tabletTool motion="absolute" relativeMotionSensitivity="1.0" />
+
   <!--
     The *category* attribute is optional and can be set to touch, touchpad,
     non-touch, default or the name of a device. You can obtain device names by
@@ -538,6 +601,7 @@
       - clickMethod [none|buttonAreas|clickfinger]
       - sendEventsMode [yes|no|disabledOnExternalMouse]
       - calibrationMatrix [six float values split by space]
+      - scrollFactor [float]
   -->
   <libinput>
     <device category="default">
@@ -554,6 +618,7 @@
       <clickMethod></clickMethod>
       <sendEventsMode></sendEventsMode>
       <calibrationMatrix></calibrationMatrix>
+      <scrollFactor>1.0</scrollFactor>
     </device>
   </libinput>
 
diff --git a/docs/themerc b/docs/themerc
index 7602da9d..cf485eaf 100644
--- a/docs/themerc
+++ b/docs/themerc
@@ -7,11 +7,13 @@
 
 # general
 border.width: 1
-padding.height: 3
 
-# The following options has no default, but fallbacks back to
-# font-height + 2x padding.height if not set.
-# titlebar.height:
+#
+# We do not support the global padding.{width,height} of openbox because
+# the default labwc button geometry has deviates from that of openbox
+#
+window.titlebar.padding.width: 0
+window.titlebar.padding.height: 0
 
 # window border
 window.active.border.color: #e1dedb
@@ -29,6 +31,14 @@ window.active.label.text.color: #000000
 window.inactive.label.text.color: #000000
 window.label.text.justify: center
 
+# window button width and spacing
+window.button.width: 26
+window.button.height: 26
+window.button.spacing: 0
+
+# window button hover effect
+window.button.hover.bg.corner-radius: 0
+
 # window buttons
 window.active.button.unpressed.image.color: #000000
 window.inactive.button.unpressed.image.color: #000000
@@ -59,6 +69,9 @@ menu.separator.width: 1
 menu.separator.padding.width: 6
 menu.separator.padding.height: 3
 menu.separator.color: #888888
+menu.title.bg.color: #589bda
+menu.title.text.color: #ffffff
+menu.title.text.justify: Center
 
 # on screen display (window-cycle dialog)
 osd.bg.color: #e1dedb
diff --git a/docs/xinitrc b/docs/xinitrc
new file mode 100644
index 00000000..5e6b0516
--- /dev/null
+++ b/docs/xinitrc
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+## This file is run every time labwc launches Xwayland.
+##
+## In the default configuration, Xwayland will be launched lazily, and will
+## terminate after several seconds when no X11 clients are connected. Thus,
+## this script may run repeatedly throughout a single labwc session.
+
+# Configure the X resource database if a file is provided
+#
+# NOTE: when Xwayland is launched lazily, an X11 client that triggers its
+# launch may attempt to read the resource database before this command can be
+# run. In that case, it is recommended to make a symlink to .Xdefaults:
+#
+#     ln -s .Xresources "${HOME}/.Xdefaults"
+#
+# With this link in place, X11 applications will fall back to reading
+# the .Xdefaults file directly when no resource database can be read from the
+# server's root window properties.
+#
+# Invoking xrdb is still useful to pre-load the resource database for
+# subsequent clients, because any additional clients launched while the X
+# server remains alive will be able to query the database without resorting to
+# filesystem access.
+
+if [ -r "${HOME}/.Xresources" ] && command -v xrdb >/dev/null 2>&1; then
+	xrdb -merge "${HOME}/.Xresources"
+fi
diff --git a/include/action.h b/include/action.h
index 799c15ce..7130d701 100644
--- a/include/action.h
+++ b/include/action.h
@@ -7,6 +7,7 @@
 
 struct view;
 struct server;
+struct cursor_context;
 
 struct action {
 	struct wl_list link; /*
@@ -34,8 +35,16 @@ void action_arg_from_xml_node(struct action *action, const char *nodename, const
 
 bool actions_contain_toggle_keybinds(struct wl_list *action_list);
 
+/**
+ * actions_run() - Run actions.
+ * @activator: Target view to apply actions (e.g. Maximize, Focus etc.).
+ * NULL is allowed, in which case the focused/hovered view is used.
+ * @ctx: Set for action invocations via mousebindings. Used to get the
+ * direction of resize or the position of the window menu button for ShowMenu
+ * action.
+ */
 void actions_run(struct view *activator, struct server *server,
-	struct wl_list *actions, uint32_t resize_edges);
+	struct wl_list *actions, struct cursor_context *ctx);
 
 void action_free(struct action *action);
 void action_list_free(struct wl_list *action_list);
diff --git a/include/buffer.h b/include/buffer.h
index a0ab3096..7bf3fbe5 100644
--- a/include/buffer.h
+++ b/include/buffer.h
@@ -32,21 +32,55 @@
 struct lab_data_buffer {
 	struct wlr_buffer base;
 
-	cairo_t *cairo;
-	void *data;
+	cairo_surface_t *surface; /* optional */
+	cairo_t *cairo;           /* optional */
+	void *data; /* owned by surface if surface != NULL */
 	uint32_t format;
 	size_t stride;
-	bool free_on_destroy;
-	uint32_t unscaled_width;
-	uint32_t unscaled_height;
+	/*
+	 * The logical size of the surface in layout pixels.
+	 * The raw pixel data may be larger or smaller.
+	 */
+	uint32_t logical_width;
+	uint32_t logical_height;
 };
 
-/* Create a buffer which creates a new cairo CAIRO_FORMAT_ARGB32 surface */
-struct lab_data_buffer *buffer_create_cairo(uint32_t width, uint32_t height,
-	float scale, bool free_on_destroy);
+/*
+ * Create a buffer which holds (and takes ownership of) an existing
+ * CAIRO_FORMAT_ARGB32 image surface.
+ *
+ * The logical size is set to the surface size in pixels, ignoring
+ * device scale. No cairo context is created.
+ */
+struct lab_data_buffer *buffer_adopt_cairo_surface(cairo_surface_t *surface);
 
-/* Create a buffer which wraps a given DRM_FORMAT_ARGB8888 pointer */
-struct lab_data_buffer *buffer_create_wrap(void *pixel_data, uint32_t width,
-	uint32_t height, uint32_t stride, bool free_on_destroy);
+/*
+ * Create a buffer which holds a new CAIRO_FORMAT_ARGB32 image surface.
+ * Additionally create a cairo context for drawing to the surface.
+ */
+struct lab_data_buffer *buffer_create_cairo(uint32_t logical_width,
+	uint32_t logical_height, float scale);
+
+/*
+ * Create a buffer from an image surface, for display as an icon.
+ *
+ * The surface is either adopted by the buffer (which takes ownership),
+ * or copied and then destroyed.
+ *
+ * This function allows non-ARGB32 source images and converts to
+ * CAIRO_FORMAT_ARGB32 if needed.
+ */
+struct lab_data_buffer *buffer_convert_cairo_surface_for_icon(
+	cairo_surface_t *surface, uint32_t icon_size, float scale);
+
+/*
+ * Create a buffer which holds (and takes ownership of) raw pixel data
+ * in pre-multiplied ARGB32 format.
+ *
+ * The logical size is set to the width and height of the pixel data.
+ * No cairo surface or context is created.
+ */
+struct lab_data_buffer *buffer_create_from_data(void *pixel_data, uint32_t width,
+	uint32_t height, uint32_t stride);
 
 #endif /* LABWC_BUFFER_H */
diff --git a/include/button/button-png.h b/include/button/button-png.h
deleted file mode 100644
index 31d01ff5..00000000
--- a/include/button/button-png.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef LABWC_BUTTON_PNG_H
-#define LABWC_BUTTON_PNG_H
-
-struct lab_data_buffer;
-
-void button_png_load(const char *button_name, struct lab_data_buffer **buffer);
-
-#endif /* LABWC_BUTTON_PNG_H */
diff --git a/include/button/button-svg.h b/include/button/button-svg.h
deleted file mode 100644
index 884a8846..00000000
--- a/include/button/button-svg.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef LABWC_BUTTON_SVG_H
-#define LABWC_BUTTON_SVG_H
-
-struct lab_data_buffer;
-
-void button_svg_load(const char *button_name, struct lab_data_buffer **buffer,
-	int size);
-
-#endif /* LABWC_BUTTON_SVG_H */
diff --git a/include/button/button-xbm.h b/include/button/button-xbm.h
deleted file mode 100644
index dd0e3169..00000000
--- a/include/button/button-xbm.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef LABWC_BUTTON_XBM_H
-#define LABWC_BUTTON_XBM_H
-
-struct lab_data_buffer;
-
-/**
- * button_xbm_from_bitmap() - create button from monochrome bitmap
- * @bitmap: bitmap data array in hexadecimal xbm format
- * @buffer: cairo-surface-buffer to create
- * @rgba: color
- *
- * Example bitmap: char button[6] = { 0x3f, 0x3f, 0x21, 0x21, 0x21, 0x3f };
- */
-void button_xbm_from_bitmap(const char *bitmap, struct lab_data_buffer **buffer,
-	float *rgba);
-
-/* button_xbm_load - Convert xbm file to buffer with cairo surface */
-void button_xbm_load(const char *button_name, struct lab_data_buffer **buffer,
-	float *rgba);
-
-#endif /* LABWC_BUTTON_XBM_H */
diff --git a/include/button/common.h b/include/button/common.h
deleted file mode 100644
index b3b5039c..00000000
--- a/include/button/common.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef LABWC_BUTTON_COMMON_H
-#define LABWC_BUTTON_COMMON_H
-
-#include <stddef.h>
-
-/**
- * button_filename() - Get full filename for button.
- * @name: The name of the button (for example 'iconify.xbm').
- * @buf: Buffer to fill with the full filename
- * @len: Length of buffer
- *
- * Example return value: /usr/share/themes/Numix/openbox-3/iconify.xbm
- */
-void button_filename(const char *name, char *buf, size_t len);
-
-#endif /* LABWC_BUTTON_COMMON_H */
diff --git a/include/common/array.h b/include/common/array.h
index f6c51fc9..a1ea7499 100644
--- a/include/common/array.h
+++ b/include/common/array.h
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef LABWC_ARRAY_H
 #define LABWC_ARRAY_H
+#include <stdio.h>
+#include <stdlib.h>
 #include <wayland-server-core.h>
 
 /*
@@ -41,4 +43,34 @@ wl_array_len(struct wl_array *array)
 		pos && (const char *)pos >= (const char *)(array)->data;               \
 		(pos)--)
 
+/**
+ * array_add() - add item to wl_array and exit on allocation error
+ * @_arr: wl_array to add the item to
+ * @_val: the item to add to the array
+ *
+ * Let us illustrate the function of this macro by an example:
+ *
+ *   uint32_t value = 5;
+ *   array_add(array, value);
+ *
+ * ...is the equivalent of the code below which is how you would
+ * otherwise use the wl_array API:
+ *
+ *   uint32_t *elm = wl_array_add(array, sizeof(uint32_t));
+ *   if (!elm) {
+ *       perror("failed to allocate memory");
+ *       exit(EXIT_FAILURE);
+ *   }
+ *   *elm = value;
+ */
+#define array_add(_arr, _val) do {                           \
+		__typeof__(_val) *_entry = wl_array_add(     \
+			(_arr), sizeof(__typeof__(_val)));   \
+		if (!_entry) {                               \
+			perror("Failed to allocate memory"); \
+			exit(EXIT_FAILURE);                  \
+		}                                            \
+		*_entry = (_val);                            \
+	} while (0)
+
 #endif /* LABWC_ARRAY_H */
diff --git a/include/common/box.h b/include/common/box.h
new file mode 100644
index 00000000..651fcff0
--- /dev/null
+++ b/include/common/box.h
@@ -0,0 +1,26 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef LABWC_BOX_H
+#define LABWC_BOX_H
+
+#include <wlr/util/box.h>
+
+bool box_contains(struct wlr_box *box_super, struct wlr_box *box_sub);
+
+bool box_intersects(struct wlr_box *box_a, struct wlr_box *box_b);
+
+/* Returns the bounding box of 2 boxes */
+void box_union(struct wlr_box *box_dest, struct wlr_box *box_a,
+	struct wlr_box *box_b);
+
+/*
+ * Fits and centers a content box (width & height) within a bounding box
+ * (max_width & max_height). The content box is downscaled if necessary
+ * (preserving aspect ratio) but not upscaled.
+ *
+ * The returned x & y coordinates are the centered content position
+ * relative to the top-left corner of the bounding box.
+ */
+struct wlr_box box_fit_within(int width, int height, int max_width,
+	int max_height);
+
+#endif /* LABWC_BOX_H */
diff --git a/include/common/buf.h b/include/common/buf.h
index bcbc8301..a75c1144 100644
--- a/include/common/buf.h
+++ b/include/common/buf.h
@@ -43,6 +43,13 @@ void buf_expand_tilde(struct buf *s);
  */
 void buf_expand_shell_variables(struct buf *s);
 
+/**
+ * buf_add_fmt - add format string to C string buffer
+ * @s: buffer
+ * @fmt: format string to be added
+ */
+void buf_add_fmt(struct buf *s, const char *fmt, ...);
+
 /**
  * buf_add - add data to C string buffer
  * @s: buffer
diff --git a/include/common/direction.h b/include/common/direction.h
new file mode 100644
index 00000000..bc8cbd0c
--- /dev/null
+++ b/include/common/direction.h
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef LABWC_DIRECTION_H
+#define LABWC_DIRECTION_H
+
+#include "view.h"
+
+enum wlr_direction direction_from_view_edge(enum view_edge edge);
+enum wlr_direction direction_get_opposite(enum wlr_direction direction);
+
+#endif /* LABWC_DIRECTION_H */
diff --git a/include/common/font.h b/include/common/font.h
index ddca15aa..7684f7e2 100644
--- a/include/common/font.h
+++ b/include/common/font.h
@@ -6,7 +6,8 @@ struct lab_data_buffer;
 
 enum font_slant {
 	FONT_SLANT_NORMAL = 0,
-	FONT_SLANT_ITALIC
+	FONT_SLANT_ITALIC,
+	FONT_SLANT_OBLIQUE
 };
 
 enum font_weight {
diff --git a/include/common/scene-helpers.h b/include/common/scene-helpers.h
index 11697a94..021d3b16 100644
--- a/include/common/scene-helpers.h
+++ b/include/common/scene-helpers.h
@@ -7,6 +7,7 @@
 struct wlr_scene_node;
 struct wlr_surface;
 struct wlr_scene_output;
+struct wlr_output_state;
 
 struct wlr_surface *lab_wlr_surface_from_node(struct wlr_scene_node *node);
 
@@ -18,6 +19,7 @@ struct wlr_surface *lab_wlr_surface_from_node(struct wlr_scene_node *node);
 struct wlr_scene_node *lab_wlr_scene_get_prev_node(struct wlr_scene_node *node);
 
 /* A variant of wlr_scene_output_commit() that respects wlr_output->pending */
-bool lab_wlr_scene_output_commit(struct wlr_scene_output *scene_output);
+bool lab_wlr_scene_output_commit(struct wlr_scene_output *scene_output,
+	struct wlr_output_state *output_state);
 
 #endif /* LABWC_SCENE_HELPERS_H */
diff --git a/include/common/set.h b/include/common/set.h
new file mode 100644
index 00000000..6ca5cd85
--- /dev/null
+++ b/include/common/set.h
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef LABWC_SET_H
+#define LABWC_SET_H
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#define LAB_SET_MAX_SIZE 16
+
+struct lab_set {
+	uint32_t values[LAB_SET_MAX_SIZE];
+	int size;
+};
+
+bool lab_set_contains(struct lab_set *set, uint32_t value);
+void lab_set_add(struct lab_set *set, uint32_t value);
+void lab_set_remove(struct lab_set *set, uint32_t value);
+
+#endif /* LABWC_SET_H */
diff --git a/include/config/default-bindings.h b/include/config/default-bindings.h
index 535ee25a..d901d9fa 100644
--- a/include/config/default-bindings.h
+++ b/include/config/default-bindings.h
@@ -322,6 +322,16 @@ static struct mouse_combos {
 		.button = "Left",
 		.event = "Click",
 		.action = "ToggleMaximize",
+	}, {
+		.context = "Shade",
+		.button = "Left",
+		.event = "Click",
+		.action = "ToggleShade",
+	}, {
+		.context = "AllDesktops",
+		.button = "Left",
+		.event = "Click",
+		.action = "ToggleOmnipresent",
 	}, {
 		.context = "Maximize",
 		.button = "Right",
@@ -366,6 +376,32 @@ static struct mouse_combos {
 			.name = "atCursor",
 			.value = "no",
 		},
+	}, {
+		.context = "Icon",
+		.button = "Left",
+		.event = "Click",
+		.action = "ShowMenu",
+		.attributes[0] = {
+			.name = "menu",
+			.value = "client-menu",
+		},
+		.attributes[1] = {
+			.name = "atCursor",
+			.value = "no",
+		},
+	}, {
+		.context = "Icon",
+		.button = "Right",
+		.event = "Click",
+		.action = "ShowMenu",
+		.attributes[0] = {
+			.name = "menu",
+			.value = "client-menu",
+		},
+		.attributes[1] = {
+			.name = "atCursor",
+			.value = "no",
+		},
 	}, {
 		.context = "Root",
 		.button = "Left",
diff --git a/include/config/keybind.h b/include/config/keybind.h
index fc573316..36d81373 100644
--- a/include/config/keybind.h
+++ b/include/config/keybind.h
@@ -18,6 +18,7 @@ struct keybind {
 	xkb_keycode_t keycodes[MAX_KEYCODES];
 	size_t keycodes_len;
 	int keycodes_layout;
+	bool allow_when_locked;
 	struct wl_list actions;  /* struct action.link */
 	struct wl_list link;     /* struct rcxml.keybinds */
 	bool on_release;
diff --git a/include/config/libinput.h b/include/config/libinput.h
index 0c211613..94a99a3a 100644
--- a/include/config/libinput.h
+++ b/include/config/libinput.h
@@ -31,6 +31,7 @@ struct libinput_category {
 	int click_method;               /* -1 or libinput_config_click_method */
 	int send_events_mode;           /* -1 or libinput_config_send_events_mode */
 	bool have_calibration_matrix;
+	double scroll_factor;
 	float calibration_matrix[6];
 };
 
diff --git a/include/config/rcxml.h b/include/config/rcxml.h
index 8df7c9aa..dd237fa4 100644
--- a/include/config/rcxml.h
+++ b/include/config/rcxml.h
@@ -11,15 +11,18 @@
 #include "common/font.h"
 #include "config/touch.h"
 #include "config/tablet.h"
+#include "config/tablet-tool.h"
 #include "config/libinput.h"
 #include "resize-indicator.h"
+#include "ssd.h"
 #include "theme.h"
 
 enum view_placement_policy {
 	LAB_PLACE_INVALID = 0,
 	LAB_PLACE_CENTER,
 	LAB_PLACE_CURSOR,
-	LAB_PLACE_AUTOMATIC
+	LAB_PLACE_AUTOMATIC,
+	LAB_PLACE_CASCADE,
 };
 
 enum adaptive_sync_mode {
@@ -28,6 +31,13 @@ enum adaptive_sync_mode {
 	LAB_ADAPTIVE_SYNC_FULLSCREEN,
 };
 
+enum tearing_mode {
+	LAB_TEARING_DISABLED = 0,
+	LAB_TEARING_ENABLED,
+	LAB_TEARING_FULLSCREEN,
+	LAB_TEARING_FULLSCREEN_FORCED,
+};
+
 enum tiling_events_mode {
 	LAB_TILING_EVENTS_NEVER = 0,
 	LAB_TILING_EVENTS_REGION = 1 << 0,
@@ -36,6 +46,11 @@ enum tiling_events_mode {
 		(LAB_TILING_EVENTS_REGION | LAB_TILING_EVENTS_EDGE),
 };
 
+struct title_button {
+	enum ssd_part_type type;
+	struct wl_list link;
+};
+
 struct usable_area_override {
 	struct border margin;
 	char *output;
@@ -52,9 +67,12 @@ struct rcxml {
 	bool xdg_shell_server_side_deco;
 	int gap;
 	enum adaptive_sync_mode adaptive_sync;
-	bool allow_tearing;
+	enum tearing_mode allow_tearing;
 	bool reuse_output_mode;
 	enum view_placement_policy placement_policy;
+	bool xwayland_persistence;
+	int placement_cascade_offset_x;
+	int placement_cascade_offset_y;
 
 	/* focus */
 	bool focus_follow_mouse;
@@ -63,11 +81,17 @@ struct rcxml {
 
 	/* theme */
 	char *theme_name;
+	char *icon_theme_name;
+	struct wl_list title_buttons_left;
+	struct wl_list title_buttons_right;
 	int corner_radius;
+	bool show_title;
+	bool title_layout_loaded;
 	bool ssd_keep_border;
 	bool shadows_enabled;
 	struct font font_activewindow;
 	struct font font_inactivewindow;
+	struct font font_menuheader;
 	struct font font_menuitem;
 	struct font font_osd;
 
@@ -87,7 +111,6 @@ struct rcxml {
 	/* mouse */
 	long doubleclick_time;     /* in ms */
 	struct wl_list mousebinds; /* struct mousebind.link */
-	double scroll_factor;
 
 	/* touch tablet */
 	struct wl_list touch_configs;
@@ -101,6 +124,10 @@ struct rcxml {
 		uint16_t button_map_count;
 		struct button_map_entry button_map[BUTTON_MAP_MAX];
 	} tablet;
+	struct tablet_tool_config {
+		enum motion motion;
+		double relative_motion_sensitivity;
+	} tablet_tool;
 
 	/* libinput */
 	struct wl_list libinput_categories;
@@ -108,6 +135,8 @@ struct rcxml {
 	/* resistance */
 	int screen_edge_strength;
 	int window_edge_strength;
+	int unsnap_threshold;
+	int unmaximize_threshold;
 
 	/* window snapping */
 	int snap_edge_range;
diff --git a/include/config/session.h b/include/config/session.h
index 867d6bd6..61a95cf9 100644
--- a/include/config/session.h
+++ b/include/config/session.h
@@ -4,6 +4,12 @@
 
 struct server;
 
+/**
+ * session_run_script - run a named session script (or, in merge-config mode,
+ * all named session scripts) from the XDG path.
+ */
+void session_run_script(const char *script);
+
 /**
  * session_environment_init - set environment variables based on <key>=<value>
  * pairs in `${XDG_CONFIG_DIRS:-/etc/xdg}/labwc/environment` with user override
diff --git a/include/config/tablet-tool.h b/include/config/tablet-tool.h
new file mode 100644
index 00000000..bd1943af
--- /dev/null
+++ b/include/config/tablet-tool.h
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef LABWC_TABLET_TOOL_CONFIG_H
+#define LABWC_TABLET_TOOL_CONFIG_H
+
+#include <stdint.h>
+
+enum motion {
+	LAB_TABLET_MOTION_ABSOLUTE = 0,
+	LAB_TABLET_MOTION_RELATIVE,
+};
+
+enum motion tablet_parse_motion(const char *name);
+
+#endif /* LABWC_TABLET_TOOL_CONFIG_H */
diff --git a/include/icon-loader.h b/include/icon-loader.h
new file mode 100644
index 00000000..846d20a2
--- /dev/null
+++ b/include/icon-loader.h
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef LABWC_ICON_LOADER_H
+#define LABWC_ICON_LOADER_H
+
+struct server;
+
+void icon_loader_init(struct server *server);
+void icon_loader_finish(struct server *server);
+struct lab_data_buffer *icon_loader_lookup(struct server *server,
+	const char *app_id, int size, float scale);
+
+#endif /* LABWC_ICON_LOADER_H */
diff --git a/include/img/img-png.h b/include/img/img-png.h
new file mode 100644
index 00000000..2e28c152
--- /dev/null
+++ b/include/img/img-png.h
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef LABWC_IMG_PNG_H
+#define LABWC_IMG_PNG_H
+
+struct lab_data_buffer;
+
+void img_png_load(const char *filename, struct lab_data_buffer **buffer,
+	int size, float scale);
+
+#endif /* LABWC_IMG_PNG_H */
diff --git a/include/img/img-svg.h b/include/img/img-svg.h
new file mode 100644
index 00000000..c8acc71c
--- /dev/null
+++ b/include/img/img-svg.h
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef LABWC_IMG_SVG_H
+#define LABWC_IMG_SVG_H
+
+struct lab_data_buffer;
+
+void img_svg_load(const char *filename, struct lab_data_buffer **buffer,
+	int size, float scale);
+
+#endif /* LABWC_IMG_SVG_H */
diff --git a/include/img/img-xbm.h b/include/img/img-xbm.h
new file mode 100644
index 00000000..24ad24d8
--- /dev/null
+++ b/include/img/img-xbm.h
@@ -0,0 +1,22 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef LABWC_IMG_XBM_H
+#define LABWC_IMG_XBM_H
+
+struct lab_data_buffer;
+
+/**
+ * img_xbm_from_bitmap() - create button from monochrome bitmap
+ * @bitmap: bitmap data array in hexadecimal xbm format
+ * @buffer: cairo-surface-buffer to create
+ * @rgba: color
+ *
+ * Example bitmap: char button[6] = { 0x3f, 0x3f, 0x21, 0x21, 0x21, 0x3f };
+ */
+void img_xbm_from_bitmap(const char *bitmap, struct lab_data_buffer **buffer,
+	float *rgba);
+
+/* img_xbm_load - Convert xbm file to buffer with cairo surface */
+void img_xbm_load(const char *filename, struct lab_data_buffer **buffer,
+	float *rgba);
+
+#endif /* LABWC_IMG_XBM_H */
diff --git a/include/img/img-xpm.h b/include/img/img-xpm.h
new file mode 100644
index 00000000..65d7c2b3
--- /dev/null
+++ b/include/img/img-xpm.h
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef LABWC_IMG_XPM_H
+#define LABWC_IMG_XPM_H
+
+struct lab_data_buffer;
+
+void img_xpm_load(const char *filename, struct lab_data_buffer **buffer,
+	int size, float scale);
+
+#endif /* LABWC_IMG_XPM_H */
diff --git a/include/input/cursor.h b/include/input/cursor.h
index 24f7326d..4e62183d 100644
--- a/include/input/cursor.h
+++ b/include/input/cursor.h
@@ -11,7 +11,7 @@ struct seat;
 struct server;
 struct wlr_surface;
 struct wlr_scene_node;
-enum wlr_button_state;
+enum wl_pointer_button_state;
 
 /* Cursors used internally by labwc */
 enum lab_cursors {
@@ -142,15 +142,18 @@ bool cursor_process_button_release(struct seat *seat, uint32_t button, uint32_t
  * Finishes cursor button release. The return value indicates if an interactive
  * move/resize had been finished. Should be called after notifying a client.
  */
-bool cursor_finish_button_release(struct seat *seat);
+bool cursor_finish_button_release(struct seat *seat, uint32_t button);
 
 void cursor_init(struct seat *seat);
 void cursor_reload(struct seat *seat);
+void cursor_emulate_move(struct seat *seat,
+		struct wlr_input_device *device,
+		double dx, double dy, uint32_t time_msec);
 void cursor_emulate_move_absolute(struct seat *seat,
 		struct wlr_input_device *device,
 		double x, double y, uint32_t time_msec);
 void cursor_emulate_button(struct seat *seat,
-		uint32_t button, enum wlr_button_state state, uint32_t time_msec);
+		uint32_t button, enum wl_pointer_button_state state, uint32_t time_msec);
 void cursor_finish(struct seat *seat);
 
 #endif /* LABWC_CURSOR_H */
diff --git a/include/input/tablet-pad.h b/include/input/tablet-pad.h
index 4f39239f..3ada7634 100644
--- a/include/input/tablet-pad.h
+++ b/include/input/tablet-pad.h
@@ -36,7 +36,7 @@ struct drawing_tablet_pad {
 	struct wl_list link; /* seat.tablet_pads */
 };
 
-void tablet_pad_init(struct seat *seat, struct wlr_input_device *wlr_input_device);
+void tablet_pad_create(struct seat *seat, struct wlr_input_device *wlr_input_device);
 void tablet_pad_attach_tablet(struct seat *seat);
 void tablet_pad_enter_surface(struct seat *seat, struct wlr_surface *wlr_surface);
 
diff --git a/include/input/tablet-tool.h b/include/input/tablet-tool.h
index 8f7b589d..76306877 100644
--- a/include/input/tablet-tool.h
+++ b/include/input/tablet-tool.h
@@ -17,7 +17,7 @@ struct drawing_tablet_tool {
 	struct wl_list link; /* seat.tablet_tools */
 };
 
-void tablet_tool_init(struct seat *seat,
+void tablet_tool_create(struct seat *seat,
 	struct wlr_tablet_tool *wlr_tablet_tool);
 bool tablet_tool_has_focused_surface(struct seat *seat);
 
diff --git a/include/input/tablet.h b/include/input/tablet.h
index e7ed395a..e9145636 100644
--- a/include/input/tablet.h
+++ b/include/input/tablet.h
@@ -14,7 +14,8 @@ struct drawing_tablet {
 	struct seat *seat;
 	struct wlr_tablet *tablet;
 	struct wlr_tablet_v2_tablet *tablet_v2;
-	double x, y;
+	enum motion motion_mode;
+	double x, y, dx, dy;
 	double distance;
 	double pressure;
 	double tilt_x, tilt_y;
@@ -22,15 +23,13 @@ struct drawing_tablet {
 	double slider;
 	double wheel_delta;
 	struct {
-		struct wl_listener proximity;
-		struct wl_listener axis;
-		struct wl_listener tip;
-		struct wl_listener button;
 		struct wl_listener destroy;
 	} handlers;
 	struct wl_list link; /* seat.tablets */
 };
 
-void tablet_init(struct seat *seat, struct wlr_input_device *wlr_input_device);
+void tablet_init(struct seat *seat);
+void tablet_finish(struct seat *seat);
+void tablet_create(struct seat *seat, struct wlr_input_device *wlr_input_device);
 
 #endif /* LABWC_TABLET_H */
diff --git a/include/labwc.h b/include/labwc.h
index e3f1ad23..1b4548a8 100644
--- a/include/labwc.h
+++ b/include/labwc.h
@@ -44,6 +44,7 @@
 #include <wlr/types/wlr_input_method_v2.h>
 #include <wlr/types/wlr_tablet_v2.h>
 #include <wlr/util/log.h>
+#include "common/set.h"
 #include "config/keybind.h"
 #include "config/rcxml.h"
 #include "input/cursor.h"
@@ -71,6 +72,8 @@ enum input_mode {
 struct input {
 	struct wlr_input_device *wlr_input_device;
 	struct seat *seat;
+	/* Set for pointer/touch devices */
+	double scroll_factor;
 	struct wl_listener destroy;
 	struct wl_list link; /* seat.inputs */
 };
@@ -127,9 +130,8 @@ struct seat {
 	struct input_method_relay *input_method_relay;
 
 	/**
-	 * pressed view/surface/node will usually be NULL and is only set on
-	 * button press while the mouse is over a view or surface, and reset
-	 * to NULL on button release.
+	 * This is usually zeroed and is only set on button press while the
+	 * mouse is over a view or surface, and zeroed on button release.
 	 * It is used to send cursor motion events to a surface even though
 	 * the cursor has left the surface in the meantime.
 	 *
@@ -142,13 +144,9 @@ struct seat {
 	 *
 	 * Both (view && !surface) and (surface && !view) are possible.
 	 */
-	struct {
-		struct view *view;
-		struct wlr_scene_node *node;
-		struct wlr_surface *surface;
-		struct wlr_surface *toplevel;
-		uint32_t resize_edges;
-	} pressed;
+	struct cursor_context pressed;
+
+	struct lab_set bound_buttons;
 
 	struct {
 		bool active;
@@ -164,7 +162,6 @@ struct seat {
 	/* Used to prevent region snapping when starting a move with A-Left */
 	bool region_prevent_snap;
 
-	struct wl_client *active_client_while_inhibited;
 	struct wl_list inputs;
 	struct wl_listener new_input;
 	struct wl_listener focus_change;
@@ -193,6 +190,11 @@ struct seat {
 	struct wl_listener touch_motion;
 	struct wl_listener touch_frame;
 
+	struct wl_listener tablet_tool_proximity;
+	struct wl_listener tablet_tool_axis;
+	struct wl_listener tablet_tool_tip;
+	struct wl_listener tablet_tool_button;
+
 	struct wl_list tablets;
 	struct wl_list tablet_tools;
 	struct wl_list tablet_pads;
@@ -210,6 +212,12 @@ struct seat {
 struct lab_data_buffer;
 struct workspace;
 
+enum lab_cycle_dir {
+	LAB_CYCLE_DIR_NONE,
+	LAB_CYCLE_DIR_FORWARD,
+	LAB_CYCLE_DIR_BACKWARD,
+};
+
 struct server {
 	struct wl_display *wl_display;
 	struct wl_event_loop *wl_event_loop;  /* Can be used for timer events */
@@ -220,11 +228,12 @@ struct server {
 		struct wlr_backend *backend;
 	} headless;
 	struct wlr_session *session;
+	struct wlr_linux_dmabuf_v1 *linux_dmabuf;
 
 	struct wlr_xdg_shell *xdg_shell;
 	struct wlr_layer_shell_v1 *layer_shell;
 
-	struct wl_listener new_xdg_surface;
+	struct wl_listener new_xdg_toplevel;
 	struct wl_listener new_layer_surface;
 
 	struct wl_listener kde_server_decoration;
@@ -236,12 +245,9 @@ struct server {
 	struct wl_listener xwayland_new_surface;
 #endif
 
-	struct wlr_input_inhibit_manager *input_inhibit;
-	struct wl_listener input_inhibit_activate;
-	struct wl_listener input_inhibit_deactivate;
-
 	struct wlr_xdg_activation_v1 *xdg_activation;
 	struct wl_listener xdg_activation_request;
+	struct wl_listener xdg_activation_new_token;
 
 	struct wl_list views;
 	struct wl_list unmanaged_surfaces;
@@ -249,11 +255,14 @@ struct server {
 	struct seat seat;
 	struct wlr_scene *scene;
 	struct wlr_scene_output_layout *scene_layout;
+	bool direct_scanout_enabled;
 
 	/* cursor interactive */
 	enum input_mode input_mode;
 	struct view *grabbed_view;
+	/* Cursor position when interactive move/resize is requested */
 	double grab_x, grab_y;
+	/* View geometry when interactive move/resize is requested */
 	struct wlr_box grab_box;
 	uint32_t resize_edges;
 
@@ -294,9 +303,16 @@ struct server {
 	struct wlr_scene_tree *menu_tree;
 
 	/* Workspaces */
-	struct wl_list workspaces;  /* struct workspace.link */
-	struct workspace *workspace_current;
-	struct workspace *workspace_last;
+	struct {
+		struct wl_list all;  /* struct workspace.link */
+		struct workspace *current;
+		struct workspace *last;
+		struct lab_cosmic_workspace_manager *cosmic_manager;
+		struct lab_cosmic_workspace_group *cosmic_group;
+		struct {
+			struct wl_listener layout_output_added;
+		} on;
+	} workspaces;
 
 	struct wl_list outputs;
 	struct wl_listener new_output;
@@ -315,6 +331,8 @@ struct server {
 	 */
 	int pending_output_layout_change;
 
+	struct wl_listener renderer_lost;
+
 	struct wlr_gamma_control_manager_v1 *gamma_control_manager_v1;
 	struct wl_listener gamma_control_set_gamma;
 
@@ -349,6 +367,8 @@ struct server {
 		struct wlr_scene_tree *preview_parent;
 		struct wlr_scene_node *preview_anchor;
 		struct multi_rect *preview_outline;
+		enum lab_cycle_dir initial_direction;
+		bool initial_keybind_contained_shift;
 	} osd_state;
 
 	struct theme *theme;
@@ -356,6 +376,8 @@ struct server {
 	struct menu *menu_current;
 	struct wl_list menus;
 
+	struct icon_loader *icon_loader;
+
 	pid_t primary_client_pid;
 };
 
@@ -365,6 +387,7 @@ struct output {
 	struct wl_list link; /* server.outputs */
 	struct server *server;
 	struct wlr_output *wlr_output;
+	struct wlr_output_state pending;
 	struct wlr_scene_output *scene_output;
 	struct wlr_scene_tree *layer_tree[LAB_NR_LAYERS];
 	struct wlr_scene_tree *layer_popup_tree;
@@ -383,6 +406,8 @@ struct output {
 
 	bool leased;
 	bool gamma_lut_changed;
+
+	uint32_t nr_tearing_failures;
 };
 
 #undef LAB_NR_LAYERS
@@ -421,7 +446,7 @@ void foreign_toplevel_update_outputs(struct view *view);
  *  - optionally raise above other views
  *
  * It's okay to call this function even if the view isn't mapped or the
- * session is locked/input is inhibited; it will simply do nothing.
+ * session is locked; it will simply do nothing.
  */
 void desktop_focus_view(struct view *view, bool raise);
 
@@ -434,6 +459,7 @@ void desktop_focus_view_or_surface(struct seat *seat, struct view *view,
 
 void desktop_arrange_all_views(struct server *server);
 void desktop_focus_output(struct output *output);
+void warp_cursor(struct view *view);
 struct view *desktop_topmost_focusable_view(struct server *server);
 
 /**
@@ -442,12 +468,6 @@ struct view *desktop_topmost_focusable_view(struct server *server);
  */
 void desktop_update_top_layer_visiblity(struct server *server);
 
-enum lab_cycle_dir {
-	LAB_CYCLE_DIR_NONE,
-	LAB_CYCLE_DIR_FORWARD,
-	LAB_CYCLE_DIR_BACKWARD,
-};
-
 /**
  * desktop_cycle_view - return view to 'cycle' to
  * @start_view: reference point for finding next view to cycle to
@@ -478,12 +498,21 @@ void seat_focus_surface(struct seat *seat, struct wlr_surface *surface);
 void seat_focus_lock_surface(struct seat *seat, struct wlr_surface *surface);
 
 void seat_set_focus_layer(struct seat *seat, struct wlr_layer_surface_v1 *layer);
-void seat_set_pressed(struct seat *seat, struct view *view,
-	struct wlr_scene_node *node, struct wlr_surface *surface,
-	struct wlr_surface *toplevel, uint32_t resize_edges);
+void seat_set_pressed(struct seat *seat, struct cursor_context *ctx);
 void seat_reset_pressed(struct seat *seat);
 void seat_output_layout_changed(struct seat *seat);
 
+/**
+ * interactive_anchor_to_cursor() - repositions the geometry to remain
+ * underneath the cursor when its size changes during interactive move.
+ * This function also resizes server->grab_box and repositions it to remain
+ * underneath server->grab_{x,y}.
+ *
+ * geo->{width,height} are provided by the caller.
+ * geo->{x,y} are computed by this function.
+ */
+void interactive_anchor_to_cursor(struct server *server, struct wlr_box *geo);
+
 void interactive_begin(struct view *view, enum input_mode mode, uint32_t edges);
 void interactive_finish(struct view *view);
 void interactive_cancel(struct view *view);
@@ -497,27 +526,44 @@ struct output *output_from_wlr_output(struct server *server,
 struct output *output_from_name(struct server *server, const char *name);
 struct output *output_nearest_to(struct server *server, int lx, int ly);
 struct output *output_nearest_to_cursor(struct server *server);
+
+/**
+ * output_get_adjacent() - get next output, in a given direction,
+ * from a given output
+ *
+ * @output: reference output
+ * @edge: direction in which to look for the nearest output
+ * @wrap: if true, wrap around at layout edge
+ *
+ * Note: if output is NULL, the output nearest the cursor will be used as the
+ * reference instead.
+ */
+struct output *output_get_adjacent(struct output *output,
+	enum view_edge edge, bool wrap);
+
 bool output_is_usable(struct output *output);
 void output_update_usable_area(struct output *output);
 void output_update_all_usable_areas(struct server *server, bool layout_changed);
+bool output_get_tearing_allowance(struct output *output);
 struct wlr_box output_usable_area_in_layout_coords(struct output *output);
 struct wlr_box output_usable_area_scaled(struct output *output);
 void handle_output_power_manager_set_mode(struct wl_listener *listener,
 	void *data);
 void output_enable_adaptive_sync(struct wlr_output *output, bool enabled);
+
+/**
+ * output_max_scale() - get maximum scale factor of all usable outputs.
+ * Used when loading/rendering resources (e.g. icons) that may be
+ * displayed on any output.
+ */
+float output_max_scale(struct server *server);
+
 void new_tearing_hint(struct wl_listener *listener, void *data);
 
 void server_init(struct server *server);
 void server_start(struct server *server);
 void server_finish(struct server *server);
 
-/*
- * wlroots "input inhibitor" extension (required for swaylock) blocks
- * any client other than the requesting client from receiving events
- */
-bool input_inhibit_blocks_surface(struct seat *seat,
-	struct wl_resource *resource);
-
 void create_constraint(struct wl_listener *listener, void *data);
 void constrain_cursor(struct server *server, struct wlr_pointer_constraint_v1
 	*constraint);
diff --git a/include/layers.h b/include/layers.h
index 7b6270ed..827c2ada 100644
--- a/include/layers.h
+++ b/include/layers.h
@@ -32,6 +32,7 @@ struct lab_layer_popup {
 	struct wl_listener commit;
 	struct wl_listener destroy;
 	struct wl_listener new_popup;
+	struct wl_listener reposition;
 };
 
 void layers_init(struct server *server);
diff --git a/include/magnifier.h b/include/magnifier.h
index 60005458..daa6d7a3 100644
--- a/include/magnifier.h
+++ b/include/magnifier.h
@@ -20,5 +20,6 @@ bool output_wants_magnification(struct output *output);
 void magnify(struct output *output, struct wlr_buffer *output_buffer,
 	struct wlr_box *damage);
 bool is_magnify_on(void);
+void magnify_reset(void);
 
 #endif /* LABWC_MAGNIFIER_H */
diff --git a/include/menu/menu.h b/include/menu/menu.h
index fee7184b..f55bc365 100644
--- a/include/menu/menu.h
+++ b/include/menu/menu.h
@@ -27,6 +27,12 @@ struct menu_scene {
 	struct scaled_font_buffer *buffer;
 };
 
+enum menuitem_type {
+	LAB_MENU_ITEM = 0,
+	LAB_MENU_SEPARATOR_LINE,
+	LAB_MENU_TITLE,
+};
+
 struct menuitem {
 	struct wl_list actions;
 	char *execute;
@@ -34,11 +40,14 @@ struct menuitem {
 	struct menu *parent;
 	struct menu *submenu;
 	bool selectable;
+	enum menuitem_type type;
 	int height;
 	int native_width;
 	struct wlr_scene_tree *tree;
 	struct menu_scene normal;
 	struct menu_scene selected;
+	struct menu_pipe_context *pipe_ctx;
+	struct view *client_list_view;  /* used by internal client-list */
 	struct wl_list link; /* menu.menuitems */
 };
 
@@ -46,7 +55,6 @@ struct menuitem {
 struct menu {
 	char *id;
 	char *label;
-	int item_height;
 	struct menu *parent;
 
 	struct {
@@ -128,4 +136,7 @@ void menu_close_root(struct server *server);
 /* menu_reconfigure - reload theme and content */
 void menu_reconfigure(struct server *server);
 
+void update_client_list_combined_menu(struct server *server);
+void update_client_send_to_menu(struct server *server);
+
 #endif /* LABWC_MENU_H */
diff --git a/include/output-state.h b/include/output-state.h
new file mode 100644
index 00000000..0b90081a
--- /dev/null
+++ b/include/output-state.h
@@ -0,0 +1,34 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef LABWC_OUTPUT_STATE_H
+#define LABWC_OUTPUT_STATE_H
+
+#include <stdbool.h>
+
+struct output;
+struct wlr_output;
+
+void output_state_init(struct output *output);
+
+/* Forward port of removed functions */
+
+bool wlr_output_test(struct wlr_output *wlr_output);
+
+bool wlr_output_commit(struct wlr_output *wlr_output);
+
+void wlr_output_enable(struct wlr_output *wlr_output, bool enabled);
+
+void wlr_output_set_mode(struct wlr_output *wlr_output,
+	struct wlr_output_mode *mode);
+
+void wlr_output_set_custom_mode(struct wlr_output *wlr_output,
+		int32_t width, int32_t height, int32_t refresh);
+
+void wlr_output_set_scale(struct wlr_output *wlr_output, float scale);
+
+void wlr_output_set_transform(struct wlr_output *wlr_output,
+	enum wl_output_transform transform);
+
+void wlr_output_enable_adaptive_sync(struct wlr_output *wlr_output,
+	bool enabled);
+
+#endif // LABWC_OUTPUT_STATE_H
diff --git a/include/protocols/cosmic-workspaces-internal.h b/include/protocols/cosmic-workspaces-internal.h
new file mode 100644
index 00000000..36556bc6
--- /dev/null
+++ b/include/protocols/cosmic-workspaces-internal.h
@@ -0,0 +1,61 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef LABWC_PROTOCOLS_COSMIC_WORKSPACES_INTERNAL_H
+#define LABWC_PROTOCOLS_COSMIC_WORKSPACES_INTERNAL_H
+
+struct lab_cosmic_workspace;
+struct lab_cosmic_workspace_group;
+struct lab_cosmic_workspace_manager;
+
+enum pending_change {
+	/* group events */
+	CW_PENDING_WS_CREATE     = 1 << 0,
+
+	/* ws events*/
+	CW_PENDING_WS_ACTIVATE   = 1 << 1,
+	CW_PENDING_WS_DEACTIVATE = 1 << 2,
+	CW_PENDING_WS_REMOVE     = 1 << 3,
+};
+
+struct transaction {
+	uint32_t change;
+	struct wl_list link;
+};
+
+struct transaction_workspace {
+	struct transaction base;
+	struct lab_cosmic_workspace *workspace;
+};
+
+struct transaction_group {
+	struct transaction base;
+	struct lab_cosmic_workspace_group *group;
+	char *new_workspace_name;
+};
+
+struct session_context {
+	int ref_count;
+	struct wl_list transactions;
+};
+
+struct wl_resource_addon {
+	struct session_context *ctx;
+	void *data;
+};
+
+struct wl_resource_addon *resource_addon_create(struct session_context *ctx);
+
+void transaction_add_workspace_ev(struct lab_cosmic_workspace *ws,
+	struct wl_resource *resource, enum pending_change change);
+
+void transaction_add_workspace_group_ev(struct lab_cosmic_workspace_group *group,
+	struct wl_resource *resource, enum pending_change change,
+	const char *new_workspace_name);
+
+void resource_addon_destroy(struct wl_resource_addon *addon);
+
+void group_output_send_initial_state(struct lab_cosmic_workspace_group *group,
+	struct wl_resource *group_resource);
+
+void manager_schedule_done_event(struct lab_cosmic_workspace_manager *manager);
+
+#endif /* LABWC_PROTOCOLS_COSMIC_WORKSPACES_INTERNAL_H */
diff --git a/include/protocols/cosmic-workspaces.h b/include/protocols/cosmic-workspaces.h
new file mode 100644
index 00000000..8776bfad
--- /dev/null
+++ b/include/protocols/cosmic-workspaces.h
@@ -0,0 +1,94 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef LABWC_PROTOCOLS_COSMIC_WORKSPACES_H
+#define LABWC_PROTOCOLS_COSMIC_WORKSPACES_H
+
+#include <stdbool.h>
+#include <wayland-server-core.h>
+
+struct wlr_output;
+
+struct lab_cosmic_workspace_manager {
+	struct wl_global *global;
+	struct wl_list groups;
+	uint32_t caps;
+	struct wl_event_source *idle_source;
+	struct wl_event_loop *event_loop;
+
+	struct {
+		struct wl_listener display_destroy;
+	} on;
+
+	struct wl_list resources;
+};
+
+struct lab_cosmic_workspace_group {
+	struct lab_cosmic_workspace_manager *manager;
+	struct wl_list workspaces;
+	struct wl_array capabilities;
+	struct {
+		struct wl_signal create_workspace;
+		struct wl_signal destroy;
+	} events;
+
+	struct wl_list link;
+	struct wl_list outputs;
+	struct wl_list resources;
+};
+
+struct lab_cosmic_workspace {
+	struct lab_cosmic_workspace_group *group;
+	char *name;
+	struct wl_array coordinates;
+	struct wl_array capabilities;
+	uint32_t state;         /* enum lab_cosmic_workspace_state */
+	uint32_t state_pending; /* enum lab_cosmic_workspace_state */
+
+	struct {
+		struct wl_signal activate;
+		struct wl_signal deactivate;
+		struct wl_signal remove;
+		struct wl_signal destroy;
+	} events;
+
+	struct wl_list link;
+	struct wl_list resources;
+};
+
+enum lab_cosmic_workspace_caps {
+	CW_CAP_NONE          = 0,
+	CW_CAP_GRP_ALL       = 0x000000ff,
+	CW_CAP_WS_ALL        = 0x0000ff00,
+
+	/* group caps */
+	CW_CAP_GRP_WS_CREATE = 1 << 0,
+
+	/* workspace caps */
+	CW_CAP_WS_ACTIVATE   = 1 << 8,
+	CW_CAP_WS_DEACTIVATE = 1 << 9,
+	CW_CAP_WS_REMOVE     = 1 << 10,
+};
+
+struct lab_cosmic_workspace_manager *lab_cosmic_workspace_manager_create(
+	struct wl_display *display, uint32_t caps, uint32_t version);
+
+struct lab_cosmic_workspace_group *lab_cosmic_workspace_group_create(
+	struct lab_cosmic_workspace_manager *manager);
+
+void lab_cosmic_workspace_group_output_enter(
+	struct lab_cosmic_workspace_group *group, struct wlr_output *output);
+
+void lab_cosmic_workspace_group_output_leave(
+
+	struct lab_cosmic_workspace_group *group, struct wlr_output *output);
+void lab_cosmic_workspace_group_destroy(struct lab_cosmic_workspace_group *group);
+
+struct lab_cosmic_workspace *lab_cosmic_workspace_create(struct lab_cosmic_workspace_group *group);
+void lab_cosmic_workspace_set_name(struct lab_cosmic_workspace *workspace, const char *name);
+void lab_cosmic_workspace_set_active(struct lab_cosmic_workspace *workspace, bool enabled);
+void lab_cosmic_workspace_set_urgent(struct lab_cosmic_workspace *workspace, bool enabled);
+void lab_cosmic_workspace_set_hidden(struct lab_cosmic_workspace *workspace, bool enabled);
+void lab_cosmic_workspace_set_coordinates(struct lab_cosmic_workspace *workspace,
+	struct wl_array *coordinates);
+void lab_cosmic_workspace_destroy(struct lab_cosmic_workspace *workspace);
+
+#endif /* LABWC_PROTOCOLS_COSMIC_WORKSPACES_H */
diff --git a/include/resistance.h b/include/resistance.h
index 65b14869..6a155ceb 100644
--- a/include/resistance.h
+++ b/include/resistance.h
@@ -3,7 +3,12 @@
 #define LABWC_RESISTANCE_H
 #include "labwc.h"
 
-void resistance_move_apply(struct view *view, double *x, double *y);
+/**
+ * resistance_unsnap_apply() - Apply resistance when dragging a
+ * maximized/tiled window. Returns true when the view needs to be un-tiled.
+ */
+bool resistance_unsnap_apply(struct view *view, int *x, int *y);
+void resistance_move_apply(struct view *view, int *x, int *y);
 void resistance_resize_apply(struct view *view, struct wlr_box *new_view_geo);
 
 #endif /* LABWC_RESISTANCE_H */
diff --git a/include/session-lock.h b/include/session-lock.h
index 0a11e7b4..715c859f 100644
--- a/include/session-lock.h
+++ b/include/session-lock.h
@@ -10,6 +10,8 @@ struct server;
 struct session_lock_manager {
 	struct server *server;
 	struct wlr_session_lock_manager_v1 *wlr_manager;
+	/* View re-focused on unlock */
+	struct view *last_active_view;
 	struct wlr_surface *focused;
 	/*
 	 * When not locked: lock=NULL, locked=false
@@ -19,7 +21,7 @@ struct session_lock_manager {
 	struct wlr_session_lock_v1 *lock;
 	bool locked;
 
-	struct wl_list session_lock_outputs;
+	struct wl_list lock_outputs;
 
 	struct wl_listener new_lock;
 	struct wl_listener destroy;
diff --git a/include/ssd-internal.h b/include/ssd-internal.h
index 639d143e..d3454335 100644
--- a/include/ssd-internal.h
+++ b/include/ssd-internal.h
@@ -18,13 +18,16 @@
 struct ssd_button {
 	struct view *view;
 	enum ssd_part_type type;
-	struct wlr_scene_node *normal;
-	struct wlr_scene_node *hover;
-	struct wlr_scene_node *toggled;
-	struct wlr_scene_node *toggled_hover;
-	struct wlr_scene_node *background;
-	struct wlr_scene_tree *icon_tree;
-	struct wlr_scene_tree *hover_tree;
+	/*
+	 * Bitmap of lab_button_state that represents a combination of
+	 * hover/toggled/rounded states.
+	 */
+	uint8_t state_set;
+	/*
+	 * Button nodes for each combination of hover/toggled/rounded states.
+	 * nodes[state_set] should be displayed.
+	 */
+	struct wlr_scene_node *nodes[LAB_BS_ALL + 1];
 
 	struct wl_listener destroy;
 };
@@ -49,13 +52,33 @@ struct ssd {
 	 * don't update things we don't have to.
 	 */
 	struct {
-		bool was_maximized;   /* To un-round corner buttons and toggle icon on maximize */
+		/* Button icons need to be swapped on shade or omnipresent toggles */
+		bool was_shaded;
+		bool was_omnipresent;
+
+		/*
+		 * Corners need to be (un)rounded and borders need be shown/hidden
+		 * when toggling maximization, and the button needs to be swapped on
+		 * maximization toggles.
+		 */
+		bool was_maximized;
+
+		/*
+		 * Corners need to be (un)rounded but borders should be kept shown when
+		 * the window is (un)tiled and notified about it or when the window may
+		 * become so small that only a squared scene-rect can be used to render
+		 * such a small titlebar.
+		 */
+		bool was_squared;
+
 		struct wlr_box geometry;
 		struct ssd_state_title {
 			char *text;
 			struct ssd_state_title_width active;
 			struct ssd_state_title_width inactive;
 		} title;
+
+		char *app_id;
 	} state;
 
 	/* An invisible area around the view which allows resizing */
@@ -99,9 +122,6 @@ struct ssd_part {
 	/* This part represented in scene graph */
 	struct wlr_scene_node *node;
 
-	/* Targeted geometry. May be NULL */
-	struct wlr_box *geometry;
-
 	struct wl_list link;
 };
 
@@ -124,19 +144,12 @@ struct ssd_part *add_scene_rect(
 struct ssd_part *add_scene_buffer(
 	struct wl_list *list, enum ssd_part_type type,
 	struct wlr_scene_tree *parent, struct wlr_buffer *buffer, int x, int y);
-struct ssd_part *add_scene_button(
-	struct wl_list *part_list, enum ssd_part_type type,
-	struct wlr_scene_tree *parent, float *bg_color,
-	struct wlr_buffer *icon_buffer, struct wlr_buffer *hover_buffer,
-	int x, struct view *view);
-void add_toggled_icon(struct ssd_button *button, struct wl_list *part_list,
-	enum ssd_part_type type, struct wlr_buffer *icon_buffer,
-	struct wlr_buffer *hover_buffer);
-struct ssd_part *add_scene_button_corner(
-	struct wl_list *part_list, enum ssd_part_type type,
-	enum ssd_part_type corner_type, struct wlr_scene_tree *parent,
-	struct wlr_buffer *corner_buffer, struct wlr_buffer *icon_buffer,
-	struct wlr_buffer *hover_buffer, int x, struct view *view);
+struct ssd_part *add_scene_button(struct wl_list *part_list,
+	enum ssd_part_type type, struct wlr_scene_tree *parent,
+	struct lab_data_buffer *buffers[LAB_BS_ALL + 1], int x, int y,
+	struct view *view);
+void update_window_icon_buffer(struct wlr_scene_node *button_node,
+	struct lab_data_buffer *buffer);
 
 /* SSD internal helpers */
 struct ssd_part *ssd_get_part(
@@ -147,6 +160,7 @@ void ssd_destroy_parts(struct wl_list *list);
 void ssd_titlebar_create(struct ssd *ssd);
 void ssd_titlebar_update(struct ssd *ssd);
 void ssd_titlebar_destroy(struct ssd *ssd);
+bool ssd_should_be_squared(struct ssd *ssd);
 
 void ssd_border_create(struct ssd *ssd);
 void ssd_border_update(struct ssd *ssd);
diff --git a/include/ssd.h b/include/ssd.h
index a0c520c6..d5b66c08 100644
--- a/include/ssd.h
+++ b/include/ssd.h
@@ -5,8 +5,6 @@
 #include <wayland-server-core.h>
 #include "common/border.h"
 
-#define SSD_BUTTON_COUNT 4
-#define SSD_BUTTON_WIDTH 26
 #define SSD_EXTENDED_AREA 8
 
 /*
@@ -23,12 +21,25 @@
  */
 enum ssd_part_type {
 	LAB_SSD_NONE = 0,
-	LAB_SSD_BUTTON_CLOSE,
+
+	LAB_SSD_BUTTON_CLOSE = 1,
 	LAB_SSD_BUTTON_MAXIMIZE,
 	LAB_SSD_BUTTON_ICONIFY,
+	LAB_SSD_BUTTON_WINDOW_ICON,
 	LAB_SSD_BUTTON_WINDOW_MENU,
+	LAB_SSD_BUTTON_SHADE,
+	LAB_SSD_BUTTON_OMNIPRESENT,
+	/* only for internal use */
+	LAB_SSD_BUTTON_FIRST = LAB_SSD_BUTTON_CLOSE,
+	LAB_SSD_BUTTON_LAST = LAB_SSD_BUTTON_OMNIPRESENT,
+	LAB_SSD_BUTTON,
+
 	LAB_SSD_PART_TITLEBAR,
+	LAB_SSD_PART_TITLEBAR_CORNER_RIGHT,
+	LAB_SSD_PART_TITLEBAR_CORNER_LEFT,
 	LAB_SSD_PART_TITLE,
+
+	/* shared by shadows, borders and extents */
 	LAB_SSD_PART_CORNER_TOP_LEFT,
 	LAB_SSD_PART_CORNER_TOP_RIGHT,
 	LAB_SSD_PART_CORNER_BOTTOM_RIGHT,
@@ -37,6 +48,7 @@ enum ssd_part_type {
 	LAB_SSD_PART_RIGHT,
 	LAB_SSD_PART_BOTTOM,
 	LAB_SSD_PART_LEFT,
+
 	LAB_SSD_CLIENT,
 	LAB_SSD_FRAME,
 	LAB_SSD_ROOT,
@@ -74,12 +86,14 @@ struct wlr_scene_node;
  */
 struct ssd *ssd_create(struct view *view, bool active);
 struct border ssd_get_margin(const struct ssd *ssd);
+int ssd_get_corner_width(void);
 void ssd_update_margin(struct ssd *ssd);
 void ssd_set_active(struct ssd *ssd, bool active);
 void ssd_update_title(struct ssd *ssd);
 void ssd_update_geometry(struct ssd *ssd);
 void ssd_destroy(struct ssd *ssd);
 void ssd_set_titlebar(struct ssd *ssd, bool enabled);
+void ssd_update_window_icon(struct ssd *ssd);
 
 void ssd_enable_keybind_inhibit_indicator(struct ssd *ssd, bool enable);
 void ssd_enable_shade(struct ssd *ssd, bool enable);
@@ -97,7 +111,6 @@ enum ssd_part_type ssd_at(const struct ssd *ssd,
 enum ssd_part_type ssd_get_part_type(const struct ssd *ssd,
 	struct wlr_scene_node *node);
 uint32_t ssd_resize_edges(enum ssd_part_type type);
-bool ssd_is_button(enum ssd_part_type type);
 bool ssd_part_contains(enum ssd_part_type whole, enum ssd_part_type candidate);
 enum ssd_mode ssd_mode_parse(const char *mode);
 
diff --git a/include/theme.h b/include/theme.h
index 50a69f6f..2b600676 100644
--- a/include/theme.h
+++ b/include/theme.h
@@ -10,6 +10,7 @@
 
 #include <stdio.h>
 #include <wlr/render/wlr_renderer.h>
+#include "ssd.h"
 
 enum lab_justification {
 	LAB_JUSTIFY_LEFT,
@@ -25,9 +26,24 @@ struct theme_snapping_overlay {
 	float border_color[3][4];
 };
 
+enum lab_button_state {
+	LAB_BS_HOVERD = 1 << 0,
+	LAB_BS_TOGGLED = 1 << 1,
+	LAB_BS_ROUNDED = 1 << 2,
+
+	LAB_BS_ALL = LAB_BS_HOVERD | LAB_BS_TOGGLED | LAB_BS_ROUNDED,
+};
+
 struct theme {
 	int border_width;
-	int padding_height;
+
+	/*
+	 * the space between title bar border and
+	 * buttons on the left/right/top
+	 */
+	int window_titlebar_padding_width;
+	int window_titlebar_padding_height;
+
 	int title_height;
 	int menu_overlap_x;
 	int menu_overlap_y;
@@ -44,20 +60,19 @@ struct theme {
 	float window_active_label_text_color[4];
 	float window_inactive_label_text_color[4];
 	enum lab_justification window_label_text_justify;
+	enum lab_justification menu_title_text_justify;
 
-	/* button colors */
-	float window_active_button_menu_unpressed_image_color[4];
-	float window_active_button_iconify_unpressed_image_color[4];
-	float window_active_button_max_unpressed_image_color[4];
-	float window_active_button_close_unpressed_image_color[4];
-	float window_inactive_button_menu_unpressed_image_color[4];
-	float window_inactive_button_iconify_unpressed_image_color[4];
-	float window_inactive_button_max_unpressed_image_color[4];
-	float window_inactive_button_close_unpressed_image_color[4];
-	/* TODO: add pressed and hover colors for buttons */
+	/* buttons */
+	int window_button_width;
+	int window_button_height;
+	int window_button_spacing;
+
+	/* the corner radius of the hover effect */
+	int window_button_hover_bg_corner_radius;
 
 	int menu_item_padding_x;
 	int menu_item_padding_y;
+	int menu_item_height;
 
 	float menu_items_bg_color[4];
 	float menu_items_text_color[4];
@@ -72,6 +87,10 @@ struct theme {
 	int menu_separator_padding_height;
 	float menu_separator_color[4];
 
+	float menu_title_bg_color[4];
+
+	float menu_title_text_color[4];
+
 	int osd_border_width;
 
 	float osd_bg_color[4];
@@ -99,31 +118,26 @@ struct theme {
 	float window_active_shadow_color[4];
 	float window_inactive_shadow_color[4];
 
+	struct {
+		/*
+		 * The texture of a window buttons for each hover/toggled/rounded
+		 * state. This can be accessed like:
+		 *
+		 * buttons[LAB_SSD_BUTTON_ICONIFY][LAB_BS_HOVERD | LAB_BS_TOGGLED]
+		 *
+		 * Elements in buttons[0] are all NULL since LAB_SSD_BUTTON_FIRST is 1.
+		 */
+		struct lab_data_buffer *buttons
+			[LAB_SSD_BUTTON_LAST + 1][LAB_BS_ALL + 1];
+
+		/* TODO: add toggled/hover/pressed/disabled colors for buttons */
+		float button_colors[LAB_SSD_BUTTON_LAST + 1][4];
+
+		/* TODO: move other window.(in)active.* entries to here */
+
+	} window[2]; /* indexed by THEME_INACTIVE and THEME_ACTIVE */
+
 	/* textures */
-	struct lab_data_buffer *button_close_active_unpressed;
-	struct lab_data_buffer *button_maximize_active_unpressed;
-	struct lab_data_buffer *button_restore_active_unpressed;
-	struct lab_data_buffer *button_iconify_active_unpressed;
-	struct lab_data_buffer *button_menu_active_unpressed;
-
-	struct lab_data_buffer *button_close_inactive_unpressed;
-	struct lab_data_buffer *button_maximize_inactive_unpressed;
-	struct lab_data_buffer *button_restore_inactive_unpressed;
-	struct lab_data_buffer *button_iconify_inactive_unpressed;
-	struct lab_data_buffer *button_menu_inactive_unpressed;
-
-	/* hover variants are optional and may be NULL */
-	struct lab_data_buffer *button_close_active_hover;
-	struct lab_data_buffer *button_maximize_active_hover;
-	struct lab_data_buffer *button_restore_active_hover;
-	struct lab_data_buffer *button_iconify_active_hover;
-	struct lab_data_buffer *button_menu_active_hover;
-
-	struct lab_data_buffer *button_close_inactive_hover;
-	struct lab_data_buffer *button_maximize_inactive_hover;
-	struct lab_data_buffer *button_restore_inactive_hover;
-	struct lab_data_buffer *button_iconify_inactive_hover;
-	struct lab_data_buffer *button_menu_inactive_hover;
 
 	struct lab_data_buffer *corner_top_left_active_normal;
 	struct lab_data_buffer *corner_top_right_active_normal;
@@ -137,7 +151,10 @@ struct theme {
 	struct lab_data_buffer *shadow_corner_bottom_inactive;
 	struct lab_data_buffer *shadow_edge_inactive;
 
-	/* not set in rc.xml/themerc, but derived from font & padding_height */
+	/*
+	 * Not set in rc.xml/themerc, but derived from the tallest titlebar
+	 * object plus 2 * window_titlebar_padding_height
+	 */
 	int osd_window_switcher_item_height;
 
 	/* magnifier */
@@ -145,6 +162,9 @@ struct theme {
 	int mag_border_width;
 };
 
+#define THEME_INACTIVE 0
+#define THEME_ACTIVE 1
+
 struct server;
 
 /**
diff --git a/include/view.h b/include/view.h
index b21d7ca2..7a1b5dde 100644
--- a/include/view.h
+++ b/include/view.h
@@ -2,6 +2,7 @@
 #ifndef LABWC_VIEW_H
 #define LABWC_VIEW_H
 
+#include "config/rcxml.h"
 #include "config.h"
 #include "ssd.h"
 #include <stdbool.h>
@@ -10,9 +11,18 @@
 #include <wlr/util/box.h>
 #include <xkbcommon/xkbcommon.h>
 
-#define LAB_MIN_VIEW_WIDTH (SSD_BUTTON_WIDTH * SSD_BUTTON_COUNT)
 #define LAB_MIN_VIEW_HEIGHT 60
 
+/*
+ * Fallback view geometry used in some cases where a better position
+ * and/or size can't be determined. Try to avoid using these except as
+ * a last resort.
+ */
+#define VIEW_FALLBACK_X 100
+#define VIEW_FALLBACK_Y 100
+#define VIEW_FALLBACK_WIDTH  640
+#define VIEW_FALLBACK_HEIGHT 480
+
 /*
  * In labwc, a view is a container for surfaces which can be moved around by
  * the user. In practice this means XDG toplevel and XWayland windows.
@@ -31,6 +41,12 @@ enum ssd_preference {
 	LAB_SSD_PREF_SERVER,
 };
 
+enum three_state {
+	LAB_STATE_UNSPECIFIED = 0,
+	LAB_STATE_ENABLED,
+	LAB_STATE_DISABLED
+};
+
 /**
  * Directions in which a view can be maximized. "None" is used
  * internally to mean "not maximized" but is not valid in rc.xml.
@@ -188,6 +204,7 @@ struct view {
 	enum view_axis maximized;
 	bool fullscreen;
 	bool tearing_hint;
+	enum three_state force_tearing;
 	bool visible_on_all_workspaces;
 	enum view_edge tiled;
 	uint32_t edges_visible;  /* enum wlr_edges bitset */
@@ -281,6 +298,7 @@ struct xdg_toplevel_view {
 
 	/* Events unique to xdg-toplevel views */
 	struct wl_listener set_app_id;
+	struct wl_listener request_show_window_menu;
 	struct wl_listener new_popup;
 };
 
@@ -451,8 +469,15 @@ void view_moved(struct view *view);
 void view_minimize(struct view *view, bool minimized);
 bool view_compute_centered_position(struct view *view,
 	const struct wlr_box *ref, int w, int h, int *x, int *y);
+void view_set_fallback_natural_geometry(struct view *view);
 void view_store_natural_geometry(struct view *view);
 
+/**
+ * view_apply_natural_geometry - adjust view->natural_geometry if it doesn't
+ * intersect with view->output and then apply it
+ */
+void view_apply_natural_geometry(struct view *view);
+
 /**
  * view_effective_height - effective height of view, with respect to shaded state
  * @view: view for which effective height is desired
@@ -475,7 +500,7 @@ void view_center(struct view *view, const struct wlr_box *ref);
  * @policy: placement policy to apply
  */
 void view_place_by_policy(struct view *view, bool allow_cursor,
-	enum view_placement_policy);
+	enum view_placement_policy policy);
 void view_constrain_size_to_that_of_usable_area(struct view *view);
 
 void view_restore_to(struct view *view, struct wlr_box geometry);
@@ -495,6 +520,7 @@ void view_toggle_always_on_bottom(struct view *view);
 void view_toggle_visible_on_all_workspaces(struct view *view);
 
 bool view_is_tiled(struct view *view);
+bool view_is_tiled_and_notify_tiled(struct view *view);
 bool view_is_floating(struct view *view);
 void view_move_to_workspace(struct view *view, struct workspace *workspace);
 enum ssd_mode view_get_ssd_mode(struct view *view);
@@ -529,6 +555,7 @@ const char *view_get_string_prop(struct view *view, const char *prop);
 void view_update_title(struct view *view);
 void view_update_app_id(struct view *view);
 void view_reload_ssd(struct view *view);
+int view_get_min_width(void);
 
 void view_set_shade(struct view *view, bool shaded);
 
@@ -540,8 +567,6 @@ void view_on_output_destroy(struct view *view);
 void view_connect_map(struct view *view, struct wlr_surface *surface);
 void view_destroy(struct view *view);
 
-struct output *view_get_adjacent_output(struct view *view, enum view_edge edge,
-	bool wrap);
 enum view_axis view_axis_parse(const char *direction);
 enum view_edge view_edge_parse(const char *direction);
 enum view_placement_policy view_placement_parse(const char *policy);
diff --git a/include/workspaces.h b/include/workspaces.h
index a558a00e..9bae5190 100644
--- a/include/workspaces.h
+++ b/include/workspaces.h
@@ -4,6 +4,7 @@
 
 #include <stdbool.h>
 #include <wayland-util.h>
+#include <wayland-server-core.h>
 
 struct seat;
 struct server;
@@ -19,6 +20,13 @@ struct workspace {
 
 	char *name;
 	struct wlr_scene_tree *tree;
+
+	struct lab_cosmic_workspace *cosmic_workspace;
+	struct {
+		struct wl_listener activate;
+		struct wl_listener deactivate;
+		struct wl_listener remove;
+	} on;
 };
 
 void workspaces_init(struct server *server);
diff --git a/include/xwayland.h b/include/xwayland.h
index 99867e3e..1db3c367 100644
--- a/include/xwayland.h
+++ b/include/xwayland.h
@@ -69,6 +69,7 @@ struct xwayland_view {
 	struct wl_listener set_override_redirect;
 	struct wl_listener set_strut_partial;
 	struct wl_listener set_window_type;
+	struct wl_listener map_request;
 
 	/* Not (yet) implemented */
 /*	struct wl_listener set_role; */
diff --git a/meson.build b/meson.build
index dcf564be..ad3bf0c9 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project(
   'labwc',
   'c',
-  version: '0.7.2',
+  version: '0.8.0',
   license: 'GPL-2.0-only',
   meson_version: '>=0.59.0',
   default_options: [
@@ -36,6 +36,7 @@ add_project_arguments(cc.get_supported_arguments([
   '-Wunused-macros',
 
   '-Wno-unused-parameter',
+  '-Wno-expansion-to-defined',
 ]), language: 'c')
 
 version='"@0@"'.format(meson.project_version())
@@ -49,15 +50,16 @@ endif
 add_project_arguments('-DLABWC_VERSION=@0@'.format(version), language: 'c')
 
 wlroots = dependency(
-  'wlroots',
+  'wlroots-0.18',
   default_options: ['default_library=static', 'examples=false'],
-  version: ['>=0.17.0', '<0.18.0'],
+  version: ['>=0.18.0', '<0.19.0'],
 )
 
 wlroots_has_xwayland = wlroots.get_variable('have_xwayland') == 'true'
+have_libsfdo = not get_option('icon').disabled()
 
 wayland_server = dependency('wayland-server', version: '>=1.19.0')
-wayland_protos = dependency('wayland-protocols')
+wayland_protos = dependency('wayland-protocols', version: '>=1.35')
 xkbcommon = dependency('xkbcommon')
 xcb = dependency('xcb', required: get_option('xwayland'))
 xcb_icccm = dependency('xcb-icccm', required: get_option('xwayland'))
@@ -72,6 +74,24 @@ pixman = dependency('pixman-1')
 math = cc.find_library('m')
 png = dependency('libpng')
 svg = dependency('librsvg-2.0', version: '>=2.46', required: false)
+sfdo_basedir = dependency(
+  'libsfdo-basedir',
+  default_options: ['default_library=static', 'examples=false', 'tests=false'],
+  version: '>=0.1.0',
+  required: have_libsfdo,
+)
+sfdo_desktop = dependency(
+  'libsfdo-desktop',
+  default_options: ['default_library=static', 'examples=false', 'tests=false'],
+  version: '>=0.1.0',
+  required: have_libsfdo,
+)
+sfdo_icon = dependency(
+  'libsfdo-icon',
+  default_options: ['default_library=static', 'examples=false', 'tests=false'],
+  version: '>=0.1.0',
+  required: have_libsfdo,
+)
 
 if get_option('xwayland').enabled() and not wlroots_has_xwayland
 	error('no wlroots Xwayland support')
@@ -87,6 +107,8 @@ else
 endif
 conf_data.set10('HAVE_RSVG', have_rsvg)
 
+conf_data.set10('HAVE_LIBSFDO', have_libsfdo)
+
 if get_option('static_analyzer').enabled()
   add_project_arguments(['-fanalyzer'], language: 'c')
 endif
@@ -125,11 +147,23 @@ if have_rsvg
     svg,
   ]
 endif
+if have_libsfdo
+  labwc_deps += [
+    sfdo_basedir,
+    sfdo_desktop,
+    sfdo_icon,
+  ]
+endif
 
 subdir('include')
 subdir('src')
 subdir('docs')
 
+dep_cmocka = dependency('cmocka', required: get_option('test'))
+if dep_cmocka.found()
+  subdir('t')
+endif
+
 executable(
   meson.project_name(),
   labwc_sources,
@@ -140,6 +174,8 @@ executable(
 
 install_data('data/labwc.desktop', install_dir: get_option('datadir') / 'wayland-sessions')
 
+install_data('data/labwc-portals.conf', install_dir: get_option('datadir') / 'xdg-desktop-portal')
+
 icons = ['labwc-symbolic.svg', 'labwc.svg']
 foreach icon : icons
   icon_path = join_paths('data', icon)
diff --git a/meson_options.txt b/meson_options.txt
index d9cb73a8..ec3fe85d 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,5 +1,7 @@
 option('man-pages', type: 'feature', value: 'auto', description: 'Generate and install man pages')
 option('xwayland', type: 'feature', value: 'auto', description: 'Enable support for X11 applications')
 option('svg', type: 'feature', value: 'enabled', description: 'Enable svg window buttons')
+option('icon', type: 'feature', value: 'enabled', description: 'Enable window icons')
 option('nls', type: 'feature', value: 'auto', description: 'Enable native language support')
 option('static_analyzer', type: 'feature', value: 'disabled', description: 'Run gcc static analyzer')
+option('test', type: 'feature', value: 'disabled', description: 'Run tests')
diff --git a/po/LINGUAS b/po/LINGUAS
index d2ca2b20..8b56fb2a 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1 +1 @@
-ar cs de el es et eu fa fi fr gl hu id it ja ka ko lt nl pa pl pt ru sv tr uk zh_CN
+ar cs da de el es et eu fa fi fr gl hu id it ja ka ko lt nl pa pl pt pt_BR ru sv tr uk zh_CN
diff --git a/po/ar.po b/po/ar.po
index af13bbcf..fc5b0cf1 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,65 +7,71 @@ msgid ""
 msgstr ""
 "Project-Id-Version: labwc\n"
 "Report-Msgid-Bugs-To: https://github.com/labwc/labwc/issues\n"
-"POT-Creation-Date: 2024-03-17 11:06+1000\n"
-"PO-Revision-Date: 2024-03-11 10:23+0000\n"
+"POT-Creation-Date: 2024-09-19 21:09+1000\n"
+"PO-Revision-Date: 2024-09-23 20:01+0000\n"
 "Last-Translator: Abdullah Albaroty <albaroty@gmail.com>\n"
-"Language-Team: Arabic <https://translate.lxqt-project.org/projects/labwc/labwc/ar/>\n"
+"Language-Team: Arabic <https://translate.lxqt-project.org/projects/labwc/"
+"labwc/ar/>\n"
 "Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
 "X-Generator: Weblate 4.2.1\n"
 
-#: src/menu/menu.c:704
+#: src/menu/menu.c:1017
+msgid "Go there..."
+msgstr "اذهب هناك..."
+
+#: src/menu/menu.c:1037
 msgid "Reconfigure"
 msgstr "إعادة تهيئة"
 
-#: src/menu/menu.c:706
+#: src/menu/menu.c:1039
 msgid "Exit"
 msgstr "أخرج"
 
-#: src/menu/menu.c:722
+#: src/menu/menu.c:1055
 msgid "Minimize"
 msgstr "صغّر"
 
-#: src/menu/menu.c:724
+#: src/menu/menu.c:1057
 msgid "Maximize"
 msgstr "كبّر"
 
-#: src/menu/menu.c:726
+#: src/menu/menu.c:1059
 msgid "Fullscreen"
 msgstr "ملء الشاشة"
 
-#: src/menu/menu.c:728
-msgid "Roll up/down"
+#: src/menu/menu.c:1061
+msgid "Roll Up/Down"
 msgstr "طي/إلغاء طي"
 
-#: src/menu/menu.c:730
+#: src/menu/menu.c:1063
 msgid "Decorations"
 msgstr "إخف الإطار"
 
-#: src/menu/menu.c:732
+#: src/menu/menu.c:1065
 msgid "Always on Top"
 msgstr "دائمًا في القمة"
 
-#: src/menu/menu.c:737
-msgid "Move left"
+#: src/menu/menu.c:1070
+msgid "Move Left"
 msgstr "أنقل يسارا"
 
-#: src/menu/menu.c:744
-msgid "Move right"
+#: src/menu/menu.c:1077
+msgid "Move Right"
 msgstr "أنقل يمينا"
 
-#: src/menu/menu.c:749
+#: src/menu/menu.c:1082
 msgid "Always on Visible Workspace"
 msgstr "أظهر في مساحات العمل دائما"
 
-#: src/menu/menu.c:752 src/config/rcxml.c:1384
+#: src/menu/menu.c:1085 src/config/rcxml.c:1629
 msgid "Workspace"
 msgstr "مساحة عمل"
 
-#: src/menu/menu.c:755
+#: src/menu/menu.c:1088
 msgid "Close"
 msgstr "غلق"
diff --git a/po/cs.po b/po/cs.po
index 7077c59b..b874267a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: labwc\n"
 "Report-Msgid-Bugs-To: https://github.com/labwc/labwc/issues\n"
-"POT-Creation-Date: 2024-03-17 11:06+1000\n"
+"POT-Creation-Date: 2024-09-19 21:09+1000\n"
 "PO-Revision-Date: 2024-03-02 02:00+0100\n"
 "Last-Translator: zenobit <zenobit@disroot.org>\n"
 "Language-Team: Czech <zenobit@disroot.org>\n"
@@ -16,54 +16,58 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/menu/menu.c:704
+#: src/menu/menu.c:1017
+msgid "Go there..."
+msgstr ""
+
+#: src/menu/menu.c:1037
 msgid "Reconfigure"
 msgstr "Překonfigurovat"
 
-#: src/menu/menu.c:706
+#: src/menu/menu.c:1039
 msgid "Exit"
 msgstr "Odejít"
 
-#: src/menu/menu.c:722
+#: src/menu/menu.c:1055
 msgid "Minimize"
 msgstr "Minimalizovat"
 
-#: src/menu/menu.c:724
+#: src/menu/menu.c:1057
 msgid "Maximize"
 msgstr "Maximalizovat"
 
-#: src/menu/menu.c:726
+#: src/menu/menu.c:1059
 msgid "Fullscreen"
 msgstr "Na celou obrazovku"
 
-#: src/menu/menu.c:728
-msgid "Roll up/down"
+#: src/menu/menu.c:1061
+msgid "Roll Up/Down"
 msgstr "Rolovat nahoru/dolů"
 
-#: src/menu/menu.c:730
+#: src/menu/menu.c:1063
 msgid "Decorations"
 msgstr "Dekorace"
 
-#: src/menu/menu.c:732
+#: src/menu/menu.c:1065
 msgid "Always on Top"
 msgstr "Vždy nahoře"
 
-#: src/menu/menu.c:737
-msgid "Move left"
+#: src/menu/menu.c:1070
+msgid "Move Left"
 msgstr "Posunout doleva"
 
-#: src/menu/menu.c:744
-msgid "Move right"
+#: src/menu/menu.c:1077
+msgid "Move Right"
 msgstr "Posunout doprava"
 
-#: src/menu/menu.c:749
+#: src/menu/menu.c:1082
 msgid "Always on Visible Workspace"
 msgstr "Vždy na viditelné Pracovní Ploše"
 
-#: src/menu/menu.c:752 src/config/rcxml.c:1384
+#: src/menu/menu.c:1085 src/config/rcxml.c:1629
 msgid "Workspace"
 msgstr "Pracovní Plocha"
 
-#: src/menu/menu.c:755
+#: src/menu/menu.c:1088
 msgid "Close"
 msgstr "Zavřít"
diff --git a/po/da.po b/po/da.po
new file mode 100644
index 00000000..fc287e1b
--- /dev/null
+++ b/po/da.po
@@ -0,0 +1,75 @@
+# Labwc pot file
+# Copyright (C) 2024
+# This file is distributed under the same license as the labwc package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: labwc\n"
+"Report-Msgid-Bugs-To: https://github.com/labwc/labwc/issues\n"
+"POT-Creation-Date: 2024-09-19 21:09+1000\n"
+"PO-Revision-Date: 2024-08-18 20:01+0000\n"
+"Last-Translator: Peter  Jespersen <flywheel@illogical.dk>\n"
+"Language-Team: Danish <https://translate.lxqt-project.org/projects/labwc/labwc/da/>\n"
+"Language: da\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.2.1\n"
+
+#: src/menu/menu.c:1017
+msgid "Go there..."
+msgstr ""
+
+#: src/menu/menu.c:1037
+msgid "Reconfigure"
+msgstr "Genindstil"
+
+#: src/menu/menu.c:1039
+msgid "Exit"
+msgstr "Afslut"
+
+#: src/menu/menu.c:1055
+msgid "Minimize"
+msgstr "Minimer"
+
+#: src/menu/menu.c:1057
+msgid "Maximize"
+msgstr "Maksimer"
+
+#: src/menu/menu.c:1059
+msgid "Fullscreen"
+msgstr "Fuldskærm"
+
+#: src/menu/menu.c:1061
+msgid "Roll Up/Down"
+msgstr "Rul Op/Ned"
+
+#: src/menu/menu.c:1063
+msgid "Decorations"
+msgstr "Dekorationer"
+
+#: src/menu/menu.c:1065
+msgid "Always on Top"
+msgstr "Altid øverst"
+
+#: src/menu/menu.c:1070
+msgid "Move Left"
+msgstr "Flyt til venstre"
+
+#: src/menu/menu.c:1077
+msgid "Move Right"
+msgstr "Flyt til højre"
+
+#: src/menu/menu.c:1082
+msgid "Always on Visible Workspace"
+msgstr "Altid på synlig arbejdsplads"
+
+#: src/menu/menu.c:1085 src/config/rcxml.c:1629
+msgid "Workspace"
+msgstr "Arbejdsplads"
+
+#: src/menu/menu.c:1088
+msgid "Close"
+msgstr "Luk"
diff --git a/po/de.po b/po/de.po
index 2b293c4e..4747ba9b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: labwc\n"
 "Report-Msgid-Bugs-To: https://github.com/labwc/labwc/issues\n"
-"POT-Creation-Date: 2024-03-17 11:06+1000\n"
-"PO-Revision-Date: 2024-03-04 07:14+0000\n"
+"POT-Creation-Date: 2024-09-19 21:09+1000\n"
+"PO-Revision-Date: 2024-06-23 13:42+0000\n"
 "Last-Translator: Standreas <standreas@riseup.net>\n"
 "Language-Team: German <https://translate.lxqt-project.org/projects/labwc/labwc/de/>\n"
 "Language: de\n"
@@ -18,54 +18,58 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.2.1\n"
 
-#: src/menu/menu.c:704
+#: src/menu/menu.c:1017
+msgid "Go there..."
+msgstr ""
+
+#: src/menu/menu.c:1037
 msgid "Reconfigure"
 msgstr "Rekonfigurieren"
 
-#: src/menu/menu.c:706
+#: src/menu/menu.c:1039
 msgid "Exit"
 msgstr "Beenden"
 
-#: src/menu/menu.c:722
+#: src/menu/menu.c:1055
 msgid "Minimize"
 msgstr "Minimieren"
 
-#: src/menu/menu.c:724
+#: src/menu/menu.c:1057
 msgid "Maximize"
 msgstr "Maximieren"
 
-#: src/menu/menu.c:726
+#: src/menu/menu.c:1059
 msgid "Fullscreen"
 msgstr "Vollbild"
 
-#: src/menu/menu.c:728
-msgid "Roll up/down"
+#: src/menu/menu.c:1061
+msgid "Roll Up/Down"
 msgstr "Hoch/Runterrollen"
 
-#: src/menu/menu.c:730
+#: src/menu/menu.c:1063
 msgid "Decorations"
 msgstr "Dekorationen"
 
-#: src/menu/menu.c:732
+#: src/menu/menu.c:1065
 msgid "Always on Top"
 msgstr "Immer im Vordergrund"
 
-#: src/menu/menu.c:737
-msgid "Move left"
+#: src/menu/menu.c:1070
+msgid "Move Left"
 msgstr "nach links"
 
-#: src/menu/menu.c:744
-msgid "Move right"
+#: src/menu/menu.c:1077
+msgid "Move Right"
 msgstr "nach rechts"
 
-#: src/menu/menu.c:749
+#: src/menu/menu.c:1082
 msgid "Always on Visible Workspace"
 msgstr "Immer auf aktiver Arbeitsfläche"
 
-#: src/menu/menu.c:752 src/config/rcxml.c:1384
+#: src/menu/menu.c:1085 src/config/rcxml.c:1629
 msgid "Workspace"
 msgstr "Arbeitsfläche"
 
-#: src/menu/menu.c:755
+#: src/menu/menu.c:1088
 msgid "Close"
 msgstr "Schließen"
diff --git a/po/el.po b/po/el.po
index 6d67478e..c6e0a7cc 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: labwc\n"
 "Report-Msgid-Bugs-To: https://github.com/labwc/labwc/issues\n"
-"POT-Creation-Date: 2024-03-17 11:06+1000\n"
-"PO-Revision-Date: 2024-04-20 15:23+0000\n"
-"Last-Translator: Yannis Drougas <drougas@gmail.com>\n"
+"POT-Creation-Date: 2024-09-19 21:09+1000\n"
+"PO-Revision-Date: 2024-09-25 20:01+0000\n"
+"Last-Translator: Giannis Antypas <gianni.antypas@gmail.com>\n"
 "Language-Team: Greek <https://translate.lxqt-project.org/projects/labwc/"
 "labwc/el/>\n"
 "Language: el\n"
@@ -19,54 +19,58 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.2.1\n"
 
-#: src/menu/menu.c:704
+#: src/menu/menu.c:1017
+msgid "Go there..."
+msgstr "Πήγαινε εκεί..."
+
+#: src/menu/menu.c:1037
 msgid "Reconfigure"
 msgstr "Επαναρύθμιση"
 
-#: src/menu/menu.c:706
+#: src/menu/menu.c:1039
 msgid "Exit"
 msgstr "Έξοδος"
 
-#: src/menu/menu.c:722
+#: src/menu/menu.c:1055
 msgid "Minimize"
 msgstr "Ελαχιστοποίηση"
 
-#: src/menu/menu.c:724
+#: src/menu/menu.c:1057
 msgid "Maximize"
 msgstr "Μεγιστοποίηση"
 
-#: src/menu/menu.c:726
+#: src/menu/menu.c:1059
 msgid "Fullscreen"
 msgstr "Πλήρης οθόνη"
 
-#: src/menu/menu.c:728
-msgid "Roll up/down"
+#: src/menu/menu.c:1061
+msgid "Roll Up/Down"
 msgstr "Τύλιγμα/Ξετύλιγμα"
 
-#: src/menu/menu.c:730
+#: src/menu/menu.c:1063
 msgid "Decorations"
 msgstr "Διακόσμηση"
 
-#: src/menu/menu.c:732
+#: src/menu/menu.c:1065
 msgid "Always on Top"
 msgstr "Πάντα στο προσκήνιο"
 
-#: src/menu/menu.c:737
-msgid "Move left"
+#: src/menu/menu.c:1070
+msgid "Move Left"
 msgstr "Στα αριστερά"
 
-#: src/menu/menu.c:744
-msgid "Move right"
+#: src/menu/menu.c:1077
+msgid "Move Right"
 msgstr "Στα δεξιά"
 
-#: src/menu/menu.c:749
+#: src/menu/menu.c:1082
 msgid "Always on Visible Workspace"
 msgstr "Πάντα στην ενεργή επιφάνεια εργασίας"
 
-#: src/menu/menu.c:752 src/config/rcxml.c:1384
+#: src/menu/menu.c:1085 src/config/rcxml.c:1629
 msgid "Workspace"
 msgstr "Επιφάνεια εργασίας"
 
-#: src/menu/menu.c:755
+#: src/menu/menu.c:1088
 msgid "Close"
 msgstr "Κλείσιμο"
diff --git a/po/es.po b/po/es.po
index 66a402af..5c9e7355 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: labwc\n"
 "Report-Msgid-Bugs-To: https://github.com/labwc/labwc/issues\n"
-"POT-Creation-Date: 2024-03-17 11:06+1000\n"
+"POT-Creation-Date: 2024-09-19 21:09+1000\n"
 "PO-Revision-Date: 2024-03-19 11:08+0000\n"
 "Last-Translator: Roberalz <lumintnian@outlook.com>\n"
 "Language-Team: Spanish <https://translate.lxqt-project.org/projects/labwc/labwc/es/>\n"
@@ -18,54 +18,58 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.2.1\n"
 
-#: src/menu/menu.c:704
+#: src/menu/menu.c:1017
+msgid "Go there..."
+msgstr ""
+
+#: src/menu/menu.c:1037
 msgid "Reconfigure"
 msgstr "Reconfigurar"
 
-#: src/menu/menu.c:706
+#: src/menu/menu.c:1039
 msgid "Exit"
 msgstr "Salir"
 
-#: src/menu/menu.c:722
+#: src/menu/menu.c:1055
 msgid "Minimize"
 msgstr "Minimizar"
 
-#: src/menu/menu.c:724
+#: src/menu/menu.c:1057
 msgid "Maximize"
 msgstr "Maximizar"
 
-#: src/menu/menu.c:726
+#: src/menu/menu.c:1059
 msgid "Fullscreen"
 msgstr "Pantalla completa"
 
-#: src/menu/menu.c:728
-msgid "Roll up/down"
+#: src/menu/menu.c:1061
+msgid "Roll Up/Down"
 msgstr "Enrollar hacia arriba/abajo"
 
-#: src/menu/menu.c:730
+#: src/menu/menu.c:1063
 msgid "Decorations"
 msgstr "Decoraciones"
 
-#: src/menu/menu.c:732
+#: src/menu/menu.c:1065
 msgid "Always on Top"
 msgstr "Siempre encima"
 
-#: src/menu/menu.c:737
-msgid "Move left"
+#: src/menu/menu.c:1070
+msgid "Move Left"
 msgstr "Mover a la izquierda"
 
-#: src/menu/menu.c:744
-msgid "Move right"
+#: src/menu/menu.c:1077
+msgid "Move Right"
 msgstr "Mover a la derecha"
 
-#: src/menu/menu.c:749
+#: src/menu/menu.c:1082
 msgid "Always on Visible Workspace"
 msgstr "Siempre en un espacio de trabajo visible"
 
-#: src/menu/menu.c:752 src/config/rcxml.c:1384
+#: src/menu/menu.c:1085 src/config/rcxml.c:1629
 msgid "Workspace"
 msgstr "Espacio de trabajo"
 
-#: src/menu/menu.c:755
+#: src/menu/menu.c:1088
 msgid "Close"
 msgstr "Cerrar"
diff --git a/po/et.po b/po/et.po
index c7074bb4..8ac0ca2c 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: labwc\n"
 "Report-Msgid-Bugs-To: https://github.com/labwc/labwc/issues\n"
-"POT-Creation-Date: 2024-03-17 11:06+1000\n"
-"PO-Revision-Date: 2024-01-23 09:23+0000\n"
+"POT-Creation-Date: 2024-09-19 21:09+1000\n"
+"PO-Revision-Date: 2024-09-23 20:01+0000\n"
 "Last-Translator: Priit Jõerüüt <lxqtwlate@joeruut.com>\n"
-"Language-Team: Estonian <https://translate.lxqt-project.org/projects/labwc/labwc/et/>\n"
+"Language-Team: Estonian <https://translate.lxqt-project.org/projects/labwc/"
+"labwc/et/>\n"
 "Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,54 +19,58 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.2.1\n"
 
-#: src/menu/menu.c:704
+#: src/menu/menu.c:1017
+msgid "Go there..."
+msgstr "Suundu..."
+
+#: src/menu/menu.c:1037
 msgid "Reconfigure"
 msgstr "Seadista uuesti"
 
-#: src/menu/menu.c:706
+#: src/menu/menu.c:1039
 msgid "Exit"
 msgstr "Välju"
 
-#: src/menu/menu.c:722
+#: src/menu/menu.c:1055
 msgid "Minimize"
 msgstr "Vähenda"
 
-#: src/menu/menu.c:724
+#: src/menu/menu.c:1057
 msgid "Maximize"
 msgstr "Suurenda"
 
-#: src/menu/menu.c:726
+#: src/menu/menu.c:1059
 msgid "Fullscreen"
 msgstr "Täisekraanivaade"
 
-#: src/menu/menu.c:728
-msgid "Roll up/down"
+#: src/menu/menu.c:1061
+msgid "Roll Up/Down"
 msgstr "Keri üles/alla"
 
-#: src/menu/menu.c:730
+#: src/menu/menu.c:1063
 msgid "Decorations"
 msgstr "Akende välimus"
 
-#: src/menu/menu.c:732
+#: src/menu/menu.c:1065
 msgid "Always on Top"
 msgstr "Alati kõige peal"
 
-#: src/menu/menu.c:737
-msgid "Move left"
+#: src/menu/menu.c:1070
+msgid "Move Left"
 msgstr "Tõsta vasakule"
 
-#: src/menu/menu.c:744
-msgid "Move right"
+#: src/menu/menu.c:1077
+msgid "Move Right"
 msgstr "Tõsta paremale"
 
-#: src/menu/menu.c:749
+#: src/menu/menu.c:1082
 msgid "Always on Visible Workspace"
 msgstr "Alati nähtav töölaual"
 
-#: src/menu/menu.c:752 src/config/rcxml.c:1384
+#: src/menu/menu.c:1085 src/config/rcxml.c:1629
 msgid "Workspace"
 msgstr "Töölaud"
 
-#: src/menu/menu.c:755
+#: src/menu/menu.c:1088
 msgid "Close"
 msgstr "Sulge"
diff --git a/po/eu.po b/po/eu.po
index 73696473..70e85752 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: labwc\n"
 "Report-Msgid-Bugs-To: https://github.com/labwc/labwc/issues\n"
-"POT-Creation-Date: 2024-03-17 11:06+1000\n"
+"POT-Creation-Date: 2024-09-19 21:09+1000\n"
 "PO-Revision-Date: 2024-03-19 11:08+0000\n"
 "Last-Translator: Roberalz <lumintnian@outlook.com>\n"
 "Language-Team: Basque <https://translate.lxqt-project.org/projects/labwc/labwc/eu/>\n"
@@ -18,54 +18,58 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.2.1\n"
 
-#: src/menu/menu.c:704
+#: src/menu/menu.c:1017
+msgid "Go there..."
+msgstr ""
+
+#: src/menu/menu.c:1037
 msgid "Reconfigure"
 msgstr "Berriz konfiguratu"
 
-#: src/menu/menu.c:706
+#: src/menu/menu.c:1039
 msgid "Exit"
 msgstr "Irten"
 
-#: src/menu/menu.c:722
+#: src/menu/menu.c:1055
 msgid "Minimize"
 msgstr "Minimizatu"
 
-#: src/menu/menu.c:724
+#: src/menu/menu.c:1057
 msgid "Maximize"
 msgstr "Maximizatu"
 
-#: src/menu/menu.c:726
+#: src/menu/menu.c:1059
 msgid "Fullscreen"
 msgstr "Pantaila osoa"
 
-#: src/menu/menu.c:728
-msgid "Roll up/down"
+#: src/menu/menu.c:1061
+msgid "Roll Up/Down"
 msgstr "Ibili gora/behera"
 
-#: src/menu/menu.c:730
+#: src/menu/menu.c:1063
 msgid "Decorations"
 msgstr "Apaingarriak"
 
-#: src/menu/menu.c:732
+#: src/menu/menu.c:1065
 msgid "Always on Top"
 msgstr "Beti gainean"
 
-#: src/menu/menu.c:737
-msgid "Move left"
+#: src/menu/menu.c:1070
+msgid "Move Left"
 msgstr "Mugitu ezkerrera"
 
-#: src/menu/menu.c:744
-msgid "Move right"
+#: src/menu/menu.c:1077
+msgid "Move Right"
 msgstr "Mugitu eskuinera"
 
-#: src/menu/menu.c:749
+#: src/menu/menu.c:1082
 msgid "Always on Visible Workspace"
 msgstr "Beti ikusgai dagoen lan-eremuan"
 
-#: src/menu/menu.c:752 src/config/rcxml.c:1384
+#: src/menu/menu.c:1085 src/config/rcxml.c:1629
 msgid "Workspace"
 msgstr "Langunea"
 
-#: src/menu/menu.c:755
+#: src/menu/menu.c:1088
 msgid "Close"
 msgstr "Itxi"
diff --git a/po/fa.po b/po/fa.po
index 2112ef54..fd990b30 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: labwc\n"
 "Report-Msgid-Bugs-To: https://github.com/labwc/labwc/issues\n"
-"POT-Creation-Date: 2024-03-17 11:06+1000\n"
+"POT-Creation-Date: 2024-09-19 21:09+1000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,54 +16,58 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/menu/menu.c:704
+#: src/menu/menu.c:1017
+msgid "Go there..."
+msgstr ""
+
+#: src/menu/menu.c:1037
 msgid "Reconfigure"
 msgstr ""
 
-#: src/menu/menu.c:706
+#: src/menu/menu.c:1039
 msgid "Exit"
 msgstr ""
 
-#: src/menu/menu.c:722
+#: src/menu/menu.c:1055
 msgid "Minimize"
 msgstr ""
 
-#: src/menu/menu.c:724
+#: src/menu/menu.c:1057
 msgid "Maximize"
 msgstr ""
 
-#: src/menu/menu.c:726
+#: src/menu/menu.c:1059
 msgid "Fullscreen"
 msgstr ""
 
-#: src/menu/menu.c:728
-msgid "Roll up/down"
+#: src/menu/menu.c:1061
+msgid "Roll Up/Down"
 msgstr ""
 
-#: src/menu/menu.c:730
+#: src/menu/menu.c:1063
 msgid "Decorations"
 msgstr ""
 
-#: src/menu/menu.c:732
+#: src/menu/menu.c:1065
 msgid "Always on Top"
 msgstr ""
 
-#: src/menu/menu.c:737
-msgid "Move left"
+#: src/menu/menu.c:1070
+msgid "Move Left"
 msgstr ""
 
-#: src/menu/menu.c:744
-msgid "Move right"
+#: src/menu/menu.c:1077
+msgid "Move Right"
 msgstr ""
 
-#: src/menu/menu.c:749
+#: src/menu/menu.c:1082
 msgid "Always on Visible Workspace"
 msgstr ""
 
-#: src/menu/menu.c:752 src/config/rcxml.c:1384
+#: src/menu/menu.c:1085 src/config/rcxml.c:1629
 msgid "Workspace"
 msgstr ""
 
-#: src/menu/menu.c:755
+#: src/menu/menu.c:1088
 msgid "Close"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 53a2d01f..5b8abc71 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,11 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: labwc\n"
 "Report-Msgid-Bugs-To: https://github.com/labwc/labwc/issues\n"
-"POT-Creation-Date: 2024-03-17 11:06+1000\n"
+"POT-Creation-Date: 2024-09-19 21:09+1000\n"
 "PO-Revision-Date: 2024-04-20 15:23+0000\n"
 "Last-Translator: Jouni Järvinen <jounijarvis@gmail.com>\n"
-"Language-Team: Finnish <https://translate.lxqt-project.org/projects/labwc/"
-"labwc/fi/>\n"
+"Language-Team: Finnish <https://translate.lxqt-project.org/projects/labwc/labwc/fi/>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,54 +18,58 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.2.1\n"
 
-#: src/menu/menu.c:704
+#: src/menu/menu.c:1017
+msgid "Go there..."
+msgstr ""
+
+#: src/menu/menu.c:1037
 msgid "Reconfigure"
 msgstr "Uudelleenmääritä"
 
-#: src/menu/menu.c:706
+#: src/menu/menu.c:1039
 msgid "Exit"
 msgstr "Poistu"
 
-#: src/menu/menu.c:722
+#: src/menu/menu.c:1055
 msgid "Minimize"
 msgstr "Pienennä"
 
-#: src/menu/menu.c:724
+#: src/menu/menu.c:1057
 msgid "Maximize"
 msgstr "Suurenna"
 
-#: src/menu/menu.c:726
+#: src/menu/menu.c:1059
 msgid "Fullscreen"
 msgstr "Koko näyttö"
 
-#: src/menu/menu.c:728
-msgid "Roll up/down"
+#: src/menu/menu.c:1061
+msgid "Roll Up/Down"
 msgstr "Rullaa ylös/alas"
 
-#: src/menu/menu.c:730
+#: src/menu/menu.c:1063
 msgid "Decorations"
 msgstr "Kehykset"
 
-#: src/menu/menu.c:732
+#: src/menu/menu.c:1065
 msgid "Always on Top"
 msgstr "Aina ylimpänä"
 
-#: src/menu/menu.c:737
-msgid "Move left"
+#: src/menu/menu.c:1070
+msgid "Move Left"
 msgstr "Siirrä vasemmalle"
 
-#: src/menu/menu.c:744
-msgid "Move right"
+#: src/menu/menu.c:1077
+msgid "Move Right"
 msgstr "Siirrä oikealle"
 
-#: src/menu/menu.c:749
+#: src/menu/menu.c:1082
 msgid "Always on Visible Workspace"
 msgstr "Aina näkyvässä työtilassa"
 
-#: src/menu/menu.c:752 src/config/rcxml.c:1384
+#: src/menu/menu.c:1085 src/config/rcxml.c:1629
 msgid "Workspace"
 msgstr "Työtila"
 
-#: src/menu/menu.c:755
+#: src/menu/menu.c:1088
 msgid "Close"
 msgstr "Sulje"
diff --git a/po/fr.po b/po/fr.po
index f7b5466c..242c6e26 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: labwc\n"
 "Report-Msgid-Bugs-To: https://github.com/labwc/labwc/issues\n"
-"POT-Creation-Date: 2024-03-17 11:06+1000\n"
-"PO-Revision-Date: 2024-03-20 18:15+0000\n"
-"Last-Translator: rico542 <rico@alwaysdata.net>\n"
+"POT-Creation-Date: 2024-09-19 21:09+1000\n"
+"PO-Revision-Date: 2024-09-30 20:01+0000\n"
+"Last-Translator: Eric Migeon <weblate.tilux@spamgourmet.com>\n"
 "Language-Team: French <https://translate.lxqt-project.org/projects/labwc/"
 "labwc/fr/>\n"
 "Language: fr\n"
@@ -19,54 +19,58 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.2.1\n"
 
-#: src/menu/menu.c:704
+#: src/menu/menu.c:1017
+msgid "Go there..."
+msgstr ""
+
+#: src/menu/menu.c:1037
 msgid "Reconfigure"
 msgstr "Reconfigurer"
 
-#: src/menu/menu.c:706
+#: src/menu/menu.c:1039
 msgid "Exit"
 msgstr "Quitter"
 
-#: src/menu/menu.c:722
+#: src/menu/menu.c:1055
 msgid "Minimize"
 msgstr "Minimiser"
 
-#: src/menu/menu.c:724
+#: src/menu/menu.c:1057
 msgid "Maximize"
 msgstr "Maximiser"
 
-#: src/menu/menu.c:726
+#: src/menu/menu.c:1059
 msgid "Fullscreen"
 msgstr "Plein écran"
 
-#: src/menu/menu.c:728
-msgid "Roll up/down"
+#: src/menu/menu.c:1061
+msgid "Roll Up/Down"
 msgstr "Enrouler/Dérouler"
 
-#: src/menu/menu.c:730
+#: src/menu/menu.c:1063
 msgid "Decorations"
 msgstr "Décorations"
 
-#: src/menu/menu.c:732
+#: src/menu/menu.c:1065
 msgid "Always on Top"
 msgstr "Toujours au dessus"
 
-#: src/menu/menu.c:737
-msgid "Move left"
-msgstr "Bouger à gauche"
+#: src/menu/menu.c:1070
+msgid "Move Left"
+msgstr "Déplacer à gauche"
 
-#: src/menu/menu.c:744
-msgid "Move right"
-msgstr "Bouger à droite"
+#: src/menu/menu.c:1077
+msgid "Move Right"
+msgstr "Déplacer à droite"
 
-#: src/menu/menu.c:749
+#: src/menu/menu.c:1082
 msgid "Always on Visible Workspace"
 msgstr "Toujours sur le bureau visible"
 
-#: src/menu/menu.c:752 src/config/rcxml.c:1384
+#: src/menu/menu.c:1085 src/config/rcxml.c:1629
 msgid "Workspace"
 msgstr "Bureau"
 
-#: src/menu/menu.c:755
+#: src/menu/menu.c:1088
 msgid "Close"
 msgstr "Fermer"
diff --git a/po/gl.po b/po/gl.po
index b5c42a49..52eb4584 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: labwc\n"
 "Report-Msgid-Bugs-To: https://github.com/labwc/labwc/issues\n"
-"POT-Creation-Date: 2024-03-17 11:06+1000\n"
+"POT-Creation-Date: 2024-09-19 21:09+1000\n"
 "PO-Revision-Date: 2024-03-19 11:08+0000\n"
 "Last-Translator: Roberalz <lumintnian@outlook.com>\n"
 "Language-Team: Galician <https://translate.lxqt-project.org/projects/labwc/labwc/gl/>\n"
@@ -18,54 +18,58 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.2.1\n"
 
-#: src/menu/menu.c:704
+#: src/menu/menu.c:1017
+msgid "Go there..."
+msgstr ""
+
+#: src/menu/menu.c:1037
 msgid "Reconfigure"
 msgstr "Reconfigurar"
 
-#: src/menu/menu.c:706
+#: src/menu/menu.c:1039
 msgid "Exit"
 msgstr "Saír"
 
-#: src/menu/menu.c:722
+#: src/menu/menu.c:1055
 msgid "Minimize"
 msgstr "Minimizar"
 
-#: src/menu/menu.c:724
+#: src/menu/menu.c:1057
 msgid "Maximize"
 msgstr "Maximizar"
 
-#: src/menu/menu.c:726
+#: src/menu/menu.c:1059
 msgid "Fullscreen"
 msgstr "Pantalla completa"
 
-#: src/menu/menu.c:728
-msgid "Roll up/down"
+#: src/menu/menu.c:1061
+msgid "Roll Up/Down"
 msgstr "Rodar cara arriba/abaixo"
 
-#: src/menu/menu.c:730
+#: src/menu/menu.c:1063
 msgid "Decorations"
 msgstr "Decoracións"
 
-#: src/menu/menu.c:732
+#: src/menu/menu.c:1065
 msgid "Always on Top"
 msgstr "Sempre enriba"
 
-#: src/menu/menu.c:737
-msgid "Move left"
+#: src/menu/menu.c:1070
+msgid "Move Left"
 msgstr "Mover á esquerda"
 
-#: src/menu/menu.c:744
-msgid "Move right"
+#: src/menu/menu.c:1077
+msgid "Move Right"
 msgstr "Mover á dereita"
 
-#: src/menu/menu.c:749
+#: src/menu/menu.c:1082
 msgid "Always on Visible Workspace"
 msgstr "Sempre no espazo de traballo visible"
 
-#: src/menu/menu.c:752 src/config/rcxml.c:1384
+#: src/menu/menu.c:1085 src/config/rcxml.c:1629
 msgid "Workspace"
 msgstr "Espazo de traballo"
 
-#: src/menu/menu.c:755
+#: src/menu/menu.c:1088
 msgid "Close"
 msgstr "Pechar"
diff --git a/po/hu.po b/po/hu.po
index 1c7b70df..169a9170 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: labwc\n"
 "Report-Msgid-Bugs-To: https://github.com/labwc/labwc/issues\n"
-"POT-Creation-Date: 2024-03-17 11:06+1000\n"
+"POT-Creation-Date: 2024-09-19 21:09+1000\n"
 "PO-Revision-Date: 2024-02-19 21:23+0000\n"
 "Last-Translator: winerysearch <david.fitala@gmail.com>\n"
 "Language-Team: Hungarian <https://translate.lxqt-project.org/projects/labwc/labwc/hu/>\n"
@@ -18,54 +18,58 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.2.1\n"
 
-#: src/menu/menu.c:704
+#: src/menu/menu.c:1017
+msgid "Go there..."
+msgstr ""
+
+#: src/menu/menu.c:1037
 msgid "Reconfigure"
 msgstr "Rekonfigurál"
 
-#: src/menu/menu.c:706
+#: src/menu/menu.c:1039
 msgid "Exit"
 msgstr "Kilépés"
 
-#: src/menu/menu.c:722
+#: src/menu/menu.c:1055
 msgid "Minimize"
 msgstr "Kis méret"
 
-#: src/menu/menu.c:724
+#: src/menu/menu.c:1057
 msgid "Maximize"
 msgstr "Teljes méret"
 
-#: src/menu/menu.c:726
+#: src/menu/menu.c:1059
 msgid "Fullscreen"
 msgstr "Teljes képernyő"
 
-#: src/menu/menu.c:728
-msgid "Roll up/down"
+#: src/menu/menu.c:1061
+msgid "Roll Up/Down"
 msgstr "Felhúz / Legördül"
 
-#: src/menu/menu.c:730
+#: src/menu/menu.c:1063
 msgid "Decorations"
 msgstr "Dekorációk"
 
-#: src/menu/menu.c:732
+#: src/menu/menu.c:1065
 msgid "Always on Top"
 msgstr "Mindig felül"
 
-#: src/menu/menu.c:737
-msgid "Move left"
+#: src/menu/menu.c:1070
+msgid "Move Left"
 msgstr "Balra dokkol"
 
-#: src/menu/menu.c:744
-msgid "Move right"
+#: src/menu/menu.c:1077
+msgid "Move Right"
 msgstr "Jobbra dokkol"
 
-#: src/menu/menu.c:749
+#: src/menu/menu.c:1082
 msgid "Always on Visible Workspace"
 msgstr "Kitűz"
 
-#: src/menu/menu.c:752 src/config/rcxml.c:1384
+#: src/menu/menu.c:1085 src/config/rcxml.c:1629
 msgid "Workspace"
 msgstr "Munkaasztal"
 
-#: src/menu/menu.c:755
+#: src/menu/menu.c:1088
 msgid "Close"
 msgstr "Bezárás"
diff --git a/po/id.po b/po/id.po
index 32915663..c4d85819 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: labwc\n"
 "Report-Msgid-Bugs-To: https://github.com/labwc/labwc/issues\n"
-"POT-Creation-Date: 2024-03-17 11:06+1000\n"
+"POT-Creation-Date: 2024-09-19 21:09+1000\n"
 "PO-Revision-Date: 2024-03-12 21:48+0000\n"
 "Last-Translator: alwanasary <baity.jannati@gmail.com>\n"
 "Language-Team: Indonesian <https://translate.lxqt-project.org/projects/labwc/labwc/id/>\n"
@@ -18,54 +18,58 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 4.2.1\n"
 
-#: src/menu/menu.c:704
+#: src/menu/menu.c:1017
+msgid "Go there..."
+msgstr ""
+
+#: src/menu/menu.c:1037
 msgid "Reconfigure"
 msgstr "Atur Ulang"
 
-#: src/menu/menu.c:706
+#: src/menu/menu.c:1039
 msgid "Exit"
 msgstr "Keluar"
 
-#: src/menu/menu.c:722
+#: src/menu/menu.c:1055
 msgid "Minimize"
 msgstr "Sembunyikan"
 
-#: src/menu/menu.c:724
+#: src/menu/menu.c:1057
 msgid "Maximize"
 msgstr "Perluas Jendela"
 
-#: src/menu/menu.c:726
+#: src/menu/menu.c:1059
 msgid "Fullscreen"
 msgstr "Tampil Menyeluruh"
 
-#: src/menu/menu.c:728
-msgid "Roll up/down"
+#: src/menu/menu.c:1061
+msgid "Roll Up/Down"
 msgstr "Gulir atas/bawah"
 
-#: src/menu/menu.c:730
+#: src/menu/menu.c:1063
 msgid "Decorations"
 msgstr "Dekorasi"
 
-#: src/menu/menu.c:732
+#: src/menu/menu.c:1065
 msgid "Always on Top"
 msgstr "Selalu di Muka"
 
-#: src/menu/menu.c:737
-msgid "Move left"
+#: src/menu/menu.c:1070
+msgid "Move Left"
 msgstr "Geser ke Kiri"
 
-#: src/menu/menu.c:744
-msgid "Move right"
+#: src/menu/menu.c:1077
+msgid "Move Right"
 msgstr "Geser ke Kanan"
 
-#: src/menu/menu.c:749
+#: src/menu/menu.c:1082
 msgid "Always on Visible Workspace"
 msgstr "Selalu pada Ruang Kerja yang Terlihat"
 
-#: src/menu/menu.c:752 src/config/rcxml.c:1384
+#: src/menu/menu.c:1085 src/config/rcxml.c:1629
 msgid "Workspace"
 msgstr "Ruang Kerja"
 
-#: src/menu/menu.c:755
+#: src/menu/menu.c:1088
 msgid "Close"
 msgstr "Tutup"
diff --git a/po/it.po b/po/it.po
index 49c330ee..73307ded 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: labwc\n"
 "Report-Msgid-Bugs-To: https://github.com/labwc/labwc/issues\n"
-"POT-Creation-Date: 2024-03-17 11:06+1000\n"
-"PO-Revision-Date: 2024-01-23 09:23+0000\n"
+"POT-Creation-Date: 2024-09-19 21:09+1000\n"
+"PO-Revision-Date: 2024-09-21 20:01+0000\n"
 "Last-Translator: Standreas <standreas@riseup.net>\n"
-"Language-Team: Italian <https://translate.lxqt-project.org/projects/labwc/labwc/it/>\n"
+"Language-Team: Italian <https://translate.lxqt-project.org/projects/labwc/"
+"labwc/it/>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,54 +19,58 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.2.1\n"
 
-#: src/menu/menu.c:704
+#: src/menu/menu.c:1017
+msgid "Go there..."
+msgstr "Vai lì..."
+
+#: src/menu/menu.c:1037
 msgid "Reconfigure"
 msgstr "Riconfigura"
 
-#: src/menu/menu.c:706
+#: src/menu/menu.c:1039
 msgid "Exit"
 msgstr "Esci"
 
-#: src/menu/menu.c:722
+#: src/menu/menu.c:1055
 msgid "Minimize"
 msgstr "Minimizza"
 
-#: src/menu/menu.c:724
+#: src/menu/menu.c:1057
 msgid "Maximize"
 msgstr "Massimizza"
 
-#: src/menu/menu.c:726
+#: src/menu/menu.c:1059
 msgid "Fullscreen"
 msgstr "Schermo intero"
 
-#: src/menu/menu.c:728
-msgid "Roll up/down"
+#: src/menu/menu.c:1061
+msgid "Roll Up/Down"
 msgstr "Arrotola/srotola"
 
-#: src/menu/menu.c:730
+#: src/menu/menu.c:1063
 msgid "Decorations"
 msgstr "Decorazioni"
 
-#: src/menu/menu.c:732
+#: src/menu/menu.c:1065
 msgid "Always on Top"
 msgstr "Sempre sopra"
 
-#: src/menu/menu.c:737
-msgid "Move left"
+#: src/menu/menu.c:1070
+msgid "Move Left"
 msgstr "Sposta a sinistra"
 
-#: src/menu/menu.c:744
-msgid "Move right"
+#: src/menu/menu.c:1077
+msgid "Move Right"
 msgstr "Sposta a destra"
 
-#: src/menu/menu.c:749
+#: src/menu/menu.c:1082
 msgid "Always on Visible Workspace"
 msgstr "Sempre sull'area di lavoro visibile"
 
-#: src/menu/menu.c:752 src/config/rcxml.c:1384
+#: src/menu/menu.c:1085 src/config/rcxml.c:1629
 msgid "Workspace"
 msgstr "Area di lavoro"
 
-#: src/menu/menu.c:755
+#: src/menu/menu.c:1088
 msgid "Close"
 msgstr "Chiudi"
diff --git a/po/ja.po b/po/ja.po
index d8445cfa..a95f9009 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: labwc\n"
 "Report-Msgid-Bugs-To: https://github.com/labwc/labwc/issues\n"
-"POT-Creation-Date: 2024-03-17 11:06+1000\n"
+"POT-Creation-Date: 2024-09-19 21:09+1000\n"
 "PO-Revision-Date: 2024-03-15 16:23+0000\n"
 "Last-Translator: Hiroaki Yamamoto <hrak1529@gmail.com>\n"
 "Language-Team: Japanese <https://translate.lxqt-project.org/projects/labwc/labwc/ja/>\n"
@@ -18,54 +18,58 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 4.2.1\n"
 
-#: src/menu/menu.c:704
+#: src/menu/menu.c:1017
+msgid "Go there..."
+msgstr ""
+
+#: src/menu/menu.c:1037
 msgid "Reconfigure"
 msgstr "再設定"
 
-#: src/menu/menu.c:706
+#: src/menu/menu.c:1039
 msgid "Exit"
 msgstr "終了"
 
-#: src/menu/menu.c:722
+#: src/menu/menu.c:1055
 msgid "Minimize"
 msgstr "最小化"
 
-#: src/menu/menu.c:724
+#: src/menu/menu.c:1057
 msgid "Maximize"
 msgstr "最大化"
 
-#: src/menu/menu.c:726
+#: src/menu/menu.c:1059
 msgid "Fullscreen"
 msgstr "フルスクリーン"
 
-#: src/menu/menu.c:728
-msgid "Roll up/down"
+#: src/menu/menu.c:1061
+msgid "Roll Up/Down"
 msgstr "折りたたむ/広げる"
 
-#: src/menu/menu.c:730
+#: src/menu/menu.c:1063
 msgid "Decorations"
 msgstr "デコレーション"
 
-#: src/menu/menu.c:732
+#: src/menu/menu.c:1065
 msgid "Always on Top"
 msgstr "常に最前面に表示"
 
-#: src/menu/menu.c:737
-msgid "Move left"
+#: src/menu/menu.c:1070
+msgid "Move Left"
 msgstr "左に移動"
 
-#: src/menu/menu.c:744
-msgid "Move right"
+#: src/menu/menu.c:1077
+msgid "Move Right"
 msgstr "右に移動"
 
-#: src/menu/menu.c:749
+#: src/menu/menu.c:1082
 msgid "Always on Visible Workspace"
 msgstr "現在のワークスペースに常に表示"
 
-#: src/menu/menu.c:752 src/config/rcxml.c:1384
+#: src/menu/menu.c:1085 src/config/rcxml.c:1629
 msgid "Workspace"
 msgstr "ワークスペース"
 
-#: src/menu/menu.c:755
+#: src/menu/menu.c:1088
 msgid "Close"
 msgstr "閉じる"
diff --git a/po/ka.po b/po/ka.po
index 470d3cc0..3bac6ecf 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: labwc\n"
 "Report-Msgid-Bugs-To: https://github.com/labwc/labwc/issues\n"
-"POT-Creation-Date: 2024-03-17 11:06+1000\n"
+"POT-Creation-Date: 2024-09-19 21:09+1000\n"
 "PO-Revision-Date: 2023-02-22 09:43+0100\n"
 "Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>\n"
 "Language-Team: Georgian <ka>\n"
@@ -18,56 +18,58 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 3.2.2\n"
 
-#: src/menu/menu.c:704
+#: src/menu/menu.c:1017
+msgid "Go there..."
+msgstr ""
+
+#: src/menu/menu.c:1037
 msgid "Reconfigure"
 msgstr "თავიდან მორგება"
 
-#: src/menu/menu.c:706
+#: src/menu/menu.c:1039
 msgid "Exit"
 msgstr "გასვლა"
 
-#: src/menu/menu.c:722
+#: src/menu/menu.c:1055
 msgid "Minimize"
 msgstr "ჩაკეცვა"
 
-#: src/menu/menu.c:724
+#: src/menu/menu.c:1057
 msgid "Maximize"
 msgstr "გადიდება"
 
-#: src/menu/menu.c:726
+#: src/menu/menu.c:1059
 msgid "Fullscreen"
 msgstr "მთელ ეკრანზე"
 
-#: src/menu/menu.c:728
-msgid "Roll up/down"
+#: src/menu/menu.c:1061
+msgid "Roll Up/Down"
 msgstr ""
 
-#: src/menu/menu.c:730
+#: src/menu/menu.c:1063
 msgid "Decorations"
 msgstr "დეკორაციები"
 
-#: src/menu/menu.c:732
-#, fuzzy
-#| msgid "Always On Top"
+#: src/menu/menu.c:1065
 msgid "Always on Top"
 msgstr "ყოველთვისყველაზეზემოდან"
 
-#: src/menu/menu.c:737
-msgid "Move left"
+#: src/menu/menu.c:1070
+msgid "Move Left"
 msgstr "მარცხნივ გაწევა"
 
-#: src/menu/menu.c:744
-msgid "Move right"
+#: src/menu/menu.c:1077
+msgid "Move Right"
 msgstr "მარჯვნივ გაწევა"
 
-#: src/menu/menu.c:749
+#: src/menu/menu.c:1082
 msgid "Always on Visible Workspace"
 msgstr ""
 
-#: src/menu/menu.c:752 src/config/rcxml.c:1384
+#: src/menu/menu.c:1085 src/config/rcxml.c:1629
 msgid "Workspace"
 msgstr "სამუშაო ადგილი"
 
-#: src/menu/menu.c:755
+#: src/menu/menu.c:1088
 msgid "Close"
 msgstr "დახურვა"
diff --git a/po/ko.po b/po/ko.po
index ec2bf863..461addc6 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,63 +7,69 @@ msgid ""
 msgstr ""
 "Project-Id-Version: labwc\n"
 "Report-Msgid-Bugs-To: https://github.com/labwc/labwc/issues\n"
-"POT-Creation-Date: 2024-03-17 11:06+1000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"POT-Creation-Date: 2024-09-19 21:09+1000\n"
+"PO-Revision-Date: 2024-07-03 08:01+0000\n"
+"Last-Translator: tark1998 <tark1998@gmail.com>\n"
+"Language-Team: Korean <https://translate.lxqt-project.org/projects/labwc/labwc/ko/>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 4.2.1\n"
 
-#: src/menu/menu.c:704
+#: src/menu/menu.c:1017
+msgid "Go there..."
+msgstr ""
+
+#: src/menu/menu.c:1037
 msgid "Reconfigure"
-msgstr ""
+msgstr "재설정"
 
-#: src/menu/menu.c:706
+#: src/menu/menu.c:1039
 msgid "Exit"
-msgstr ""
+msgstr "종료"
 
-#: src/menu/menu.c:722
+#: src/menu/menu.c:1055
 msgid "Minimize"
-msgstr ""
+msgstr "최소화"
 
-#: src/menu/menu.c:724
+#: src/menu/menu.c:1057
 msgid "Maximize"
-msgstr ""
+msgstr "최대화"
 
-#: src/menu/menu.c:726
+#: src/menu/menu.c:1059
 msgid "Fullscreen"
-msgstr ""
+msgstr "전체화면"
 
-#: src/menu/menu.c:728
-msgid "Roll up/down"
-msgstr ""
+#: src/menu/menu.c:1061
+msgid "Roll Up/Down"
+msgstr "접기/펼치기"
 
-#: src/menu/menu.c:730
+#: src/menu/menu.c:1063
 msgid "Decorations"
-msgstr ""
+msgstr "창 장식"
 
-#: src/menu/menu.c:732
+#: src/menu/menu.c:1065
 msgid "Always on Top"
-msgstr ""
+msgstr "항상 최상단에 표시"
 
-#: src/menu/menu.c:737
-msgid "Move left"
-msgstr ""
+#: src/menu/menu.c:1070
+msgid "Move Left"
+msgstr "좌로 이동"
 
-#: src/menu/menu.c:744
-msgid "Move right"
-msgstr ""
+#: src/menu/menu.c:1077
+msgid "Move Right"
+msgstr "우로 이동"
 
-#: src/menu/menu.c:749
+#: src/menu/menu.c:1082
 msgid "Always on Visible Workspace"
-msgstr ""
+msgstr "현재 작업공간에 항상 표시"
 
-#: src/menu/menu.c:752 src/config/rcxml.c:1384
+#: src/menu/menu.c:1085 src/config/rcxml.c:1629
 msgid "Workspace"
-msgstr ""
+msgstr "작업공간"
 
-#: src/menu/menu.c:755
+#: src/menu/menu.c:1088
 msgid "Close"
-msgstr ""
+msgstr "닫기"
diff --git a/po/labwc.pot b/po/labwc.pot
index ea893ecd..26828c8b 100644
--- a/po/labwc.pot
+++ b/po/labwc.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: labwc\n"
 "Report-Msgid-Bugs-To: https://github.com/labwc/labwc/issues\n"
-"POT-Creation-Date: 2024-03-17 11:06+1000\n"
+"POT-Creation-Date: 2024-09-19 21:09+1000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,54 +17,58 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/menu/menu.c:704
+#: src/menu/menu.c:1017
+msgid "Go there..."
+msgstr ""
+
+#: src/menu/menu.c:1037
 msgid "Reconfigure"
 msgstr ""
 
-#: src/menu/menu.c:706
+#: src/menu/menu.c:1039
 msgid "Exit"
 msgstr ""
 
-#: src/menu/menu.c:722
+#: src/menu/menu.c:1055
 msgid "Minimize"
 msgstr ""
 
-#: src/menu/menu.c:724
+#: src/menu/menu.c:1057
 msgid "Maximize"
 msgstr ""
 
-#: src/menu/menu.c:726
+#: src/menu/menu.c:1059
 msgid "Fullscreen"
 msgstr ""
 
-#: src/menu/menu.c:728
-msgid "Roll up/down"
+#: src/menu/menu.c:1061
+msgid "Roll Up/Down"
 msgstr ""
 
-#: src/menu/menu.c:730
+#: src/menu/menu.c:1063
 msgid "Decorations"
 msgstr ""
 
-#: src/menu/menu.c:732
+#: src/menu/menu.c:1065
 msgid "Always on Top"
 msgstr ""
 
-#: src/menu/menu.c:737
-msgid "Move left"
+#: src/menu/menu.c:1070
+msgid "Move Left"
 msgstr ""
 
-#: src/menu/menu.c:744
-msgid "Move right"
+#: src/menu/menu.c:1077
+msgid "Move Right"
 msgstr ""
 
-#: src/menu/menu.c:749
+#: src/menu/menu.c:1082
 msgid "Always on Visible Workspace"
 msgstr ""
 
-#: src/menu/menu.c:752 src/config/rcxml.c:1384
+#: src/menu/menu.c:1085 src/config/rcxml.c:1629
 msgid "Workspace"
 msgstr ""
 
-#: src/menu/menu.c:755
+#: src/menu/menu.c:1088
 msgid "Close"
 msgstr ""
diff --git a/po/lt.po b/po/lt.po
index 22235c49..c92f3518 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: labwc\n"
 "Report-Msgid-Bugs-To: https://github.com/labwc/labwc/issues\n"
-"POT-Creation-Date: 2024-03-17 11:06+1000\n"
+"POT-Creation-Date: 2024-09-19 21:09+1000\n"
 "PO-Revision-Date: 2024-02-29 14:23+0000\n"
 "Last-Translator: Moo <hazap@hotmail.com>\n"
 "Language-Team: Lithuanian <https://translate.lxqt-project.org/projects/labwc/labwc/lt/>\n"
@@ -18,54 +18,58 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n % 10 == 1 && (n % 100 < 11 || n % 100 > 19)) ? 0 : ((n % 10 >= 2 && n % 10 <= 9 && (n % 100 < 11 || n % 100 > 19)) ? 1 : 2);\n"
 "X-Generator: Weblate 4.2.1\n"
 
-#: src/menu/menu.c:704
+#: src/menu/menu.c:1017
+msgid "Go there..."
+msgstr ""
+
+#: src/menu/menu.c:1037
 msgid "Reconfigure"
 msgstr "Konfigūruoti iš naujo"
 
-#: src/menu/menu.c:706
+#: src/menu/menu.c:1039
 msgid "Exit"
 msgstr "Išeiti"
 
-#: src/menu/menu.c:722
+#: src/menu/menu.c:1055
 msgid "Minimize"
 msgstr "Suskleisti"
 
-#: src/menu/menu.c:724
+#: src/menu/menu.c:1057
 msgid "Maximize"
 msgstr "Išskleisti"
 
-#: src/menu/menu.c:726
+#: src/menu/menu.c:1059
 msgid "Fullscreen"
 msgstr "Visas ekranas"
 
-#: src/menu/menu.c:728
-msgid "Roll up/down"
+#: src/menu/menu.c:1061
+msgid "Roll Up/Down"
 msgstr "Užraityti/atraityti"
 
-#: src/menu/menu.c:730
+#: src/menu/menu.c:1063
 msgid "Decorations"
 msgstr "Dekoracijos"
 
-#: src/menu/menu.c:732
+#: src/menu/menu.c:1065
 msgid "Always on Top"
 msgstr "Visada viršuje"
 
-#: src/menu/menu.c:737
-msgid "Move left"
+#: src/menu/menu.c:1070
+msgid "Move Left"
 msgstr "Perkelti kairėn"
 
-#: src/menu/menu.c:744
-msgid "Move right"
+#: src/menu/menu.c:1077
+msgid "Move Right"
 msgstr "Perkelti dešinėn"
 
-#: src/menu/menu.c:749
+#: src/menu/menu.c:1082
 msgid "Always on Visible Workspace"
 msgstr "Visada matomoje darbo srityje"
 
-#: src/menu/menu.c:752 src/config/rcxml.c:1384
+#: src/menu/menu.c:1085 src/config/rcxml.c:1629
 msgid "Workspace"
 msgstr "Darbo sritis"
 
-#: src/menu/menu.c:755
+#: src/menu/menu.c:1088
 msgid "Close"
 msgstr "Užverti"
diff --git a/po/meson.build b/po/meson.build
index 708d4aad..bcc74cd3 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -1,11 +1,18 @@
 i18n = import('i18n')
-add_project_arguments('-DGETTEXT_PACKAGE="' + meson.project_name() + '"',
+
+add_project_arguments(
+  '-DGETTEXT_PACKAGE="' + meson.project_name() + '"',
   '-DLOCALEDIR="' + get_option('prefix') / get_option('localedir') + '"',
-  language:'c')
-i18n.gettext(meson.project_name(),
-  args: ['--directory=' + source_root,
+  language:'c',
+)
+
+i18n.gettext(
+  meson.project_name(),
+  args: [
+    '--directory=' + source_root,
     '--add-comments=TRANSLATORS',
     '--keyword=_',
-    '--msgid-bugs=https://github.com/labwc/labwc/issues'],
-    preset: 'glib'
+    '--msgid-bugs=https://github.com/labwc/labwc/issues',
+  ],
+  preset: 'glib',
 )
diff --git a/po/nl.po b/po/nl.po
index b34c1f73..3742e860 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: labwc\n"
 "Report-Msgid-Bugs-To: https://github.com/labwc/labwc/issues\n"
-"POT-Creation-Date: 2024-03-17 11:06+1000\n"
-"PO-Revision-Date: 2024-01-23 09:23+0000\n"
+"POT-Creation-Date: 2024-09-19 21:09+1000\n"
+"PO-Revision-Date: 2024-09-21 20:01+0000\n"
 "Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
-"Language-Team: Dutch <https://translate.lxqt-project.org/projects/labwc/labwc/nl/>\n"
+"Language-Team: Dutch <https://translate.lxqt-project.org/projects/labwc/"
+"labwc/nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,54 +19,58 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.2.1\n"
 
-#: src/menu/menu.c:704
+#: src/menu/menu.c:1017
+msgid "Go there..."
+msgstr "Openen…"
+
+#: src/menu/menu.c:1037
 msgid "Reconfigure"
 msgstr "Opnieuw instellen"
 
-#: src/menu/menu.c:706
+#: src/menu/menu.c:1039
 msgid "Exit"
 msgstr "Afsluiten"
 
-#: src/menu/menu.c:722
+#: src/menu/menu.c:1055
 msgid "Minimize"
 msgstr "Minimaliseren"
 
-#: src/menu/menu.c:724
+#: src/menu/menu.c:1057
 msgid "Maximize"
 msgstr "Maximaliseren"
 
-#: src/menu/menu.c:726
+#: src/menu/menu.c:1059
 msgid "Fullscreen"
 msgstr "Schermvullende weergave"
 
-#: src/menu/menu.c:728
-msgid "Roll up/down"
+#: src/menu/menu.c:1061
+msgid "Roll Up/Down"
 msgstr "Op-/Afrollen"
 
-#: src/menu/menu.c:730
+#: src/menu/menu.c:1063
 msgid "Decorations"
 msgstr "Decoraties"
 
-#: src/menu/menu.c:732
+#: src/menu/menu.c:1065
 msgid "Always on Top"
 msgstr "Altijd bovenaan"
 
-#: src/menu/menu.c:737
-msgid "Move left"
+#: src/menu/menu.c:1070
+msgid "Move Left"
 msgstr "Naar links verplaatsen"
 
-#: src/menu/menu.c:744
-msgid "Move right"
+#: src/menu/menu.c:1077
+msgid "Move Right"
 msgstr "Naar rechts verplaatsen"
 
-#: src/menu/menu.c:749
+#: src/menu/menu.c:1082
 msgid "Always on Visible Workspace"
 msgstr "Altijd op zichtbaar werkblad"
 
-#: src/menu/menu.c:752 src/config/rcxml.c:1384
+#: src/menu/menu.c:1085 src/config/rcxml.c:1629
 msgid "Workspace"
 msgstr "Werkblad"
 
-#: src/menu/menu.c:755
+#: src/menu/menu.c:1088
 msgid "Close"
 msgstr "Sluiten"
diff --git a/po/pa.po b/po/pa.po
index c40d76f2..1c83991c 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: labwc\n"
 "Report-Msgid-Bugs-To: https://github.com/labwc/labwc/issues\n"
-"POT-Creation-Date: 2024-03-17 11:06+1000\n"
+"POT-Creation-Date: 2024-09-19 21:09+1000\n"
 "PO-Revision-Date: 2024-02-21 14:23+0000\n"
 "Last-Translator: A S Alam <amanpreet.alam@gmail.com>\n"
 "Language-Team: Punjabi <https://translate.lxqt-project.org/projects/labwc/labwc/pa/>\n"
@@ -18,54 +18,58 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.2.1\n"
 
-#: src/menu/menu.c:704
+#: src/menu/menu.c:1017
+msgid "Go there..."
+msgstr ""
+
+#: src/menu/menu.c:1037
 msgid "Reconfigure"
 msgstr "ਮੁੜ-ਸੰਰਚਨਾ ਕਰੋ"
 
-#: src/menu/menu.c:706
+#: src/menu/menu.c:1039
 msgid "Exit"
 msgstr "ਬਾਹਰ"
 
-#: src/menu/menu.c:722
+#: src/menu/menu.c:1055
 msgid "Minimize"
 msgstr "ਘੱਟੋ-ਘੱਟ"
 
-#: src/menu/menu.c:724
+#: src/menu/menu.c:1057
 msgid "Maximize"
 msgstr "ਵੱਧ ਤੋਂ ਵੱਧ"
 
-#: src/menu/menu.c:726
+#: src/menu/menu.c:1059
 msgid "Fullscreen"
 msgstr "ਪੂਰੀ ਸਕਰੀਨ"
 
-#: src/menu/menu.c:728
-msgid "Roll up/down"
+#: src/menu/menu.c:1061
+msgid "Roll Up/Down"
 msgstr "ਉੱਤੇ/ਹੇਠਾਂ ਸਕਰਾਓ"
 
-#: src/menu/menu.c:730
+#: src/menu/menu.c:1063
 msgid "Decorations"
 msgstr "ਸਜਾਵਟ"
 
-#: src/menu/menu.c:732
+#: src/menu/menu.c:1065
 msgid "Always on Top"
 msgstr "ਹਮੇਸ਼ਾਂ ਉੱਤੇ ਰੱਖੋ"
 
-#: src/menu/menu.c:737
-msgid "Move left"
+#: src/menu/menu.c:1070
+msgid "Move Left"
 msgstr "ਖੱਬੇ ਭੇਜੋ"
 
-#: src/menu/menu.c:744
-msgid "Move right"
+#: src/menu/menu.c:1077
+msgid "Move Right"
 msgstr "ਸੱਜੇ ਭੇਜੋ"
 
-#: src/menu/menu.c:749
+#: src/menu/menu.c:1082
 msgid "Always on Visible Workspace"
 msgstr "ਹਮੇਸ਼ਾਂ ਦਿੱਖ ਵਰਕਸਪੇਸ ਉੱਤੇ"
 
-#: src/menu/menu.c:752 src/config/rcxml.c:1384
+#: src/menu/menu.c:1085 src/config/rcxml.c:1629
 msgid "Workspace"
 msgstr "ਵਰਕਸਪੇਸ"
 
-#: src/menu/menu.c:755
+#: src/menu/menu.c:1088
 msgid "Close"
 msgstr "ਬੰਦ ਕਰੋ"
diff --git a/po/pl.po b/po/pl.po
index 37374a5a..e88afa00 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,65 +7,71 @@ msgid ""
 msgstr ""
 "Project-Id-Version: labwc\n"
 "Report-Msgid-Bugs-To: https://github.com/labwc/labwc/issues\n"
-"POT-Creation-Date: 2024-03-17 11:06+1000\n"
-"PO-Revision-Date: 2024-01-23 09:23+0000\n"
+"POT-Creation-Date: 2024-09-19 21:09+1000\n"
+"PO-Revision-Date: 2024-09-21 20:01+0000\n"
 "Last-Translator: Jan Rolski <wbcwknvstb@proton.me>\n"
-"Language-Team: Polish <https://translate.lxqt-project.org/projects/labwc/labwc/pl/>\n"
+"Language-Team: Polish <https://translate.lxqt-project.org/projects/labwc/"
+"labwc/pl/>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 4.2.1\n"
 
-#: src/menu/menu.c:704
+#: src/menu/menu.c:1017
+msgid "Go there..."
+msgstr "Przejdź tam..."
+
+#: src/menu/menu.c:1037
 msgid "Reconfigure"
 msgstr "Rekonfiguruj"
 
-#: src/menu/menu.c:706
+#: src/menu/menu.c:1039
 msgid "Exit"
 msgstr "Wyjdź"
 
-#: src/menu/menu.c:722
+#: src/menu/menu.c:1055
 msgid "Minimize"
 msgstr "Minimalizuj"
 
-#: src/menu/menu.c:724
+#: src/menu/menu.c:1057
 msgid "Maximize"
 msgstr "Maksymalizuj"
 
-#: src/menu/menu.c:726
+#: src/menu/menu.c:1059
 msgid "Fullscreen"
 msgstr "Pełny ekran"
 
-#: src/menu/menu.c:728
-msgid "Roll up/down"
+#: src/menu/menu.c:1061
+msgid "Roll Up/Down"
 msgstr "Zwiń w górę/w dół"
 
-#: src/menu/menu.c:730
+#: src/menu/menu.c:1063
 msgid "Decorations"
 msgstr "Dekoracje"
 
-#: src/menu/menu.c:732
+#: src/menu/menu.c:1065
 msgid "Always on Top"
 msgstr "Zawsze na wierzchu"
 
-#: src/menu/menu.c:737
-msgid "Move left"
+#: src/menu/menu.c:1070
+msgid "Move Left"
 msgstr "Przenieś w lewo"
 
-#: src/menu/menu.c:744
-msgid "Move right"
+#: src/menu/menu.c:1077
+msgid "Move Right"
 msgstr "Przenieś w prawo"
 
-#: src/menu/menu.c:749
+#: src/menu/menu.c:1082
 msgid "Always on Visible Workspace"
 msgstr "Zawsze na widocznym obszarze roboczym"
 
-#: src/menu/menu.c:752 src/config/rcxml.c:1384
+#: src/menu/menu.c:1085 src/config/rcxml.c:1629
 msgid "Workspace"
 msgstr "Przestrzeń robocza"
 
-#: src/menu/menu.c:755
+#: src/menu/menu.c:1088
 msgid "Close"
 msgstr "Zamknij"
diff --git a/po/pt.po b/po/pt.po
index 330f6024..42a4254c 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: labwc\n"
 "Report-Msgid-Bugs-To: https://github.com/labwc/labwc/issues\n"
-"POT-Creation-Date: 2024-03-17 11:06+1000\n"
-"PO-Revision-Date: 2024-03-27 22:23+0000\n"
+"POT-Creation-Date: 2024-09-19 21:09+1000\n"
+"PO-Revision-Date: 2024-09-21 20:01+0000\n"
 "Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
 "Language-Team: Portuguese <https://translate.lxqt-project.org/projects/labwc/"
 "labwc/pt/>\n"
@@ -19,54 +19,58 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.2.1\n"
 
-#: src/menu/menu.c:704
+#: src/menu/menu.c:1017
+msgid "Go there..."
+msgstr "Ir lá..."
+
+#: src/menu/menu.c:1037
 msgid "Reconfigure"
 msgstr "Reconfigurar"
 
-#: src/menu/menu.c:706
+#: src/menu/menu.c:1039
 msgid "Exit"
 msgstr "Sair"
 
-#: src/menu/menu.c:722
+#: src/menu/menu.c:1055
 msgid "Minimize"
 msgstr "Minimizar"
 
-#: src/menu/menu.c:724
+#: src/menu/menu.c:1057
 msgid "Maximize"
 msgstr "Maximizar"
 
-#: src/menu/menu.c:726
+#: src/menu/menu.c:1059
 msgid "Fullscreen"
 msgstr "Ecrã inteiro"
 
-#: src/menu/menu.c:728
-msgid "Roll up/down"
+#: src/menu/menu.c:1061
+msgid "Roll Up/Down"
 msgstr "Rolar para cima/baixo"
 
-#: src/menu/menu.c:730
+#: src/menu/menu.c:1063
 msgid "Decorations"
 msgstr "Decorações"
 
-#: src/menu/menu.c:732
+#: src/menu/menu.c:1065
 msgid "Always on Top"
 msgstr "Sempre no topo"
 
-#: src/menu/menu.c:737
-msgid "Move left"
+#: src/menu/menu.c:1070
+msgid "Move Left"
 msgstr "Mover para a esquerda"
 
-#: src/menu/menu.c:744
-msgid "Move right"
+#: src/menu/menu.c:1077
+msgid "Move Right"
 msgstr "Mover para a direita"
 
-#: src/menu/menu.c:749
+#: src/menu/menu.c:1082
 msgid "Always on Visible Workspace"
 msgstr "Sempre visível na área de trabalho"
 
-#: src/menu/menu.c:752 src/config/rcxml.c:1384
+#: src/menu/menu.c:1085 src/config/rcxml.c:1629
 msgid "Workspace"
 msgstr "Área de trabalho"
 
-#: src/menu/menu.c:755
+#: src/menu/menu.c:1088
 msgid "Close"
 msgstr "Fechar"
diff --git a/po/pt_BR.po b/po/pt_BR.po
new file mode 100644
index 00000000..f9ae5493
--- /dev/null
+++ b/po/pt_BR.po
@@ -0,0 +1,75 @@
+# Labwc pot file
+# Copyright (C) 2024
+# This file is distributed under the same license as the labwc package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: labwc\n"
+"Report-Msgid-Bugs-To: https://github.com/labwc/labwc/issues\n"
+"POT-Creation-Date: 2024-09-19 21:09+1000\n"
+"PO-Revision-Date: 2024-08-24 20:01+0000\n"
+"Last-Translator: daniel <punished.haddock@proton.me>\n"
+"Language-Team: Portuguese (Brazil) <https://translate.lxqt-project.org/projects/labwc/labwc/pt_BR/>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.2.1\n"
+
+#: src/menu/menu.c:1017
+msgid "Go there..."
+msgstr ""
+
+#: src/menu/menu.c:1037
+msgid "Reconfigure"
+msgstr "Reconfigurar"
+
+#: src/menu/menu.c:1039
+msgid "Exit"
+msgstr "Sair"
+
+#: src/menu/menu.c:1055
+msgid "Minimize"
+msgstr "Minimizar"
+
+#: src/menu/menu.c:1057
+msgid "Maximize"
+msgstr "Maximizar"
+
+#: src/menu/menu.c:1059
+msgid "Fullscreen"
+msgstr "Tela Cheia"
+
+#: src/menu/menu.c:1061
+msgid "Roll Up/Down"
+msgstr "Rolar para Cima/Baixo"
+
+#: src/menu/menu.c:1063
+msgid "Decorations"
+msgstr "Decorações"
+
+#: src/menu/menu.c:1065
+msgid "Always on Top"
+msgstr "Sempre no Topo"
+
+#: src/menu/menu.c:1070
+msgid "Move Left"
+msgstr "Mover à Esquerda"
+
+#: src/menu/menu.c:1077
+msgid "Move Right"
+msgstr "Mover à Direita"
+
+#: src/menu/menu.c:1082
+msgid "Always on Visible Workspace"
+msgstr "Sempre Visível na Área de Trabalho"
+
+#: src/menu/menu.c:1085 src/config/rcxml.c:1629
+msgid "Workspace"
+msgstr "Área de Trabalho"
+
+#: src/menu/menu.c:1088
+msgid "Close"
+msgstr "Fechar"
diff --git a/po/ru.po b/po/ru.po
index 282fc429..98c66b57 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: labwc\n"
 "Report-Msgid-Bugs-To: https://github.com/labwc/labwc/issues\n"
-"POT-Creation-Date: 2024-03-17 11:06+1000\n"
+"POT-Creation-Date: 2024-09-19 21:09+1000\n"
 "PO-Revision-Date: 2024-02-26 12:23+0000\n"
 "Last-Translator: Alice Ventus <zolkin.ag@phystech.edu>\n"
 "Language-Team: Russian <https://translate.lxqt-project.org/projects/labwc/labwc/ru/>\n"
@@ -18,54 +18,58 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 4.2.1\n"
 
-#: src/menu/menu.c:704
+#: src/menu/menu.c:1017
+msgid "Go there..."
+msgstr ""
+
+#: src/menu/menu.c:1037
 msgid "Reconfigure"
 msgstr "Перенастроить"
 
-#: src/menu/menu.c:706
+#: src/menu/menu.c:1039
 msgid "Exit"
 msgstr "Выход"
 
-#: src/menu/menu.c:722
+#: src/menu/menu.c:1055
 msgid "Minimize"
 msgstr "Свернуть"
 
-#: src/menu/menu.c:724
+#: src/menu/menu.c:1057
 msgid "Maximize"
 msgstr "Развернуть"
 
-#: src/menu/menu.c:726
+#: src/menu/menu.c:1059
 msgid "Fullscreen"
 msgstr "На весь экран"
 
-#: src/menu/menu.c:728
-msgid "Roll up/down"
+#: src/menu/menu.c:1061
+msgid "Roll Up/Down"
 msgstr "Свернуть/развернуть в заголовок"
 
-#: src/menu/menu.c:730
+#: src/menu/menu.c:1063
 msgid "Decorations"
 msgstr "Декорации"
 
-#: src/menu/menu.c:732
+#: src/menu/menu.c:1065
 msgid "Always on Top"
 msgstr "Всегда на переднем плане"
 
-#: src/menu/menu.c:737
-msgid "Move left"
+#: src/menu/menu.c:1070
+msgid "Move Left"
 msgstr "Переместить влево"
 
-#: src/menu/menu.c:744
-msgid "Move right"
+#: src/menu/menu.c:1077
+msgid "Move Right"
 msgstr "Переместить вправо"
 
-#: src/menu/menu.c:749
+#: src/menu/menu.c:1082
 msgid "Always on Visible Workspace"
 msgstr "На всех рабочих пространствах"
 
-#: src/menu/menu.c:752 src/config/rcxml.c:1384
+#: src/menu/menu.c:1085 src/config/rcxml.c:1629
 msgid "Workspace"
 msgstr "Рабочее пространство"
 
-#: src/menu/menu.c:755
+#: src/menu/menu.c:1088
 msgid "Close"
 msgstr "Закрыть"
diff --git a/po/sv.po b/po/sv.po
index a55e17c6..315f15d6 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: labwc\n"
 "Report-Msgid-Bugs-To: https://github.com/labwc/labwc/issues\n"
-"POT-Creation-Date: 2024-03-17 11:06+1000\n"
-"PO-Revision-Date: 2024-01-24 11:23+0000\n"
+"POT-Creation-Date: 2024-09-19 21:09+1000\n"
+"PO-Revision-Date: 2024-10-12 07:24+0000\n"
 "Last-Translator: bittin <bittin@reimu.nl>\n"
-"Language-Team: Swedish <https://translate.lxqt-project.org/projects/labwc/labwc/sv/>\n"
+"Language-Team: Swedish <https://translate.lxqt-project.org/projects/labwc/"
+"labwc/sv/>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,54 +19,58 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.2.1\n"
 
-#: src/menu/menu.c:704
+#: src/menu/menu.c:1017
+msgid "Go there..."
+msgstr "Gå dit..."
+
+#: src/menu/menu.c:1037
 msgid "Reconfigure"
 msgstr "Konfigurera om"
 
-#: src/menu/menu.c:706
+#: src/menu/menu.c:1039
 msgid "Exit"
 msgstr "Avsluta"
 
-#: src/menu/menu.c:722
+#: src/menu/menu.c:1055
 msgid "Minimize"
 msgstr "Minimera"
 
-#: src/menu/menu.c:724
+#: src/menu/menu.c:1057
 msgid "Maximize"
 msgstr "Maximera"
 
-#: src/menu/menu.c:726
+#: src/menu/menu.c:1059
 msgid "Fullscreen"
 msgstr "Fullskärm"
 
-#: src/menu/menu.c:728
-msgid "Roll up/down"
+#: src/menu/menu.c:1061
+msgid "Roll Up/Down"
 msgstr "Rulla upp/ned"
 
-#: src/menu/menu.c:730
+#: src/menu/menu.c:1063
 msgid "Decorations"
 msgstr "Dekorationer"
 
-#: src/menu/menu.c:732
+#: src/menu/menu.c:1065
 msgid "Always on Top"
 msgstr "Alltid överst"
 
-#: src/menu/menu.c:737
-msgid "Move left"
+#: src/menu/menu.c:1070
+msgid "Move Left"
 msgstr "Flytta till vänster"
 
-#: src/menu/menu.c:744
-msgid "Move right"
+#: src/menu/menu.c:1077
+msgid "Move Right"
 msgstr "Flytta till höger"
 
-#: src/menu/menu.c:749
+#: src/menu/menu.c:1082
 msgid "Always on Visible Workspace"
 msgstr "Alltid på aktiv arbetsyta"
 
-#: src/menu/menu.c:752 src/config/rcxml.c:1384
+#: src/menu/menu.c:1085 src/config/rcxml.c:1629
 msgid "Workspace"
 msgstr "Arbetsyta"
 
-#: src/menu/menu.c:755
+#: src/menu/menu.c:1088
 msgid "Close"
 msgstr "Stäng"
diff --git a/po/tr.po b/po/tr.po
index 36ed1252..6280d327 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: labwc\n"
 "Report-Msgid-Bugs-To: https://github.com/labwc/labwc/issues\n"
-"POT-Creation-Date: 2024-03-17 11:06+1000\n"
-"PO-Revision-Date: 2024-02-24 22:23+0000\n"
-"Last-Translator: Sabri Ünal <libreajans@gmail.com>\n"
-"Language-Team: Turkish <https://translate.lxqt-project.org/projects/labwc/labwc/tr/>\n"
+"POT-Creation-Date: 2024-09-19 21:09+1000\n"
+"PO-Revision-Date: 2024-10-03 08:01+0000\n"
+"Last-Translator: Dr. Ayhan YALÇINSOY <ayhanyalcinsoy@pisilinux.org>\n"
+"Language-Team: Turkish <https://translate.lxqt-project.org/projects/labwc/"
+"labwc/tr/>\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,54 +19,58 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.2.1\n"
 
-#: src/menu/menu.c:704
+#: src/menu/menu.c:1017
+msgid "Go there..."
+msgstr "Şuraya git..."
+
+#: src/menu/menu.c:1037
 msgid "Reconfigure"
 msgstr "Yeniden Yapılandır"
 
-#: src/menu/menu.c:706
+#: src/menu/menu.c:1039
 msgid "Exit"
 msgstr "Çıkış"
 
-#: src/menu/menu.c:722
+#: src/menu/menu.c:1055
 msgid "Minimize"
 msgstr "Küçült"
 
-#: src/menu/menu.c:724
+#: src/menu/menu.c:1057
 msgid "Maximize"
 msgstr "Büyüt"
 
-#: src/menu/menu.c:726
+#: src/menu/menu.c:1059
 msgid "Fullscreen"
 msgstr "Tam Ekran"
 
-#: src/menu/menu.c:728
-msgid "Roll up/down"
+#: src/menu/menu.c:1061
+msgid "Roll Up/Down"
 msgstr "Yukarı/aşağı katla"
 
-#: src/menu/menu.c:730
+#: src/menu/menu.c:1063
 msgid "Decorations"
 msgstr "Süslemeler"
 
-#: src/menu/menu.c:732
+#: src/menu/menu.c:1065
 msgid "Always on Top"
 msgstr "Her Zaman Üstte"
 
-#: src/menu/menu.c:737
-msgid "Move left"
+#: src/menu/menu.c:1070
+msgid "Move Left"
 msgstr "Sola taşı"
 
-#: src/menu/menu.c:744
-msgid "Move right"
+#: src/menu/menu.c:1077
+msgid "Move Right"
 msgstr "Sağa taşı"
 
-#: src/menu/menu.c:749
+#: src/menu/menu.c:1082
 msgid "Always on Visible Workspace"
 msgstr "Her Zaman Görünür Çalışma Alanında"
 
-#: src/menu/menu.c:752 src/config/rcxml.c:1384
+#: src/menu/menu.c:1085 src/config/rcxml.c:1629
 msgid "Workspace"
 msgstr "Çalışma Alanı"
 
-#: src/menu/menu.c:755
+#: src/menu/menu.c:1088
 msgid "Close"
 msgstr "Kapat"
diff --git a/po/uk.po b/po/uk.po
index 4ac221f7..18cc35e5 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,65 +7,71 @@ msgid ""
 msgstr ""
 "Project-Id-Version: labwc\n"
 "Report-Msgid-Bugs-To: https://github.com/labwc/labwc/issues\n"
-"POT-Creation-Date: 2024-03-17 11:06+1000\n"
-"PO-Revision-Date: 2024-01-28 20:10+0000\n"
+"POT-Creation-Date: 2024-09-19 21:09+1000\n"
+"PO-Revision-Date: 2024-09-24 08:01+0000\n"
 "Last-Translator: Ihor Hordiichuk <igor_ck@outlook.com>\n"
-"Language-Team: Ukrainian <https://translate.lxqt-project.org/projects/labwc/labwc/uk/>\n"
+"Language-Team: Ukrainian <https://translate.lxqt-project.org/projects/labwc/"
+"labwc/uk/>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 4.2.1\n"
 
-#: src/menu/menu.c:704
+#: src/menu/menu.c:1017
+msgid "Go there..."
+msgstr "Перейти до..."
+
+#: src/menu/menu.c:1037
 msgid "Reconfigure"
 msgstr "Переналаштувати"
 
-#: src/menu/menu.c:706
+#: src/menu/menu.c:1039
 msgid "Exit"
 msgstr "Вихід"
 
-#: src/menu/menu.c:722
+#: src/menu/menu.c:1055
 msgid "Minimize"
 msgstr "Згорнути"
 
-#: src/menu/menu.c:724
+#: src/menu/menu.c:1057
 msgid "Maximize"
 msgstr "Розгорнути"
 
-#: src/menu/menu.c:726
+#: src/menu/menu.c:1059
 msgid "Fullscreen"
 msgstr "На весь екран"
 
-#: src/menu/menu.c:728
-msgid "Roll up/down"
+#: src/menu/menu.c:1061
+msgid "Roll Up/Down"
 msgstr "Згорнути/розгорнути"
 
-#: src/menu/menu.c:730
+#: src/menu/menu.c:1063
 msgid "Decorations"
 msgstr "Декорації"
 
-#: src/menu/menu.c:732
+#: src/menu/menu.c:1065
 msgid "Always on Top"
 msgstr "Завжди зверху"
 
-#: src/menu/menu.c:737
-msgid "Move left"
+#: src/menu/menu.c:1070
+msgid "Move Left"
 msgstr "Перемістити ліворуч"
 
-#: src/menu/menu.c:744
-msgid "Move right"
+#: src/menu/menu.c:1077
+msgid "Move Right"
 msgstr "Перемістити праворуч"
 
-#: src/menu/menu.c:749
+#: src/menu/menu.c:1082
 msgid "Always on Visible Workspace"
 msgstr "Завжди на видимому робочому просторі"
 
-#: src/menu/menu.c:752 src/config/rcxml.c:1384
+#: src/menu/menu.c:1085 src/config/rcxml.c:1629
 msgid "Workspace"
 msgstr "Робочий простір"
 
-#: src/menu/menu.c:755
+#: src/menu/menu.c:1088
 msgid "Close"
 msgstr "Закрити"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 43e1526b..a9932a16 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: labwc\n"
 "Report-Msgid-Bugs-To: https://github.com/labwc/labwc/issues\n"
-"POT-Creation-Date: 2024-03-17 11:06+1000\n"
+"POT-Creation-Date: 2024-09-19 21:09+1000\n"
 "PO-Revision-Date: 2024-01-30 08:23+0000\n"
 "Last-Translator: kmephistoh <kanhaosmile@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <https://translate.lxqt-project.org/projects/labwc/labwc/zh_CN/>\n"
@@ -18,54 +18,58 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 4.2.1\n"
 
-#: src/menu/menu.c:704
+#: src/menu/menu.c:1017
+msgid "Go there..."
+msgstr ""
+
+#: src/menu/menu.c:1037
 msgid "Reconfigure"
 msgstr "配置重载"
 
-#: src/menu/menu.c:706
+#: src/menu/menu.c:1039
 msgid "Exit"
 msgstr "退出"
 
-#: src/menu/menu.c:722
+#: src/menu/menu.c:1055
 msgid "Minimize"
 msgstr "最小化"
 
-#: src/menu/menu.c:724
+#: src/menu/menu.c:1057
 msgid "Maximize"
 msgstr "最大化"
 
-#: src/menu/menu.c:726
+#: src/menu/menu.c:1059
 msgid "Fullscreen"
 msgstr "全屏"
 
-#: src/menu/menu.c:728
-msgid "Roll up/down"
+#: src/menu/menu.c:1061
+msgid "Roll Up/Down"
 msgstr "滚动 上/下"
 
-#: src/menu/menu.c:730
+#: src/menu/menu.c:1063
 msgid "Decorations"
 msgstr "装饰"
 
-#: src/menu/menu.c:732
+#: src/menu/menu.c:1065
 msgid "Always on Top"
 msgstr "最上层显示"
 
-#: src/menu/menu.c:737
-msgid "Move left"
+#: src/menu/menu.c:1070
+msgid "Move Left"
 msgstr "左移"
 
-#: src/menu/menu.c:744
-msgid "Move right"
+#: src/menu/menu.c:1077
+msgid "Move Right"
 msgstr "右移"
 
-#: src/menu/menu.c:749
+#: src/menu/menu.c:1082
 msgid "Always on Visible Workspace"
 msgstr "始终在可见工作区"
 
-#: src/menu/menu.c:752 src/config/rcxml.c:1384
+#: src/menu/menu.c:1085 src/config/rcxml.c:1629
 msgid "Workspace"
 msgstr "工作区"
 
-#: src/menu/menu.c:755
+#: src/menu/menu.c:1088
 msgid "Close"
 msgstr "关闭"
diff --git a/protocols/cosmic-workspace-unstable-v1.xml b/protocols/cosmic-workspace-unstable-v1.xml
new file mode 100644
index 00000000..76adedd9
--- /dev/null
+++ b/protocols/cosmic-workspace-unstable-v1.xml
@@ -0,0 +1,364 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<protocol name="cosmic_workspace_unstable_v1">
+  <copyright>
+    Copyright © 2019 Christopher Billington
+    Copyright © 2020 Ilia Bozhinov
+    Copyright © 2022 Victoria Brekenfeld
+
+    Permission to use, copy, modify, distribute, and sell this
+    software and its documentation for any purpose is hereby granted
+    without fee, provided that the above copyright notice appear in
+    all copies and that both that copyright notice and this permission
+    notice appear in supporting documentation, and that the name of
+    the copyright holders not be used in advertising or publicity
+    pertaining to distribution of the software without specific,
+    written prior permission.  The copyright holders make no
+    representations about the suitability of this software for any
+    purpose.  It is provided "as is" without express or implied
+    warranty.
+
+    THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+    SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+    FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+    ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+    THIS SOFTWARE.
+  </copyright>
+
+  <interface name="zcosmic_workspace_manager_v1" version="1">
+    <description summary="list and control workspaces">
+      Workspaces, also called virtual desktops, are groups of surfaces. A
+      compositor with a concept of workspaces may only show some such groups of
+      surfaces (those of 'active' workspaces) at a time. 'Activating' a
+      workspace is a request for the compositor to display that workspace's
+      surfaces as normal, whereas the compositor may hide or otherwise
+      de-emphasise surfaces that are associated only with 'inactive' workspaces.
+      Workspaces are grouped by which sets of outputs they correspond to, and
+      may contain surfaces only from those outputs. In this way, it is possible
+      for each output to have its own set of workspaces, or for all outputs (or
+      any other arbitrary grouping) to share workspaces. Compositors may
+      optionally conceptually arrange each group of workspaces in an
+      N-dimensional grid.
+
+      The purpose of this protocol is to enable the creation of taskbars and
+      docks by providing them with a list of workspaces and their properties,
+      and allowing them to activate and deactivate workspaces.
+
+      After a client binds the zcosmic_workspace_manager_v1, each workspace will be
+      sent via the workspace event.
+    </description>
+
+    <event name="workspace_group">
+      <description summary="a workspace group has been created">
+        This event is emitted whenever a new workspace group has been created.
+
+        All initial details of the workspace group (workspaces, outputs) will be
+        sent immediately after this event via the corresponding events in
+        zcosmic_workspace_group_handle_v1.
+      </description>
+      <arg name="workspace_group" type="new_id" interface="zcosmic_workspace_group_handle_v1"/>
+    </event>
+
+    <request name="commit">
+      <description summary="all requests about the workspaces have been sent">
+        The client must send this request after it has finished sending other
+        requests. The compositor must process a series of requests preceding a
+        commit request atomically.
+
+        This allows changes to the workspace properties to be seen as atomic,
+        even if they happen via multiple events, and even if they involve
+        multiple zcosmic_workspace_handle_v1 objects, for example, deactivating one
+        workspace and activating another.
+      </description>
+    </request>
+
+    <event name="done">
+      <description summary="all information about the workspace groups has been sent">
+        This event is sent after all changes in all workspace groups have been
+        sent.
+
+        This allows changes to one or more zcosmic_workspace_group_handle_v1
+        properties and zcosmic_workspace_handle_v1 properties to be seen as atomic,
+        even if they happen via multiple events.
+        In particular, an output moving from one workspace group to
+        another sends an output_enter event and an output_leave event to the two
+        zcosmic_workspace_group_handle_v1 objects in question. The compositor sends
+        the done event only after updating the output information in both
+        workspace groups.
+      </description>
+    </event>
+
+    <event name="finished">
+      <description summary="the compositor has finished with the workspace_manager">
+        This event indicates that the compositor is done sending events to the
+        zcosmic_workspace_manager_v1. The server will destroy the object
+        immediately after sending this request, so it will become invalid and
+        the client should free any resources associated with it.
+      </description>
+    </event>
+
+    <request name="stop">
+      <description summary="stop sending events">
+        Indicates the client no longer wishes to receive events for new
+        workspace groups. However the compositor may emit further workspace
+        events, until the finished event is emitted.
+
+        The client must not send any more requests after this one.
+      </description>
+    </request>
+  </interface>
+
+  <interface name="zcosmic_workspace_group_handle_v1" version="1">
+    <description summary="a workspace group assigned to a set of outputs">
+      A zcosmic_workspace_group_handle_v1 object represents a a workspace group
+      that is assigned a set of outputs and contains a number of workspaces.
+
+      The set of outputs assigned to the workspace group is conveyed to the client via
+      output_enter and output_leave events, and its workspaces are conveyed with
+      workspace events.
+
+      For example, a compositor which has a set of workspaces for each output may
+      advertise a workspace group (and its workspaces) per output, whereas a compositor
+      where a workspace spans all outputs may advertise a single workspace group for all
+      outputs.
+    </description>
+
+    <enum name="zcosmic_workspace_group_capabilities_v1">
+      <entry name="create_workspace" value="1" summary="create_workspace request is available"/>
+    </enum>
+
+    <event name="capabilities">
+      <description summary="compositor capabilities">
+        This event advertises the capabilities supported by the compositor. If
+        a capability isn't supported, clients should hide or disable the UI
+        elements that expose this functionality. For instance, if the
+        compositor doesn't advertise support for creating workspaces, a button
+        triggering the create_workspace request should not be displayed.
+
+        The compositor will ignore requests it doesn't support. For instance,
+        a compositor which doesn't advertise support for creating workspaces will ignore
+        create_workspace requests.
+
+        Compositors must send this event once after creation of an
+        zcosmic_workspace_group_handle_v1 . When the capabilities change, compositors
+        must send this event again.
+
+        The capabilities are sent as an array of 32-bit unsigned integers in
+        native endianness.
+      </description>
+      <arg name="capabilities" type="array" summary="array of 32-bit capabilities"/>
+    </event>
+
+    <event name="output_enter">
+      <description summary="output assigned to workspace group">
+        This event is emitted whenever an output is assigned to the workspace
+        group.
+      </description>
+      <arg name="output" type="object" interface="wl_output"/>
+    </event>
+
+    <event name="output_leave">
+      <description summary="output removed from workspace group">
+        This event is emitted whenever an output is removed from the workspace
+        group.
+      </description>
+      <arg name="output" type="object" interface="wl_output"/>
+    </event>
+
+    <event name="workspace">
+      <description summary="workspace added to workspace group">
+        This event is emitted whenever a new workspace has been created.
+        A workspace can only be a member of a single workspace group and cannot
+        be re-assigned.
+
+        All initial details of the workspace (name, coordinates, state) will
+        be sent immediately after this event via the corresponding events in
+        zcosmic_workspace_handle_v1.
+      </description>
+      <arg name="workspace" type="new_id" interface="zcosmic_workspace_handle_v1"/>
+    </event>
+
+    <event name="remove">
+      <description summary="this workspace group has been destroyed">
+        This event means the zcosmic_workspace_group_handle_v1 has been destroyed.
+        It is guaranteed there won't be any more events for this
+        zcosmic_workspace_group_handle_v1. The zext_workspace_group_handle_v1 becomes
+        inert so any requests will be ignored except the destroy request.
+
+        The compositor must remove all workspaces belonging to a workspace group
+        before removing the workspace group.
+      </description>
+    </event>
+
+    <request name="create_workspace">
+      <description summary="create a new workspace">
+        Request that the compositor create a new workspace with the given name.
+
+        There is no guarantee that the compositor will create a new workspace,
+        or that the created workspace will have the provided name.
+      </description>
+      <arg name="workspace" type="string"/>
+    </request>
+
+    <request name="destroy" type="destructor">
+      <description summary="destroy the zcosmic_workspace_group_handle_v1 object">
+        Destroys the zcosmic_workspace_group_handle_v1 object.
+
+        This request should be called either when the client does not want to
+        use the workspace object any more or after the remove event to finalize
+        the destruction of the object.
+      </description>
+    </request>
+  </interface>
+
+  <interface name="zcosmic_workspace_handle_v1" version="1">
+    <description summary="a workspace handing a group of surfaces">
+      A zcosmic_workspace_handle_v1 object represents a a workspace that handles a
+      group of surfaces.
+
+      Each workspace has a name, conveyed to the client with the name event; a
+      list of states, conveyed to the client with the state event; and
+      optionally a set of coordinates, conveyed to the client with the
+      coordinates event. The client may request that the compositor activate or
+      deactivate the workspace.
+
+      Each workspace can belong to only a single workspace group.
+      Depepending on the compositor policy, there might be workspaces with
+      the same name in different workspace groups, but these workspaces are still
+      separate (e.g. one of them might be active while the other is not).
+    </description>
+
+    <event name="name">
+      <description summary="workspace name changed">
+        This event is emitted immediately after the zcosmic_workspace_handle_v1 is
+        created and whenever the name of the workspace changes.
+      </description>
+      <arg name="name" type="string"/>
+    </event>
+
+    <event name="coordinates">
+      <description summary="workspace coordinates changed">
+        This event is used to organize workspaces into an N-dimensional grid
+        within a workspace group, and if supported, is emitted immediately after
+        the zcosmic_workspace_handle_v1 is created and whenever the coordinates of
+        the workspace change. Compositors may not send this event if they do not
+        conceptually arrange workspaces in this way. If compositors simply
+        number workspaces, without any geometric interpretation, they may send
+        1D coordinates, which clients should not interpret as implying any
+        geometry. Sending an empty array means that the compositor no longer
+        orders the workspace geometrically.
+
+        Coordinates have an arbitrary number of dimensions N with an uint32
+        position along each dimension. By convention if N > 1, the first
+        dimension is X, the second Y, the third Z, and so on. The compositor may
+        chose to utilize these events for a more novel workspace layout
+        convention, however. No guarantee is made about the grid being filled or
+        bounded; there may be a workspace at coordinate 1 and another at
+        coordinate 1000 and none in between. Within a workspace group, however,
+        workspaces must have unique coordinates of equal dimensionality.
+      </description>
+      <arg name="coordinates" type="array"/>
+    </event>
+
+    <event name="state">
+      <description summary="the state of the workspace changed">
+        This event is emitted immediately after the zcosmic_workspace_handle_v1 is
+        created and each time the workspace state changes, either because of a
+        compositor action or because of a request in this protocol.
+      </description>
+      <arg name="state" type="array"/>
+    </event>
+
+    <enum name="state">
+      <description summary="types of states on the workspace">
+        The different states that a workspace can have.
+      </description>
+
+      <entry name="active" value="0" summary="the workspace is active"/>
+      <entry name="urgent" value="1" summary="the workspace requests attention"/>
+      <entry name="hidden" value="2">
+        <description summary="the workspace is not visible">
+          The workspace is not visible in its workspace group, and clients
+          attempting to visualize the compositor workspace state should not
+          display such workspaces.
+        </description>
+      </entry>
+    </enum>
+
+    <enum name="zcosmic_workspace_capabilities_v1">
+      <entry name="activate" value="1" summary="activate request is available"/>
+      <entry name="deactivate" value="2" summary="deactivate request is available"/>
+      <entry name="remove" value="3" summary="remove request is available"/>
+    </enum>
+
+    <event name="capabilities">
+      <description summary="compositor capabilities">
+        This event advertises the capabilities supported by the compositor. If
+        a capability isn't supported, clients should hide or disable the UI
+        elements that expose this functionality. For instance, if the
+        compositor doesn't advertise support for removing workspaces, a button
+        triggering the remove request should not be displayed.
+
+        The compositor will ignore requests it doesn't support. For instance,
+        a compositor which doesn't advertise support for remove will ignore
+        remove requests.
+
+        Compositors must send this event once after creation of an
+        zcosmic_workspace_handle_v1 . When the capabilities change, compositors
+        must send this event again.
+
+        The capabilities are sent as an array of 32-bit unsigned integers in
+        native endianness.
+      </description>
+      <arg name="capabilities" type="array" summary="array of 32-bit capabilities"/>
+    </event>
+
+    <event name="remove">
+      <description summary="this workspace has been destroyed">
+        This event means the zcosmic_workspace_handle_v1 has been destroyed. It is
+        guaranteed there won't be any more events for this
+        zcosmic_workspace_handle_v1. The zext_workspace_handle_v1 becomes inert so
+        any requests will be ignored except the destroy request.
+      </description>
+    </event>
+
+    <request name="destroy" type="destructor">
+      <description summary="destroy the zcosmic_workspace_handle_v1 object">
+        Destroys the zcosmic_workspace_handle_v1 object.
+
+        This request should be called either when the client does not want to
+        use the workspace object any more or after the remove event to finalize
+        the destruction of the object.
+      </description>
+    </request>
+
+    <request name="activate">
+      <description summary="activate the workspace">
+        Request that this workspace be activated.
+
+        There is no guarantee the workspace will be actually activated, and
+        behaviour may be compositor-dependent. For example, activating a
+        workspace may or may not deactivate all other workspaces in the same
+        group.
+      </description>
+    </request>
+
+    <request name="deactivate">
+      <description summary="activate the workspace">
+        Request that this workspace be deactivated.
+
+        There is no guarantee the workspace will be actually deactivated.
+      </description>
+    </request>
+
+    <request name="remove">
+      <description summary="remove the workspace">
+        Request that this workspace be removed.
+
+        There is no guarantee the workspace will be actually removed.
+      </description>
+    </request>
+  </interface>
+</protocol>
diff --git a/protocols/meson.build b/protocols/meson.build
index b0c2f5ab..711a9ec1 100644
--- a/protocols/meson.build
+++ b/protocols/meson.build
@@ -16,11 +16,12 @@ wayland_scanner_server = generator(
 server_protocols = [
 	wl_protocol_dir / 'stable/xdg-shell/xdg-shell.xml',
 	wl_protocol_dir / 'unstable/pointer-constraints/pointer-constraints-unstable-v1.xml',
-	wl_protocol_dir / 'unstable/tablet/tablet-unstable-v2.xml',
+	wl_protocol_dir / 'stable/tablet/tablet-v2.xml',
 	wl_protocol_dir / 'staging/cursor-shape/cursor-shape-v1.xml',
 	wl_protocol_dir / 'staging/drm-lease/drm-lease-v1.xml',
 	wl_protocol_dir / 'staging/xwayland-shell/xwayland-shell-v1.xml',
 	wl_protocol_dir / 'staging/tearing-control/tearing-control-v1.xml',
+	'cosmic-workspace-unstable-v1.xml',
 	'wlr-layer-shell-unstable-v1.xml',
 	'wlr-input-inhibitor-unstable-v1.xml',
 	'wlr-output-power-management-unstable-v1.xml',
diff --git a/scripts/check b/scripts/check
index 7b8c6255..9e108666 100755
--- a/scripts/check
+++ b/scripts/check
@@ -19,14 +19,10 @@ run_checks () {
 		return $?
 	fi
 
-	find src/ include/ \( -name "*.c" -o -name "*.h" \) -type f |
-	{
-		errors=0
-		while IFS= read -r file; do
-			run_checkpatch "$file" || errors=1
-		done
-		return ${errors}
-	}
+	find src/ include/ \( -name "*.c" -o -name "*.h" \) -type f -print0 |
+	nice xargs -0 --max-args 1 --max-procs $(nproc) \
+		scripts/checkpatch.pl --terse --no-tree --strict --file
+	return $?
 }
 
 main () {
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 72368147..b2499234 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -5657,7 +5657,7 @@ sub process {
 #labwc-custom check to ignore some pango/libxml2/etc CamelCase variants
 			    $var !~ /^(?:_?Pango\w+)/ &&
 			    $var !~ /^(?:xml\w+)/ &&
-			    $var !~ /^(?:GString|GError)/ &&
+			    $var !~ /^(?:GString|GError|GHashTable)/ &&
 			    $var !~ /^(?:RsvgRectangle|RsvgHandle)/ &&
 			    $var !~ /^(?:XKB_KEY_XF86Switch_VT_1)/ &&
 
diff --git a/src/action.c b/src/action.c
index 135af253..5c0f2a8d 100644
--- a/src/action.c
+++ b/src/action.c
@@ -19,7 +19,6 @@
 #include "menu/menu.h"
 #include "osd.h"
 #include "output-virtual.h"
-#include "placement.h"
 #include "regions.h"
 #include "ssd.h"
 #include "view.h"
@@ -70,6 +69,7 @@ enum action_type {
 	ACTION_TYPE_EXECUTE,
 	ACTION_TYPE_EXIT,
 	ACTION_TYPE_MOVE_TO_EDGE,
+	ACTION_TYPE_TOGGLE_SNAP_TO_EDGE,
 	ACTION_TYPE_SNAP_TO_EDGE,
 	ACTION_TYPE_GROW_TO_EDGE,
 	ACTION_TYPE_SHRINK_TO_EDGE,
@@ -100,7 +100,9 @@ enum action_type {
 	ACTION_TYPE_MOVE_RELATIVE,
 	ACTION_TYPE_SEND_TO_DESKTOP,
 	ACTION_TYPE_GO_TO_DESKTOP,
+	ACTION_TYPE_TOGGLE_SNAP_TO_REGION,
 	ACTION_TYPE_SNAP_TO_REGION,
+	ACTION_TYPE_UNSNAP,
 	ACTION_TYPE_TOGGLE_KEYBINDS,
 	ACTION_TYPE_FOCUS_OUTPUT,
 	ACTION_TYPE_MOVE_TO_OUTPUT,
@@ -114,6 +116,9 @@ enum action_type {
 	ACTION_TYPE_SHADE,
 	ACTION_TYPE_UNSHADE,
 	ACTION_TYPE_TOGGLE_SHADE,
+	ACTION_TYPE_ENABLE_TABLET_MOUSE_EMULATION,
+	ACTION_TYPE_DISABLE_TABLET_MOUSE_EMULATION,
+	ACTION_TYPE_TOGGLE_TABLET_MOUSE_EMULATION,
 	ACTION_TYPE_TOGGLE_MAGNIFY,
 	ACTION_TYPE_ZOOM_IN,
 	ACTION_TYPE_ZOOM_OUT
@@ -128,6 +133,7 @@ const char *action_names[] = {
 	"Execute",
 	"Exit",
 	"MoveToEdge",
+	"ToggleSnapToEdge",
 	"SnapToEdge",
 	"GrowToEdge",
 	"ShrinkToEdge",
@@ -158,7 +164,9 @@ const char *action_names[] = {
 	"MoveRelative",
 	"SendToDesktop",
 	"GoToDesktop",
+	"ToggleSnapToRegion",
 	"SnapToRegion",
+	"UnSnap",
 	"ToggleKeybinds",
 	"FocusOutput",
 	"MoveToOutput",
@@ -172,6 +180,9 @@ const char *action_names[] = {
 	"Shade",
 	"Unshade",
 	"ToggleShade",
+	"EnableTabletMouseEmulation",
+	"DisableTabletMouseEmulation",
+	"ToggleTabletMouseEmulation",
 	"ToggleMagnify",
 	"ZoomIn",
 	"ZoomOut",
@@ -314,12 +325,15 @@ action_arg_from_xml_node(struct action *action, const char *nodename, const char
 			goto cleanup;
 		}
 		/* Falls through */
+	case ACTION_TYPE_TOGGLE_SNAP_TO_EDGE:
 	case ACTION_TYPE_SNAP_TO_EDGE:
 	case ACTION_TYPE_GROW_TO_EDGE:
 	case ACTION_TYPE_SHRINK_TO_EDGE:
 		if (!strcmp(argument, "direction")) {
 			enum view_edge edge = view_edge_parse(content);
-			if ((edge == VIEW_EDGE_CENTER && action->type != ACTION_TYPE_SNAP_TO_EDGE)
+			bool allow_center = action->type == ACTION_TYPE_TOGGLE_SNAP_TO_EDGE
+				|| action->type == ACTION_TYPE_SNAP_TO_EDGE;
+			if ((edge == VIEW_EDGE_CENTER && !allow_center)
 					|| edge == VIEW_EDGE_INVALID) {
 				wlr_log(WLR_ERROR, "Invalid argument for action %s: '%s' (%s)",
 					action_names[action->type], argument, content);
@@ -338,6 +352,14 @@ action_arg_from_xml_node(struct action *action, const char *nodename, const char
 			action_arg_add_bool(action, argument, parse_bool(content, true));
 			goto cleanup;
 		}
+		if (!strcasecmp(argument, "x.position")) {
+			action_arg_add_str(action, argument, content);
+			goto cleanup;
+		}
+		if (!strcasecmp(argument, "y.position")) {
+			action_arg_add_str(action, argument, content);
+			goto cleanup;
+		}
 		break;
 	case ACTION_TYPE_TOGGLE_MAXIMIZE:
 	case ACTION_TYPE_MAXIMIZE:
@@ -400,6 +422,7 @@ action_arg_from_xml_node(struct action *action, const char *nodename, const char
 			goto cleanup;
 		}
 		break;
+	case ACTION_TYPE_TOGGLE_SNAP_TO_REGION:
 	case ACTION_TYPE_SNAP_TO_REGION:
 		if (!strcmp(argument, "region")) {
 			action_arg_add_str(action, argument, content);
@@ -407,11 +430,6 @@ action_arg_from_xml_node(struct action *action, const char *nodename, const char
 		}
 		break;
 	case ACTION_TYPE_FOCUS_OUTPUT:
-		if (!strcmp(argument, "output")) {
-			action_arg_add_str(action, argument, content);
-			goto cleanup;
-		}
-		break;
 	case ACTION_TYPE_MOVE_TO_OUTPUT:
 		if (!strcmp(argument, "output")) {
 			action_arg_add_str(action, argument, content);
@@ -530,6 +548,7 @@ action_is_valid(struct action *action)
 		arg_name = "command";
 		break;
 	case ACTION_TYPE_MOVE_TO_EDGE:
+	case ACTION_TYPE_TOGGLE_SNAP_TO_EDGE:
 	case ACTION_TYPE_SNAP_TO_EDGE:
 	case ACTION_TYPE_GROW_TO_EDGE:
 	case ACTION_TYPE_SHRINK_TO_EDGE:
@@ -543,12 +562,10 @@ action_is_valid(struct action *action)
 	case ACTION_TYPE_SEND_TO_DESKTOP:
 		arg_name = "to";
 		break;
+	case ACTION_TYPE_TOGGLE_SNAP_TO_REGION:
 	case ACTION_TYPE_SNAP_TO_REGION:
 		arg_name = "region";
 		break;
-	case ACTION_TYPE_FOCUS_OUTPUT:
-		arg_name = "output";
-		break;
 	case ACTION_TYPE_IF:
 	case ACTION_TYPE_FOR_EACH:
 		; /* works around "a label can only be part of a statement" */
@@ -613,8 +630,9 @@ action_list_free(struct wl_list *action_list)
 }
 
 static void
-show_menu(struct server *server, struct view *view,
-		const char *menu_name, bool at_cursor)
+show_menu(struct server *server, struct view *view, struct cursor_context *ctx,
+		const char *menu_name, bool at_cursor,
+		const char *pos_x, const char *pos_y)
 {
 	if (server->input_mode != LAB_INPUT_STATE_PASSTHROUGH
 			&& server->input_mode != LAB_INPUT_STATE_MENU) {
@@ -627,18 +645,88 @@ show_menu(struct server *server, struct view *view,
 		return;
 	}
 
+	/*
+	 * We always refresh client-list-combined-menu and client-send-to-menu
+	 * so that they are up-to-date whether they are directly opened as a
+	 * top-level menu or opened as a submenu which we don't know at this
+	 * point. It is also needed to calculate the proper width for placement
+	 * as it fluctuates depending on application/workspace titles.
+	 */
+	update_client_list_combined_menu(menu->server);
+	update_client_send_to_menu(menu->server);
+
 	int x = server->seat.cursor->x;
 	int y = server->seat.cursor->y;
 
 	/* The client menu needs an active client */
-	if (!view && strcasecmp(menu_name, "client-menu") == 0) {
+	bool is_client_menu = !strcasecmp(menu_name, "client-menu");
+	if (is_client_menu && !view) {
 		return;
 	}
-
 	/* Place menu in the view corner if desired (and menu is not root-menu) */
 	if (!at_cursor && view) {
 		x = view->current.x;
 		y = view->current.y;
+		/* Push the client menu underneath the button */
+		if (is_client_menu && ssd_part_contains(
+				LAB_SSD_BUTTON, ctx->type)) {
+			assert(ctx->node);
+			int ly;
+			wlr_scene_node_coords(ctx->node, &x, &ly);
+		}
+	}
+
+	/*
+	 * determine placement by looking at x and y
+	 * x/y can be number, "center" or a %percent of screen dimensions
+	 */
+	if (pos_x && pos_y) {
+		struct output *output = output_nearest_to(server,
+				server->seat.cursor->x, server->seat.cursor->y);
+		struct menuitem *item;
+		struct theme *theme = server->theme;
+		int max_width = theme->menu_min_width;
+
+		wl_list_for_each(item, &menu->menuitems, link) {
+			if (item->native_width > max_width) {
+				max_width = item->native_width < theme->menu_max_width
+					? item->native_width : theme->menu_max_width;
+			}
+		}
+
+		if (!strcasecmp(pos_x, "center")) {
+			x = (output->usable_area.width / 2) - (max_width / 2);
+		} else if (strchr(pos_x, '%')) {
+			x = (output->usable_area.width * atoi(pos_x)) / 100;
+		} else {
+			if (pos_x[0] == '-') {
+				int neg_x = strtol(pos_x, NULL, 10);
+				x = output->usable_area.width + neg_x;
+			} else {
+				x = atoi(pos_x);
+			}
+		}
+
+		if (!strcasecmp(pos_y, "center")) {
+			y = (output->usable_area.height / 2) - (menu->size.height / 2);
+		} else if (strchr(pos_y, '%')) {
+			y = (output->usable_area.height * atoi(pos_y)) / 100;
+		} else {
+			if (pos_y[0] == '-') {
+				int neg_y = strtol(pos_y, NULL, 10);
+				y = output->usable_area.height + neg_y;
+			} else {
+				y = atoi(pos_y);
+			}
+		}
+		/* keep menu from being off screen */
+		x = MAX(x, 0);
+		x = MIN(x, (output->usable_area.width -1));
+		y = MAX(y, 0);
+		y = MIN(y, (output->usable_area.height -1));
+		/* adjust for which monitor to appear on */
+		x += output->usable_area.x;
+		y += output->usable_area.y;
 	}
 
 	/* Replaced by next show_menu() or cleaned on view_destroy() */
@@ -648,7 +736,7 @@ show_menu(struct server *server, struct view *view,
 
 static struct view *
 view_for_action(struct view *activator, struct server *server,
-	struct action *action, uint32_t *resize_edges)
+	struct action *action, struct cursor_context *ctx)
 {
 	/* View is explicitly specified for mousebinds */
 	if (activator) {
@@ -660,13 +748,8 @@ view_for_action(struct view *activator, struct server *server,
 	case ACTION_TYPE_FOCUS:
 	case ACTION_TYPE_MOVE:
 	case ACTION_TYPE_RESIZE: {
-		struct cursor_context ctx = get_cursor_context(server);
-		if (action->type == ACTION_TYPE_RESIZE) {
-			/* Select resize edges for the keybind case */
-			*resize_edges = cursor_get_resize_edges(
-				server->seat.cursor, &ctx);
-		}
-		return ctx.view;
+		*ctx = get_cursor_context(server);
+		return ctx->view;
 	}
 	default:
 		return server->active_view;
@@ -694,14 +777,57 @@ run_if_action(struct view *view, struct server *server, struct action *action)
 
 	actions = action_get_actionlist(action, branch);
 	if (actions) {
-		actions_run(view, server, actions, 0);
+		actions_run(view, server, actions, NULL);
 	}
 	return !strcmp(branch, "then");
 }
 
+static bool
+shift_is_pressed(struct server *server)
+{
+	uint32_t modifiers = wlr_keyboard_get_modifiers(
+			&server->seat.keyboard_group->keyboard);
+	return modifiers & WLR_MODIFIER_SHIFT;
+}
+
+static void
+start_window_cycling(struct server *server, enum lab_cycle_dir direction)
+{
+	/* Remember direction so it can be followed by subsequent key presses */
+	server->osd_state.initial_direction = direction;
+	server->osd_state.initial_keybind_contained_shift =
+		shift_is_pressed(server);
+	server->osd_state.cycle_view = desktop_cycle_view(server,
+		server->osd_state.cycle_view, direction);
+	osd_update(server);
+}
+
+static struct output *
+get_target_output(struct output *output, struct server *server,
+	struct action *action)
+{
+	const char *output_name = action_get_str(action, "output", NULL);
+	struct output *target = NULL;
+
+	if (output_name) {
+		target = output_from_name(server, output_name);
+	} else {
+		enum view_edge edge =
+			action_get_int(action, "direction", VIEW_EDGE_INVALID);
+		bool wrap = action_get_bool(action, "wrap", false);
+		target = output_get_adjacent(output, edge, wrap);
+	}
+
+	if (!target) {
+		wlr_log(WLR_DEBUG, "Invalid output");
+	}
+
+	return target;
+}
+
 void
 actions_run(struct view *activator, struct server *server,
-	struct wl_list *actions, uint32_t resize_edges)
+	struct wl_list *actions, struct cursor_context *cursor_ctx)
 {
 	if (!actions) {
 		wlr_log(WLR_ERROR, "empty actions");
@@ -713,6 +839,13 @@ actions_run(struct view *activator, struct server *server,
 
 	struct view *view;
 	struct action *action;
+	struct output *output;
+	struct output *target;
+	struct cursor_context ctx = {0};
+	if (cursor_ctx) {
+		ctx = *cursor_ctx;
+	}
+
 	wl_list_for_each(action, actions, link) {
 		wlr_log(WLR_DEBUG, "Handling action %u: %s", action->type,
 			action_names[action->type]);
@@ -721,8 +854,7 @@ actions_run(struct view *activator, struct server *server,
 		 * Refetch view because it may have been changed due to the
 		 * previous action
 		 */
-		view = view_for_action(activator, server, action,
-			&resize_edges);
+		view = view_for_action(activator, server, action, &ctx);
 
 		switch (action->type) {
 		case ACTION_TYPE_CLOSE:
@@ -765,10 +897,20 @@ actions_run(struct view *activator, struct server *server,
 				view_move_to_edge(view, edge, snap_to_windows);
 			}
 			break;
+		case ACTION_TYPE_TOGGLE_SNAP_TO_EDGE:
 		case ACTION_TYPE_SNAP_TO_EDGE:
 			if (view) {
 				/* Config parsing makes sure that direction is a valid direction */
 				enum view_edge edge = action_get_int(action, "direction", 0);
+				if (action->type == ACTION_TYPE_TOGGLE_SNAP_TO_EDGE
+						&& view->maximized == VIEW_AXIS_NONE
+						&& !view->fullscreen
+						&& view_is_tiled(view)
+						&& view->tiled == edge) {
+					view_set_untiled(view);
+					view_apply_natural_geometry(view);
+					break;
+				}
 				view_snap_to_edge(view, edge,
 					/*across_outputs*/ true,
 					/*store_natural_geometry*/ true);
@@ -789,22 +931,20 @@ actions_run(struct view *activator, struct server *server,
 			}
 			break;
 		case ACTION_TYPE_NEXT_WINDOW:
-			server->osd_state.cycle_view = desktop_cycle_view(server,
-				server->osd_state.cycle_view, LAB_CYCLE_DIR_FORWARD);
-			osd_update(server);
+			start_window_cycling(server, LAB_CYCLE_DIR_FORWARD);
 			break;
 		case ACTION_TYPE_PREVIOUS_WINDOW:
-			server->osd_state.cycle_view = desktop_cycle_view(server,
-				server->osd_state.cycle_view, LAB_CYCLE_DIR_BACKWARD);
-			osd_update(server);
+			start_window_cycling(server, LAB_CYCLE_DIR_BACKWARD);
 			break;
 		case ACTION_TYPE_RECONFIGURE:
 			kill(getpid(), SIGHUP);
 			break;
 		case ACTION_TYPE_SHOW_MENU:
-			show_menu(server, view,
+			show_menu(server, view, &ctx,
 				action_get_str(action, "menu", NULL),
-				action_get_bool(action, "atCursor", true));
+				action_get_bool(action, "atCursor", true),
+				action_get_str(action, "x.position", NULL),
+				action_get_str(action, "y.position", NULL));
 			break;
 		case ACTION_TYPE_TOGGLE_MAXIMIZE:
 			if (view) {
@@ -893,6 +1033,8 @@ actions_run(struct view *activator, struct server *server,
 			break;
 		case ACTION_TYPE_RESIZE:
 			if (view) {
+				uint32_t resize_edges = cursor_get_resize_edges(
+					server->seat.cursor, &ctx);
 				interactive_begin(view, LAB_INPUT_STATE_RESIZE,
 					resize_edges);
 			}
@@ -964,7 +1106,7 @@ actions_run(struct view *activator, struct server *server,
 				 * a required argument for both SendToDesktop and GoToDesktop.
 				 */
 				struct workspace *target = workspaces_find(
-					server->workspace_current, to, wrap);
+					server->workspaces.current, to, wrap);
 				if (!target) {
 					break;
 				}
@@ -987,25 +1129,10 @@ actions_run(struct view *activator, struct server *server,
 			if (!view) {
 				break;
 			}
-			const char *output_name = action_get_str(action, "output", NULL);
-			struct output *target = NULL;
-			if (output_name) {
-				target = output_from_name(view->server, output_name);
-			} else {
-				enum view_edge edge = action_get_int(action, "direction", 0);
-				bool wrap = action_get_bool(action, "wrap", false);
-				target = view_get_adjacent_output(view, edge, wrap);
+			target = get_target_output(view->output, server, action);
+			if (target) {
+				view_move_to_output(view, target);
 			}
-			if (!target) {
-				/*
-				 * Most likely because we're already on the
-				 * output furthest in the requested direction
-				 * or the output or direction was invalid.
-				 */
-				wlr_log(WLR_DEBUG, "Invalid output");
-				break;
-			}
-			view_move_to_output(view, target);
 			break;
 		case ACTION_TYPE_FIT_TO_OUTPUT:
 			if (!view) {
@@ -1013,32 +1140,51 @@ actions_run(struct view *activator, struct server *server,
 			}
 			view_constrain_size_to_that_of_usable_area(view);
 			break;
+		case ACTION_TYPE_TOGGLE_SNAP_TO_REGION:
 		case ACTION_TYPE_SNAP_TO_REGION:
 			if (!view) {
 				break;
 			}
-			struct output *output = view->output;
+			output = view->output;
 			if (!output) {
 				break;
 			}
 			const char *region_name = action_get_str(action, "region", NULL);
 			struct region *region = regions_from_name(region_name, output);
 			if (region) {
+				if (action->type == ACTION_TYPE_TOGGLE_SNAP_TO_REGION
+						&& view->maximized == VIEW_AXIS_NONE
+						&& !view->fullscreen
+						&& view_is_tiled(view)
+						&& view->tiled_region == region) {
+					view_set_untiled(view);
+					view_apply_natural_geometry(view);
+					break;
+				}
 				view_snap_to_region(view, region,
 					/*store_natural_geometry*/ true);
 			} else {
 				wlr_log(WLR_ERROR, "Invalid SnapToRegion id: '%s'", region_name);
 			}
 			break;
+		case ACTION_TYPE_UNSNAP:
+			if (view && !view->fullscreen && !view_is_floating(view)) {
+				view_maximize(view, VIEW_AXIS_NONE,
+					/* store_natural_geometry */ false);
+				view_set_untiled(view);
+				view_apply_natural_geometry(view);
+			}
+			break;
 		case ACTION_TYPE_TOGGLE_KEYBINDS:
 			if (view) {
 				view_toggle_keybinds(view);
 			}
 			break;
 		case ACTION_TYPE_FOCUS_OUTPUT:
-			{
-				const char *output_name = action_get_str(action, "output", NULL);
-				desktop_focus_output(output_from_name(server, output_name));
+			output = output_nearest_to_cursor(server);
+			target = get_target_output(output, server, action);
+			if (target) {
+				desktop_focus_output(target);
 			}
 			break;
 		case ACTION_TYPE_IF:
@@ -1061,7 +1207,7 @@ actions_run(struct view *activator, struct server *server,
 					struct wl_list *actions;
 					actions = action_get_actionlist(action, "none");
 					if (actions) {
-						actions_run(view, server, actions, 0);
+						actions_run(view, server, actions, NULL);
 					}
 				}
 			}
@@ -1091,9 +1237,22 @@ actions_run(struct view *activator, struct server *server,
 			break;
 		case ACTION_TYPE_TOGGLE_TEARING:
 			if (view) {
-				view->tearing_hint = !view->tearing_hint;
-				wlr_log(WLR_DEBUG, "tearing %sabled",
-					view->tearing_hint ? "en" : "dis");
+				switch (view->force_tearing) {
+				case LAB_STATE_UNSPECIFIED:
+					view->force_tearing =
+						output_get_tearing_allowance(view->output)
+							? LAB_STATE_DISABLED : LAB_STATE_ENABLED;
+					break;
+				case LAB_STATE_DISABLED:
+					view->force_tearing = LAB_STATE_ENABLED;
+					break;
+				case LAB_STATE_ENABLED:
+					view->force_tearing = LAB_STATE_DISABLED;
+					break;
+				}
+				wlr_log(WLR_ERROR, "force tearing %sabled",
+					view->force_tearing == LAB_STATE_ENABLED
+						? "en" : "dis");
 			}
 			break;
 		case ACTION_TYPE_TOGGLE_SHADE:
@@ -1111,6 +1270,15 @@ actions_run(struct view *activator, struct server *server,
 				view_set_shade(view, false);
 			}
 			break;
+		case ACTION_TYPE_ENABLE_TABLET_MOUSE_EMULATION:
+			rc.tablet.force_mouse_emulation = true;
+			break;
+		case ACTION_TYPE_DISABLE_TABLET_MOUSE_EMULATION:
+			rc.tablet.force_mouse_emulation = false;
+			break;
+		case ACTION_TYPE_TOGGLE_TABLET_MOUSE_EMULATION:
+			rc.tablet.force_mouse_emulation = !rc.tablet.force_mouse_emulation;
+			break;
 		case ACTION_TYPE_TOGGLE_MAGNIFY:
 			magnify_toggle(server);
 			break;
diff --git a/src/buffer.c b/src/buffer.c
index 0921acdd..d9cb8726 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -29,6 +29,7 @@
 #include <drm_fourcc.h>
 #include <wlr/interfaces/wlr_buffer.h>
 #include "buffer.h"
+#include "common/box.h"
 #include "common/mem.h"
 
 static const struct wlr_buffer_impl data_buffer_impl;
@@ -44,14 +45,12 @@ static void
 data_buffer_destroy(struct wlr_buffer *wlr_buffer)
 {
 	struct lab_data_buffer *buffer = data_buffer_from_buffer(wlr_buffer);
-	if (!buffer->free_on_destroy) {
-		free(buffer);
-		return;
-	}
 	if (buffer->cairo) {
-		cairo_surface_t *surf = cairo_get_target(buffer->cairo);
 		cairo_destroy(buffer->cairo);
-		cairo_surface_destroy(surf);
+	}
+	if (buffer->surface) {
+		/* this also frees buffer->data */
+		cairo_surface_destroy(buffer->surface);
 	} else if (buffer->data) {
 		free(buffer->data);
 		buffer->data = NULL;
@@ -85,19 +84,35 @@ static const struct wlr_buffer_impl data_buffer_impl = {
 };
 
 struct lab_data_buffer *
-buffer_create_cairo(uint32_t width, uint32_t height, float scale,
-	bool free_on_destroy)
+buffer_adopt_cairo_surface(cairo_surface_t *surface)
 {
-	struct lab_data_buffer *buffer = znew(*buffer);
-	buffer->unscaled_width = width;
-	buffer->unscaled_height = height;
-	width *= scale;
-	height *= scale;
+	assert(cairo_surface_get_type(surface) == CAIRO_SURFACE_TYPE_IMAGE);
+	assert(cairo_image_surface_get_format(surface) == CAIRO_FORMAT_ARGB32);
 
-	/* Allocate the buffer with the scaled size */
+	int width = cairo_image_surface_get_width(surface);
+	int height = cairo_image_surface_get_height(surface);
+
+	struct lab_data_buffer *buffer = znew(*buffer);
 	wlr_buffer_init(&buffer->base, &data_buffer_impl, width, height);
-	cairo_surface_t *surf =
-		cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
+
+	buffer->surface = surface;
+	buffer->data = cairo_image_surface_get_data(buffer->surface);
+	buffer->format = DRM_FORMAT_ARGB8888;
+	buffer->stride = cairo_image_surface_get_stride(buffer->surface);
+	buffer->logical_width = width;
+	buffer->logical_height = height;
+
+	return buffer;
+}
+
+struct lab_data_buffer *
+buffer_create_cairo(uint32_t logical_width, uint32_t logical_height, float scale)
+{
+	/* Create an image surface with the scaled size */
+	cairo_surface_t *surface =
+		cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
+			lroundf(logical_width * scale),
+			lroundf(logical_height * scale));
 
 	/**
 	 * Tell cairo about the device scale so we can keep drawing in unscaled
@@ -106,34 +121,82 @@ buffer_create_cairo(uint32_t width, uint32_t height, float scale,
 	 *
 	 * For a more complete explanation see PR #389
 	 */
-	cairo_surface_set_device_scale(surf, scale, scale);
+	cairo_surface_set_device_scale(surface, scale, scale);
 
-	buffer->cairo = cairo_create(surf);
-	buffer->data = cairo_image_surface_get_data(surf);
-	buffer->format = DRM_FORMAT_ARGB8888;
-	buffer->stride = cairo_image_surface_get_stride(surf);
-	buffer->free_on_destroy = free_on_destroy;
+	/*
+	 * Adopt the image surface into a buffer, set the correct
+	 * logical size, and create a cairo context for drawing
+	 */
+	struct lab_data_buffer *buffer = buffer_adopt_cairo_surface(surface);
+	buffer->logical_width = logical_width;
+	buffer->logical_height = logical_height;
+	buffer->cairo = cairo_create(surface);
 
-	if (!buffer->data) {
-		cairo_destroy(buffer->cairo);
-		cairo_surface_destroy(surf);
-		free(buffer);
-		buffer = NULL;
-	}
 	return buffer;
 }
 
 struct lab_data_buffer *
-buffer_create_wrap(void *pixel_data, uint32_t width, uint32_t height,
-	uint32_t stride, bool free_on_destroy)
+buffer_convert_cairo_surface_for_icon(cairo_surface_t *surface,
+		uint32_t icon_size, float scale)
+{
+	assert(cairo_surface_get_type(surface) == CAIRO_SURFACE_TYPE_IMAGE);
+
+	/*
+	 * Compute logical size for display and decide whether we can
+	 * use the image data directly (fast path). Requirements are:
+	 *
+	 *  - The pixel format must be ARGB32.
+	 *  - The image must not be so large as to need downsampling by
+	 *    more than 2x when displayed at the target scale. wlr_scene
+	 *    uses linear interpolation without pixel averaging, which
+	 *    starts to skip samples if downsampling more than 2x,
+	 *    resulting in a grainy look.
+	 */
+	int width = cairo_image_surface_get_width(surface);
+	int height = cairo_image_surface_get_height(surface);
+	struct wlr_box logical =
+		box_fit_within(width, height, icon_size, icon_size);
+	struct lab_data_buffer *buffer;
+
+	if (cairo_image_surface_get_format(surface) == CAIRO_FORMAT_ARGB32
+			&& width <= 2 * logical.width * scale
+			&& height <= 2 * logical.height * scale) {
+		buffer = buffer_adopt_cairo_surface(surface);
+		/* set logical size for display */
+		buffer->logical_width = logical.width;
+		buffer->logical_height = logical.height;
+	} else {
+		/* convert to ARGB32 and scale for display (slow path) */
+		buffer = buffer_create_cairo(logical.width,
+			logical.height, scale);
+
+		cairo_t *cairo = buffer->cairo;
+		cairo_scale(cairo, (double)logical.width / width,
+			(double)logical.height / height);
+		cairo_set_source_surface(cairo, surface, 0, 0);
+		cairo_pattern_set_filter(cairo_get_source(cairo),
+			CAIRO_FILTER_GOOD);
+		cairo_paint(cairo);
+
+		/* ensure pixel data is updated */
+		cairo_surface_flush(buffer->surface);
+		/* destroy original surface */
+		cairo_surface_destroy(surface);
+	}
+
+	return buffer;
+}
+
+struct lab_data_buffer *
+buffer_create_from_data(void *pixel_data, uint32_t width, uint32_t height,
+		uint32_t stride)
 {
 	struct lab_data_buffer *buffer = znew(*buffer);
 	wlr_buffer_init(&buffer->base, &data_buffer_impl, width, height);
-	buffer->unscaled_width = width;
-	buffer->unscaled_height = height;
+	buffer->logical_width = width;
+	buffer->logical_height = height;
 	buffer->data = pixel_data;
 	buffer->format = DRM_FORMAT_ARGB8888;
 	buffer->stride = stride;
-	buffer->free_on_destroy = free_on_destroy;
 	return buffer;
 }
diff --git a/src/button/common.c b/src/button/common.c
deleted file mode 100644
index 39400994..00000000
--- a/src/button/common.c
+++ /dev/null
@@ -1,27 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-#include <stdio.h>
-#include <unistd.h>
-#include "button/common.h"
-#include "common/dir.h"
-#include "config/rcxml.h"
-#include "labwc.h"
-
-void
-button_filename(const char *name, char *buf, size_t len)
-{
-	struct wl_list paths;
-	paths_theme_create(&paths, rc.theme_name, name);
-
-	/*
-	 * You can't really merge buttons, so let's just iterate forwards
-	 * and stop on the first hit
-	 */
-	struct path *path;
-	wl_list_for_each(path, &paths, link) {
-		if (access(path->string, R_OK) == 0) {
-			snprintf(buf, len, "%s", path->string);
-			break;
-		}
-	}
-	paths_destroy(&paths);
-}
diff --git a/src/common/box.c b/src/common/box.c
new file mode 100644
index 00000000..eefa535c
--- /dev/null
+++ b/src/common/box.c
@@ -0,0 +1,75 @@
+// SPDX-License-Identifier: GPL-2.0-only
+#include <assert.h>
+#include "common/box.h"
+#include "common/macros.h"
+
+bool
+box_contains(struct wlr_box *box_super, struct wlr_box *box_sub)
+{
+	if (wlr_box_empty(box_super) || wlr_box_empty(box_sub)) {
+		return false;
+	}
+	return box_super->x <= box_sub->x
+		&& box_super->x + box_super->width >= box_sub->x + box_sub->width
+		&& box_super->y <= box_sub->y
+		&& box_super->y + box_super->height >= box_sub->y + box_sub->height;
+}
+
+bool
+box_intersects(struct wlr_box *box_a, struct wlr_box *box_b)
+{
+	if (wlr_box_empty(box_a) || wlr_box_empty(box_b)) {
+		return false;
+	}
+	return box_a->x < box_b->x + box_b->width
+		&& box_b->x < box_a->x + box_a->width
+		&& box_a->y < box_b->y + box_b->height
+		&& box_b->y < box_a->y + box_a->height;
+}
+
+void
+box_union(struct wlr_box *box_dest, struct wlr_box *box_a, struct wlr_box *box_b)
+{
+	if (wlr_box_empty(box_a)) {
+		*box_dest = *box_b;
+		return;
+	}
+	if (wlr_box_empty(box_b)) {
+		*box_dest = *box_a;
+		return;
+	}
+	int x1 = MIN(box_a->x, box_b->x);
+	int y1 = MIN(box_a->y, box_b->y);
+	int x2 = MAX(box_a->x + box_a->width, box_b->x + box_b->width);
+	int y2 = MAX(box_a->y + box_a->height, box_b->y + box_b->height);
+	box_dest->x = x1;
+	box_dest->y = y1;
+	box_dest->width = x2 - x1;
+	box_dest->height = y2 - y1;
+}
+
+struct wlr_box
+box_fit_within(int width, int height, int max_width, int max_height)
+{
+	struct wlr_box box;
+
+	if (width <= max_width && height <= max_height) {
+		/* No downscaling needed */
+		box.width = width;
+		box.height = height;
+	} else if (width * max_height > height * max_width) {
+		/* Wider content, fit width */
+		box.width = max_width;
+		box.height = (height * max_width + (width / 2)) / width;
+	} else {
+		/* Taller content, fit height */
+		box.width = (width * max_height + (height / 2)) / height;
+		box.height = max_height;
+	}
+
+	/* Compute centered position */
+	box.x = (max_width - box.width) / 2;
+	box.y = (max_height - box.height) / 2;
+
+	return box;
+}
diff --git a/src/common/buf.c b/src/common/buf.c
index ecdddc6e..70be9ed0 100644
--- a/src/common/buf.c
+++ b/src/common/buf.c
@@ -1,7 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include <assert.h>
 #include <ctype.h>
+#include <stdarg.h>
 #include <stdbool.h>
+#include <stdio.h>
 #include <string.h>
 #include "common/buf.h"
 #include "common/macros.h"
@@ -95,6 +97,37 @@ buf_expand(struct buf *s, int new_alloc)
 	s->alloc = new_alloc;
 }
 
+void
+buf_add_fmt(struct buf *s, const char *fmt, ...)
+{
+	if (string_null_or_empty(fmt)) {
+		return;
+	}
+	va_list ap;
+
+	va_start(ap, fmt);
+	int n = vsnprintf(NULL, 0, fmt, ap);
+	va_end(ap);
+
+	if (n < 0) {
+		return;
+	}
+
+	size_t size = (size_t)n + 1;
+	buf_expand(s, s->len + size);
+
+	va_start(ap, fmt);
+	n = vsnprintf(s->data + s->len, size, fmt, ap);
+	va_end(ap);
+
+	if (n < 0) {
+		return;
+	}
+
+	s->len += n;
+	s->data[s->len] = 0;
+}
+
 void
 buf_add(struct buf *s, const char *data)
 {
diff --git a/src/common/direction.c b/src/common/direction.c
new file mode 100644
index 00000000..fa88eee4
--- /dev/null
+++ b/src/common/direction.c
@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: GPL-2.0-only
+#include <assert.h>
+#include <wlr/types/wlr_output_layout.h>
+#include "common/direction.h"
+#include "view.h"
+
+enum wlr_direction
+direction_from_view_edge(enum view_edge edge)
+{
+	switch (edge) {
+	case VIEW_EDGE_LEFT:
+		return WLR_DIRECTION_LEFT;
+	case VIEW_EDGE_RIGHT:
+		return WLR_DIRECTION_RIGHT;
+	case VIEW_EDGE_UP:
+		return WLR_DIRECTION_UP;
+	case VIEW_EDGE_DOWN:
+		return WLR_DIRECTION_DOWN;
+	case VIEW_EDGE_CENTER:
+	case VIEW_EDGE_INVALID:
+	default:
+		return WLR_DIRECTION_UP;
+	}
+}
+
+enum wlr_direction
+direction_get_opposite(enum wlr_direction direction)
+{
+	switch (direction) {
+	case WLR_DIRECTION_RIGHT:
+		return WLR_DIRECTION_LEFT;
+	case WLR_DIRECTION_LEFT:
+		return WLR_DIRECTION_RIGHT;
+	case WLR_DIRECTION_DOWN:
+		return WLR_DIRECTION_UP;
+	case WLR_DIRECTION_UP:
+		return WLR_DIRECTION_DOWN;
+	default:
+		assert(0); /* Unreachable */
+		return WLR_DIRECTION_UP;
+	}
+}
diff --git a/src/common/font.c b/src/common/font.c
index c9e6166c..ff984ce4 100644
--- a/src/common/font.c
+++ b/src/common/font.c
@@ -20,6 +20,9 @@ font_to_pango_desc(struct font *font)
 	if (font->slant == FONT_SLANT_ITALIC) {
 		pango_font_description_set_style(desc, PANGO_STYLE_ITALIC);
 	}
+	if (font->slant == FONT_SLANT_OBLIQUE) {
+		pango_font_description_set_style(desc, PANGO_STYLE_OBLIQUE);
+	}
 	if (font->weight == FONT_WEIGHT_BOLD) {
 		pango_font_description_set_weight(desc, PANGO_WEIGHT_BOLD);
 	}
@@ -40,6 +43,7 @@ font_extents(struct font *font, const char *string)
 	surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 1, 1);
 	c = cairo_create(surface);
 	layout = pango_cairo_create_layout(c);
+	pango_context_set_round_glyph_positions(pango_layout_get_context(layout), false);
 	PangoFontDescription *desc = font_to_pango_desc(font);
 
 	pango_layout_set_font_description(layout, desc);
@@ -105,7 +109,7 @@ font_buffer_create(struct lab_data_buffer **buffer, int max_width,
 	}
 
 	*buffer = buffer_create_cairo(text_extents.width + arrow_extents.width,
-			text_extents.height, scale, true);
+			text_extents.height, scale);
 	if (!*buffer) {
 		wlr_log(WLR_ERROR, "Failed to create font buffer");
 		return;
@@ -137,6 +141,7 @@ font_buffer_create(struct lab_data_buffer **buffer, int max_width,
 	cairo_move_to(cairo, 0, 0);
 
 	PangoLayout *layout = pango_cairo_create_layout(cairo);
+	pango_context_set_round_glyph_positions(pango_layout_get_context(layout), false);
 	pango_layout_set_width(layout, text_extents.width * PANGO_SCALE);
 	pango_layout_set_text(layout, text, -1);
 	pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END);
diff --git a/src/common/graphic-helpers.c b/src/common/graphic-helpers.c
index 5c754b30..106e9a36 100644
--- a/src/common/graphic-helpers.c
+++ b/src/common/graphic-helpers.c
@@ -14,6 +14,7 @@ static void
 multi_rect_destroy_notify(struct wl_listener *listener, void *data)
 {
 	struct multi_rect *rect = wl_container_of(listener, rect, destroy);
+	wl_list_remove(&rect->destroy.link);
 	free(rect);
 }
 
@@ -124,8 +125,8 @@ get_cairo_surface_from_lab_data_buffer(struct lab_data_buffer *buffer)
 	}
 
 	/* Handle DRM_FORMAT_ARGB8888 buffers */
-	int w = buffer->unscaled_width;
-	int h = buffer->unscaled_height;
+	int w = buffer->logical_width;
+	int h = buffer->logical_height;
 	cairo_surface_t *surface =
 		cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w, h);
 	if (!surface) {
diff --git a/src/common/meson.build b/src/common/meson.build
index 441e92c0..d369df4c 100644
--- a/src/common/meson.build
+++ b/src/common/meson.build
@@ -1,4 +1,6 @@
 labwc_sources += files(
+  'direction.c',
+  'box.c',
   'buf.c',
   'dir.c',
   'fd-util.c',
@@ -14,6 +16,7 @@ labwc_sources += files(
   'scaled-font-buffer.c',
   'scaled-scene-buffer.c',
   'scene-helpers.c',
+  'set.c',
   'surface-helpers.c',
   'spawn.c',
   'string-helpers.c',
diff --git a/src/common/scaled-font-buffer.c b/src/common/scaled-font-buffer.c
index f785e2e1..844aeaef 100644
--- a/src/common/scaled-font-buffer.c
+++ b/src/common/scaled-font-buffer.c
@@ -14,15 +14,19 @@
 static struct lab_data_buffer *
 _create_buffer(struct scaled_scene_buffer *scaled_buffer, double scale)
 {
-	struct lab_data_buffer *buffer;
+	struct lab_data_buffer *buffer = NULL;
 	struct scaled_font_buffer *self = scaled_buffer->data;
 
 	/* Buffer gets free'd automatically along the backing wlr_buffer */
 	font_buffer_create(&buffer, self->max_width, self->text,
 		&self->font, self->color, self->bg_color, self->arrow, scale);
 
-	self->width = buffer ? buffer->unscaled_width : 0;
-	self->height = buffer ? buffer->unscaled_height : 0;
+	if (!buffer) {
+		wlr_log(WLR_ERROR, "font_buffer_create() failed");
+	}
+
+	self->width = buffer ? buffer->logical_width : 0;
+	self->height = buffer ? buffer->logical_height : 0;
 	return buffer;
 }
 
diff --git a/src/common/scaled-scene-buffer.c b/src/common/scaled-scene-buffer.c
index 7c018ace..e6fd49da 100644
--- a/src/common/scaled-scene-buffer.c
+++ b/src/common/scaled-scene-buffer.c
@@ -72,8 +72,8 @@ _update_buffer(struct scaled_scene_buffer *self, double scale)
 		/* Ensure the buffer doesn't get deleted behind our back */
 		wlr_buffer_lock(&buffer->base);
 	}
-	self->width = buffer ? buffer->unscaled_width : 0;
-	self->height = buffer ? buffer->unscaled_height : 0;
+	self->width = buffer ? buffer->logical_width : 0;
+	self->height = buffer ? buffer->logical_height : 0;
 
 	/* Create or reuse cache entry */
 	if (wl_list_length(&self->cache) < LAB_SCALED_BUFFER_MAX_CACHE) {
diff --git a/src/common/scene-helpers.c b/src/common/scene-helpers.c
index 755d65d4..2d12d570 100644
--- a/src/common/scene-helpers.c
+++ b/src/common/scene-helpers.c
@@ -4,8 +4,12 @@
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_scene.h>
 #include <wlr/util/log.h>
+#include <wlr/util/region.h>
+#include <wlr/util/transform.h>
 #include "common/scene-helpers.h"
+#include "labwc.h"
 #include "magnifier.h"
+#include "output-state.h"
 
 struct wlr_surface *
 lab_wlr_surface_from_node(struct wlr_scene_node *node)
@@ -35,16 +39,54 @@ lab_wlr_scene_get_prev_node(struct wlr_scene_node *node)
 	return prev;
 }
 
+/*
+ * This is a slightly modified copy of scene_output_damage(),
+ * required to properly add the magnifier damage to scene_output
+ * ->damage_ring and scene_output->pending_commit_damage.
+ *
+ * The only difference is code style and removal of wlr_output_schedule_frame().
+ */
+static void
+scene_output_damage(struct wlr_scene_output *scene_output,
+		const pixman_region32_t *region)
+{
+	if (!wlr_damage_ring_add(&scene_output->damage_ring, region)) {
+		return;
+	}
+
+	struct wlr_output *output = scene_output->output;
+	enum wl_output_transform transform =
+		wlr_output_transform_invert(scene_output->output->transform);
+
+	int width = output->width;
+	int height = output->height;
+	if (transform & WL_OUTPUT_TRANSFORM_90) {
+		width = output->height;
+		height = output->width;
+	}
+
+	pixman_region32_t frame_damage;
+	pixman_region32_init(&frame_damage);
+	wlr_region_transform(&frame_damage, region, transform, width, height);
+
+	pixman_region32_union(&scene_output->pending_commit_damage,
+		&scene_output->pending_commit_damage, &frame_damage);
+	pixman_region32_intersect_rect(&scene_output->pending_commit_damage,
+		&scene_output->pending_commit_damage, 0, 0, output->width, output->height);
+	pixman_region32_fini(&frame_damage);
+}
+
 /*
  * This is a copy of wlr_scene_output_commit()
  * as it doesn't use the pending state at all.
  */
 bool
-lab_wlr_scene_output_commit(struct wlr_scene_output *scene_output)
+lab_wlr_scene_output_commit(struct wlr_scene_output *scene_output,
+		struct wlr_output_state *state)
 {
 	assert(scene_output);
+	assert(state);
 	struct wlr_output *wlr_output = scene_output->output;
-	struct wlr_output_state *state = &wlr_output->pending;
 	struct output *output = wlr_output->data;
 	bool wants_magnification = output_wants_magnification(output);
 
@@ -55,8 +97,8 @@ lab_wlr_scene_output_commit(struct wlr_scene_output *scene_output)
 	 * We also need to verify the necessity of wants_magnification.
 	 */
 	if (!wlr_output->needs_frame && !pixman_region32_not_empty(
-			&scene_output->damage_ring.current) && !wants_magnification) {
-		return false;
+			&scene_output->pending_commit_damage) && !wants_magnification) {
+		return true;
 	}
 
 	if (!wlr_scene_output_build_state(scene_output, state, NULL)) {
@@ -70,21 +112,26 @@ lab_wlr_scene_output_commit(struct wlr_scene_output *scene_output)
 		magnify(output, state->buffer, &additional_damage);
 	}
 
-	if (!wlr_output_commit(wlr_output)) {
-		wlr_log(WLR_INFO, "Failed to commit output %s",
+	if (state == &output->pending) {
+		if (!wlr_output_commit(wlr_output)) {
+			wlr_log(WLR_INFO, "Failed to commit output %s",
+				wlr_output->name);
+			return false;
+		}
+	} else if (!wlr_output_commit_state(wlr_output, state)) {
+		wlr_log(WLR_INFO, "Failed to commit state for output %s",
 			wlr_output->name);
 		return false;
 	}
-	/*
-	 * FIXME: Remove the following line as soon as
-	 * https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4253
-	 * is merged. At that point wlr_scene handles damage tracking internally
-	 * again.
-	 */
-	wlr_damage_ring_rotate(&scene_output->damage_ring);
 
 	if (!wlr_box_empty(&additional_damage)) {
-		wlr_damage_ring_add_box(&scene_output->damage_ring, &additional_damage);
+		pixman_region32_t region;
+		pixman_region32_init_rect(&region,
+			additional_damage.x, additional_damage.y,
+			additional_damage.width, additional_damage.height);
+		scene_output_damage(scene_output, &region);
+		pixman_region32_fini(&region);
 	}
+
 	return true;
 }
diff --git a/src/common/set.c b/src/common/set.c
new file mode 100644
index 00000000..ccaa6c49
--- /dev/null
+++ b/src/common/set.c
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: GPL-2.0-only
+#include <wlr/util/log.h>
+#include "common/set.h"
+
+bool
+lab_set_contains(struct lab_set *set, uint32_t value)
+{
+	for (int i = 0; i < set->size; ++i) {
+		if (set->values[i] == value) {
+			return true;
+		}
+	}
+	return false;
+}
+
+void
+lab_set_add(struct lab_set *set, uint32_t value)
+{
+	if (lab_set_contains(set, value)) {
+		return;
+	}
+	if (set->size >= LAB_SET_MAX_SIZE) {
+		wlr_log(WLR_ERROR, "lab_set size exceeded");
+		return;
+	}
+	set->values[set->size++] = value;
+}
+
+void
+lab_set_remove(struct lab_set *set, uint32_t value)
+{
+	bool shifting = false;
+
+	for (int i = 0; i < LAB_SET_MAX_SIZE; ++i) {
+		if (set->values[i] == value) {
+			--set->size;
+			shifting = true;
+		}
+		if (shifting) {
+			set->values[i] = i < LAB_SET_MAX_SIZE - 1
+				? set->values[i + 1] : 0;
+		}
+	}
+}
diff --git a/src/config/libinput.c b/src/config/libinput.c
index af4f1bd0..42ec647a 100644
--- a/src/config/libinput.c
+++ b/src/config/libinput.c
@@ -26,6 +26,7 @@ libinput_category_init(struct libinput_category *l)
 	l->click_method = -1;
 	l->send_events_mode = -1;
 	l->have_calibration_matrix = false;
+	l->scroll_factor = 1.0;
 }
 
 enum lab_libinput_device_type
diff --git a/src/config/meson.build b/src/config/meson.build
index de08f6d0..70b1baa3 100644
--- a/src/config/meson.build
+++ b/src/config/meson.build
@@ -5,5 +5,6 @@ labwc_sources += files(
   'mousebind.c',
   'touch.c',
   'tablet.c',
+  'tablet-tool.c',
   'libinput.c',
 )
diff --git a/src/config/mousebind.c b/src/config/mousebind.c
index 857012fd..19169d55 100644
--- a/src/config/mousebind.c
+++ b/src/config/mousebind.c
@@ -114,6 +114,12 @@ context_from_str(const char *str)
 		return LAB_SSD_BUTTON_ICONIFY;
 	} else if (!strcasecmp(str, "WindowMenu")) {
 		return LAB_SSD_BUTTON_WINDOW_MENU;
+	} else if (!strcasecmp(str, "Icon")) {
+		return LAB_SSD_BUTTON_WINDOW_ICON;
+	} else if (!strcasecmp(str, "Shade")) {
+		return LAB_SSD_BUTTON_SHADE;
+	} else if (!strcasecmp(str, "AllDesktops")) {
+		return LAB_SSD_BUTTON_OMNIPRESENT;
 	} else if (!strcasecmp(str, "Titlebar")) {
 		return LAB_SSD_PART_TITLEBAR;
 	} else if (!strcasecmp(str, "Title")) {
diff --git a/src/config/rcxml.c b/src/config/rcxml.c
index de240374..d6d9c76f 100644
--- a/src/config/rcxml.c
+++ b/src/config/rcxml.c
@@ -63,12 +63,15 @@ static struct window_rule *current_window_rule;
 static struct action *current_window_rule_action;
 static struct view_query *current_view_query;
 static struct action *current_child_action;
+/* for backword compatibility of <mouse><scrollFactor> */
+static double mouse_scroll_factor = -1;
 
 enum font_place {
 	FONT_PLACE_NONE = 0,
 	FONT_PLACE_UNKNOWN,
 	FONT_PLACE_ACTIVEWINDOW,
 	FONT_PLACE_INACTIVEWINDOW,
+	FONT_PLACE_MENUHEADER,
 	FONT_PLACE_MENUITEM,
 	FONT_PLACE_OSD,
 	/* TODO: Add all places based on Openbox's rc.xml */
@@ -116,6 +119,143 @@ parse_window_type(const char *type)
 	}
 }
 
+/*
+ * Openbox/labwc comparison
+ *
+ * Instead of openbox's <titleLayout>WLIMC</title> we use
+ *
+ *     <titlebar>
+ *       <layout>menu:iconfiy,max,close</layout>
+ *       <showTitle>yes|no</showTitle>
+ *     </titlebar>
+ *
+ * ...using the icon names (like iconify.xbm) without the file extension for the
+ * identifier.
+ *
+ * labwc        openbox     description
+ * -----        -------     -----------
+ * menu         W           Open window menu (client-menu)
+ * iconfiy      I           Iconify (aka minimize)
+ * max          M           Maximize toggle
+ * close        C           Close
+ * shade        S           Shade toggle
+ * desk         D           All-desktops toggle (aka omnipresent)
+ */
+static void
+fill_section(const char *content, struct wl_list *list)
+{
+	gchar **identifiers = g_strsplit(content, ",", -1);
+	for (size_t i = 0; identifiers[i]; ++i) {
+		char *identifier = identifiers[i];
+		if (string_null_or_empty(identifier)) {
+			continue;
+		}
+		enum ssd_part_type type = LAB_SSD_NONE;
+		if (!strcmp(identifier, "icon")) {
+			type = LAB_SSD_BUTTON_WINDOW_ICON;
+		} else if (!strcmp(identifier, "menu")) {
+			type = LAB_SSD_BUTTON_WINDOW_MENU;
+		} else if (!strcmp(identifier, "iconify")) {
+			type = LAB_SSD_BUTTON_ICONIFY;
+		} else if (!strcmp(identifier, "max")) {
+			type = LAB_SSD_BUTTON_MAXIMIZE;
+		} else if (!strcmp(identifier, "close")) {
+			type = LAB_SSD_BUTTON_CLOSE;
+		} else if (!strcmp(identifier, "shade")) {
+			type = LAB_SSD_BUTTON_SHADE;
+		} else if (!strcmp(identifier, "desk")) {
+			type = LAB_SSD_BUTTON_OMNIPRESENT;
+		} else {
+			wlr_log(WLR_ERROR, "invalid titleLayout identifier '%s'",
+				identifier);
+			continue;
+		}
+
+		assert(type != LAB_SSD_NONE);
+
+		struct title_button *item = znew(*item);
+		item->type = type;
+		wl_list_append(list, &item->link);
+	}
+	g_strfreev(identifiers);
+}
+
+static int
+compare_strings(const void *a, const void *b)
+{
+	char * const *str1 = a;
+	char * const *str2 = b;
+	return strcmp(*str1, *str2);
+}
+
+static bool
+contains_duplicates(char *content)
+{
+	bool ret = false;
+
+	/*
+	 * The string typically looks like: 'menu:iconfiy,max,close' so we have
+	 * to split on both ':' and ','.
+	 */
+	gchar **idents = g_strsplit_set(content, ",:", -1);
+
+	/*
+	 * We've got to have at least two for duplicates to exist. Bailing out
+	 * early here also enables the below algorithm which just iterates and
+	 * checks if previous item is the same.
+	 */
+	if (g_strv_length(idents) <= 1) {
+		goto out;
+	}
+
+	qsort(idents, g_strv_length(idents), sizeof(gchar *), compare_strings);
+	for (size_t i = 1; idents[i]; ++i) {
+		if (string_null_or_empty(idents[i])) {
+			continue;
+		}
+		if (!strcmp(idents[i], idents[i-1])) {
+			ret = true;
+			wlr_log(WLR_ERROR,
+				"titleLayout identifier '%s' is a duplicate",
+				idents[i]);
+			break;
+		}
+	}
+
+out:
+	g_strfreev(idents);
+	return ret;
+}
+
+static void
+fill_title_layout(char *content)
+{
+	if (contains_duplicates(content)) {
+		wlr_log(WLR_ERROR, "titleLayout contains duplicates");
+		return;
+	}
+
+	struct wl_list *sections[] = {
+		&rc.title_buttons_left,
+		&rc.title_buttons_right,
+	};
+
+	gchar **parts = g_strsplit(content, ":", -1);
+
+	if (g_strv_length(parts) != 2) {
+		wlr_log(WLR_ERROR, "<titlebar><layout> must contain one colon");
+		goto err;
+	}
+
+	for (size_t i = 0; parts[i]; ++i) {
+		fill_section(parts[i], sections[i]);
+	}
+
+	rc.title_layout_loaded = true;
+err:
+	g_strfreev(parts);
+}
+
 static void
 fill_usable_area_override(char *nodename, char *content)
 {
@@ -407,6 +547,8 @@ fill_keybind(char *nodename, char *content)
 		set_bool(content, &current_keybind->on_release);
 	} else if (!strcasecmp(nodename, "layoutDependent")) {
 		set_bool(content, &current_keybind->use_syms_only);
+	} else if (!strcasecmp(nodename, "allowWhenLocked")) {
+		set_bool(content, &current_keybind->allow_when_locked);
 	} else if (!strcmp(nodename, "name.action")) {
 		current_keybind_action = action_create(content);
 		if (current_keybind_action) {
@@ -679,6 +821,8 @@ fill_libinput_category(char *nodename, char *content)
 			current_libinput_category->have_calibration_matrix = false;
 		}
 		g_strfreev(elements);
+	} else if (!strcasecmp(nodename, "scrollFactor")) {
+		set_double(content, &current_libinput_category->scroll_factor);
 	}
 }
 
@@ -691,8 +835,13 @@ set_font_attr(struct font *font, const char *nodename, const char *content)
 	} else if (!strcmp(nodename, "size")) {
 		font->size = atoi(content);
 	} else if (!strcmp(nodename, "slant")) {
-		font->slant = !strcasecmp(content, "italic") ?
-			FONT_SLANT_ITALIC : FONT_SLANT_NORMAL;
+		if (!strcasecmp(content, "italic")) {
+			font->slant = FONT_SLANT_ITALIC;
+		} else if (!strcasecmp(content, "oblique")) {
+			font->slant = FONT_SLANT_OBLIQUE;
+		} else {
+			font->slant = FONT_SLANT_NORMAL;
+		}
 	} else if (!strcmp(nodename, "weight")) {
 		font->weight = !strcasecmp(content, "bold") ?
 			FONT_WEIGHT_BOLD : FONT_WEIGHT_NORMAL;
@@ -715,6 +864,7 @@ fill_font(char *nodename, char *content, enum font_place place)
 		 */
 		set_font_attr(&rc.font_activewindow, nodename, content);
 		set_font_attr(&rc.font_inactivewindow, nodename, content);
+		set_font_attr(&rc.font_menuheader, nodename, content);
 		set_font_attr(&rc.font_menuitem, nodename, content);
 		set_font_attr(&rc.font_osd, nodename, content);
 		break;
@@ -724,6 +874,9 @@ fill_font(char *nodename, char *content, enum font_place place)
 	case FONT_PLACE_INACTIVEWINDOW:
 		set_font_attr(&rc.font_inactivewindow, nodename, content);
 		break;
+	case FONT_PLACE_MENUHEADER:
+		set_font_attr(&rc.font_menuheader, nodename, content);
+		break;
 	case FONT_PLACE_MENUITEM:
 		set_font_attr(&rc.font_menuitem, nodename, content);
 		break;
@@ -748,6 +901,8 @@ enum_font_place(const char *place)
 		return FONT_PLACE_ACTIVEWINDOW;
 	} else if (!strcasecmp(place, "InactiveWindow")) {
 		return FONT_PLACE_INACTIVEWINDOW;
+	} else if (!strcasecmp(place, "MenuHeader")) {
+		return FONT_PLACE_MENUHEADER;
 	} else if (!strcasecmp(place, "MenuItem")) {
 		return FONT_PLACE_MENUITEM;
 	} else if (!strcasecmp(place, "OnScreenDisplay")
@@ -772,6 +927,20 @@ set_adaptive_sync_mode(const char *str, enum adaptive_sync_mode *variable)
 	}
 }
 
+static void
+set_tearing_mode(const char *str, enum tearing_mode *variable)
+{
+	if (!strcasecmp(str, "fullscreen")) {
+		*variable = LAB_TEARING_FULLSCREEN;
+	} else if (!strcasecmp(str, "fullscreenForced")) {
+		*variable = LAB_TEARING_FULLSCREEN_FORCED;
+	} else if (parse_bool(str, -1) == 1) {
+		*variable = LAB_TEARING_ENABLED;
+	} else {
+		*variable = LAB_TEARING_DISABLED;
+	}
+}
+
 static void
 entry(xmlNode *node, char *nodename, char *content)
 {
@@ -886,14 +1055,7 @@ entry(xmlNode *node, char *nodename, char *content)
 	} else if (!strcasecmp(nodename, "adaptiveSync.core")) {
 		set_adaptive_sync_mode(content, &rc.adaptive_sync);
 	} else if (!strcasecmp(nodename, "allowTearing.core")) {
-		set_bool(content, &rc.allow_tearing);
-		if (rc.allow_tearing) {
-			char *no_atomic_env = getenv("WLR_DRM_NO_ATOMIC");
-			if (!no_atomic_env || strcmp(no_atomic_env, "1") != 0) {
-				rc.allow_tearing = false;
-				wlr_log(WLR_ERROR, "tearing requires WLR_DRM_NO_ATOMIC=1");
-			}
-		}
+		set_tearing_mode(content, &rc.allow_tearing);
 	} else if (!strcasecmp(nodename, "reuseOutputMode.core")) {
 		set_bool(content, &rc.reuse_output_mode);
 	} else if (!strcmp(nodename, "policy.placement")) {
@@ -901,8 +1063,20 @@ entry(xmlNode *node, char *nodename, char *content)
 		if (rc.placement_policy == LAB_PLACE_INVALID) {
 			rc.placement_policy = LAB_PLACE_CENTER;
 		}
+	} else if (!strcasecmp(nodename, "xwaylandPersistence.core")) {
+		set_bool(content, &rc.xwayland_persistence);
+	} else if (!strcasecmp(nodename, "x.cascadeOffset.placement")) {
+		rc.placement_cascade_offset_x = atoi(content);
+	} else if (!strcasecmp(nodename, "y.cascadeOffset.placement")) {
+		rc.placement_cascade_offset_y = atoi(content);
 	} else if (!strcmp(nodename, "name.theme")) {
 		rc.theme_name = xstrdup(content);
+	} else if (!strcmp(nodename, "icon.theme")) {
+		rc.icon_theme_name = xstrdup(content);
+	} else if (!strcasecmp(nodename, "layout.titlebar.theme")) {
+		fill_title_layout(content);
+	} else if (!strcasecmp(nodename, "showTitle.titlebar.theme")) {
+		rc.show_title = parse_bool(content, true);
 	} else if (!strcmp(nodename, "cornerradius.theme")) {
 		rc.corner_radius = atoi(content);
 	} else if (!strcasecmp(nodename, "keepBorder.theme")) {
@@ -931,7 +1105,8 @@ entry(xmlNode *node, char *nodename, char *content)
 			wlr_log(WLR_ERROR, "invalid doubleClickTime");
 		}
 	} else if (!strcasecmp(nodename, "scrollFactor.mouse")) {
-		set_double(content, &rc.scroll_factor);
+		/* This is deprecated. Show an error message in post_processing() */
+		set_double(content, &mouse_scroll_factor);
 	} else if (!strcasecmp(nodename, "name.context.mouse")) {
 		current_mouse_context = content;
 		current_mousebind = NULL;
@@ -952,6 +1127,10 @@ entry(xmlNode *node, char *nodename, char *content)
 		rc.screen_edge_strength = atoi(content);
 	} else if (!strcasecmp(nodename, "windowEdgeStrength.resistance")) {
 		rc.window_edge_strength = atoi(content);
+	} else if (!strcasecmp(nodename, "unSnapThreshold.resistance")) {
+		rc.unsnap_threshold = atoi(content);
+	} else if (!strcasecmp(nodename, "unMaximizeThreshold.resistance")) {
+		rc.unmaximize_threshold = atoi(content);
 	} else if (!strcasecmp(nodename, "range.snapping")) {
 		rc.snap_edge_range = atoi(content);
 	} else if (!strcasecmp(nodename, "enabled.overlay.snapping")) {
@@ -1061,6 +1240,11 @@ entry(xmlNode *node, char *nodename, char *content)
 		} else {
 			wlr_log(WLR_ERROR, "Missing 'button' argument for tablet button mapping");
 		}
+	} else if (!strcasecmp(nodename, "motion.tabletTool")) {
+		rc.tablet_tool.motion = tablet_parse_motion(content);
+	} else if (!strcasecmp(nodename, "relativeMotionSensitivity.tabletTool")) {
+		rc.tablet_tool.relative_motion_sensitivity =
+			tablet_get_dbl_if_positive(content, "relativeMotionSensitivity");
 	} else if (!strcasecmp(nodename, "ignoreButtonReleasePeriod.menu")) {
 		rc.menu_ignore_button_release_period = atoi(content);
 	} else if (!strcasecmp(nodename, "width.magnifier")) {
@@ -1216,6 +1400,8 @@ rcxml_init(void)
 	static bool has_run;
 
 	if (!has_run) {
+		wl_list_init(&rc.title_buttons_left);
+		wl_list_init(&rc.title_buttons_right);
 		wl_list_init(&rc.usable_area_overrides);
 		wl_list_init(&rc.keybinds);
 		wl_list_init(&rc.mousebinds);
@@ -1229,14 +1415,25 @@ rcxml_init(void)
 	has_run = true;
 
 	rc.placement_policy = LAB_PLACE_CENTER;
+	rc.placement_cascade_offset_x = 0;
+	rc.placement_cascade_offset_y = 0;
 
 	rc.xdg_shell_server_side_deco = true;
+	rc.show_title = true;
+	rc.title_layout_loaded = false;
 	rc.ssd_keep_border = true;
 	rc.corner_radius = 8;
 	rc.shadows_enabled = false;
 
+	rc.gap = 0;
+	rc.adaptive_sync = LAB_ADAPTIVE_SYNC_DISABLED;
+	rc.allow_tearing = false;
+	rc.reuse_output_mode = false;
+	rc.xwayland_persistence = false;
+
 	init_font_defaults(&rc.font_activewindow);
 	init_font_defaults(&rc.font_inactivewindow);
+	init_font_defaults(&rc.font_menuheader);
 	init_font_defaults(&rc.font_menuitem);
 	init_font_defaults(&rc.font_osd);
 
@@ -1245,13 +1442,14 @@ rcxml_init(void)
 	rc.raise_on_focus = false;
 
 	rc.doubleclick_time = 500;
-	rc.scroll_factor = 1.0;
 
 	rc.tablet.force_mouse_emulation = false;
 	rc.tablet.output_name = NULL;
 	rc.tablet.rotation = 0;
 	rc.tablet.box = (struct wlr_fbox){0};
 	tablet_load_default_button_mappings();
+	rc.tablet_tool.motion = LAB_TABLET_MOTION_ABSOLUTE;
+	rc.tablet_tool.relative_motion_sensitivity = 1.0;
 
 	rc.repeat_rate = 25;
 	rc.repeat_delay = 600;
@@ -1259,6 +1457,8 @@ rcxml_init(void)
 	rc.kb_layout_per_window = false;
 	rc.screen_edge_strength = 20;
 	rc.window_edge_strength = 20;
+	rc.unsnap_threshold = 20;
+	rc.unmaximize_threshold = 150;
 
 	rc.snap_edge_range = 1;
 	rc.snap_overlay_enabled = true;
@@ -1463,6 +1663,10 @@ post_processing(void)
 		load_default_mouse_bindings();
 	}
 
+	if (!rc.title_layout_loaded) {
+		fill_title_layout("icon:iconify,max,close");
+	}
+
 	/*
 	 * Replace all earlier bindings by later ones
 	 * and clear the ones with an empty action list.
@@ -1479,6 +1683,9 @@ post_processing(void)
 	if (!rc.font_inactivewindow.name) {
 		rc.font_inactivewindow.name = xstrdup("sans");
 	}
+	if (!rc.font_menuheader.name) {
+		rc.font_menuheader.name = xstrdup("sans");
+	}
 	if (!rc.font_menuitem.name) {
 		rc.font_menuitem.name = xstrdup("sans");
 	}
@@ -1486,12 +1693,21 @@ post_processing(void)
 		rc.font_osd.name = xstrdup("sans");
 	}
 	if (!libinput_category_get_default()) {
-		/* So we still allow tap to click by default */
+		/* So we set default values of <tap> and <scrollFactor> */
 		struct libinput_category *l = libinput_category_create();
 		/* Prevents unused variable warning when compiled without asserts */
 		(void)l;
 		assert(l && libinput_category_get_default() == l);
 	}
+	if (mouse_scroll_factor >= 0) {
+		wlr_log(WLR_ERROR, "<mouse><scrollFactor> is deprecated"
+				" and overwrites <libinput><scrollFactor>."
+				" Use only <libinput><scrollFactor>.");
+		struct libinput_category *l;
+		wl_list_for_each(l, &rc.libinput_categories, link) {
+			l->scroll_factor = mouse_scroll_factor;
+		}
+	}
 
 	int nr_workspaces = wl_list_length(&rc.workspace_config.workspaces);
 	if (nr_workspaces < rc.workspace_config.min_nr_workspaces) {
@@ -1684,11 +1900,23 @@ rcxml_finish(void)
 {
 	zfree(rc.font_activewindow.name);
 	zfree(rc.font_inactivewindow.name);
+	zfree(rc.font_menuheader.name);
 	zfree(rc.font_menuitem.name);
 	zfree(rc.font_osd.name);
 	zfree(rc.theme_name);
+	zfree(rc.icon_theme_name);
 	zfree(rc.workspace_config.prefix);
 
+	struct title_button *p, *p_tmp;
+	wl_list_for_each_safe(p, p_tmp, &rc.title_buttons_left, link) {
+		wl_list_remove(&p->link);
+		zfree(p);
+	}
+	wl_list_for_each_safe(p, p_tmp, &rc.title_buttons_right, link) {
+		wl_list_remove(&p->link);
+		zfree(p);
+	}
+
 	struct usable_area_override *area, *area_tmp;
 	wl_list_for_each_safe(area, area_tmp, &rc.usable_area_overrides, link) {
 		wl_list_remove(&area->link);
@@ -1763,4 +1991,5 @@ rcxml_finish(void)
 	current_field = NULL;
 	current_window_rule = NULL;
 	current_window_rule_action = NULL;
+	mouse_scroll_factor = -1;
 }
diff --git a/src/config/session.c b/src/config/session.c
index db589434..3238369f 100644
--- a/src/config/session.c
+++ b/src/config/session.c
@@ -227,7 +227,7 @@ session_environment_init(void)
 	 * May be overridden either by already having a value set or by the user
 	 * supplied environment file.
 	 */
-	setenv("XDG_CURRENT_DESKTOP", "wlroots", 0);
+	setenv("XDG_CURRENT_DESKTOP", "labwc:wlroots", 0);
 
 	/*
 	 * Set default for _JAVA_AWT_WM_NONREPARENTING so that Java applications
@@ -261,8 +261,8 @@ session_environment_init(void)
 	paths_destroy(&paths);
 }
 
-static void
-run_session_script(const char *script)
+void
+session_run_script(const char *script)
 {
 	struct wl_list paths;
 	paths_config_create(&paths, script);
@@ -293,13 +293,13 @@ session_autostart_init(struct server *server)
 {
 	/* Update dbus and systemd user environment, each may fail gracefully */
 	update_activation_env(server, /* initialize */ true);
-	run_session_script("autostart");
+	session_run_script("autostart");
 }
 
 void
 session_shutdown(struct server *server)
 {
-	run_session_script("shutdown");
+	session_run_script("shutdown");
 
 	/* Clear the dbus and systemd user environment, each may fail gracefully */
 	update_activation_env(server, /* initialize */ false);
diff --git a/src/config/tablet-tool.c b/src/config/tablet-tool.c
new file mode 100644
index 00000000..7e171410
--- /dev/null
+++ b/src/config/tablet-tool.c
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: GPL-2.0-only
+#define _POSIX_C_SOURCE 200809L
+#include <strings.h>
+#include <wlr/util/log.h>
+#include "config/tablet-tool.h"
+
+enum motion
+tablet_parse_motion(const char *name)
+{
+	if (!strcasecmp(name, "Absolute")) {
+		return LAB_TABLET_MOTION_ABSOLUTE;
+	} else if (!strcasecmp(name, "Relative")) {
+		return LAB_TABLET_MOTION_RELATIVE;
+	}
+	wlr_log(WLR_ERROR, "Invalid value for tablet motion: %s", name);
+	return LAB_TABLET_MOTION_ABSOLUTE;
+}
diff --git a/src/debug.c b/src/debug.c
index d5750fea..7fb2672d 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -106,7 +106,7 @@ get_special(struct server *server, struct wlr_scene_node *node)
 	}
 	if (node->parent == server->view_tree) {
 		struct workspace *workspace;
-		wl_list_for_each(workspace, &server->workspaces, link) {
+		wl_list_for_each(workspace, &server->workspaces.all, link) {
 			if (&workspace->tree->node == node) {
 				return workspace->name;
 			}
diff --git a/src/decorations/xdg-deco.c b/src/decorations/xdg-deco.c
index c79964dd..97257ed4 100644
--- a/src/decorations/xdg-deco.c
+++ b/src/decorations/xdg-deco.c
@@ -7,9 +7,11 @@
 
 struct xdg_deco {
 	struct wlr_xdg_toplevel_decoration_v1 *wlr_xdg_decoration;
+	enum wlr_xdg_toplevel_decoration_v1_mode client_mode;
 	struct view *view;
 	struct wl_listener destroy;
 	struct wl_listener request_mode;
+	struct wl_listener surface_commit;
 };
 
 static void
@@ -18,9 +20,26 @@ xdg_deco_destroy(struct wl_listener *listener, void *data)
 	struct xdg_deco *xdg_deco = wl_container_of(listener, xdg_deco, destroy);
 	wl_list_remove(&xdg_deco->destroy.link);
 	wl_list_remove(&xdg_deco->request_mode.link);
+	if (xdg_deco->surface_commit.notify) {
+		wl_list_remove(&xdg_deco->surface_commit.link);
+		xdg_deco->surface_commit.notify = NULL;
+	}
 	free(xdg_deco);
 }
 
+static void
+handle_surface_commit(struct wl_listener *listener, void *data)
+{
+	struct xdg_deco *xdg_deco = wl_container_of(listener, xdg_deco, surface_commit);
+	struct wlr_xdg_toplevel_decoration_v1 *deco = xdg_deco->wlr_xdg_decoration;
+
+	if (deco->toplevel->base->initial_commit) {
+		wlr_xdg_toplevel_decoration_v1_set_mode(deco, xdg_deco->client_mode);
+		wl_list_remove(&xdg_deco->surface_commit.link);
+		xdg_deco->surface_commit.notify = NULL;
+	}
+}
+
 static void
 xdg_deco_request_mode(struct wl_listener *listener, void *data)
 {
@@ -46,8 +65,22 @@ xdg_deco_request_mode(struct wl_listener *listener, void *data)
 			"requested: %u", client_mode);
 	}
 
-	wlr_xdg_toplevel_decoration_v1_set_mode(xdg_deco->wlr_xdg_decoration,
-		client_mode);
+	/*
+	 * We may get multiple request_mode calls in an unitialized state.
+	 * Just update the last requested mode and only add the commit
+	 * handler on the first uninitialized state call.
+	 */
+	xdg_deco->client_mode = client_mode;
+
+	if (xdg_deco->wlr_xdg_decoration->toplevel->base->initialized) {
+		wlr_xdg_toplevel_decoration_v1_set_mode(xdg_deco->wlr_xdg_decoration,
+			client_mode);
+	} else if (!xdg_deco->surface_commit.notify) {
+		xdg_deco->surface_commit.notify = handle_surface_commit;
+		wl_signal_add(
+			&xdg_deco->wlr_xdg_decoration->toplevel->base->surface->events.commit,
+			&xdg_deco->surface_commit);
+	}
 	if (client_mode == WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE) {
 		view_set_ssd_mode(xdg_deco->view, LAB_SSD_MODE_FULL);
 	} else {
diff --git a/src/desktop.c b/src/desktop.c
index 2c0db207..fb2173d5 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -145,7 +145,7 @@ desktop_topmost_focusable_view(struct server *server)
 	struct view *view;
 	struct wl_list *node_list;
 	struct wlr_scene_node *node;
-	node_list = &server->workspace_current->tree->children;
+	node_list = &server->workspaces.current->tree->children;
 	wl_list_for_each_reverse(node, node_list, link) {
 		if (!node->data) {
 			/* We found some non-view, most likely the region overlay */
@@ -185,7 +185,7 @@ desktop_focus_output(struct output *output)
 	struct wlr_scene_node *node;
 	struct wlr_output_layout *layout = output->server->output_layout;
 	struct wl_list *list_head =
-		&output->server->workspace_current->tree->children;
+		&output->server->workspaces.current->tree->children;
 	wl_list_for_each_reverse(node, list_head, link) {
 		if (!node->data) {
 			continue;
@@ -197,10 +197,10 @@ desktop_focus_output(struct output *output)
 		if (wlr_output_layout_intersects(layout,
 				output->wlr_output, &view->current)) {
 			desktop_focus_view(view, /*raise*/ false);
-			wlr_cursor_warp(output->server->seat.cursor, NULL,
+			wlr_cursor_warp(view->server->seat.cursor, NULL,
 				view->current.x + view->current.width / 2,
 				view->current.y + view->current.height / 2);
-			cursor_update_focus(output->server);
+			cursor_update_focus(view->server);
 			return;
 		}
 	}
diff --git a/src/dnd.c b/src/dnd.c
index 04c016df..eeca114a 100644
--- a/src/dnd.c
+++ b/src/dnd.c
@@ -37,6 +37,7 @@ handle_drag_start(struct wl_listener *listener, void *data)
 	if (drag->icon) {
 		/* Cleans up automatically on drag->icon->events.destroy */
 		wlr_scene_drag_icon_create(seat->drag.icons, drag->icon);
+		wlr_scene_node_raise_to_top(&seat->drag.icons->node);
 		wlr_scene_node_set_enabled(&seat->drag.icons->node, true);
 	}
 	wl_signal_add(&drag->events.destroy, &seat->drag.events.destroy);
diff --git a/src/edges.c b/src/edges.c
index bd96c5a0..e0c6b295 100644
--- a/src/edges.c
+++ b/src/edges.c
@@ -5,6 +5,7 @@
 #include <wlr/util/edges.h>
 #include <wlr/util/box.h>
 #include "common/border.h"
+#include "common/box.h"
 #include "common/macros.h"
 #include "config/rcxml.h"
 #include "edges.h"
@@ -466,9 +467,8 @@ edges_find_outputs(struct border *nearest_edges, struct view *view,
 		struct wlr_box usable =
 			output_usable_area_in_layout_coords(o);
 
-		struct wlr_box ol;
-		if (!wlr_box_intersection(&ol, &origin, &usable) &&
-				!wlr_box_intersection(&ol, &target, &usable)) {
+		if (!box_intersects(&origin, &usable)
+				&& !box_intersects(&target, &usable)) {
 			continue;
 		}
 
@@ -515,7 +515,7 @@ edges_adjust_move_coords(struct view *view, struct border edges,
 
 	if (view_geom->x != *x) {
 		int lshift = border.left + rc.gap;
-		int rshift = border.right + rc.gap + view->pending.width;
+		int rshift = border.right + rc.gap + view_geom->width;
 
 		adjust_move_coords_1d(x, edges.left, lshift,
 			edges.right, rshift, *x < view_geom->x);
@@ -524,7 +524,7 @@ edges_adjust_move_coords(struct view *view, struct border edges,
 	if (view_geom->y != *y) {
 		int tshift = border.top + rc.gap;
 		int bshift = border.bottom + rc.gap
-			+ view_effective_height(view, /* use_pending */ true);
+			+ view_effective_height(view, use_pending);
 
 		adjust_move_coords_1d(y, edges.top, tshift,
 			edges.bottom, bshift, *y < view_geom->y);
diff --git a/src/icon-loader.c b/src/icon-loader.c
new file mode 100644
index 00000000..3d324211
--- /dev/null
+++ b/src/icon-loader.c
@@ -0,0 +1,298 @@
+// SPDX-License-Identifier: GPL-2.0-only
+#include <sfdo-desktop.h>
+#include <sfdo-icon.h>
+#include <sfdo-basedir.h>
+#include <string.h>
+#include <strings.h>
+#include <wlr/util/log.h>
+#include "common/macros.h"
+#include "common/mem.h"
+#include "common/string-helpers.h"
+#include "config.h"
+#include "icon-loader.h"
+#include "img/img-png.h"
+#include "img/img-xpm.h"
+
+#if HAVE_RSVG
+#include "img/img-svg.h"
+#endif
+
+#include "labwc.h"
+
+struct icon_loader {
+	struct sfdo_desktop_ctx *desktop_ctx;
+	struct sfdo_icon_ctx *icon_ctx;
+	struct sfdo_desktop_db *desktop_db;
+	struct sfdo_icon_theme *icon_theme;
+};
+
+static void
+log_handler(enum sfdo_log_level level, const char *fmt, va_list args, void *tag)
+{
+	/* add a prefix if the format length is reasonable */
+	char buf[256];
+	if (snprintf(buf, sizeof(buf), "[%s] %s", (const char *)tag, fmt)
+			< (int)sizeof(buf)) {
+		fmt = buf;
+	}
+	/* sfdo_log_level and wlr_log_importance are compatible */
+	_wlr_vlog((enum wlr_log_importance)level, fmt, args);
+}
+
+void
+icon_loader_init(struct server *server)
+{
+	struct icon_loader *loader = znew(*loader);
+
+	struct sfdo_basedir_ctx *basedir_ctx = sfdo_basedir_ctx_create();
+	if (!basedir_ctx) {
+		goto err_basedir_ctx;
+	}
+	loader->desktop_ctx = sfdo_desktop_ctx_create(basedir_ctx);
+	if (!loader->desktop_ctx) {
+		goto err_desktop_ctx;
+	}
+	loader->icon_ctx = sfdo_icon_ctx_create(basedir_ctx);
+	if (!loader->icon_ctx) {
+		goto err_icon_ctx;
+	}
+
+	/* sfdo_log_level and wlr_log_importance are compatible */
+	enum sfdo_log_level level =
+		(enum sfdo_log_level)wlr_log_get_verbosity();
+	sfdo_desktop_ctx_set_log_handler(
+		loader->desktop_ctx, level, log_handler, "sfdo-desktop");
+	sfdo_icon_ctx_set_log_handler(
+		loader->icon_ctx, level, log_handler, "sfdo-icon");
+
+	loader->desktop_db = sfdo_desktop_db_load(loader->desktop_ctx, NULL);
+	if (!loader->desktop_db) {
+		goto err_desktop_db;
+	}
+
+	/*
+	 * We set some relaxed load options to accommodate delinquent themes in
+	 * the wild, namely:
+	 *
+	 * - SFDO_ICON_THEME_LOAD_OPTION_ALLOW_MISSING to "impose less
+	 *   restrictions on the format of icon theme files"
+	 *
+	 * - SFDO_ICON_THEME_LOAD_OPTION_RELAXED to "continue loading even if it
+	 *   fails to find a theme or one of its dependencies."
+	 */
+	int load_options = SFDO_ICON_THEME_LOAD_OPTIONS_DEFAULT
+		| SFDO_ICON_THEME_LOAD_OPTION_ALLOW_MISSING
+		| SFDO_ICON_THEME_LOAD_OPTION_RELAXED;
+
+	loader->icon_theme = sfdo_icon_theme_load(loader->icon_ctx,
+		rc.icon_theme_name, load_options);
+	if (!loader->icon_theme) {
+		goto err_icon_theme;
+	}
+
+	/* basedir_ctx is not referenced by other objects */
+	sfdo_basedir_ctx_destroy(basedir_ctx);
+
+	server->icon_loader = loader;
+	return;
+
+err_icon_theme:
+	sfdo_desktop_db_destroy(loader->desktop_db);
+err_desktop_db:
+	sfdo_icon_ctx_destroy(loader->icon_ctx);
+err_icon_ctx:
+	sfdo_desktop_ctx_destroy(loader->desktop_ctx);
+err_desktop_ctx:
+	sfdo_basedir_ctx_destroy(basedir_ctx);
+err_basedir_ctx:
+	free(loader);
+	wlr_log(WLR_ERROR, "Failed to initialize icon loader");
+}
+
+void
+icon_loader_finish(struct server *server)
+{
+	struct icon_loader *loader = server->icon_loader;
+	if (!loader) {
+		return;
+	}
+
+	sfdo_desktop_db_destroy(loader->desktop_db);
+	sfdo_icon_ctx_destroy(loader->icon_ctx);
+	sfdo_desktop_ctx_destroy(loader->desktop_ctx);
+	free(loader);
+	server->icon_loader = NULL;
+}
+
+struct icon_ctx {
+	char *path;
+	enum sfdo_icon_file_format format;
+};
+
+/*
+ * Return the length of a filename minus any known extension
+ */
+static size_t
+length_without_extension(const char *name)
+{
+	size_t len = strlen(name);
+	if (len >= 4 && name[len - 4] == '.') {
+		const char *ext = &name[len - 3];
+		if (!strcmp(ext, "png") || !strcmp(ext, "svg")
+				|| !strcmp(ext, "xpm")) {
+			len -= 4;
+		}
+	}
+	return len;
+}
+
+/*
+ * Return 0 on success and -1 on error
+ * The calling function is responsible for free()ing ctx->path
+ */
+static int
+process_rel_name(struct icon_ctx *ctx, const char *icon_name,
+		struct icon_loader *loader, int size, int scale)
+{
+	int ret = 0;
+	int lookup_options = SFDO_ICON_THEME_LOOKUP_OPTIONS_DEFAULT;
+#if !HAVE_RSVG
+	lookup_options |= SFDO_ICON_THEME_LOOKUP_OPTION_NO_SVG;
+#endif
+
+	/*
+	 * Relative icon names are not supposed to include an extension,
+	 * but some .desktop files include one anyway. libsfdo does not
+	 * allow this in lookups, so strip the extension first.
+	 */
+	size_t name_len = length_without_extension(icon_name);
+	struct sfdo_icon_file *icon_file = sfdo_icon_theme_lookup(
+		loader->icon_theme, icon_name, name_len, size, scale,
+		lookup_options);
+	if (!icon_file || icon_file == SFDO_ICON_FILE_INVALID) {
+		ret = -1;
+		goto out;
+	}
+	ctx->path = xstrdup(sfdo_icon_file_get_path(icon_file, NULL));
+	ctx->format = sfdo_icon_file_get_format(icon_file);
+out:
+	sfdo_icon_file_destroy(icon_file);
+	return ret;
+}
+
+static int
+process_abs_name(struct icon_ctx *ctx, const char *icon_name)
+{
+	ctx->path = xstrdup(icon_name);
+	if (str_endswith(icon_name, ".png")) {
+		ctx->format = SFDO_ICON_FILE_FORMAT_PNG;
+	} else if (str_endswith(icon_name, ".svg")) {
+		ctx->format = SFDO_ICON_FILE_FORMAT_SVG;
+	} else if (str_endswith(icon_name, ".xpm")) {
+		ctx->format = SFDO_ICON_FILE_FORMAT_XPM;
+	} else {
+		goto err;
+	}
+	return 0;
+err:
+	wlr_log(WLR_ERROR, "'%s' has invalid file extension", icon_name);
+	free(ctx->path);
+	return -1;
+}
+
+/*
+ * Looks up an application desktop entry using fuzzy matching
+ * (e.g. "thunderbird" matches "org.mozilla.Thunderbird.desktop"
+ * and "XTerm" matches "xterm.desktop"). This is not per any spec
+ * but is needed to find icons for existing applications.
+ */
+static struct sfdo_desktop_entry *
+get_db_entry_by_id_fuzzy(struct sfdo_desktop_db *db, const char *app_id)
+{
+	size_t n_entries;
+	struct sfdo_desktop_entry **entries = sfdo_desktop_db_get_entries(db, &n_entries);
+
+	for (size_t i = 0; i < n_entries; i++) {
+		struct sfdo_desktop_entry *entry = entries[i];
+		const char *desktop_id = sfdo_desktop_entry_get_id(entry, NULL);
+		/* Get portion of desktop ID after last '.' */
+		const char *dot = strrchr(desktop_id, '.');
+		const char *desktop_id_base = dot ? (dot + 1) : desktop_id;
+
+		if (!strcasecmp(app_id, desktop_id_base)) {
+			return entry;
+		}
+
+		/* Try desktop entry's StartupWMClass also */
+		const char *wm_class =
+			sfdo_desktop_entry_get_startup_wm_class(entry, NULL);
+		if (wm_class && !strcasecmp(app_id, wm_class)) {
+			return entry;
+		}
+	}
+
+	return NULL;
+}
+
+struct lab_data_buffer *
+icon_loader_lookup(struct server *server, const char *app_id, int size,
+		float scale)
+{
+	struct icon_loader *loader = server->icon_loader;
+	if (!loader) {
+		return NULL;
+	}
+
+	const char *icon_name = NULL;
+	struct sfdo_desktop_entry *entry = sfdo_desktop_db_get_entry_by_id(
+		loader->desktop_db, app_id, SFDO_NT);
+	if (!entry) {
+		entry = get_db_entry_by_id_fuzzy(loader->desktop_db, app_id);
+	}
+	if (entry) {
+		icon_name = sfdo_desktop_entry_get_icon(entry, NULL);
+	}
+
+	/*
+	 * libsfdo doesn't support loading icons for fractional scales,
+	 * so round down and increase the icon size to compensate.
+	 */
+	int lookup_scale = MAX((int)scale, 1);
+	int lookup_size = lroundf(size * scale / lookup_scale);
+
+	struct icon_ctx ctx = {0};
+	int ret;
+	if (!icon_name) {
+		/* fall back to app id */
+		ret = process_rel_name(&ctx, app_id, loader, lookup_size, lookup_scale);
+	} else if (icon_name[0] == '/') {
+		ret = process_abs_name(&ctx, icon_name);
+	} else {
+		/* this should be the case for most icons */
+		ret = process_rel_name(&ctx, icon_name, loader, lookup_size, lookup_scale);
+	}
+	if (ret < 0) {
+		return NULL;
+	}
+
+	struct lab_data_buffer *icon_buffer = NULL;
+
+	wlr_log(WLR_DEBUG, "loading icon file %s", ctx.path);
+
+	switch (ctx.format) {
+	case SFDO_ICON_FILE_FORMAT_PNG:
+		img_png_load(ctx.path, &icon_buffer, size, scale);
+		break;
+	case SFDO_ICON_FILE_FORMAT_SVG:
+#if HAVE_RSVG
+		img_svg_load(ctx.path, &icon_buffer, size, scale);
+#endif
+		break;
+	case SFDO_ICON_FILE_FORMAT_XPM:
+		img_xpm_load(ctx.path, &icon_buffer, size, scale);
+		break;
+	}
+
+	free(ctx.path);
+	return icon_buffer;
+}
diff --git a/src/img/gen-color-table.pl b/src/img/gen-color-table.pl
new file mode 100755
index 00000000..e6ffa49a
--- /dev/null
+++ b/src/img/gen-color-table.pl
@@ -0,0 +1,80 @@
+#!/usr/bin/perl -w
+
+# Generates xpm-color-table.h from X11's rgb.txt
+# Adapted from gdk-pixbuf (LGPL-2.0-or-later)
+
+if (@ARGV != 1) {
+    die "Usage: gen-color-table.pl rgb.txt > xpm-color-table.h\n";
+}
+
+open IN, '<', $ARGV[0] or die "Cannot open $ARGV[0]: $!\n";
+
+@colors = ();
+while (<IN>) {
+    next if /^!/;
+    if (!/^\s*([0-9]+)\s+([0-9]+)\s+([0-9]+)\s+(.*\S)\s*$/) {
+	die "Cannot parse line $_";
+    }
+
+    push @colors, [$1, $2, $3, $4];
+}
+
+close IN or die "close IN failed: $!\n";
+
+@colors = sort { lc($a->[3]) cmp lc($b->[3]) } @colors;
+
+$offset = 0;
+
+$date = gmtime;
+
+print <<EOT;
+/* SPDX-License-Identifier: LGPL-2.0-or-later */
+/* xpm-color-table.h: Generated by gen-color-table.pl from rgb.txt
+ *
+ *  Date: $date
+ *
+ * Do not edit.
+ */
+static const char color_names[] =
+EOT
+
+for $color (@colors) {
+    $name = $color->[3];
+
+    if ($offset != 0) {
+	print qq(\n);
+    }
+    print qq(	"$name\\0");
+
+    $color->[4] = $offset;
+    $offset += length($name) + 1;
+}
+
+print ";\n\n";
+
+print <<EOT;
+struct xcolor_entry {
+	uint16_t name_offset;
+	uint8_t red;
+	uint8_t green;
+	uint8_t blue;
+};
+
+static const struct xcolor_entry xcolors[] = {
+EOT
+
+$i = 0;
+for $color (@colors) {
+    $red = $color->[0];
+    $green = $color->[1];
+    $blue = $color->[2];
+    $offset = $color->[4];
+
+    if ($i != 0) {
+	print ",\n";
+    }
+    print "	{ $offset, $red, $green, $blue }";
+    $i++;
+}
+
+print "\n};\n";
diff --git a/src/button/button-png.c b/src/img/img-png.c
similarity index 62%
rename from src/button/button-png.c
rename to src/img/img-png.c
index 2c700a06..cff84726 100644
--- a/src/button/button-png.c
+++ b/src/img/img-png.c
@@ -10,8 +10,7 @@
 #include <stdlib.h>
 #include <wlr/util/log.h>
 #include "buffer.h"
-#include "button/button-png.h"
-#include "button/common.h"
+#include "img/img-png.h"
 #include "common/string-helpers.h"
 #include "labwc.h"
 
@@ -44,34 +43,26 @@ ispng(const char *filename)
 #undef PNG_BYTES_TO_CHECK
 
 void
-button_png_load(const char *button_name, struct lab_data_buffer **buffer)
+img_png_load(const char *filename, struct lab_data_buffer **buffer, int size,
+		float scale)
 {
 	if (*buffer) {
 		wlr_buffer_drop(&(*buffer)->base);
 		*buffer = NULL;
 	}
-	if (string_null_or_empty(button_name)) {
+	if (string_null_or_empty(filename)) {
+		return;
+	}
+	if (!ispng(filename)) {
 		return;
 	}
 
-	char path[4096] = { 0 };
-	button_filename(button_name, path, sizeof(path));
-	if (!ispng(path)) {
-		return;
-	}
-
-	cairo_surface_t *image = cairo_image_surface_create_from_png(path);
+	cairo_surface_t *image = cairo_image_surface_create_from_png(filename);
 	if (cairo_surface_status(image)) {
-		wlr_log(WLR_ERROR, "error reading png button '%s'", path);
+		wlr_log(WLR_ERROR, "error reading png button '%s'", filename);
 		cairo_surface_destroy(image);
 		return;
 	}
-	cairo_surface_flush(image);
 
-	double w = cairo_image_surface_get_width(image);
-	double h = cairo_image_surface_get_height(image);
-	*buffer = buffer_create_cairo((int)w, (int)h, 1.0, true);
-	cairo_t *cairo = (*buffer)->cairo;
-	cairo_set_source_surface(cairo, image, 0, 0);
-	cairo_paint_with_alpha(cairo, 1.0);
+	*buffer = buffer_convert_cairo_surface_for_icon(image, size, scale);
 }
diff --git a/src/button/button-svg.c b/src/img/img-svg.c
similarity index 61%
rename from src/button/button-svg.c
rename to src/img/img-svg.c
index 2f27ea47..baab5faa 100644
--- a/src/button/button-svg.c
+++ b/src/img/img-svg.c
@@ -10,25 +10,18 @@
 #include <stdlib.h>
 #include <wlr/util/log.h>
 #include "buffer.h"
-#include "button/button-svg.h"
-#include "button/common.h"
+#include "img/img-svg.h"
 #include "common/string-helpers.h"
 #include "labwc.h"
 
 void
-button_svg_load(const char *button_name, struct lab_data_buffer **buffer,
-		int size)
+img_svg_load(const char *filename, struct lab_data_buffer **buffer, int size,
+		float scale)
 {
 	if (*buffer) {
 		wlr_buffer_drop(&(*buffer)->base);
 		*buffer = NULL;
 	}
-	if (string_null_or_empty(button_name)) {
-		return;
-	}
-
-	char filename[4096] = { 0 };
-	button_filename(button_name, filename, sizeof(filename));
 	if (string_null_or_empty(filename)) {
 		return;
 	}
@@ -46,8 +39,9 @@ button_svg_load(const char *button_name, struct lab_data_buffer **buffer,
 		return;
 	}
 
-	cairo_surface_t *image = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, size, size);
-	cairo_t *cr = cairo_create(image);
+	*buffer = buffer_create_cairo(size, size, scale);
+	cairo_surface_t *image = (*buffer)->surface;
+	cairo_t *cr = (*buffer)->cairo;
 
 	rsvg_handle_render_document(svg, cr, &viewport, &err);
 	if (err) {
@@ -62,15 +56,11 @@ button_svg_load(const char *button_name, struct lab_data_buffer **buffer,
 	}
 	cairo_surface_flush(image);
 
-	double w = cairo_image_surface_get_width(image);
-	double h = cairo_image_surface_get_height(image);
-	*buffer = buffer_create_cairo((int)w, (int)h, 1.0, /* free_on_destroy */ true);
-	cairo_t *cairo = (*buffer)->cairo;
-	cairo_set_source_surface(cairo, image, 0, 0);
-	cairo_paint_with_alpha(cairo, 1.0);
+	g_object_unref(svg);
+	return;
 
 error:
-	cairo_destroy(cr);
-	cairo_surface_destroy(image);
+	wlr_buffer_drop(&(*buffer)->base);
+	*buffer = NULL;
 	g_object_unref(svg);
 }
diff --git a/src/button/button-xbm.c b/src/img/img-xbm.c
similarity index 90%
rename from src/button/button-xbm.c
rename to src/img/img-xbm.c
index 94ad238a..af9c90ac 100644
--- a/src/button/button-xbm.c
+++ b/src/img/img-xbm.c
@@ -13,8 +13,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <drm_fourcc.h>
-#include "button/button-xbm.h"
-#include "button/common.h"
+#include "img/img-xbm.h"
 #include "common/grab-file.h"
 #include "common/mem.h"
 #include "common/string-helpers.h"
@@ -257,7 +256,7 @@ parse_xbm_builtin(const char *button, int size)
 }
 
 void
-button_xbm_from_bitmap(const char *bitmap, struct lab_data_buffer **buffer,
+img_xbm_from_bitmap(const char *bitmap, struct lab_data_buffer **buffer,
 		float *rgba)
 {
 	struct pixmap pixmap = {0};
@@ -267,12 +266,12 @@ button_xbm_from_bitmap(const char *bitmap, struct lab_data_buffer **buffer,
 	}
 	color = argb32(rgba);
 	pixmap = parse_xbm_builtin(bitmap, 6);
-	*buffer = buffer_create_wrap(pixmap.data, pixmap.width, pixmap.height,
-		pixmap.width * 4, /* free_on_destroy */ true);
+	*buffer = buffer_create_from_data(pixmap.data, pixmap.width, pixmap.height,
+		pixmap.width * 4);
 }
 
 void
-button_xbm_load(const char *button_name, struct lab_data_buffer **buffer,
+img_xbm_load(const char *filename, struct lab_data_buffer **buffer,
 		float *rgba)
 {
 	struct pixmap pixmap = {0};
@@ -280,14 +279,12 @@ button_xbm_load(const char *button_name, struct lab_data_buffer **buffer,
 		wlr_buffer_drop(&(*buffer)->base);
 		*buffer = NULL;
 	}
-	if (string_null_or_empty(button_name)) {
+	if (string_null_or_empty(filename)) {
 		return;
 	}
 	color = argb32(rgba);
 
 	/* Read file into memory as it's easier to tokenize that way */
-	char filename[4096] = { 0 };
-	button_filename(button_name, filename, sizeof(filename));
 	struct buf token_buf = grab_file(filename);
 	if (token_buf.len) {
 		struct token *tokens = tokenize_xbm(token_buf.data);
@@ -301,9 +298,9 @@ button_xbm_load(const char *button_name, struct lab_data_buffer **buffer,
 		return;
 	}
 
-	/* Create buffer with free_on_destroy being true */
+	/* Create buffer */
 	if (pixmap.data) {
-		*buffer = buffer_create_wrap(pixmap.data, pixmap.width,
-			pixmap.height, pixmap.width * 4, true);
+		*buffer = buffer_create_from_data(pixmap.data, pixmap.width,
+			pixmap.height, pixmap.width * 4);
 	}
 }
diff --git a/src/img/img-xpm.c b/src/img/img-xpm.c
new file mode 100644
index 00000000..3e6598d8
--- /dev/null
+++ b/src/img/img-xpm.c
@@ -0,0 +1,426 @@
+// SPDX-License-Identifier: LGPL-2.0-or-later
+/*
+ * XPM image loader adapted from gdk-pixbuf
+ *
+ * Copyright (C) 1999 Mark Crichton
+ * Copyright (C) 1999 The Free Software Foundation
+ *
+ * Authors: Mark Crichton <crichton@gimp.org>
+ *          Federico Mena-Quintero <federico@gimp.org>
+ *
+ * Adapted for labwc by John Lindgren, 2024
+ */
+
+#include <glib.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wlr/util/log.h>
+
+#include "buffer.h"
+#include "common/buf.h"
+#include "common/macros.h"
+#include "common/mem.h"
+#include "img/img-xpm.h"
+
+#include "xpm-color-table.h"
+
+enum buf_op { op_header, op_cmap, op_body };
+
+struct xpm_color {
+	char *color_string;
+	uint32_t argb;
+};
+
+struct file_handle {
+	FILE *infile;
+	struct buf buf;
+};
+
+static inline uint32_t
+make_argb(uint8_t a, uint8_t r, uint8_t g, uint8_t b)
+{
+	return ((uint32_t)a << 24) | ((uint32_t)r << 16) | ((uint32_t)g << 8) | b;
+}
+
+static int
+compare_xcolor_entries(const void *a, const void *b)
+{
+	return g_ascii_strcasecmp((const char *)a,
+		color_names + ((const struct xcolor_entry *)b)->name_offset);
+}
+
+static bool
+lookup_named_color(const char *name, uint32_t *argb)
+{
+	struct xcolor_entry *found = bsearch(name, xcolors, ARRAY_SIZE(xcolors),
+		sizeof(struct xcolor_entry), compare_xcolor_entries);
+	if (!found) {
+		return false;
+	}
+
+	*argb = make_argb(0xFF, found->red, found->green, found->blue);
+	return true;
+}
+
+static bool
+parse_color(const char *spec, uint32_t *argb)
+{
+	if (spec[0] != '#') {
+		return lookup_named_color(spec, argb);
+	}
+
+	int red, green, blue;
+	switch (strlen(spec + 1)) {
+	case 3:
+		if (sscanf(spec + 1, "%1x%1x%1x", &red, &green, &blue) != 3) {
+			return false;
+		}
+		*argb = make_argb(255, (red * 255) / 15, (green * 255) / 15,
+			(blue * 255) / 15);
+		return true;
+	case 6:
+		if (sscanf(spec + 1, "%2x%2x%2x", &red, &green, &blue) != 3) {
+			return false;
+		}
+		*argb = make_argb(255, red, green, blue);
+		return true;
+	case 9:
+		if (sscanf(spec + 1, "%3x%3x%3x", &red, &green, &blue) != 3) {
+			return false;
+		}
+		*argb = make_argb(255, (red * 255) / 4095, (green * 255) / 4095,
+			(blue * 255) / 4095);
+		return true;
+	case 12:
+		if (sscanf(spec + 1, "%4x%4x%4x", &red, &green, &blue) != 3) {
+			return false;
+		}
+		*argb = make_argb(255, (red * 255) / 65535,
+			(green * 255) / 65535, (blue * 255) / 65535);
+		return true;
+	default:
+		return false;
+	}
+}
+
+static bool
+xpm_seek_string(FILE *infile, const char *str)
+{
+	char instr[1024];
+
+	while (!feof(infile)) {
+		if (fscanf(infile, "%1023s", instr) < 0) {
+			return false;
+		}
+		if (strcmp(instr, str) == 0) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+static bool
+xpm_seek_char(FILE *infile, char c)
+{
+	int b, oldb;
+
+	while ((b = getc(infile)) != EOF) {
+		if (c != b && b == '/') {
+			b = getc(infile);
+			if (b == EOF) {
+				return false;
+			} else if (b == '*') { /* we have a comment */
+				b = -1;
+				do {
+					oldb = b;
+					b = getc(infile);
+					if (b == EOF) {
+						return false;
+					}
+				} while (!(oldb == '*' && b == '/'));
+			}
+		} else if (c == b) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+static bool
+xpm_read_string(FILE *infile, struct buf *buf)
+{
+	buf_clear(buf);
+	int c;
+
+	do {
+		c = getc(infile);
+		if (c == EOF) {
+			return false;
+		}
+	} while (c != '"');
+
+	while ((c = getc(infile)) != EOF) {
+		if (c == '"') {
+			return true;
+		}
+		buf_add_char(buf, c);
+	}
+
+	return false;
+}
+
+static uint32_t
+xpm_extract_color(const char *buffer)
+{
+	const char *p = buffer;
+	int new_key = 0;
+	int key = 0;
+	int current_key = 1;
+	char word[129], color[129], current_color[129];
+	char *r;
+
+	word[0] = '\0';
+	color[0] = '\0';
+	current_color[0] = '\0';
+	while (true) {
+		/* skip whitespace */
+		for (; *p != '\0' && g_ascii_isspace(*p); p++) {
+			/* nothing */
+		}
+		/* copy word */
+		for (r = word; *p != '\0' && !g_ascii_isspace(*p)
+				&& r - word < (int)sizeof(word) - 1;
+				p++, r++) {
+			*r = *p;
+		}
+		*r = '\0';
+		if (*word == '\0') {
+			if (color[0] == '\0') { /* incomplete colormap entry */
+				return 0;
+			} else { /* end of entry, still store the last color */
+				new_key = 1;
+			}
+		} else if (key > 0 && color[0] == '\0') {
+			/* next word must be a color name part */
+			new_key = 0;
+		} else {
+			if (strcmp(word, "c") == 0) {
+				new_key = 5;
+			} else if (strcmp(word, "g") == 0) {
+				new_key = 4;
+			} else if (strcmp(word, "g4") == 0) {
+				new_key = 3;
+			} else if (strcmp(word, "m") == 0) {
+				new_key = 2;
+			} else if (strcmp(word, "s") == 0) {
+				new_key = 1;
+			} else {
+				new_key = 0;
+			}
+		}
+		if (new_key == 0) {	/* word is a color name part */
+			if (key == 0) { /* key expected */
+				return 0;
+			}
+			/* accumulate color name */
+			int len = strlen(color);
+			if (len && len < (int)sizeof(color) - 1) {
+				color[len++] = ' ';
+			}
+			g_strlcpy(color + len, word, sizeof(color) - len);
+		} else { /* word is a key */
+			if (key > current_key) {
+				current_key = key;
+				g_strlcpy(current_color, color, sizeof(current_color));
+			}
+			color[0] = '\0';
+			key = new_key;
+			if (*p == '\0') {
+				break;
+			}
+		}
+	}
+
+	uint32_t argb;
+	if (current_key > 1 && (g_ascii_strcasecmp(current_color, "None") != 0)
+			&& parse_color(current_color, &argb)) {
+		return argb;
+	} else {
+		return 0;
+	}
+}
+
+static const char *
+file_buffer(enum buf_op op, struct file_handle *h)
+{
+	switch (op) {
+	case op_header:
+		if (!xpm_seek_string(h->infile, "XPM")) {
+			break;
+		}
+		if (!xpm_seek_char(h->infile, '{')) {
+			break;
+		}
+		/* Fall through to the next xpm_seek_char. */
+
+	case op_cmap:
+		xpm_seek_char(h->infile, '"');
+		if (fseek(h->infile, -1, SEEK_CUR) != 0) {
+			return NULL;
+		}
+		/* Fall through to the xpm_read_string. */
+
+	case op_body:
+		if (!xpm_read_string(h->infile, &h->buf)) {
+			return NULL;
+		}
+		return h->buf.data;
+
+	default:
+		g_assert_not_reached();
+	}
+
+	return NULL;
+}
+
+static cairo_surface_t *
+xpm_load_to_surface(struct file_handle *handle)
+{
+	const char *buffer = file_buffer(op_header, handle);
+	if (!buffer) {
+		wlr_log(WLR_DEBUG, "No XPM header found");
+		return NULL;
+	}
+
+	int w, h, n_col, cpp, x_hot, y_hot;
+	int items = sscanf(buffer, "%d %d %d %d %d %d", &w, &h, &n_col, &cpp,
+		&x_hot, &y_hot);
+
+	if (items != 4 && items != 6) {
+		wlr_log(WLR_DEBUG, "Invalid XPM header");
+		return NULL;
+	}
+
+	if (w <= 0) {
+		wlr_log(WLR_DEBUG, "XPM file has image width <= 0");
+		return NULL;
+	}
+	if (h <= 0) {
+		wlr_log(WLR_DEBUG, "XPM file has image height <= 0");
+		return NULL;
+	}
+	/* Limits (width, height, colors) modified for labwc */
+	if (h > 1024 || w > 1024) {
+		wlr_log(WLR_DEBUG, "XPM file is larger than 1024x1024");
+		return NULL;
+	}
+	if (cpp <= 0 || cpp >= 32) {
+		wlr_log(WLR_DEBUG, "XPM has invalid number of chars per pixel");
+		return NULL;
+	}
+	if (n_col <= 0 || n_col > 1024) {
+		wlr_log(WLR_DEBUG, "XPM file has invalid number of colors");
+		return NULL;
+	}
+
+	/* The hash is used for fast lookups of color from chars */
+	GHashTable *color_hash = g_hash_table_new(g_str_hash, g_str_equal);
+
+	char *name_buf = xzalloc(n_col * (cpp + 1));
+	struct xpm_color *colors = znew_n(struct xpm_color, n_col);
+	cairo_surface_t *surface = NULL;
+	struct xpm_color *fallbackcolor = NULL;
+	char pixel_str[32]; /* cpp < 32 */
+
+	for (int cnt = 0; cnt < n_col; cnt++) {
+		buffer = file_buffer(op_cmap, handle);
+		if (!buffer) {
+			wlr_log(WLR_DEBUG, "Cannot read XPM colormap");
+			goto out;
+		}
+
+		struct xpm_color *color = &colors[cnt];
+		color->color_string = &name_buf[cnt * (cpp + 1)];
+		g_strlcpy(color->color_string, buffer, cpp + 1);
+		buffer += strlen(color->color_string);
+
+		color->argb = xpm_extract_color(buffer);
+
+		g_hash_table_insert(color_hash, color->color_string, color);
+
+		if (cnt == 0) {
+			fallbackcolor = color;
+		}
+	}
+
+	surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w, h);
+	uint32_t *data = (uint32_t *)cairo_image_surface_get_data(surface);
+	int stride = cairo_image_surface_get_stride(surface) / sizeof(uint32_t);
+
+	for (int ycnt = 0; ycnt < h; ycnt++) {
+		uint32_t *pixtmp = data + stride * ycnt;
+		int wbytes = w * cpp;
+
+		buffer = file_buffer(op_body, handle);
+		if (!buffer || (strlen(buffer) < (size_t)wbytes)) {
+			/* Advertised width doesn't match pixels */
+			wlr_log(WLR_DEBUG, "Dimensions do not match data");
+			cairo_surface_destroy(surface);
+			surface = NULL;
+			goto out;
+		}
+
+		for (int n = 0, xcnt = 0; n < wbytes; n += cpp, xcnt++) {
+			g_strlcpy(pixel_str, &buffer[n], cpp + 1);
+
+			struct xpm_color *color =
+				g_hash_table_lookup(color_hash, pixel_str);
+
+			/* Bad XPM...punt */
+			if (!color) {
+				color = fallbackcolor;
+			}
+
+			*pixtmp++ = color->argb;
+		}
+	}
+	/* let cairo know pixel data has been modified */
+	cairo_surface_mark_dirty(surface);
+
+out:
+	g_hash_table_destroy(color_hash);
+	free(colors);
+	free(name_buf);
+	return surface;
+}
+
+void
+img_xpm_load(const char *filename, struct lab_data_buffer **buffer, int size,
+		float scale)
+{
+	if (*buffer) {
+		wlr_buffer_drop(&(*buffer)->base);
+		*buffer = NULL;
+	}
+
+	struct file_handle h = {0};
+	h.infile = fopen(filename, "rb");
+	if (!h.infile) {
+		wlr_log(WLR_ERROR, "error opening '%s'", filename);
+		return;
+	}
+
+	cairo_surface_t *surface = xpm_load_to_surface(&h);
+	if (surface) {
+		*buffer = buffer_convert_cairo_surface_for_icon(surface, size,
+			scale);
+	} else {
+		wlr_log(WLR_ERROR, "error loading '%s'", filename);
+	}
+
+	fclose(h.infile);
+	buf_reset(&h.buf);
+}
diff --git a/src/button/meson.build b/src/img/meson.build
similarity index 52%
rename from src/button/meson.build
rename to src/img/meson.build
index 2e587eaf..4e31ac04 100644
--- a/src/button/meson.build
+++ b/src/img/meson.build
@@ -1,12 +1,12 @@
 labwc_sources += files(
-  'button-png.c',
-  'button-xbm.c',
-  'common.c',
+  'img-png.c',
+  'img-xbm.c',
+  'img-xpm.c'
 )
 
 if have_rsvg
   labwc_sources += files(
-    'button-svg.c',
+    'img-svg.c',
   )
 endif
 
diff --git a/src/img/rgb.txt b/src/img/rgb.txt
new file mode 100644
index 00000000..70966437
--- /dev/null
+++ b/src/img/rgb.txt
@@ -0,0 +1,782 @@
+255 250 250		snow
+248 248 255		ghost white
+248 248 255		GhostWhite
+245 245 245		white smoke
+245 245 245		WhiteSmoke
+220 220 220		gainsboro
+255 250 240		floral white
+255 250 240		FloralWhite
+253 245 230		old lace
+253 245 230		OldLace
+250 240 230		linen
+250 235 215		antique white
+250 235 215		AntiqueWhite
+255 239 213		papaya whip
+255 239 213		PapayaWhip
+255 235 205		blanched almond
+255 235 205		BlanchedAlmond
+255 228 196		bisque
+255 218 185		peach puff
+255 218 185		PeachPuff
+255 222 173		navajo white
+255 222 173		NavajoWhite
+255 228 181		moccasin
+255 248 220		cornsilk
+255 255 240		ivory
+255 250 205		lemon chiffon
+255 250 205		LemonChiffon
+255 245 238		seashell
+240 255 240		honeydew
+245 255 250		mint cream
+245 255 250		MintCream
+240 255 255		azure
+240 248 255		alice blue
+240 248 255		AliceBlue
+230 230 250		lavender
+255 240 245		lavender blush
+255 240 245		LavenderBlush
+255 228 225		misty rose
+255 228 225		MistyRose
+255 255 255		white
+  0   0   0		black
+ 47  79  79		dark slate gray
+ 47  79  79		DarkSlateGray
+ 47  79  79		dark slate grey
+ 47  79  79		DarkSlateGrey
+105 105 105		dim gray
+105 105 105		DimGray
+105 105 105		dim grey
+105 105 105		DimGrey
+112 128 144		slate gray
+112 128 144		SlateGray
+112 128 144		slate grey
+112 128 144		SlateGrey
+119 136 153		light slate gray
+119 136 153		LightSlateGray
+119 136 153		light slate grey
+119 136 153		LightSlateGrey
+190 190 190		gray
+190 190 190		grey
+190 190 190		x11 gray
+190 190 190		X11Gray
+190 190 190		x11 grey
+190 190 190		X11Grey
+128 128 128		web gray
+128 128 128		WebGray
+128 128 128		web grey
+128 128 128		WebGrey
+211 211 211		light grey
+211 211 211		LightGrey
+211 211 211		light gray
+211 211 211		LightGray
+ 25  25 112		midnight blue
+ 25  25 112		MidnightBlue
+  0   0 128		navy
+  0   0 128		navy blue
+  0   0 128		NavyBlue
+100 149 237		cornflower blue
+100 149 237		CornflowerBlue
+ 72  61 139		dark slate blue
+ 72  61 139		DarkSlateBlue
+106  90 205		slate blue
+106  90 205		SlateBlue
+123 104 238		medium slate blue
+123 104 238		MediumSlateBlue
+132 112 255		light slate blue
+132 112 255		LightSlateBlue
+  0   0 205		medium blue
+  0   0 205		MediumBlue
+ 65 105 225		royal blue
+ 65 105 225		RoyalBlue
+  0   0 255		blue
+ 30 144 255		dodger blue
+ 30 144 255		DodgerBlue
+  0 191 255		deep sky blue
+  0 191 255		DeepSkyBlue
+135 206 235		sky blue
+135 206 235		SkyBlue
+135 206 250		light sky blue
+135 206 250		LightSkyBlue
+ 70 130 180		steel blue
+ 70 130 180		SteelBlue
+176 196 222		light steel blue
+176 196 222		LightSteelBlue
+173 216 230		light blue
+173 216 230		LightBlue
+176 224 230		powder blue
+176 224 230		PowderBlue
+175 238 238		pale turquoise
+175 238 238		PaleTurquoise
+  0 206 209		dark turquoise
+  0 206 209		DarkTurquoise
+ 72 209 204		medium turquoise
+ 72 209 204		MediumTurquoise
+ 64 224 208		turquoise
+  0 255 255		cyan
+  0 255 255		aqua
+224 255 255		light cyan
+224 255 255		LightCyan
+ 95 158 160		cadet blue
+ 95 158 160		CadetBlue
+102 205 170		medium aquamarine
+102 205 170		MediumAquamarine
+127 255 212		aquamarine
+  0 100   0		dark green
+  0 100   0		DarkGreen
+ 85 107  47		dark olive green
+ 85 107  47		DarkOliveGreen
+143 188 143		dark sea green
+143 188 143		DarkSeaGreen
+ 46 139  87		sea green
+ 46 139  87		SeaGreen
+ 60 179 113		medium sea green
+ 60 179 113		MediumSeaGreen
+ 32 178 170		light sea green
+ 32 178 170		LightSeaGreen
+152 251 152		pale green
+152 251 152		PaleGreen
+  0 255 127		spring green
+  0 255 127		SpringGreen
+124 252   0		lawn green
+124 252   0		LawnGreen
+  0 255   0		green
+  0 255   0		lime
+  0 255   0		x11 green
+  0 255   0		X11Green
+  0 128   0		web green
+  0 128   0		WebGreen
+127 255   0		chartreuse
+  0 250 154		medium spring green
+  0 250 154		MediumSpringGreen
+173 255  47		green yellow
+173 255  47		GreenYellow
+ 50 205  50		lime green
+ 50 205  50		LimeGreen
+154 205  50		yellow green
+154 205  50		YellowGreen
+ 34 139  34		forest green
+ 34 139  34		ForestGreen
+107 142  35		olive drab
+107 142  35		OliveDrab
+189 183 107		dark khaki
+189 183 107		DarkKhaki
+240 230 140		khaki
+238 232 170		pale goldenrod
+238 232 170		PaleGoldenrod
+250 250 210		light goldenrod yellow
+250 250 210		LightGoldenrodYellow
+255 255 224		light yellow
+255 255 224		LightYellow
+255 255   0		yellow
+255 215   0		gold
+238 221 130		light goldenrod
+238 221 130		LightGoldenrod
+218 165  32		goldenrod
+184 134  11		dark goldenrod
+184 134  11		DarkGoldenrod
+188 143 143		rosy brown
+188 143 143		RosyBrown
+205  92  92		indian red
+205  92  92		IndianRed
+139  69  19		saddle brown
+139  69  19		SaddleBrown
+160  82  45		sienna
+205 133  63		peru
+222 184 135		burlywood
+245 245 220		beige
+245 222 179		wheat
+244 164  96		sandy brown
+244 164  96		SandyBrown
+210 180 140		tan
+210 105  30		chocolate
+178  34  34		firebrick
+165  42  42		brown
+233 150 122		dark salmon
+233 150 122		DarkSalmon
+250 128 114		salmon
+255 160 122		light salmon
+255 160 122		LightSalmon
+255 165   0		orange
+255 140   0		dark orange
+255 140   0		DarkOrange
+255 127  80		coral
+240 128 128		light coral
+240 128 128		LightCoral
+255  99  71		tomato
+255  69   0		orange red
+255  69   0		OrangeRed
+255   0   0		red
+255 105 180		hot pink
+255 105 180		HotPink
+255  20 147		deep pink
+255  20 147		DeepPink
+255 192 203		pink
+255 182 193		light pink
+255 182 193		LightPink
+219 112 147		pale violet red
+219 112 147		PaleVioletRed
+176  48  96		maroon
+176  48  96		x11 maroon
+176  48  96		X11Maroon
+128   0   0		web maroon
+128   0   0		WebMaroon
+199  21 133		medium violet red
+199  21 133		MediumVioletRed
+208  32 144		violet red
+208  32 144		VioletRed
+255   0 255		magenta
+255   0 255		fuchsia
+238 130 238		violet
+221 160 221		plum
+218 112 214		orchid
+186  85 211		medium orchid
+186  85 211		MediumOrchid
+153  50 204		dark orchid
+153  50 204		DarkOrchid
+148   0 211		dark violet
+148   0 211		DarkViolet
+138  43 226		blue violet
+138  43 226		BlueViolet
+160  32 240		purple
+160  32 240		x11 purple
+160  32 240		X11Purple
+128   0 128		web purple
+128   0 128		WebPurple
+147 112 219		medium purple
+147 112 219		MediumPurple
+216 191 216		thistle
+255 250 250		snow1
+238 233 233		snow2
+205 201 201		snow3
+139 137 137		snow4
+255 245 238		seashell1
+238 229 222		seashell2
+205 197 191		seashell3
+139 134 130		seashell4
+255 239 219		AntiqueWhite1
+238 223 204		AntiqueWhite2
+205 192 176		AntiqueWhite3
+139 131 120		AntiqueWhite4
+255 228 196		bisque1
+238 213 183		bisque2
+205 183 158		bisque3
+139 125 107		bisque4
+255 218 185		PeachPuff1
+238 203 173		PeachPuff2
+205 175 149		PeachPuff3
+139 119 101		PeachPuff4
+255 222 173		NavajoWhite1
+238 207 161		NavajoWhite2
+205 179 139		NavajoWhite3
+139 121  94		NavajoWhite4
+255 250 205		LemonChiffon1
+238 233 191		LemonChiffon2
+205 201 165		LemonChiffon3
+139 137 112		LemonChiffon4
+255 248 220		cornsilk1
+238 232 205		cornsilk2
+205 200 177		cornsilk3
+139 136 120		cornsilk4
+255 255 240		ivory1
+238 238 224		ivory2
+205 205 193		ivory3
+139 139 131		ivory4
+240 255 240		honeydew1
+224 238 224		honeydew2
+193 205 193		honeydew3
+131 139 131		honeydew4
+255 240 245		LavenderBlush1
+238 224 229		LavenderBlush2
+205 193 197		LavenderBlush3
+139 131 134		LavenderBlush4
+255 228 225		MistyRose1
+238 213 210		MistyRose2
+205 183 181		MistyRose3
+139 125 123		MistyRose4
+240 255 255		azure1
+224 238 238		azure2
+193 205 205		azure3
+131 139 139		azure4
+131 111 255		SlateBlue1
+122 103 238		SlateBlue2
+105  89 205		SlateBlue3
+ 71  60 139		SlateBlue4
+ 72 118 255		RoyalBlue1
+ 67 110 238		RoyalBlue2
+ 58  95 205		RoyalBlue3
+ 39  64 139		RoyalBlue4
+  0   0 255		blue1
+  0   0 238		blue2
+  0   0 205		blue3
+  0   0 139		blue4
+ 30 144 255		DodgerBlue1
+ 28 134 238		DodgerBlue2
+ 24 116 205		DodgerBlue3
+ 16  78 139		DodgerBlue4
+ 99 184 255		SteelBlue1
+ 92 172 238		SteelBlue2
+ 79 148 205		SteelBlue3
+ 54 100 139		SteelBlue4
+  0 191 255		DeepSkyBlue1
+  0 178 238		DeepSkyBlue2
+  0 154 205		DeepSkyBlue3
+  0 104 139		DeepSkyBlue4
+135 206 255		SkyBlue1
+126 192 238		SkyBlue2
+108 166 205		SkyBlue3
+ 74 112 139		SkyBlue4
+176 226 255		LightSkyBlue1
+164 211 238		LightSkyBlue2
+141 182 205		LightSkyBlue3
+ 96 123 139		LightSkyBlue4
+198 226 255		SlateGray1
+185 211 238		SlateGray2
+159 182 205		SlateGray3
+108 123 139		SlateGray4
+202 225 255		LightSteelBlue1
+188 210 238		LightSteelBlue2
+162 181 205		LightSteelBlue3
+110 123 139		LightSteelBlue4
+191 239 255		LightBlue1
+178 223 238		LightBlue2
+154 192 205		LightBlue3
+104 131 139		LightBlue4
+224 255 255		LightCyan1
+209 238 238		LightCyan2
+180 205 205		LightCyan3
+122 139 139		LightCyan4
+187 255 255		PaleTurquoise1
+174 238 238		PaleTurquoise2
+150 205 205		PaleTurquoise3
+102 139 139		PaleTurquoise4
+152 245 255		CadetBlue1
+142 229 238		CadetBlue2
+122 197 205		CadetBlue3
+ 83 134 139		CadetBlue4
+  0 245 255		turquoise1
+  0 229 238		turquoise2
+  0 197 205		turquoise3
+  0 134 139		turquoise4
+  0 255 255		cyan1
+  0 238 238		cyan2
+  0 205 205		cyan3
+  0 139 139		cyan4
+151 255 255		DarkSlateGray1
+141 238 238		DarkSlateGray2
+121 205 205		DarkSlateGray3
+ 82 139 139		DarkSlateGray4
+127 255 212		aquamarine1
+118 238 198		aquamarine2
+102 205 170		aquamarine3
+ 69 139 116		aquamarine4
+193 255 193		DarkSeaGreen1
+180 238 180		DarkSeaGreen2
+155 205 155		DarkSeaGreen3
+105 139 105		DarkSeaGreen4
+ 84 255 159		SeaGreen1
+ 78 238 148		SeaGreen2
+ 67 205 128		SeaGreen3
+ 46 139  87		SeaGreen4
+154 255 154		PaleGreen1
+144 238 144		PaleGreen2
+124 205 124		PaleGreen3
+ 84 139  84		PaleGreen4
+  0 255 127		SpringGreen1
+  0 238 118		SpringGreen2
+  0 205 102		SpringGreen3
+  0 139  69		SpringGreen4
+  0 255   0		green1
+  0 238   0		green2
+  0 205   0		green3
+  0 139   0		green4
+127 255   0		chartreuse1
+118 238   0		chartreuse2
+102 205   0		chartreuse3
+ 69 139   0		chartreuse4
+192 255  62		OliveDrab1
+179 238  58		OliveDrab2
+154 205  50		OliveDrab3
+105 139  34		OliveDrab4
+202 255 112		DarkOliveGreen1
+188 238 104		DarkOliveGreen2
+162 205  90		DarkOliveGreen3
+110 139  61		DarkOliveGreen4
+255 246 143		khaki1
+238 230 133		khaki2
+205 198 115		khaki3
+139 134  78		khaki4
+255 236 139		LightGoldenrod1
+238 220 130		LightGoldenrod2
+205 190 112		LightGoldenrod3
+139 129  76		LightGoldenrod4
+255 255 224		LightYellow1
+238 238 209		LightYellow2
+205 205 180		LightYellow3
+139 139 122		LightYellow4
+255 255   0		yellow1
+238 238   0		yellow2
+205 205   0		yellow3
+139 139   0		yellow4
+255 215   0		gold1
+238 201   0		gold2
+205 173   0		gold3
+139 117   0		gold4
+255 193  37		goldenrod1
+238 180  34		goldenrod2
+205 155  29		goldenrod3
+139 105  20		goldenrod4
+255 185  15		DarkGoldenrod1
+238 173  14		DarkGoldenrod2
+205 149  12		DarkGoldenrod3
+139 101   8		DarkGoldenrod4
+255 193 193		RosyBrown1
+238 180 180		RosyBrown2
+205 155 155		RosyBrown3
+139 105 105		RosyBrown4
+255 106 106		IndianRed1
+238  99  99		IndianRed2
+205  85  85		IndianRed3
+139  58  58		IndianRed4
+255 130  71		sienna1
+238 121  66		sienna2
+205 104  57		sienna3
+139  71  38		sienna4
+255 211 155		burlywood1
+238 197 145		burlywood2
+205 170 125		burlywood3
+139 115  85		burlywood4
+255 231 186		wheat1
+238 216 174		wheat2
+205 186 150		wheat3
+139 126 102		wheat4
+255 165  79		tan1
+238 154  73		tan2
+205 133  63		tan3
+139  90  43		tan4
+255 127  36		chocolate1
+238 118  33		chocolate2
+205 102  29		chocolate3
+139  69  19		chocolate4
+255  48  48		firebrick1
+238  44  44		firebrick2
+205  38  38		firebrick3
+139  26  26		firebrick4
+255  64  64		brown1
+238  59  59		brown2
+205  51  51		brown3
+139  35  35		brown4
+255 140 105		salmon1
+238 130  98		salmon2
+205 112  84		salmon3
+139  76  57		salmon4
+255 160 122		LightSalmon1
+238 149 114		LightSalmon2
+205 129  98		LightSalmon3
+139  87  66		LightSalmon4
+255 165   0		orange1
+238 154   0		orange2
+205 133   0		orange3
+139  90   0		orange4
+255 127   0		DarkOrange1
+238 118   0		DarkOrange2
+205 102   0		DarkOrange3
+139  69   0		DarkOrange4
+255 114  86		coral1
+238 106  80		coral2
+205  91  69		coral3
+139  62  47		coral4
+255  99  71		tomato1
+238  92  66		tomato2
+205  79  57		tomato3
+139  54  38		tomato4
+255  69   0		OrangeRed1
+238  64   0		OrangeRed2
+205  55   0		OrangeRed3
+139  37   0		OrangeRed4
+255   0   0		red1
+238   0   0		red2
+205   0   0		red3
+139   0   0		red4
+255  20 147		DeepPink1
+238  18 137		DeepPink2
+205  16 118		DeepPink3
+139  10  80		DeepPink4
+255 110 180		HotPink1
+238 106 167		HotPink2
+205  96 144		HotPink3
+139  58  98		HotPink4
+255 181 197		pink1
+238 169 184		pink2
+205 145 158		pink3
+139  99 108		pink4
+255 174 185		LightPink1
+238 162 173		LightPink2
+205 140 149		LightPink3
+139  95 101		LightPink4
+255 130 171		PaleVioletRed1
+238 121 159		PaleVioletRed2
+205 104 137		PaleVioletRed3
+139  71  93		PaleVioletRed4
+255  52 179		maroon1
+238  48 167		maroon2
+205  41 144		maroon3
+139  28  98		maroon4
+255  62 150		VioletRed1
+238  58 140		VioletRed2
+205  50 120		VioletRed3
+139  34  82		VioletRed4
+255   0 255		magenta1
+238   0 238		magenta2
+205   0 205		magenta3
+139   0 139		magenta4
+255 131 250		orchid1
+238 122 233		orchid2
+205 105 201		orchid3
+139  71 137		orchid4
+255 187 255		plum1
+238 174 238		plum2
+205 150 205		plum3
+139 102 139		plum4
+224 102 255		MediumOrchid1
+209  95 238		MediumOrchid2
+180  82 205		MediumOrchid3
+122  55 139		MediumOrchid4
+191  62 255		DarkOrchid1
+178  58 238		DarkOrchid2
+154  50 205		DarkOrchid3
+104  34 139		DarkOrchid4
+155  48 255		purple1
+145  44 238		purple2
+125  38 205		purple3
+ 85  26 139		purple4
+171 130 255		MediumPurple1
+159 121 238		MediumPurple2
+137 104 205		MediumPurple3
+ 93  71 139		MediumPurple4
+255 225 255		thistle1
+238 210 238		thistle2
+205 181 205		thistle3
+139 123 139		thistle4
+  0   0   0		gray0
+  0   0   0		grey0
+  3   3   3		gray1
+  3   3   3		grey1
+  5   5   5		gray2
+  5   5   5		grey2
+  8   8   8		gray3
+  8   8   8		grey3
+ 10  10  10		gray4
+ 10  10  10		grey4
+ 13  13  13		gray5
+ 13  13  13		grey5
+ 15  15  15		gray6
+ 15  15  15		grey6
+ 18  18  18		gray7
+ 18  18  18		grey7
+ 20  20  20		gray8
+ 20  20  20		grey8
+ 23  23  23		gray9
+ 23  23  23		grey9
+ 26  26  26		gray10
+ 26  26  26		grey10
+ 28  28  28		gray11
+ 28  28  28		grey11
+ 31  31  31		gray12
+ 31  31  31		grey12
+ 33  33  33		gray13
+ 33  33  33		grey13
+ 36  36  36		gray14
+ 36  36  36		grey14
+ 38  38  38		gray15
+ 38  38  38		grey15
+ 41  41  41		gray16
+ 41  41  41		grey16
+ 43  43  43		gray17
+ 43  43  43		grey17
+ 46  46  46		gray18
+ 46  46  46		grey18
+ 48  48  48		gray19
+ 48  48  48		grey19
+ 51  51  51		gray20
+ 51  51  51		grey20
+ 54  54  54		gray21
+ 54  54  54		grey21
+ 56  56  56		gray22
+ 56  56  56		grey22
+ 59  59  59		gray23
+ 59  59  59		grey23
+ 61  61  61		gray24
+ 61  61  61		grey24
+ 64  64  64		gray25
+ 64  64  64		grey25
+ 66  66  66		gray26
+ 66  66  66		grey26
+ 69  69  69		gray27
+ 69  69  69		grey27
+ 71  71  71		gray28
+ 71  71  71		grey28
+ 74  74  74		gray29
+ 74  74  74		grey29
+ 77  77  77		gray30
+ 77  77  77		grey30
+ 79  79  79		gray31
+ 79  79  79		grey31
+ 82  82  82		gray32
+ 82  82  82		grey32
+ 84  84  84		gray33
+ 84  84  84		grey33
+ 87  87  87		gray34
+ 87  87  87		grey34
+ 89  89  89		gray35
+ 89  89  89		grey35
+ 92  92  92		gray36
+ 92  92  92		grey36
+ 94  94  94		gray37
+ 94  94  94		grey37
+ 97  97  97		gray38
+ 97  97  97		grey38
+ 99  99  99		gray39
+ 99  99  99		grey39
+102 102 102		gray40
+102 102 102		grey40
+105 105 105		gray41
+105 105 105		grey41
+107 107 107		gray42
+107 107 107		grey42
+110 110 110		gray43
+110 110 110		grey43
+112 112 112		gray44
+112 112 112		grey44
+115 115 115		gray45
+115 115 115		grey45
+117 117 117		gray46
+117 117 117		grey46
+120 120 120		gray47
+120 120 120		grey47
+122 122 122		gray48
+122 122 122		grey48
+125 125 125		gray49
+125 125 125		grey49
+127 127 127		gray50
+127 127 127		grey50
+130 130 130		gray51
+130 130 130		grey51
+133 133 133		gray52
+133 133 133		grey52
+135 135 135		gray53
+135 135 135		grey53
+138 138 138		gray54
+138 138 138		grey54
+140 140 140		gray55
+140 140 140		grey55
+143 143 143		gray56
+143 143 143		grey56
+145 145 145		gray57
+145 145 145		grey57
+148 148 148		gray58
+148 148 148		grey58
+150 150 150		gray59
+150 150 150		grey59
+153 153 153		gray60
+153 153 153		grey60
+156 156 156		gray61
+156 156 156		grey61
+158 158 158		gray62
+158 158 158		grey62
+161 161 161		gray63
+161 161 161		grey63
+163 163 163		gray64
+163 163 163		grey64
+166 166 166		gray65
+166 166 166		grey65
+168 168 168		gray66
+168 168 168		grey66
+171 171 171		gray67
+171 171 171		grey67
+173 173 173		gray68
+173 173 173		grey68
+176 176 176		gray69
+176 176 176		grey69
+179 179 179		gray70
+179 179 179		grey70
+181 181 181		gray71
+181 181 181		grey71
+184 184 184		gray72
+184 184 184		grey72
+186 186 186		gray73
+186 186 186		grey73
+189 189 189		gray74
+189 189 189		grey74
+191 191 191		gray75
+191 191 191		grey75
+194 194 194		gray76
+194 194 194		grey76
+196 196 196		gray77
+196 196 196		grey77
+199 199 199		gray78
+199 199 199		grey78
+201 201 201		gray79
+201 201 201		grey79
+204 204 204		gray80
+204 204 204		grey80
+207 207 207		gray81
+207 207 207		grey81
+209 209 209		gray82
+209 209 209		grey82
+212 212 212		gray83
+212 212 212		grey83
+214 214 214		gray84
+214 214 214		grey84
+217 217 217		gray85
+217 217 217		grey85
+219 219 219		gray86
+219 219 219		grey86
+222 222 222		gray87
+222 222 222		grey87
+224 224 224		gray88
+224 224 224		grey88
+227 227 227		gray89
+227 227 227		grey89
+229 229 229		gray90
+229 229 229		grey90
+232 232 232		gray91
+232 232 232		grey91
+235 235 235		gray92
+235 235 235		grey92
+237 237 237		gray93
+237 237 237		grey93
+240 240 240		gray94
+240 240 240		grey94
+242 242 242		gray95
+242 242 242		grey95
+245 245 245		gray96
+245 245 245		grey96
+247 247 247		gray97
+247 247 247		grey97
+250 250 250		gray98
+250 250 250		grey98
+252 252 252		gray99
+252 252 252		grey99
+255 255 255		gray100
+255 255 255		grey100
+169 169 169		dark grey
+169 169 169		DarkGrey
+169 169 169		dark gray
+169 169 169		DarkGray
+  0   0 139		dark blue
+  0   0 139		DarkBlue
+  0 139 139		dark cyan
+  0 139 139		DarkCyan
+139   0 139		dark magenta
+139   0 139		DarkMagenta
+139   0   0		dark red
+139   0   0		DarkRed
+144 238 144		light green
+144 238 144		LightGreen
+220  20  60		crimson
+ 75   0 130		indigo
+128 128   0		olive
+102  51 153		rebecca purple
+102  51 153		RebeccaPurple
+192 192 192		silver
+  0 128 128		teal
diff --git a/src/img/xpm-color-table.h b/src/img/xpm-color-table.h
new file mode 100644
index 00000000..cf3bfc1d
--- /dev/null
+++ b/src/img/xpm-color-table.h
@@ -0,0 +1,1582 @@
+/* SPDX-License-Identifier: LGPL-2.0-or-later */
+/* xpm-color-table.h: Generated by gen-color-table.pl from rgb.txt
+ *
+ *  Date: Mon Sep 30 09:04:01 2024
+ *
+ * Do not edit.
+ */
+static const char color_names[] =
+	"alice blue\0"
+	"AliceBlue\0"
+	"antique white\0"
+	"AntiqueWhite\0"
+	"AntiqueWhite1\0"
+	"AntiqueWhite2\0"
+	"AntiqueWhite3\0"
+	"AntiqueWhite4\0"
+	"aqua\0"
+	"aquamarine\0"
+	"aquamarine1\0"
+	"aquamarine2\0"
+	"aquamarine3\0"
+	"aquamarine4\0"
+	"azure\0"
+	"azure1\0"
+	"azure2\0"
+	"azure3\0"
+	"azure4\0"
+	"beige\0"
+	"bisque\0"
+	"bisque1\0"
+	"bisque2\0"
+	"bisque3\0"
+	"bisque4\0"
+	"black\0"
+	"blanched almond\0"
+	"BlanchedAlmond\0"
+	"blue\0"
+	"blue violet\0"
+	"blue1\0"
+	"blue2\0"
+	"blue3\0"
+	"blue4\0"
+	"BlueViolet\0"
+	"brown\0"
+	"brown1\0"
+	"brown2\0"
+	"brown3\0"
+	"brown4\0"
+	"burlywood\0"
+	"burlywood1\0"
+	"burlywood2\0"
+	"burlywood3\0"
+	"burlywood4\0"
+	"cadet blue\0"
+	"CadetBlue\0"
+	"CadetBlue1\0"
+	"CadetBlue2\0"
+	"CadetBlue3\0"
+	"CadetBlue4\0"
+	"chartreuse\0"
+	"chartreuse1\0"
+	"chartreuse2\0"
+	"chartreuse3\0"
+	"chartreuse4\0"
+	"chocolate\0"
+	"chocolate1\0"
+	"chocolate2\0"
+	"chocolate3\0"
+	"chocolate4\0"
+	"coral\0"
+	"coral1\0"
+	"coral2\0"
+	"coral3\0"
+	"coral4\0"
+	"cornflower blue\0"
+	"CornflowerBlue\0"
+	"cornsilk\0"
+	"cornsilk1\0"
+	"cornsilk2\0"
+	"cornsilk3\0"
+	"cornsilk4\0"
+	"crimson\0"
+	"cyan\0"
+	"cyan1\0"
+	"cyan2\0"
+	"cyan3\0"
+	"cyan4\0"
+	"dark blue\0"
+	"dark cyan\0"
+	"dark goldenrod\0"
+	"dark gray\0"
+	"dark green\0"
+	"dark grey\0"
+	"dark khaki\0"
+	"dark magenta\0"
+	"dark olive green\0"
+	"dark orange\0"
+	"dark orchid\0"
+	"dark red\0"
+	"dark salmon\0"
+	"dark sea green\0"
+	"dark slate blue\0"
+	"dark slate gray\0"
+	"dark slate grey\0"
+	"dark turquoise\0"
+	"dark violet\0"
+	"DarkBlue\0"
+	"DarkCyan\0"
+	"DarkGoldenrod\0"
+	"DarkGoldenrod1\0"
+	"DarkGoldenrod2\0"
+	"DarkGoldenrod3\0"
+	"DarkGoldenrod4\0"
+	"DarkGray\0"
+	"DarkGreen\0"
+	"DarkGrey\0"
+	"DarkKhaki\0"
+	"DarkMagenta\0"
+	"DarkOliveGreen\0"
+	"DarkOliveGreen1\0"
+	"DarkOliveGreen2\0"
+	"DarkOliveGreen3\0"
+	"DarkOliveGreen4\0"
+	"DarkOrange\0"
+	"DarkOrange1\0"
+	"DarkOrange2\0"
+	"DarkOrange3\0"
+	"DarkOrange4\0"
+	"DarkOrchid\0"
+	"DarkOrchid1\0"
+	"DarkOrchid2\0"
+	"DarkOrchid3\0"
+	"DarkOrchid4\0"
+	"DarkRed\0"
+	"DarkSalmon\0"
+	"DarkSeaGreen\0"
+	"DarkSeaGreen1\0"
+	"DarkSeaGreen2\0"
+	"DarkSeaGreen3\0"
+	"DarkSeaGreen4\0"
+	"DarkSlateBlue\0"
+	"DarkSlateGray\0"
+	"DarkSlateGray1\0"
+	"DarkSlateGray2\0"
+	"DarkSlateGray3\0"
+	"DarkSlateGray4\0"
+	"DarkSlateGrey\0"
+	"DarkTurquoise\0"
+	"DarkViolet\0"
+	"deep pink\0"
+	"deep sky blue\0"
+	"DeepPink\0"
+	"DeepPink1\0"
+	"DeepPink2\0"
+	"DeepPink3\0"
+	"DeepPink4\0"
+	"DeepSkyBlue\0"
+	"DeepSkyBlue1\0"
+	"DeepSkyBlue2\0"
+	"DeepSkyBlue3\0"
+	"DeepSkyBlue4\0"
+	"dim gray\0"
+	"dim grey\0"
+	"DimGray\0"
+	"DimGrey\0"
+	"dodger blue\0"
+	"DodgerBlue\0"
+	"DodgerBlue1\0"
+	"DodgerBlue2\0"
+	"DodgerBlue3\0"
+	"DodgerBlue4\0"
+	"firebrick\0"
+	"firebrick1\0"
+	"firebrick2\0"
+	"firebrick3\0"
+	"firebrick4\0"
+	"floral white\0"
+	"FloralWhite\0"
+	"forest green\0"
+	"ForestGreen\0"
+	"fuchsia\0"
+	"gainsboro\0"
+	"ghost white\0"
+	"GhostWhite\0"
+	"gold\0"
+	"gold1\0"
+	"gold2\0"
+	"gold3\0"
+	"gold4\0"
+	"goldenrod\0"
+	"goldenrod1\0"
+	"goldenrod2\0"
+	"goldenrod3\0"
+	"goldenrod4\0"
+	"gray\0"
+	"gray0\0"
+	"gray1\0"
+	"gray10\0"
+	"gray100\0"
+	"gray11\0"
+	"gray12\0"
+	"gray13\0"
+	"gray14\0"
+	"gray15\0"
+	"gray16\0"
+	"gray17\0"
+	"gray18\0"
+	"gray19\0"
+	"gray2\0"
+	"gray20\0"
+	"gray21\0"
+	"gray22\0"
+	"gray23\0"
+	"gray24\0"
+	"gray25\0"
+	"gray26\0"
+	"gray27\0"
+	"gray28\0"
+	"gray29\0"
+	"gray3\0"
+	"gray30\0"
+	"gray31\0"
+	"gray32\0"
+	"gray33\0"
+	"gray34\0"
+	"gray35\0"
+	"gray36\0"
+	"gray37\0"
+	"gray38\0"
+	"gray39\0"
+	"gray4\0"
+	"gray40\0"
+	"gray41\0"
+	"gray42\0"
+	"gray43\0"
+	"gray44\0"
+	"gray45\0"
+	"gray46\0"
+	"gray47\0"
+	"gray48\0"
+	"gray49\0"
+	"gray5\0"
+	"gray50\0"
+	"gray51\0"
+	"gray52\0"
+	"gray53\0"
+	"gray54\0"
+	"gray55\0"
+	"gray56\0"
+	"gray57\0"
+	"gray58\0"
+	"gray59\0"
+	"gray6\0"
+	"gray60\0"
+	"gray61\0"
+	"gray62\0"
+	"gray63\0"
+	"gray64\0"
+	"gray65\0"
+	"gray66\0"
+	"gray67\0"
+	"gray68\0"
+	"gray69\0"
+	"gray7\0"
+	"gray70\0"
+	"gray71\0"
+	"gray72\0"
+	"gray73\0"
+	"gray74\0"
+	"gray75\0"
+	"gray76\0"
+	"gray77\0"
+	"gray78\0"
+	"gray79\0"
+	"gray8\0"
+	"gray80\0"
+	"gray81\0"
+	"gray82\0"
+	"gray83\0"
+	"gray84\0"
+	"gray85\0"
+	"gray86\0"
+	"gray87\0"
+	"gray88\0"
+	"gray89\0"
+	"gray9\0"
+	"gray90\0"
+	"gray91\0"
+	"gray92\0"
+	"gray93\0"
+	"gray94\0"
+	"gray95\0"
+	"gray96\0"
+	"gray97\0"
+	"gray98\0"
+	"gray99\0"
+	"green\0"
+	"green yellow\0"
+	"green1\0"
+	"green2\0"
+	"green3\0"
+	"green4\0"
+	"GreenYellow\0"
+	"grey\0"
+	"grey0\0"
+	"grey1\0"
+	"grey10\0"
+	"grey100\0"
+	"grey11\0"
+	"grey12\0"
+	"grey13\0"
+	"grey14\0"
+	"grey15\0"
+	"grey16\0"
+	"grey17\0"
+	"grey18\0"
+	"grey19\0"
+	"grey2\0"
+	"grey20\0"
+	"grey21\0"
+	"grey22\0"
+	"grey23\0"
+	"grey24\0"
+	"grey25\0"
+	"grey26\0"
+	"grey27\0"
+	"grey28\0"
+	"grey29\0"
+	"grey3\0"
+	"grey30\0"
+	"grey31\0"
+	"grey32\0"
+	"grey33\0"
+	"grey34\0"
+	"grey35\0"
+	"grey36\0"
+	"grey37\0"
+	"grey38\0"
+	"grey39\0"
+	"grey4\0"
+	"grey40\0"
+	"grey41\0"
+	"grey42\0"
+	"grey43\0"
+	"grey44\0"
+	"grey45\0"
+	"grey46\0"
+	"grey47\0"
+	"grey48\0"
+	"grey49\0"
+	"grey5\0"
+	"grey50\0"
+	"grey51\0"
+	"grey52\0"
+	"grey53\0"
+	"grey54\0"
+	"grey55\0"
+	"grey56\0"
+	"grey57\0"
+	"grey58\0"
+	"grey59\0"
+	"grey6\0"
+	"grey60\0"
+	"grey61\0"
+	"grey62\0"
+	"grey63\0"
+	"grey64\0"
+	"grey65\0"
+	"grey66\0"
+	"grey67\0"
+	"grey68\0"
+	"grey69\0"
+	"grey7\0"
+	"grey70\0"
+	"grey71\0"
+	"grey72\0"
+	"grey73\0"
+	"grey74\0"
+	"grey75\0"
+	"grey76\0"
+	"grey77\0"
+	"grey78\0"
+	"grey79\0"
+	"grey8\0"
+	"grey80\0"
+	"grey81\0"
+	"grey82\0"
+	"grey83\0"
+	"grey84\0"
+	"grey85\0"
+	"grey86\0"
+	"grey87\0"
+	"grey88\0"
+	"grey89\0"
+	"grey9\0"
+	"grey90\0"
+	"grey91\0"
+	"grey92\0"
+	"grey93\0"
+	"grey94\0"
+	"grey95\0"
+	"grey96\0"
+	"grey97\0"
+	"grey98\0"
+	"grey99\0"
+	"honeydew\0"
+	"honeydew1\0"
+	"honeydew2\0"
+	"honeydew3\0"
+	"honeydew4\0"
+	"hot pink\0"
+	"HotPink\0"
+	"HotPink1\0"
+	"HotPink2\0"
+	"HotPink3\0"
+	"HotPink4\0"
+	"indian red\0"
+	"IndianRed\0"
+	"IndianRed1\0"
+	"IndianRed2\0"
+	"IndianRed3\0"
+	"IndianRed4\0"
+	"indigo\0"
+	"ivory\0"
+	"ivory1\0"
+	"ivory2\0"
+	"ivory3\0"
+	"ivory4\0"
+	"khaki\0"
+	"khaki1\0"
+	"khaki2\0"
+	"khaki3\0"
+	"khaki4\0"
+	"lavender\0"
+	"lavender blush\0"
+	"LavenderBlush\0"
+	"LavenderBlush1\0"
+	"LavenderBlush2\0"
+	"LavenderBlush3\0"
+	"LavenderBlush4\0"
+	"lawn green\0"
+	"LawnGreen\0"
+	"lemon chiffon\0"
+	"LemonChiffon\0"
+	"LemonChiffon1\0"
+	"LemonChiffon2\0"
+	"LemonChiffon3\0"
+	"LemonChiffon4\0"
+	"light blue\0"
+	"light coral\0"
+	"light cyan\0"
+	"light goldenrod\0"
+	"light goldenrod yellow\0"
+	"light gray\0"
+	"light green\0"
+	"light grey\0"
+	"light pink\0"
+	"light salmon\0"
+	"light sea green\0"
+	"light sky blue\0"
+	"light slate blue\0"
+	"light slate gray\0"
+	"light slate grey\0"
+	"light steel blue\0"
+	"light yellow\0"
+	"LightBlue\0"
+	"LightBlue1\0"
+	"LightBlue2\0"
+	"LightBlue3\0"
+	"LightBlue4\0"
+	"LightCoral\0"
+	"LightCyan\0"
+	"LightCyan1\0"
+	"LightCyan2\0"
+	"LightCyan3\0"
+	"LightCyan4\0"
+	"LightGoldenrod\0"
+	"LightGoldenrod1\0"
+	"LightGoldenrod2\0"
+	"LightGoldenrod3\0"
+	"LightGoldenrod4\0"
+	"LightGoldenrodYellow\0"
+	"LightGray\0"
+	"LightGreen\0"
+	"LightGrey\0"
+	"LightPink\0"
+	"LightPink1\0"
+	"LightPink2\0"
+	"LightPink3\0"
+	"LightPink4\0"
+	"LightSalmon\0"
+	"LightSalmon1\0"
+	"LightSalmon2\0"
+	"LightSalmon3\0"
+	"LightSalmon4\0"
+	"LightSeaGreen\0"
+	"LightSkyBlue\0"
+	"LightSkyBlue1\0"
+	"LightSkyBlue2\0"
+	"LightSkyBlue3\0"
+	"LightSkyBlue4\0"
+	"LightSlateBlue\0"
+	"LightSlateGray\0"
+	"LightSlateGrey\0"
+	"LightSteelBlue\0"
+	"LightSteelBlue1\0"
+	"LightSteelBlue2\0"
+	"LightSteelBlue3\0"
+	"LightSteelBlue4\0"
+	"LightYellow\0"
+	"LightYellow1\0"
+	"LightYellow2\0"
+	"LightYellow3\0"
+	"LightYellow4\0"
+	"lime\0"
+	"lime green\0"
+	"LimeGreen\0"
+	"linen\0"
+	"magenta\0"
+	"magenta1\0"
+	"magenta2\0"
+	"magenta3\0"
+	"magenta4\0"
+	"maroon\0"
+	"maroon1\0"
+	"maroon2\0"
+	"maroon3\0"
+	"maroon4\0"
+	"medium aquamarine\0"
+	"medium blue\0"
+	"medium orchid\0"
+	"medium purple\0"
+	"medium sea green\0"
+	"medium slate blue\0"
+	"medium spring green\0"
+	"medium turquoise\0"
+	"medium violet red\0"
+	"MediumAquamarine\0"
+	"MediumBlue\0"
+	"MediumOrchid\0"
+	"MediumOrchid1\0"
+	"MediumOrchid2\0"
+	"MediumOrchid3\0"
+	"MediumOrchid4\0"
+	"MediumPurple\0"
+	"MediumPurple1\0"
+	"MediumPurple2\0"
+	"MediumPurple3\0"
+	"MediumPurple4\0"
+	"MediumSeaGreen\0"
+	"MediumSlateBlue\0"
+	"MediumSpringGreen\0"
+	"MediumTurquoise\0"
+	"MediumVioletRed\0"
+	"midnight blue\0"
+	"MidnightBlue\0"
+	"mint cream\0"
+	"MintCream\0"
+	"misty rose\0"
+	"MistyRose\0"
+	"MistyRose1\0"
+	"MistyRose2\0"
+	"MistyRose3\0"
+	"MistyRose4\0"
+	"moccasin\0"
+	"navajo white\0"
+	"NavajoWhite\0"
+	"NavajoWhite1\0"
+	"NavajoWhite2\0"
+	"NavajoWhite3\0"
+	"NavajoWhite4\0"
+	"navy\0"
+	"navy blue\0"
+	"NavyBlue\0"
+	"old lace\0"
+	"OldLace\0"
+	"olive\0"
+	"olive drab\0"
+	"OliveDrab\0"
+	"OliveDrab1\0"
+	"OliveDrab2\0"
+	"OliveDrab3\0"
+	"OliveDrab4\0"
+	"orange\0"
+	"orange red\0"
+	"orange1\0"
+	"orange2\0"
+	"orange3\0"
+	"orange4\0"
+	"OrangeRed\0"
+	"OrangeRed1\0"
+	"OrangeRed2\0"
+	"OrangeRed3\0"
+	"OrangeRed4\0"
+	"orchid\0"
+	"orchid1\0"
+	"orchid2\0"
+	"orchid3\0"
+	"orchid4\0"
+	"pale goldenrod\0"
+	"pale green\0"
+	"pale turquoise\0"
+	"pale violet red\0"
+	"PaleGoldenrod\0"
+	"PaleGreen\0"
+	"PaleGreen1\0"
+	"PaleGreen2\0"
+	"PaleGreen3\0"
+	"PaleGreen4\0"
+	"PaleTurquoise\0"
+	"PaleTurquoise1\0"
+	"PaleTurquoise2\0"
+	"PaleTurquoise3\0"
+	"PaleTurquoise4\0"
+	"PaleVioletRed\0"
+	"PaleVioletRed1\0"
+	"PaleVioletRed2\0"
+	"PaleVioletRed3\0"
+	"PaleVioletRed4\0"
+	"papaya whip\0"
+	"PapayaWhip\0"
+	"peach puff\0"
+	"PeachPuff\0"
+	"PeachPuff1\0"
+	"PeachPuff2\0"
+	"PeachPuff3\0"
+	"PeachPuff4\0"
+	"peru\0"
+	"pink\0"
+	"pink1\0"
+	"pink2\0"
+	"pink3\0"
+	"pink4\0"
+	"plum\0"
+	"plum1\0"
+	"plum2\0"
+	"plum3\0"
+	"plum4\0"
+	"powder blue\0"
+	"PowderBlue\0"
+	"purple\0"
+	"purple1\0"
+	"purple2\0"
+	"purple3\0"
+	"purple4\0"
+	"rebecca purple\0"
+	"RebeccaPurple\0"
+	"red\0"
+	"red1\0"
+	"red2\0"
+	"red3\0"
+	"red4\0"
+	"rosy brown\0"
+	"RosyBrown\0"
+	"RosyBrown1\0"
+	"RosyBrown2\0"
+	"RosyBrown3\0"
+	"RosyBrown4\0"
+	"royal blue\0"
+	"RoyalBlue\0"
+	"RoyalBlue1\0"
+	"RoyalBlue2\0"
+	"RoyalBlue3\0"
+	"RoyalBlue4\0"
+	"saddle brown\0"
+	"SaddleBrown\0"
+	"salmon\0"
+	"salmon1\0"
+	"salmon2\0"
+	"salmon3\0"
+	"salmon4\0"
+	"sandy brown\0"
+	"SandyBrown\0"
+	"sea green\0"
+	"SeaGreen\0"
+	"SeaGreen1\0"
+	"SeaGreen2\0"
+	"SeaGreen3\0"
+	"SeaGreen4\0"
+	"seashell\0"
+	"seashell1\0"
+	"seashell2\0"
+	"seashell3\0"
+	"seashell4\0"
+	"sienna\0"
+	"sienna1\0"
+	"sienna2\0"
+	"sienna3\0"
+	"sienna4\0"
+	"silver\0"
+	"sky blue\0"
+	"SkyBlue\0"
+	"SkyBlue1\0"
+	"SkyBlue2\0"
+	"SkyBlue3\0"
+	"SkyBlue4\0"
+	"slate blue\0"
+	"slate gray\0"
+	"slate grey\0"
+	"SlateBlue\0"
+	"SlateBlue1\0"
+	"SlateBlue2\0"
+	"SlateBlue3\0"
+	"SlateBlue4\0"
+	"SlateGray\0"
+	"SlateGray1\0"
+	"SlateGray2\0"
+	"SlateGray3\0"
+	"SlateGray4\0"
+	"SlateGrey\0"
+	"snow\0"
+	"snow1\0"
+	"snow2\0"
+	"snow3\0"
+	"snow4\0"
+	"spring green\0"
+	"SpringGreen\0"
+	"SpringGreen1\0"
+	"SpringGreen2\0"
+	"SpringGreen3\0"
+	"SpringGreen4\0"
+	"steel blue\0"
+	"SteelBlue\0"
+	"SteelBlue1\0"
+	"SteelBlue2\0"
+	"SteelBlue3\0"
+	"SteelBlue4\0"
+	"tan\0"
+	"tan1\0"
+	"tan2\0"
+	"tan3\0"
+	"tan4\0"
+	"teal\0"
+	"thistle\0"
+	"thistle1\0"
+	"thistle2\0"
+	"thistle3\0"
+	"thistle4\0"
+	"tomato\0"
+	"tomato1\0"
+	"tomato2\0"
+	"tomato3\0"
+	"tomato4\0"
+	"turquoise\0"
+	"turquoise1\0"
+	"turquoise2\0"
+	"turquoise3\0"
+	"turquoise4\0"
+	"violet\0"
+	"violet red\0"
+	"VioletRed\0"
+	"VioletRed1\0"
+	"VioletRed2\0"
+	"VioletRed3\0"
+	"VioletRed4\0"
+	"web gray\0"
+	"web green\0"
+	"web grey\0"
+	"web maroon\0"
+	"web purple\0"
+	"WebGray\0"
+	"WebGreen\0"
+	"WebGrey\0"
+	"WebMaroon\0"
+	"WebPurple\0"
+	"wheat\0"
+	"wheat1\0"
+	"wheat2\0"
+	"wheat3\0"
+	"wheat4\0"
+	"white\0"
+	"white smoke\0"
+	"WhiteSmoke\0"
+	"x11 gray\0"
+	"x11 green\0"
+	"x11 grey\0"
+	"x11 maroon\0"
+	"x11 purple\0"
+	"X11Gray\0"
+	"X11Green\0"
+	"X11Grey\0"
+	"X11Maroon\0"
+	"X11Purple\0"
+	"yellow\0"
+	"yellow green\0"
+	"yellow1\0"
+	"yellow2\0"
+	"yellow3\0"
+	"yellow4\0"
+	"YellowGreen\0";
+
+struct xcolor_entry {
+	uint16_t name_offset;
+	uint8_t red;
+	uint8_t green;
+	uint8_t blue;
+};
+
+static const struct xcolor_entry xcolors[] = {
+	{ 0, 240, 248, 255 },
+	{ 11, 240, 248, 255 },
+	{ 21, 250, 235, 215 },
+	{ 35, 250, 235, 215 },
+	{ 48, 255, 239, 219 },
+	{ 62, 238, 223, 204 },
+	{ 76, 205, 192, 176 },
+	{ 90, 139, 131, 120 },
+	{ 104, 0, 255, 255 },
+	{ 109, 127, 255, 212 },
+	{ 120, 127, 255, 212 },
+	{ 132, 118, 238, 198 },
+	{ 144, 102, 205, 170 },
+	{ 156, 69, 139, 116 },
+	{ 168, 240, 255, 255 },
+	{ 174, 240, 255, 255 },
+	{ 181, 224, 238, 238 },
+	{ 188, 193, 205, 205 },
+	{ 195, 131, 139, 139 },
+	{ 202, 245, 245, 220 },
+	{ 208, 255, 228, 196 },
+	{ 215, 255, 228, 196 },
+	{ 223, 238, 213, 183 },
+	{ 231, 205, 183, 158 },
+	{ 239, 139, 125, 107 },
+	{ 247, 0, 0, 0 },
+	{ 253, 255, 235, 205 },
+	{ 269, 255, 235, 205 },
+	{ 284, 0, 0, 255 },
+	{ 289, 138, 43, 226 },
+	{ 301, 0, 0, 255 },
+	{ 307, 0, 0, 238 },
+	{ 313, 0, 0, 205 },
+	{ 319, 0, 0, 139 },
+	{ 325, 138, 43, 226 },
+	{ 336, 165, 42, 42 },
+	{ 342, 255, 64, 64 },
+	{ 349, 238, 59, 59 },
+	{ 356, 205, 51, 51 },
+	{ 363, 139, 35, 35 },
+	{ 370, 222, 184, 135 },
+	{ 380, 255, 211, 155 },
+	{ 391, 238, 197, 145 },
+	{ 402, 205, 170, 125 },
+	{ 413, 139, 115, 85 },
+	{ 424, 95, 158, 160 },
+	{ 435, 95, 158, 160 },
+	{ 445, 152, 245, 255 },
+	{ 456, 142, 229, 238 },
+	{ 467, 122, 197, 205 },
+	{ 478, 83, 134, 139 },
+	{ 489, 127, 255, 0 },
+	{ 500, 127, 255, 0 },
+	{ 512, 118, 238, 0 },
+	{ 524, 102, 205, 0 },
+	{ 536, 69, 139, 0 },
+	{ 548, 210, 105, 30 },
+	{ 558, 255, 127, 36 },
+	{ 569, 238, 118, 33 },
+	{ 580, 205, 102, 29 },
+	{ 591, 139, 69, 19 },
+	{ 602, 255, 127, 80 },
+	{ 608, 255, 114, 86 },
+	{ 615, 238, 106, 80 },
+	{ 622, 205, 91, 69 },
+	{ 629, 139, 62, 47 },
+	{ 636, 100, 149, 237 },
+	{ 652, 100, 149, 237 },
+	{ 667, 255, 248, 220 },
+	{ 676, 255, 248, 220 },
+	{ 686, 238, 232, 205 },
+	{ 696, 205, 200, 177 },
+	{ 706, 139, 136, 120 },
+	{ 716, 220, 20, 60 },
+	{ 724, 0, 255, 255 },
+	{ 729, 0, 255, 255 },
+	{ 735, 0, 238, 238 },
+	{ 741, 0, 205, 205 },
+	{ 747, 0, 139, 139 },
+	{ 753, 0, 0, 139 },
+	{ 763, 0, 139, 139 },
+	{ 773, 184, 134, 11 },
+	{ 788, 169, 169, 169 },
+	{ 798, 0, 100, 0 },
+	{ 809, 169, 169, 169 },
+	{ 819, 189, 183, 107 },
+	{ 830, 139, 0, 139 },
+	{ 843, 85, 107, 47 },
+	{ 860, 255, 140, 0 },
+	{ 872, 153, 50, 204 },
+	{ 884, 139, 0, 0 },
+	{ 893, 233, 150, 122 },
+	{ 905, 143, 188, 143 },
+	{ 920, 72, 61, 139 },
+	{ 936, 47, 79, 79 },
+	{ 952, 47, 79, 79 },
+	{ 968, 0, 206, 209 },
+	{ 983, 148, 0, 211 },
+	{ 995, 0, 0, 139 },
+	{ 1004, 0, 139, 139 },
+	{ 1013, 184, 134, 11 },
+	{ 1027, 255, 185, 15 },
+	{ 1042, 238, 173, 14 },
+	{ 1057, 205, 149, 12 },
+	{ 1072, 139, 101, 8 },
+	{ 1087, 169, 169, 169 },
+	{ 1096, 0, 100, 0 },
+	{ 1106, 169, 169, 169 },
+	{ 1115, 189, 183, 107 },
+	{ 1125, 139, 0, 139 },
+	{ 1137, 85, 107, 47 },
+	{ 1152, 202, 255, 112 },
+	{ 1168, 188, 238, 104 },
+	{ 1184, 162, 205, 90 },
+	{ 1200, 110, 139, 61 },
+	{ 1216, 255, 140, 0 },
+	{ 1227, 255, 127, 0 },
+	{ 1239, 238, 118, 0 },
+	{ 1251, 205, 102, 0 },
+	{ 1263, 139, 69, 0 },
+	{ 1275, 153, 50, 204 },
+	{ 1286, 191, 62, 255 },
+	{ 1298, 178, 58, 238 },
+	{ 1310, 154, 50, 205 },
+	{ 1322, 104, 34, 139 },
+	{ 1334, 139, 0, 0 },
+	{ 1342, 233, 150, 122 },
+	{ 1353, 143, 188, 143 },
+	{ 1366, 193, 255, 193 },
+	{ 1380, 180, 238, 180 },
+	{ 1394, 155, 205, 155 },
+	{ 1408, 105, 139, 105 },
+	{ 1422, 72, 61, 139 },
+	{ 1436, 47, 79, 79 },
+	{ 1450, 151, 255, 255 },
+	{ 1465, 141, 238, 238 },
+	{ 1480, 121, 205, 205 },
+	{ 1495, 82, 139, 139 },
+	{ 1510, 47, 79, 79 },
+	{ 1524, 0, 206, 209 },
+	{ 1538, 148, 0, 211 },
+	{ 1549, 255, 20, 147 },
+	{ 1559, 0, 191, 255 },
+	{ 1573, 255, 20, 147 },
+	{ 1582, 255, 20, 147 },
+	{ 1592, 238, 18, 137 },
+	{ 1602, 205, 16, 118 },
+	{ 1612, 139, 10, 80 },
+	{ 1622, 0, 191, 255 },
+	{ 1634, 0, 191, 255 },
+	{ 1647, 0, 178, 238 },
+	{ 1660, 0, 154, 205 },
+	{ 1673, 0, 104, 139 },
+	{ 1686, 105, 105, 105 },
+	{ 1695, 105, 105, 105 },
+	{ 1704, 105, 105, 105 },
+	{ 1712, 105, 105, 105 },
+	{ 1720, 30, 144, 255 },
+	{ 1732, 30, 144, 255 },
+	{ 1743, 30, 144, 255 },
+	{ 1755, 28, 134, 238 },
+	{ 1767, 24, 116, 205 },
+	{ 1779, 16, 78, 139 },
+	{ 1791, 178, 34, 34 },
+	{ 1801, 255, 48, 48 },
+	{ 1812, 238, 44, 44 },
+	{ 1823, 205, 38, 38 },
+	{ 1834, 139, 26, 26 },
+	{ 1845, 255, 250, 240 },
+	{ 1858, 255, 250, 240 },
+	{ 1870, 34, 139, 34 },
+	{ 1883, 34, 139, 34 },
+	{ 1895, 255, 0, 255 },
+	{ 1903, 220, 220, 220 },
+	{ 1913, 248, 248, 255 },
+	{ 1925, 248, 248, 255 },
+	{ 1936, 255, 215, 0 },
+	{ 1941, 255, 215, 0 },
+	{ 1947, 238, 201, 0 },
+	{ 1953, 205, 173, 0 },
+	{ 1959, 139, 117, 0 },
+	{ 1965, 218, 165, 32 },
+	{ 1975, 255, 193, 37 },
+	{ 1986, 238, 180, 34 },
+	{ 1997, 205, 155, 29 },
+	{ 2008, 139, 105, 20 },
+	{ 2019, 190, 190, 190 },
+	{ 2024, 0, 0, 0 },
+	{ 2030, 3, 3, 3 },
+	{ 2036, 26, 26, 26 },
+	{ 2043, 255, 255, 255 },
+	{ 2051, 28, 28, 28 },
+	{ 2058, 31, 31, 31 },
+	{ 2065, 33, 33, 33 },
+	{ 2072, 36, 36, 36 },
+	{ 2079, 38, 38, 38 },
+	{ 2086, 41, 41, 41 },
+	{ 2093, 43, 43, 43 },
+	{ 2100, 46, 46, 46 },
+	{ 2107, 48, 48, 48 },
+	{ 2114, 5, 5, 5 },
+	{ 2120, 51, 51, 51 },
+	{ 2127, 54, 54, 54 },
+	{ 2134, 56, 56, 56 },
+	{ 2141, 59, 59, 59 },
+	{ 2148, 61, 61, 61 },
+	{ 2155, 64, 64, 64 },
+	{ 2162, 66, 66, 66 },
+	{ 2169, 69, 69, 69 },
+	{ 2176, 71, 71, 71 },
+	{ 2183, 74, 74, 74 },
+	{ 2190, 8, 8, 8 },
+	{ 2196, 77, 77, 77 },
+	{ 2203, 79, 79, 79 },
+	{ 2210, 82, 82, 82 },
+	{ 2217, 84, 84, 84 },
+	{ 2224, 87, 87, 87 },
+	{ 2231, 89, 89, 89 },
+	{ 2238, 92, 92, 92 },
+	{ 2245, 94, 94, 94 },
+	{ 2252, 97, 97, 97 },
+	{ 2259, 99, 99, 99 },
+	{ 2266, 10, 10, 10 },
+	{ 2272, 102, 102, 102 },
+	{ 2279, 105, 105, 105 },
+	{ 2286, 107, 107, 107 },
+	{ 2293, 110, 110, 110 },
+	{ 2300, 112, 112, 112 },
+	{ 2307, 115, 115, 115 },
+	{ 2314, 117, 117, 117 },
+	{ 2321, 120, 120, 120 },
+	{ 2328, 122, 122, 122 },
+	{ 2335, 125, 125, 125 },
+	{ 2342, 13, 13, 13 },
+	{ 2348, 127, 127, 127 },
+	{ 2355, 130, 130, 130 },
+	{ 2362, 133, 133, 133 },
+	{ 2369, 135, 135, 135 },
+	{ 2376, 138, 138, 138 },
+	{ 2383, 140, 140, 140 },
+	{ 2390, 143, 143, 143 },
+	{ 2397, 145, 145, 145 },
+	{ 2404, 148, 148, 148 },
+	{ 2411, 150, 150, 150 },
+	{ 2418, 15, 15, 15 },
+	{ 2424, 153, 153, 153 },
+	{ 2431, 156, 156, 156 },
+	{ 2438, 158, 158, 158 },
+	{ 2445, 161, 161, 161 },
+	{ 2452, 163, 163, 163 },
+	{ 2459, 166, 166, 166 },
+	{ 2466, 168, 168, 168 },
+	{ 2473, 171, 171, 171 },
+	{ 2480, 173, 173, 173 },
+	{ 2487, 176, 176, 176 },
+	{ 2494, 18, 18, 18 },
+	{ 2500, 179, 179, 179 },
+	{ 2507, 181, 181, 181 },
+	{ 2514, 184, 184, 184 },
+	{ 2521, 186, 186, 186 },
+	{ 2528, 189, 189, 189 },
+	{ 2535, 191, 191, 191 },
+	{ 2542, 194, 194, 194 },
+	{ 2549, 196, 196, 196 },
+	{ 2556, 199, 199, 199 },
+	{ 2563, 201, 201, 201 },
+	{ 2570, 20, 20, 20 },
+	{ 2576, 204, 204, 204 },
+	{ 2583, 207, 207, 207 },
+	{ 2590, 209, 209, 209 },
+	{ 2597, 212, 212, 212 },
+	{ 2604, 214, 214, 214 },
+	{ 2611, 217, 217, 217 },
+	{ 2618, 219, 219, 219 },
+	{ 2625, 222, 222, 222 },
+	{ 2632, 224, 224, 224 },
+	{ 2639, 227, 227, 227 },
+	{ 2646, 23, 23, 23 },
+	{ 2652, 229, 229, 229 },
+	{ 2659, 232, 232, 232 },
+	{ 2666, 235, 235, 235 },
+	{ 2673, 237, 237, 237 },
+	{ 2680, 240, 240, 240 },
+	{ 2687, 242, 242, 242 },
+	{ 2694, 245, 245, 245 },
+	{ 2701, 247, 247, 247 },
+	{ 2708, 250, 250, 250 },
+	{ 2715, 252, 252, 252 },
+	{ 2722, 0, 255, 0 },
+	{ 2728, 173, 255, 47 },
+	{ 2741, 0, 255, 0 },
+	{ 2748, 0, 238, 0 },
+	{ 2755, 0, 205, 0 },
+	{ 2762, 0, 139, 0 },
+	{ 2769, 173, 255, 47 },
+	{ 2781, 190, 190, 190 },
+	{ 2786, 0, 0, 0 },
+	{ 2792, 3, 3, 3 },
+	{ 2798, 26, 26, 26 },
+	{ 2805, 255, 255, 255 },
+	{ 2813, 28, 28, 28 },
+	{ 2820, 31, 31, 31 },
+	{ 2827, 33, 33, 33 },
+	{ 2834, 36, 36, 36 },
+	{ 2841, 38, 38, 38 },
+	{ 2848, 41, 41, 41 },
+	{ 2855, 43, 43, 43 },
+	{ 2862, 46, 46, 46 },
+	{ 2869, 48, 48, 48 },
+	{ 2876, 5, 5, 5 },
+	{ 2882, 51, 51, 51 },
+	{ 2889, 54, 54, 54 },
+	{ 2896, 56, 56, 56 },
+	{ 2903, 59, 59, 59 },
+	{ 2910, 61, 61, 61 },
+	{ 2917, 64, 64, 64 },
+	{ 2924, 66, 66, 66 },
+	{ 2931, 69, 69, 69 },
+	{ 2938, 71, 71, 71 },
+	{ 2945, 74, 74, 74 },
+	{ 2952, 8, 8, 8 },
+	{ 2958, 77, 77, 77 },
+	{ 2965, 79, 79, 79 },
+	{ 2972, 82, 82, 82 },
+	{ 2979, 84, 84, 84 },
+	{ 2986, 87, 87, 87 },
+	{ 2993, 89, 89, 89 },
+	{ 3000, 92, 92, 92 },
+	{ 3007, 94, 94, 94 },
+	{ 3014, 97, 97, 97 },
+	{ 3021, 99, 99, 99 },
+	{ 3028, 10, 10, 10 },
+	{ 3034, 102, 102, 102 },
+	{ 3041, 105, 105, 105 },
+	{ 3048, 107, 107, 107 },
+	{ 3055, 110, 110, 110 },
+	{ 3062, 112, 112, 112 },
+	{ 3069, 115, 115, 115 },
+	{ 3076, 117, 117, 117 },
+	{ 3083, 120, 120, 120 },
+	{ 3090, 122, 122, 122 },
+	{ 3097, 125, 125, 125 },
+	{ 3104, 13, 13, 13 },
+	{ 3110, 127, 127, 127 },
+	{ 3117, 130, 130, 130 },
+	{ 3124, 133, 133, 133 },
+	{ 3131, 135, 135, 135 },
+	{ 3138, 138, 138, 138 },
+	{ 3145, 140, 140, 140 },
+	{ 3152, 143, 143, 143 },
+	{ 3159, 145, 145, 145 },
+	{ 3166, 148, 148, 148 },
+	{ 3173, 150, 150, 150 },
+	{ 3180, 15, 15, 15 },
+	{ 3186, 153, 153, 153 },
+	{ 3193, 156, 156, 156 },
+	{ 3200, 158, 158, 158 },
+	{ 3207, 161, 161, 161 },
+	{ 3214, 163, 163, 163 },
+	{ 3221, 166, 166, 166 },
+	{ 3228, 168, 168, 168 },
+	{ 3235, 171, 171, 171 },
+	{ 3242, 173, 173, 173 },
+	{ 3249, 176, 176, 176 },
+	{ 3256, 18, 18, 18 },
+	{ 3262, 179, 179, 179 },
+	{ 3269, 181, 181, 181 },
+	{ 3276, 184, 184, 184 },
+	{ 3283, 186, 186, 186 },
+	{ 3290, 189, 189, 189 },
+	{ 3297, 191, 191, 191 },
+	{ 3304, 194, 194, 194 },
+	{ 3311, 196, 196, 196 },
+	{ 3318, 199, 199, 199 },
+	{ 3325, 201, 201, 201 },
+	{ 3332, 20, 20, 20 },
+	{ 3338, 204, 204, 204 },
+	{ 3345, 207, 207, 207 },
+	{ 3352, 209, 209, 209 },
+	{ 3359, 212, 212, 212 },
+	{ 3366, 214, 214, 214 },
+	{ 3373, 217, 217, 217 },
+	{ 3380, 219, 219, 219 },
+	{ 3387, 222, 222, 222 },
+	{ 3394, 224, 224, 224 },
+	{ 3401, 227, 227, 227 },
+	{ 3408, 23, 23, 23 },
+	{ 3414, 229, 229, 229 },
+	{ 3421, 232, 232, 232 },
+	{ 3428, 235, 235, 235 },
+	{ 3435, 237, 237, 237 },
+	{ 3442, 240, 240, 240 },
+	{ 3449, 242, 242, 242 },
+	{ 3456, 245, 245, 245 },
+	{ 3463, 247, 247, 247 },
+	{ 3470, 250, 250, 250 },
+	{ 3477, 252, 252, 252 },
+	{ 3484, 240, 255, 240 },
+	{ 3493, 240, 255, 240 },
+	{ 3503, 224, 238, 224 },
+	{ 3513, 193, 205, 193 },
+	{ 3523, 131, 139, 131 },
+	{ 3533, 255, 105, 180 },
+	{ 3542, 255, 105, 180 },
+	{ 3550, 255, 110, 180 },
+	{ 3559, 238, 106, 167 },
+	{ 3568, 205, 96, 144 },
+	{ 3577, 139, 58, 98 },
+	{ 3586, 205, 92, 92 },
+	{ 3597, 205, 92, 92 },
+	{ 3607, 255, 106, 106 },
+	{ 3618, 238, 99, 99 },
+	{ 3629, 205, 85, 85 },
+	{ 3640, 139, 58, 58 },
+	{ 3651, 75, 0, 130 },
+	{ 3658, 255, 255, 240 },
+	{ 3664, 255, 255, 240 },
+	{ 3671, 238, 238, 224 },
+	{ 3678, 205, 205, 193 },
+	{ 3685, 139, 139, 131 },
+	{ 3692, 240, 230, 140 },
+	{ 3698, 255, 246, 143 },
+	{ 3705, 238, 230, 133 },
+	{ 3712, 205, 198, 115 },
+	{ 3719, 139, 134, 78 },
+	{ 3726, 230, 230, 250 },
+	{ 3735, 255, 240, 245 },
+	{ 3750, 255, 240, 245 },
+	{ 3764, 255, 240, 245 },
+	{ 3779, 238, 224, 229 },
+	{ 3794, 205, 193, 197 },
+	{ 3809, 139, 131, 134 },
+	{ 3824, 124, 252, 0 },
+	{ 3835, 124, 252, 0 },
+	{ 3845, 255, 250, 205 },
+	{ 3859, 255, 250, 205 },
+	{ 3872, 255, 250, 205 },
+	{ 3886, 238, 233, 191 },
+	{ 3900, 205, 201, 165 },
+	{ 3914, 139, 137, 112 },
+	{ 3928, 173, 216, 230 },
+	{ 3939, 240, 128, 128 },
+	{ 3951, 224, 255, 255 },
+	{ 3962, 238, 221, 130 },
+	{ 3978, 250, 250, 210 },
+	{ 4001, 211, 211, 211 },
+	{ 4012, 144, 238, 144 },
+	{ 4024, 211, 211, 211 },
+	{ 4035, 255, 182, 193 },
+	{ 4046, 255, 160, 122 },
+	{ 4059, 32, 178, 170 },
+	{ 4075, 135, 206, 250 },
+	{ 4090, 132, 112, 255 },
+	{ 4107, 119, 136, 153 },
+	{ 4124, 119, 136, 153 },
+	{ 4141, 176, 196, 222 },
+	{ 4158, 255, 255, 224 },
+	{ 4171, 173, 216, 230 },
+	{ 4181, 191, 239, 255 },
+	{ 4192, 178, 223, 238 },
+	{ 4203, 154, 192, 205 },
+	{ 4214, 104, 131, 139 },
+	{ 4225, 240, 128, 128 },
+	{ 4236, 224, 255, 255 },
+	{ 4246, 224, 255, 255 },
+	{ 4257, 209, 238, 238 },
+	{ 4268, 180, 205, 205 },
+	{ 4279, 122, 139, 139 },
+	{ 4290, 238, 221, 130 },
+	{ 4305, 255, 236, 139 },
+	{ 4321, 238, 220, 130 },
+	{ 4337, 205, 190, 112 },
+	{ 4353, 139, 129, 76 },
+	{ 4369, 250, 250, 210 },
+	{ 4390, 211, 211, 211 },
+	{ 4400, 144, 238, 144 },
+	{ 4411, 211, 211, 211 },
+	{ 4421, 255, 182, 193 },
+	{ 4431, 255, 174, 185 },
+	{ 4442, 238, 162, 173 },
+	{ 4453, 205, 140, 149 },
+	{ 4464, 139, 95, 101 },
+	{ 4475, 255, 160, 122 },
+	{ 4487, 255, 160, 122 },
+	{ 4500, 238, 149, 114 },
+	{ 4513, 205, 129, 98 },
+	{ 4526, 139, 87, 66 },
+	{ 4539, 32, 178, 170 },
+	{ 4553, 135, 206, 250 },
+	{ 4566, 176, 226, 255 },
+	{ 4580, 164, 211, 238 },
+	{ 4594, 141, 182, 205 },
+	{ 4608, 96, 123, 139 },
+	{ 4622, 132, 112, 255 },
+	{ 4637, 119, 136, 153 },
+	{ 4652, 119, 136, 153 },
+	{ 4667, 176, 196, 222 },
+	{ 4682, 202, 225, 255 },
+	{ 4698, 188, 210, 238 },
+	{ 4714, 162, 181, 205 },
+	{ 4730, 110, 123, 139 },
+	{ 4746, 255, 255, 224 },
+	{ 4758, 255, 255, 224 },
+	{ 4771, 238, 238, 209 },
+	{ 4784, 205, 205, 180 },
+	{ 4797, 139, 139, 122 },
+	{ 4810, 0, 255, 0 },
+	{ 4815, 50, 205, 50 },
+	{ 4826, 50, 205, 50 },
+	{ 4836, 250, 240, 230 },
+	{ 4842, 255, 0, 255 },
+	{ 4850, 255, 0, 255 },
+	{ 4859, 238, 0, 238 },
+	{ 4868, 205, 0, 205 },
+	{ 4877, 139, 0, 139 },
+	{ 4886, 176, 48, 96 },
+	{ 4893, 255, 52, 179 },
+	{ 4901, 238, 48, 167 },
+	{ 4909, 205, 41, 144 },
+	{ 4917, 139, 28, 98 },
+	{ 4925, 102, 205, 170 },
+	{ 4943, 0, 0, 205 },
+	{ 4955, 186, 85, 211 },
+	{ 4969, 147, 112, 219 },
+	{ 4983, 60, 179, 113 },
+	{ 5000, 123, 104, 238 },
+	{ 5018, 0, 250, 154 },
+	{ 5038, 72, 209, 204 },
+	{ 5055, 199, 21, 133 },
+	{ 5073, 102, 205, 170 },
+	{ 5090, 0, 0, 205 },
+	{ 5101, 186, 85, 211 },
+	{ 5114, 224, 102, 255 },
+	{ 5128, 209, 95, 238 },
+	{ 5142, 180, 82, 205 },
+	{ 5156, 122, 55, 139 },
+	{ 5170, 147, 112, 219 },
+	{ 5183, 171, 130, 255 },
+	{ 5197, 159, 121, 238 },
+	{ 5211, 137, 104, 205 },
+	{ 5225, 93, 71, 139 },
+	{ 5239, 60, 179, 113 },
+	{ 5254, 123, 104, 238 },
+	{ 5270, 0, 250, 154 },
+	{ 5288, 72, 209, 204 },
+	{ 5304, 199, 21, 133 },
+	{ 5320, 25, 25, 112 },
+	{ 5334, 25, 25, 112 },
+	{ 5347, 245, 255, 250 },
+	{ 5358, 245, 255, 250 },
+	{ 5368, 255, 228, 225 },
+	{ 5379, 255, 228, 225 },
+	{ 5389, 255, 228, 225 },
+	{ 5400, 238, 213, 210 },
+	{ 5411, 205, 183, 181 },
+	{ 5422, 139, 125, 123 },
+	{ 5433, 255, 228, 181 },
+	{ 5442, 255, 222, 173 },
+	{ 5455, 255, 222, 173 },
+	{ 5467, 255, 222, 173 },
+	{ 5480, 238, 207, 161 },
+	{ 5493, 205, 179, 139 },
+	{ 5506, 139, 121, 94 },
+	{ 5519, 0, 0, 128 },
+	{ 5524, 0, 0, 128 },
+	{ 5534, 0, 0, 128 },
+	{ 5543, 253, 245, 230 },
+	{ 5552, 253, 245, 230 },
+	{ 5560, 128, 128, 0 },
+	{ 5566, 107, 142, 35 },
+	{ 5577, 107, 142, 35 },
+	{ 5587, 192, 255, 62 },
+	{ 5598, 179, 238, 58 },
+	{ 5609, 154, 205, 50 },
+	{ 5620, 105, 139, 34 },
+	{ 5631, 255, 165, 0 },
+	{ 5638, 255, 69, 0 },
+	{ 5649, 255, 165, 0 },
+	{ 5657, 238, 154, 0 },
+	{ 5665, 205, 133, 0 },
+	{ 5673, 139, 90, 0 },
+	{ 5681, 255, 69, 0 },
+	{ 5691, 255, 69, 0 },
+	{ 5702, 238, 64, 0 },
+	{ 5713, 205, 55, 0 },
+	{ 5724, 139, 37, 0 },
+	{ 5735, 218, 112, 214 },
+	{ 5742, 255, 131, 250 },
+	{ 5750, 238, 122, 233 },
+	{ 5758, 205, 105, 201 },
+	{ 5766, 139, 71, 137 },
+	{ 5774, 238, 232, 170 },
+	{ 5789, 152, 251, 152 },
+	{ 5800, 175, 238, 238 },
+	{ 5815, 219, 112, 147 },
+	{ 5831, 238, 232, 170 },
+	{ 5845, 152, 251, 152 },
+	{ 5855, 154, 255, 154 },
+	{ 5866, 144, 238, 144 },
+	{ 5877, 124, 205, 124 },
+	{ 5888, 84, 139, 84 },
+	{ 5899, 175, 238, 238 },
+	{ 5913, 187, 255, 255 },
+	{ 5928, 174, 238, 238 },
+	{ 5943, 150, 205, 205 },
+	{ 5958, 102, 139, 139 },
+	{ 5973, 219, 112, 147 },
+	{ 5987, 255, 130, 171 },
+	{ 6002, 238, 121, 159 },
+	{ 6017, 205, 104, 137 },
+	{ 6032, 139, 71, 93 },
+	{ 6047, 255, 239, 213 },
+	{ 6059, 255, 239, 213 },
+	{ 6070, 255, 218, 185 },
+	{ 6081, 255, 218, 185 },
+	{ 6091, 255, 218, 185 },
+	{ 6102, 238, 203, 173 },
+	{ 6113, 205, 175, 149 },
+	{ 6124, 139, 119, 101 },
+	{ 6135, 205, 133, 63 },
+	{ 6140, 255, 192, 203 },
+	{ 6145, 255, 181, 197 },
+	{ 6151, 238, 169, 184 },
+	{ 6157, 205, 145, 158 },
+	{ 6163, 139, 99, 108 },
+	{ 6169, 221, 160, 221 },
+	{ 6174, 255, 187, 255 },
+	{ 6180, 238, 174, 238 },
+	{ 6186, 205, 150, 205 },
+	{ 6192, 139, 102, 139 },
+	{ 6198, 176, 224, 230 },
+	{ 6210, 176, 224, 230 },
+	{ 6221, 160, 32, 240 },
+	{ 6228, 155, 48, 255 },
+	{ 6236, 145, 44, 238 },
+	{ 6244, 125, 38, 205 },
+	{ 6252, 85, 26, 139 },
+	{ 6260, 102, 51, 153 },
+	{ 6275, 102, 51, 153 },
+	{ 6289, 255, 0, 0 },
+	{ 6293, 255, 0, 0 },
+	{ 6298, 238, 0, 0 },
+	{ 6303, 205, 0, 0 },
+	{ 6308, 139, 0, 0 },
+	{ 6313, 188, 143, 143 },
+	{ 6324, 188, 143, 143 },
+	{ 6334, 255, 193, 193 },
+	{ 6345, 238, 180, 180 },
+	{ 6356, 205, 155, 155 },
+	{ 6367, 139, 105, 105 },
+	{ 6378, 65, 105, 225 },
+	{ 6389, 65, 105, 225 },
+	{ 6399, 72, 118, 255 },
+	{ 6410, 67, 110, 238 },
+	{ 6421, 58, 95, 205 },
+	{ 6432, 39, 64, 139 },
+	{ 6443, 139, 69, 19 },
+	{ 6456, 139, 69, 19 },
+	{ 6468, 250, 128, 114 },
+	{ 6475, 255, 140, 105 },
+	{ 6483, 238, 130, 98 },
+	{ 6491, 205, 112, 84 },
+	{ 6499, 139, 76, 57 },
+	{ 6507, 244, 164, 96 },
+	{ 6519, 244, 164, 96 },
+	{ 6530, 46, 139, 87 },
+	{ 6540, 46, 139, 87 },
+	{ 6549, 84, 255, 159 },
+	{ 6559, 78, 238, 148 },
+	{ 6569, 67, 205, 128 },
+	{ 6579, 46, 139, 87 },
+	{ 6589, 255, 245, 238 },
+	{ 6598, 255, 245, 238 },
+	{ 6608, 238, 229, 222 },
+	{ 6618, 205, 197, 191 },
+	{ 6628, 139, 134, 130 },
+	{ 6638, 160, 82, 45 },
+	{ 6645, 255, 130, 71 },
+	{ 6653, 238, 121, 66 },
+	{ 6661, 205, 104, 57 },
+	{ 6669, 139, 71, 38 },
+	{ 6677, 192, 192, 192 },
+	{ 6684, 135, 206, 235 },
+	{ 6693, 135, 206, 235 },
+	{ 6701, 135, 206, 255 },
+	{ 6710, 126, 192, 238 },
+	{ 6719, 108, 166, 205 },
+	{ 6728, 74, 112, 139 },
+	{ 6737, 106, 90, 205 },
+	{ 6748, 112, 128, 144 },
+	{ 6759, 112, 128, 144 },
+	{ 6770, 106, 90, 205 },
+	{ 6780, 131, 111, 255 },
+	{ 6791, 122, 103, 238 },
+	{ 6802, 105, 89, 205 },
+	{ 6813, 71, 60, 139 },
+	{ 6824, 112, 128, 144 },
+	{ 6834, 198, 226, 255 },
+	{ 6845, 185, 211, 238 },
+	{ 6856, 159, 182, 205 },
+	{ 6867, 108, 123, 139 },
+	{ 6878, 112, 128, 144 },
+	{ 6888, 255, 250, 250 },
+	{ 6893, 255, 250, 250 },
+	{ 6899, 238, 233, 233 },
+	{ 6905, 205, 201, 201 },
+	{ 6911, 139, 137, 137 },
+	{ 6917, 0, 255, 127 },
+	{ 6930, 0, 255, 127 },
+	{ 6942, 0, 255, 127 },
+	{ 6955, 0, 238, 118 },
+	{ 6968, 0, 205, 102 },
+	{ 6981, 0, 139, 69 },
+	{ 6994, 70, 130, 180 },
+	{ 7005, 70, 130, 180 },
+	{ 7015, 99, 184, 255 },
+	{ 7026, 92, 172, 238 },
+	{ 7037, 79, 148, 205 },
+	{ 7048, 54, 100, 139 },
+	{ 7059, 210, 180, 140 },
+	{ 7063, 255, 165, 79 },
+	{ 7068, 238, 154, 73 },
+	{ 7073, 205, 133, 63 },
+	{ 7078, 139, 90, 43 },
+	{ 7083, 0, 128, 128 },
+	{ 7088, 216, 191, 216 },
+	{ 7096, 255, 225, 255 },
+	{ 7105, 238, 210, 238 },
+	{ 7114, 205, 181, 205 },
+	{ 7123, 139, 123, 139 },
+	{ 7132, 255, 99, 71 },
+	{ 7139, 255, 99, 71 },
+	{ 7147, 238, 92, 66 },
+	{ 7155, 205, 79, 57 },
+	{ 7163, 139, 54, 38 },
+	{ 7171, 64, 224, 208 },
+	{ 7181, 0, 245, 255 },
+	{ 7192, 0, 229, 238 },
+	{ 7203, 0, 197, 205 },
+	{ 7214, 0, 134, 139 },
+	{ 7225, 238, 130, 238 },
+	{ 7232, 208, 32, 144 },
+	{ 7243, 208, 32, 144 },
+	{ 7253, 255, 62, 150 },
+	{ 7264, 238, 58, 140 },
+	{ 7275, 205, 50, 120 },
+	{ 7286, 139, 34, 82 },
+	{ 7297, 128, 128, 128 },
+	{ 7306, 0, 128, 0 },
+	{ 7316, 128, 128, 128 },
+	{ 7325, 128, 0, 0 },
+	{ 7336, 128, 0, 128 },
+	{ 7347, 128, 128, 128 },
+	{ 7355, 0, 128, 0 },
+	{ 7364, 128, 128, 128 },
+	{ 7372, 128, 0, 0 },
+	{ 7382, 128, 0, 128 },
+	{ 7392, 245, 222, 179 },
+	{ 7398, 255, 231, 186 },
+	{ 7405, 238, 216, 174 },
+	{ 7412, 205, 186, 150 },
+	{ 7419, 139, 126, 102 },
+	{ 7426, 255, 255, 255 },
+	{ 7432, 245, 245, 245 },
+	{ 7444, 245, 245, 245 },
+	{ 7455, 190, 190, 190 },
+	{ 7464, 0, 255, 0 },
+	{ 7474, 190, 190, 190 },
+	{ 7483, 176, 48, 96 },
+	{ 7494, 160, 32, 240 },
+	{ 7505, 190, 190, 190 },
+	{ 7513, 0, 255, 0 },
+	{ 7522, 190, 190, 190 },
+	{ 7530, 176, 48, 96 },
+	{ 7540, 160, 32, 240 },
+	{ 7550, 255, 255, 0 },
+	{ 7557, 154, 205, 50 },
+	{ 7570, 255, 255, 0 },
+	{ 7578, 238, 238, 0 },
+	{ 7586, 205, 205, 0 },
+	{ 7594, 139, 139, 0 },
+	{ 7602, 154, 205, 50 }
+};
diff --git a/src/input/cursor.c b/src/input/cursor.c
index 663f419d..513aff3a 100644
--- a/src/input/cursor.c
+++ b/src/input/cursor.c
@@ -13,12 +13,13 @@
 #include "common/scene-helpers.h"
 #include "common/surface-helpers.h"
 #include "config/mousebind.h"
+#include "config/tablet-tool.h"
 #include "dnd.h"
 #include "idle.h"
 #include "input/gestures.h"
 #include "input/touch.h"
+#include "input/tablet.h"
 #include "input/tablet-tool.h"
-#include "input/tablet-pad.h"
 #include "labwc.h"
 #include "layers.h"
 #include "menu/menu.h"
@@ -232,16 +233,38 @@ request_set_primary_selection_notify(struct wl_listener *listener, void *data)
 static void
 process_cursor_move(struct server *server, uint32_t time)
 {
-	double dx = server->seat.cursor->x - server->grab_x;
-	double dy = server->seat.cursor->y - server->grab_y;
 	struct view *view = server->grabbed_view;
 
-	/* Move the grabbed view to the new position. */
-	dx += server->grab_box.x;
-	dy += server->grab_box.y;
-	resistance_move_apply(view, &dx, &dy);
-	view_move(view, dx, dy);
+	int x = server->grab_box.x + (server->seat.cursor->x - server->grab_x);
+	int y = server->grab_box.y + (server->seat.cursor->y - server->grab_y);
 
+	/* Apply resistance for maximized/tiled view */
+	bool needs_untile = resistance_unsnap_apply(view, &x, &y);
+	if (needs_untile) {
+		/*
+		 * When the view needs to be un-tiled, resize it to natural
+		 * geometry while anchoring it to cursor. If the natural
+		 * geometry is unknown (possible with xdg-shell views), then
+		 * we set a size of 0x0 here and determine the correct geometry
+		 * later. See do_late_positioning() in xdg.c.
+		 */
+		struct wlr_box new_geo = {
+			.width = view->natural_geometry.width,
+			.height = view->natural_geometry.height,
+		};
+		interactive_anchor_to_cursor(server, &new_geo);
+		/* Shaded clients will not process resize events until unshaded */
+		view_set_shade(view, false);
+		view_set_untiled(view);
+		view_restore_to(view, new_geo);
+		x = new_geo.x;
+		y = new_geo.y;
+	}
+
+	/* Then apply window & edge resistance */
+	resistance_move_apply(view, &x, &y);
+
+	view_move(view, x, y);
 	overlay_update(&server->seat);
 }
 
@@ -358,15 +381,6 @@ cursor_update_image(struct seat *seat)
 		cursor_names[cursor]);
 }
 
-bool
-input_inhibit_blocks_surface(struct seat *seat, struct wl_resource *resource)
-{
-	struct wl_client *inhibiting_client =
-		seat->active_client_while_inhibited;
-	return inhibiting_client
-		&& inhibiting_client != wl_resource_get_client(resource);
-}
-
 static bool
 update_pressed_surface(struct seat *seat, struct cursor_context *ctx)
 {
@@ -386,11 +400,8 @@ update_pressed_surface(struct seat *seat, struct cursor_context *ctx)
 	}
 	if (seat->pressed.surface && ctx->surface != seat->pressed.surface) {
 		struct wlr_surface *toplevel = get_toplevel(ctx->surface);
-		if (toplevel && toplevel == seat->pressed.toplevel) {
-			/* No need to recompute resize edges here */
-			seat_set_pressed(seat, ctx->view,
-				ctx->node, ctx->surface, toplevel,
-				seat->pressed.resize_edges);
+		if (toplevel && toplevel == get_toplevel(seat->pressed.surface)) {
+			seat_set_pressed(seat, ctx);
 			return true;
 		}
 	}
@@ -472,8 +483,7 @@ cursor_update_common(struct server *server, struct cursor_context *ctx,
 		return false;
 	}
 
-	if (ctx->surface && !input_inhibit_blocks_surface(seat,
-			ctx->surface->resource)) {
+	if (ctx->surface) {
 		/*
 		 * Cursor is over an input-enabled client surface.  The
 		 * cursor image will be set by request_cursor_notify()
@@ -584,9 +594,8 @@ cursor_process_motion(struct server *server, uint32_t time, double *sx, double *
 			 * moving/resizing the wrong view
 			 */
 			mousebind->pressed_in_context = false;
-			actions_run(seat->pressed.view,
-				server, &mousebind->actions,
-				seat->pressed.resize_edges);
+			actions_run(seat->pressed.view, server,
+				&mousebind->actions, &seat->pressed);
 		}
 	}
 
@@ -740,6 +749,9 @@ constrain_cursor(struct server *server, struct wlr_pointer_constraint_v1
 static void
 apply_constraint(struct seat *seat, struct wlr_pointer *pointer, double *x, double *y)
 {
+	if (!seat->server->active_view) {
+		return;
+	}
 	if (!seat->current_constraint || pointer->base.type != WLR_INPUT_DEVICE_POINTER) {
 		return;
 	}
@@ -848,16 +860,15 @@ cursor_motion_absolute(struct wl_listener *listener, void *data)
 		event->time_msec, dx, dy);
 }
 
-static bool
+static void
 handle_release_mousebinding(struct server *server,
 		struct cursor_context *ctx, uint32_t button)
 {
 	if (server->osd_state.cycle_view) {
-		return false;
+		return;
 	}
 
 	struct mousebind *mousebind;
-	bool consumed_by_frame_context = false;
 
 	uint32_t modifiers = wlr_keyboard_get_modifiers(
 			&server->seat.keyboard_group->keyboard);
@@ -874,37 +885,12 @@ handle_release_mousebinding(struct server *server,
 					break;
 				}
 				continue;
-			case MOUSE_ACTION_DRAG:
-				if (mousebind->pressed_in_context) {
-					/*
-					 * Swallow the release event as well as
-					 * the press one
-					 */
-					consumed_by_frame_context |=
-						mousebind->context == LAB_SSD_FRAME;
-					consumed_by_frame_context |=
-						mousebind->context == LAB_SSD_ALL;
-				}
-				continue;
 			default:
 				continue;
 			}
-			consumed_by_frame_context |= mousebind->context == LAB_SSD_FRAME;
-			consumed_by_frame_context |= mousebind->context == LAB_SSD_ALL;
-			actions_run(ctx->view, server, &mousebind->actions,
-				/*resize_edges*/ 0);
+			actions_run(ctx->view, server, &mousebind->actions, ctx);
 		}
 	}
-	/*
-	 * Clear "pressed" status for all bindings of this mouse button,
-	 * regardless of whether handled or not
-	 */
-	wl_list_for_each(mousebind, &rc.mousebinds, link) {
-		if (mousebind->button == button) {
-			mousebind->pressed_in_context = false;
-		}
-	}
-	return consumed_by_frame_context;
 }
 
 static bool
@@ -943,7 +929,7 @@ is_double_click(long double_click_speed, uint32_t button,
 
 static bool
 handle_press_mousebinding(struct server *server, struct cursor_context *ctx,
-		uint32_t button, uint32_t resize_edges)
+		uint32_t button)
 {
 	if (server->osd_state.cycle_view) {
 		return false;
@@ -969,10 +955,7 @@ handle_press_mousebinding(struct server *server, struct cursor_context *ctx,
 				 * counted as a DOUBLECLICK.
 				 */
 				if (!double_click) {
-					/*
-					 * Swallow the press event as well as
-					 * the release one
-					 */
+					/* Swallow the press event */
 					consumed_by_frame_context |=
 						mousebind->context == LAB_SSD_FRAME;
 					consumed_by_frame_context |=
@@ -992,7 +975,7 @@ handle_press_mousebinding(struct server *server, struct cursor_context *ctx,
 			}
 			consumed_by_frame_context |= mousebind->context == LAB_SSD_FRAME;
 			consumed_by_frame_context |= mousebind->context == LAB_SSD_ALL;
-			actions_run(ctx->view, server, &mousebind->actions, resize_edges);
+			actions_run(ctx->view, server, &mousebind->actions, ctx);
 		}
 	}
 	return consumed_by_frame_context;
@@ -1009,13 +992,9 @@ cursor_process_button_press(struct seat *seat, uint32_t button, uint32_t time_ms
 	/* Used on next button release to check if it can close menu or select menu item */
 	press_msec = time_msec;
 
-	/* Determine closest resize edges in case action is Resize */
-	uint32_t resize_edges = cursor_get_resize_edges(seat->cursor, &ctx);
-
 	if (ctx.view || ctx.surface) {
-		/* Store resize edges for later action processing */
-		seat_set_pressed(seat, ctx.view, ctx.node, ctx.surface,
-			get_toplevel(ctx.surface), resize_edges);
+		/* Store cursor context for later action processing */
+		seat_set_pressed(seat, &ctx);
 	}
 
 	if (server->input_mode == LAB_INPUT_STATE_MENU) {
@@ -1024,6 +1003,7 @@ cursor_process_button_press(struct seat *seat, uint32_t button, uint32_t time_ms
 		 * so subsequent release always closes menu or selects menu item.
 		 */
 		press_msec = 0;
+		lab_set_add(&seat->bound_buttons, button);
 		return false;
 	}
 
@@ -1064,18 +1044,20 @@ cursor_process_button_press(struct seat *seat, uint32_t button, uint32_t time_ms
 		 * Note: This does not work for XWayland clients
 		 */
 		wlr_seat_pointer_end_grab(seat->seat);
+		lab_set_add(&seat->bound_buttons, button);
 		return false;
 	}
 
 	/* Bindings to the Frame context swallow mouse events if activated */
 	bool consumed_by_frame_context =
-		handle_press_mousebinding(server, &ctx, button, resize_edges);
+		handle_press_mousebinding(server, &ctx, button);
 
 	if (ctx.surface && !consumed_by_frame_context) {
 		/* Notify client with pointer focus of button press */
 		return true;
 	}
 
+	lab_set_add(&seat->bound_buttons, button);
 	return false;
 }
 
@@ -1087,6 +1069,9 @@ cursor_process_button_release(struct seat *seat, uint32_t button,
 	struct cursor_context ctx = get_cursor_context(server);
 	struct wlr_surface *pressed_surface = seat->pressed.surface;
 
+	/* Always notify button release event when it's not bound */
+	const bool notify = !lab_set_contains(&seat->bound_buttons, button);
+
 	seat_reset_pressed(seat);
 
 	if (server->input_mode == LAB_INPUT_STATE_MENU) {
@@ -1101,15 +1086,11 @@ cursor_process_button_release(struct seat *seat, uint32_t button,
 					/*cursor_has_moved*/ false, &sx, &sy);
 			}
 		}
-		return false;
+		return notify;
 	}
 
 	if (server->input_mode != LAB_INPUT_STATE_PASSTHROUGH) {
-		if (pressed_surface) {
-			/* Ensure CSD clients see the release event */
-			return true;
-		}
-		return false;
+		return notify;
 	}
 
 	if (pressed_surface && ctx.surface != pressed_surface) {
@@ -1117,26 +1098,29 @@ cursor_process_button_release(struct seat *seat, uint32_t button,
 		 * Button released but originally pressed over a different surface.
 		 * Just send the release event to the still focused surface.
 		 */
-		return true;
+		return notify;
 	}
 
-	/* Bindings to the Frame context swallow mouse events if activated */
-	bool consumed_by_frame_context =
-		handle_release_mousebinding(server, &ctx, button);
+	handle_release_mousebinding(server, &ctx, button);
 
-	if (!consumed_by_frame_context) {
-		/* Notify client with pointer focus of button release */
-		return true;
-	}
-
-	return false;
+	return notify;
 }
 
 bool
-cursor_finish_button_release(struct seat *seat)
+cursor_finish_button_release(struct seat *seat, uint32_t button)
 {
 	struct server *server = seat->server;
 
+	/* Clear "pressed" status for all bindings of this mouse button */
+	struct mousebind *mousebind;
+	wl_list_for_each(mousebind, &rc.mousebinds, link) {
+		if (mousebind->button == button) {
+			mousebind->pressed_in_context = false;
+		}
+	}
+
+	lab_set_remove(&seat->bound_buttons, button);
+
 	if (server->input_mode == LAB_INPUT_STATE_MOVE
 			|| server->input_mode == LAB_INPUT_STATE_RESIZE) {
 		if (resize_outlines_enabled(server->grabbed_view)) {
@@ -1163,7 +1147,7 @@ cursor_button(struct wl_listener *listener, void *data)
 
 	bool notify;
 	switch (event->state) {
-	case WLR_BUTTON_PRESSED:
+	case WL_POINTER_BUTTON_STATE_PRESSED:
 		notify = cursor_process_button_press(seat, event->button,
 			event->time_msec);
 		if (notify) {
@@ -1171,31 +1155,22 @@ cursor_button(struct wl_listener *listener, void *data)
 				event->button, event->state);
 		}
 		break;
-	case WLR_BUTTON_RELEASED:
+	case WL_POINTER_BUTTON_STATE_RELEASED:
 		notify = cursor_process_button_release(seat, event->button,
 			event->time_msec);
 		if (notify) {
 			wlr_seat_pointer_notify_button(seat->seat, event->time_msec,
 				event->button, event->state);
 		}
-		cursor_finish_button_release(seat);
+		cursor_finish_button_release(seat, event->button);
 		break;
 	}
 }
 
 void
-cursor_emulate_move_absolute(struct seat *seat, struct wlr_input_device *device,
-		double x, double y, uint32_t time_msec)
+cursor_emulate_move(struct seat *seat, struct wlr_input_device *device,
+		double dx, double dy, uint32_t time_msec)
 {
-	idle_manager_notify_activity(seat->seat);
-
-	double lx, ly;
-	wlr_cursor_absolute_to_layout_coords(seat->cursor,
-		device, x, y, &lx, &ly);
-
-	double dx = lx - seat->cursor->x;
-	double dy = ly - seat->cursor->y;
-
 	if (!dx && !dy) {
 		wlr_log(WLR_DEBUG, "dropping useless cursor_emulate: %.10f,%.10f", dx, dy);
 		return;
@@ -1215,29 +1190,45 @@ cursor_emulate_move_absolute(struct seat *seat, struct wlr_input_device *device,
 	wlr_seat_pointer_notify_frame(seat->seat);
 }
 
+void
+cursor_emulate_move_absolute(struct seat *seat, struct wlr_input_device *device,
+		double x, double y, uint32_t time_msec)
+{
+	idle_manager_notify_activity(seat->seat);
+
+	double lx, ly;
+	wlr_cursor_absolute_to_layout_coords(seat->cursor,
+		device, x, y, &lx, &ly);
+
+	double dx = lx - seat->cursor->x;
+	double dy = ly - seat->cursor->y;
+
+	cursor_emulate_move(seat, device, dx, dy, time_msec);
+}
+
 void
 cursor_emulate_button(struct seat *seat, uint32_t button,
-		enum wlr_button_state state, uint32_t time_msec)
+		enum wl_pointer_button_state state, uint32_t time_msec)
 {
 	idle_manager_notify_activity(seat->seat);
 
 	bool notify;
 	switch (state) {
-	case WLR_BUTTON_PRESSED:
+	case WL_POINTER_BUTTON_STATE_PRESSED:
 		notify = cursor_process_button_press(seat, button, time_msec);
 		if (notify) {
 			wlr_seat_pointer_notify_button(seat->seat, time_msec, button, state);
 		}
 		break;
-	case WLR_BUTTON_RELEASED:
+	case WL_POINTER_BUTTON_STATE_RELEASED:
 		notify = cursor_process_button_release(seat, button, time_msec);
 		if (notify) {
 			wlr_seat_pointer_notify_button(seat->seat, time_msec, button, state);
 		}
-		cursor_finish_button_release(seat);
+		cursor_finish_button_release(seat, button);
 		break;
 	}
-	wlr_seat_pointer_notify_frame (seat->seat);
+	wlr_seat_pointer_notify_frame(seat->seat);
 }
 
 static int
@@ -1283,14 +1274,14 @@ handle_cursor_axis(struct server *server, struct cursor_context *ctx,
 			&server->seat.keyboard_group->keyboard);
 
 	enum direction direction = LAB_DIRECTION_INVALID;
-	if (event->orientation == WLR_AXIS_ORIENTATION_HORIZONTAL) {
+	if (event->orientation == WL_POINTER_AXIS_HORIZONTAL_SCROLL) {
 		int rel = compare_delta(event, &server->seat.smooth_scroll_offset.x);
 		if (rel < 0) {
 			direction = LAB_DIRECTION_LEFT;
 		} else if (rel > 0) {
 			direction = LAB_DIRECTION_RIGHT;
 		}
-	} else if (event->orientation == WLR_AXIS_ORIENTATION_VERTICAL) {
+	} else if (event->orientation == WL_POINTER_AXIS_VERTICAL_SCROLL) {
 		int rel = compare_delta(event, &server->seat.smooth_scroll_offset.y);
 		if (rel < 0) {
 			direction = LAB_DIRECTION_UP;
@@ -1311,7 +1302,7 @@ handle_cursor_axis(struct server *server, struct cursor_context *ctx,
 				&& modifiers == mousebind->modifiers
 				&& mousebind->mouse_event == MOUSE_ACTION_SCROLL) {
 			handled = true;
-			actions_run(ctx->view, server, &mousebind->actions, /*resize_edges*/ 0);
+			actions_run(ctx->view, server, &mousebind->actions, ctx);
 		}
 	}
 
@@ -1328,6 +1319,13 @@ cursor_axis(struct wl_listener *listener, void *data)
 	struct seat *seat = wl_container_of(listener, seat, cursor_axis);
 	struct wlr_pointer_axis_event *event = data;
 	struct server *server = seat->server;
+
+	/* input->scroll_factor is set for pointer/touch devices */
+	assert(event->pointer->base.type == WLR_INPUT_DEVICE_POINTER
+		|| event->pointer->base.type == WLR_INPUT_DEVICE_TOUCH);
+	struct input *input = event->pointer->base.data;
+	double scroll_factor = input->scroll_factor;
+
 	struct cursor_context ctx = get_cursor_context(server);
 	idle_manager_notify_activity(seat->seat);
 
@@ -1342,9 +1340,9 @@ cursor_axis(struct wl_listener *listener, void *data)
 
 		/* Notify the client with pointer focus of the axis event. */
 		wlr_seat_pointer_notify_axis(seat->seat, event->time_msec,
-			event->orientation, rc.scroll_factor * event->delta,
-			round(rc.scroll_factor * event->delta_discrete),
-			event->source);
+			event->orientation, scroll_factor * event->delta,
+			round(scroll_factor * event->delta_discrete),
+			event->source, event->relative_direction);
 	}
 }
 
@@ -1444,6 +1442,8 @@ cursor_init(struct seat *seat)
 	gestures_init(seat);
 	touch_init(seat);
 
+	tablet_init(seat);
+
 	seat->request_cursor.notify = request_cursor_notify;
 	wl_signal_add(&seat->seat->events.request_set_cursor,
 		&seat->request_cursor);
@@ -1482,6 +1482,8 @@ void cursor_finish(struct seat *seat)
 	gestures_finish(seat);
 	touch_finish(seat);
 
+	tablet_finish(seat);
+
 	wl_list_remove(&seat->request_cursor.link);
 	wl_list_remove(&seat->request_set_shape.link);
 	wl_list_remove(&seat->request_set_selection.link);
diff --git a/src/input/key-state.c b/src/input/key-state.c
index 8ce66ff0..e5bfe3ca 100644
--- a/src/input/key-state.c
+++ b/src/input/key-state.c
@@ -5,19 +5,13 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wlr/util/log.h>
+#include "common/set.h"
 #include "input/key-state.h"
 
-#define MAX_PRESSED_KEYS (16)
-
-struct key_array {
-	uint32_t keys[MAX_PRESSED_KEYS];
-	int nr_keys;
-};
-
-static struct key_array pressed, pressed_mods, bound, pressed_sent;
+static struct lab_set pressed, pressed_mods, bound, pressed_sent;
 
 static void
-report(struct key_array *array, const char *msg)
+report(struct lab_set *key_set, const char *msg)
 {
 	static char *should_print;
 	static bool has_run;
@@ -30,48 +24,12 @@ report(struct key_array *array, const char *msg)
 		return;
 	}
 	printf("%s", msg);
-	for (int i = 0; i < array->nr_keys; ++i) {
-		printf("%d,", array->keys[i]);
+	for (int i = 0; i < key_set->size; ++i) {
+		printf("%d,", key_set->values[i]);
 	}
 	printf("\n");
 }
 
-static bool
-key_present(struct key_array *array, uint32_t keycode)
-{
-	for (int i = 0; i < array->nr_keys; ++i) {
-		if (array->keys[i] == keycode) {
-			return true;
-		}
-	}
-	return false;
-}
-
-static void
-remove_key(struct key_array *array, uint32_t keycode)
-{
-	bool shifting = false;
-
-	for (int i = 0; i < MAX_PRESSED_KEYS; ++i) {
-		if (array->keys[i] == keycode) {
-			--array->nr_keys;
-			shifting = true;
-		}
-		if (shifting) {
-			array->keys[i] = i < MAX_PRESSED_KEYS - 1
-				? array->keys[i + 1] : 0;
-		}
-	}
-}
-
-static void
-add_key(struct key_array *array, uint32_t keycode)
-{
-	if (!key_present(array, keycode) && array->nr_keys < MAX_PRESSED_KEYS) {
-		array->keys[array->nr_keys++] = keycode;
-	}
-}
-
 uint32_t *
 key_state_pressed_sent_keycodes(void)
 {
@@ -80,70 +38,70 @@ key_state_pressed_sent_keycodes(void)
 
 	/* pressed_sent = pressed - bound */
 	pressed_sent = pressed;
-	for (int i = 0; i < bound.nr_keys; ++i) {
-		remove_key(&pressed_sent, bound.keys[i]);
+	for (int i = 0; i < bound.size; ++i) {
+		lab_set_remove(&pressed_sent, bound.values[i]);
 	}
 
 	report(&pressed_sent, "after - pressed_sent:");
 
-	return pressed_sent.keys;
+	return pressed_sent.values;
 }
 
 int
 key_state_nr_pressed_sent_keycodes(void)
 {
-	return pressed_sent.nr_keys;
+	return pressed_sent.size;
 }
 
 void
 key_state_set_pressed(uint32_t keycode, bool is_pressed, bool is_modifier)
 {
 	if (is_pressed) {
-		add_key(&pressed, keycode);
+		lab_set_add(&pressed, keycode);
 		if (is_modifier) {
-			add_key(&pressed_mods, keycode);
+			lab_set_add(&pressed_mods, keycode);
 		}
 	} else {
-		remove_key(&pressed, keycode);
-		remove_key(&pressed_mods, keycode);
+		lab_set_remove(&pressed, keycode);
+		lab_set_remove(&pressed_mods, keycode);
 	}
 }
 
 void
 key_state_store_pressed_key_as_bound(uint32_t keycode)
 {
-	add_key(&bound, keycode);
+	lab_set_add(&bound, keycode);
 	/*
 	 * Also store any pressed modifiers as bound. This prevents
 	 * applications from seeing and handling the release event for
 	 * a modifier key that was part of a keybinding (e.g. Firefox
 	 * displays its menu bar for a lone Alt press + release).
 	 */
-	for (int i = 0; i < pressed_mods.nr_keys; ++i) {
-		add_key(&bound, pressed_mods.keys[i]);
+	for (int i = 0; i < pressed_mods.size; ++i) {
+		lab_set_add(&bound, pressed_mods.values[i]);
 	}
 }
 
 bool
 key_state_corresponding_press_event_was_bound(uint32_t keycode)
 {
-	return key_present(&bound, keycode);
+	return lab_set_contains(&bound, keycode);
 }
 
 void
 key_state_bound_key_remove(uint32_t keycode)
 {
-	remove_key(&bound, keycode);
+	lab_set_remove(&bound, keycode);
 }
 
 int
 key_state_nr_bound_keys(void)
 {
-	return bound.nr_keys;
+	return bound.size;
 }
 
 int
 key_state_nr_pressed_keys(void)
 {
-	return pressed.nr_keys;
+	return pressed.size;
 }
diff --git a/src/input/keyboard.c b/src/input/keyboard.c
index 147ec4dc..01557e61 100644
--- a/src/input/keyboard.c
+++ b/src/input/keyboard.c
@@ -383,6 +383,16 @@ handle_menu_keys(struct server *server, struct keysyms *syms)
 	}
 }
 
+static void
+toggle_direction(enum lab_cycle_dir *direction)
+{
+	if (*direction == LAB_CYCLE_DIR_FORWARD) {
+		*direction = LAB_CYCLE_DIR_BACKWARD;
+	} else if (*direction == LAB_CYCLE_DIR_BACKWARD) {
+		*direction = LAB_CYCLE_DIR_FORWARD;
+	}
+}
+
 static void
 handle_cycle_view_key(struct server *server, struct keyinfo *keyinfo)
 {
@@ -397,21 +407,36 @@ handle_cycle_view_key(struct server *server, struct keyinfo *keyinfo)
 
 	/* cycle to next */
 	if (!keyinfo->is_modifier) {
-		bool back_key = false;
+		enum lab_cycle_dir direction = server->osd_state.initial_direction;
 		for (int i = 0; i < keyinfo->translated.nr_syms; i++) {
 			if (keyinfo->translated.syms[i] == XKB_KEY_Up
 					|| keyinfo->translated.syms[i] == XKB_KEY_Left) {
-				back_key = true;
-				break;
+				direction = LAB_CYCLE_DIR_BACKWARD;
+				goto miss_shift_toggle;
+			}
+			if (keyinfo->translated.syms[i] == XKB_KEY_Down
+					|| keyinfo->translated.syms[i] == XKB_KEY_Right) {
+				direction = LAB_CYCLE_DIR_FORWARD;
+				goto miss_shift_toggle;
 			}
 		}
-		bool backwards = (keyinfo->modifiers & WLR_MODIFIER_SHIFT) || back_key;
 
-		enum lab_cycle_dir dir = backwards
-			? LAB_CYCLE_DIR_BACKWARD
-			: LAB_CYCLE_DIR_FORWARD;
+		bool shift_is_pressed = keyinfo->modifiers & WLR_MODIFIER_SHIFT;
+		if (shift_is_pressed != server->osd_state.initial_keybind_contained_shift) {
+			/*
+			 * Shift reverses the direction - unless shift was part of the
+			 * original keybind in which case we do the opposite.
+			 * For example with S-A-Tab bound to PreviousWindow, shift with
+			 * subsequent key presses should carry on cycling backwards.
+			 */
+			toggle_direction(&direction);
+		}
+
+	/* Only one direction modifier is allowed, either arrow keys OR shift */
+miss_shift_toggle:
+
 		server->osd_state.cycle_view = desktop_cycle_view(server,
-			server->osd_state.cycle_view, dir);
+			server->osd_state.cycle_view, direction);
 		osd_update(server);
 	}
 }
@@ -424,6 +449,7 @@ handle_compositor_keybindings(struct keyboard *keyboard,
 	struct server *server = seat->server;
 	struct wlr_keyboard *wlr_keyboard = keyboard->wlr_keyboard;
 	struct keyinfo keyinfo = get_keyinfo(wlr_keyboard, event->keycode);
+	bool locked = seat->server->session_lock_manager->locked;
 
 	key_state_set_pressed(event->keycode,
 		event->state == WL_KEYBOARD_KEY_STATE_PRESSED,
@@ -432,12 +458,11 @@ handle_compositor_keybindings(struct keyboard *keyboard,
 	if (event->state == WL_KEYBOARD_KEY_STATE_RELEASED) {
 		if (cur_keybind && cur_keybind->on_release) {
 			key_state_bound_key_remove(event->keycode);
-			if (seat->server->session_lock_manager->locked
-					|| seat->active_client_while_inhibited) {
+			if (locked && !cur_keybind->allow_when_locked) {
 				cur_keybind = NULL;
 				return true;
 			}
-			actions_run(NULL, server, &cur_keybind->actions, 0);
+			actions_run(NULL, server, &cur_keybind->actions, NULL);
 			return true;
 		} else {
 			return handle_key_release(server, event->keycode);
@@ -451,34 +476,29 @@ handle_compositor_keybindings(struct keyboard *keyboard,
 	}
 
 	/*
-	 * Ignore labwc keybindings if input is inhibited
+	 * Ignore labwc keybindings if the session is locked.
 	 * It's important to do this after key_state_set_pressed() to ensure
 	 * _all_ key press/releases are registered
 	 */
-	if (seat->active_client_while_inhibited) {
-		return false;
-	}
-	if (seat->server->session_lock_manager->locked) {
-		return false;
-	}
+	if (!locked) {
+		if (server->input_mode == LAB_INPUT_STATE_MENU) {
+			key_state_store_pressed_key_as_bound(event->keycode);
+			handle_menu_keys(server, &keyinfo.translated);
+			return true;
+		}
 
-	if (server->input_mode == LAB_INPUT_STATE_MENU) {
-		key_state_store_pressed_key_as_bound(event->keycode);
-		handle_menu_keys(server, &keyinfo.translated);
-		return true;
-	}
-
-	if (server->osd_state.cycle_view) {
-		key_state_store_pressed_key_as_bound(event->keycode);
-		handle_cycle_view_key(server, &keyinfo);
-		return true;
+		if (server->osd_state.cycle_view) {
+			key_state_store_pressed_key_as_bound(event->keycode);
+			handle_cycle_view_key(server, &keyinfo);
+			return true;
+		}
 	}
 
 	/*
 	 * Handle compositor keybinds
 	 */
 	cur_keybind = match_keybinding(server, &keyinfo, keyboard->is_virtual);
-	if (cur_keybind) {
+	if (cur_keybind && (!locked || cur_keybind->allow_when_locked)) {
 		/*
 		 * Update key-state before action_run() because the action
 		 * might lead to seat_focus() in which case we pass the
@@ -486,7 +506,7 @@ handle_compositor_keybindings(struct keyboard *keyboard,
 		 */
 		key_state_store_pressed_key_as_bound(event->keycode);
 		if (!cur_keybind->on_release) {
-			actions_run(NULL, server, &cur_keybind->actions, 0);
+			actions_run(NULL, server, &cur_keybind->actions, NULL);
 		}
 		return true;
 	}
@@ -678,7 +698,15 @@ set_layout(struct server *server, struct wlr_keyboard *kb)
 	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
 	struct xkb_keymap *keymap = xkb_map_new_from_names(context, &rules,
 		XKB_KEYMAP_COMPILE_NO_FLAGS);
-	if (keymap) {
+
+	/*
+	 * With XKB_DEFAULT_LAYOUT set to empty odd things happen with
+	 * xkb_map_new_from_names() resulting in the keyboard not working, so
+	 * we protect against that.
+	 */
+	const char *layout = getenv("XKB_DEFAULT_LAYOUT");
+	bool layout_empty = layout && !*layout;
+	if (keymap && !layout_empty) {
 		if (!wlr_keyboard_keymaps_match(kb->keymap, keymap)) {
 			wlr_keyboard_set_keymap(kb, keymap);
 			reset_window_keyboard_layout_groups(server);
@@ -686,7 +714,7 @@ set_layout(struct server *server, struct wlr_keyboard *kb)
 		xkb_keymap_unref(keymap);
 	} else {
 		wlr_log(WLR_ERROR, "failed to create xkb keymap for layout '%s'",
-			getenv("XKB_DEFAULT_LAYOUT"));
+			layout);
 		if (!fallback_mode) {
 			wlr_log(WLR_ERROR, "entering fallback mode with layout 'us'");
 			fallback_mode = true;
diff --git a/src/input/tablet-pad.c b/src/input/tablet-pad.c
index 1729e356..2453be96 100644
--- a/src/input/tablet-pad.c
+++ b/src/input/tablet-pad.c
@@ -25,12 +25,25 @@ tablet_pad_attach_tablet(struct seat *seat)
 	/* loop over all tablets and all pads and link by device group */
 	struct drawing_tablet *tablet;
 	wl_list_for_each(tablet, &seat->tablets, link) {
+		if (!wlr_input_device_is_libinput(tablet->wlr_input_device)) {
+			/*
+			 * Prevent iterating over non-libinput devices. This might
+			 * be the case when a tablet is exposed by the Wayland
+			 * protocol backend when running labwc as a nested compositor.
+			 */
+			continue;
+		}
+
 		struct libinput_device *tablet_device =
 			wlr_libinput_get_device_handle(tablet->wlr_input_device);
 		struct libinput_device_group *tablet_group =
 			libinput_device_get_device_group(tablet_device);
 
 		wl_list_for_each(pad, &seat->tablet_pads, link) {
+			if (!wlr_input_device_is_libinput(pad->wlr_input_device)) {
+				continue;
+			}
+
 			struct libinput_device *pad_device =
 				wlr_libinput_get_device_handle(pad->wlr_input_device);
 			struct libinput_device_group *pad_group =
@@ -103,7 +116,11 @@ handle_button(struct wl_listener *listener, void *data)
 	} else {
 		uint32_t button = tablet_get_mapped_button(ev->button);
 		if (button) {
-			cursor_emulate_button(pad->seat, button, ev->state, ev->time_msec);
+			cursor_emulate_button(pad->seat, button,
+				ev->state == WLR_BUTTON_PRESSED
+					? WL_POINTER_BUTTON_STATE_PRESSED
+					: WL_POINTER_BUTTON_STATE_RELEASED,
+				ev->time_msec);
 		}
 	}
 }
@@ -158,7 +175,7 @@ handle_destroy(struct wl_listener *listener, void *data)
 }
 
 void
-tablet_pad_init(struct seat *seat, struct wlr_input_device *wlr_device)
+tablet_pad_create(struct seat *seat, struct wlr_input_device *wlr_device)
 {
 	wlr_log(WLR_DEBUG, "setting up tablet pad");
 	struct drawing_tablet_pad *pad = znew(*pad);
@@ -170,6 +187,10 @@ tablet_pad_init(struct seat *seat, struct wlr_input_device *wlr_device)
 			seat->server->tablet_manager, seat->seat, wlr_device);
 	}
 	pad->pad->data = pad;
+	wlr_log(WLR_INFO, "tablet pad capabilities: %zu button(s) %zu strip(s) %zu ring(s)",
+		pad->pad->button_count,
+		pad->pad->strip_count,
+		pad->pad->ring_count);
 	CONNECT_SIGNAL(pad->pad, &pad->handlers, button);
 	CONNECT_SIGNAL(pad->pad, &pad->handlers, ring);
 	CONNECT_SIGNAL(pad->pad, &pad->handlers, strip);
diff --git a/src/input/tablet-tool.c b/src/input/tablet-tool.c
index 3e36f5b0..fcc1e733 100644
--- a/src/input/tablet-tool.c
+++ b/src/input/tablet-tool.c
@@ -60,7 +60,7 @@ handle_destroy(struct wl_listener *listener, void *data)
 }
 
 void
-tablet_tool_init(struct seat *seat,
+tablet_tool_create(struct seat *seat,
 		struct wlr_tablet_tool *wlr_tablet_tool)
 {
 	wlr_log(WLR_DEBUG, "setting up tablet tool");
diff --git a/src/input/tablet.c b/src/input/tablet.c
index 3d8caa61..9a72e6e5 100644
--- a/src/input/tablet.c
+++ b/src/input/tablet.c
@@ -19,15 +19,19 @@
 #include "idle.h"
 #include "action.h"
 
-static bool
-tool_supports_absolute_motion(struct wlr_tablet_tool *tool)
+static enum motion
+tool_motion_mode(enum motion motion, struct wlr_tablet_tool *tool)
 {
+	/*
+	 * Absolute positioning doesn't make sense
+	 * for tablet mouses and lenses.
+	 */
 	switch (tool->type) {
 	case WLR_TABLET_TOOL_TYPE_MOUSE:
 	case WLR_TABLET_TOOL_TYPE_LENS:
-		return false;
+		return LAB_TABLET_MOTION_RELATIVE;
 	default:
-		return true;
+		return motion;
 	}
 }
 
@@ -83,30 +87,80 @@ adjust_for_rotation(enum rotation rotation, double *x, double *y)
 	}
 }
 
+static void
+adjust_for_rotation_relative(enum rotation rotation, double *dx, double *dy)
+{
+	double tmp;
+	switch (rotation) {
+	case LAB_ROTATE_NONE:
+		break;
+	case LAB_ROTATE_90:
+		tmp = *dx;
+		*dx = -*dy;
+		*dy = tmp;
+		break;
+	case LAB_ROTATE_180:
+		*dx = -*dx;
+		*dy = -*dy;
+		break;
+	case LAB_ROTATE_270:
+		tmp = *dx;
+		*dx = *dy;
+		*dy = -tmp;
+		break;
+	}
+}
+
+static void
+adjust_for_motion_sensitivity(double motion_sensitivity, double *dx, double *dy)
+{
+	*dx = *dx * motion_sensitivity;
+	*dy = *dy * motion_sensitivity;
+}
+
 static struct wlr_surface*
-tablet_get_coords(struct drawing_tablet *tablet, double *x, double *y)
+tablet_get_coords(struct drawing_tablet *tablet, double *x, double *y, double *dx, double *dy)
 {
 	*x = tablet->x;
 	*y = tablet->y;
+	*dx = tablet->dx;
+	*dy = tablet->dy;
+	adjust_for_rotation(rc.tablet.rotation, x, y);
 	adjust_for_tablet_area(tablet->tablet->width_mm, tablet->tablet->height_mm,
 		rc.tablet.box, x, y);
-	adjust_for_rotation(rc.tablet.rotation, x, y);
+	adjust_for_rotation_relative(rc.tablet.rotation, dx, dy);
+	adjust_for_motion_sensitivity(rc.tablet_tool.relative_motion_sensitivity, dx, dy);
 
 	if (rc.tablet.force_mouse_emulation
 			|| !tablet->tablet_v2) {
 		return NULL;
 	}
 
-	/* Convert coordinates: first [0, 1] => layout, then layout => surface */
-	double lx, ly;
-	wlr_cursor_absolute_to_layout_coords(tablet->seat->cursor,
-		tablet->wlr_input_device, *x, *y, &lx, &ly);
+	/* convert coordinates: first [0, 1] => layout, then layout => surface */
+
+	/* initialize here to avoid a maybe-uninitialized compiler warning */
+	double lx = -1, ly = -1;
+	switch (tablet->motion_mode) {
+	case LAB_TABLET_MOTION_ABSOLUTE:
+		wlr_cursor_absolute_to_layout_coords(tablet->seat->cursor,
+			tablet->wlr_input_device, *x, *y, &lx, &ly);
+		break;
+	case LAB_TABLET_MOTION_RELATIVE:
+		/*
+		 * Deltas dx,dy will be directly passed into wlr_cursor_move,
+		 * so we can add those directly here to determine our future
+		 * position.
+		 */
+		lx = tablet->seat->cursor->x + *dx;
+		ly = tablet->seat->cursor->y + *dy;
+		break;
+	}
 
 	double sx, sy;
 	struct wlr_scene_node *node =
 		wlr_scene_node_at(&tablet->seat->server->scene->tree.node, lx, ly, &sx, &sy);
 
-	/* Find the surface and return it if it accepts tablet events */
+	/* find the surface and return it if it accepts tablet events */
 	struct wlr_surface *surface = lab_wlr_surface_from_node(node);
 
 	if (surface && !wlr_surface_accepts_tablet_v2(tablet->tablet_v2, surface)) {
@@ -117,7 +171,8 @@ tablet_get_coords(struct drawing_tablet *tablet, double *x, double *y)
 
 static void
 notify_motion(struct drawing_tablet *tablet, struct drawing_tablet_tool *tool,
-		struct wlr_surface *surface, double x, double y, uint32_t time)
+		struct wlr_surface *surface, double x, double y, double dx, double dy,
+		uint32_t time)
 {
 	idle_manager_notify_activity(tool->seat->seat);
 
@@ -129,8 +184,16 @@ notify_motion(struct drawing_tablet *tablet, struct drawing_tablet_tool *tool,
 			tablet->tablet_v2, surface);
 	}
 
-	wlr_cursor_warp_absolute(tablet->seat->cursor,
-		tablet->wlr_input_device, x, y);
+	switch (tablet->motion_mode) {
+	case LAB_TABLET_MOTION_ABSOLUTE:
+		wlr_cursor_warp_absolute(tablet->seat->cursor,
+			tablet->wlr_input_device, x, y);
+		break;
+	case LAB_TABLET_MOTION_RELATIVE:
+		wlr_cursor_move(tablet->seat->cursor,
+			tablet->wlr_input_device, dx, dy);
+		break;
+	}
 
 	double sx, sy;
 	bool notify = cursor_process_motion(tablet->seat->server, time, &sx, &sy);
@@ -173,24 +236,33 @@ notify_motion(struct drawing_tablet *tablet, struct drawing_tablet_tool *tool,
 }
 
 static void
-handle_proximity(struct wl_listener *listener, void *data)
+handle_tablet_tool_proximity(struct wl_listener *listener, void *data)
 {
 	struct wlr_tablet_tool_proximity_event *ev = data;
 	struct drawing_tablet *tablet = ev->tablet->data;
 	struct drawing_tablet_tool *tool = ev->tool->data;
-
-	if (!tool_supports_absolute_motion(ev->tool)) {
-		if (ev->state == WLR_TABLET_TOOL_PROXIMITY_IN) {
-			wlr_log(WLR_INFO, "ignoring not supporting tablet tool");
-		}
+	if (!tablet) {
+		wlr_log(WLR_DEBUG, "tool proximity event before tablet create");
 		return;
 	}
 
+	if (ev->state == WLR_TABLET_TOOL_PROXIMITY_IN) {
+		tablet->motion_mode =
+			tool_motion_mode(rc.tablet_tool.motion, ev->tool);
+	}
+
+	/*
+	 * Reset relative coordinates, we don't want to move the
+	 * cursor on proximity-in for relative positioning.
+	 */
+	tablet->dx = 0;
+	tablet->dy = 0;
+
 	tablet->x = ev->x;
 	tablet->y = ev->y;
 
-	double x, y;
-	struct wlr_surface *surface = tablet_get_coords(tablet, &x, &y);
+	double x, y, dx, dy;
+	struct wlr_surface *surface = tablet_get_coords(tablet, &x, &y, &dx, &dy);
 
 	if (!rc.tablet.force_mouse_emulation
 			&& tablet->seat->server->tablet_manager && !tool) {
@@ -198,7 +270,7 @@ handle_proximity(struct wl_listener *listener, void *data)
 		 * Unfortunately `wlr_tool` is only present in the events, so
 		 * use proximity for creating a `wlr_tablet_v2_tablet_tool`.
 		 */
-		tablet_tool_init(tablet->seat, ev->tool);
+		tablet_tool_create(tablet->seat, ev->tool);
 	}
 
 	/*
@@ -207,7 +279,7 @@ handle_proximity(struct wl_listener *listener, void *data)
 	 */
 	if (tool && surface) {
 		if (tool->tool_v2 && ev->state == WLR_TABLET_TOOL_PROXIMITY_IN) {
-			notify_motion(tablet, tool, surface, x, y, ev->time_msec);
+			notify_motion(tablet, tool, surface, x, y, dx, dy, ev->time_msec);
 		}
 		if (tool->tool_v2 && ev->state == WLR_TABLET_TOOL_PROXIMITY_OUT) {
 			wlr_tablet_v2_tablet_tool_notify_proximity_out(tool->tool_v2);
@@ -218,21 +290,32 @@ handle_proximity(struct wl_listener *listener, void *data)
 static bool is_down_mouse_emulation = false;
 
 static void
-handle_axis(struct wl_listener *listener, void *data)
+handle_tablet_tool_axis(struct wl_listener *listener, void *data)
 {
 	struct wlr_tablet_tool_axis_event *ev = data;
 	struct drawing_tablet *tablet = ev->tablet->data;
 	struct drawing_tablet_tool *tool = ev->tool->data;
-
-	if (!tool_supports_absolute_motion(ev->tool)) {
+	if (!tablet) {
+		wlr_log(WLR_DEBUG, "tool axis event before tablet create");
 		return;
 	}
 
+	/*
+	 * Reset relative coordinates. If those axes aren't updated,
+	 * the delta is zero.
+	 */
+	tablet->dx = 0;
+	tablet->dy = 0;
+	tablet->tilt_x = 0;
+	tablet->tilt_y = 0;
+
 	if (ev->updated_axes & WLR_TABLET_TOOL_AXIS_X) {
 		tablet->x = ev->x;
+		tablet->dx = ev->dx;
 	}
 	if (ev->updated_axes & WLR_TABLET_TOOL_AXIS_Y) {
 		tablet->y = ev->y;
+		tablet->dy = ev->dy;
 	}
 	if (ev->updated_axes & WLR_TABLET_TOOL_AXIS_DISTANCE) {
 		tablet->distance = ev->distance;
@@ -256,8 +339,8 @@ handle_axis(struct wl_listener *listener, void *data)
 		tablet->wheel_delta = ev->wheel_delta;
 	}
 
-	double x, y;
-	struct wlr_surface *surface = tablet_get_coords(tablet, &x, &y);
+	double x, y, dx, dy;
+	struct wlr_surface *surface = tablet_get_coords(tablet, &x, &y, &dx, &dy);
 
 	/*
 	 * We are sending tablet notifications on the following conditions:
@@ -274,7 +357,7 @@ handle_axis(struct wl_listener *listener, void *data)
 			&& tablet->seat->server->input_mode == LAB_INPUT_STATE_PASSTHROUGH)
 			|| wlr_tablet_tool_v2_has_implicit_grab(tool->tool_v2))) {
 		/* motion seems to be supported by all tools */
-		notify_motion(tablet, tool, surface, x, y, ev->time_msec);
+		notify_motion(tablet, tool, surface, x, y, dx, dy, ev->time_msec);
 
 		/* notify about other axis based on tool capabilities */
 		if (ev->tool->distance) {
@@ -299,7 +382,7 @@ handle_axis(struct wl_listener *listener, void *data)
 			 */
 			double tilt_x = tablet->tilt_x;
 			double tilt_y = tablet->tilt_y;
-			adjust_for_rotation(rc.tablet.rotation, &tilt_x, &tilt_y);
+			adjust_for_rotation_relative(rc.tablet.rotation, &tilt_x, &tilt_y);
 
 			wlr_tablet_v2_tablet_tool_notify_tilt(tool->tool_v2,
 				tilt_x, tilt_y);
@@ -322,8 +405,19 @@ handle_axis(struct wl_listener *listener, void *data)
 				wlr_tablet_v2_tablet_tool_notify_proximity_out(
 					tool->tool_v2);
 			}
-			cursor_emulate_move_absolute(tablet->seat, &ev->tablet->base,
-				x, y, ev->time_msec);
+
+			switch (tablet->motion_mode) {
+			case LAB_TABLET_MOTION_ABSOLUTE:
+				cursor_emulate_move_absolute(tablet->seat,
+					&ev->tablet->base,
+					x, y, ev->time_msec);
+				break;
+			case LAB_TABLET_MOTION_RELATIVE:
+				cursor_emulate_move(tablet->seat,
+					&ev->tablet->base,
+					dx, dy, ev->time_msec);
+				break;
+			}
 		}
 	}
 }
@@ -374,14 +468,18 @@ seat_pointer_end_grab(struct drawing_tablet_tool *tool,
 }
 
 static void
-handle_tip(struct wl_listener *listener, void *data)
+handle_tablet_tool_tip(struct wl_listener *listener, void *data)
 {
 	struct wlr_tablet_tool_tip_event *ev = data;
 	struct drawing_tablet *tablet = ev->tablet->data;
 	struct drawing_tablet_tool *tool = ev->tool->data;
+	if (!tablet) {
+		wlr_log(WLR_DEBUG, "tool tip event before tablet create");
+		return;
+	}
 
-	double x, y;
-	struct wlr_surface *surface = tablet_get_coords(tablet, &x, &y);
+	double x, y, dx, dy;
+	struct wlr_surface *surface = tablet_get_coords(tablet, &x, &y, &dx, &dy);
 
 	uint32_t button = tablet_get_mapped_button(BTN_TOOL_PEN);
 
@@ -418,7 +516,7 @@ handle_tip(struct wl_listener *listener, void *data)
 				wlr_tablet_v2_tablet_tool_notify_up(tool->tool_v2);
 			}
 
-			bool exit_interactive = cursor_finish_button_release(tool->seat);
+			bool exit_interactive = cursor_finish_button_release(tool->seat, BTN_LEFT);
 			if (exit_interactive && surface && tool->tool_v2->focused_surface) {
 				/*
 				 * Re-enter the surface after a resize/move to ensure
@@ -441,22 +539,26 @@ handle_tip(struct wl_listener *listener, void *data)
 			cursor_emulate_button(tablet->seat,
 				button,
 				ev->state == WLR_TABLET_TOOL_TIP_DOWN
-					? WLR_BUTTON_PRESSED
-					: WLR_BUTTON_RELEASED,
+					? WL_POINTER_BUTTON_STATE_PRESSED
+					: WL_POINTER_BUTTON_STATE_RELEASED,
 				ev->time_msec);
 		}
 	}
 }
 
 static void
-handle_button(struct wl_listener *listener, void *data)
+handle_tablet_tool_button(struct wl_listener *listener, void *data)
 {
 	struct wlr_tablet_tool_button_event *ev = data;
 	struct drawing_tablet *tablet = ev->tablet->data;
 	struct drawing_tablet_tool *tool = ev->tool->data;
+	if (!tablet) {
+		wlr_log(WLR_DEBUG, "tool button event before tablet create");
+		return;
+	}
 
-	double x, y;
-	struct wlr_surface *surface = tablet_get_coords(tablet, &x, &y);
+	double x, y, dx, dy;
+	struct wlr_surface *surface = tablet_get_coords(tablet, &x, &y, &dx, &dy);
 
 	uint32_t button = tablet_get_mapped_button(ev->button);
 
@@ -479,7 +581,7 @@ handle_button(struct wl_listener *listener, void *data)
 						&& mousebind->button == button
 						&& mousebind->context == LAB_SSD_CLIENT) {
 					actions_run(view, tool->seat->server,
-						&mousebind->actions, 0);
+						&mousebind->actions, NULL);
 				}
 			}
 		}
@@ -500,7 +602,11 @@ handle_button(struct wl_listener *listener, void *data)
 	} else {
 		if (button) {
 			is_down_mouse_emulation = ev->state == WLR_BUTTON_PRESSED;
-			cursor_emulate_button(tablet->seat, button, ev->state, ev->time_msec);
+			cursor_emulate_button(tablet->seat, button,
+				ev->state == WLR_BUTTON_PRESSED
+					? WL_POINTER_BUTTON_STATE_PRESSED
+					: WL_POINTER_BUTTON_STATE_RELEASED,
+				ev->time_msec);
 		}
 	}
 }
@@ -514,16 +620,12 @@ handle_destroy(struct wl_listener *listener, void *data)
 	wl_list_remove(&tablet->link);
 	tablet_pad_attach_tablet(tablet->seat);
 
-	wl_list_remove(&tablet->handlers.tip.link);
-	wl_list_remove(&tablet->handlers.button.link);
-	wl_list_remove(&tablet->handlers.proximity.link);
-	wl_list_remove(&tablet->handlers.axis.link);
 	wl_list_remove(&tablet->handlers.destroy.link);
 	free(tablet);
 }
 
 void
-tablet_init(struct seat *seat, struct wlr_input_device *wlr_device)
+tablet_create(struct seat *seat, struct wlr_input_device *wlr_device)
 {
 	wlr_log(WLR_DEBUG, "setting up tablet");
 	struct drawing_tablet *tablet = znew(*tablet);
@@ -546,12 +648,26 @@ tablet_init(struct seat *seat, struct wlr_input_device *wlr_device)
 	tablet->wheel_delta = 0.0;
 	wlr_log(WLR_INFO, "tablet dimensions: %.2fmm x %.2fmm",
 		tablet->tablet->width_mm, tablet->tablet->height_mm);
-	CONNECT_SIGNAL(tablet->tablet, &tablet->handlers, axis);
-	CONNECT_SIGNAL(tablet->tablet, &tablet->handlers, proximity);
-	CONNECT_SIGNAL(tablet->tablet, &tablet->handlers, tip);
-	CONNECT_SIGNAL(tablet->tablet, &tablet->handlers, button);
 	CONNECT_SIGNAL(wlr_device, &tablet->handlers, destroy);
 
 	wl_list_insert(&seat->tablets, &tablet->link);
 	tablet_pad_attach_tablet(tablet->seat);
 }
+
+void
+tablet_init(struct seat *seat)
+{
+	CONNECT_SIGNAL(seat->cursor, seat, tablet_tool_axis);
+	CONNECT_SIGNAL(seat->cursor, seat, tablet_tool_proximity);
+	CONNECT_SIGNAL(seat->cursor, seat, tablet_tool_tip);
+	CONNECT_SIGNAL(seat->cursor, seat, tablet_tool_button);
+}
+
+void
+tablet_finish(struct seat *seat)
+{
+	wl_list_remove(&seat->tablet_tool_axis.link);
+	wl_list_remove(&seat->tablet_tool_proximity.link);
+	wl_list_remove(&seat->tablet_tool_tip.link);
+	wl_list_remove(&seat->tablet_tool_button.link);
+}
diff --git a/src/input/touch.c b/src/input/touch.c
index 048aaf2d..f99b013e 100644
--- a/src/input/touch.c
+++ b/src/input/touch.c
@@ -2,6 +2,7 @@
 #include <wayland-util.h>
 #include <wlr/types/wlr_touch.h>
 #include <linux/input-event-codes.h>
+#include "common/macros.h"
 #include "common/mem.h"
 #include "common/scene-helpers.h"
 #include "idle.h"
@@ -9,7 +10,6 @@
 #include "labwc.h"
 #include "config/mousebind.h"
 #include "action.h"
-#include "view.h"
 
 /* Holds layout -> surface offsets to report motion events in relative coords */
 struct touch_point {
@@ -46,7 +46,7 @@ touch_get_coords(struct seat *seat, struct wlr_touch *touch, double x, double y,
 }
 
 static void
-touch_motion(struct wl_listener *listener, void *data)
+handle_touch_motion(struct wl_listener *listener, void *data)
 {
 	struct seat *seat = wl_container_of(listener, seat, touch_motion);
 	struct wlr_touch_motion_event *event = data;
@@ -78,7 +78,7 @@ touch_motion(struct wl_listener *listener, void *data)
 }
 
 static void
-touch_frame(struct wl_listener *listener, void *data)
+handle_touch_frame(struct wl_listener *listener, void *data)
 {
 	struct seat *seat = wl_container_of(listener, seat, touch_frame);
 
@@ -86,7 +86,7 @@ touch_frame(struct wl_listener *listener, void *data)
 }
 
 static void
-touch_down(struct wl_listener *listener, void *data)
+handle_touch_down(struct wl_listener *listener, void *data)
 {
 	struct seat *seat = wl_container_of(listener, seat, touch_down);
 	struct wlr_touch_down_event *event = data;
@@ -118,7 +118,7 @@ touch_down(struct wl_listener *listener, void *data)
 			if (mousebind->mouse_event == MOUSE_ACTION_PRESS
 					&& mousebind->button == BTN_LEFT
 					&& mousebind->context == LAB_SSD_CLIENT) {
-				actions_run(view, seat->server, &mousebind->actions, 0);
+				actions_run(view, seat->server, &mousebind->actions, NULL);
 			}
 		}
 
@@ -127,13 +127,13 @@ touch_down(struct wl_listener *listener, void *data)
 	} else {
 		cursor_emulate_move_absolute(seat, &event->touch->base,
 			event->x, event->y, event->time_msec);
-		cursor_emulate_button(seat, BTN_LEFT, WLR_BUTTON_PRESSED,
+		cursor_emulate_button(seat, BTN_LEFT, WL_POINTER_BUTTON_STATE_PRESSED,
 			event->time_msec);
 	}
 }
 
 static void
-touch_up(struct wl_listener *listener, void *data)
+handle_touch_up(struct wl_listener *listener, void *data)
 {
 	struct seat *seat = wl_container_of(listener, seat, touch_up);
 	struct wlr_touch_up_event *event = data;
@@ -146,8 +146,8 @@ touch_up(struct wl_listener *listener, void *data)
 				wlr_seat_touch_notify_up(seat->seat, event->time_msec,
 					event->touch_id);
 			} else {
-				cursor_emulate_button(seat, BTN_LEFT, WLR_BUTTON_RELEASED,
-					event->time_msec);
+				cursor_emulate_button(seat, BTN_LEFT,
+					WL_POINTER_BUTTON_STATE_RELEASED, event->time_msec);
 			}
 			wl_list_remove(&touch_point->link);
 			zfree(touch_point);
@@ -159,14 +159,10 @@ touch_up(struct wl_listener *listener, void *data)
 void
 touch_init(struct seat *seat)
 {
-	seat->touch_down.notify = touch_down;
-	wl_signal_add(&seat->cursor->events.touch_down, &seat->touch_down);
-	seat->touch_up.notify = touch_up;
-	wl_signal_add(&seat->cursor->events.touch_up, &seat->touch_up);
-	seat->touch_motion.notify = touch_motion;
-	wl_signal_add(&seat->cursor->events.touch_motion, &seat->touch_motion);
-	seat->touch_frame.notify = touch_frame;
-	wl_signal_add(&seat->cursor->events.touch_frame, &seat->touch_frame);
+	CONNECT_SIGNAL(seat->cursor, seat, touch_down);
+	CONNECT_SIGNAL(seat->cursor, seat, touch_up);
+	CONNECT_SIGNAL(seat->cursor, seat, touch_motion);
+	CONNECT_SIGNAL(seat->cursor, seat, touch_frame);
 }
 
 void
diff --git a/src/interactive.c b/src/interactive.c
index 813289aa..91081fd3 100644
--- a/src/interactive.c
+++ b/src/interactive.c
@@ -1,4 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
+#include <assert.h>
 #include "edges.h"
 #include "input/keyboard.h"
 #include "labwc.h"
@@ -8,19 +9,49 @@
 #include "view.h"
 #include "window-rules.h"
 
+/*
+ *   pos_old  pos_cursor
+ *      v         v
+ *      +---------+-------------------+
+ *      <-----------size_old---------->
+ *
+ *      return value
+ *           v
+ *           +----+---------+
+ *           <---size_new--->
+ */
 static int
-max_move_scale(double pos_cursor, double pos_current,
-	double size_current, double size_orig)
+max_move_scale(double pos_cursor, double pos_old, double size_old,
+		double size_new)
 {
-	double anchor_frac = (pos_cursor - pos_current) / size_current;
-	int pos_new = pos_cursor - (size_orig * anchor_frac);
-	if (pos_new < pos_current) {
+	double anchor_frac = (pos_cursor - pos_old) / size_old;
+	int pos_new = pos_cursor - (size_new * anchor_frac);
+	if (pos_new < pos_old) {
 		/* Clamp by using the old offsets of the maximized window */
-		pos_new = pos_current;
+		pos_new = pos_old;
 	}
 	return pos_new;
 }
 
+void
+interactive_anchor_to_cursor(struct server *server, struct wlr_box *geo)
+{
+	assert(server->input_mode == LAB_INPUT_STATE_MOVE);
+	if (wlr_box_empty(geo)) {
+		return;
+	}
+	/* Resize grab_box while anchoring it to grab_box.{x,y} */
+	server->grab_box.x = max_move_scale(server->grab_x, server->grab_box.x,
+		server->grab_box.width, geo->width);
+	server->grab_box.y = max_move_scale(server->grab_y, server->grab_box.y,
+		server->grab_box.height, geo->height);
+	server->grab_box.width = geo->width;
+	server->grab_box.height = geo->height;
+
+	geo->x = server->grab_box.x + (server->seat.cursor->x - server->grab_x);
+	geo->y = server->grab_box.y + (server->seat.cursor->y - server->grab_y);
+}
+
 void
 interactive_begin(struct view *view, enum input_mode mode, uint32_t edges)
 {
@@ -31,7 +62,6 @@ interactive_begin(struct view *view, enum input_mode mode, uint32_t edges)
 	 */
 	struct server *server = view->server;
 	struct seat *seat = &server->seat;
-	struct wlr_box geometry = view->current;
 
 	if (server->input_mode != LAB_INPUT_STATE_PASSTHROUGH) {
 		return;
@@ -55,25 +85,8 @@ interactive_begin(struct view *view, enum input_mode mode, uint32_t edges)
 			 */
 			return;
 		}
-		if (!view_is_floating(view)) {
-			/*
-			 * Un-maximize, unshade and restore natural
-			 * width/height.
-			 * Don't reset tiled state yet since we may want
-			 * to keep it (in the snap-to-maximize case).
-			 */
-			geometry = view->natural_geometry;
-			geometry.x = max_move_scale(seat->cursor->x,
-				view->current.x, view->current.width,
-				geometry.width);
-			geometry.y = max_move_scale(seat->cursor->y,
-				view->current.y, view->current.height,
-				geometry.height);
 
-			view_set_shade(view, false);
-			view_set_untiled(view);
-			view_restore_to(view, geometry);
-		} else {
+		if (view_is_floating(view)) {
 			/* Store natural geometry at start of move */
 			view_store_natural_geometry(view);
 			view_invalidate_last_layout_geometry(view);
@@ -103,7 +116,7 @@ interactive_begin(struct view *view, enum input_mode mode, uint32_t edges)
 
 		/*
 		 * If tiled or maximized in only one direction, reset
-		 * tiled/maximized state but keep the same geometry as
+		 * maximized/tiled state but keep the same geometry as
 		 * the starting point for the resize.
 		 */
 		view_set_untiled(view);
@@ -120,8 +133,26 @@ interactive_begin(struct view *view, enum input_mode mode, uint32_t edges)
 	/* Remember view and cursor positions at start of move/resize */
 	server->grab_x = seat->cursor->x;
 	server->grab_y = seat->cursor->y;
-	server->grab_box = geometry;
+	server->grab_box = view->current;
 	server->resize_edges = edges;
+
+	/*
+	 * Un-tile maximized/tiled view immediately if <unSnapThreshold> is
+	 * zero. Otherwise, un-tile it later in cursor motion handler.
+	 * If the natural geometry is unknown (possible with xdg-shell views),
+	 * then we set a size of 0x0 here and determine the correct geometry
+	 * later. See do_late_positioning() in xdg.c.
+	 */
+	if (mode == LAB_INPUT_STATE_MOVE && !view_is_floating(view)
+			&& rc.unsnap_threshold <= 0) {
+		struct wlr_box natural_geo = view->natural_geometry;
+		interactive_anchor_to_cursor(server, &natural_geo);
+		/* Shaded clients will not process resize events until unshaded */
+		view_set_shade(view, false);
+		view_set_untiled(view);
+		view_restore_to(view, natural_geo);
+	}
+
 	if (rc.resize_indicator) {
 		resize_indicator_show(view);
 	}
@@ -133,6 +164,10 @@ interactive_begin(struct view *view, enum input_mode mode, uint32_t edges)
 enum view_edge
 edge_from_cursor(struct seat *seat, struct output **dest_output)
 {
+	if (!view_is_floating(seat->server->grabbed_view)) {
+		return VIEW_EDGE_INVALID;
+	}
+
 	int snap_range = rc.snap_edge_range;
 	if (!snap_range) {
 		return VIEW_EDGE_INVALID;
diff --git a/src/layers.c b/src/layers.c
index 4a853fe3..a5ca7315 100644
--- a/src/layers.c
+++ b/src/layers.c
@@ -356,6 +356,7 @@ popup_handle_destroy(struct wl_listener *listener, void *data)
 		wl_container_of(listener, popup, destroy);
 	wl_list_remove(&popup->destroy.link);
 	wl_list_remove(&popup->new_popup.link);
+	wl_list_remove(&popup->reposition.link);
 
 	/* Usually already removed unless there was no commit at all */
 	if (popup->commit.notify) {
@@ -381,6 +382,15 @@ popup_handle_commit(struct wl_listener *listener, void *data)
 	}
 }
 
+static void
+popup_handle_reposition(struct wl_listener *listener, void *data)
+{
+	struct lab_layer_popup *popup =
+		wl_container_of(listener, popup, reposition);
+	wlr_xdg_popup_unconstrain_from_box(popup->wlr_popup,
+		&popup->output_toplevel_sx_box);
+}
+
 static void popup_handle_new_popup(struct wl_listener *listener, void *data);
 
 static struct lab_layer_popup *
@@ -402,7 +412,7 @@ create_popup(struct wlr_xdg_popup *wlr_popup, struct wlr_scene_tree *parent)
 		LAB_NODE_DESC_LAYER_POPUP, popup);
 
 	popup->destroy.notify = popup_handle_destroy;
-	wl_signal_add(&wlr_popup->base->events.destroy, &popup->destroy);
+	wl_signal_add(&wlr_popup->events.destroy, &popup->destroy);
 
 	popup->new_popup.notify = popup_handle_new_popup;
 	wl_signal_add(&wlr_popup->base->events.new_popup, &popup->new_popup);
@@ -410,6 +420,9 @@ create_popup(struct wlr_xdg_popup *wlr_popup, struct wlr_scene_tree *parent)
 	popup->commit.notify = popup_handle_commit;
 	wl_signal_add(&wlr_popup->base->surface->events.commit, &popup->commit);
 
+	popup->reposition.notify = popup_handle_reposition;
+	wl_signal_add(&wlr_popup->events.reposition, &popup->reposition);
+
 	return popup;
 }
 
@@ -566,15 +579,6 @@ handle_new_layer_surface(struct wl_listener *listener, void *data)
 	surface->node_destroy.notify = handle_node_destroy;
 	wl_signal_add(&surface->scene_layer_surface->tree->node.events.destroy,
 		&surface->node_destroy);
-
-	/*
-	 * Temporarily set the layer's current state to pending so that
-	 * it can easily be arranged.
-	 */
-	struct wlr_layer_surface_v1_state old_state = layer_surface->current;
-	layer_surface->current = layer_surface->pending;
-	output_update_usable_area(output);
-	layer_surface->current = old_state;
 }
 
 void
diff --git a/src/magnifier.c b/src/magnifier.c
index 327fd3e4..fded35fd 100644
--- a/src/magnifier.c
+++ b/src/magnifier.c
@@ -10,6 +10,10 @@
 static bool magnify_on;
 static double mag_scale = 0.0;
 
+/* Reuse a single scratch buffer */
+static struct wlr_buffer *tmp_buffer = NULL;
+static struct wlr_texture *tmp_texture = NULL;
+
 #define CLAMP(in, lower, upper) MAX(MIN((in), (upper)), (lower))
 
 void
@@ -21,10 +25,6 @@ magnify(struct output *output, struct wlr_buffer *output_buffer, struct wlr_box
 	struct wlr_fbox src_box;
 	bool fullscreen = false;
 
-	/* Reuse a single scratch buffer */
-	static struct wlr_buffer *tmp_buffer = NULL;
-	static struct wlr_texture *tmp_texture = NULL;
-
 	/* TODO: This looks way too complicated to just get the used format */
 	struct wlr_drm_format wlr_drm_format = {0};
 	struct wlr_shm_attributes shm_attribs = {0};
@@ -96,7 +96,7 @@ magnify(struct output *output, struct wlr_buffer *output_buffer, struct wlr_box
 
 	/* (Re)create the temporary buffer if required */
 	if (tmp_buffer && (tmp_buffer->width != width || tmp_buffer->height != height)) {
-		wlr_log(WLR_DEBUG, "tmp buffer size changed, dropping");
+		wlr_log(WLR_DEBUG, "tmp magnifier buffer size changed, dropping");
 		assert(tmp_texture);
 		wlr_texture_destroy(tmp_texture);
 		wlr_buffer_drop(tmp_buffer);
@@ -112,21 +112,23 @@ magnify(struct output *output, struct wlr_buffer *output_buffer, struct wlr_box
 		return;
 	}
 
-	/* Paste the magnified result back into the output buffer */
 	if (!tmp_texture) {
 		tmp_texture = wlr_texture_from_buffer(server->renderer, tmp_buffer);
 	}
 	if (!tmp_texture) {
-		wlr_log(WLR_ERROR, "Failed to allocate temporary texture");
+		wlr_log(WLR_ERROR, "Failed to allocate temporary magnifier texture");
 		wlr_buffer_drop(tmp_buffer);
 		tmp_buffer = NULL;
 		return;
 	}
 
 	/* Extract source region into temporary buffer */
-
 	struct wlr_render_pass *tmp_render_pass = wlr_renderer_begin_buffer_pass(
 		server->renderer, tmp_buffer, NULL);
+	if (!tmp_render_pass) {
+		wlr_log(WLR_ERROR, "Failed to begin magnifier render pass");
+		return;
+	}
 
 	wlr_buffer_lock(output_buffer);
 	struct wlr_texture *output_texture = wlr_texture_from_buffer(
@@ -154,6 +156,10 @@ magnify(struct output *output, struct wlr_buffer *output_buffer, struct wlr_box
 	/* Render to the output buffer itself */
 	tmp_render_pass = wlr_renderer_begin_buffer_pass(
 		server->renderer, output_buffer, NULL);
+	if (!tmp_render_pass) {
+		wlr_log(WLR_ERROR, "Failed to begin second magnifier render pass");
+		goto cleanup;
+	}
 
 	/* Borders */
 	if (fullscreen) {
@@ -198,6 +204,7 @@ magnify(struct output *output, struct wlr_buffer *output_buffer, struct wlr_box
 		dst_box.y = oy - (height / 2);
 	}
 
+	/* Paste the magnified result back into the output buffer */
 	opts = (struct wlr_render_texture_options) {
 		.texture = tmp_texture,
 		.src_box = src_box,
@@ -209,7 +216,7 @@ magnify(struct output *output, struct wlr_buffer *output_buffer, struct wlr_box
 	};
 	wlr_render_pass_add_texture(tmp_render_pass, &opts);
 	if (!wlr_render_pass_submit(tmp_render_pass)) {
-		wlr_log(WLR_ERROR, "Failed to submit render pass");
+		wlr_log(WLR_ERROR, "Failed to submit magnifier render pass");
 		goto cleanup;
 	}
 
@@ -241,18 +248,21 @@ output_wants_magnification(struct output *output)
 	return output_nearest_to_cursor(output->server) == output;
 }
 
+static void
+enable_magnifier(struct server *server, bool enable)
+{
+	magnify_on = enable;
+	server->scene->direct_scanout = enable ? false
+		: server->direct_scanout_enabled;
+}
+
 /* Toggles magnification on and off */
 void
 magnify_toggle(struct server *server)
 {
+	enable_magnifier(server, !magnify_on);
+
 	struct output *output = output_nearest_to_cursor(server);
-
-	if (magnify_on) {
-		magnify_on = false;
-	} else {
-		magnify_on = true;
-	}
-
 	if (output) {
 		wlr_output_schedule_frame(output->wlr_output);
 	}
@@ -268,14 +278,14 @@ magnify_set_scale(struct server *server, enum magnify_dir dir)
 		if (magnify_on) {
 			mag_scale += rc.mag_increment;
 		} else {
-			magnify_on = true;
+			enable_magnifier(server, true);
 			mag_scale = 1.0 + rc.mag_increment;
 		}
 	} else {
 		if (magnify_on && mag_scale > 1.0 + rc.mag_increment) {
 			mag_scale -= rc.mag_increment;
 		} else {
-			magnify_on = false;
+			enable_magnifier(server, false);
 		}
 	}
 
@@ -284,6 +294,18 @@ magnify_set_scale(struct server *server, enum magnify_dir dir)
 	}
 }
 
+/* Reset any buffers held by the magnifier */
+void
+magnify_reset(void)
+{
+	if (tmp_texture && tmp_buffer) {
+		wlr_texture_destroy(tmp_texture);
+		wlr_buffer_drop(tmp_buffer);
+		tmp_buffer = NULL;
+		tmp_texture = NULL;
+	}
+}
+
 /* Report whether magnification is enabled */
 bool
 is_magnify_on(void)
diff --git a/src/main.c b/src/main.c
index e974a35f..6d3200cd 100644
--- a/src/main.c
+++ b/src/main.c
@@ -112,11 +112,6 @@ idle_callback(void *data)
 int
 main(int argc, char *argv[])
 {
-#if HAVE_NLS
-	setlocale(LC_ALL, "");
-	bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
-	textdomain(GETTEXT_PACKAGE);
-#endif
 	char *startup_cmd = NULL;
 	char *primary_client = NULL;
 	enum wlr_log_importance verbosity = WLR_ERROR;
@@ -173,6 +168,14 @@ main(int argc, char *argv[])
 	die_on_detecting_suid();
 
 	session_environment_init();
+
+#if HAVE_NLS
+	/* Initialize locale after setting env vars */
+	setlocale(LC_ALL, "");
+	bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
+	textdomain(GETTEXT_PACKAGE);
+#endif
+
 	rcxml_read(rc.config_file);
 
 	/*
diff --git a/src/menu/menu.c b/src/menu/menu.c
index f4871422..882b1eee 100644
--- a/src/menu/menu.c
+++ b/src/menu/menu.c
@@ -23,6 +23,8 @@
 #include "common/string-helpers.h"
 #include "labwc.h"
 #include "menu/menu.h"
+#include "workspaces.h"
+#include "view.h"
 #include "node.h"
 #include "theme.h"
 
@@ -40,6 +42,16 @@ static struct menu *current_menu;
 static bool waiting_for_pipe_menu;
 static struct menuitem *selected_item;
 
+struct menu_pipe_context {
+	struct server *server;
+	struct menuitem *item;
+	struct buf buf;
+	struct wl_event_source *event_read;
+	struct wl_event_source *event_timeout;
+	pid_t pid;
+	int pipe_fd;
+};
+
 /* TODO: split this whole file into parser.c and actions.c*/
 
 static bool
@@ -108,26 +120,54 @@ menu_update_width(struct menu *menu)
 	}
 	menu->size.width = max_width + 2 * theme->menu_item_padding_x;
 
+	/*
+	 * TODO: This function is getting a bit unwieldy. Consider calculating
+	 * the menu-window width up-front to avoid this post_processing() and
+	 * second-bite-of-the-cherry stuff
+	 */
+
 	/* Update all items for the new size */
 	wl_list_for_each(item, &menu->menuitems, link) {
 		wlr_scene_rect_set_size(
 			wlr_scene_rect_from_node(item->normal.background),
 			menu->size.width, item->height);
 
-		if (!item->selected.background) {
-			/* This is a separator. They don't have a selected background. */
+		/*
+		 * Separator lines are special because they change width with
+		 * the menu.
+		 */
+		if (item->type == LAB_MENU_SEPARATOR_LINE) {
+			int width = menu->size.width
+				- 2 * theme->menu_separator_padding_width
+				- 2 * theme->menu_item_padding_x;
 			wlr_scene_rect_set_size(
 				wlr_scene_rect_from_node(item->normal.text),
-				menu->size.width - 2 * theme->menu_separator_padding_width,
-				theme->menu_separator_line_thickness);
-		} else {
-			/* Usual menu item */
+				width, theme->menu_separator_line_thickness);
+		} else if (item->type == LAB_MENU_TITLE) {
+			if (item->native_width > max_width) {
+				scaled_font_buffer_set_max_width(item->normal.buffer,
+					max_width);
+			}
+			if (theme->menu_title_text_justify == LAB_JUSTIFY_CENTER) {
+				int x, y;
+				x = (menu->size.width - item->native_width) / 2;
+				x = x < 0 ? 0 : x;
+				y = (theme->menu_item_height - item->normal.buffer->height) / 2;
+				wlr_scene_node_set_position(item->normal.text, x, y);
+			}
+		}
+
+		if (item->selectable) {
+			/* Only selectable items have item->selected.background */
 			wlr_scene_rect_set_size(
 				wlr_scene_rect_from_node(item->selected.background),
 				menu->size.width, item->height);
-			if (item->native_width > max_width || item->submenu || item->execute) {
-				scaled_font_buffer_set_max_width(item->normal.buffer,
-					max_width);
+		}
+
+		if (item->native_width > max_width || item->submenu || item->execute) {
+			scaled_font_buffer_set_max_width(item->normal.buffer,
+				max_width);
+			if (item->selectable) {
 				scaled_font_buffer_set_max_width(item->selected.buffer,
 					max_width);
 			}
@@ -178,16 +218,13 @@ item_create(struct menu *menu, const char *text, bool show_arrow)
 	struct menuitem *menuitem = znew(*menuitem);
 	menuitem->parent = menu;
 	menuitem->selectable = true;
+	menuitem->type = LAB_MENU_ITEM;
 	struct server *server = menu->server;
 	struct theme *theme = server->theme;
 
 	const char *arrow = show_arrow ? "›" : NULL;
 
-	if (!menu->item_height) {
-		menu->item_height = font_height(&rc.font_menuitem)
-			+ 2 * theme->menu_item_padding_y;
-	}
-	menuitem->height = menu->item_height;
+	menuitem->height = theme->menu_item_height;
 
 	int x, y;
 	menuitem->native_width = font_width(&rc.font_menuitem, text);
@@ -207,11 +244,11 @@ item_create(struct menu *menu, const char *text, bool show_arrow)
 	/* Item background nodes */
 	menuitem->normal.background = &wlr_scene_rect_create(
 		menuitem->normal.tree,
-		menu->size.width, menu->item_height,
+		menu->size.width, theme->menu_item_height,
 		theme->menu_items_bg_color)->node;
 	menuitem->selected.background = &wlr_scene_rect_create(
 		menuitem->selected.tree,
-		menu->size.width, menu->item_height,
+		menu->size.width, theme->menu_item_height,
 		theme->menu_items_active_bg_color)->node;
 
 	/* Font nodes */
@@ -240,9 +277,9 @@ item_create(struct menu *menu, const char *text, bool show_arrow)
 
 	/* Center font nodes */
 	x = theme->menu_item_padding_x;
-	y = (menu->item_height - menuitem->normal.buffer->height) / 2;
+	y = (theme->menu_item_height - menuitem->normal.buffer->height) / 2;
 	wlr_scene_node_set_position(menuitem->normal.text, x, y);
-	y = (menu->item_height - menuitem->selected.buffer->height) / 2;
+	y = (theme->menu_item_height - menuitem->selected.buffer->height) / 2;
 	wlr_scene_node_set_position(menuitem->selected.text, x, y);
 
 	/* Position the item in relation to its menu */
@@ -265,34 +302,70 @@ separator_create(struct menu *menu, const char *label)
 	struct menuitem *menuitem = znew(*menuitem);
 	menuitem->parent = menu;
 	menuitem->selectable = false;
+	menuitem->type = string_null_or_empty(label) ? LAB_MENU_SEPARATOR_LINE
+		: LAB_MENU_TITLE;
 	struct server *server = menu->server;
 	struct theme *theme = server->theme;
-	menuitem->height = theme->menu_separator_line_thickness +
-			2 * theme->menu_separator_padding_height;
 
+	if (menuitem->type == LAB_MENU_TITLE) {
+		menuitem->height = theme->menu_item_height;
+		menuitem->native_width = font_width(&rc.font_menuheader, label);
+	} else if (menuitem->type == LAB_MENU_SEPARATOR_LINE) {
+		menuitem->height = theme->menu_separator_line_thickness +
+				2 * theme->menu_separator_padding_height;
+	}
+
+	/* Menu item root node */
 	menuitem->tree = wlr_scene_tree_create(menu->scene_tree);
 	node_descriptor_create(&menuitem->tree->node,
 		LAB_NODE_DESC_MENUITEM, menuitem);
+
+	/* Tree to hold background and text/line buffer */
 	menuitem->normal.tree = wlr_scene_tree_create(menuitem->tree);
+
+	/* Item background nodes */
+	float *bg_color = menuitem->type == LAB_MENU_TITLE
+		? theme->menu_title_bg_color : theme->menu_items_bg_color;
+	float *text_color = menuitem->type == LAB_MENU_TITLE
+		? theme->menu_title_text_color : theme->menu_items_text_color;
 	menuitem->normal.background = &wlr_scene_rect_create(
 		menuitem->normal.tree,
-		menu->size.width, menuitem->height,
-		theme->menu_items_bg_color)->node;
-
-	int width = menu->size.width - 2 * theme->menu_separator_padding_width;
-	menuitem->normal.text = &wlr_scene_rect_create(
-		menuitem->normal.tree,
-		width > 0 ? width : 0,
-		theme->menu_separator_line_thickness,
-		theme->menu_separator_color)->node;
+		menu->size.width, menuitem->height, bg_color)->node;
 
+	/* Draw separator line or title */
+	if (menuitem->type == LAB_MENU_TITLE) {
+		menuitem->normal.buffer = scaled_font_buffer_create(menuitem->normal.tree);
+		if (!menuitem->normal.buffer) {
+			wlr_log(WLR_ERROR, "Failed to create menu item '%s'", label);
+			wlr_scene_node_destroy(&menuitem->tree->node);
+			free(menuitem);
+			return NULL;
+		}
+		menuitem->normal.text = &menuitem->normal.buffer->scene_buffer->node;
+		/* Font buffer */
+		scaled_font_buffer_update(menuitem->normal.buffer, label,
+			menuitem->native_width, &rc.font_menuheader,
+			text_color, bg_color, /* arrow */ NULL);
+		/* Center font nodes */
+		int x, y;
+		x = theme->menu_item_padding_x;
+		y = (theme->menu_item_height - menuitem->normal.buffer->height) / 2;
+		wlr_scene_node_set_position(menuitem->normal.text, x, y);
+	} else {
+		int nominal_width = theme->menu_min_width;
+		menuitem->normal.text = &wlr_scene_rect_create(
+			menuitem->normal.tree, nominal_width,
+			theme->menu_separator_line_thickness,
+			theme->menu_separator_color)->node;
+		wlr_scene_node_set_position(&menuitem->tree->node, 0, menu->size.height);
+		/* Vertically center-align separator line */
+		wlr_scene_node_set_position(menuitem->normal.text,
+			theme->menu_separator_padding_width
+			+ theme->menu_item_padding_x,
+			theme->menu_separator_padding_height);
+	}
 	wlr_scene_node_set_position(&menuitem->tree->node, 0, menu->size.height);
 
-	/* Vertically center-align separator line */
-	wlr_scene_node_set_position(menuitem->normal.text,
-		theme->menu_separator_padding_width,
-		theme->menu_separator_padding_height);
-
 	menu->size.height += menuitem->height;
 	wl_list_append(&menu->menuitems, &menuitem->link);
 	wl_list_init(&menuitem->actions);
@@ -347,6 +420,9 @@ fill_item(char *nodename, char *content)
 static void
 item_destroy(struct menuitem *item)
 {
+	if (item->pipe_ctx) {
+		item->pipe_ctx->item = NULL;
+	}
 	wl_list_remove(&item->link);
 	action_list_free(&item->actions);
 	wlr_scene_node_destroy(&item->tree->node);
@@ -506,6 +582,23 @@ handle_menu_element(xmlNode *n, struct server *server)
 
 	if (execute && label && id) {
 		wlr_log(WLR_DEBUG, "pipemenu '%s:%s:%s'", id, label, execute);
+		if (!current_menu) {
+			/*
+			 * We currently do not support pipemenus without a
+			 * parent <item> such as the one the example below:
+			 *
+			 * <?xml version="1.0" encoding="UTF-8"?>
+			 * <openbox_menu>
+			 *   <menu id="root-menu" label="foo" execute="bar"/>
+			 * </openbox_menu>
+			 *
+			 * TODO: Consider supporting this
+			 */
+			wlr_log(WLR_ERROR,
+				"pipemenu '%s:%s:%s' has no parent <menu>",
+				id, label, execute);
+			goto error;
+		}
 		current_item = item_create(current_menu, label, /* arrow */ true);
 		current_item_action = NULL;
 		current_item->execute = xstrdup(execute);
@@ -671,7 +764,7 @@ parse_xml(const char *filename, struct server *server)
 		struct path *path = wl_container_of(elm, path, link);
 		FILE *stream = fopen(path->string, "r");
 		if (!stream) {
-			return;
+			continue;
 		}
 		wlr_log(WLR_INFO, "read menu file %s", path->string);
 		parse_stream(server, stream);
@@ -702,22 +795,23 @@ menu_get_full_width(struct menu *menu)
 	return width + max_child_width;
 }
 
+/**
+ * get_submenu_position() - get output layout coordinates of menu window
+ * @item: the menuitem that triggers the submenu (static or dynamic)
+ */
 static struct wlr_box
 get_submenu_position(struct menuitem *item, enum menu_align align)
 {
 	struct wlr_box pos = { 0 };
 	struct menu *menu = item->parent;
 	struct theme *theme = menu->server->theme;
-	int lx = menu->scene_tree->node.x;
-	int ly = menu->scene_tree->node.y;
+	pos.x = menu->scene_tree->node.x;
+	pos.y = menu->scene_tree->node.y;
 
 	if (align & LAB_MENU_OPEN_RIGHT) {
-		pos.x = lx + menu->size.width - theme->menu_overlap_x;
-	} else {
-		pos.x = lx;
+		pos.x += menu->size.width - theme->menu_overlap_x;
 	}
-	int rel_y = item->tree->node.y;
-	pos.y = ly + rel_y - theme->menu_overlap_y;
+	pos.y += item->tree->node.y - theme->menu_overlap_y;
 	return pos;
 }
 
@@ -766,7 +860,7 @@ menu_configure(struct menu *menu, int lx, int ly, enum menu_align align)
 		ly -= menu->size.height;
 		if (menu->parent) {
 			/* For submenus adjust y to bottom left corner */
-			ly += menu->item_height;
+			ly += theme->menu_item_height;
 		}
 	}
 	wlr_scene_node_set_position(&menu->scene_tree->node, lx, ly);
@@ -815,6 +909,126 @@ menu_hide_submenu(struct server *server, const char *id)
 	}
 }
 
+static void
+init_client_send_to_menu(struct server *server)
+{
+	/* Just create placeholder. Contents will be created when launched */
+	menu_create(server, "client-send-to-menu", "");
+}
+
+/*
+ * This is client-send-to-menu
+ * an internal menu similar to root-menu and client-menu
+ *
+ * This will look at workspaces and produce a menu
+ * with the workspace names that can be used with
+ * SendToDesktop, left/right options are included.
+ */
+void
+update_client_send_to_menu(struct server *server)
+{
+	struct menu *menu = menu_get_by_id(server,
+			"client-send-to-menu");
+
+	if (menu) {
+		struct menuitem *item, *next;
+		wl_list_for_each_safe(item, next, &menu->menuitems, link) {
+			item_destroy(item);
+		}
+	}
+
+	menu->size.height = 0;
+
+	struct workspace *workspace;
+
+	wl_list_for_each(workspace, &server->workspaces.all, link) {
+		if (workspace == server->workspaces.current) {
+			char *label = strdup_printf(">%s<", workspace->name);
+			current_item = item_create(menu, label,
+				/*show arrow*/ false);
+			free(label);
+		} else {
+			current_item = item_create(menu, workspace->name, /*show arrow*/ false);
+		}
+		fill_item("name.action", "SendToDesktop");
+		fill_item("to.action", workspace->name);
+	}
+
+	menu_update_width(menu);
+}
+
+static void
+init_client_list_combined_menu(struct server *server)
+{
+	/* Just create placeholder. Contents will be created when launched */
+	menu_create(server, "client-list-combined-menu", "");
+}
+
+/*
+ * This is client-list-combined-menu an internal menu similar to root-menu and
+ * client-menu.
+ *
+ * This will look at workspaces and produce a menu with the workspace name as a
+ * separator label and the titles of the view, if any, below each workspace
+ * name. Active view is indicated by "*" preceeding title.
+ */
+void
+update_client_list_combined_menu(struct server *server)
+{
+	struct menu *menu = menu_get_by_id(server, "client-list-combined-menu");
+
+	if (!menu) {
+		/* Menu is created on compositor startup/reconfigure */
+		wlr_log(WLR_ERROR, "client-list-combined-menu does not exist");
+		return;
+	}
+
+	struct menuitem *item, *next;
+	wl_list_for_each_safe(item, next, &menu->menuitems, link) {
+		item_destroy(item);
+	}
+
+	menu->size.height = 0;
+
+	struct workspace *workspace;
+	struct view *view;
+	struct buf buffer = BUF_INIT;
+
+	wl_list_for_each(workspace, &server->workspaces.all, link) {
+		buf_add_fmt(&buffer, workspace == server->workspaces.current ? ">%s<" : "%s",
+				workspace->name);
+		current_item = separator_create(menu, buffer.data);
+		buf_clear(&buffer);
+
+		wl_list_for_each(view, &server->views, link) {
+			if (view->workspace == workspace) {
+				const char *title = view_get_string_prop(view, "title");
+				if (!view->toplevel.handle || string_null_or_empty(title)) {
+					continue;
+				}
+
+				if (view == server->active_view) {
+					buf_add(&buffer, "*");
+				}
+				buf_add(&buffer, title);
+
+				current_item = item_create(menu, buffer.data, /*show arrow*/ false);
+				current_item->id = xstrdup(menu->id);
+				current_item->client_list_view = view;
+				fill_item("name.action", "Focus");
+				fill_item("name.action", "Raise");
+				buf_clear(&buffer);
+			}
+		}
+		current_item = item_create(menu, _("Go there..."), /*show arrow*/ false);
+		current_item->id = xstrdup(menu->id);
+		fill_item("name.action", "GoToDesktop");
+		fill_item("to.action", workspace->name);
+	}
+	buf_reset(&buffer);
+	menu_update_width(menu);
+}
+
 static void
 init_rootmenu(struct server *server)
 {
@@ -893,6 +1107,8 @@ menu_init(struct server *server)
 	parse_xml("menu.xml", server);
 	init_rootmenu(server);
 	init_windowmenu(server);
+	init_client_list_combined_menu(server);
+	init_client_send_to_menu(server);
 	post_processing(server);
 	validate(server);
 }
@@ -937,6 +1153,8 @@ menu_free(struct menu *menu)
 	 */
 	wlr_scene_node_destroy(&menu->scene_tree->node);
 	wl_list_remove(&menu->link);
+	zfree(menu->id);
+	zfree(menu->label);
 	zfree(menu);
 }
 
@@ -1066,27 +1284,19 @@ menu_open_root(struct menu *menu, int x, int y)
 	selected_item = NULL;
 }
 
-struct pipe_context {
-	struct server *server;
-	struct menuitem *item;
-	struct buf buf;
-	struct wl_event_source *event_read;
-	struct wl_event_source *event_timeout;
-	pid_t pid;
-	int pipe_fd;
-};
-
 static void
-create_pipe_menu(struct pipe_context *ctx)
+create_pipe_menu(struct menu_pipe_context *ctx)
 {
+	assert(ctx->item);
+
 	struct menu *pipe_parent = ctx->item->parent;
 	if (!pipe_parent) {
-		wlr_log(WLR_ERROR, "[pipemenu %ld] invalid parent",
+		wlr_log(WLR_INFO, "[pipemenu %ld] invalid parent",
 			(long)ctx->pid);
 		return;
 	}
 	if (!pipe_parent->scene_tree->node.enabled) {
-		wlr_log(WLR_ERROR, "[pipemenu %ld] parent menu already closed",
+		wlr_log(WLR_INFO, "[pipemenu %ld] parent menu already closed",
 			(long)ctx->pid);
 		return;
 	}
@@ -1117,19 +1327,9 @@ create_pipe_menu(struct pipe_context *ctx)
 	/* Set menu-widths before configuring */
 	post_processing(ctx->server);
 
-	/*
-	 * TODO:
-	 * (1) Combine this with the code in get_submenu_position()
-	 *     and/or menu_configure()
-	 * (2) Take into account menu_overlap_{x,y}
-	 */
 	enum menu_align align = ctx->item->parent->align;
-	int x = pipe_parent->scene_tree->node.x;
-	int y = pipe_parent->scene_tree->node.y + ctx->item->tree->node.y;
-	if (align & LAB_MENU_OPEN_RIGHT) {
-		x += pipe_parent->size.width;
-	}
-	menu_configure(pipe_menu, x, y, align);
+	struct wlr_box pos = get_submenu_position(ctx->item, align);
+	menu_configure(pipe_menu, pos.x, pos.y, align);
 
 	validate(ctx->server);
 
@@ -1143,12 +1343,15 @@ restore_menus:
 }
 
 static void
-pipemenu_ctx_destroy(struct pipe_context *ctx)
+pipemenu_ctx_destroy(struct menu_pipe_context *ctx)
 {
 	wl_event_source_remove(ctx->event_read);
 	wl_event_source_remove(ctx->event_timeout);
 	spawn_piped_close(ctx->pid, ctx->pipe_fd);
 	buf_reset(&ctx->buf);
+	if (ctx->item) {
+		ctx->item->pipe_ctx = NULL;
+	}
 	free(ctx);
 	waiting_for_pipe_menu = false;
 }
@@ -1156,9 +1359,9 @@ pipemenu_ctx_destroy(struct pipe_context *ctx)
 static int
 handle_pipemenu_timeout(void *_ctx)
 {
-	struct pipe_context *ctx = _ctx;
+	struct menu_pipe_context *ctx = _ctx;
 	wlr_log(WLR_ERROR, "[pipemenu %ld] timeout reached, killing %s",
-		(long)ctx->pid, ctx->item->execute);
+		(long)ctx->pid, ctx->item ? ctx->item->execute : "n/a");
 	kill(ctx->pid, SIGTERM);
 	pipemenu_ctx_destroy(ctx);
 	return 0;
@@ -1173,11 +1376,19 @@ starts_with_less_than(const char *s)
 static int
 handle_pipemenu_readable(int fd, uint32_t mask, void *_ctx)
 {
-	struct pipe_context *ctx = _ctx;
+	struct menu_pipe_context *ctx = _ctx;
 	/* two 4k pages + 1 NULL byte */
 	char data[8193];
 	ssize_t size;
 
+	if (!ctx->item) {
+		/* parent menu item got destroyed in the meantime */
+		wlr_log(WLR_INFO, "[pipemenu %ld] parent menu item destroyed",
+			(long)ctx->pid);
+		kill(ctx->pid, SIGTERM);
+		goto clean_up;
+	}
+
 	do {
 		/* leave space for terminating NULL byte */
 		size = read(fd, data, sizeof(data) - 1);
@@ -1225,6 +1436,11 @@ parse_pipemenu(struct menuitem *item)
 		return;
 	}
 
+	if (item->pipe_ctx) {
+		wlr_log(WLR_ERROR, "item already has a pipe context attached");
+		return;
+	}
+
 	int pipe_fd = 0;
 	pid_t pid = spawn_piped(item->execute, &pipe_fd);
 	if (pid <= 0) {
@@ -1233,12 +1449,13 @@ parse_pipemenu(struct menuitem *item)
 	}
 
 	waiting_for_pipe_menu = true;
-	struct pipe_context *ctx = znew(*ctx);
+	struct menu_pipe_context *ctx = znew(*ctx);
 	ctx->server = item->parent->server;
 	ctx->item = item;
 	ctx->pid = pid;
 	ctx->pipe_fd = pipe_fd;
 	ctx->buf = BUF_INIT;
+	item->pipe_ctx = ctx;
 
 	ctx->event_read = wl_event_loop_add_fd(ctx->server->wl_event_loop,
 		pipe_fd, WL_EVENT_READABLE, handle_pipemenu_readable, ctx);
@@ -1373,7 +1590,13 @@ menu_execute_item(struct menuitem *item)
 	 * menu_close() and destroy_pipemenus() which we have to handle
 	 * before/after action_run() respectively.
 	 */
-	actions_run(item->parent->triggered_by_view, server, &item->actions, 0);
+	if (item->id && !strcmp(item->id, "client-list-combined-menu")
+			&& item->client_list_view) {
+		actions_run(item->client_list_view, server, &item->actions, NULL);
+	} else {
+		actions_run(item->parent->triggered_by_view, server,
+				&item->actions, NULL);
+	}
 
 	server->menu_current = NULL;
 	destroy_pipemenus(server);
diff --git a/src/meson.build b/src/meson.build
index bc69eec4..c6ec720e 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -15,6 +15,7 @@ labwc_sources = files(
   'osd.c',
   'osd-field.c',
   'output.c',
+  'output-state.c',
   'output-virtual.c',
   'overlay.c',
   'placement.c',
@@ -43,11 +44,17 @@ if have_xwayland
   )
 endif
 
+if have_libsfdo
+  labwc_sources += files(
+    'icon-loader.c',
+  )
+endif
 
-subdir('button')
+subdir('img')
 subdir('common')
 subdir('config')
 subdir('decorations')
 subdir('input')
 subdir('menu')
 subdir('ssd')
+subdir('protocols')
diff --git a/src/osd.c b/src/osd.c
index 9555d913..1c3b85a7 100644
--- a/src/osd.c
+++ b/src/osd.c
@@ -225,6 +225,7 @@ render_osd(struct server *server, cairo_t *cairo, int w, int h,
 	/* Set up text rendering */
 	set_cairo_color(cairo, theme->osd_label_text_color);
 	PangoLayout *layout = pango_cairo_create_layout(cairo);
+	pango_context_set_round_glyph_positions(pango_layout_get_context(layout), false);
 	pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END);
 
 	PangoFontDescription *desc = font_to_pango_desc(&rc.font_osd);
@@ -330,7 +331,7 @@ display_osd(struct output *output, struct wl_array *views)
 	struct server *server = output->server;
 	struct theme *theme = server->theme;
 	bool show_workspace = wl_list_length(&rc.workspace_config.workspaces) > 1;
-	const char *workspace_name = server->workspace_current->name;
+	const char *workspace_name = server->workspaces.current->name;
 
 	float scale = output->wlr_output->scale;
 	int w = theme->osd_window_switcher_width;
@@ -350,7 +351,7 @@ display_osd(struct output *output, struct wl_array *views)
 	if (output->osd_buffer) {
 		wlr_buffer_drop(&output->osd_buffer->base);
 	}
-	output->osd_buffer = buffer_create_cairo(w, h, scale, true);
+	output->osd_buffer = buffer_create_cairo(w, h, scale);
 	if (!output->osd_buffer) {
 		wlr_log(WLR_ERROR, "Failed to allocate cairo buffer for the window switcher");
 		return;
diff --git a/src/output-state.c b/src/output-state.c
new file mode 100644
index 00000000..602149a2
--- /dev/null
+++ b/src/output-state.c
@@ -0,0 +1,92 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+#include <wlr/types/wlr_output.h>
+#include <wlr/types/wlr_output_management_v1.h>
+#include "labwc.h"
+#include "output-state.h"
+
+void
+output_state_init(struct output *output)
+{
+	wlr_output_state_init(&output->pending);
+
+	/*
+	 * As there is no direct way to convert an existing output
+	 * configuration to an output_state we first convert it
+	 * to a temporary output-management config and then apply
+	 * it to an empty wlr_output_state.
+	 */
+	struct wlr_output_configuration_v1 *backup_config =
+		wlr_output_configuration_v1_create();
+	struct wlr_output_configuration_head_v1 *backup_head =
+		wlr_output_configuration_head_v1_create(
+			backup_config, output->wlr_output);
+
+	wlr_output_head_v1_state_apply(&backup_head->state, &output->pending);
+	wlr_output_configuration_v1_destroy(backup_config);
+}
+
+bool
+wlr_output_test(struct wlr_output *wlr_output)
+{
+	struct output *output = wlr_output->data;
+	return wlr_output_test_state(wlr_output, &output->pending);
+}
+
+bool
+wlr_output_commit(struct wlr_output *wlr_output)
+{
+	struct output *output = wlr_output->data;
+	bool committed = wlr_output_commit_state(wlr_output, &output->pending);
+	if (committed) {
+		wlr_output_state_finish(&output->pending);
+		wlr_output_state_init(&output->pending);
+	} else {
+		wlr_log(WLR_ERROR, "Failed to commit frame");
+	}
+	return committed;
+}
+
+void
+wlr_output_enable(struct wlr_output *wlr_output, bool enabled)
+{
+	struct output *output = wlr_output->data;
+	wlr_output_state_set_enabled(&output->pending, enabled);
+}
+
+void
+wlr_output_set_mode(struct wlr_output *wlr_output, struct wlr_output_mode *mode)
+{
+	struct output *output = wlr_output->data;
+	wlr_output_state_set_mode(&output->pending, mode);
+}
+
+void
+wlr_output_set_custom_mode(struct wlr_output *wlr_output,
+		int32_t width, int32_t height, int32_t refresh)
+{
+	struct output *output = wlr_output->data;
+	wlr_output_state_set_custom_mode(&output->pending, width, height, refresh);
+}
+
+void
+wlr_output_set_scale(struct wlr_output *wlr_output, float scale)
+{
+	struct output *output = wlr_output->data;
+	wlr_output_state_set_scale(&output->pending, scale);
+}
+
+void
+wlr_output_set_transform(struct wlr_output *wlr_output,
+		enum wl_output_transform transform)
+{
+	struct output *output = wlr_output->data;
+	wlr_output_state_set_transform(&output->pending, transform);
+}
+
+void
+wlr_output_enable_adaptive_sync(struct wlr_output *wlr_output, bool enabled)
+{
+	struct output *output = wlr_output->data;
+	wlr_output_state_set_adaptive_sync_enabled(&output->pending, enabled);
+}
diff --git a/src/output.c b/src/output.c
index bb2b9760..58743e31 100644
--- a/src/output.c
+++ b/src/output.c
@@ -18,34 +18,102 @@
 #include <wlr/types/wlr_scene.h>
 #include <wlr/util/region.h>
 #include <wlr/util/log.h>
+#include "common/direction.h"
 #include "common/macros.h"
 #include "common/mem.h"
 #include "common/scene-helpers.h"
 #include "labwc.h"
 #include "layers.h"
 #include "node.h"
+#include "output-state.h"
 #include "output-virtual.h"
+#include "protocols/cosmic-workspaces.h"
 #include "regions.h"
 #include "view.h"
 #include "xwayland.h"
 
-static bool
-get_tearing_preference(struct output *output)
+static unsigned int
+get_tearing_retry_count(struct output *output)
+{
+	/* Two seconds worth of frames, guessing 60Hz if refresh is invalid */
+	int refresh = output->wlr_output->refresh;
+	return refresh > 0 ? refresh / 500 : 120;
+}
+
+bool
+output_get_tearing_allowance(struct output *output)
 {
 	struct server *server = output->server;
 
-	/* Never allow tearing when disabled */
+	/* never allow tearing when disabled */
 	if (!rc.allow_tearing) {
 		return false;
 	}
 
-	/* Tearing is only allowed for the output with the active view */
-	if (!server->active_view || server->active_view->output != output) {
+	struct view *view = server->active_view;
+
+	/* tearing is only allowed for the output with the active view */
+	if (!view || view->output != output) {
 		return false;
 	}
 
-	/* If the active view requests tearing, or it is toggled on with action, allow it */
-	return server->active_view->tearing_hint;
+	/* tearing should not have failed too many times */
+	if (output->nr_tearing_failures >= get_tearing_retry_count(output)) {
+		return false;
+	}
+
+	/* allow tearing for any window when requested or forced */
+	if (rc.allow_tearing == LAB_TEARING_ENABLED) {
+		if (view->force_tearing == LAB_STATE_UNSPECIFIED) {
+			return view->tearing_hint;
+		} else {
+			return view->force_tearing == LAB_STATE_ENABLED;
+		}
+	}
+
+	/* remaining tearing options apply only to full-screen windows */
+	if (!view->fullscreen) {
+		return false;
+	}
+
+	if (view->force_tearing == LAB_STATE_UNSPECIFIED) {
+		/* honor the tearing hint or the fullscreen-force preference */
+		return view->tearing_hint ||
+			rc.allow_tearing == LAB_TEARING_FULLSCREEN_FORCED;
+	}
+
+	/* honor tearing as requested by action */
+	return view->force_tearing == LAB_STATE_ENABLED;
+}
+
+static void
+output_apply_gamma(struct output *output)
+{
+	assert(output);
+	assert(output->gamma_lut_changed);
+
+	struct server *server = output->server;
+	struct wlr_scene_output *scene_output = output->scene_output;
+
+	struct wlr_output_state pending;
+	wlr_output_state_init(&pending);
+
+	output->gamma_lut_changed = false;
+	struct wlr_gamma_control_v1 *gamma_control =
+		wlr_gamma_control_manager_v1_get_control(
+			server->gamma_control_manager_v1,
+			output->wlr_output);
+
+	if (!wlr_gamma_control_v1_apply(gamma_control, &pending)) {
+		wlr_output_state_finish(&pending);
+		return;
+	}
+
+	if (!lab_wlr_scene_output_commit(scene_output, &pending)) {
+		wlr_gamma_control_v1_send_failed_and_destroy(gamma_control);
+	}
+
+	wlr_output_state_finish(&pending);
 }
 
 static void
@@ -71,39 +139,39 @@ output_frame_notify(struct wl_listener *listener, void *data)
 		return;
 	}
 
-	struct wlr_output *wlr_output = output->wlr_output;
-	struct server *server = output->server;
-
 	if (output->gamma_lut_changed) {
-		struct wlr_output_state pending;
-		wlr_output_state_init(&pending);
-		if (!wlr_scene_output_build_state(output->scene_output, &pending, NULL)) {
-			return;
-		}
-		output->gamma_lut_changed = false;
-		struct wlr_gamma_control_v1 *gamma_control =
-			wlr_gamma_control_manager_v1_get_control(
-				server->gamma_control_manager_v1, wlr_output);
-		if (!wlr_gamma_control_v1_apply(gamma_control, &pending)) {
-			wlr_output_state_finish(&pending);
-			return;
-		}
+		/*
+		 * We are not mixing the gamma state with
+		 * other pending output changes to make it
+		 * easier to handle a failed output commit
+		 * due to gamma without impacting other
+		 * unrelated output changes.
+		 */
+		output_apply_gamma(output);
+	} else {
+		struct wlr_scene_output *scene_output = output->scene_output;
+		struct wlr_output_state *pending = &output->pending;
 
-		if (!wlr_output_commit_state(output->wlr_output, &pending)) {
-			wlr_gamma_control_v1_send_failed_and_destroy(gamma_control);
-			wlr_output_state_finish(&pending);
-			return;
-		}
+		pending->tearing_page_flip = output_get_tearing_allowance(output);
 
-		wlr_damage_ring_rotate(&output->scene_output->damage_ring);
-		wlr_output_state_finish(&pending);
-		return;
+		bool committed =
+			lab_wlr_scene_output_commit(scene_output, pending);
+
+		if (pending->tearing_page_flip) {
+			if (committed) {
+				output->nr_tearing_failures = 0;
+			} else {
+				if (++output->nr_tearing_failures >=
+						get_tearing_retry_count(output)) {
+					wlr_log(WLR_INFO, "setting tearing allowance failed "
+						"for two consecutive seconds, disabling");
+				}
+				pending->tearing_page_flip = false;
+				lab_wlr_scene_output_commit(scene_output, pending);
+			}
+		}
 	}
 
-	output->wlr_output->pending.tearing_page_flip =
-		get_tearing_preference(output);
-	lab_wlr_scene_output_commit(output->scene_output);
-
 	struct timespec now = { 0 };
 	clock_gettime(CLOCK_MONOTONIC, &now);
 	wlr_scene_output_send_frame_done(output->scene_output, &now);
@@ -144,6 +212,8 @@ output_destroy_notify(struct wl_listener *listener, void *data)
 		}
 	}
 
+	wlr_output_state_finish(&output->pending);
+
 	/*
 	 * Ensure that we don't accidentally try to dereference
 	 * the output pointer in some output event handler like
@@ -230,6 +300,9 @@ add_output_to_layout(struct server *server, struct output *output)
 		wlr_scene_output_layout_add_output(server->scene_layout,
 			layout_output, output->scene_output);
 	}
+
+	lab_cosmic_workspace_group_output_enter(
+		server->workspaces.cosmic_group, output->wlr_output);
 }
 
 static void
@@ -255,6 +328,13 @@ new_output_notify(struct wl_listener *listener, void *data)
 		}
 	}
 
+	if (wlr_output_is_wl(wlr_output)) {
+		char title[64];
+		snprintf(title, sizeof(title), "%s - %s", "labwc", wlr_output->name);
+		wlr_wl_output_set_title(wlr_output, title);
+		wlr_wl_output_set_app_id(wlr_output, "labwc");
+	}
+
 	/*
 	 * We offer any display as available for lease, some apps like
 	 * gamescope want to take ownership of a display when they can
@@ -285,6 +365,12 @@ new_output_notify(struct wl_listener *listener, void *data)
 		return;
 	}
 
+	output = znew(*output);
+	output->wlr_output = wlr_output;
+	wlr_output->data = output;
+	output->server = server;
+	output_state_init(output);
+
 	wlr_log(WLR_DEBUG, "enable output");
 	wlr_output_enable(wlr_output, true);
 
@@ -297,7 +383,9 @@ new_output_notify(struct wl_listener *listener, void *data)
 		wlr_log(WLR_DEBUG, "set preferred mode");
 		/* The mode is a tuple of (width, height, refresh rate). */
 		preferred_mode = wlr_output_preferred_mode(wlr_output);
-		wlr_output_set_mode(wlr_output, preferred_mode);
+		if (preferred_mode) {
+			wlr_output_set_mode(wlr_output, preferred_mode);
+		}
 	}
 
 	/*
@@ -327,10 +415,6 @@ new_output_notify(struct wl_listener *listener, void *data)
 
 	wlr_output_commit(wlr_output);
 
-	output = znew(*output);
-	output->wlr_output = wlr_output;
-	wlr_output->data = output;
-	output->server = server;
 	wlr_output_effective_resolution(wlr_output,
 		&output->usable_area.width, &output->usable_area.height);
 	wl_list_insert(&server->outputs, &output->link);
@@ -417,7 +501,7 @@ output_init(struct server *server)
 	 * Create an output layout, which is a wlroots utility for working with
 	 * an arrangement of screens in a physical layout.
 	 */
-	server->output_layout = wlr_output_layout_create();
+	server->output_layout = wlr_output_layout_create(server->wl_display);
 	if (!server->output_layout) {
 		wlr_log(WLR_ERROR, "unable to create output layout");
 		exit(EXIT_FAILURE);
@@ -517,6 +601,10 @@ output_config_apply(struct server *server,
 
 		if (need_to_remove) {
 			regions_evacuate_output(output);
+
+			lab_cosmic_workspace_group_output_leave(
+				server->workspaces.cosmic_group, output->wlr_output);
+
 			/*
 			 * At time of writing, wlr_output_layout_remove()
 			 * indirectly destroys the wlr_scene_output, but
@@ -801,6 +889,53 @@ output_nearest_to_cursor(struct server *server)
 		server->seat.cursor->y);
 }
 
+struct output *
+output_get_adjacent(struct output *output, enum view_edge edge, bool wrap)
+{
+	if (!output_is_usable(output)) {
+		wlr_log(WLR_ERROR,
+			"output is not usable, cannot find adjacent output");
+		return NULL;
+	}
+
+	struct wlr_box box = output_usable_area_in_layout_coords(output);
+	int lx = box.x + box.width / 2;
+	int ly = box.y + box.height / 2;
+
+	/* Determine any adjacent output in the appropriate direction */
+	struct wlr_output *new_output = NULL;
+	struct wlr_output *current_output = output->wlr_output;
+	struct wlr_output_layout *layout = output->server->output_layout;
+	enum wlr_direction direction = direction_from_view_edge(edge);
+	new_output = wlr_output_layout_adjacent_output(layout, direction,
+		current_output, lx, ly);
+
+	/*
+	 * Optionally wrap around from top-to-bottom or left-to-right, and vice
+	 * versa.
+	 */
+	if (wrap && !new_output) {
+		new_output = wlr_output_layout_farthest_output(layout,
+			direction_get_opposite(direction), current_output, lx, ly);
+	}
+
+	/*
+	 * When "adjacent" output is the same as the original, there is no
+	 * adjacent
+	 */
+	if (!new_output || new_output == current_output) {
+		return NULL;
+	}
+
+	output = output_from_wlr_output(output->server, new_output);
+	if (!output_is_usable(output)) {
+		wlr_log(WLR_ERROR, "invalid output in layout");
+		return NULL;
+	}
+
+	return output;
+}
+
 bool
 output_is_usable(struct output *output)
 {
@@ -909,9 +1044,6 @@ handle_output_power_manager_set_mode(struct wl_listener *listener, void *data)
 		break;
 	case ZWLR_OUTPUT_POWER_V1_MODE_ON:
 		wlr_output_enable(event->output, true);
-		if (!wlr_output_test(event->output)) {
-			wlr_output_rollback(event->output);
-		}
 		wlr_output_commit(event->output);
 		/*
 		 * Re-set the cursor image so that the cursor
@@ -935,3 +1067,17 @@ output_enable_adaptive_sync(struct wlr_output *output, bool enabled)
 			enabled ? "en" : "dis", output->name);
 	}
 }
+
+float
+output_max_scale(struct server *server)
+{
+	/* Never return less than 1, in case outputs are disabled */
+	float scale = 1;
+	struct output *output;
+	wl_list_for_each(output, &server->outputs, link) {
+		if (output_is_usable(output)) {
+			scale = MAX(scale, output->wlr_output->scale);
+		}
+	}
+	return scale;
+}
diff --git a/src/protocols/cosmic_workspaces/cosmic-workspaces.c b/src/protocols/cosmic_workspaces/cosmic-workspaces.c
new file mode 100644
index 00000000..e8d4cc6a
--- /dev/null
+++ b/src/protocols/cosmic_workspaces/cosmic-workspaces.c
@@ -0,0 +1,651 @@
+// SPDX-License-Identifier: GPL-2.0-only
+#include <assert.h>
+#include <wlr/types/wlr_output.h>
+#include <wlr/util/log.h>
+#include "common/array.h"
+#include "common/mem.h"
+#include "common/list.h"
+#include "cosmic-workspace-unstable-v1-protocol.h"
+#include "protocols/cosmic-workspaces.h"
+#include "protocols/cosmic-workspaces-internal.h"
+
+/*
+ *	.--------------------.
+ *	|        TODO        |
+ *	|--------------------|
+ *	| - prevent empty    |
+ *	|   done events      |
+ *	| - go through xml   |
+ *	|   and verify impl  |
+ *	| - assert pub API   |
+ *	`--------------------´
+ *
+ */
+
+/* Only used within an assert() */
+#ifndef NDEBUG
+	#define COSMIC_WORKSPACE_V1_VERSION 1
+#endif
+
+/* These are just *waaay* too long */
+#define ZCOSMIC_CAP_WS_CREATE \
+	ZCOSMIC_WORKSPACE_GROUP_HANDLE_V1_ZCOSMIC_WORKSPACE_GROUP_CAPABILITIES_V1_CREATE_WORKSPACE
+#define ZCOSMIC_CAP_WS_ACTIVATE \
+	ZCOSMIC_WORKSPACE_HANDLE_V1_ZCOSMIC_WORKSPACE_CAPABILITIES_V1_ACTIVATE
+#define ZCOSMIC_CAP_WS_DEACTIVATE \
+	ZCOSMIC_WORKSPACE_HANDLE_V1_ZCOSMIC_WORKSPACE_CAPABILITIES_V1_DEACTIVATE
+#define ZCOSMIC_CAP_WS_REMOVE \
+	ZCOSMIC_WORKSPACE_HANDLE_V1_ZCOSMIC_WORKSPACE_CAPABILITIES_V1_REMOVE
+
+enum workspace_state {
+	CW_WS_STATE_ACTIVE  = 1 << 0,
+	CW_WS_STATE_URGENT  = 1 << 1,
+	CW_WS_STATE_HIDDEN  = 1 << 2,
+
+	/*
+	 * Set when creating a new workspace so we
+	 * don't end up having to send the state twice.
+	 */
+	CW_WS_STATE_INVALID = 1 << 31,
+};
+
+static void
+add_caps(struct wl_array *caps_arr, uint32_t caps)
+{
+	if (caps == CW_CAP_NONE) {
+		return;
+	}
+	if (caps & CW_CAP_GRP_WS_CREATE) {
+		array_add(caps_arr, ZCOSMIC_CAP_WS_CREATE);
+	}
+	if (caps & CW_CAP_WS_ACTIVATE) {
+		array_add(caps_arr, ZCOSMIC_CAP_WS_ACTIVATE);
+	}
+	if (caps & CW_CAP_WS_DEACTIVATE) {
+		array_add(caps_arr, ZCOSMIC_CAP_WS_DEACTIVATE);
+	}
+	if (caps & CW_CAP_WS_REMOVE) {
+		array_add(caps_arr, ZCOSMIC_CAP_WS_REMOVE);
+	}
+}
+
+/* Workspace */
+static void
+workspace_handle_destroy(struct wl_client *client, struct wl_resource *resource)
+{
+	wl_resource_destroy(resource);
+}
+
+static void
+workspace_handle_activate(struct wl_client *client, struct wl_resource *resource)
+{
+	struct wl_resource_addon *addon = wl_resource_get_user_data(resource);
+	if (!addon) {
+		/* workspace was destroyed from the compositor side */
+		return;
+	}
+	struct lab_cosmic_workspace *workspace = addon->data;
+	transaction_add_workspace_ev(workspace, resource, CW_PENDING_WS_ACTIVATE);
+}
+
+static void
+workspace_handle_deactivate(struct wl_client *client, struct wl_resource *resource)
+{
+	struct wl_resource_addon *addon = wl_resource_get_user_data(resource);
+	if (!addon) {
+		/* Workspace was destroyed from the compositor side */
+		return;
+	}
+	struct lab_cosmic_workspace *workspace = addon->data;
+	transaction_add_workspace_ev(workspace, resource, CW_PENDING_WS_DEACTIVATE);
+}
+
+static void
+workspace_handle_remove(struct wl_client *client, struct wl_resource *resource)
+{
+	struct wl_resource_addon *addon = wl_resource_get_user_data(resource);
+	if (!addon) {
+		/* workspace was destroyed from the compositor side */
+		return;
+	}
+	struct lab_cosmic_workspace *workspace = addon->data;
+	transaction_add_workspace_ev(workspace, resource, CW_PENDING_WS_REMOVE);
+}
+
+static const struct zcosmic_workspace_handle_v1_interface workspace_impl = {
+	.destroy = workspace_handle_destroy,
+	.activate = workspace_handle_activate,
+	.deactivate = workspace_handle_deactivate,
+	.remove = workspace_handle_remove,
+};
+
+static void
+workspace_instance_resource_destroy(struct wl_resource *resource)
+{
+	struct wl_resource_addon *addon = wl_resource_get_user_data(resource);
+	if (addon) {
+		resource_addon_destroy(addon);
+		wl_resource_set_user_data(resource, NULL);
+	}
+
+	wl_list_remove(wl_resource_get_link(resource));
+}
+
+static struct wl_resource *
+workspace_resource_create(struct lab_cosmic_workspace *workspace,
+		struct wl_resource *group_resource, struct session_context *ctx)
+{
+	struct wl_client *client = wl_resource_get_client(group_resource);
+	struct wl_resource *resource = wl_resource_create(client,
+			&zcosmic_workspace_handle_v1_interface,
+			wl_resource_get_version(group_resource), 0);
+	if (!resource) {
+		wl_client_post_no_memory(client);
+		return NULL;
+	}
+
+	struct wl_resource_addon *addon = resource_addon_create(ctx);
+	addon->data = workspace;
+
+	wl_resource_set_implementation(resource, &workspace_impl, addon,
+		workspace_instance_resource_destroy);
+
+	wl_list_insert(&workspace->resources, wl_resource_get_link(resource));
+	return resource;
+}
+
+/* Workspace internal helpers */
+static void
+workspace_send_state(struct lab_cosmic_workspace *workspace, struct wl_resource *target)
+{
+	struct wl_array state;
+	wl_array_init(&state);
+
+	if (workspace->state & CW_WS_STATE_ACTIVE) {
+		array_add(&state, ZCOSMIC_WORKSPACE_HANDLE_V1_STATE_ACTIVE);
+	}
+	if (workspace->state & CW_WS_STATE_URGENT) {
+		array_add(&state, ZCOSMIC_WORKSPACE_HANDLE_V1_STATE_URGENT);
+	}
+	if (workspace->state & CW_WS_STATE_HIDDEN) {
+		array_add(&state, ZCOSMIC_WORKSPACE_HANDLE_V1_STATE_HIDDEN);
+	}
+
+	if (target) {
+		zcosmic_workspace_handle_v1_send_state(target, &state);
+	} else {
+		struct wl_resource *resource;
+		wl_resource_for_each(resource, &workspace->resources) {
+			zcosmic_workspace_handle_v1_send_state(resource, &state);
+		}
+	}
+
+	wl_array_release(&state);
+}
+
+static void
+workspace_send_initial_state(struct lab_cosmic_workspace *workspace, struct wl_resource *resource)
+{
+	zcosmic_workspace_handle_v1_send_capabilities(resource, &workspace->capabilities);
+	if (workspace->coordinates.size > 0) {
+		zcosmic_workspace_handle_v1_send_coordinates(resource, &workspace->coordinates);
+	}
+	if (workspace->name) {
+		zcosmic_workspace_handle_v1_send_name(resource, workspace->name);
+	}
+}
+
+static void
+workspace_set_state(struct lab_cosmic_workspace *workspace,
+		enum workspace_state state, bool enabled)
+{
+	if (!!(workspace->state_pending & state) == enabled) {
+		return;
+	}
+
+	if (enabled) {
+		workspace->state_pending |= state;
+	} else {
+		workspace->state_pending &= ~state;
+	}
+	manager_schedule_done_event(workspace->group->manager);
+}
+
+/* Group */
+static void
+group_handle_create_workspace(struct wl_client *client,
+		struct wl_resource *resource, const char *name)
+{
+	struct wl_resource_addon *addon = wl_resource_get_user_data(resource);
+	if (!addon) {
+		return;
+	}
+
+	struct lab_cosmic_workspace_group *group = addon->data;
+	transaction_add_workspace_group_ev(group, resource, CW_PENDING_WS_CREATE, name);
+}
+
+static void
+group_handle_destroy(struct wl_client *client, struct wl_resource *resource)
+{
+	wl_resource_destroy(resource);
+}
+
+static const struct zcosmic_workspace_group_handle_v1_interface group_impl = {
+	.create_workspace = group_handle_create_workspace,
+	.destroy = group_handle_destroy,
+};
+
+static void
+group_instance_resource_destroy(struct wl_resource *resource)
+{
+	struct wl_resource_addon *addon = wl_resource_get_user_data(resource);
+	if (addon) {
+		resource_addon_destroy(addon);
+		wl_resource_set_user_data(resource, NULL);
+	}
+	wl_list_remove(wl_resource_get_link(resource));
+}
+
+static struct wl_resource *
+group_resource_create(struct lab_cosmic_workspace_group *group,
+		struct wl_resource *manager_resource, struct session_context *ctx)
+{
+	struct wl_client *client = wl_resource_get_client(manager_resource);
+	struct wl_resource *resource = wl_resource_create(client,
+			&zcosmic_workspace_group_handle_v1_interface,
+			wl_resource_get_version(manager_resource), 0);
+	if (!resource) {
+		wl_client_post_no_memory(client);
+		return NULL;
+	}
+
+	struct wl_resource_addon *addon = resource_addon_create(ctx);
+	addon->data = group;
+
+	wl_resource_set_implementation(resource, &group_impl, addon,
+		group_instance_resource_destroy);
+
+	wl_list_insert(&group->resources, wl_resource_get_link(resource));
+	return resource;
+}
+
+/* Group internal helpers */
+static void
+group_send_state(struct lab_cosmic_workspace_group *group, struct wl_resource *resource)
+{
+	zcosmic_workspace_group_handle_v1_send_capabilities(
+		resource, &group->capabilities);
+
+	group_output_send_initial_state(group, resource);
+}
+
+/* Manager itself */
+static void
+manager_handle_commit(struct wl_client *client, struct wl_resource *resource)
+{
+	struct wl_resource_addon *addon = wl_resource_get_user_data(resource);
+	if (!addon) {
+		return;
+	}
+
+	struct transaction_group *trans_grp;
+	struct transaction_workspace *trans_ws;
+	struct transaction *trans, *trans_tmp;
+	wl_list_for_each_safe(trans, trans_tmp, &addon->ctx->transactions, link) {
+		switch (trans->change) {
+		case CW_PENDING_WS_CREATE:
+			trans_grp = wl_container_of(trans, trans_grp, base);
+			wl_signal_emit_mutable(
+				&trans_grp->group->events.create_workspace,
+				trans_grp->new_workspace_name);
+			free(trans_grp->new_workspace_name);
+			break;
+		case CW_PENDING_WS_ACTIVATE:
+			trans_ws = wl_container_of(trans, trans_ws, base);
+			wl_signal_emit_mutable(&trans_ws->workspace->events.activate, NULL);
+			break;
+		case CW_PENDING_WS_DEACTIVATE:
+			trans_ws = wl_container_of(trans, trans_ws, base);
+			wl_signal_emit_mutable(&trans_ws->workspace->events.deactivate, NULL);
+			break;
+		case CW_PENDING_WS_REMOVE:
+			trans_ws = wl_container_of(trans, trans_ws, base);
+			wl_signal_emit_mutable(&trans_ws->workspace->events.remove, NULL);
+			break;
+		default:
+			wlr_log(WLR_ERROR, "Invalid transaction state: %u", trans->change);
+		}
+		wl_list_remove(&trans->link);
+		free(trans);
+	}
+}
+
+static void
+manager_handle_stop(struct wl_client *client, struct wl_resource *resource)
+{
+	zcosmic_workspace_manager_v1_send_finished(resource);
+	wl_resource_destroy(resource);
+}
+
+static const struct zcosmic_workspace_manager_v1_interface manager_impl = {
+	.commit = manager_handle_commit,
+	.stop = manager_handle_stop,
+};
+
+static void
+manager_instance_resource_destroy(struct wl_resource *resource)
+{
+	struct wl_resource_addon *addon = wl_resource_get_user_data(resource);
+	if (addon) {
+		resource_addon_destroy(addon);
+		wl_resource_set_user_data(resource, NULL);
+	}
+
+	wl_list_remove(wl_resource_get_link(resource));
+}
+
+static void
+manager_handle_bind(struct wl_client *client, void *data,
+		uint32_t version, uint32_t id)
+{
+	struct lab_cosmic_workspace_manager *manager = data;
+	struct wl_resource *resource = wl_resource_create(client,
+			&zcosmic_workspace_manager_v1_interface,
+			version, id);
+	if (!resource) {
+		wl_client_post_no_memory(client);
+		return;
+	}
+
+	struct wl_resource_addon *addon = resource_addon_create(/* session context*/ NULL);
+	addon->data = manager;
+
+	wl_resource_set_implementation(resource, &manager_impl,
+		addon, manager_instance_resource_destroy);
+
+	wl_list_insert(&manager->resources, wl_resource_get_link(resource));
+
+	struct lab_cosmic_workspace *workspace;
+	struct lab_cosmic_workspace_group *group;
+	wl_list_for_each(group, &manager->groups, link) {
+		/* Create group resource */
+		struct wl_resource *group_resource =
+			group_resource_create(group, resource, addon->ctx);
+		zcosmic_workspace_manager_v1_send_workspace_group(resource, group_resource);
+		group_send_state(group, group_resource);
+
+		/* Create workspace resource */
+		wl_list_for_each(workspace, &group->workspaces, link) {
+			struct wl_resource *workspace_resource =
+				workspace_resource_create(workspace, group_resource, addon->ctx);
+			zcosmic_workspace_group_handle_v1_send_workspace(
+				group_resource, workspace_resource);
+			workspace_send_initial_state(workspace, workspace_resource);
+			/* Send the current workspace state manually */
+			workspace_send_state(workspace, workspace_resource);
+		}
+	}
+	zcosmic_workspace_manager_v1_send_done(resource);
+}
+
+static void
+manager_handle_display_destroy(struct wl_listener *listener, void *data)
+{
+	struct lab_cosmic_workspace_manager *manager =
+		wl_container_of(listener, manager, on.display_destroy);
+
+	wl_list_remove(&manager->on.display_destroy.link);
+	manager->event_loop = NULL;
+}
+
+/* Manager internal helpers */
+static void
+manager_idle_send_done(void *data)
+{
+	struct lab_cosmic_workspace_manager *manager = data;
+
+	struct lab_cosmic_workspace *workspace;
+	struct lab_cosmic_workspace_group *group;
+	wl_list_for_each(group, &manager->groups, link) {
+		wl_list_for_each(workspace, &group->workspaces, link) {
+			if (workspace->state != workspace->state_pending) {
+				workspace->state = workspace->state_pending;
+				workspace_send_state(workspace, /*target*/ NULL);
+			}
+		}
+	}
+
+	struct wl_resource *resource;
+	wl_resource_for_each(resource, &manager->resources) {
+		zcosmic_workspace_manager_v1_send_done(resource);
+	}
+	manager->idle_source = NULL;
+}
+
+/* Internal API */
+void
+manager_schedule_done_event(struct lab_cosmic_workspace_manager *manager)
+{
+	if (manager->idle_source) {
+		return;
+	}
+	if (!manager->event_loop) {
+		return;
+	}
+	manager->idle_source = wl_event_loop_add_idle(
+		manager->event_loop, manager_idle_send_done, manager);
+}
+
+/* Public API */
+struct lab_cosmic_workspace_manager *
+lab_cosmic_workspace_manager_create(struct wl_display *display, uint32_t caps, uint32_t version)
+{
+	assert(version <= COSMIC_WORKSPACE_V1_VERSION);
+
+	struct lab_cosmic_workspace_manager *manager = znew(*manager);
+	manager->global = wl_global_create(display,
+			&zcosmic_workspace_manager_v1_interface,
+			version, manager, manager_handle_bind);
+
+	if (!manager->global) {
+		free(manager);
+		return NULL;
+	}
+
+	manager->caps = caps;
+	manager->event_loop = wl_display_get_event_loop(display);
+
+	manager->on.display_destroy.notify = manager_handle_display_destroy;
+	wl_display_add_destroy_listener(display, &manager->on.display_destroy);
+
+	wl_list_init(&manager->groups);
+	wl_list_init(&manager->resources);
+	return manager;
+}
+
+struct lab_cosmic_workspace_group *
+lab_cosmic_workspace_group_create(struct lab_cosmic_workspace_manager *manager)
+{
+	assert(manager);
+
+	struct lab_cosmic_workspace_group *group = znew(*group);
+	group->manager = manager;
+
+	wl_array_init(&group->capabilities);
+	add_caps(&group->capabilities, manager->caps & CW_CAP_GRP_ALL);
+
+	wl_list_init(&group->outputs);
+	wl_list_init(&group->resources);
+	wl_list_init(&group->workspaces);
+	wl_signal_init(&group->events.create_workspace);
+	wl_signal_init(&group->events.destroy);
+
+	wl_list_append(&manager->groups, &group->link);
+
+	struct wl_resource *resource, *tmp;
+	wl_resource_for_each_safe(resource, tmp, &manager->resources) {
+		struct wl_resource_addon *addon = wl_resource_get_user_data(resource);
+		assert(addon && addon->ctx);
+		struct wl_resource *group_resource =
+			group_resource_create(group, resource, addon->ctx);
+		zcosmic_workspace_manager_v1_send_workspace_group(resource, group_resource);
+		group_send_state(group, group_resource);
+	}
+	manager_schedule_done_event(manager);
+
+	return group;
+}
+
+void
+lab_cosmic_workspace_group_destroy(struct lab_cosmic_workspace_group *group)
+{
+	if (!group) {
+		return;
+	}
+	wl_signal_emit_mutable(&group->events.destroy, NULL);
+
+	struct lab_cosmic_workspace *ws, *ws_tmp;
+	wl_list_for_each_safe(ws, ws_tmp, &group->workspaces, link) {
+		lab_cosmic_workspace_destroy(ws);
+	}
+
+	struct wl_resource *resource, *res_tmp;
+	wl_resource_for_each_safe(resource, res_tmp, &group->resources) {
+		struct wl_resource_addon *addon = wl_resource_get_user_data(resource);
+		if (addon) {
+			resource_addon_destroy(addon);
+			wl_resource_set_user_data(resource, NULL);
+		}
+		zcosmic_workspace_group_handle_v1_send_remove(resource);
+		wl_list_remove(wl_resource_get_link(resource));
+		wl_list_init(wl_resource_get_link(resource));
+	}
+
+	wl_list_remove(&group->link);
+	wl_array_release(&group->capabilities);
+	free(group);
+}
+
+struct lab_cosmic_workspace *
+lab_cosmic_workspace_create(struct lab_cosmic_workspace_group *group)
+{
+	assert(group);
+
+	struct lab_cosmic_workspace *workspace = znew(*workspace);
+	workspace->group = group;
+	/*
+	 * Ensures we are sending workspace->state_pending on the done event,
+	 * regardless if the compositor has changed any state in between here
+	 * and the scheduled done event or not.
+	 *
+	 * Without this we might have to send the state twice, first here and
+	 * then again in the scheduled done event when there were any changes.
+	 */
+	workspace->state = CW_WS_STATE_INVALID;
+
+	wl_array_init(&workspace->capabilities);
+	add_caps(&workspace->capabilities, group->manager->caps & CW_CAP_WS_ALL);
+
+	wl_list_init(&workspace->resources);
+	wl_array_init(&workspace->coordinates);
+	wl_signal_init(&workspace->events.activate);
+	wl_signal_init(&workspace->events.deactivate);
+	wl_signal_init(&workspace->events.remove);
+	wl_signal_init(&workspace->events.destroy);
+
+	wl_list_append(&group->workspaces, &workspace->link);
+
+	/* Notify clients */
+	struct wl_resource *group_resource;
+	wl_resource_for_each(group_resource, &group->resources) {
+		struct wl_resource_addon *addon = wl_resource_get_user_data(group_resource);
+		assert(addon && addon->ctx);
+		struct wl_resource *workspace_resource =
+			workspace_resource_create(workspace, group_resource, addon->ctx);
+		zcosmic_workspace_group_handle_v1_send_workspace(
+			group_resource, workspace_resource);
+		workspace_send_initial_state(workspace, workspace_resource);
+	}
+	manager_schedule_done_event(group->manager);
+
+	return workspace;
+}
+
+void
+lab_cosmic_workspace_set_name(struct lab_cosmic_workspace *workspace, const char *name)
+{
+	assert(workspace);
+	assert(name);
+
+	if (!workspace->name || strcmp(workspace->name, name)) {
+		free(workspace->name);
+		workspace->name = xstrdup(name);
+		struct wl_resource *resource;
+		wl_resource_for_each(resource, &workspace->resources) {
+			zcosmic_workspace_handle_v1_send_name(resource, workspace->name);
+		}
+	}
+	manager_schedule_done_event(workspace->group->manager);
+}
+
+void
+lab_cosmic_workspace_set_active(struct lab_cosmic_workspace *workspace, bool enabled)
+{
+	workspace_set_state(workspace, CW_WS_STATE_ACTIVE, enabled);
+}
+
+void
+lab_cosmic_workspace_set_urgent(struct lab_cosmic_workspace *workspace, bool enabled)
+{
+	workspace_set_state(workspace, CW_WS_STATE_URGENT, enabled);
+}
+
+void
+lab_cosmic_workspace_set_hidden(struct lab_cosmic_workspace *workspace, bool enabled)
+{
+	workspace_set_state(workspace, CW_WS_STATE_HIDDEN, enabled);
+}
+
+void
+lab_cosmic_workspace_set_coordinates(struct lab_cosmic_workspace *workspace,
+		struct wl_array *coordinates)
+{
+	wl_array_release(&workspace->coordinates);
+	wl_array_init(&workspace->coordinates);
+	wl_array_copy(&workspace->coordinates, coordinates);
+
+	struct wl_resource *resource;
+	wl_resource_for_each(resource, &workspace->resources) {
+		zcosmic_workspace_handle_v1_send_coordinates(resource, &workspace->coordinates);
+	}
+	manager_schedule_done_event(workspace->group->manager);
+}
+
+void
+lab_cosmic_workspace_destroy(struct lab_cosmic_workspace *workspace)
+{
+	if (!workspace) {
+		return;
+	}
+	wl_signal_emit_mutable(&workspace->events.destroy, NULL);
+
+	struct wl_resource *resource, *tmp;
+	wl_resource_for_each_safe(resource, tmp, &workspace->resources) {
+		struct wl_resource_addon *addon = wl_resource_get_user_data(resource);
+		if (addon) {
+			resource_addon_destroy(addon);
+			wl_resource_set_user_data(resource, NULL);
+		}
+		zcosmic_workspace_handle_v1_send_remove(resource);
+		wl_list_remove(wl_resource_get_link(resource));
+		wl_list_init(wl_resource_get_link(resource));
+	}
+	manager_schedule_done_event(workspace->group->manager);
+
+	wl_list_remove(&workspace->link);
+	wl_array_release(&workspace->coordinates);
+	wl_array_release(&workspace->capabilities);
+	zfree(workspace->name);
+	free(workspace);
+}
diff --git a/src/protocols/cosmic_workspaces/meson.build b/src/protocols/cosmic_workspaces/meson.build
new file mode 100644
index 00000000..29bb80ca
--- /dev/null
+++ b/src/protocols/cosmic_workspaces/meson.build
@@ -0,0 +1,5 @@
+labwc_sources += files(
+  'cosmic-workspaces.c',
+  'transactions.c',
+  'output.c',
+)
diff --git a/src/protocols/cosmic_workspaces/output.c b/src/protocols/cosmic_workspaces/output.c
new file mode 100644
index 00000000..3abaf83a
--- /dev/null
+++ b/src/protocols/cosmic_workspaces/output.c
@@ -0,0 +1,174 @@
+// SPDX-License-Identifier: GPL-2.0-only
+#include <wayland-server-core.h>
+#include <wlr/types/wlr_output.h>
+#include <wlr/util/log.h>
+#include "common/mem.h"
+#include "cosmic-workspace-unstable-v1-protocol.h"
+#include "protocols/cosmic-workspaces.h"
+#include "protocols/cosmic-workspaces-internal.h"
+
+struct group_output {
+	struct wlr_output *wlr_output;
+	struct lab_cosmic_workspace_group *group;
+	struct {
+		struct wl_listener group_destroy;
+		struct wl_listener output_bind;
+		struct wl_listener output_destroy;
+	} on;
+
+	struct wl_list link;
+};
+
+/* Internal helpers */
+static void
+group_output_send_event(struct wl_list *group_resources, struct wl_list *output_resources,
+		void (*notifier)(struct wl_resource *group, struct wl_resource *output))
+{
+	struct wl_client *client;
+	struct wl_resource *group_resource, *output_resource;
+	wl_resource_for_each(group_resource, group_resources) {
+		client = wl_resource_get_client(group_resource);
+		wl_resource_for_each(output_resource, output_resources) {
+			if (wl_resource_get_client(output_resource) == client) {
+				notifier(group_resource, output_resource);
+			}
+		}
+	}
+}
+
+static void
+group_output_destroy(struct group_output *group_output)
+{
+	group_output_send_event(
+		&group_output->group->resources,
+		&group_output->wlr_output->resources,
+		zcosmic_workspace_group_handle_v1_send_output_leave);
+
+	manager_schedule_done_event(group_output->group->manager);
+
+	wl_list_remove(&group_output->link);
+	wl_list_remove(&group_output->on.group_destroy.link);
+	wl_list_remove(&group_output->on.output_bind.link);
+	wl_list_remove(&group_output->on.output_destroy.link);
+	free(group_output);
+}
+
+/* Event handlers */
+static void
+handle_output_bind(struct wl_listener *listener, void *data)
+{
+	struct group_output *group_output =
+		wl_container_of(listener, group_output, on.output_bind);
+
+	struct wlr_output_event_bind *event = data;
+	struct wl_client *client = wl_resource_get_client(event->resource);
+
+	bool sent = false;
+	struct wl_resource *group_resource;
+	wl_resource_for_each(group_resource, &group_output->group->resources) {
+		if (wl_resource_get_client(group_resource) == client) {
+			zcosmic_workspace_group_handle_v1_send_output_enter(
+				group_resource, event->resource);
+			sent = true;
+		}
+	}
+	if (!sent) {
+		return;
+	}
+
+	struct wl_resource *manager_resource;
+	struct wl_list *manager_resources = &group_output->group->manager->resources;
+	wl_resource_for_each(manager_resource, manager_resources) {
+		if (wl_resource_get_client(manager_resource) == client) {
+			zcosmic_workspace_manager_v1_send_done(manager_resource);
+		}
+	}
+}
+
+static void
+handle_output_destroy(struct wl_listener *listener, void *data)
+{
+	struct group_output *group_output =
+		wl_container_of(listener, group_output, on.output_destroy);
+	group_output_destroy(group_output);
+}
+
+static void
+handle_group_destroy(struct wl_listener *listener, void *data)
+{
+	struct group_output *group_output =
+		wl_container_of(listener, group_output, on.group_destroy);
+	group_output_destroy(group_output);
+}
+
+/* Internal API*/
+void
+group_output_send_initial_state(struct lab_cosmic_workspace_group *group,
+		struct wl_resource *group_resource)
+{
+	struct group_output *group_output;
+	struct wl_resource *output_resource;
+	struct wl_client *client = wl_resource_get_client(group_resource);
+	wl_list_for_each(group_output, &group->outputs, link) {
+		wl_resource_for_each(output_resource, &group_output->wlr_output->resources) {
+			if (wl_resource_get_client(output_resource) == client) {
+				zcosmic_workspace_group_handle_v1_send_output_enter(
+					group_resource, output_resource);
+			}
+		}
+	}
+}
+
+/* Public API */
+void
+lab_cosmic_workspace_group_output_enter(struct lab_cosmic_workspace_group *group,
+		struct wlr_output *wlr_output)
+{
+	struct group_output *group_output;
+	wl_list_for_each(group_output, &group->outputs, link) {
+		if (group_output->wlr_output == wlr_output) {
+			return;
+		}
+	}
+	group_output = znew(*group_output);
+	group_output->wlr_output = wlr_output;
+	group_output->group = group;
+
+	group_output->on.group_destroy.notify = handle_group_destroy;
+	wl_signal_add(&group->events.destroy, &group_output->on.group_destroy);
+
+	group_output->on.output_bind.notify = handle_output_bind;
+	wl_signal_add(&wlr_output->events.bind, &group_output->on.output_bind);
+
+	group_output->on.output_destroy.notify = handle_output_destroy;
+	wl_signal_add(&wlr_output->events.destroy, &group_output->on.output_destroy);
+
+	wl_list_insert(&group->outputs, &group_output->link);
+
+	group_output_send_event(
+		&group_output->group->resources,
+		&group_output->wlr_output->resources,
+		zcosmic_workspace_group_handle_v1_send_output_enter);
+
+	manager_schedule_done_event(group->manager);
+}
+
+void
+lab_cosmic_workspace_group_output_leave(struct lab_cosmic_workspace_group *group,
+		struct wlr_output *wlr_output)
+{
+	struct group_output *tmp;
+	struct group_output *group_output = NULL;
+	wl_list_for_each(tmp, &group->outputs, link) {
+		if (tmp->wlr_output == wlr_output) {
+			group_output = tmp;
+			break;
+		}
+	}
+	if (!group_output) {
+		wlr_log(WLR_ERROR, "output %s was never entered", wlr_output->name);
+		return;
+	}
+
+	group_output_destroy(group_output);
+}
diff --git a/src/protocols/cosmic_workspaces/transactions.c b/src/protocols/cosmic_workspaces/transactions.c
new file mode 100644
index 00000000..571b2c11
--- /dev/null
+++ b/src/protocols/cosmic_workspaces/transactions.c
@@ -0,0 +1,93 @@
+// SPDX-License-Identifier: GPL-2.0-only
+#include <assert.h>
+#include <wayland-server-core.h>
+#include <wlr/util/log.h>
+#include "common/list.h"
+#include "common/mem.h"
+#include "protocols/cosmic-workspaces-internal.h"
+
+static void
+transactions_destroy(struct wl_list *list)
+{
+	struct transaction_group *group;
+	struct transaction *trans, *trans_tmp;
+	wl_list_for_each_safe(trans, trans_tmp, list, link) {
+		if (trans->change == CW_PENDING_WS_CREATE) {
+			group = wl_container_of(trans, group, base);
+			free(group->new_workspace_name);
+		}
+		wl_list_remove(&trans->link);
+		free(trans);
+	}
+}
+
+void
+resource_addon_destroy(struct wl_resource_addon *addon)
+{
+	assert(addon);
+	assert(addon->ctx);
+
+	addon->ctx->ref_count--;
+	assert(addon->ctx->ref_count >= 0);
+
+	wlr_log(WLR_DEBUG, "New refcount for session %p: %d",
+		addon->ctx, addon->ctx->ref_count);
+	if (!addon->ctx->ref_count) {
+		wlr_log(WLR_DEBUG, "Destroying session context");
+		transactions_destroy(&addon->ctx->transactions);
+		free(addon->ctx);
+	}
+
+	free(addon);
+}
+
+struct wl_resource_addon *
+resource_addon_create(struct session_context *ctx)
+{
+	struct wl_resource_addon *addon = znew(*addon);
+	if (!ctx) {
+		ctx = znew(*ctx);
+		wl_list_init(&ctx->transactions);
+	}
+	addon->ctx = ctx;
+	addon->ctx->ref_count++;
+	return addon;
+}
+
+void
+transaction_add_workspace_ev(struct lab_cosmic_workspace *ws,
+		struct wl_resource *resource, enum pending_change change)
+{
+	struct wl_resource_addon *addon = wl_resource_get_user_data(resource);
+	if (!addon) {
+		wlr_log(WLR_ERROR, "Failed to find manager addon for workspace transaction");
+		return;
+	}
+
+	assert(change != CW_PENDING_WS_CREATE);
+
+	struct transaction_workspace *trans_ws = znew(*trans_ws);
+	trans_ws->workspace = ws;
+	trans_ws->base.change = change;
+	wl_list_append(&addon->ctx->transactions, &trans_ws->base.link);
+}
+
+void
+transaction_add_workspace_group_ev(struct lab_cosmic_workspace_group *group,
+		struct wl_resource *resource, enum pending_change change,
+		const char *new_workspace_name)
+{
+	struct wl_resource_addon *addon = wl_resource_get_user_data(resource);
+	if (!addon) {
+		wlr_log(WLR_ERROR, "Failed to find manager addon for group transaction");
+		return;
+	}
+
+	assert(change == CW_PENDING_WS_CREATE);
+
+	struct transaction_group *trans_grp = znew(*trans_grp);
+	trans_grp->group = group;
+	trans_grp->base.change = change;
+	trans_grp->new_workspace_name = xstrdup(new_workspace_name);
+	wl_list_append(&addon->ctx->transactions, &trans_grp->base.link);
+}
diff --git a/src/protocols/meson.build b/src/protocols/meson.build
new file mode 100644
index 00000000..d4412119
--- /dev/null
+++ b/src/protocols/meson.build
@@ -0,0 +1 @@
+subdir('cosmic_workspaces')
diff --git a/src/regions.c b/src/regions.c
index 1b265fe3..f52a5619 100644
--- a/src/regions.c
+++ b/src/regions.c
@@ -20,7 +20,8 @@ regions_should_snap(struct server *server)
 {
 	if (server->input_mode != LAB_INPUT_STATE_MOVE
 			|| wl_list_empty(&rc.regions)
-			|| server->seat.region_prevent_snap) {
+			|| server->seat.region_prevent_snap
+			|| !view_is_floating(server->grabbed_view)) {
 		return false;
 	}
 
diff --git a/src/resistance.c b/src/resistance.c
index ce2efbdd..a20f3b3c 100644
--- a/src/resistance.c
+++ b/src/resistance.c
@@ -91,8 +91,38 @@ check_edge_window(int *next, struct edge current, struct edge target,
 		oppose, align, rc.window_edge_strength, lesser);
 }
 
+bool
+resistance_unsnap_apply(struct view *view, int *x, int *y)
+{
+	if (view_is_floating(view)) {
+		return false;
+	}
+
+	int dx = *x - view->current.x;
+	int dy = *y - view->current.y;
+	if (view->maximized == VIEW_AXIS_HORIZONTAL) {
+		if (abs(dx) < rc.unmaximize_threshold) {
+			*x = view->current.x;
+			return false;
+		}
+	} else if (view->maximized == VIEW_AXIS_VERTICAL) {
+		if (abs(dy) < rc.unmaximize_threshold) {
+			*y = view->current.y;
+			return false;
+		}
+	} else {
+		if (dx * dx + dy * dy < rc.unsnap_threshold * rc.unsnap_threshold) {
+			*x = view->current.x;
+			*y = view->current.y;
+			return false;
+		}
+	}
+
+	return true;
+}
+
 void
-resistance_move_apply(struct view *view, double *x, double *y)
+resistance_move_apply(struct view *view, int *x, int *y)
 {
 	assert(view);
 
diff --git a/src/seat.c b/src/seat.c
index 287c40a3..1fd3cb8e 100644
--- a/src/seat.c
+++ b/src/seat.c
@@ -40,7 +40,7 @@ device_type_from_wlr_device(struct wlr_input_device *wlr_input_device)
 {
 	switch (wlr_input_device->type) {
 	case WLR_INPUT_DEVICE_TOUCH:
-	case WLR_INPUT_DEVICE_TABLET_TOOL:
+	case WLR_INPUT_DEVICE_TABLET:
 		return LAB_LIBINPUT_DEVICE_TOUCH;
 	default:
 		break;
@@ -114,7 +114,11 @@ configure_libinput(struct wlr_input_device *wlr_input_device)
 		wlr_log(WLR_ERROR, "no wlr_input_device");
 		return;
 	}
+	struct input *input = wlr_input_device->data;
+
+	/* Set scroll factor to 1.0 for Wayland/X11 backends or virtual pointers */
 	if (!wlr_input_device_is_libinput(wlr_input_device)) {
+		input->scroll_factor = 1.0;
 		return;
 	}
 
@@ -247,6 +251,9 @@ configure_libinput(struct wlr_input_device *wlr_input_device)
 		wlr_log(WLR_INFO, "calibration matrix configured");
 		libinput_device_config_calibration_set_matrix(libinput_dev, dc->calibration_matrix);
 	}
+
+	wlr_log(WLR_INFO, "scroll factor configured");
+	input->scroll_factor = dc->scroll_factor;
 }
 
 static struct wlr_output *
@@ -286,6 +293,7 @@ new_pointer(struct seat *seat, struct wlr_input_device *dev)
 {
 	struct input *input = znew(*input);
 	input->wlr_input_device = dev;
+	dev->data = input;
 	configure_libinput(dev);
 	wlr_cursor_attach_input_device(seat->cursor, dev);
 
@@ -354,6 +362,7 @@ new_touch(struct seat *seat, struct wlr_input_device *dev)
 {
 	struct input *input = znew(*input);
 	input->wlr_input_device = dev;
+	dev->data = input;
 	configure_libinput(dev);
 	wlr_cursor_attach_input_device(seat->cursor, dev);
 	/* In support of running with WLR_WL_OUTPUTS set to >=2 */
@@ -367,7 +376,7 @@ new_tablet(struct seat *seat, struct wlr_input_device *dev)
 {
 	struct input *input = znew(*input);
 	input->wlr_input_device = dev;
-	tablet_init(seat, dev);
+	tablet_create(seat, dev);
 	wlr_cursor_attach_input_device(seat->cursor, dev);
 	wlr_log(WLR_INFO, "map tablet to output %s\n", rc.tablet.output_name);
 	map_input_to_output(seat, dev, rc.tablet.output_name);
@@ -380,7 +389,7 @@ new_tablet_pad(struct seat *seat, struct wlr_input_device *dev)
 {
 	struct input *input = znew(*input);
 	input->wlr_input_device = dev;
-	tablet_pad_init(seat, dev);
+	tablet_pad_create(seat, dev);
 
 	return input;
 }
@@ -398,7 +407,7 @@ seat_update_capabilities(struct seat *seat)
 			caps |= WL_SEAT_CAPABILITY_KEYBOARD;
 			break;
 		case WLR_INPUT_DEVICE_POINTER:
-		case WLR_INPUT_DEVICE_TABLET_TOOL:
+		case WLR_INPUT_DEVICE_TABLET:
 			caps |= WL_SEAT_CAPABILITY_POINTER;
 			break;
 		case WLR_INPUT_DEVICE_TOUCH:
@@ -446,7 +455,7 @@ new_input_notify(struct wl_listener *listener, void *data)
 	case WLR_INPUT_DEVICE_TOUCH:
 		input = new_touch(seat, device);
 		break;
-	case WLR_INPUT_DEVICE_TABLET_TOOL:
+	case WLR_INPUT_DEVICE_TABLET:
 		input = new_tablet(seat, device);
 		break;
 	case WLR_INPUT_DEVICE_TABLET_PAD:
@@ -617,7 +626,7 @@ seat_reconfigure(struct server *server)
 			configure_libinput(input->wlr_input_device);
 			map_touch_to_output(seat, input->wlr_input_device);
 			break;
-		case WLR_INPUT_DEVICE_TABLET_TOOL:
+		case WLR_INPUT_DEVICE_TABLET:
 			map_input_to_output(seat, input->wlr_input_device, rc.tablet.output_name);
 			break;
 		default:
@@ -645,11 +654,6 @@ seat_focus(struct seat *seat, struct wlr_surface *surface, bool is_lock_surface)
 		return;
 	}
 
-	/* Respect input inhibit (also used by some lock screens) */
-	if (input_inhibit_blocks_surface(seat, surface->resource)) {
-		return;
-	}
-
 	if (!wlr_seat_get_keyboard(seat->seat)) {
 		/*
 		 * wlr_seat_keyboard_notify_enter() sends wl_keyboard.modifiers,
@@ -726,22 +730,17 @@ pressed_surface_destroy(struct wl_listener *listener, void *data)
 }
 
 void
-seat_set_pressed(struct seat *seat, struct view *view,
-	struct wlr_scene_node *node, struct wlr_surface *surface,
-	struct wlr_surface *toplevel, uint32_t resize_edges)
+seat_set_pressed(struct seat *seat, struct cursor_context *ctx)
 {
-	assert(view || surface);
+	assert(ctx);
+	assert(ctx->view || ctx->surface);
 	seat_reset_pressed(seat);
 
-	seat->pressed.view = view;
-	seat->pressed.node = node;
-	seat->pressed.surface = surface;
-	seat->pressed.toplevel = toplevel;
-	seat->pressed.resize_edges = resize_edges;
+	seat->pressed = *ctx;
 
-	if (surface) {
+	if (ctx->surface) {
 		seat->pressed_surface_destroy.notify = pressed_surface_destroy;
-		wl_signal_add(&surface->events.destroy,
+		wl_signal_add(&ctx->surface->events.destroy,
 			&seat->pressed_surface_destroy);
 	}
 }
@@ -752,12 +751,7 @@ seat_reset_pressed(struct seat *seat)
 	if (seat->pressed.surface) {
 		wl_list_remove(&seat->pressed_surface_destroy.link);
 	}
-
-	seat->pressed.view = NULL;
-	seat->pressed.node = NULL;
-	seat->pressed.surface = NULL;
-	seat->pressed.toplevel = NULL;
-	seat->pressed.resize_edges = 0;
+	seat->pressed = (struct cursor_context){0};
 }
 
 void
@@ -772,7 +766,7 @@ seat_output_layout_changed(struct seat *seat)
 		case WLR_INPUT_DEVICE_TOUCH:
 			map_touch_to_output(seat, input->wlr_input_device);
 			break;
-		case WLR_INPUT_DEVICE_TABLET_TOOL:
+		case WLR_INPUT_DEVICE_TABLET:
 			map_input_to_output(seat, input->wlr_input_device, rc.tablet.output_name);
 			break;
 		default:
diff --git a/src/server.c b/src/server.c
index 0a093930..d9241940 100644
--- a/src/server.c
+++ b/src/server.c
@@ -7,10 +7,10 @@
 #include <wlr/backend/headless.h>
 #include <wlr/backend/multi.h>
 #include <wlr/types/wlr_data_control_v1.h>
+#include <wlr/types/wlr_drm.h>
 #include <wlr/types/wlr_export_dmabuf_v1.h>
 #include <wlr/types/wlr_fractional_scale_v1.h>
 #include <wlr/types/wlr_gamma_control_v1.h>
-#include <wlr/types/wlr_input_inhibitor.h>
 #include <wlr/types/wlr_presentation_time.h>
 #include <wlr/types/wlr_primary_selection_v1.h>
 #include <wlr/types/wlr_screencopy_v1.h>
@@ -26,10 +26,15 @@
 #include "config/rcxml.h"
 #include "config/session.h"
 #include "decorations.h"
+#if HAVE_LIBSFDO
+#include "icon-loader.h"
+#endif
 #include "idle.h"
 #include "labwc.h"
 #include "layers.h"
+#include "magnifier.h"
 #include "menu/menu.h"
+#include "output-state.h"
 #include "output-virtual.h"
 #include "regions.h"
 #include "resize-indicator.h"
@@ -40,6 +45,7 @@
 
 #define LAB_WLR_COMPOSITOR_VERSION 5
 #define LAB_WLR_FRACTIONAL_SCALE_V1_VERSION 1
+#define LAB_WLR_LINUX_DMABUF_VERSION 4
 
 static struct wlr_compositor *compositor;
 static struct wl_event_source *sighup_source;
@@ -55,6 +61,11 @@ reload_config_and_theme(struct server *server)
 	theme_finish(server->theme);
 	theme_init(server->theme, server, rc.theme_name);
 
+#if HAVE_LIBSFDO
+	icon_loader_finish(server);
+	icon_loader_init(server);
+#endif
+
 	struct view *view;
 	wl_list_for_each(view, &server->views, link) {
 		view_reload_ssd(view);
@@ -150,61 +161,6 @@ handle_sigchld(int signal, void *data)
 	return 0;
 }
 
-static void
-seat_inhibit_input(struct seat *seat,  struct wl_client *active_client)
-{
-	seat->active_client_while_inhibited = active_client;
-
-	if (seat->focused_layer && active_client !=
-			wl_resource_get_client(seat->focused_layer->resource)) {
-		seat_set_focus_layer(seat, NULL);
-	}
-	struct wlr_surface *previous_kb_surface =
-		seat->seat->keyboard_state.focused_surface;
-	if (previous_kb_surface && active_client !=
-			wl_resource_get_client(previous_kb_surface->resource)) {
-		seat_focus_surface(seat, NULL);	  /* keyboard focus */
-	}
-
-	struct wlr_seat_client *previous_ptr_client =
-		seat->seat->pointer_state.focused_client;
-	if (previous_ptr_client && previous_ptr_client->client != active_client) {
-		wlr_seat_pointer_clear_focus(seat->seat);
-	}
-}
-
-static void
-seat_disinhibit_input(struct seat *seat)
-{
-	seat->active_client_while_inhibited = NULL;
-
-	/*
-	 * Triggers a refocus of the topmost surface layer if necessary
-	 * TODO: Make layer surface focus per-output based on cursor position
-	 */
-	output_update_all_usable_areas(seat->server, /*layout_changed*/ false);
-}
-
-static void
-handle_input_inhibit(struct wl_listener *listener, void *data)
-{
-	wlr_log(WLR_INFO, "activate input inhibit");
-
-	struct server *server =
-		wl_container_of(listener, server, input_inhibit_activate);
-	seat_inhibit_input(&server->seat, server->input_inhibit->active_client);
-}
-
-static void
-handle_input_disinhibit(struct wl_listener *listener, void *data)
-{
-	wlr_log(WLR_INFO, "deactivate input inhibit");
-
-	struct server *server =
-		wl_container_of(listener, server, input_inhibit_deactivate);
-	seat_disinhibit_input(&server->seat);
-}
-
 static void
 handle_drm_lease_request(struct wl_listener *listener, void *data)
 {
@@ -304,6 +260,51 @@ get_headless_backend(struct wlr_backend *backend, void *data)
 	}
 }
 
+static void
+handle_renderer_lost(struct wl_listener *listener, void *data)
+{
+	struct server *server = wl_container_of(listener, server, renderer_lost);
+
+	wlr_log(WLR_INFO, "Re-creating renderer after GPU reset");
+
+	struct wlr_renderer *renderer = wlr_renderer_autocreate(server->backend);
+	if (!renderer) {
+		wlr_log(WLR_ERROR, "Unable to create renderer");
+		return;
+	}
+
+	struct wlr_allocator *allocator =
+		wlr_allocator_autocreate(server->backend, renderer);
+	if (!allocator) {
+		wlr_log(WLR_ERROR, "Unable to create allocator");
+		wlr_renderer_destroy(renderer);
+		return;
+	}
+
+	struct wlr_renderer *old_renderer = server->renderer;
+	struct wlr_allocator *old_allocator = server->allocator;
+	server->renderer = renderer;
+	server->allocator = allocator;
+
+	wl_list_remove(&server->renderer_lost.link);
+	wl_signal_add(&server->renderer->events.lost, &server->renderer_lost);
+
+	wlr_compositor_set_renderer(compositor, renderer);
+
+	struct output *output;
+	wl_list_for_each(output, &server->outputs, link) {
+		wlr_output_init_render(output->wlr_output,
+			server->allocator, server->renderer);
+	}
+
+	reload_config_and_theme(server);
+
+	magnify_reset();
+
+	wlr_allocator_destroy(old_allocator);
+	wlr_renderer_destroy(old_renderer);
+}
+
 void
 server_init(struct server *server)
 {
@@ -346,7 +347,7 @@ server_init(struct server *server)
 	 * window if an x11 server is running.
 	 */
 	server->backend = wlr_backend_autocreate(
-		server->wl_display, &server->session);
+		server->wl_event_loop, &server->session);
 	if (!server->backend) {
 		wlr_log(WLR_ERROR, "unable to create backend");
 		fprintf(stderr, helpful_seat_error_message);
@@ -359,7 +360,8 @@ server_init(struct server *server)
 
 	if (!server->headless.backend) {
 		wlr_log(WLR_DEBUG, "manually creating headless backend");
-		server->headless.backend = wlr_headless_backend_create(server->wl_display);
+		server->headless.backend = wlr_headless_backend_create(
+			server->wl_event_loop);
 	} else {
 		wlr_log(WLR_DEBUG, "headless backend already exists");
 	}
@@ -390,7 +392,26 @@ server_init(struct server *server)
 		exit(EXIT_FAILURE);
 	}
 
-	wlr_renderer_init_wl_display(server->renderer, server->wl_display);
+	server->renderer_lost.notify = handle_renderer_lost;
+	wl_signal_add(&server->renderer->events.lost, &server->renderer_lost);
+
+	if (!wlr_renderer_init_wl_shm(server->renderer, server->wl_display)) {
+		wlr_log(WLR_ERROR, "Failed to initialize shared memory pool");
+		exit(EXIT_FAILURE);
+	}
+
+	if (wlr_renderer_get_texture_formats(
+			server->renderer, WLR_BUFFER_CAP_DMABUF)) {
+		if (wlr_renderer_get_drm_fd(server->renderer) >= 0) {
+			wlr_drm_create(server->wl_display, server->renderer);
+		}
+		server->linux_dmabuf = wlr_linux_dmabuf_v1_create_with_renderer(
+			server->wl_display,
+			LAB_WLR_LINUX_DMABUF_VERSION,
+			server->renderer);
+	} else {
+		wlr_log(WLR_DEBUG, "unable to initialize dmabuf");
+	}
 
 	/*
 	 * Autocreates an allocator for us. The allocator is the bridge between
@@ -414,6 +435,7 @@ server_init(struct server *server)
 		wlr_log(WLR_ERROR, "unable to create scene");
 		exit(EXIT_FAILURE);
 	}
+	server->direct_scanout_enabled = server->scene->direct_scanout;
 
 	/*
 	 * The order in which the scene-trees below are created determines the
@@ -498,7 +520,9 @@ server_init(struct server *server)
 		wlr_log(WLR_ERROR, "unable to create presentation interface");
 		exit(EXIT_FAILURE);
 	}
-	wlr_scene_set_presentation(server->scene, presentation);
+	if (server->linux_dmabuf) {
+		wlr_scene_set_linux_dmabuf_v1(server->scene, server->linux_dmabuf);
+	}
 
 	wlr_export_dmabuf_manager_v1_create(server->wl_display);
 	wlr_screencopy_manager_v1_create(server->wl_display);
@@ -521,21 +545,6 @@ server_init(struct server *server)
 	wl_signal_add(&server->constraints->events.new_constraint,
 		&server->new_constraint);
 
-	server->input_inhibit =
-		wlr_input_inhibit_manager_create(server->wl_display);
-	if (!server->input_inhibit) {
-		wlr_log(WLR_ERROR, "unable to create input inhibit manager");
-		exit(EXIT_FAILURE);
-	}
-
-	wl_signal_add(&server->input_inhibit->events.activate,
-		&server->input_inhibit_activate);
-	server->input_inhibit_activate.notify = handle_input_inhibit;
-
-	wl_signal_add(&server->input_inhibit->events.deactivate,
-		&server->input_inhibit_deactivate);
-	server->input_inhibit_deactivate.notify = handle_input_disinhibit;
-
 	server->foreign_toplevel_manager =
 		wlr_foreign_toplevel_manager_v1_create(server->wl_display);
 
@@ -567,6 +576,10 @@ server_init(struct server *server)
 
 	layers_init(server);
 
+#if HAVE_LIBSFDO
+	icon_loader_init(server);
+#endif
+
 #if HAVE_XWAYLAND
 	xwayland_server_init(server, compositor);
 #endif
@@ -613,10 +626,12 @@ server_finish(struct server *server)
 	wl_display_destroy_clients(server->wl_display);
 
 	seat_finish(server);
-	wlr_output_layout_destroy(server->output_layout);
-
 	wl_display_destroy(server->wl_display);
 
 	/* TODO: clean up various scene_tree nodes */
 	workspaces_destroy(server);
+
+#if HAVE_LIBSFDO
+	icon_loader_finish(server);
+#endif
 }
diff --git a/src/session-lock.c b/src/session-lock.c
index 72db111f..bdf3f053 100644
--- a/src/session-lock.c
+++ b/src/session-lock.c
@@ -13,7 +13,7 @@ struct session_lock_output {
 	struct wlr_session_lock_surface_v1 *surface;
 	struct wl_event_source *blank_timer;
 
-	struct wl_list link; /* session_lock_manager.outputs */
+	struct wl_list link; /* session_lock_manager.lock_outputs */
 
 	struct wl_listener destroy;
 	struct wl_listener commit;
@@ -37,7 +37,7 @@ refocus_output(struct session_lock_output *output)
 	}
 
 	struct session_lock_output *iter;
-	wl_list_for_each(iter, &output->manager->session_lock_outputs, link) {
+	wl_list_for_each(iter, &output->manager->lock_outputs, link) {
 		if (iter == output || !iter->surface || !iter->surface->surface) {
 			continue;
 		}
@@ -109,7 +109,7 @@ handle_new_surface(struct wl_listener *listener, void *data)
 	struct wlr_session_lock_surface_v1 *lock_surface = data;
 	struct output *output = lock_surface->output->data;
 	struct session_lock_output *lock_output;
-	wl_list_for_each(lock_output, &manager->session_lock_outputs, link) {
+	wl_list_for_each(lock_output, &manager->lock_outputs, link) {
 		if (lock_output->output == output) {
 			goto found_lock_output;
 		}
@@ -211,7 +211,10 @@ session_lock_output_create(struct session_lock_manager *manager, struct output *
 		goto exit_session;
 	}
 
-	/* Delay blanking output by 100ms to prevent flashing */
+	/*
+	 * Delay blanking output by 100ms to prevent flicker. If the session is
+	 * already locked, blank immediately.
+	 */
 	lock_output->blank_timer =
 		wl_event_loop_add_timer(manager->server->wl_event_loop,
 			handle_output_blank_timeout, lock_output);
@@ -235,7 +238,7 @@ session_lock_output_create(struct session_lock_manager *manager, struct output *
 
 	lock_output_reconfigure(lock_output);
 
-	wl_list_insert(&manager->session_lock_outputs, &lock_output->link);
+	wl_list_insert(&manager->lock_outputs, &lock_output->link);
 	return;
 
 exit_session:
@@ -248,7 +251,7 @@ static void
 session_lock_destroy(struct session_lock_manager *manager)
 {
 	struct session_lock_output *lock_output, *next;
-	wl_list_for_each_safe(lock_output, next, &manager->session_lock_outputs, link) {
+	wl_list_for_each_safe(lock_output, next, &manager->lock_outputs, link) {
 		wlr_scene_node_destroy(&lock_output->tree->node);
 	}
 	if (manager->lock) {
@@ -266,25 +269,32 @@ handle_lock_unlock(struct wl_listener *listener, void *data)
 		wl_container_of(listener, manager, lock_unlock);
 	session_lock_destroy(manager);
 	manager->locked = false;
-	desktop_focus_topmost_view(manager->server);
+
+	if (manager->last_active_view) {
+		desktop_focus_view(manager->last_active_view, /* raise */ false);
+	} else {
+		desktop_focus_topmost_view(manager->server);
+	}
+	manager->last_active_view = NULL;
+
 	cursor_update_focus(manager->server);
 }
 
+/* Called when session-lock is destroyed without unlock */
 static void
 handle_lock_destroy(struct wl_listener *listener, void *data)
 {
 	struct session_lock_manager *manager =
 		wl_container_of(listener, manager, lock_destroy);
 
-	float *black = (float[4]) { 0.f, 0.f, 0.f, 1.f };
-	struct session_lock_output *lock_output;
-	wl_list_for_each(lock_output, &manager->session_lock_outputs, link) {
-		wlr_scene_rect_set_color(lock_output->background, black);
-	}
-
+	/*
+	 * Destroy session-lock, but manager->locked remains true and
+	 * lock_outputs still hides the screens.
+	 */
 	wl_list_remove(&manager->lock_destroy.link);
 	wl_list_remove(&manager->lock_unlock.link);
 	wl_list_remove(&manager->lock_new_surface.link);
+	manager->lock = NULL;
 }
 
 static void
@@ -301,9 +311,14 @@ handle_new_session_lock(struct wl_listener *listener, void *data)
 	}
 	if (manager->locked) {
 		wlr_log(WLR_INFO, "replacing abandoned lock");
+		/* clear manager->lock_outputs */
 		session_lock_destroy(manager);
 	}
-	assert(wl_list_empty(&manager->session_lock_outputs));
+	assert(wl_list_empty(&manager->lock_outputs));
+
+	/* Remember the focused view to restore it on unlock */
+	manager->last_active_view = manager->server->active_view;
+	seat_focus_surface(&manager->server->seat, NULL);
 
 	struct output *output;
 	wl_list_for_each(output, &manager->server->outputs, link) {
@@ -320,6 +335,7 @@ handle_new_session_lock(struct wl_listener *listener, void *data)
 	wl_signal_add(&lock->events.destroy, &manager->lock_destroy);
 
 	manager->locked = true;
+	manager->lock = lock;
 	wlr_session_lock_v1_send_locked(lock);
 }
 
@@ -342,7 +358,7 @@ session_lock_init(struct server *server)
 	server->session_lock_manager = manager;
 	manager->server = server;
 	manager->wlr_manager = wlr_session_lock_manager_v1_create(server->wl_display);
-	wl_list_init(&manager->session_lock_outputs);
+	wl_list_init(&manager->lock_outputs);
 
 	manager->new_lock.notify = handle_new_session_lock;
 	wl_signal_add(&manager->wlr_manager->events.new_lock, &manager->new_lock);
@@ -365,7 +381,7 @@ session_lock_update_for_layout_change(struct server *server)
 
 	struct session_lock_manager *manager = server->session_lock_manager;
 	struct session_lock_output *lock_output;
-	wl_list_for_each(lock_output, &manager->session_lock_outputs, link) {
+	wl_list_for_each(lock_output, &manager->lock_outputs, link) {
 		lock_output_reconfigure(lock_output);
 	}
 }
diff --git a/src/snap.c b/src/snap.c
index ca5186cf..612d7a3f 100644
--- a/src/snap.c
+++ b/src/snap.c
@@ -220,6 +220,7 @@ snap_shrink_to_next_edge(struct view *view,
 
 	*geo = view->pending;
 	uint32_t resize_edges;
+	int min_width = view_get_min_width();
 
 	/*
 	 * First shrink the view along the relevant edge. The maximum shrink
@@ -228,12 +229,12 @@ snap_shrink_to_next_edge(struct view *view,
 	 */
 	switch (direction) {
 	case VIEW_EDGE_RIGHT:
-		geo->width = MAX(geo->width / 2, LAB_MIN_VIEW_WIDTH);
+		geo->width = MAX(geo->width / 2, min_width);
 		geo->x = view->pending.x + view->pending.width - geo->width;
 		resize_edges = WLR_EDGE_LEFT;
 		break;
 	case VIEW_EDGE_LEFT:
-		geo->width = MAX(geo->width / 2, LAB_MIN_VIEW_WIDTH);
+		geo->width = MAX(geo->width / 2, min_width);
 		resize_edges = WLR_EDGE_RIGHT;
 		break;
 	case VIEW_EDGE_DOWN:
diff --git a/src/ssd/ssd-border.c b/src/ssd/ssd-border.c
index 74f29ffa..aa7c4d5f 100644
--- a/src/ssd/ssd-border.c
+++ b/src/ssd/ssd-border.c
@@ -22,6 +22,7 @@ ssd_border_create(struct ssd *ssd)
 	int width = view->current.width;
 	int height = view_effective_height(view, /* use_pending */ false);
 	int full_width = width + 2 * theme->border_width;
+	int corner_width = ssd_get_corner_width();
 
 	float *color;
 	struct wlr_scene_tree *parent;
@@ -48,14 +49,22 @@ ssd_border_create(struct ssd *ssd)
 		add_scene_rect(&subtree->parts, LAB_SSD_PART_BOTTOM, parent,
 			full_width, theme->border_width, 0, height, color);
 		add_scene_rect(&subtree->parts, LAB_SSD_PART_TOP, parent,
-			width - 2 * SSD_BUTTON_WIDTH, theme->border_width,
-			theme->border_width + SSD_BUTTON_WIDTH,
+			width - 2 * corner_width, theme->border_width,
+			theme->border_width + corner_width,
 			-(ssd->titlebar.height + theme->border_width), color);
 	} FOR_EACH_END
 
 	if (view->maximized == VIEW_AXIS_BOTH) {
 		wlr_scene_node_set_enabled(&ssd->border.tree->node, false);
 	}
+
+	if (view->current.width > 0 && view->current.height > 0) {
+		/*
+		 * The SSD is recreated by a Reconfigure request
+		 * thus we may need to handle squared corners.
+		 */
+		ssd_border_update(ssd);
+	}
 }
 
 void
@@ -85,6 +94,39 @@ ssd_border_update(struct ssd *ssd)
 	int width = view->current.width;
 	int height = view_effective_height(view, /* use_pending */ false);
 	int full_width = width + 2 * theme->border_width;
+	int corner_width = ssd_get_corner_width();
+
+	/*
+	 * From here on we have to cover the following border scenarios:
+	 * Non-tiled (partial border, rounded corners):
+	 *    _____________
+	 *   o           oox
+	 *  |---------------|
+	 *  |_______________|
+	 *
+	 * Tiled (full border, squared corners):
+	 *   _______________
+	 *  |o           oox|
+	 *  |---------------|
+	 *  |_______________|
+	 *
+	 * Tiled or non-tiled with zero title height (full boarder, no title):
+	 *   _______________
+	 *  |_______________|
+	 */
+
+	int side_height = ssd->state.was_squared
+		? height + ssd->titlebar.height
+		: height;
+	int side_y = ssd->state.was_squared
+		? -ssd->titlebar.height
+		: 0;
+	int top_width = ssd->titlebar.height <= 0 || ssd->state.was_squared
+		? full_width
+		: width - 2 * corner_width;
+	int top_x = ssd->titlebar.height <= 0 || ssd->state.was_squared
+		? 0
+		: theme->border_width + corner_width;
 
 	struct ssd_part *part;
 	struct wlr_scene_rect *rect;
@@ -95,34 +137,35 @@ ssd_border_update(struct ssd *ssd)
 			switch (part->type) {
 			case LAB_SSD_PART_LEFT:
 				wlr_scene_rect_set_size(rect,
-					theme->border_width, height);
+					theme->border_width,
+					side_height);
+				wlr_scene_node_set_position(part->node,
+					0,
+					side_y);
 				continue;
 			case LAB_SSD_PART_RIGHT:
 				wlr_scene_rect_set_size(rect,
-					theme->border_width, height);
+					theme->border_width,
+					side_height);
 				wlr_scene_node_set_position(part->node,
-					theme->border_width + width, 0);
+					theme->border_width + width,
+					side_y);
 				continue;
 			case LAB_SSD_PART_BOTTOM:
 				wlr_scene_rect_set_size(rect,
-					full_width, theme->border_width);
+					full_width,
+					theme->border_width);
 				wlr_scene_node_set_position(part->node,
-					0, height);
+					0,
+					height);
 				continue;
 			case LAB_SSD_PART_TOP:
-				if (ssd->titlebar.height > 0) {
-					wlr_scene_rect_set_size(rect,
-						width - 2 * SSD_BUTTON_WIDTH,
-						theme->border_width);
-					wlr_scene_node_set_position(part->node,
-						theme->border_width + SSD_BUTTON_WIDTH,
-						-(ssd->titlebar.height + theme->border_width));
-				} else {
-					wlr_scene_rect_set_size(rect,
-						full_width, theme->border_width);
-					wlr_scene_node_set_position(part->node,
-						0, -theme->border_width);
-				}
+				wlr_scene_rect_set_size(rect,
+					top_width,
+					theme->border_width);
+				wlr_scene_node_set_position(part->node,
+					top_x,
+					-(ssd->titlebar.height + theme->border_width));
 				continue;
 			default:
 				continue;
diff --git a/src/ssd/ssd-extents.c b/src/ssd/ssd-extents.c
index 4bb5b69d..1a0ed351 100644
--- a/src/ssd/ssd-extents.c
+++ b/src/ssd/ssd-extents.c
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 
+#include <assert.h>
 #include <pixman.h>
 #include "common/mem.h"
 #include "common/scene-helpers.h"
@@ -14,14 +15,7 @@ add_extent(struct wl_list *part_list, enum ssd_part_type type,
 {
 	float invisible[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
 	struct ssd_part *part = add_scene_part(part_list, type);
-	/*
-	 * Extents need additional geometry to enable dynamic
-	 * resize based on position and output->usable_area.
-	 *
-	 * part->geometry will get free'd automatically in ssd_destroy_parts().
-	 */
 	part->node = &wlr_scene_rect_create(parent, 0, 0, invisible)->node;
-	part->geometry = znew(struct wlr_box);
 	return part;
 }
 
@@ -32,7 +26,6 @@ ssd_extents_create(struct ssd *ssd)
 	struct theme *theme = view->server->theme;
 	struct wl_list *part_list = &ssd->extents.parts;
 	int extended_area = SSD_EXTENDED_AREA;
-	int corner_size = extended_area + theme->border_width + SSD_BUTTON_WIDTH / 2;
 
 	ssd->extents.tree = wlr_scene_tree_create(ssd->tree);
 	struct wlr_scene_tree *parent = ssd->extents.tree;
@@ -44,43 +37,17 @@ ssd_extents_create(struct ssd *ssd)
 		-(theme->border_width + extended_area),
 		-(ssd->titlebar.height + theme->border_width + extended_area));
 
-	/* Initialize parts and set constant values for targeted geometry */
-	struct ssd_part *p;
-
 	/* Top */
-	p = add_extent(part_list, LAB_SSD_PART_CORNER_TOP_LEFT, parent);
-	p->geometry->width = corner_size;
-	p->geometry->height = corner_size;
-
-	p = add_extent(part_list, LAB_SSD_PART_TOP, parent);
-	p->geometry->x = corner_size;
-	p->geometry->height = extended_area;
-
-	p = add_extent(part_list, LAB_SSD_PART_CORNER_TOP_RIGHT, parent);
-	p->geometry->width = corner_size;
-	p->geometry->height = corner_size;
-
+	add_extent(part_list, LAB_SSD_PART_CORNER_TOP_LEFT, parent);
+	add_extent(part_list, LAB_SSD_PART_TOP, parent);
+	add_extent(part_list, LAB_SSD_PART_CORNER_TOP_RIGHT, parent);
 	/* Sides */
-	p = add_extent(part_list, LAB_SSD_PART_LEFT, parent);
-	p->geometry->y = corner_size;
-	p->geometry->width = extended_area;
-
-	p = add_extent(part_list, LAB_SSD_PART_RIGHT, parent);
-	p->geometry->y = corner_size;
-	p->geometry->width = extended_area;
-
+	add_extent(part_list, LAB_SSD_PART_LEFT, parent);
+	add_extent(part_list, LAB_SSD_PART_RIGHT, parent);
 	/* Bottom */
-	p = add_extent(part_list, LAB_SSD_PART_CORNER_BOTTOM_LEFT, parent);
-	p->geometry->width = corner_size;
-	p->geometry->height = corner_size;
-
-	p = add_extent(part_list, LAB_SSD_PART_BOTTOM, parent);
-	p->geometry->x = corner_size;
-	p->geometry->height = extended_area;
-
-	p = add_extent(part_list, LAB_SSD_PART_CORNER_BOTTOM_RIGHT, parent);
-	p->geometry->width = corner_size;
-	p->geometry->height = corner_size;
+	add_extent(part_list, LAB_SSD_PART_CORNER_BOTTOM_LEFT, parent);
+	add_extent(part_list, LAB_SSD_PART_BOTTOM, parent);
+	add_extent(part_list, LAB_SSD_PART_CORNER_BOTTOM_RIGHT, parent);
 
 	/* Initial manual update to keep X11 applications happy */
 	ssd_extents_update(ssd);
@@ -109,7 +76,9 @@ ssd_extents_update(struct ssd *ssd)
 	int full_height = height + theme->border_width * 2 + ssd->titlebar.height;
 	int full_width = width + 2 * theme->border_width;
 	int extended_area = SSD_EXTENDED_AREA;
-	int corner_size = extended_area + theme->border_width + SSD_BUTTON_WIDTH / 2;
+	int corner_width = ssd_get_corner_width();
+	int corner_size = extended_area + theme->border_width +
+		MIN(corner_width, width) / 2;
 	int side_width = full_width + extended_area * 2 - corner_size * 2;
 	int side_height = full_height + extended_area * 2 - corner_size * 2;
 
@@ -117,6 +86,7 @@ ssd_extents_update(struct ssd *ssd)
 	struct wlr_box result_box;
 	struct ssd_part *part;
 	struct wlr_scene_rect *rect;
+	struct wlr_box target;
 
 	/* Make sure we update the y offset based on titlebar shown / hidden */
 	wlr_scene_node_set_position(&ssd->extents.tree->node,
@@ -147,44 +117,69 @@ ssd_extents_update(struct ssd *ssd)
 	int base_x, base_y;
 	wlr_scene_node_coords(&ssd->extents.tree->node, &base_x, &base_y);
 
-	struct wlr_box *target;
 	wl_list_for_each(part, &ssd->extents.parts, link) {
 		rect = wlr_scene_rect_from_node(part->node);
-		target = part->geometry;
 		switch (part->type) {
+		case LAB_SSD_PART_CORNER_TOP_LEFT:
+			target.x = 0;
+			target.y = 0;
+			target.width = corner_size;
+			target.height = corner_size;
+			break;
 		case LAB_SSD_PART_TOP:
-			target->width = side_width;
+			target.x = corner_size;
+			target.y = 0;
+			target.width = side_width;
+			target.height = extended_area;
 			break;
 		case LAB_SSD_PART_CORNER_TOP_RIGHT:
-			target->x = corner_size + side_width;
+			target.x = corner_size + side_width;
+			target.y = 0;
+			target.width = corner_size;
+			target.height = corner_size;
 			break;
 		case LAB_SSD_PART_LEFT:
-			target->height = side_height;
+			target.x = 0;
+			target.y = corner_size;
+			target.width = extended_area;
+			target.height = side_height;
 			break;
 		case LAB_SSD_PART_RIGHT:
-			target->x = extended_area + full_width;
-			target->height = side_height;
+			target.x = extended_area + full_width;
+			target.y = corner_size;
+			target.width = extended_area;
+			target.height = side_height;
 			break;
 		case LAB_SSD_PART_CORNER_BOTTOM_LEFT:
-			target->y = corner_size + side_height;
+			target.x = 0;
+			target.y = corner_size + side_height;
+			target.width = corner_size;
+			target.height = corner_size;
 			break;
 		case LAB_SSD_PART_BOTTOM:
-			target->width = side_width;
-			target->y = extended_area + full_height;
+			target.x = corner_size;
+			target.y = extended_area + full_height;
+			target.width = side_width;
+			target.height = extended_area;
 			break;
 		case LAB_SSD_PART_CORNER_BOTTOM_RIGHT:
-			target->x = corner_size + side_width;
-			target->y = corner_size + side_height;
+			target.x = corner_size + side_width;
+			target.y = corner_size + side_height;
+			target.width = corner_size;
+			target.height = corner_size;
 			break;
 		default:
-			break;
+			/* not reached */
+			assert(false);
+			/* suppress warnings with NDEBUG */
+			target = (struct wlr_box){0};
 		}
 
 		/* Get layout geometry of what the part *should* be */
-		part_box.x = base_x + target->x;
-		part_box.y = base_y + target->y;
-		part_box.width = target->width;
-		part_box.height = target->height;
+		part_box.x = base_x + target.x;
+		part_box.y = base_y + target.y;
+		part_box.width = target.width;
+		part_box.height = target.height;
 
 		/* Constrain part to output->usable_area */
 		pixman_region32_clear(&intersection);
@@ -230,18 +225,12 @@ ssd_extents_update(struct ssd *ssd)
 			wlr_scene_rect_set_size(rect, result_box.width,
 				result_box.height);
 			wlr_scene_node_set_position(part->node,
-				target->x + (result_box.x - part_box.x),
-				target->y + (result_box.y - part_box.y));
-			continue;
-		}
-
-		/* Fully visible */
-		if (target->x != part->node->x
-				|| target->y != part->node->y) {
-			wlr_scene_node_set_position(part->node, target->x, target->y);
-		}
-		if (target->width != rect->width || target->height != rect->height) {
-			wlr_scene_rect_set_size(rect, target->width, target->height);
+				target.x + (result_box.x - part_box.x),
+				target.y + (result_box.y - part_box.y));
+		} else {
+			/* Fully visible */
+			wlr_scene_node_set_position(part->node, target.x, target.y);
+			wlr_scene_rect_set_size(rect, target.width, target.height);
 		}
 	}
 	pixman_region32_fini(&intersection);
diff --git a/src/ssd/ssd-part.c b/src/ssd/ssd-part.c
index 3933cd17..af09df24 100644
--- a/src/ssd/ssd-part.c
+++ b/src/ssd/ssd-part.c
@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-only
 
 #include <assert.h>
+#include "buffer.h"
+#include "common/box.h"
 #include "common/list.h"
 #include "common/mem.h"
 #include "labwc.h"
@@ -78,154 +80,77 @@ add_scene_buffer(struct wl_list *list, enum ssd_part_type type,
 	return part;
 }
 
-struct ssd_part *
-add_scene_button_corner(struct wl_list *part_list, enum ssd_part_type type,
-		enum ssd_part_type corner_type, struct wlr_scene_tree *parent,
-		struct wlr_buffer *corner_buffer, struct wlr_buffer *icon_buffer,
-		struct wlr_buffer *hover_buffer, int x, struct view *view)
+static struct wlr_box
+get_scale_box(struct lab_data_buffer *buffer, int container_width,
+		int container_height)
 {
-	int offset_x;
-	float invisible[4] = { 0, 0, 0, 0 };
-
-	if (corner_type == LAB_SSD_PART_CORNER_TOP_LEFT) {
-		offset_x = rc.theme->border_width;
-	} else if (corner_type == LAB_SSD_PART_CORNER_TOP_RIGHT) {
-		offset_x = 0;
-	} else {
-		assert(false && "invalid corner button type");
-		wlr_log(WLR_ERROR, "invalid corner button type");
-		abort();
-	}
-
-	struct ssd_part *button_root = add_scene_part(part_list, corner_type);
-	parent = wlr_scene_tree_create(parent);
-	button_root->node = &parent->node;
-	wlr_scene_node_set_position(button_root->node, x, 0);
-
-	/*
-	 * Background, x and y adjusted for border_width which is
-	 * already included in rendered theme.c / corner_buffer
-	 */
-	add_scene_buffer(part_list, corner_type, parent, corner_buffer,
-		-offset_x, -rc.theme->border_width);
-
-	/* Finally just put a usual theme button on top, using an invisible hitbox */
-	add_scene_button(part_list, type, parent, invisible, icon_buffer, hover_buffer, 0, view);
-	return button_root;
+	return box_fit_within(buffer->logical_width, buffer->logical_height,
+		container_width, container_height);
 }
 
-static struct wlr_box
-get_scale_box(struct wlr_buffer *buffer, double container_width,
-		double container_height)
+void
+update_window_icon_buffer(struct wlr_scene_node *button_node,
+		struct lab_data_buffer *buffer)
 {
-	struct wlr_box icon_geo = {
-		.width = buffer->width,
-		.height = buffer->height
-	};
+	struct wlr_scene_buffer *scene_buffer =
+		wlr_scene_buffer_from_node(button_node);
 
-	/* Scale down buffer if required */
-	if (icon_geo.width && icon_geo.height) {
-		double scale = MIN(container_width / icon_geo.width,
-			container_height / icon_geo.height);
-		if (scale < 1.0f) {
-			icon_geo.width = (double)icon_geo.width * scale;
-			icon_geo.height = (double)icon_geo.height * scale;
-		}
-	}
+	struct wlr_box icon_geo = get_scale_box(buffer,
+		rc.theme->window_button_width,
+		rc.theme->window_button_height);
 
-	/* Center buffer on both axis */
-	icon_geo.x = (container_width - icon_geo.width) / 2;
-	icon_geo.y = (container_height - icon_geo.height) / 2;
-
-	return icon_geo;
+	wlr_scene_buffer_set_buffer(scene_buffer, &buffer->base);
+	wlr_scene_buffer_set_dest_size(scene_buffer,
+		icon_geo.width, icon_geo.height);
+	wlr_scene_node_set_position(button_node, icon_geo.x, icon_geo.y);
 }
 
 struct ssd_part *
 add_scene_button(struct wl_list *part_list, enum ssd_part_type type,
-		struct wlr_scene_tree *parent, float *bg_color,
-		struct wlr_buffer *icon_buffer, struct wlr_buffer *hover_buffer,
-		int x, struct view *view)
+		struct wlr_scene_tree *parent,
+		struct lab_data_buffer *buffers[LAB_BS_ALL + 1],
+		int x, int y, struct view *view)
 {
 	struct ssd_part *button_root = add_scene_part(part_list, type);
 	parent = wlr_scene_tree_create(parent);
 	button_root->node = &parent->node;
-	wlr_scene_node_set_position(button_root->node, x, 0);
+	wlr_scene_node_set_position(button_root->node, x, y);
 
-	/* Background */
-	struct ssd_part *bg_rect = add_scene_rect(part_list, type, parent,
-		SSD_BUTTON_WIDTH, rc.theme->title_height, 0, 0, bg_color);
+	/* Hitbox */
+	float invisible[4] = { 0, 0, 0, 0 };
+	add_scene_rect(part_list, type, parent,
+		rc.theme->window_button_width, rc.theme->window_button_height, 0, 0,
+		invisible);
 
-	/* Icon */
-	struct wlr_scene_tree *icon_tree = wlr_scene_tree_create(parent);
-	struct wlr_box icon_geo = get_scale_box(icon_buffer,
-		SSD_BUTTON_WIDTH, rc.theme->title_height);
-	struct ssd_part *icon_part = add_scene_buffer(part_list, type,
-		icon_tree, icon_buffer, icon_geo.x, icon_geo.y);
-
-	/* Make sure big icons are scaled down if necessary */
-	wlr_scene_buffer_set_dest_size(
-		wlr_scene_buffer_from_node(icon_part->node),
-		icon_geo.width, icon_geo.height);
-
-	/* Hover icon */
-	struct wlr_scene_tree *hover_tree = wlr_scene_tree_create(parent);
-	wlr_scene_node_set_enabled(&hover_tree->node, false);
-	struct wlr_box hover_geo = get_scale_box(hover_buffer,
-		SSD_BUTTON_WIDTH, rc.theme->title_height);
-	struct ssd_part *hover_part = add_scene_buffer(part_list, type,
-		hover_tree, hover_buffer, hover_geo.x, hover_geo.y);
-
-	/* Make sure big icons are scaled down if necessary */
-	wlr_scene_buffer_set_dest_size(
-		wlr_scene_buffer_from_node(hover_part->node),
-		hover_geo.width, hover_geo.height);
+	/* Icons */
+	struct wlr_scene_node *nodes[LAB_BS_ALL + 1] = {0};
+	for (uint8_t state_set = 0; state_set <= LAB_BS_ALL; state_set++) {
+		if (!buffers[state_set]) {
+			continue;
+		}
+		struct lab_data_buffer *icon_buffer = buffers[state_set];
+		struct wlr_box icon_geo = get_scale_box(icon_buffer,
+			rc.theme->window_button_width, rc.theme->window_button_height);
+		struct ssd_part *icon_part = add_scene_buffer(part_list, type,
+			parent, &icon_buffer->base, icon_geo.x, icon_geo.y);
+		/* Make sure big icons are scaled down if necessary */
+		wlr_scene_buffer_set_dest_size(
+			wlr_scene_buffer_from_node(icon_part->node),
+			icon_geo.width, icon_geo.height);
+		wlr_scene_node_set_enabled(icon_part->node, false);
+		nodes[state_set] = icon_part->node;
+	}
+	/* Initially show non-hover, non-toggled, unrounded variant */
+	wlr_scene_node_set_enabled(nodes[0], true);
 
 	struct ssd_button *button = ssd_button_descriptor_create(button_root->node);
 	button->type = type;
 	button->view = view;
-	button->normal = icon_part->node;
-	button->hover = hover_part->node;
-	button->background = bg_rect->node;
-	button->toggled = NULL;
-	button->toggled_hover = NULL;
-	button->icon_tree = icon_tree;
-	button->hover_tree = hover_tree;
+	button->state_set = 0;
+	memcpy(button->nodes, nodes, sizeof(nodes));
 	return button_root;
 }
 
-void
-add_toggled_icon(struct ssd_button *button, struct wl_list *part_list,
-		enum ssd_part_type type, struct wlr_buffer *icon_buffer,
-		struct wlr_buffer *hover_buffer)
-{
-	/* Alternate icon */
-	struct wlr_box icon_geo = get_scale_box(icon_buffer,
-		SSD_BUTTON_WIDTH, rc.theme->title_height);
-
-	struct ssd_part *alticon_part = add_scene_buffer(part_list, type,
-		button->icon_tree, icon_buffer, icon_geo.x, icon_geo.y);
-
-	wlr_scene_buffer_set_dest_size(
-		wlr_scene_buffer_from_node(alticon_part->node),
-		icon_geo.width, icon_geo.height);
-
-	wlr_scene_node_set_enabled(alticon_part->node, false);
-
-	struct wlr_box hover_geo = get_scale_box(hover_buffer,
-		SSD_BUTTON_WIDTH, rc.theme->title_height);
-	struct ssd_part *althover_part = add_scene_buffer(part_list, type,
-		button->hover_tree, hover_buffer, hover_geo.x, hover_geo.y);
-
-	wlr_scene_buffer_set_dest_size(
-		wlr_scene_buffer_from_node(althover_part->node),
-		hover_geo.width, hover_geo.height);
-
-	wlr_scene_node_set_enabled(althover_part->node, false);
-
-	button->toggled = alticon_part->node;
-	button->toggled_hover = althover_part->node;
-}
-
 struct ssd_part *
 ssd_get_part(struct wl_list *part_list, enum ssd_part_type type)
 {
@@ -249,10 +174,6 @@ ssd_destroy_parts(struct wl_list *list)
 		}
 		/* part->buffer will free itself along the scene_buffer node */
 		part->buffer = NULL;
-		if (part->geometry) {
-			free(part->geometry);
-			part->geometry = NULL;
-		}
 		wl_list_remove(&part->link);
 		free(part);
 	}
diff --git a/src/ssd/ssd-shadow.c b/src/ssd/ssd-shadow.c
index cf54f6fa..dfd18bd2 100644
--- a/src/ssd/ssd-shadow.c
+++ b/src/ssd/ssd-shadow.c
@@ -196,8 +196,8 @@ set_shadow_geometry(struct ssd *ssd)
 		 * is different).  The buffers are square so width == height.
 		 */
 		int corner_size = active
-			? theme->shadow_corner_top_active->unscaled_height
-			: theme->shadow_corner_top_inactive->unscaled_height;
+			? theme->shadow_corner_top_active->logical_height
+			: theme->shadow_corner_top_inactive->logical_height;
 
 		wl_list_for_each(part, &subtree->parts, link) {
 			set_shadow_part_geometry(part, width, height,
@@ -241,7 +241,12 @@ ssd_shadow_create(struct ssd *ssd)
 	struct wlr_scene_tree *parent;
 
 	FOR_EACH_STATE(ssd, subtree) {
-		if (subtree == &ssd->shadow.active) {
+		wl_list_init(&subtree->parts);
+
+		if (!rc.shadows_enabled) {
+			/* Shadows are globally disabled */
+			continue;
+		} else if (subtree == &ssd->shadow.active) {
 			if (theme->window_active_shadow_size == 0) {
 				/* Active window shadows are disabled */
 				continue;
@@ -264,7 +269,6 @@ ssd_shadow_create(struct ssd *ssd)
 			corner_bottom_buffer = &theme->shadow_corner_bottom_inactive->base;
 			edge_buffer = &theme->shadow_edge_inactive->base;
 		}
-		wl_list_init(&subtree->parts);
 
 		make_shadow(&subtree->parts,
 			LAB_SSD_PART_CORNER_BOTTOM_RIGHT, parent,
@@ -311,6 +315,16 @@ ssd_shadow_destroy(struct ssd *ssd)
 	assert(ssd);
 	assert(ssd->shadow.tree);
 
+	struct ssd_sub_tree *subtree;
+	FOR_EACH_STATE(ssd, subtree) {
+		ssd_destroy_parts(&subtree->parts);
+		/*
+		 * subtree->tree will be destroyed when its
+		 * parent (ssd->shadow.tree) is destroyed.
+		 */
+		subtree->tree = NULL;
+	} FOR_EACH_END
+
 	wlr_scene_node_destroy(&ssd->shadow.tree->node);
 	ssd->shadow.tree = NULL;
 }
diff --git a/src/ssd/ssd-titlebar.c b/src/ssd/ssd-titlebar.c
index cdbe4d36..8591759a 100644
--- a/src/ssd/ssd-titlebar.c
+++ b/src/ssd/ssd-titlebar.c
@@ -4,10 +4,14 @@
 #include <assert.h>
 #include <string.h>
 #include "buffer.h"
+#include "config.h"
 #include "common/mem.h"
 #include "common/scaled-font-buffer.h"
 #include "common/scene-helpers.h"
 #include "common/string-helpers.h"
+#if HAVE_LIBSFDO
+#include "icon-loader.h"
+#endif
 #include "labwc.h"
 #include "node.h"
 #include "ssd-internal.h"
@@ -19,7 +23,8 @@
 	&(ssd)->titlebar.inactive)
 
 static void set_squared_corners(struct ssd *ssd, bool enable);
-static void set_maximize_alt_icon(struct ssd *ssd, bool enable);
+static void set_alt_button_icon(struct ssd *ssd, enum ssd_part_type type, bool enable);
+static void update_visible_buttons(struct ssd *ssd);
 
 void
 ssd_titlebar_create(struct ssd *ssd)
@@ -27,24 +32,13 @@ ssd_titlebar_create(struct ssd *ssd)
 	struct view *view = ssd->view;
 	struct theme *theme = view->server->theme;
 	int width = view->current.width;
+	int corner_width = ssd_get_corner_width();
 
 	float *color;
 	struct wlr_scene_tree *parent;
 	struct wlr_buffer *corner_top_left;
 	struct wlr_buffer *corner_top_right;
 
-	struct wlr_buffer *menu_button_unpressed;
-	struct wlr_buffer *iconify_button_unpressed;
-	struct wlr_buffer *maximize_button_unpressed;
-	struct wlr_buffer *restore_button_unpressed;
-	struct wlr_buffer *close_button_unpressed;
-
-	struct wlr_buffer *menu_button_hover;
-	struct wlr_buffer *iconify_button_hover;
-	struct wlr_buffer *maximize_button_hover;
-	struct wlr_buffer *restore_button_hover;
-	struct wlr_buffer *close_button_hover;
-
 	ssd->titlebar.tree = wlr_scene_tree_create(ssd->tree);
 
 	struct ssd_sub_tree *subtree;
@@ -56,126 +50,211 @@ ssd_titlebar_create(struct ssd *ssd)
 			color = theme->window_active_title_bg_color;
 			corner_top_left = &theme->corner_top_left_active_normal->base;
 			corner_top_right = &theme->corner_top_right_active_normal->base;
-			menu_button_unpressed = &theme->button_menu_active_unpressed->base;
-			iconify_button_unpressed = &theme->button_iconify_active_unpressed->base;
-			close_button_unpressed = &theme->button_close_active_unpressed->base;
-			maximize_button_unpressed = &theme->button_maximize_active_unpressed->base;
-			restore_button_unpressed = &theme->button_restore_active_unpressed->base;
-
-			menu_button_hover = &theme->button_menu_active_hover->base;
-			iconify_button_hover = &theme->button_iconify_active_hover->base;
-			close_button_hover = &theme->button_close_active_hover->base;
-			maximize_button_hover = &theme->button_maximize_active_hover->base;
-			restore_button_hover = &theme->button_restore_active_hover->base;
 		} else {
 			color = theme->window_inactive_title_bg_color;
 			corner_top_left = &theme->corner_top_left_inactive_normal->base;
 			corner_top_right = &theme->corner_top_right_inactive_normal->base;
-			menu_button_unpressed = &theme->button_menu_inactive_unpressed->base;
-			iconify_button_unpressed = &theme->button_iconify_inactive_unpressed->base;
-			maximize_button_unpressed =
-				&theme->button_maximize_inactive_unpressed->base;
-			restore_button_unpressed = &theme->button_restore_inactive_unpressed->base;
-			close_button_unpressed = &theme->button_close_inactive_unpressed->base;
-
-			menu_button_hover = &theme->button_menu_inactive_hover->base;
-			iconify_button_hover = &theme->button_iconify_inactive_hover->base;
-			close_button_hover = &theme->button_close_inactive_hover->base;
-			maximize_button_hover = &theme->button_maximize_inactive_hover->base;
-			restore_button_hover = &theme->button_restore_inactive_hover->base;
 
 			wlr_scene_node_set_enabled(&parent->node, false);
 		}
 		wl_list_init(&subtree->parts);
 
-		/* Title */
+		/* Background */
 		add_scene_rect(&subtree->parts, LAB_SSD_PART_TITLEBAR, parent,
-			width - SSD_BUTTON_WIDTH * SSD_BUTTON_COUNT, theme->title_height,
-			SSD_BUTTON_WIDTH, 0, color);
+			width - corner_width * 2, theme->title_height,
+			corner_width, 0, color);
+		add_scene_buffer(&subtree->parts, LAB_SSD_PART_TITLEBAR_CORNER_LEFT, parent,
+			corner_top_left, -rc.theme->border_width, -rc.theme->border_width);
+		add_scene_buffer(&subtree->parts, LAB_SSD_PART_TITLEBAR_CORNER_RIGHT, parent,
+			corner_top_right, width - corner_width,
+			-rc.theme->border_width);
+
+		int active = (subtree == &ssd->titlebar.active) ?
+				THEME_ACTIVE : THEME_INACTIVE;
+
 		/* Buttons */
-		add_scene_button_corner(&subtree->parts,
-			LAB_SSD_BUTTON_WINDOW_MENU, LAB_SSD_PART_CORNER_TOP_LEFT, parent,
-			corner_top_left, menu_button_unpressed, menu_button_hover, 0, view);
-		add_scene_button(&subtree->parts, LAB_SSD_BUTTON_ICONIFY, parent,
-			color, iconify_button_unpressed, iconify_button_hover,
-			width - SSD_BUTTON_WIDTH * 3, view);
+		struct title_button *b;
+		int x = theme->window_titlebar_padding_width;
 
-		/* Maximize button has an alternate state when maximized */
-		struct ssd_part *btn_max_root = add_scene_button(
-			&subtree->parts, LAB_SSD_BUTTON_MAXIMIZE, parent,
-			color, maximize_button_unpressed, maximize_button_hover,
-			width - SSD_BUTTON_WIDTH * 2, view);
-		struct ssd_button *btn_max = node_ssd_button_from_node(btn_max_root->node);
-		add_toggled_icon(btn_max, &subtree->parts, LAB_SSD_BUTTON_MAXIMIZE,
-			restore_button_unpressed, restore_button_hover);
+		/* Center vertically within titlebar */
+		int y = (theme->title_height - theme->window_button_height) / 2;
 
-		add_scene_button_corner(&subtree->parts,
-			LAB_SSD_BUTTON_CLOSE, LAB_SSD_PART_CORNER_TOP_RIGHT, parent,
-			corner_top_right, close_button_unpressed, close_button_hover,
-			width - SSD_BUTTON_WIDTH * 1, view);
+		wl_list_for_each(b, &rc.title_buttons_left, link) {
+			struct lab_data_buffer **buffers =
+				theme->window[active].buttons[b->type];
+			add_scene_button(&subtree->parts, b->type, parent,
+				buffers, x, y, view);
+			x += theme->window_button_width + theme->window_button_spacing;
+		}
+
+		x = width - theme->window_titlebar_padding_width + theme->window_button_spacing;
+		wl_list_for_each_reverse(b, &rc.title_buttons_right, link) {
+			x -= theme->window_button_width + theme->window_button_spacing;
+			struct lab_data_buffer **buffers =
+				theme->window[active].buttons[b->type];
+			add_scene_button(&subtree->parts, b->type, parent,
+				buffers, x, y, view);
+		}
 	} FOR_EACH_END
 
-	ssd_update_title(ssd);
+	update_visible_buttons(ssd);
 
-	if (view->maximized == VIEW_AXIS_BOTH) {
+	ssd_update_title(ssd);
+	ssd_update_window_icon(ssd);
+
+	set_squared_corners(ssd, false);
+
+	bool maximized = view->maximized == VIEW_AXIS_BOTH;
+	if (maximized) {
 		set_squared_corners(ssd, true);
-		set_maximize_alt_icon(ssd, true);
+		set_alt_button_icon(ssd, LAB_SSD_BUTTON_MAXIMIZE, true);
 		ssd->state.was_maximized = true;
 	}
+
+	if (view->shaded) {
+		set_alt_button_icon(ssd, LAB_SSD_BUTTON_SHADE, true);
+	}
+
+	if (view->visible_on_all_workspaces) {
+		set_alt_button_icon(ssd, LAB_SSD_BUTTON_OMNIPRESENT, true);
+	}
+
+	if (ssd_should_be_squared(ssd)) {
+		set_squared_corners(ssd, true);
+		ssd->state.was_squared = true;
+	}
 }
 
-static bool
-is_direct_child(struct wlr_scene_node *node, struct ssd_sub_tree *subtree)
+static void
+update_button_state(struct ssd_button *button, enum lab_button_state state,
+		bool enable)
 {
-	return node->parent == subtree->tree;
+	if (enable) {
+		button->state_set |= state;
+	} else {
+		button->state_set &= ~state;
+	}
+	/* Switch the displayed icon buffer to the new one */
+	for (uint8_t state_set = 0; state_set <= LAB_BS_ALL; state_set++) {
+		if (!button->nodes[state_set]) {
+			continue;
+		}
+		wlr_scene_node_set_enabled(
+			button->nodes[state_set], button->state_set == state_set);
+	}
 }
 
 static void
 set_squared_corners(struct ssd *ssd, bool enable)
 {
+	struct view *view = ssd->view;
+	int width = view->current.width;
+	int corner_width = ssd_get_corner_width();
+	struct theme *theme = view->server->theme;
+
 	struct ssd_part *part;
 	struct ssd_sub_tree *subtree;
-	enum ssd_part_type ssd_type[2] = { LAB_SSD_BUTTON_WINDOW_MENU, LAB_SSD_BUTTON_CLOSE };
+	int x = enable ? 0 : corner_width;
 
 	FOR_EACH_STATE(ssd, subtree) {
-		for (size_t i = 0; i < ARRAY_SIZE(ssd_type); i++) {
-			part = ssd_get_part(&subtree->parts, ssd_type[i]);
+		part = ssd_get_part(&subtree->parts, LAB_SSD_PART_TITLEBAR);
+		wlr_scene_node_set_position(part->node, x, 0);
+		wlr_scene_rect_set_size(
+			wlr_scene_rect_from_node(part->node), width - 2 * x, theme->title_height);
+
+		part = ssd_get_part(&subtree->parts, LAB_SSD_PART_TITLEBAR_CORNER_LEFT);
+		wlr_scene_node_set_enabled(part->node, !enable);
+
+		part = ssd_get_part(&subtree->parts, LAB_SSD_PART_TITLEBAR_CORNER_RIGHT);
+		wlr_scene_node_set_enabled(part->node, !enable);
+
+		/* (Un)round the corner buttons */
+		struct title_button *title_button;
+		wl_list_for_each(title_button, &rc.title_buttons_left, link) {
+			part = ssd_get_part(&subtree->parts, title_button->type);
 			struct ssd_button *button = node_ssd_button_from_node(part->node);
-
-			/* Toggle background between invisible and titlebar background color */
-			struct wlr_scene_rect *rect = wlr_scene_rect_from_node(button->background);
-			wlr_scene_rect_set_color(rect, !enable ? (float[4]) {0, 0, 0, 0} : (
-				subtree == &ssd->titlebar.active
-					? rc.theme->window_active_title_bg_color
-					: rc.theme->window_inactive_title_bg_color));
-
-			/* Toggle rounded corner image itself */
-			struct wlr_scene_node *rounded_corner =
-				wl_container_of(part->node->link.prev, rounded_corner, link);
-			wlr_scene_node_set_enabled(rounded_corner, !enable);
+			update_button_state(button, LAB_BS_ROUNDED, !enable);
+			break;
+		}
+		wl_list_for_each_reverse(title_button, &rc.title_buttons_right, link) {
+			part = ssd_get_part(&subtree->parts, title_button->type);
+			struct ssd_button *button = node_ssd_button_from_node(part->node);
+			update_button_state(button, LAB_BS_ROUNDED, !enable);
+			break;
 		}
 	} FOR_EACH_END
 }
 
 static void
-set_maximize_alt_icon(struct ssd *ssd, bool enable)
+set_alt_button_icon(struct ssd *ssd, enum ssd_part_type type, bool enable)
 {
 	struct ssd_part *part;
 	struct ssd_button *button;
 	struct ssd_sub_tree *subtree;
 
 	FOR_EACH_STATE(ssd, subtree) {
-		part = ssd_get_part(&subtree->parts, LAB_SSD_BUTTON_MAXIMIZE);
-		button = node_ssd_button_from_node(part->node);
-
-		if (button->toggled) {
-			wlr_scene_node_set_enabled(button->toggled, enable);
-			wlr_scene_node_set_enabled(button->normal, !enable);
+		part = ssd_get_part(&subtree->parts, type);
+		if (!part) {
+			return;
 		}
 
-		if (button->toggled_hover) {
-			wlr_scene_node_set_enabled(button->toggled_hover, enable);
-			wlr_scene_node_set_enabled(button->hover, !enable);
+		button = node_ssd_button_from_node(part->node);
+		update_button_state(button, LAB_BS_TOGGLED, enable);
+	} FOR_EACH_END
+}
+
+/*
+ * Usually this function just enables all the nodes for buttons, but some
+ * buttons can be hidden for small windows (e.g. xterm -geometry 1x1).
+ */
+static void
+update_visible_buttons(struct ssd *ssd)
+{
+	struct view *view = ssd->view;
+	int width = view->current.width - (2 * view->server->theme->window_titlebar_padding_width);
+	int button_width = view->server->theme->window_button_width;
+	int button_spacing = view->server->theme->window_button_spacing;
+	int button_count_left = wl_list_length(&rc.title_buttons_left);
+	int button_count_right = wl_list_length(&rc.title_buttons_right);
+
+	/* Make sure infinite loop never occurs */
+	assert(button_width > 0);
+
+	/*
+	 * The corner-left button is lastly removed as it's usually a window
+	 * menu button (or an app icon button in the future).
+	 *
+	 * There is spacing to the inside of each button, including between the
+	 * innermost buttons and the window title. See also get_title_offsets().
+	 */
+	while (width < ((button_width + button_spacing)
+			* (button_count_left + button_count_right))) {
+		if (button_count_left > button_count_right) {
+			button_count_left--;
+		} else {
+			button_count_right--;
+		}
+	}
+
+	int button_count;
+	struct ssd_part *part;
+	struct ssd_sub_tree *subtree;
+	struct title_button *b;
+	FOR_EACH_STATE(ssd, subtree) {
+		button_count = 0;
+		wl_list_for_each(b, &rc.title_buttons_left, link) {
+			part = ssd_get_part(&subtree->parts, b->type);
+			wlr_scene_node_set_enabled(part->node,
+				button_count < button_count_left);
+			button_count++;
+		}
+
+		button_count = 0;
+		wl_list_for_each_reverse(b, &rc.title_buttons_right, link) {
+			part = ssd_get_part(&subtree->parts, b->type);
+			wlr_scene_node_set_enabled(part->node,
+				button_count < button_count_right);
+			button_count++;
 		}
 	} FOR_EACH_END
 }
@@ -185,54 +264,73 @@ ssd_titlebar_update(struct ssd *ssd)
 {
 	struct view *view = ssd->view;
 	int width = view->current.width;
+	int corner_width = ssd_get_corner_width();
 	struct theme *theme = view->server->theme;
 
-	bool maximized = (view->maximized == VIEW_AXIS_BOTH);
-	if (ssd->state.was_maximized != maximized) {
-		set_squared_corners(ssd, maximized);
-		set_maximize_alt_icon(ssd, maximized);
+	bool maximized = view->maximized == VIEW_AXIS_BOTH;
+	bool squared = ssd_should_be_squared(ssd);
+
+	if (ssd->state.was_maximized != maximized
+			|| ssd->state.was_squared != squared) {
+		set_squared_corners(ssd, maximized || squared);
+		if (ssd->state.was_maximized != maximized) {
+			set_alt_button_icon(ssd, LAB_SSD_BUTTON_MAXIMIZE, maximized);
+		}
 		ssd->state.was_maximized = maximized;
+		ssd->state.was_squared = squared;
+	}
+
+	if (ssd->state.was_shaded != view->shaded) {
+		set_alt_button_icon(ssd, LAB_SSD_BUTTON_SHADE, view->shaded);
+		ssd->state.was_shaded = view->shaded;
+	}
+
+	if (ssd->state.was_omnipresent != view->visible_on_all_workspaces) {
+		set_alt_button_icon(ssd, LAB_SSD_BUTTON_OMNIPRESENT,
+			view->visible_on_all_workspaces);
+		ssd->state.was_omnipresent = view->visible_on_all_workspaces;
 	}
 
 	if (width == ssd->state.geometry.width) {
 		return;
 	}
 
+	update_visible_buttons(ssd);
+
+	/* Center buttons vertically within titlebar */
+	int y = (theme->title_height - theme->window_button_height) / 2;
+	int x;
 	struct ssd_part *part;
 	struct ssd_sub_tree *subtree;
+	struct title_button *b;
+	int bg_offset = maximized || squared ? 0 : corner_width;
 	FOR_EACH_STATE(ssd, subtree) {
-		wl_list_for_each(part, &subtree->parts, link) {
-			switch (part->type) {
-			case LAB_SSD_PART_TITLEBAR:
-				wlr_scene_rect_set_size(
-					wlr_scene_rect_from_node(part->node),
-					width - SSD_BUTTON_WIDTH * SSD_BUTTON_COUNT,
-					theme->title_height);
-				continue;
-			case LAB_SSD_BUTTON_ICONIFY:
-				if (is_direct_child(part->node, subtree)) {
-					wlr_scene_node_set_position(part->node,
-						width - SSD_BUTTON_WIDTH * 3, 0);
-				}
-				continue;
-			case LAB_SSD_BUTTON_MAXIMIZE:
-				if (is_direct_child(part->node, subtree)) {
-					wlr_scene_node_set_position(part->node,
-						width - SSD_BUTTON_WIDTH * 2, 0);
-				}
-				continue;
-			case LAB_SSD_PART_CORNER_TOP_RIGHT:
-				if (is_direct_child(part->node, subtree)) {
-					wlr_scene_node_set_position(part->node,
-						width - SSD_BUTTON_WIDTH * 1, 0);
-				}
-				continue;
-			default:
-				continue;
-			}
+		part = ssd_get_part(&subtree->parts, LAB_SSD_PART_TITLEBAR);
+		wlr_scene_rect_set_size(
+			wlr_scene_rect_from_node(part->node),
+			width - bg_offset * 2, theme->title_height);
+
+		x = theme->window_titlebar_padding_width;
+		wl_list_for_each(b, &rc.title_buttons_left, link) {
+			part = ssd_get_part(&subtree->parts, b->type);
+			wlr_scene_node_set_position(part->node, x, y);
+			x += theme->window_button_width + theme->window_button_spacing;
+		}
+
+		x = width - corner_width;
+		part = ssd_get_part(&subtree->parts, LAB_SSD_PART_TITLEBAR_CORNER_RIGHT);
+		wlr_scene_node_set_position(part->node, x, -rc.theme->border_width);
+
+		x = width - theme->window_titlebar_padding_width + theme->window_button_spacing;
+		wl_list_for_each_reverse(b, &rc.title_buttons_right, link) {
+			part = ssd_get_part(&subtree->parts, b->type);
+			x -= theme->window_button_width + theme->window_button_spacing;
+			wlr_scene_node_set_position(part->node, x, y);
 		}
 	} FOR_EACH_END
+
 	ssd_update_title(ssd);
+	ssd_update_window_icon(ssd);
 }
 
 void
@@ -250,8 +348,10 @@ ssd_titlebar_destroy(struct ssd *ssd)
 	} FOR_EACH_END
 
 	if (ssd->state.title.text) {
-		free(ssd->state.title.text);
-		ssd->state.title.text = NULL;
+		zfree(ssd->state.title.text);
+	}
+	if (ssd->state.app_id) {
+		zfree(ssd->state.app_id);
 	}
 
 	wlr_scene_node_destroy(&ssd->titlebar.tree->node);
@@ -271,12 +371,12 @@ ssd_titlebar_destroy(struct ssd *ssd)
  */
 
 static void
-ssd_update_title_positions(struct ssd *ssd)
+ssd_update_title_positions(struct ssd *ssd, int offset_left, int offset_right)
 {
 	struct view *view = ssd->view;
 	struct theme *theme = view->server->theme;
 	int width = view->current.width;
-	int title_bg_width = width - SSD_BUTTON_WIDTH * SSD_BUTTON_COUNT;
+	int title_bg_width = width - offset_left - offset_right;
 
 	int x, y;
 	int buffer_height, buffer_width;
@@ -292,7 +392,7 @@ ssd_update_title_positions(struct ssd *ssd)
 
 		buffer_width = part->buffer ? part->buffer->width : 0;
 		buffer_height = part->buffer ? part->buffer->height : 0;
-		x = SSD_BUTTON_WIDTH;
+		x = offset_left;
 		y = (theme->title_height - buffer_height) / 2;
 
 		if (title_bg_width <= 0) {
@@ -302,7 +402,7 @@ ssd_update_title_positions(struct ssd *ssd)
 		wlr_scene_node_set_enabled(part->node, true);
 
 		if (theme->window_label_text_justify == LAB_JUSTIFY_CENTER) {
-			if (buffer_width + SSD_BUTTON_WIDTH * 2 <= title_bg_width) {
+			if (buffer_width + MAX(offset_left, offset_right) * 2 <= width) {
 				/* Center based on the full width */
 				x = (width - buffer_width) / 2;
 			} else {
@@ -322,10 +422,39 @@ ssd_update_title_positions(struct ssd *ssd)
 	} FOR_EACH_END
 }
 
+/*
+ * Get left/right offsets of the title area based on visible/hidden states of
+ * buttons set in update_visible_buttons().
+ */
+static void
+get_title_offsets(struct ssd *ssd, int *offset_left, int *offset_right)
+{
+	struct ssd_sub_tree *subtree = &ssd->titlebar.active;
+	int button_width = ssd->view->server->theme->window_button_width;
+	int button_spacing = ssd->view->server->theme->window_button_spacing;
+	int padding_width = ssd->view->server->theme->window_titlebar_padding_width;
+	*offset_left = padding_width;
+	*offset_right = padding_width;
+
+	struct title_button *b;
+	wl_list_for_each(b, &rc.title_buttons_left, link) {
+		struct ssd_part *part = ssd_get_part(&subtree->parts, b->type);
+		if (part->node->enabled) {
+			*offset_left += button_width + button_spacing;
+		}
+	}
+	wl_list_for_each_reverse(b, &rc.title_buttons_right, link) {
+		struct ssd_part *part = ssd_get_part(&subtree->parts, b->type);
+		if (part->node->enabled) {
+			*offset_right += button_width + button_spacing;
+		}
+	}
+}
+
 void
 ssd_update_title(struct ssd *ssd)
 {
-	if (!ssd) {
+	if (!ssd || !rc.show_title) {
 		return;
 	}
 
@@ -345,8 +474,10 @@ ssd_update_title(struct ssd *ssd)
 	struct ssd_part *part;
 	struct ssd_sub_tree *subtree;
 	struct ssd_state_title_width *dstate;
-	int title_bg_width = view->current.width
-		- SSD_BUTTON_WIDTH * SSD_BUTTON_COUNT;
+
+	int offset_left, offset_right;
+	get_title_offsets(ssd, &offset_left, &offset_right);
+	int title_bg_width = view->current.width - offset_left - offset_right;
 
 	FOR_EACH_STATE(ssd, subtree) {
 		if (subtree == &ssd->titlebar.active) {
@@ -402,15 +533,7 @@ ssd_update_title(struct ssd *ssd)
 		}
 		state->text = xstrdup(title);
 	}
-	ssd_update_title_positions(ssd);
-}
-
-static void
-ssd_button_set_hover(struct ssd_button *button, bool enabled)
-{
-	assert(button);
-	wlr_scene_node_set_enabled(&button->hover_tree->node, enabled);
-	wlr_scene_node_set_enabled(&button->icon_tree->node, !enabled);
+	ssd_update_title_positions(ssd, offset_left, offset_right);
 }
 
 void
@@ -433,15 +556,98 @@ ssd_update_button_hover(struct wlr_scene_node *node,
 
 disable_old_hover:
 	if (hover_state->button) {
-		ssd_button_set_hover(hover_state->button, false);
+		update_button_state(hover_state->button, LAB_BS_HOVERD, false);
 		hover_state->view = NULL;
 		hover_state->button = NULL;
 	}
 	if (button) {
-		ssd_button_set_hover(button, true);
+		update_button_state(button, LAB_BS_HOVERD, true);
 		hover_state->view = button->view;
 		hover_state->button = button;
 	}
 }
 
+bool
+ssd_should_be_squared(struct ssd *ssd)
+{
+	struct view *view = ssd->view;
+	int corner_width = ssd_get_corner_width();
+
+	return (view_is_tiled_and_notify_tiled(view)
+			|| view->current.width < corner_width * 2)
+		&& view->maximized != VIEW_AXIS_BOTH;
+}
+
+void
+ssd_update_window_icon(struct ssd *ssd)
+{
+#if HAVE_LIBSFDO
+	if (!ssd) {
+		return;
+	}
+
+	const char *app_id = view_get_string_prop(ssd->view, "app_id");
+	if (string_null_or_empty(app_id)) {
+		return;
+	}
+	if (ssd->state.app_id && !strcmp(ssd->state.app_id, app_id)) {
+		return;
+	}
+
+	free(ssd->state.app_id);
+	ssd->state.app_id = xstrdup(app_id);
+
+	struct theme *theme = ssd->view->server->theme;
+
+	/*
+	 * Ensure a small amount of horizontal padding within the button
+	 * area (2px on each side with the default 26px button width).
+	 * A new theme setting could be added to configure this. Using
+	 * an existing setting (padding.width or window.button.spacing)
+	 * was considered, but these settings have distinct purposes
+	 * already and are zero by default.
+	 */
+	int hpad = theme->window_button_width / 10;
+	int icon_size = MIN(theme->window_button_width - 2 * hpad,
+		theme->window_button_height);
+
+	/*
+	 * Load/render icons at the max scale of any usable output (at
+	 * this point in time). We don't want to be constantly reloading
+	 * icons as views are moved between outputs.
+	 *
+	 * TODO: currently there's no signal to reload/render icons if
+	 * outputs are reconfigured and the max scale changes.
+	 */
+	float icon_scale = output_max_scale(ssd->view->server);
+
+	struct lab_data_buffer *icon_buffer = icon_loader_lookup(
+		ssd->view->server, app_id, icon_size, icon_scale);
+	if (!icon_buffer) {
+		wlr_log(WLR_DEBUG, "icon could not be loaded for %s", app_id);
+		return;
+	}
+
+	struct ssd_sub_tree *subtree;
+	FOR_EACH_STATE(ssd, subtree) {
+		struct ssd_part *part = ssd_get_part(
+			&subtree->parts, LAB_SSD_BUTTON_WINDOW_ICON);
+		if (!part) {
+			break;
+		}
+
+		/* Replace all the buffers in the button with the window icon */
+		struct ssd_button *button = node_ssd_button_from_node(part->node);
+		for (uint8_t state_set = 0; state_set <= LAB_BS_ALL; state_set++) {
+			if (button->nodes[state_set]) {
+				update_window_icon_buffer(button->nodes[state_set],
+					icon_buffer);
+			}
+		}
+	} FOR_EACH_END
+
+	wlr_buffer_drop(&icon_buffer->base);
+#endif
+}
+
 #undef FOR_EACH_STATE
diff --git a/src/ssd/ssd.c b/src/ssd/ssd.c
index 2d382ca0..c1e4e0e5 100644
--- a/src/ssd/ssd.c
+++ b/src/ssd/ssd.c
@@ -74,15 +74,6 @@ ssd_max_extents(struct view *view)
 	};
 }
 
-bool
-ssd_is_button(enum ssd_part_type type)
-{
-	return type == LAB_SSD_BUTTON_CLOSE
-		|| type == LAB_SSD_BUTTON_MAXIMIZE
-		|| type == LAB_SSD_BUTTON_ICONIFY
-		|| type == LAB_SSD_BUTTON_WINDOW_MENU;
-}
-
 enum ssd_part_type
 ssd_get_part_type(const struct ssd *ssd, struct wlr_scene_node *node)
 {
@@ -188,8 +179,14 @@ ssd_create(struct view *view, bool active)
 	ssd->titlebar.height = view->server->theme->title_height;
 	ssd_shadow_create(ssd);
 	ssd_extents_create(ssd);
-	ssd_border_create(ssd);
+	/*
+	 * We need to create the borders after the titlebar because it sets
+	 * ssd->state.squared which ssd_border_create() reacts to.
+	 * TODO: Set the state here instead so the order does not matter
+	 * anymore.
+	 */
 	ssd_titlebar_create(ssd);
+	ssd_border_create(ssd);
 	if (view->ssd_titlebar_hidden) {
 		/* Ensure we keep the old state on Reconfigure or when exiting fullscreen */
 		ssd_set_titlebar(ssd, false);
@@ -208,6 +205,13 @@ ssd_get_margin(const struct ssd *ssd)
 	return ssd ? ssd->margin : (struct border){ 0 };
 }
 
+int
+ssd_get_corner_width(void)
+{
+	/* ensure a minimum corner width */
+	return MAX(rc.corner_radius, 5);
+}
+
 void
 ssd_update_margin(struct ssd *ssd)
 {
@@ -224,47 +228,40 @@ ssd_update_geometry(struct ssd *ssd)
 		return;
 	}
 
+	struct view *view = ssd->view;
+	assert(view);
+
 	struct wlr_box cached = ssd->state.geometry;
-	struct wlr_box current = ssd->view->current;
+	struct wlr_box current = view->current;
 
 	int eff_width = current.width;
-	int eff_height = view_effective_height(ssd->view, /* use_pending */ false);
+	int eff_height = view_effective_height(view, /* use_pending */ false);
 
-	if (eff_width > 0 && eff_width < LAB_MIN_VIEW_WIDTH) {
-		/*
-		 * Prevent negative values in calculations like
-		 * `width - SSD_BUTTON_WIDTH * SSD_BUTTON_COUNT`
-		 */
-		wlr_log(WLR_ERROR,
-			"view width is smaller than its minimal value");
-		return;
+	bool update_area = eff_width != cached.width || eff_height != cached.height;
+	bool update_extents = update_area
+		|| current.x != cached.x || current.y != cached.y;
+
+	bool maximized = view->maximized == VIEW_AXIS_BOTH;
+	bool squared = ssd_should_be_squared(ssd);
+
+	bool state_changed = ssd->state.was_maximized != maximized
+		|| ssd->state.was_shaded != view->shaded
+		|| ssd->state.was_squared != squared
+		|| ssd->state.was_omnipresent != view->visible_on_all_workspaces;
+
+	if (update_extents) {
+		ssd_extents_update(ssd);
 	}
 
-	if (eff_width == cached.width && eff_height == cached.height) {
-		if (current.x != cached.x || current.y != cached.y) {
-			/* Dynamically resize extents based on position and usable_area */
-			ssd_extents_update(ssd);
-			ssd->state.geometry = current;
-		}
-		bool maximized = (ssd->view->maximized == VIEW_AXIS_BOTH);
-		if (ssd->state.was_maximized != maximized) {
-			ssd_border_update(ssd);
-			ssd_titlebar_update(ssd);
-			ssd_shadow_update(ssd);
-			/*
-			 * Not strictly necessary as ssd_titlebar_update()
-			 * already sets state.was_maximized but to future
-			 * proof this a bit we also set it here again.
-			 */
-			ssd->state.was_maximized = maximized;
-		}
-		return;
+	if (update_area || state_changed) {
+		ssd_titlebar_update(ssd);
+		ssd_border_update(ssd);
+		ssd_shadow_update(ssd);
+	}
+
+	if (update_extents) {
+		ssd->state.geometry = current;
 	}
-	ssd_extents_update(ssd);
-	ssd_border_update(ssd);
-	ssd_titlebar_update(ssd);
-	ssd_shadow_update(ssd);
-	ssd->state.geometry = current;
 }
 
 void
@@ -313,6 +310,10 @@ ssd_part_contains(enum ssd_part_type whole, enum ssd_part_type candidate)
 	if (whole == candidate || whole == LAB_SSD_ALL) {
 		return true;
 	}
+	if (whole == LAB_SSD_BUTTON) {
+		return candidate >= LAB_SSD_BUTTON_CLOSE
+			&& candidate <= LAB_SSD_BUTTON_OMNIPRESENT;
+	}
 	if (whole == LAB_SSD_PART_TITLEBAR) {
 		return candidate >= LAB_SSD_BUTTON_CLOSE
 			&& candidate <= LAB_SSD_PART_TITLE;
@@ -328,7 +329,7 @@ ssd_part_contains(enum ssd_part_type whole, enum ssd_part_type candidate)
 	}
 	if (whole == LAB_SSD_PART_TOP) {
 		return candidate == LAB_SSD_PART_CORNER_TOP_LEFT
-			|| candidate == LAB_SSD_PART_CORNER_BOTTOM_LEFT;
+			|| candidate == LAB_SSD_PART_CORNER_TOP_RIGHT;
 	}
 	if (whole == LAB_SSD_PART_RIGHT) {
 		return candidate == LAB_SSD_PART_CORNER_TOP_RIGHT
@@ -386,6 +387,7 @@ ssd_enable_shade(struct ssd *ssd, bool enable)
 	if (!ssd) {
 		return;
 	}
+	ssd_titlebar_update(ssd);
 	ssd_border_update(ssd);
 	wlr_scene_node_set_enabled(&ssd->extents.tree->node, !enable);
 	ssd_shadow_update(ssd);
diff --git a/src/tearing.c b/src/tearing.c
index 45113de5..b4e86d60 100644
--- a/src/tearing.c
+++ b/src/tearing.c
@@ -15,8 +15,15 @@ set_tearing_hint(struct wl_listener *listener, void *data)
 {
 	struct tearing_controller *controller = wl_container_of(listener, controller, set_hint);
 	struct view *view = view_from_wlr_surface(controller->tearing_control->surface);
-	if (view && controller->tearing_control->hint) {
-		view->tearing_hint = true;
+	if (view) {
+		/*
+		 * tearing_control->current is actually an enum:
+		 * WP_TEARING_CONTROL_V1_PRESENTATION_HINT_VSYNC = 0
+		 * WP_TEARING_CONTROL_V1_PRESENTATION_HINT_ASYNC = 1
+		 *
+		 * Using it as a bool here allows us to not ship the XML.
+		 */
+		view->tearing_hint = controller->tearing_control->current;
 	}
 }
 
diff --git a/src/theme.c b/src/theme.c
index 904aeadf..c0af2ad6 100644
--- a/src/theme.c
+++ b/src/theme.c
@@ -29,14 +29,14 @@
 #include "common/parse-double.h"
 #include "common/string-helpers.h"
 #include "config/rcxml.h"
-#include "button/button-png.h"
+#include "img/img-png.h"
 #include "labwc.h"
 
 #if HAVE_RSVG
-#include "button/button-svg.h"
+#include "img/img-svg.h"
 #endif
 
-#include "button/button-xbm.h"
+#include "img/img-xbm.h"
 #include "theme.h"
 #include "buffer.h"
 #include "ssd.h"
@@ -45,10 +45,8 @@ struct button {
 	const char *name;
 	const char *alt_name;
 	const char *fallback_button;  /* built-in 6x6 button */
-	struct {
-		struct lab_data_buffer **buffer;
-		float *rgba;
-	} active, inactive;
+	enum ssd_part_type type;
+	uint8_t state_set;
 };
 
 enum corner {
@@ -70,6 +68,9 @@ struct rounded_corner_ctx {
 
 static struct lab_data_buffer *rounded_rect(struct rounded_corner_ctx *ctx);
 
+/* 1 degree in radians (=2π/360) */
+static const double deg = 0.017453292519943295;
+
 static void
 zdrop(struct lab_data_buffer **buffer)
 {
@@ -79,96 +80,247 @@ zdrop(struct lab_data_buffer **buffer)
 	}
 }
 
-static enum corner
-corner_from_icon_name(const char *icon_name)
+static struct lab_data_buffer *
+copy_icon_buffer(struct theme *theme, struct lab_data_buffer *icon_buffer)
 {
-	assert(icon_name);
-
-	/*
-	 * TODO: Once we implement titleLayout we can make the
-	 *       return values depend on parsed config values.
-	 */
-	if (!strcmp(icon_name, "menu")) {
-		return LAB_CORNER_TOP_LEFT;
-	} else if (!strcmp(icon_name, "close")) {
-		return LAB_CORNER_TOP_RIGHT;
-	}
-	return LAB_CORNER_UNKNOWN;
-}
-
-static void
-create_hover_fallback(struct theme *theme, const char *icon_name,
-		struct lab_data_buffer **hover_buffer,
-		struct lab_data_buffer *icon_buffer)
-{
-	assert(icon_name);
 	assert(icon_buffer);
-	assert(!*hover_buffer);
 
 	struct surface_context icon =
 		get_cairo_surface_from_lab_data_buffer(icon_buffer);
 	int icon_width = cairo_image_surface_get_width(icon.surface);
 	int icon_height = cairo_image_surface_get_height(icon.surface);
 
-	int width = SSD_BUTTON_WIDTH;
-	int height = theme->title_height;
+	int width = theme->window_button_width;
+	int height = theme->window_button_height;
 
-	if (width && height) {
-		/*
-		 * Proportionately increase size of hover_buffer if the
-		 * non-hover 'donor' buffer is larger than the allocated space.
-		 * It will get scaled down again by wlroots when rendered and as
-		 * required by the current output scale.
-		 *
-		 * This ensures that icons > width or > height keep their aspect
-		 * ratio and are rendered the same as without the hover overlay.
-		 */
-		double scale = MAX((double)icon_width / width,
-				(double)icon_height / height);
-		if (scale > 1.0f) {
-			width = (double)width * scale;
-			height = (double)height * scale;
-		}
+	/*
+	 * Proportionately increase size of hover_buffer if the non-hover
+	 * 'donor' buffer is larger than the allocated space. It will get
+	 * scaled down again by wlroots when rendered and as required by the
+	 * current output scale.
+	 *
+	 * This ensures that icons > width or > height keep their aspect ratio
+	 * and are rendered the same as without the hover overlay.
+	 */
+	double scale = (width && height) ?
+		MAX((double)icon_width / width, (double)icon_height / height) : 1.0;
+	if (scale < 1.0) {
+		scale = 1.0;
 	}
+	int buffer_width = (double)width * scale;
+	int buffer_height = (double)height * scale;
+	struct lab_data_buffer *buffer = buffer_create_cairo(
+		buffer_width, buffer_height, 1.0);
+	cairo_t *cairo = buffer->cairo;
 
-	*hover_buffer = buffer_create_cairo(width, height, 1.0, true);
-
-	cairo_t *cairo = (*hover_buffer)->cairo;
-	cairo_surface_t *surf = cairo_get_target(cairo);
-
-	/* Background */
 	cairo_set_source_surface(cairo, icon.surface,
-		(width - icon_width) / 2, (height - icon_height) / 2);
+		(buffer_width - icon_width) / 2, (buffer_height - icon_height) / 2);
 	cairo_paint(cairo);
 
-	/* Overlay (pre-multiplied alpha) */
-	float overlay_color[4] = { 0.15f, 0.15f, 0.15f, 0.3f};
-	enum corner corner = corner_from_icon_name(icon_name);
-
-	if (corner == LAB_CORNER_UNKNOWN) {
-		set_cairo_color(cairo, overlay_color);
-		cairo_rectangle(cairo, 0, 0, width, height);
-		cairo_fill(cairo);
-	} else {
-		struct rounded_corner_ctx rounded_ctx = {
-			.box = &(struct wlr_box) { .width = width, .height = height },
-			.radius = rc.corner_radius,
-			.line_width = theme->border_width,
-			.fill_color = overlay_color,
-			.border_color = overlay_color,
-			.corner = corner
-		};
-		struct lab_data_buffer *overlay_buffer = rounded_rect(&rounded_ctx);
-		cairo_set_source_surface(cairo,
-			cairo_get_target(overlay_buffer->cairo), 0, 0);
-		cairo_paint(cairo);
-		wlr_buffer_drop(&overlay_buffer->base);
-	}
-	cairo_surface_flush(surf);
+	/*
+	 * Scale cairo context so that we can draw hover overlay or rounded
+	 * corner on this buffer in the scene coordinates.
+	 */
+	cairo_scale(cairo, scale, scale);
 
 	if (icon.is_duplicate) {
 		cairo_surface_destroy(icon.surface);
 	}
+
+	return buffer;
+}
+
+static void
+create_hover_fallback(struct theme *theme,
+		struct lab_data_buffer **hover_buffer,
+		struct lab_data_buffer *icon_buffer)
+{
+	assert(icon_buffer);
+	assert(!*hover_buffer);
+
+	int width = theme->window_button_width;
+	int height = theme->window_button_height;
+
+	*hover_buffer = copy_icon_buffer(theme, icon_buffer);
+	cairo_t *cairo = (*hover_buffer)->cairo;
+
+	/* Overlay (pre-multiplied alpha) */
+	float overlay_color[4] = { 0.15f, 0.15f, 0.15f, 0.3f};
+	set_cairo_color(cairo, overlay_color);
+	int radius = theme->window_button_hover_bg_corner_radius;
+
+	cairo_new_sub_path(cairo);
+	cairo_arc(cairo, radius, radius, radius, 180 * deg, 270 * deg);
+	cairo_line_to(cairo, width - radius, 0);
+	cairo_arc(cairo, width - radius, radius, radius, -90 * deg, 0 * deg);
+	cairo_line_to(cairo, width, height - radius);
+	cairo_arc(cairo, width - radius, height - radius, radius, 0 * deg, 90 * deg);
+	cairo_line_to(cairo, radius, height);
+	cairo_arc(cairo, radius, height - radius, radius, 90 * deg, 180 * deg);
+	cairo_close_path(cairo);
+	cairo_fill(cairo);
+
+	cairo_surface_flush(cairo_get_target(cairo));
+}
+
+static void
+create_rounded_buffer(struct theme *theme, enum corner corner,
+		struct lab_data_buffer **rounded_buffer,
+		struct lab_data_buffer *icon_buffer)
+{
+	*rounded_buffer = copy_icon_buffer(theme, icon_buffer);
+	cairo_t *cairo = (*rounded_buffer)->cairo;
+
+	int width = theme->window_button_width;
+	int height = theme->window_button_height;
+
+	/*
+	 * Round the corner button by cropping the region within the window
+	 * border. See the picture in #2189 for reference.
+	 */
+	int margin_x = theme->window_titlebar_padding_width;
+	int margin_y = (theme->title_height - theme->window_button_height) / 2;
+	float white[4] = {1, 1, 1, 1};
+	struct rounded_corner_ctx rounded_ctx = {
+		.box = &(struct wlr_box){
+			.width = margin_x + width,
+			.height = margin_y + height,
+		},
+		.radius = rc.corner_radius,
+		.line_width = theme->border_width,
+		.fill_color = white,
+		.border_color = white,
+		.corner = corner,
+	};
+	struct lab_data_buffer *mask_buffer = rounded_rect(&rounded_ctx);
+	cairo_set_operator(cairo, CAIRO_OPERATOR_DEST_IN);
+	cairo_set_source_surface(cairo, cairo_get_target(mask_buffer->cairo),
+		(corner == LAB_CORNER_TOP_LEFT) ? -margin_x : 0,
+		-margin_y);
+	cairo_paint(cairo);
+
+	cairo_surface_flush(cairo_get_target(cairo));
+	wlr_buffer_drop(&mask_buffer->base);
+}
+
+/*
+ * Scan theme directories with button names (name + postfix) and write the full
+ * path of the found button file to @buf. An empty string is set if a button
+ * file is not found.
+ */
+static void
+get_button_filename(char *buf, size_t len, const char *name, const char *postfix)
+{
+	buf[0] = '\0';
+
+	char filename[4096];
+	snprintf(filename, sizeof(filename), "%s%s", name, postfix);
+
+	struct wl_list paths;
+	paths_theme_create(&paths, rc.theme_name, filename);
+
+	/*
+	 * You can't really merge buttons, so let's just iterate forwards
+	 * and stop on the first hit
+	 */
+	struct path *path;
+	wl_list_for_each(path, &paths, link) {
+		if (access(path->string, R_OK) == 0) {
+			snprintf(buf, len, "%s", path->string);
+			break;
+		}
+	}
+	paths_destroy(&paths);
+}
+
+static void
+load_button(struct theme *theme, struct button *b, int active)
+{
+	struct lab_data_buffer *(*buttons)[LAB_BS_ALL + 1] =
+		theme->window[active].buttons;
+	struct lab_data_buffer **buffer = &buttons[b->type][b->state_set];
+	float *rgba = theme->window[active].button_colors[b->type];
+	char filename[4096];
+
+	zdrop(buffer);
+
+	int size = theme->window_button_height;
+	float scale = 1; /* TODO: account for output scale */
+
+	/* PNG */
+	get_button_filename(filename, sizeof(filename), b->name,
+		active ? "-active.png" : "-inactive.png");
+	img_png_load(filename, buffer, size, scale);
+
+#if HAVE_RSVG
+	/* SVG */
+	if (!*buffer) {
+		get_button_filename(filename, sizeof(filename), b->name,
+			active ? "-active.svg" : "-inactive.svg");
+		img_svg_load(filename, buffer, size, scale);
+	}
+#endif
+
+	/* XBM */
+	if (!*buffer) {
+		get_button_filename(filename, sizeof(filename), b->name, ".xbm");
+		img_xbm_load(filename, buffer, rgba);
+	}
+
+	/*
+	 * XBM (alternative name)
+	 * For example max_hover_toggled instead of max_toggled_hover
+	 */
+	if (!*buffer && b->alt_name) {
+		get_button_filename(filename, sizeof(filename),
+			b->alt_name, ".xbm");
+		img_xbm_load(filename, buffer, rgba);
+	}
+
+	/*
+	 * Builtin bitmap
+	 *
+	 * Applicable to basic buttons such as max, max_toggled and iconify.
+	 * There are no bitmap fallbacks for *_hover icons.
+	 */
+	if (!*buffer && b->fallback_button) {
+		img_xbm_from_bitmap(b->fallback_button, buffer, rgba);
+	}
+
+	/*
+	 * If hover-icons do not exist, add fallbacks by copying the non-hover
+	 * variant and then adding an overlay.
+	 */
+	if (!*buffer && (b->state_set & LAB_BS_HOVERD)) {
+		uint8_t non_hover_state_set = b->state_set & ~LAB_BS_HOVERD;
+		create_hover_fallback(theme, buffer,
+			buttons[b->type][non_hover_state_set]);
+	}
+
+	/*
+	 * If the loaded button is at the corner of the titlebar, also create
+	 * rounded variants.
+	 */
+	uint8_t rounded_state_set = b->state_set | LAB_BS_ROUNDED;
+
+	struct title_button *leftmost_button;
+	wl_list_for_each(leftmost_button,
+			&rc.title_buttons_left, link) {
+		if (leftmost_button->type == b->type) {
+			create_rounded_buffer(theme, LAB_CORNER_TOP_LEFT,
+				&buttons[b->type][rounded_state_set], *buffer);
+		}
+		break;
+	}
+	struct title_button *rightmost_button;
+	wl_list_for_each_reverse(rightmost_button,
+			&rc.title_buttons_right, link) {
+		if (rightmost_button->type == b->type) {
+			create_rounded_buffer(theme, LAB_CORNER_TOP_RIGHT,
+				&buttons[b->type][rounded_state_set], *buffer);
+		}
+		break;
+	}
 }
 
 /*
@@ -206,178 +358,115 @@ load_buttons(struct theme *theme)
 {
 	struct button buttons[] = { {
 		.name = "menu",
+		.type = LAB_SSD_BUTTON_WINDOW_MENU,
+		.state_set = 0,
+		.fallback_button = (const char[]){ 0x00, 0x18, 0x3c, 0x3c, 0x18, 0x00 },
+	}, {
+		/* menu icon is loaded again as a fallback of window icon */
+		.name = "menu",
+		.type = LAB_SSD_BUTTON_WINDOW_ICON,
+		.state_set = 0,
 		.fallback_button = (const char[]){ 0x00, 0x18, 0x3c, 0x3c, 0x18, 0x00 },
-		.active.buffer = &theme->button_menu_active_unpressed,
-		.active.rgba = theme->window_active_button_menu_unpressed_image_color,
-		.inactive.buffer = &theme->button_menu_inactive_unpressed,
-		.inactive.rgba = theme->window_inactive_button_menu_unpressed_image_color,
 	}, {
 		.name = "iconify",
+		.type = LAB_SSD_BUTTON_ICONIFY,
+		.state_set = 0,
 		.fallback_button = (const char[]){ 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f },
-		.active.buffer = &theme->button_iconify_active_unpressed,
-		.active.rgba = theme->window_active_button_iconify_unpressed_image_color,
-		.inactive.buffer = &theme->button_iconify_inactive_unpressed,
-		.inactive.rgba = theme->window_inactive_button_iconify_unpressed_image_color,
 	}, {
 		.name = "max",
+		.type = LAB_SSD_BUTTON_MAXIMIZE,
+		.state_set = 0,
 		.fallback_button = (const char[]){ 0x3f, 0x3f, 0x21, 0x21, 0x21, 0x3f },
-		.active.buffer = &theme->button_maximize_active_unpressed,
-		.active.rgba = theme->window_active_button_max_unpressed_image_color,
-		.inactive.buffer = &theme->button_maximize_inactive_unpressed,
-		.inactive.rgba = theme->window_inactive_button_max_unpressed_image_color,
 	}, {
 		.name = "max_toggled",
+		.type = LAB_SSD_BUTTON_MAXIMIZE,
+		.state_set = LAB_BS_TOGGLED,
 		.fallback_button = (const char[]){ 0x3e, 0x22, 0x2f, 0x29, 0x39, 0x0f },
-		.active.buffer = &theme->button_restore_active_unpressed,
-		.active.rgba = theme->window_active_button_max_unpressed_image_color,
-		.inactive.buffer = &theme->button_restore_inactive_unpressed,
-		.inactive.rgba = theme->window_inactive_button_max_unpressed_image_color,
+	}, {
+		.name = "shade",
+		.type = LAB_SSD_BUTTON_SHADE,
+		.state_set = 0,
+		.fallback_button = (const char[]){ 0x3f, 0x3f, 0x00, 0x0c, 0x1e, 0x3f },
+	}, {
+		.name = "shade_toggled",
+		.type = LAB_SSD_BUTTON_SHADE,
+		.state_set = LAB_BS_TOGGLED,
+		.fallback_button = (const char[]){ 0x3f, 0x3f, 0x00, 0x3f, 0x1e, 0x0c },
+	}, {
+		.name = "desk",
+		.type = LAB_SSD_BUTTON_OMNIPRESENT,
+		.state_set = 0,
+		.fallback_button = (const char[]){ 0x33, 0x33, 0x00, 0x00, 0x33, 0x33 },
+	}, {
+		.name = "desk_toggled",
+		.type = LAB_SSD_BUTTON_OMNIPRESENT,
+		.state_set = LAB_BS_TOGGLED,
+		.fallback_button = (const char[]){ 0x00, 0x1e, 0x1a, 0x16, 0x1e, 0x00 },
 	}, {
 		.name = "close",
+		.type = LAB_SSD_BUTTON_CLOSE,
+		.state_set = 0,
 		.fallback_button = (const char[]){ 0x33, 0x3f, 0x1e, 0x1e, 0x3f, 0x33 },
-		.active.buffer = &theme->button_close_active_unpressed,
-		.active.rgba = theme->window_active_button_close_unpressed_image_color,
-		.inactive.buffer = &theme->button_close_inactive_unpressed,
-		.inactive.rgba = theme->window_inactive_button_close_unpressed_image_color,
 	}, {
 		.name = "menu_hover",
+		.type = LAB_SSD_BUTTON_WINDOW_MENU,
+		.state_set = LAB_BS_HOVERD,
+		/* no fallback (non-hover variant is used instead) */
+	}, {
+		/* menu_hover icon is loaded again as a fallback of window icon */
+		.name = "menu_hover",
+		.type = LAB_SSD_BUTTON_WINDOW_ICON,
+		.state_set = LAB_BS_HOVERD,
 		/* no fallback (non-hover variant is used instead) */
-		.active.buffer = &theme->button_menu_active_hover,
-		.active.rgba = theme->window_active_button_menu_unpressed_image_color,
-		.inactive.buffer = &theme->button_menu_inactive_hover,
-		.inactive.rgba = theme->window_inactive_button_menu_unpressed_image_color,
 	}, {
 		.name = "iconify_hover",
+		.type = LAB_SSD_BUTTON_ICONIFY,
+		.state_set = LAB_BS_HOVERD,
 		/* no fallback (non-hover variant is used instead) */
-		.active.buffer = &theme->button_iconify_active_hover,
-		.active.rgba = theme->window_active_button_iconify_unpressed_image_color,
-		.inactive.buffer = &theme->button_iconify_inactive_hover,
-		.inactive.rgba = theme->window_inactive_button_iconify_unpressed_image_color,
 	}, {
 		.name = "max_hover",
+		.type = LAB_SSD_BUTTON_MAXIMIZE,
+		.state_set = LAB_BS_HOVERD,
 		/* no fallback (non-hover variant is used instead) */
-		.active.buffer = &theme->button_maximize_active_hover,
-		.active.rgba = theme->window_active_button_max_unpressed_image_color,
-		.inactive.buffer = &theme->button_maximize_inactive_hover,
-		.inactive.rgba = theme->window_inactive_button_max_unpressed_image_color,
 	}, {
 		.name = "max_toggled_hover",
 		.alt_name = "max_hover_toggled",
+		.type = LAB_SSD_BUTTON_MAXIMIZE,
+		.state_set = LAB_BS_TOGGLED | LAB_BS_HOVERD,
+		/* no fallback (non-hover variant is used instead) */
+	}, {
+		.name = "shade_hover",
+		.type = LAB_SSD_BUTTON_SHADE,
+		.state_set = LAB_BS_HOVERD,
+		/* no fallback (non-hover variant is used instead) */
+	}, {
+		.name = "shade_toggled_hover",
+		.alt_name = "shade_hover_toggled",
+		.type = LAB_SSD_BUTTON_SHADE,
+		.state_set = LAB_BS_TOGGLED | LAB_BS_HOVERD,
+		/* no fallback (non-hover variant is used instead) */
+	}, {
+		.name = "desk_hover",
+		/* no fallback (non-hover variant is used instead) */
+		.type = LAB_SSD_BUTTON_OMNIPRESENT,
+		.state_set = LAB_BS_HOVERD,
+	}, {
+		.name = "desk_toggled_hover",
+		.alt_name = "desk_hover_toggled",
+		.type = LAB_SSD_BUTTON_OMNIPRESENT,
+		.state_set = LAB_BS_TOGGLED | LAB_BS_HOVERD,
 		/* no fallback (non-hover variant is used instead) */
-		.active.buffer = &theme->button_restore_active_hover,
-		.active.rgba = theme->window_active_button_max_unpressed_image_color,
-		.inactive.buffer = &theme->button_restore_inactive_hover,
-		.inactive.rgba = theme->window_inactive_button_max_unpressed_image_color,
 	}, {
 		.name = "close_hover",
+		.type = LAB_SSD_BUTTON_CLOSE,
+		.state_set = LAB_BS_HOVERD,
 		/* no fallback (non-hover variant is used instead) */
-		.active.buffer = &theme->button_close_active_hover,
-		.active.rgba = theme->window_active_button_close_unpressed_image_color,
-		.inactive.buffer = &theme->button_close_inactive_hover,
-		.inactive.rgba = theme->window_inactive_button_close_unpressed_image_color,
 	}, };
 
-	char filename[4096] = {0};
 	for (size_t i = 0; i < ARRAY_SIZE(buttons); ++i) {
 		struct button *b = &buttons[i];
-
-		zdrop(b->active.buffer);
-		zdrop(b->inactive.buffer);
-
-		/* PNG */
-		snprintf(filename, sizeof(filename), "%s-active.png", b->name);
-		button_png_load(filename, b->active.buffer);
-		snprintf(filename, sizeof(filename), "%s-inactive.png", b->name);
-		button_png_load(filename, b->inactive.buffer);
-
-#if HAVE_RSVG
-		/* SVG */
-		int size = theme->title_height - 2 * theme->padding_height;
-		if (!*b->active.buffer) {
-			snprintf(filename, sizeof(filename), "%s-active.svg", b->name);
-			button_svg_load(filename, b->active.buffer, size);
-		}
-		if (!*b->inactive.buffer) {
-			snprintf(filename, sizeof(filename), "%s-inactive.svg", b->name);
-			button_svg_load(filename, b->inactive.buffer, size);
-		}
-#endif
-
-		/* XBM */
-		snprintf(filename, sizeof(filename), "%s.xbm", b->name);
-		if (!*b->active.buffer) {
-			button_xbm_load(filename, b->active.buffer, b->active.rgba);
-		}
-		if (!*b->inactive.buffer) {
-			button_xbm_load(filename, b->inactive.buffer, b->inactive.rgba);
-		}
-
-		/*
-		 * XBM (alternative name)
-		 * For example max_hover_toggled instead of max_toggled_hover
-		 */
-		if (b->alt_name) {
-			snprintf(filename, sizeof(filename), "%s.xbm", b->alt_name);
-		}  else {
-			filename[0] = '\0';
-		}
-		if (!*b->active.buffer) {
-			button_xbm_load(filename, b->active.buffer, b->active.rgba);
-		}
-		if (!*b->inactive.buffer) {
-			button_xbm_load(filename, b->inactive.buffer, b->inactive.rgba);
-		}
-
-		/*
-		 * Builtin bitmap
-		 *
-		 * Applicable to basic buttons such as max, max_toggled and
-		 * iconify. There are no bitmap fallbacks for *_hover icons.
-		 */
-		if (!b->fallback_button) {
-			continue;
-		}
-		if (!*b->active.buffer) {
-			button_xbm_from_bitmap(b->fallback_button,
-				b->active.buffer, b->active.rgba);
-		}
-		if (!*b->inactive.buffer) {
-			button_xbm_from_bitmap(b->fallback_button,
-				b->inactive.buffer, b->inactive.rgba);
-		}
-	}
-
-	/*
-	 * If hover-icons do not exist, add fallbacks by copying the non-hover
-	 * variant (base) and then adding an overlay.
-	 */
-	for (size_t i = 0; i < ARRAY_SIZE(buttons); i++) {
-		struct button *hover_button = &buttons[i];
-
-		if (!strstr(hover_button->name, "_hover")) {
-			continue;
-		}
-
-		/* If name=='foo_hover', basename='foo' */
-		char basename[64]  = {0};
-		snprintf(basename, sizeof(basename), "%s", hover_button->name);
-		trim_last_field(basename, '_');
-		for (size_t j = 0; j < ARRAY_SIZE(buttons); j++) {
-			struct button *base = &buttons[j];
-			if (!strcmp(basename, base->name)) {
-				if (!*hover_button->active.buffer) {
-					create_hover_fallback(theme, basename,
-						hover_button->active.buffer,
-						*base->active.buffer);
-				}
-				if (!*hover_button->inactive.buffer) {
-					create_hover_fallback(theme, basename,
-						hover_button->inactive.buffer,
-						*base->inactive.buffer);
-				}
-				break;
-			}
-		}
+		load_button(theme, b, THEME_INACTIVE);
+		load_button(theme, b, THEME_ACTIVE);
 	}
 }
 
@@ -471,7 +560,8 @@ static void
 theme_builtin(struct theme *theme, struct server *server)
 {
 	theme->border_width = 1;
-	theme->padding_height = 3;
+	theme->window_titlebar_padding_height = 0;
+	theme->window_titlebar_padding_width = 0;
 	theme->title_height = INT_MIN;
 	theme->menu_overlap_x = 0;
 	theme->menu_overlap_y = 0;
@@ -487,23 +577,20 @@ theme_builtin(struct theme *theme, struct server *server)
 	parse_hexstr("#000000", theme->window_active_label_text_color);
 	parse_hexstr("#000000", theme->window_inactive_label_text_color);
 	theme->window_label_text_justify = parse_justification("Center");
+	theme->menu_title_text_justify = parse_justification("Center");
 
-	parse_hexstr("#000000",
-		theme->window_active_button_menu_unpressed_image_color);
-	parse_hexstr("#000000",
-		theme->window_active_button_iconify_unpressed_image_color);
-	parse_hexstr("#000000",
-		theme->window_active_button_max_unpressed_image_color);
-	parse_hexstr("#000000",
-		theme->window_active_button_close_unpressed_image_color);
-	parse_hexstr("#000000",
-		theme->window_inactive_button_menu_unpressed_image_color);
-	parse_hexstr("#000000",
-		theme->window_inactive_button_iconify_unpressed_image_color);
-	parse_hexstr("#000000",
-		theme->window_inactive_button_max_unpressed_image_color);
-	parse_hexstr("#000000",
-		theme->window_inactive_button_close_unpressed_image_color);
+	theme->window_button_width = 26;
+	theme->window_button_height = 26;
+	theme->window_button_spacing = 0;
+	theme->window_button_hover_bg_corner_radius = 0;
+
+	for (enum ssd_part_type type = LAB_SSD_BUTTON_FIRST;
+			type <= LAB_SSD_BUTTON_LAST; type++) {
+		parse_hexstr("#000000",
+			theme->window[THEME_INACTIVE].button_colors[type]);
+		parse_hexstr("#000000",
+			theme->window[THEME_ACTIVE].button_colors[type]);
+	}
 
 	theme->window_active_shadow_size = 60;
 	theme->window_inactive_shadow_size = 40;
@@ -526,6 +613,10 @@ theme_builtin(struct theme *theme, struct server *server)
 	theme->menu_separator_padding_height = 3;
 	parse_hexstr("#888888", theme->menu_separator_color);
 
+	parse_hexstr("#589bda", theme->menu_title_bg_color);
+
+	parse_hexstr("#ffffff", theme->menu_title_text_color);
+
 	theme->osd_window_switcher_width = 600;
 	theme->osd_window_switcher_width_is_percent = false;
 	theme->osd_window_switcher_padding = 4;
@@ -576,6 +667,18 @@ theme_builtin(struct theme *theme, struct server *server)
 	theme->mag_border_width = 1;
 }
 
+static int
+get_int_if_positive(const char *content, const char *field)
+{
+	int value = atoi(content);
+	if (value < 0) {
+		wlr_log(WLR_ERROR,
+			"%s cannot be negative, clamping it to 0.", field);
+		value = 0;
+	}
+	return value;
+}
+
 static void
 entry(struct theme *theme, const char *key, const char *value)
 {
@@ -588,25 +691,41 @@ entry(struct theme *theme, const char *key, const char *value)
 	 * the first instance, "else if" cannot be used throughout this function
 	 */
 	if (match_glob(key, "border.width")) {
-		theme->border_width = atoi(value);
+		theme->border_width = get_int_if_positive(
+			value, "border.width");
 	}
-	if (match_glob(key, "padding.height")) {
-		theme->padding_height = atoi(value);
+	if (match_glob(key, "window.titlebar.padding.width")) {
+		theme->window_titlebar_padding_width = get_int_if_positive(
+			value, "window.titlebar.padding.width");
+	}
+	if (match_glob(key, "window.titlebar.padding.height")) {
+		theme->window_titlebar_padding_height = get_int_if_positive(
+			value, "window.titlebar.padding.height");
 	}
 	if (match_glob(key, "titlebar.height")) {
-		theme->title_height = atoi(value);
+		wlr_log(WLR_ERROR, "titlebar.height is no longer supported");
+	}
+	if (match_glob(key, "padding.height")) {
+		wlr_log(WLR_ERROR, "padding.height is no longer supported");
 	}
 	if (match_glob(key, "menu.items.padding.x")) {
-		theme->menu_item_padding_x = atoi(value);
+		theme->menu_item_padding_x = get_int_if_positive(
+			value, "menu.items.padding.x");
 	}
 	if (match_glob(key, "menu.items.padding.y")) {
-		theme->menu_item_padding_y = atoi(value);
+		theme->menu_item_padding_y = get_int_if_positive(
+			value, "menu.items.padding.y");
+	}
+	if (match_glob(key, "menu.title.text.justify")) {
+		theme->menu_title_text_justify = parse_justification(value);
 	}
 	if (match_glob(key, "menu.overlap.x")) {
-		theme->menu_overlap_x = atoi(value);
+		theme->menu_overlap_x = get_int_if_positive(
+			value, "menu.overlap.x");
 	}
 	if (match_glob(key, "menu.overlap.y")) {
-		theme->menu_overlap_y = atoi(value);
+		theme->menu_overlap_y = get_int_if_positive(
+			value, "menu.overlap.y");
 	}
 
 	if (match_glob(key, "window.active.border.color")) {
@@ -642,78 +761,109 @@ entry(struct theme *theme, const char *key, const char *value)
 		theme->window_label_text_justify = parse_justification(value);
 	}
 
+	if (match_glob(key, "window.button.width")) {
+		theme->window_button_width = atoi(value);
+		if (theme->window_button_width < 1) {
+			wlr_log(WLR_ERROR, "window.button.width cannot "
+				"be less than 1, clamping it to 1.");
+			theme->window_button_width = 1;
+		}
+	}
+	if (match_glob(key, "window.button.height")) {
+		theme->window_button_height = atoi(value);
+		if (theme->window_button_height < 1) {
+			wlr_log(WLR_ERROR, "window.button.height cannot "
+				"be less than 1, clamping it to 1.");
+			theme->window_button_height = 1;
+		}
+	}
+	if (match_glob(key, "window.button.spacing")) {
+		theme->window_button_spacing = get_int_if_positive(
+			value, "window.button.spacing");
+	}
+	if (match_glob(key, "window.button.hover.bg.corner-radius")) {
+		theme->window_button_hover_bg_corner_radius = get_int_if_positive(
+			value, "window.button.hover.bg.corner-radius");
+	}
+
 	/* universal button */
 	if (match_glob(key, "window.active.button.unpressed.image.color")) {
-		parse_hexstr(value,
-			theme->window_active_button_menu_unpressed_image_color);
-		parse_hexstr(value,
-			theme->window_active_button_iconify_unpressed_image_color);
-		parse_hexstr(value,
-			theme->window_active_button_max_unpressed_image_color);
-		parse_hexstr(value,
-			theme->window_active_button_close_unpressed_image_color);
+		for (enum ssd_part_type type = LAB_SSD_BUTTON_FIRST;
+				type <= LAB_SSD_BUTTON_LAST; type++) {
+			parse_hexstr(value,
+				theme->window[THEME_ACTIVE].button_colors[type]);
+		}
 	}
 	if (match_glob(key, "window.inactive.button.unpressed.image.color")) {
-		parse_hexstr(value,
-			theme->window_inactive_button_menu_unpressed_image_color);
-		parse_hexstr(value,
-			theme->window_inactive_button_iconify_unpressed_image_color);
-		parse_hexstr(value,
-			theme->window_inactive_button_max_unpressed_image_color);
-		parse_hexstr(value,
-			theme->window_inactive_button_close_unpressed_image_color);
+		for (enum ssd_part_type type = LAB_SSD_BUTTON_FIRST;
+				type <= LAB_SSD_BUTTON_LAST; type++) {
+			parse_hexstr(value,
+				theme->window[THEME_INACTIVE].button_colors[type]);
+		}
 	}
 
 	/* individual buttons */
 	if (match_glob(key, "window.active.button.menu.unpressed.image.color")) {
-		parse_hexstr(value,
-			theme->window_active_button_menu_unpressed_image_color);
+		parse_hexstr(value, theme->window[THEME_ACTIVE]
+			.button_colors[LAB_SSD_BUTTON_WINDOW_MENU]);
+		parse_hexstr(value, theme->window[THEME_ACTIVE]
+			.button_colors[LAB_SSD_BUTTON_WINDOW_ICON]);
 	}
 	if (match_glob(key, "window.active.button.iconify.unpressed.image.color")) {
-		parse_hexstr(value,
-			theme->window_active_button_iconify_unpressed_image_color);
+		parse_hexstr(value, theme->window[THEME_ACTIVE]
+			.button_colors[LAB_SSD_BUTTON_ICONIFY]);
 	}
 	if (match_glob(key, "window.active.button.max.unpressed.image.color")) {
-		parse_hexstr(value,
-			theme->window_active_button_max_unpressed_image_color);
+		parse_hexstr(value, theme->window[THEME_ACTIVE]
+			.button_colors[LAB_SSD_BUTTON_MAXIMIZE]);
+	}
+	if (match_glob(key, "window.active.button.shade.unpressed.image.color")) {
+		parse_hexstr(value, theme->window[THEME_ACTIVE]
+			.button_colors[LAB_SSD_BUTTON_SHADE]);
+	}
+	if (match_glob(key, "window.active.button.desk.unpressed.image.color")) {
+		parse_hexstr(value, theme->window[THEME_ACTIVE]
+			.button_colors[LAB_SSD_BUTTON_OMNIPRESENT]);
 	}
 	if (match_glob(key, "window.active.button.close.unpressed.image.color")) {
-		parse_hexstr(value,
-			theme->window_active_button_close_unpressed_image_color);
+		parse_hexstr(value, theme->window[THEME_ACTIVE]
+			.button_colors[LAB_SSD_BUTTON_CLOSE]);
 	}
 	if (match_glob(key, "window.inactive.button.menu.unpressed.image.color")) {
-		parse_hexstr(value,
-			theme->window_inactive_button_menu_unpressed_image_color);
+		parse_hexstr(value, theme->window[THEME_INACTIVE]
+			.button_colors[LAB_SSD_BUTTON_WINDOW_MENU]);
+		parse_hexstr(value, theme->window[THEME_INACTIVE]
+			.button_colors[LAB_SSD_BUTTON_WINDOW_ICON]);
 	}
 	if (match_glob(key, "window.inactive.button.iconify.unpressed.image.color")) {
-		parse_hexstr(value,
-			theme->window_inactive_button_iconify_unpressed_image_color);
+		parse_hexstr(value, theme->window[THEME_INACTIVE]
+			.button_colors[LAB_SSD_BUTTON_ICONIFY]);
 	}
 	if (match_glob(key, "window.inactive.button.max.unpressed.image.color")) {
-		parse_hexstr(value,
-			theme->window_inactive_button_max_unpressed_image_color);
+		parse_hexstr(value, theme->window[THEME_INACTIVE]
+			.button_colors[LAB_SSD_BUTTON_MAXIMIZE]);
+	}
+	if (match_glob(key, "window.inactive.button.shade.unpressed.image.color")) {
+		parse_hexstr(value, theme->window[THEME_INACTIVE]
+			.button_colors[LAB_SSD_BUTTON_SHADE]);
+	}
+	if (match_glob(key, "window.inactive.button.desk.unpressed.image.color")) {
+		parse_hexstr(value, theme->window[THEME_INACTIVE]
+			.button_colors[LAB_SSD_BUTTON_OMNIPRESENT]);
 	}
 	if (match_glob(key, "window.inactive.button.close.unpressed.image.color")) {
-		parse_hexstr(value,
-			theme->window_inactive_button_close_unpressed_image_color);
+		parse_hexstr(value, theme->window[THEME_INACTIVE]
+			.button_colors[LAB_SSD_BUTTON_CLOSE]);
 	}
 
 	/* window drop-shadows */
 	if (match_glob(key, "window.active.shadow.size")) {
-		theme->window_active_shadow_size = atoi(value);
-		if (theme->window_active_shadow_size < 0) {
-			wlr_log(WLR_ERROR, "window.active.shadow.size cannot "
-				"be negative, clamping it to 0.");
-			theme->window_active_shadow_size = 0;
-		}
+		theme->window_active_shadow_size = get_int_if_positive(
+			value, "window.active.shadow.size");
 	}
 	if (match_glob(key, "window.inactive.shadow.size")) {
-		theme->window_inactive_shadow_size = atoi(value);
-		if (theme->window_inactive_shadow_size < 0) {
-			wlr_log(WLR_ERROR, "window.inactive.shadow.size cannot "
-				"be negative, clamping it to 0.");
-			theme->window_inactive_shadow_size = 0;
-		}
+		theme->window_inactive_shadow_size = get_int_if_positive(
+			value, "window.inactive.shadow.size");
 	}
 	if (match_glob(key, "window.active.shadow.color")) {
 		parse_hexstr(value, theme->window_active_shadow_color);
@@ -723,10 +873,12 @@ entry(struct theme *theme, const char *key, const char *value)
 	}
 
 	if (match_glob(key, "menu.width.min")) {
-		theme->menu_min_width = atoi(value);
+		theme->menu_min_width = get_int_if_positive(
+			value, "menu.width.min");
 	}
 	if (match_glob(key, "menu.width.max")) {
-		theme->menu_max_width = atoi(value);
+		theme->menu_max_width = get_int_if_positive(
+			value, "menu.width.max");
 	}
 
 	if (match_glob(key, "menu.items.bg.color")) {
@@ -743,23 +895,35 @@ entry(struct theme *theme, const char *key, const char *value)
 	}
 
 	if (match_glob(key, "menu.separator.width")) {
-		theme->menu_separator_line_thickness = atoi(value);
+		theme->menu_separator_line_thickness = get_int_if_positive(
+			value, "menu.separator.width");
 	}
 	if (match_glob(key, "menu.separator.padding.width")) {
-		theme->menu_separator_padding_width = atoi(value);
+		theme->menu_separator_padding_width = get_int_if_positive(
+			value, "menu.separator.padding.width");
 	}
 	if (match_glob(key, "menu.separator.padding.height")) {
-		theme->menu_separator_padding_height = atoi(value);
+		theme->menu_separator_padding_height = get_int_if_positive(
+			value, "menu.separator.padding.height");
 	}
 	if (match_glob(key, "menu.separator.color")) {
 		parse_hexstr(value, theme->menu_separator_color);
 	}
 
+	if (match_glob(key, "menu.title.bg.color")) {
+		parse_hexstr(value, theme->menu_title_bg_color);
+	}
+
+	if (match_glob(key, "menu.title.text.color")) {
+		parse_hexstr(value, theme->menu_title_text_color);
+	}
+
 	if (match_glob(key, "osd.bg.color")) {
 		parse_hexstr(value, theme->osd_bg_color);
 	}
 	if (match_glob(key, "osd.border.width")) {
-		theme->osd_border_width = atoi(value);
+		theme->osd_border_width = get_int_if_positive(
+			value, "osd.border.width");
 	}
 	if (match_glob(key, "osd.border.color")) {
 		parse_hexstr(value, theme->osd_border_color);
@@ -770,31 +934,45 @@ entry(struct theme *theme, const char *key, const char *value)
 		} else {
 			theme->osd_window_switcher_width_is_percent = false;
 		}
-		theme->osd_window_switcher_width = MAX(atoi(value), 0);
+		theme->osd_window_switcher_width = get_int_if_positive(
+			value, "osd.window-switcher.width");
 	}
 	if (match_glob(key, "osd.window-switcher.padding")) {
-		theme->osd_window_switcher_padding = atoi(value);
+		theme->osd_window_switcher_padding = get_int_if_positive(
+			value, "osd.window-switcher.padding");
 	}
 	if (match_glob(key, "osd.window-switcher.item.padding.x")) {
-		theme->osd_window_switcher_item_padding_x = atoi(value);
+		theme->osd_window_switcher_item_padding_x =
+			get_int_if_positive(
+				value, "osd.window-switcher.item.padding.x");
 	}
 	if (match_glob(key, "osd.window-switcher.item.padding.y")) {
-		theme->osd_window_switcher_item_padding_y = atoi(value);
+		theme->osd_window_switcher_item_padding_y =
+			get_int_if_positive(
+				value, "osd.window-switcher.item.padding.y");
 	}
 	if (match_glob(key, "osd.window-switcher.item.active.border.width")) {
-		theme->osd_window_switcher_item_active_border_width = atoi(value);
+		theme->osd_window_switcher_item_active_border_width =
+			get_int_if_positive(
+				value, "osd.window-switcher.item.active.border.width");
 	}
 	if (match_glob(key, "osd.window-switcher.preview.border.width")) {
-		theme->osd_window_switcher_preview_border_width = atoi(value);
+		theme->osd_window_switcher_preview_border_width =
+			get_int_if_positive(
+				value, "osd.window-switcher.preview.border.width");
 	}
 	if (match_glob(key, "osd.window-switcher.preview.border.color")) {
 		parse_hexstrs(value, theme->osd_window_switcher_preview_border_color);
 	}
 	if (match_glob(key, "osd.workspace-switcher.boxes.width")) {
-		theme->osd_workspace_switcher_boxes_width = atoi(value);
+		theme->osd_workspace_switcher_boxes_width =
+			get_int_if_positive(
+				value, "osd.workspace-switcher.boxes.width");
 	}
 	if (match_glob(key, "osd.workspace-switcher.boxes.height")) {
-		theme->osd_workspace_switcher_boxes_height = atoi(value);
+		theme->osd_workspace_switcher_boxes_height =
+			get_int_if_positive(
+				value, "osd.workspace-switcher.boxes.height");
 	}
 	if (match_glob(key, "osd.label.text.color")) {
 		parse_hexstr(value, theme->osd_label_text_color);
@@ -818,10 +996,12 @@ entry(struct theme *theme, const char *key, const char *value)
 		parse_hexstr(value, theme->snapping_overlay_edge.bg_color);
 	}
 	if (match_glob(key, "snapping.overlay.region.border.width")) {
-		theme->snapping_overlay_region.border_width = atoi(value);
+		theme->snapping_overlay_region.border_width = get_int_if_positive(
+			value, "snapping.overlay.region.border.width");
 	}
 	if (match_glob(key, "snapping.overlay.edge.border.width")) {
-		theme->snapping_overlay_edge.border_width = atoi(value);
+		theme->snapping_overlay_edge.border_width = get_int_if_positive(
+			value, "snapping.overlay.edge.border.width");
 	}
 	if (match_glob(key, "snapping.overlay.region.border.color")) {
 		parse_hexstrs(value, theme->snapping_overlay_region.border_color);
@@ -831,7 +1011,8 @@ entry(struct theme *theme, const char *key, const char *value)
 	}
 
 	if (match_glob(key, "magnifier.border.width")) {
-		theme->mag_border_width = atoi(value);
+		theme->mag_border_width = get_int_if_positive(
+			value, "magnifier.border.width");
 	}
 	if (match_glob(key, "magnifier.border.color")) {
 		parse_hexstr(value, theme->mag_border_color);
@@ -897,9 +1078,6 @@ theme_read(struct theme *theme, struct wl_list *paths)
 static struct lab_data_buffer *
 rounded_rect(struct rounded_corner_ctx *ctx)
 {
-	/* 1 degree in radians (=2π/360) */
-	double deg = 0.017453292519943295;
-
 	if (ctx->corner == LAB_CORNER_UNKNOWN) {
 		return NULL;
 	}
@@ -910,7 +1088,7 @@ rounded_rect(struct rounded_corner_ctx *ctx)
 
 	struct lab_data_buffer *buffer;
 	/* TODO: scale */
-	buffer = buffer_create_cairo(w, h, 1, /*free_on_destroy*/ true);
+	buffer = buffer_create_cairo(w, h, 1);
 
 	cairo_t *cairo = buffer->cairo;
 	cairo_surface_t *surf = cairo_get_target(cairo);
@@ -1062,10 +1240,12 @@ out:
 static void
 create_corners(struct theme *theme)
 {
+	int corner_width = ssd_get_corner_width();
+
 	struct wlr_box box = {
 		.x = 0,
 		.y = 0,
-		.width = SSD_BUTTON_WIDTH + theme->border_width,
+		.width = corner_width + theme->border_width,
 		.height = theme->title_height + theme->border_width,
 	};
 
@@ -1227,11 +1407,11 @@ create_shadows(struct theme *theme)
 	 */
 	if (visible_active_size > 0) {
 		theme->shadow_edge_active = buffer_create_cairo(
-			visible_active_size, 1, 1.0, true);
+			visible_active_size, 1, 1.0);
 		theme->shadow_corner_top_active = buffer_create_cairo(
-			total_active_size, total_active_size, 1.0, true);
+			total_active_size, total_active_size, 1.0);
 		theme->shadow_corner_bottom_active = buffer_create_cairo(
-			total_active_size, total_active_size, 1.0, true);
+			total_active_size, total_active_size, 1.0);
 		if (!theme->shadow_corner_top_active
 				|| !theme->shadow_corner_bottom_active
 				|| !theme->shadow_edge_active) {
@@ -1241,11 +1421,11 @@ create_shadows(struct theme *theme)
 	}
 	if (visible_inactive_size > 0) {
 		theme->shadow_edge_inactive = buffer_create_cairo(
-			visible_inactive_size, 1, 1.0, true);
+			visible_inactive_size, 1, 1.0);
 		theme->shadow_corner_top_inactive = buffer_create_cairo(
-			total_inactive_size, total_inactive_size, 1.0, true);
+			total_inactive_size, total_inactive_size, 1.0);
 		theme->shadow_corner_bottom_inactive = buffer_create_cairo(
-			total_inactive_size, total_inactive_size, 1.0, true);
+			total_inactive_size, total_inactive_size, 1.0);
 		if (!theme->shadow_corner_top_inactive
 				|| !theme->shadow_corner_bottom_inactive
 				|| !theme->shadow_edge_inactive) {
@@ -1280,13 +1460,25 @@ fill_colors_with_osd_theme(struct theme *theme, float colors[3][4])
 	memcpy(colors[2], theme->osd_bg_color, sizeof(colors[2]));
 }
 
+static int
+get_titlebar_height(struct theme *theme)
+{
+	int h = MAX(font_height(&rc.font_activewindow),
+		font_height(&rc.font_inactivewindow));
+	if (h < theme->window_button_height) {
+		h = theme->window_button_height;
+	}
+	h += 2 * theme->window_titlebar_padding_height;
+	return h;
+}
+
 static void
 post_processing(struct theme *theme)
 {
-	int h = MAX(font_height(&rc.font_activewindow), font_height(&rc.font_inactivewindow));
-	if (theme->title_height < h) {
-		theme->title_height = h + 2 * theme->padding_height;
-	}
+	theme->title_height = get_titlebar_height(theme);
+
+	theme->menu_item_height = font_height(&rc.font_menuitem)
+		+ 2 * theme->menu_item_padding_y;
 
 	theme->osd_window_switcher_item_height = font_height(&rc.font_osd)
 		+ 2 * theme->osd_window_switcher_item_padding_y
@@ -1296,6 +1488,12 @@ post_processing(struct theme *theme)
 		rc.corner_radius = theme->title_height - 1;
 	}
 
+	int min_button_hover_radius =
+		MIN(theme->window_button_width, theme->window_button_height) / 2;
+	if (theme->window_button_hover_bg_corner_radius > min_button_hover_radius) {
+		theme->window_button_hover_bg_corner_radius = min_button_hover_radius;
+	}
+
 	if (theme->menu_max_width < theme->menu_min_width) {
 		wlr_log(WLR_ERROR,
 			"Adjusting menu.width.max: .max (%d) lower than .min (%d)",
@@ -1397,10 +1595,22 @@ theme_init(struct theme *theme, struct server *server, const char *theme_name)
 void
 theme_finish(struct theme *theme)
 {
+	for (enum ssd_part_type type = LAB_SSD_BUTTON_FIRST;
+			type <= LAB_SSD_BUTTON_LAST; type++) {
+		for (uint8_t state_set = 0; state_set <= LAB_BS_ALL;
+				state_set++) {
+			zdrop(&theme->window[THEME_INACTIVE]
+				.buttons[type][state_set]);
+			zdrop(&theme->window[THEME_ACTIVE]
+				.buttons[type][state_set]);
+		}
+	}
+
 	zdrop(&theme->corner_top_left_active_normal);
 	zdrop(&theme->corner_top_left_inactive_normal);
 	zdrop(&theme->corner_top_right_active_normal);
 	zdrop(&theme->corner_top_right_inactive_normal);
+
 	zdrop(&theme->shadow_corner_top_active);
 	zdrop(&theme->shadow_corner_bottom_active);
 	zdrop(&theme->shadow_edge_active);
diff --git a/src/view.c b/src/view.c
index f83c9a66..bcb86ea0 100644
--- a/src/view.c
+++ b/src/view.c
@@ -4,6 +4,7 @@
 #include <strings.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_security_context_v1.h>
+#include "common/box.h"
 #include "common/macros.h"
 #include "common/match.h"
 #include "common/mem.h"
@@ -12,6 +13,7 @@
 #include "labwc.h"
 #include "menu/menu.h"
 #include "osd.h"
+#include "output-state.h"
 #include "placement.h"
 #include "regions.h"
 #include "resize-indicator.h"
@@ -27,9 +29,6 @@
 #include <wlr/xwayland.h>
 #endif
 
-#define LAB_FALLBACK_WIDTH  640
-#define LAB_FALLBACK_HEIGHT 480
-
 struct view *
 view_from_wlr_surface(struct wlr_surface *surface)
 {
@@ -138,7 +137,7 @@ matches_criteria(struct view *view, enum lab_view_criteria criteria)
 		 * special in that they live in a different tree.
 		 */
 		struct server *server = view->server;
-		if (view->scene_tree->node.parent != server->workspace_current->tree
+		if (view->scene_tree->node.parent != server->workspaces.current->tree
 				&& !view_is_always_on_top(view)) {
 			return false;
 		}
@@ -347,7 +346,6 @@ static bool
 view_discover_output(struct view *view, struct wlr_box *geometry)
 {
 	assert(view);
-	assert(!view->fullscreen);
 
 	if (!geometry) {
 		geometry = &view->current;
@@ -360,6 +358,10 @@ view_discover_output(struct view *view, struct wlr_box *geometry)
 
 	if (output && output != view->output) {
 		view->output = output;
+		/* Show fullscreen views above top-layer */
+		if (view->fullscreen) {
+			desktop_update_top_layer_visiblity(view->server);
+		}
 		return true;
 	}
 
@@ -407,12 +409,15 @@ void
 view_set_output(struct view *view, struct output *output)
 {
 	assert(view);
-	assert(!view->fullscreen);
 	if (!output_is_usable(output)) {
 		wlr_log(WLR_ERROR, "invalid output set for view");
 		return;
 	}
 	view->output = output;
+	/* Show fullscreen views above top-layer */
+	if (view->fullscreen) {
+		desktop_update_top_layer_visiblity(view->server);
+	}
 }
 
 void
@@ -609,6 +614,7 @@ view_adjust_size(struct view *view, int *w, int *h)
 {
 	assert(view);
 	struct view_size_hints hints = view_get_size_hints(view);
+	int min_width = view_get_min_width();
 
 	/*
 	 * "If a base size is not provided, the minimum size is to be
@@ -631,7 +637,7 @@ view_adjust_size(struct view *view, int *w, int *h)
 	 * This is currently always the case for xdg-shell views.
 	 */
 	if (hints.min_width < 1) {
-		hints.min_width = LAB_MIN_VIEW_WIDTH;
+		hints.min_width = min_width;
 	}
 	if (hints.min_height < 1) {
 		hints.min_height = LAB_MIN_VIEW_HEIGHT;
@@ -815,11 +821,11 @@ adjust_floating_geometry(struct view *view, struct wlr_box *geometry,
 		&geometry->x, &geometry->y);
 }
 
-static void
-set_fallback_geometry(struct view *view)
+void
+view_set_fallback_natural_geometry(struct view *view)
 {
-	view->natural_geometry.width = LAB_FALLBACK_WIDTH;
-	view->natural_geometry.height = LAB_FALLBACK_HEIGHT;
+	view->natural_geometry.width = VIEW_FALLBACK_WIDTH;
+	view->natural_geometry.height = VIEW_FALLBACK_HEIGHT;
 	view_compute_centered_position(view, NULL,
 		view->natural_geometry.width,
 		view->natural_geometry.height,
@@ -827,9 +833,6 @@ set_fallback_geometry(struct view *view)
 		&view->natural_geometry.y);
 }
 
-#undef LAB_FALLBACK_WIDTH
-#undef LAB_FALLBACK_HEIGHT
-
 void
 view_store_natural_geometry(struct view *view)
 {
@@ -839,16 +842,14 @@ view_store_natural_geometry(struct view *view)
 		return;
 	}
 
-	/**
-	 * If an application was started maximized or fullscreened, its
-	 * natural_geometry width/height may still be zero in which case we set
-	 * some fallback values. This is the case with foot and Qt applications.
+	/*
+	 * Note that for xdg-shell views that start fullscreen or maximized,
+	 * we end up storing a natural geometry of 0x0. This is intentional.
+	 * When leaving fullscreen or unmaximizing, we pass 0x0 to the
+	 * xdg-toplevel configure event, which means the application should
+	 * choose its own size.
 	 */
-	if (wlr_box_empty(&view->pending)) {
-		set_fallback_geometry(view);
-	} else {
-		view->natural_geometry = view->pending;
-	}
+	view->natural_geometry = view->pending;
 }
 
 int
@@ -874,6 +875,94 @@ view_center(struct view *view, const struct wlr_box *ref)
 	}
 }
 
+/*
+ * Algorithm based on KWin's implementation:
+ * https://github.com/KDE/kwin/blob/df9f8f8346b5b7645578e37365dabb1a7b02ca5a/src/placement.cpp#L589
+ */
+static void
+view_cascade(struct view *view)
+{
+	/* "cascade" policy places a new view at center by default */
+	struct wlr_box center = view->pending;
+	view_compute_centered_position(view, NULL,
+		center.width, center.height, &center.x, &center.y);
+	struct border margin = ssd_get_margin(view->ssd);
+	center.x -= margin.left;
+	center.y -= margin.top;
+	center.width += margin.left + margin.right;
+	center.height += margin.top + margin.bottom;
+
+	/* Candidate geometry to which the view is moved */
+	struct wlr_box candidate = center;
+
+	struct wlr_box usable = output_usable_area_in_layout_coords(view->output);
+
+	/* TODO: move this logic to rcxml.c */
+	int offset_x = rc.placement_cascade_offset_x;
+	int offset_y = rc.placement_cascade_offset_y;
+	struct theme *theme = view->server->theme;
+	int default_offset = theme->title_height + theme->border_width + 5;
+	if (offset_x <= 0) {
+		offset_x = default_offset;
+	}
+	if (offset_y <= 0) {
+		offset_y = default_offset;
+	}
+
+	/*
+	 * Keep updating the candidate until it doesn't cover any existing views
+	 * or doesn't fit within the usable area.
+	 */
+	bool candidate_updated = true;
+	while (candidate_updated) {
+		candidate_updated = false;
+		struct wlr_box covered = {0};
+
+		/* Iterate over views from top to bottom */
+		struct view *other_view;
+		for_each_view(other_view, &view->server->views,
+				LAB_VIEW_CRITERIA_CURRENT_WORKSPACE) {
+			struct wlr_box other = ssd_max_extents(other_view);
+			if (other_view == view
+					|| view->minimized
+					|| !box_intersects(&candidate, &other)) {
+				continue;
+			}
+			/*
+			 * If the candidate covers an existing view whose
+			 * top-left corner is not covered by other views,
+			 * shift the candidate to bottom-right.
+			 */
+			if (box_contains(&candidate, &other)
+					&& !wlr_box_contains_point(
+						&covered, other.x, other.y)) {
+				candidate.x = other.x + offset_x;
+				candidate.y = other.y + offset_y;
+				if (!box_contains(&usable, &candidate)) {
+					/*
+					 * If the candidate doesn't fit within
+					 * the usable area, fall back to center
+					 * and finish updating the candidate.
+					 */
+					candidate = center;
+					break;
+				} else {
+					/* Repeat with the new candidate */
+					candidate_updated = true;
+					break;
+				}
+			}
+			/*
+			 * We use just a bounding box to represent the covered
+			 * area, which would be fine for our use-case.
+			 */
+			box_union(&covered, &covered, &other);
+		}
+	}
+
+	view_move(view, candidate.x + margin.left, candidate.y + margin.top);
+}
+
 void
 view_place_by_policy(struct view *view, bool allow_cursor,
 		enum view_placement_policy policy)
@@ -887,6 +976,9 @@ view_place_by_policy(struct view *view, bool allow_cursor,
 			view_move(view, geometry.x, geometry.y);
 			return;
 		}
+	} else if (policy == LAB_PLACE_CASCADE) {
+		view_cascade(view);
+		return;
 	}
 
 	view_center(view, NULL);
@@ -938,15 +1030,18 @@ view_constrain_size_to_that_of_usable_area(struct view *view)
 	view_move_resize(view, box);
 }
 
-static void
+void
 view_apply_natural_geometry(struct view *view)
 {
 	assert(view);
 	assert(view_is_floating(view));
 
 	struct wlr_box geometry = view->natural_geometry;
-	adjust_floating_geometry(view, &geometry,
-		/* midpoint_visibility */ false);
+	/* Only adjust natural geometry if known (not 0x0) */
+	if (!wlr_box_empty(&geometry)) {
+		adjust_floating_geometry(view, &geometry,
+			/* midpoint_visibility */ false);
+	}
 	view_move_resize(view, geometry);
 }
 
@@ -1073,14 +1168,11 @@ view_apply_maximized_geometry(struct view *view)
 	 * center the unmaximized axis.
 	 */
 	struct wlr_box natural = view->natural_geometry;
-	if (view->maximized != VIEW_AXIS_BOTH) {
-		struct wlr_box intersect;
-		wlr_box_intersection(&intersect, &box, &natural);
-		if (wlr_box_empty(&intersect)) {
-			view_compute_centered_position(view, NULL,
-				natural.width, natural.height,
-				&natural.x, &natural.y);
-		}
+	if (view->maximized != VIEW_AXIS_BOTH
+			&& !box_intersects(&box, &natural)) {
+		view_compute_centered_position(view, NULL,
+			natural.width, natural.height,
+			&natural.x, &natural.y);
 	}
 
 	if (view->ssd_enabled) {
@@ -1171,6 +1263,23 @@ view_is_tiled(struct view *view)
 		|| view->tiled_region_evacuate);
 }
 
+bool
+view_is_tiled_and_notify_tiled(struct view *view)
+{
+	switch (rc.snap_tiling_events_mode) {
+	case LAB_TILING_EVENTS_NEVER:
+		return false;
+	case LAB_TILING_EVENTS_REGION:
+		return view->tiled_region || view->tiled_region_evacuate;
+	case LAB_TILING_EVENTS_EDGE:
+		return view->tiled;
+	case LAB_TILING_EVENTS_ALWAYS:
+		return view_is_tiled(view);
+	}
+
+	return false;
+}
+
 bool
 view_is_floating(struct view *view)
 {
@@ -1227,6 +1336,18 @@ view_maximize(struct view *view, enum view_axis axis,
 			view_invalidate_last_layout_geometry(view);
 		}
 	}
+
+	/*
+	 * When natural geometry is unknown (0x0) for an xdg-shell view,
+	 * we normally send a configure event of 0x0 to get the client's
+	 * preferred size, but this doesn't work if unmaximizing only
+	 * one axis. So in that corner case, set a fallback geometry.
+	 */
+	if ((axis == VIEW_AXIS_HORIZONTAL || axis == VIEW_AXIS_VERTICAL)
+			&& wlr_box_empty(&view->natural_geometry)) {
+		view_set_fallback_natural_geometry(view);
+	}
+
 	set_maximized(view, axis);
 	if (view_is_floating(view)) {
 		view_apply_natural_geometry(view);
@@ -1330,7 +1451,7 @@ view_toggle_always_on_top(struct view *view)
 {
 	assert(view);
 	if (view_is_always_on_top(view)) {
-		view->workspace = view->server->workspace_current;
+		view->workspace = view->server->workspaces.current;
 		wlr_scene_node_reparent(&view->scene_tree->node,
 			view->workspace->tree);
 	} else {
@@ -1352,7 +1473,7 @@ view_toggle_always_on_bottom(struct view *view)
 {
 	assert(view);
 	if (view_is_always_on_bottom(view)) {
-		view->workspace = view->server->workspace_current;
+		view->workspace = view->server->workspaces.current;
 		wlr_scene_node_reparent(&view->scene_tree->node,
 			view->workspace->tree);
 	} else {
@@ -1366,6 +1487,7 @@ view_toggle_visible_on_all_workspaces(struct view *view)
 {
 	assert(view);
 	view->visible_on_all_workspaces = !view->visible_on_all_workspaces;
+	ssd_update_geometry(view->ssd);
 }
 
 void
@@ -1580,23 +1702,14 @@ view_adjust_for_layout_change(struct view *view)
 {
 	assert(view);
 
-	bool was_fullscreen = view->fullscreen;
 	bool is_floating = view_is_floating(view);
+	bool use_natural = false;
 
 	if (!output_is_usable(view->output)) {
 		/* A view losing an output should have a last-layout geometry */
 		update_last_layout_geometry(view);
-
-		/* Exit fullscreen and re-assess floating status */
-		if (was_fullscreen) {
-			set_fullscreen(view, false);
-			is_floating = view_is_floating(view);
-		}
 	}
 
-	/* Restore any full-screen window to natural geometry */
-	bool use_natural = was_fullscreen;
-
 	/* Capture a pointer to the last-layout geometry (only if valid) */
 	struct wlr_box *last_geometry = NULL;
 	if (last_layout_geometry_is_valid(view)) {
@@ -1636,8 +1749,8 @@ view_adjust_for_layout_change(struct view *view)
 		view_apply_special_geometry(view);
 	} else if (use_natural) {
 		/*
-		 * Move the window to its natural location, either because it
-		 * was fullscreen or we are trying to restore a prior layout.
+		 * Move the window to its natural location, because
+		 * we are trying to restore a prior layout.
 		 */
 		view_apply_natural_geometry(view);
 	} else {
@@ -1667,99 +1780,9 @@ void
 view_on_output_destroy(struct view *view)
 {
 	assert(view);
-	/*
-	 * This is the only time we modify view->output for a fullscreen
-	 * view. We expect view_adjust_for_layout_change() to be called
-	 * shortly afterward, which will exit fullscreen.
-	 */
 	view->output = NULL;
 }
 
-static enum wlr_direction
-opposite_direction(enum wlr_direction direction)
-{
-	switch (direction) {
-	case WLR_DIRECTION_RIGHT:
-		return WLR_DIRECTION_LEFT;
-	case WLR_DIRECTION_LEFT:
-		return WLR_DIRECTION_RIGHT;
-	case WLR_DIRECTION_DOWN:
-		return WLR_DIRECTION_UP;
-	case WLR_DIRECTION_UP:
-		return WLR_DIRECTION_DOWN;
-	default:
-		return 0;
-	}
-}
-
-static enum wlr_direction
-get_wlr_direction(enum view_edge edge)
-{
-	switch (edge) {
-	case VIEW_EDGE_LEFT:
-		return WLR_DIRECTION_LEFT;
-	case VIEW_EDGE_RIGHT:
-		return WLR_DIRECTION_RIGHT;
-	case VIEW_EDGE_UP:
-		return WLR_DIRECTION_UP;
-	case VIEW_EDGE_DOWN:
-		return WLR_DIRECTION_DOWN;
-	case VIEW_EDGE_CENTER:
-	case VIEW_EDGE_INVALID:
-	default:
-		return 0;
-	}
-}
-
-struct output *
-view_get_adjacent_output(struct view *view, enum view_edge edge, bool wrap)
-{
-	assert(view);
-	struct output *output = view->output;
-	if (!output_is_usable(output)) {
-		wlr_log(WLR_ERROR,
-			"view has no output, cannot find adjacent output");
-		return NULL;
-	}
-
-	struct wlr_box box = output_usable_area_in_layout_coords(output);
-	int lx = box.x + box.width / 2;
-	int ly = box.y + box.height / 2;
-
-	/* Determine any adjacent output in the appropriate direction */
-	struct wlr_output *new_output = NULL;
-	struct wlr_output *current_output = output->wlr_output;
-	struct wlr_output_layout *layout = view->server->output_layout;
-	enum wlr_direction direction = get_wlr_direction(edge);
-	new_output = wlr_output_layout_adjacent_output(layout, direction,
-		current_output, lx, ly);
-
-	/*
-	 * Optionally wrap around from top-to-bottom or left-to-right, and vice
-	 * versa.
-	 */
-	if (wrap && !new_output) {
-		new_output = wlr_output_layout_farthest_output(layout,
-			opposite_direction(direction), current_output, lx, ly);
-	}
-
-	/*
-	 * When "adjacent" output is the same as the original, there is no
-	 * adjacent
-	 */
-	if (!new_output || new_output == current_output) {
-		return NULL;
-	}
-
-	output = output_from_wlr_output(view->server, new_output);
-	if (!output_is_usable(output)) {
-		wlr_log(WLR_ERROR, "invalid output in layout");
-		return NULL;
-	}
-
-	return output;
-}
-
 static int
 shift_view_to_usable_1d(int size,
 		int cur_pos, int cur_lo, int cur_extent,
@@ -1821,7 +1844,7 @@ view_move_to_edge(struct view *view, enum view_edge direction, bool snap_to_wind
 
 	/* Otherwise, move to edge of next adjacent display, if possible */
 	struct output *output =
-		view_get_adjacent_output(view, direction, /* wrap */ false);
+		output_get_adjacent(view->output, direction, /* wrap */ false);
 	if (!output) {
 		return;
 	}
@@ -1973,6 +1996,8 @@ view_placement_parse(const char *policy)
 		return LAB_PLACE_CURSOR;
 	} else if (!strcasecmp(policy, "center")) {
 		return LAB_PLACE_CENTER;
+	} else if (!strcasecmp(policy, "cascade")) {
+		return LAB_PLACE_CASCADE;
 	}
 
 	return LAB_PLACE_INVALID;
@@ -1998,7 +2023,7 @@ view_snap_to_edge(struct view *view, enum view_edge edge,
 
 	if (across_outputs && view->tiled == edge && view->maximized == VIEW_AXIS_NONE) {
 		/* We are already tiled for this edge; try to switch outputs */
-		output = view_get_adjacent_output(view, edge, /* wrap */ false);
+		output = output_get_adjacent(view->output, edge, /* wrap */ false);
 
 		if (!output) {
 			/*
@@ -2071,9 +2096,6 @@ void
 view_move_to_output(struct view *view, struct output *output)
 {
 	assert(view);
-	if (view->fullscreen) {
-		return;
-	}
 
 	view_invalidate_last_layout_geometry(view);
 	view_set_output(view, output);
@@ -2083,6 +2105,8 @@ view_move_to_output(struct view *view, struct output *output)
 		view->pending.y = output_area.y;
 		view_place_by_policy(view,
 				/* allow_cursor */ false, rc.placement_policy);
+	} else if (view->fullscreen) {
+		view_apply_fullscreen_geometry(view);
 	} else if (view->maximized != VIEW_AXIS_NONE) {
 		view_apply_maximized_geometry(view);
 	} else if (view->tiled) {
@@ -2236,6 +2260,10 @@ view_update_app_id(struct view *view)
 	}
 	wlr_foreign_toplevel_handle_v1_set_app_id(
 		view->toplevel.handle, app_id);
+
+	if (view->ssd_enabled) {
+		ssd_update_window_icon(view->ssd);
+	}
 }
 
 void
@@ -2248,6 +2276,17 @@ view_reload_ssd(struct view *view)
 	}
 }
 
+int
+view_get_min_width(void)
+{
+	int button_count_left = wl_list_length(&rc.title_buttons_left);
+	int button_count_right =  wl_list_length(&rc.title_buttons_right);
+	return (rc.theme->window_button_width * (button_count_left + button_count_right)) +
+		(rc.theme->window_button_spacing * MAX((button_count_right - 1), 0)) +
+		(rc.theme->window_button_spacing * MAX((button_count_left - 1), 0)) +
+		(2 * rc.theme->window_titlebar_padding_width);
+}
+
 void
 view_toggle_keybinds(struct view *view)
 {
@@ -2377,6 +2416,10 @@ view_destroy(struct view *view)
 		server->active_view = NULL;
 	}
 
+	if (server->session_lock_manager->last_active_view == view) {
+		server->session_lock_manager->last_active_view = NULL;
+	}
+
 	if (server->last_raised_view == view) {
 		server->last_raised_view = NULL;
 	}
diff --git a/src/window-rules.c b/src/window-rules.c
index f543f7ec..ce2131f6 100644
--- a/src/window-rules.c
+++ b/src/window-rules.c
@@ -52,7 +52,7 @@ window_rules_apply(struct view *view, enum window_rule_event event)
 			continue;
 		}
 		if (view_matches_criteria(rule, view)) {
-			actions_run(view, view->server, &rule->actions, 0);
+			actions_run(view, view->server, &rule->actions, NULL);
 		}
 	}
 }
diff --git a/src/workspaces.c b/src/workspaces.c
index 0fcef01a..96e19635 100644
--- a/src/workspaces.c
+++ b/src/workspaces.c
@@ -15,10 +15,13 @@
 #include "common/mem.h"
 #include "input/keyboard.h"
 #include "labwc.h"
+#include "protocols/cosmic-workspaces.h"
 #include "view.h"
 #include "workspaces.h"
 #include "xwayland.h"
 
+#define COSMIC_WORKSPACES_VERSION 1
+
 /* Internal helpers */
 static size_t
 parse_workspace_index(const char *name)
@@ -66,7 +69,7 @@ _osd_update(struct server *server)
 		theme->osd_workspace_switcher_boxes_height == 0;
 
 	/* Dimensions */
-	size_t workspace_count = wl_list_length(&server->workspaces);
+	size_t workspace_count = wl_list_length(&server->workspaces.all);
 	uint16_t marker_width = workspace_count * (rect_width + padding) - padding;
 	uint16_t width = margin * 2 + (marker_width < 200 ? 200 : marker_width);
 	uint16_t height = margin * (hide_boxes ? 2 : 3) + rect_height + font_height(&rc.font_osd);
@@ -81,7 +84,7 @@ _osd_update(struct server *server)
 			continue;
 		}
 		struct lab_data_buffer *buffer = buffer_create_cairo(width, height,
-			output->wlr_output->scale, true);
+			output->wlr_output->scale);
 		if (!buffer) {
 			wlr_log(WLR_ERROR, "Failed to allocate buffer for workspace OSD");
 			continue;
@@ -106,8 +109,8 @@ _osd_update(struct server *server)
 		uint16_t x;
 		if (!hide_boxes) {
 			x = (width - marker_width) / 2;
-			wl_list_for_each(workspace, &server->workspaces, link) {
-				bool active =  workspace == server->workspace_current;
+			wl_list_for_each(workspace, &server->workspaces.all, link) {
+				bool active =  workspace == server->workspaces.current;
 				set_cairo_color(cairo, server->theme->osd_label_text_color);
 				cairo_rectangle(cairo, x, margin,
 					rect_width - padding, rect_height);
@@ -124,10 +127,11 @@ _osd_update(struct server *server)
 		/* Text */
 		set_cairo_color(cairo, server->theme->osd_label_text_color);
 		PangoLayout *layout = pango_cairo_create_layout(cairo);
+		pango_context_set_round_glyph_positions(pango_layout_get_context(layout), false);
 		pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END);
 
 		/* Center workspace indicator on the x axis */
-		int req_width = font_width(&rc.font_osd, server->workspace_current->name);
+		int req_width = font_width(&rc.font_osd, server->workspaces.current->name);
 		req_width = MIN(req_width, width - 2 * margin);
 		x = (width - req_width) / 2;
 		if (!hide_boxes) {
@@ -140,7 +144,7 @@ _osd_update(struct server *server)
 		pango_layout_set_font_description(layout, desc);
 		pango_layout_set_width(layout, req_width * PANGO_SCALE);
 		pango_font_description_free(desc);
-		pango_layout_set_text(layout, server->workspace_current->name, -1);
+		pango_layout_set_text(layout, server->workspaces.current->name, -1);
 		pango_cairo_show_layout(cairo, layout);
 
 		g_object_unref(layout);
@@ -164,13 +168,22 @@ _osd_update(struct server *server)
 		wlr_scene_node_set_position(&output->workspace_osd->node, lx, ly);
 		wlr_scene_buffer_set_buffer(output->workspace_osd, &buffer->base);
 		wlr_scene_buffer_set_dest_size(output->workspace_osd,
-			buffer->unscaled_width, buffer->unscaled_height);
+			buffer->logical_width, buffer->logical_height);
 
 		/* And finally drop the buffer so it will get destroyed on OSD hide */
 		wlr_buffer_drop(&buffer->base);
 	}
 }
 
+/* cosmic workspace handlers */
+static void
+handle_workspace_activate(struct wl_listener *listener, void *data)
+{
+	struct workspace *workspace = wl_container_of(listener, workspace, on.activate);
+	workspaces_switch_to(workspace, /* update_focus */ true);
+	wlr_log(WLR_INFO, "activating workspace %s", workspace->name);
+}
+
 /* Internal API */
 static void
 add_workspace(struct server *server, const char *name)
@@ -179,12 +192,21 @@ add_workspace(struct server *server, const char *name)
 	workspace->server = server;
 	workspace->name = xstrdup(name);
 	workspace->tree = wlr_scene_tree_create(server->view_tree);
-	wl_list_append(&server->workspaces, &workspace->link);
-	if (!server->workspace_current) {
-		server->workspace_current = workspace;
+	wl_list_append(&server->workspaces.all, &workspace->link);
+	if (!server->workspaces.current) {
+		server->workspaces.current = workspace;
 	} else {
 		wlr_scene_node_set_enabled(&workspace->tree->node, false);
 	}
+
+	bool active = server->workspaces.current == workspace;
+	workspace->cosmic_workspace = lab_cosmic_workspace_create(server->workspaces.cosmic_group);
+	lab_cosmic_workspace_set_name(workspace->cosmic_workspace, name);
+	lab_cosmic_workspace_set_active(workspace->cosmic_workspace, active);
+	lab_cosmic_workspace_set_hidden(workspace->cosmic_workspace, !active);
+
+	workspace->on.activate.notify = handle_workspace_activate;
+	wl_signal_add(&workspace->cosmic_workspace->events.activate, &workspace->on.activate);
 }
 
 static struct workspace *
@@ -259,7 +281,14 @@ _osd_show(struct server *server)
 void
 workspaces_init(struct server *server)
 {
-	wl_list_init(&server->workspaces);
+	server->workspaces.cosmic_manager = lab_cosmic_workspace_manager_create(
+		server->wl_display, /* capabilities */ CW_CAP_WS_ACTIVATE,
+		COSMIC_WORKSPACES_VERSION);
+
+	server->workspaces.cosmic_group = lab_cosmic_workspace_group_create(
+		server->workspaces.cosmic_manager);
+
+	wl_list_init(&server->workspaces.all);
 
 	struct workspace *conf;
 	wl_list_for_each(conf, &rc.workspace_config.workspaces, link) {
@@ -277,13 +306,18 @@ workspaces_switch_to(struct workspace *target, bool update_focus)
 {
 	assert(target);
 	struct server *server = target->server;
-	if (target == server->workspace_current) {
+	if (target == server->workspaces.current) {
 		return;
 	}
 
 	/* Disable the old workspace */
 	wlr_scene_node_set_enabled(
-		&server->workspace_current->tree->node, false);
+		&server->workspaces.current->tree->node, false);
+
+	lab_cosmic_workspace_set_active(
+		server->workspaces.current->cosmic_workspace, false);
+	lab_cosmic_workspace_set_hidden(
+		server->workspaces.current->cosmic_workspace, true);
 
 	/* Move Omnipresent views to new workspace */
 	struct view *view;
@@ -299,10 +333,10 @@ workspaces_switch_to(struct workspace *target, bool update_focus)
 	wlr_scene_node_set_enabled(&target->tree->node, true);
 
 	/* Save the last visited workspace */
-	server->workspace_last = server->workspace_current;
+	server->workspaces.last = server->workspaces.current;
 
 	/* Make sure new views will spawn on the new workspace */
-	server->workspace_current = target;
+	server->workspaces.current = target;
 
 	/*
 	 * Make sure we are focusing what the user sees.
@@ -330,6 +364,9 @@ workspaces_switch_to(struct workspace *target, bool update_focus)
 
 	/* Ensure that only currently visible fullscreen windows hide the top layer */
 	desktop_update_top_layer_visiblity(server);
+
+	lab_cosmic_workspace_set_active(target->cosmic_workspace, true);
+	lab_cosmic_workspace_set_hidden(target->cosmic_workspace, false);
 }
 
 void
@@ -361,7 +398,7 @@ workspaces_find(struct workspace *anchor, const char *name, bool wrap)
 	size_t index = 0;
 	struct workspace *target;
 	size_t wants_index = parse_workspace_index(name);
-	struct wl_list *workspaces = &anchor->server->workspaces;
+	struct wl_list *workspaces = &anchor->server->workspaces.all;
 
 	if (wants_index) {
 		wl_list_for_each(target, workspaces, link) {
@@ -372,7 +409,7 @@ workspaces_find(struct workspace *anchor, const char *name, bool wrap)
 	} else if (!strcasecmp(name, "current")) {
 		return anchor;
 	} else if (!strcasecmp(name, "last")) {
-		return anchor->server->workspace_last;
+		return anchor->server->workspaces.last;
 	} else if (!strcasecmp(name, "left")) {
 		return get_prev(anchor, workspaces, wrap);
 	} else if (!strcasecmp(name, "right")) {
@@ -394,6 +431,8 @@ destroy_workspace(struct workspace *workspace)
 	wlr_scene_node_destroy(&workspace->tree->node);
 	zfree(workspace->name);
 	wl_list_remove(&workspace->link);
+
+	lab_cosmic_workspace_destroy(workspace->cosmic_workspace);
 	free(workspace);
 }
 
@@ -407,7 +446,7 @@ workspaces_reconfigure(struct server *server)
 	 *   - Destroy workspaces if fewer workspace are desired
 	 */
 
-	struct wl_list *actual_workspace_link = server->workspaces.next;
+	struct wl_list *actual_workspace_link = server->workspaces.all.next;
 
 	struct workspace *configured_workspace;
 	wl_list_for_each(configured_workspace,
@@ -415,7 +454,7 @@ workspaces_reconfigure(struct server *server)
 		struct workspace *actual_workspace = wl_container_of(
 			actual_workspace_link, actual_workspace, link);
 
-		if (actual_workspace_link == &server->workspaces) {
+		if (actual_workspace_link == &server->workspaces.all) {
 			/* # of configured workspaces increased */
 			wlr_log(WLR_DEBUG, "Adding workspace \"%s\"",
 				configured_workspace->name);
@@ -428,20 +467,22 @@ workspaces_reconfigure(struct server *server)
 				actual_workspace->name, configured_workspace->name);
 			free(actual_workspace->name);
 			actual_workspace->name = xstrdup(configured_workspace->name);
+			lab_cosmic_workspace_set_name(
+				actual_workspace->cosmic_workspace, actual_workspace->name);
 		}
 		actual_workspace_link = actual_workspace_link->next;
 	}
 
-	if (actual_workspace_link == &server->workspaces) {
+	if (actual_workspace_link == &server->workspaces.all) {
 		return;
 	}
 
 	/* # of configured workspaces decreased */
 	overlay_hide(&server->seat);
 	struct workspace *first_workspace =
-		wl_container_of(server->workspaces.next, first_workspace, link);
+		wl_container_of(server->workspaces.all.next, first_workspace, link);
 
-	while (actual_workspace_link != &server->workspaces) {
+	while (actual_workspace_link != &server->workspaces.all) {
 		struct workspace *actual_workspace = wl_container_of(
 			actual_workspace_link, actual_workspace, link);
 
@@ -455,12 +496,12 @@ workspaces_reconfigure(struct server *server)
 			}
 		}
 
-		if (server->workspace_current == actual_workspace) {
+		if (server->workspaces.current == actual_workspace) {
 			workspaces_switch_to(first_workspace,
 				/* update_focus */ true);
 		}
-		if (server->workspace_last == actual_workspace) {
-			server->workspace_last = first_workspace;
+		if (server->workspaces.last == actual_workspace) {
+			server->workspaces.last = first_workspace;
 		}
 
 		actual_workspace_link = actual_workspace_link->next;
@@ -472,8 +513,8 @@ void
 workspaces_destroy(struct server *server)
 {
 	struct workspace *workspace, *tmp;
-	wl_list_for_each_safe(workspace, tmp, &server->workspaces, link) {
+	wl_list_for_each_safe(workspace, tmp, &server->workspaces.all, link) {
 		destroy_workspace(workspace);
 	}
-	assert(wl_list_empty(&server->workspaces));
+	assert(wl_list_empty(&server->workspaces.all));
 }
diff --git a/src/xdg-popup.c b/src/xdg-popup.c
index 0d1ed909..468a303c 100644
--- a/src/xdg-popup.c
+++ b/src/xdg-popup.c
@@ -7,6 +7,7 @@
  *	- keeping non-layer-shell xdg-popups outside the layers.c code
  */
 
+#include "common/macros.h"
 #include "common/mem.h"
 #include "labwc.h"
 #include "node.h"
@@ -19,6 +20,7 @@ struct xdg_popup {
 	struct wl_listener commit;
 	struct wl_listener destroy;
 	struct wl_listener new_popup;
+	struct wl_listener reposition;
 };
 
 static void
@@ -26,15 +28,41 @@ popup_unconstrain(struct xdg_popup *popup)
 {
 	struct view *view = popup->parent_view;
 	struct server *server = view->server;
-	struct wlr_box *popup_box = &popup->wlr_popup->current.geometry;
+
+	/* Get position of parent toplevel/popup */
+	int parent_lx, parent_ly;
+	struct wlr_scene_tree *parent_tree = popup->wlr_popup->parent->data;
+	wlr_scene_node_coords(&parent_tree->node, &parent_lx, &parent_ly);
+
+	/*
+	 * Get usable area to constrain by
+	 *
+	 * The scheduled top-left corner (x, y) of the popup is sometimes less
+	 * than zero, typically with Qt apps. We therefore clamp it to avoid for
+	 * example the 'File' menu of a maximized window to end up on an another
+	 * output.
+	 */
+	struct wlr_box *popup_box = &popup->wlr_popup->scheduled.geometry;
 	struct output *output = output_nearest_to(server,
-		view->current.x + popup_box->x,
-		view->current.y + popup_box->y);
+		parent_lx + MAX(popup_box->x, 0),
+		parent_ly + MAX(popup_box->y, 0));
 	struct wlr_box usable = output_usable_area_in_layout_coords(output);
 
+	/* Get offset of toplevel window from its surface */
+	int toplevel_dx = 0;
+	int toplevel_dy = 0;
+	struct wlr_xdg_surface *toplevel_surface = xdg_surface_from_view(view);
+	if (toplevel_surface) {
+		toplevel_dx = toplevel_surface->current.geometry.x;
+		toplevel_dy = toplevel_surface->current.geometry.y;
+	} else {
+		wlr_log(WLR_ERROR, "toplevel is not valid XDG surface");
+	}
+
+	/* Geometry of usable area relative to toplevel surface */
 	struct wlr_box output_toplevel_box = {
-		.x = usable.x - view->current.x,
-		.y = usable.y - view->current.y,
+		.x = usable.x - (view->current.x - toplevel_dx),
+		.y = usable.y - (view->current.y - toplevel_dy),
 		.width = usable.width,
 		.height = usable.height,
 	};
@@ -47,6 +75,7 @@ handle_xdg_popup_destroy(struct wl_listener *listener, void *data)
 	struct xdg_popup *popup = wl_container_of(listener, popup, destroy);
 	wl_list_remove(&popup->destroy.link);
 	wl_list_remove(&popup->new_popup.link);
+	wl_list_remove(&popup->reposition.link);
 
 	/* Usually already removed unless there was no commit at all */
 	if (popup->commit.notify) {
@@ -69,6 +98,13 @@ handle_xdg_popup_commit(struct wl_listener *listener, void *data)
 	}
 }
 
+static void
+handle_xdg_popup_reposition(struct wl_listener *listener, void *data)
+{
+	struct xdg_popup *popup = wl_container_of(listener, popup, reposition);
+	popup_unconstrain(popup);
+}
+
 static void
 popup_handle_new_xdg_popup(struct wl_listener *listener, void *data)
 {
@@ -92,7 +128,7 @@ xdg_popup_create(struct view *view, struct wlr_xdg_popup *wlr_popup)
 	popup->wlr_popup = wlr_popup;
 
 	popup->destroy.notify = handle_xdg_popup_destroy;
-	wl_signal_add(&wlr_popup->base->events.destroy, &popup->destroy);
+	wl_signal_add(&wlr_popup->events.destroy, &popup->destroy);
 
 	popup->new_popup.notify = popup_handle_new_xdg_popup;
 	wl_signal_add(&wlr_popup->base->events.new_popup, &popup->new_popup);
@@ -100,11 +136,14 @@ xdg_popup_create(struct view *view, struct wlr_xdg_popup *wlr_popup)
 	popup->commit.notify = handle_xdg_popup_commit;
 	wl_signal_add(&wlr_popup->base->surface->events.commit, &popup->commit);
 
+	popup->reposition.notify = handle_xdg_popup_reposition;
+	wl_signal_add(&wlr_popup->events.reposition, &popup->reposition);
+
 	/*
 	 * We must add xdg popups to the scene graph so they get rendered. The
 	 * wlroots scene graph provides a helper for this, but to use it we must
 	 * provide the proper parent scene node of the xdg popup. To enable
-	 * this, we always set the user data field of xdg_surfaces to the
+	 * this, we always set the user data field of wlr_surfaces to the
 	 * corresponding scene node.
 	 *
 	 * xdg-popups live in server->xdg_popup_tree so that they can be
diff --git a/src/xdg.c b/src/xdg.c
index 2b8bf96e..da0ceeef 100644
--- a/src/xdg.c
+++ b/src/xdg.c
@@ -7,6 +7,7 @@
 #include "common/mem.h"
 #include "decorations.h"
 #include "labwc.h"
+#include "menu/menu.h"
 #include "node.h"
 #include "snap-constraints.h"
 #include "view.h"
@@ -14,7 +15,7 @@
 #include "window-rules.h"
 #include "workspaces.h"
 
-#define LAB_XDG_SHELL_VERSION (2)
+#define LAB_XDG_SHELL_VERSION (3)
 #define CONFIGURE_TIMEOUT_MS 100
 
 static struct xdg_toplevel_view *
@@ -43,6 +44,20 @@ xdg_toplevel_from_view(struct view *view)
 	return xdg_surface->toplevel;
 }
 
+static struct view_size_hints
+xdg_toplevel_view_get_size_hints(struct view *view)
+{
+	assert(view);
+
+	struct wlr_xdg_toplevel *toplevel = xdg_toplevel_from_view(view);
+	struct wlr_xdg_toplevel_state *state = &toplevel->current;
+
+	return (struct view_size_hints){
+		.min_width = state->min_width,
+		.min_height = state->min_height,
+	};
+}
+
 static bool
 xdg_toplevel_view_contains_window_type(struct view *view, int32_t window_type)
 {
@@ -75,15 +90,80 @@ handle_new_popup(struct wl_listener *listener, void *data)
 	xdg_popup_create(view, wlr_popup);
 }
 
+static void
+set_fullscreen_from_request(struct view *view,
+		struct wlr_xdg_toplevel_requested *requested)
+{
+	if (!view->fullscreen && requested->fullscreen
+			&& requested->fullscreen_output) {
+		view_set_output(view, output_from_wlr_output(view->server,
+			requested->fullscreen_output));
+	}
+	view_set_fullscreen(view, requested->fullscreen);
+}
+
+static void
+do_late_positioning(struct view *view)
+{
+	struct server *server = view->server;
+	if (server->input_mode == LAB_INPUT_STATE_MOVE
+			&& view == server->grabbed_view) {
+		/* Reposition the view while anchoring it to cursor */
+		interactive_anchor_to_cursor(server, &view->pending);
+	} else {
+		/* TODO: smart placement? */
+		view_compute_centered_position(view, NULL,
+			view->pending.width, view->pending.height,
+			&view->pending.x, &view->pending.y);
+	}
+}
+
 static void
 handle_commit(struct wl_listener *listener, void *data)
 {
 	struct view *view = wl_container_of(listener, view, commit);
 	struct wlr_xdg_surface *xdg_surface = xdg_surface_from_view(view);
+	struct wlr_xdg_toplevel *toplevel = xdg_toplevel_from_view(view);
 	assert(view->surface);
 
+	if (xdg_surface->initial_commit) {
+		wlr_log(WLR_DEBUG, "scheduling configure");
+		wlr_xdg_surface_schedule_configure(xdg_surface);
+		/*
+		 * Handle initial fullscreen/maximize requests immediately after
+		 * scheduling the initial configure event (before it is sent) in
+		 * order to send the correct size and avoid flicker.
+		 *
+		 * In normal (non-fullscreen/maximized) cases, the initial
+		 * configure event is sent with a zero size, which requests the
+		 * application to choose its own size.
+		 */
+		if (toplevel->requested.fullscreen) {
+			set_fullscreen_from_request(view, &toplevel->requested);
+		}
+		if (toplevel->requested.maximized) {
+			view_maximize(view, VIEW_AXIS_BOTH,
+				/*store_natural_geometry*/ true);
+		}
+		return;
+	}
+
 	struct wlr_box size;
 	wlr_xdg_surface_get_geometry(xdg_surface, &size);
+	bool update_required = false;
+
+	/*
+	 * If we didn't know the natural size when leaving fullscreen or
+	 * unmaximizing, then the pending size will be 0x0. In this case,
+	 * the pending x/y is also unset and we still need to position
+	 * the window.
+	 */
+	if (wlr_box_empty(&view->pending) && !wlr_box_empty(&size)) {
+		view->pending.width = size.width;
+		view->pending.height = size.height;
+		do_late_positioning(view);
+		update_required = true;
+	}
 
 	/*
 	 * Qt applications occasionally fail to call set_window_geometry
@@ -95,8 +175,15 @@ handle_commit(struct wl_listener *listener, void *data)
 	 */
 	if (size.width != view->pending.width
 			|| size.height != view->pending.height) {
-		struct wlr_box extent;
-		wlr_surface_get_extends(xdg_surface->surface, &extent);
+		/*
+		 * Not using wlr_surface_get_extend() since Thunderbird
+		 * sometimes resizes the window geometry and the toplevel
+		 * surface size, but not the subsurface size (see #2183).
+		 */
+		struct wlr_box extent = {
+			.width = view->surface->current.width,
+			.height = view->surface->current.height,
+		};
 		if (extent.width == view->pending.width
 				&& extent.height == view->pending.height) {
 			wlr_log(WLR_DEBUG, "window geometry for client (%s) "
@@ -107,8 +194,9 @@ handle_commit(struct wl_listener *listener, void *data)
 	}
 
 	struct wlr_box *current = &view->current;
-	bool update_required = current->width != size.width
-		|| current->height != size.height;
+	if (current->width != size.width || current->height != size.height) {
+		update_required = true;
+	}
 
 	uint32_t serial = view->pending_configure_serial;
 	if (serial > 0 && serial == xdg_surface->current.configure_serial) {
@@ -177,8 +265,37 @@ handle_configure_timeout(void *data)
 	view->pending_configure_serial = 0;
 	view->pending_configure_timeout = NULL;
 
-	view_impl_apply_geometry(view,
-		view->current.width, view->current.height);
+	bool empty_pending = wlr_box_empty(&view->pending);
+	if (empty_pending || view->pending.x != view->current.x
+			|| view->pending.y != view->current.y) {
+		/*
+		 * This is a pending move + resize and the client is
+		 * taking too long to respond to the resize. Apply the
+		 * move now (while keeping the current size) so that the
+		 * desktop doesn't appear unresponsive.
+		 *
+		 * We do not use view_impl_apply_geometry() here since
+		 * in this case we prefer to always put the top-left
+		 * corner of the view at the desired position rather
+		 * than anchoring some other edge or corner.
+		 *
+		 * Corner case: we may get here with an empty pending
+		 * geometry in the case of an initially-maximized view
+		 * which is taking a long time to un-maximize (seen for
+		 * example with Thunderbird on slow machines). In that
+		 * case we have no great options (we can't center the
+		 * view since we don't know the un-maximized size yet),
+		 * so set a fallback position.
+		 */
+		if (empty_pending) {
+			wlr_log(WLR_INFO, "using fallback position");
+			view->pending.x = VIEW_FALLBACK_X;
+			view->pending.y = VIEW_FALLBACK_Y;
+		}
+		view->current.x = view->pending.x;
+		view->current.y = view->pending.y;
+		view_moved(view);
+	}
 
 	/* Re-sync pending view with current state */
 	snap_constraints_update(view);
@@ -214,6 +331,7 @@ handle_destroy(struct wl_listener *listener, void *data)
 	/* Remove xdg-shell view specific listeners */
 	wl_list_remove(&xdg_toplevel_view->set_app_id.link);
 	wl_list_remove(&xdg_toplevel_view->new_popup.link);
+	wl_list_remove(&view->commit.link);
 
 	if (view->pending_configure_timeout) {
 		wl_event_source_remove(view->pending_configure_timeout);
@@ -269,30 +387,38 @@ static void
 handle_request_maximize(struct wl_listener *listener, void *data)
 {
 	struct view *view = wl_container_of(listener, view, request_maximize);
+	struct wlr_xdg_toplevel *toplevel = xdg_toplevel_from_view(view);
+
+	if (!toplevel->base->initialized) {
+		/*
+		 * Do nothing if we have not received the initial commit yet.
+		 * We will maximize the view in the commit handler.
+		 */
+		return;
+	}
+
 	if (!view->mapped && !view->output) {
 		view_set_output(view, output_nearest_to_cursor(view->server));
 	}
-	bool maximized = xdg_toplevel_from_view(view)->requested.maximized;
+	bool maximized = toplevel->requested.maximized;
 	view_maximize(view, maximized ? VIEW_AXIS_BOTH : VIEW_AXIS_NONE,
 		/*store_natural_geometry*/ true);
 }
 
-static void
-set_fullscreen_from_request(struct view *view,
-		struct wlr_xdg_toplevel_requested *requested)
-{
-	if (!view->fullscreen && requested->fullscreen
-			&& requested->fullscreen_output) {
-		view_set_output(view, output_from_wlr_output(view->server,
-			requested->fullscreen_output));
-	}
-	view_set_fullscreen(view, requested->fullscreen);
-}
-
 static void
 handle_request_fullscreen(struct wl_listener *listener, void *data)
 {
 	struct view *view = wl_container_of(listener, view, request_fullscreen);
+	struct wlr_xdg_toplevel *toplevel = xdg_toplevel_from_view(view);
+
+	if (!toplevel->base->initialized) {
+		/*
+		 * Do nothing if we have not received the initial commit yet.
+		 * We will fullscreen the view in the commit handler.
+		 */
+		return;
+	}
+
 	if (!view->mapped && !view->output) {
 		view_set_output(view, output_nearest_to_cursor(view->server));
 	}
@@ -300,6 +426,21 @@ handle_request_fullscreen(struct wl_listener *listener, void *data)
 		&xdg_toplevel_from_view(view)->requested);
 }
 
+static void
+handle_request_show_window_menu(struct wl_listener *listener, void *data)
+{
+	struct xdg_toplevel_view *xdg_toplevel_view = wl_container_of(
+		listener, xdg_toplevel_view, request_show_window_menu);
+	struct server *server = xdg_toplevel_view->base.server;
+
+	struct menu *menu = menu_get_by_id(server, "client-menu");
+	assert(menu);
+	menu->triggered_by_view = &xdg_toplevel_view->base;
+
+	struct wlr_cursor *cursor = server->seat.cursor;
+	menu_open_root(menu, cursor->x, cursor->y);
+}
+
 static void
 handle_set_title(struct wl_listener *listener, void *data)
 {
@@ -320,7 +461,6 @@ static void
 xdg_toplevel_view_configure(struct view *view, struct wlr_box geo)
 {
 	uint32_t serial = 0;
-	view_adjust_size(view, &geo.width, &geo.height);
 
 	/*
 	 * We do not need to send a configure request unless the size
@@ -560,14 +700,8 @@ xdg_toplevel_view_map(struct view *view)
 		view_set_output(view, output_nearest_to_cursor(view->server));
 	}
 	struct wlr_xdg_surface *xdg_surface = xdg_surface_from_view(view);
-	view->surface = xdg_surface->surface;
 	wlr_scene_node_set_enabled(&view->scene_tree->node, true);
 	if (!view->been_mapped) {
-		struct wlr_xdg_toplevel_requested *requested =
-			&xdg_toplevel_from_view(view)->requested;
-
-		init_foreign_toplevel(view);
-
 		if (view_wants_decorations(view)) {
 			view_set_ssd_mode(view, LAB_SSD_MODE_FULL);
 		} else {
@@ -575,8 +709,7 @@ xdg_toplevel_view_map(struct view *view)
 		}
 
 		/*
-		 * Set initial "pending" dimensions (may be modified by
-		 * view_set_fullscreen/view_maximize() below). "Current"
+		 * Set initial "pending" dimensions. "Current"
 		 * dimensions remain zero until handle_commit().
 		 */
 		if (wlr_box_empty(&view->pending)) {
@@ -588,22 +721,11 @@ xdg_toplevel_view_map(struct view *view)
 
 		/*
 		 * Set initial "pending" position for floating views.
-		 * Do this before view_set_fullscreen/view_maximize() so
-		 * that the position is saved with the natural geometry.
-		 *
-		 * FIXME: the natural geometry is not saved if either
-		 * handle_request_fullscreen/handle_request_maximize()
-		 * is called before map (try "foot --maximized").
 		 */
 		if (view_is_floating(view)) {
 			set_initial_position(view);
 		}
 
-		set_fullscreen_from_request(view, requested);
-		view_maximize(view, requested->maximized ?
-			VIEW_AXIS_BOTH : VIEW_AXIS_NONE,
-			/*store_natural_geometry*/ true);
-
 		/*
 		 * Set initial "current" position directly before
 		 * calling view_moved() to reduce flicker
@@ -614,8 +736,10 @@ xdg_toplevel_view_map(struct view *view)
 		view_moved(view);
 	}
 
-	view->commit.notify = handle_commit;
-	wl_signal_add(&xdg_surface->surface->events.commit, &view->commit);
+	if (!view->toplevel.handle) {
+		init_foreign_toplevel(view);
+		foreign_toplevel_update_outputs(view);
+	}
 
 	view_impl_map(view);
 	view->been_mapped = true;
@@ -627,9 +751,17 @@ xdg_toplevel_view_unmap(struct view *view, bool client_request)
 	if (view->mapped) {
 		view->mapped = false;
 		wlr_scene_node_set_enabled(&view->scene_tree->node, false);
-		wl_list_remove(&view->commit.link);
 		view_impl_unmap(view);
 	}
+
+	/*
+	 * If the view was explicitly unmapped by the client (rather
+	 * than just minimized), destroy the foreign toplevel handle so
+	 * the unmapped view doesn't show up in panels and the like.
+	 */
+	if (client_request && view->toplevel.handle) {
+		wlr_foreign_toplevel_handle_v1_destroy(view->toplevel.handle);
+	}
 }
 
 static pid_t
@@ -661,14 +793,44 @@ static const struct view_impl xdg_toplevel_view_impl = {
 	.move_to_back = view_impl_move_to_back,
 	.get_root = xdg_toplevel_view_get_root,
 	.append_children = xdg_toplevel_view_append_children,
+	.get_size_hints = xdg_toplevel_view_get_size_hints,
 	.contains_window_type = xdg_toplevel_view_contains_window_type,
 	.get_pid = xdg_view_get_pid,
 };
 
+struct token_data {
+	bool had_valid_surface;
+	bool had_valid_seat;
+	struct wl_listener destroy;
+};
+
+static void
+xdg_activation_handle_token_destroy(struct wl_listener *listener, void *data)
+{
+	struct token_data *token_data = wl_container_of(listener, token_data, destroy);
+	wl_list_remove(&token_data->destroy.link);
+	free(token_data);
+}
+
+static void
+xdg_activation_handle_new_token(struct wl_listener *listener, void *data)
+{
+	struct wlr_xdg_activation_token_v1 *token = data;
+	struct token_data *token_data = znew(*token_data);
+	token_data->had_valid_surface = !!token->surface;
+	token_data->had_valid_seat = !!token->seat;
+	token->data = token_data;
+
+	token_data->destroy.notify = xdg_activation_handle_token_destroy;
+	wl_signal_add(&token->events.destroy, &token_data->destroy);
+}
+
 static void
 xdg_activation_handle_request(struct wl_listener *listener, void *data)
 {
 	const struct wlr_xdg_activation_v1_request_activate_event *event = data;
+	struct token_data *token_data = event->token->data;
+	assert(token_data);
 
 	struct wlr_xdg_surface *xdg_surface =
 		wlr_xdg_surface_try_from_wlr_surface(event->surface);
@@ -681,16 +843,22 @@ xdg_activation_handle_request(struct wl_listener *listener, void *data)
 		wlr_log(WLR_INFO, "Not activating surface - no view attached to surface");
 		return;
 	}
-	if (!event->token->seat) {
+
+	if (!token_data->had_valid_seat) {
 		wlr_log(WLR_INFO, "Denying focus request, seat wasn't supplied");
 		return;
 	}
+
 	/*
-	 * We do not check for event->token->surface here because it may already
-	 * be destroyed and thus being NULL. With wlroots 0.17 we can hook into
-	 * the `new_token` signal, attach further information to the token and
-	 * then react to that information here instead. For now we just check
-	 * for the seat / serial being correct and then allow the request.
+	 * TODO: The verification of source surface is temporarily disabled to
+	 * allow activation of some clients (e.g. thunderbird). Reland this
+	 * check when we implement the configuration for activation policy or
+	 * urgency hints.
+	 *
+	 * if (!token_data->had_valid_surface) {
+	 *	wlr_log(WLR_INFO, "Denying focus request, source surface not set");
+	 *	return;
+	 * }
 	 */
 
 	if (window_rules_get_property(view, "ignoreFocusRequest") == LAB_PROP_TRUE) {
@@ -715,19 +883,14 @@ xdg_activation_handle_request(struct wl_listener *listener, void *data)
  *     to help the popups find their parent nodes
  */
 static void
-xdg_surface_new(struct wl_listener *listener, void *data)
+xdg_toplevel_new(struct wl_listener *listener, void *data)
 {
 	struct server *server =
-		wl_container_of(listener, server, new_xdg_surface);
-	struct wlr_xdg_surface *xdg_surface = data;
+		wl_container_of(listener, server, new_xdg_toplevel);
+	struct wlr_xdg_toplevel *xdg_toplevel = data;
+	struct wlr_xdg_surface *xdg_surface = xdg_toplevel->base;
 
-	/*
-	 * We deal with popups in xdg-popup.c and layers.c as they have to be
-	 * treated differently
-	 */
-	if (xdg_surface->role != WLR_XDG_SURFACE_ROLE_TOPLEVEL) {
-		return;
-	}
+	assert(xdg_surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL);
 
 	wlr_xdg_surface_ping(xdg_surface);
 
@@ -750,7 +913,7 @@ xdg_surface_new(struct wl_listener *listener, void *data)
 			view->output->wlr_output->scale);
 	}
 
-	view->workspace = server->workspace_current;
+	view->workspace = server->workspaces.current;
 	view->scene_tree = wlr_scene_tree_create(view->workspace->tree);
 	wlr_scene_node_set_enabled(&view->scene_tree->node, false);
 
@@ -793,21 +956,24 @@ xdg_surface_new(struct wl_listener *listener, void *data)
 	kde_server_decoration_set_view(view, xdg_surface->surface);
 
 	/* In support of xdg popups and IME popup */
-	xdg_surface->surface->data = tree;
+	view->surface = xdg_surface->surface;
+	view->surface->data = tree;
 
 	view_connect_map(view, xdg_surface->surface);
-	CONNECT_SIGNAL(xdg_surface, view, destroy);
 
 	struct wlr_xdg_toplevel *toplevel = xdg_surface->toplevel;
+	CONNECT_SIGNAL(toplevel, view, destroy);
 	CONNECT_SIGNAL(toplevel, view, request_move);
 	CONNECT_SIGNAL(toplevel, view, request_resize);
 	CONNECT_SIGNAL(toplevel, view, request_minimize);
 	CONNECT_SIGNAL(toplevel, view, request_maximize);
 	CONNECT_SIGNAL(toplevel, view, request_fullscreen);
 	CONNECT_SIGNAL(toplevel, view, set_title);
+	CONNECT_SIGNAL(view->surface, view, commit);
 
 	/* Events specific to XDG toplevel views */
 	CONNECT_SIGNAL(toplevel, xdg_toplevel_view, set_app_id);
+	CONNECT_SIGNAL(toplevel, xdg_toplevel_view, request_show_window_menu);
 	CONNECT_SIGNAL(xdg_surface, xdg_toplevel_view, new_popup);
 
 	wl_list_insert(&server->views, &view->link);
@@ -822,16 +988,22 @@ xdg_shell_init(struct server *server)
 		wlr_log(WLR_ERROR, "unable to create the XDG shell interface");
 		exit(EXIT_FAILURE);
 	}
-	server->new_xdg_surface.notify = xdg_surface_new;
-	wl_signal_add(&server->xdg_shell->events.new_surface, &server->new_xdg_surface);
+
+	server->new_xdg_toplevel.notify = xdg_toplevel_new;
+	wl_signal_add(&server->xdg_shell->events.new_toplevel, &server->new_xdg_toplevel);
 
 	server->xdg_activation = wlr_xdg_activation_v1_create(server->wl_display);
 	if (!server->xdg_activation) {
 		wlr_log(WLR_ERROR, "unable to create xdg_activation interface");
 		exit(EXIT_FAILURE);
 	}
+
 	server->xdg_activation_request.notify = xdg_activation_handle_request;
 	wl_signal_add(&server->xdg_activation->events.request_activate,
 		&server->xdg_activation_request);
+
+	server->xdg_activation_new_token.notify = xdg_activation_handle_new_token;
+	wl_signal_add(&server->xdg_activation->events.new_token,
+		&server->xdg_activation_new_token);
 }
 
diff --git a/src/xwayland-unmanaged.c b/src/xwayland-unmanaged.c
index 72dce1ff..38d3c315 100644
--- a/src/xwayland-unmanaged.c
+++ b/src/xwayland-unmanaged.c
@@ -42,7 +42,6 @@ handle_map(struct wl_listener *listener, void *data)
 	assert(!unmanaged->node);
 
 	/* Stack new surface on top */
-	wlr_xwayland_surface_restack(xsurface, NULL, XCB_STACK_MODE_ABOVE);
 	wl_list_append(&unmanaged->server->unmanaged_surfaces, &unmanaged->link);
 
 	CONNECT_SIGNAL(xsurface, unmanaged, set_geometry);
diff --git a/src/xwayland.c b/src/xwayland.c
index d4eff83d..af3bb871 100644
--- a/src/xwayland.c
+++ b/src/xwayland.c
@@ -6,6 +6,8 @@
 #include "common/array.h"
 #include "common/macros.h"
 #include "common/mem.h"
+#include "config/rcxml.h"
+#include "config/session.h"
 #include "labwc.h"
 #include "node.h"
 #include "ssd.h"
@@ -277,19 +279,8 @@ handle_dissociate(struct wl_listener *listener, void *data)
 	struct xwayland_view *xwayland_view =
 		wl_container_of(listener, xwayland_view, dissociate);
 
-	if (!xwayland_view->base.mappable.connected) {
-		/*
-		 * In some cases wlroots fails to emit the associate event
-		 * due to an early return in xwayland_surface_associate().
-		 * This is arguably a wlroots bug, but nevertheless it
-		 * should not bring down labwc.
-		 *
-		 * TODO: Potentially remove when starting to track
-		 *       wlroots 0.18 and it got fixed upstream.
-		 */
-		wlr_log(WLR_ERROR, "dissociate received before associate");
-		return;
-	}
+	/* https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4524 */
+	assert(xwayland_view->base.mappable.connected);
 	mappable_disconnect(&xwayland_view->base.mappable);
 }
 
@@ -339,6 +330,7 @@ handle_destroy(struct wl_listener *listener, void *data)
 	wl_list_remove(&xwayland_view->set_override_redirect.link);
 	wl_list_remove(&xwayland_view->set_strut_partial.link);
 	wl_list_remove(&xwayland_view->set_window_type.link);
+	wl_list_remove(&xwayland_view->map_request.link);
 
 	view_destroy(view);
 }
@@ -497,9 +489,17 @@ xwayland_view_get_string_prop(struct view *view, const char *prop)
 	if (!strcmp(prop, "class")) {
 		return xwayland_surface->class;
 	}
-	/* We give 'class' for wlr_foreign_toplevel_handle_v1_set_app_id() */
+	/*
+	 * Use the WM_CLASS 'instance' (1st string) for the app_id. Per
+	 * ICCCM, this is usually "the trailing part of the name used to
+	 * invoke the program (argv[0] stripped of any directory names)".
+	 *
+	 * In most cases, the 'class' (2nd string) is the same as the
+	 * 'instance' except for being capitalized. We want lowercase
+	 * here since we use the app_id for icon lookups.
+	 */
 	if (!strcmp(prop, "app_id")) {
-		return xwayland_surface->class;
+		return xwayland_surface->instance;
 	}
 	return "";
 }
@@ -554,6 +554,80 @@ handle_set_strut_partial(struct wl_listener *listener, void *data)
 	}
 }
 
+/*
+ * Sets the initial geometry of maximized/fullscreen views before
+ * actually mapping them, so that they can do their initial layout and
+ * drawing with the correct geometry. This avoids visual glitches and
+ * also avoids undesired layout changes with some apps (e.g. HomeBank).
+ */
+static void
+handle_map_request(struct wl_listener *listener, void *data)
+{
+	struct xwayland_view *xwayland_view =
+		wl_container_of(listener, xwayland_view, map_request);
+	struct view *view = &xwayland_view->base;
+	struct wlr_xwayland_surface *xsurface = xwayland_view->xwayland_surface;
+
+	if (view->mapped) {
+		/* Probably shouldn't happen, but be sure */
+		return;
+	}
+
+	/* Keep the view invisible until actually mapped */
+	wlr_scene_node_set_enabled(&view->scene_tree->node, false);
+	ensure_initial_geometry_and_output(view);
+
+	/*
+	 * Per the Extended Window Manager Hints (EWMH) spec: "The Window
+	 * Manager SHOULD honor _NET_WM_STATE whenever a withdrawn window
+	 * requests to be mapped."
+	 *
+	 * The following order of operations is intended to reduce the
+	 * number of resize (Configure) events:
+	 *   1. set fullscreen state
+	 *   2. set decorations (depends on fullscreen state)
+	 *   3. set maximized (geometry depends on decorations)
+	 */
+	view_set_fullscreen(view, xsurface->fullscreen);
+	if (!view->been_mapped) {
+		if (want_deco(xsurface)) {
+			view_set_ssd_mode(view, LAB_SSD_MODE_FULL);
+		} else {
+			view_set_ssd_mode(view, LAB_SSD_MODE_NONE);
+		}
+	}
+	enum view_axis axis = VIEW_AXIS_NONE;
+	if (xsurface->maximized_horz) {
+		axis |= VIEW_AXIS_HORIZONTAL;
+	}
+	if (xsurface->maximized_vert) {
+		axis |= VIEW_AXIS_VERTICAL;
+	}
+	view_maximize(view, axis, /*store_natural_geometry*/ true);
+	/*
+	 * We could also call set_initial_position() here, but it's not
+	 * really necessary until the view is actually mapped (and at
+	 * that point the output layout is known for sure).
+	 */
+}
+
+static void
+check_natural_geometry(struct view *view)
+{
+	int min_width = view_get_min_width();
+
+	/*
+	 * Some applications (example: Thonny) don't set a reasonable
+	 * un-maximized size when started maximized. Try to detect this
+	 * and set a fallback size.
+	 */
+	if (!view_is_floating(view)
+			&& (view->natural_geometry.width < min_width
+			|| view->natural_geometry.height < LAB_MIN_VIEW_HEIGHT)) {
+		view_set_fallback_natural_geometry(view);
+	}
+}
+
 static void
 set_initial_position(struct view *view,
 		struct wlr_xwayland_surface *xwayland_surface)
@@ -564,17 +638,7 @@ set_initial_position(struct view *view,
 			XCB_ICCCM_SIZE_HINT_US_POSITION |
 			XCB_ICCCM_SIZE_HINT_P_POSITION));
 
-	if (has_position) {
-		/*
-		 * Make sure a floating view is onscreen. For a
-		 * maximized/fullscreen view, do nothing; if it is
-		 * unmaximized/leaves fullscreen later, we will make
-		 * sure it is on-screen at that point.
-		 */
-		if (view_is_floating(view)) {
-			view_adjust_for_layout_change(view);
-		}
-	} else {
+	if (!has_position) {
 		view_constrain_size_to_that_of_usable_area(view);
 
 		if (view_is_floating(view)) {
@@ -593,6 +657,13 @@ set_initial_position(struct view *view,
 				&view->natural_geometry.y);
 		}
 	}
+
+	/*
+	 * Always make sure the view is onscreen and adjusted for any
+	 * layout changes that could have occurred between map_request
+	 * and the actual map event.
+	 */
+	view_adjust_for_layout_change(view);
 }
 
 static void
@@ -614,7 +685,11 @@ init_foreign_toplevel(struct view *view)
 static void
 xwayland_view_map(struct view *view)
 {
-	struct wlr_xwayland_surface *xwayland_surface = xwayland_surface_from_view(view);
+	struct xwayland_view *xwayland_view = xwayland_view_from_view(view);
+	struct wlr_xwayland_surface *xwayland_surface =
+		xwayland_view->xwayland_surface;
+	assert(xwayland_surface);
+
 	if (view->mapped) {
 		return;
 	}
@@ -628,8 +703,16 @@ xwayland_view_map(struct view *view)
 		wlr_log(WLR_DEBUG, "Cannot map view without wlr_surface");
 		return;
 	}
+
+	/*
+	 * The map_request event may not be received when an unmanaged
+	 * (override-redirect) surface becomes managed. To make sure we
+	 * have valid geometry in that case, call handle_map_request()
+	 * explicitly (calling it twice is harmless).
+	 */
+	handle_map_request(&xwayland_view->map_request, NULL);
+
 	view->mapped = true;
-	ensure_initial_geometry_and_output(view);
 	wlr_scene_node_set_enabled(&view->scene_tree->node, true);
 
 	if (view->surface != xwayland_surface->surface) {
@@ -653,44 +736,8 @@ xwayland_view_map(struct view *view)
 		view->scene_node = &tree->node;
 	}
 
-	/*
-	 * Per the Extended Window Manager Hints (EWMH) spec: "The Window
-	 * Manager SHOULD honor _NET_WM_STATE whenever a withdrawn window
-	 * requests to be mapped."
-	 *
-	 * The following order of operations is intended to reduce the
-	 * number of resize (Configure) events:
-	 *   1. set fullscreen state
-	 *   2. set decorations (depends on fullscreen state)
-	 *   3. set maximized (geometry depends on decorations)
-	 */
-	view_set_fullscreen(view, xwayland_surface->fullscreen);
-	if (!view->been_mapped) {
-		if (want_deco(xwayland_surface)) {
-			view_set_ssd_mode(view, LAB_SSD_MODE_FULL);
-		} else {
-			view_set_ssd_mode(view, LAB_SSD_MODE_NONE);
-		}
-	}
-	enum view_axis axis = VIEW_AXIS_NONE;
-	if (xwayland_surface->maximized_horz) {
-		axis |= VIEW_AXIS_HORIZONTAL;
-	}
-	if (xwayland_surface->maximized_vert) {
-		axis |= VIEW_AXIS_VERTICAL;
-	}
-	view_maximize(view, axis, /*store_natural_geometry*/ true);
-
-	/*
-	 * Exclude unfocusable views from wlr-foreign-toplevel. These
-	 * views (notifications, floating toolbars, etc.) should not be
-	 * shown in taskbars/docks/etc.
-	 */
-	if (!view->toplevel.handle && view_is_focusable(view)) {
-		init_foreign_toplevel(view);
-	}
-
 	if (!view->been_mapped) {
+		check_natural_geometry(view);
 		set_initial_position(view, xwayland_surface);
 		/*
 		 * When mapping the view for the first time, visual
@@ -702,6 +749,16 @@ xwayland_view_map(struct view *view)
 		view_moved(view);
 	}
 
+	/*
+	 * Exclude unfocusable views from wlr-foreign-toplevel. These
+	 * views (notifications, floating toolbars, etc.) should not be
+	 * shown in taskbars/docks/etc.
+	 */
+	if (!view->toplevel.handle && view_is_focusable(view)) {
+		init_foreign_toplevel(view);
+		foreign_toplevel_update_outputs(view);
+	}
+
 	/* Add commit here, as xwayland map/unmap can change the wlr_surface */
 	wl_signal_add(&xwayland_surface->surface->events.commit, &view->commit);
 	view->commit.notify = handle_commit;
@@ -739,7 +796,6 @@ xwayland_view_unmap(struct view *view, bool client_request)
 out:
 	if (client_request && view->toplevel.handle) {
 		wlr_foreign_toplevel_handle_v1_destroy(view->toplevel.handle);
-		view->toplevel.handle = NULL;
 	}
 }
 
@@ -780,14 +836,6 @@ xwayland_view_move_to_front(struct view *view)
 	 */
 	wlr_xwayland_surface_restack(xwayland_surface_from_view(view),
 		NULL, XCB_STACK_MODE_ABOVE);
-
-	/* Restack unmanaged surfaces on top */
-	struct wl_list *list = &view->server->unmanaged_surfaces;
-	struct xwayland_unmanaged *u;
-	wl_list_for_each(u, list, link) {
-		wlr_xwayland_surface_restack(u->xwayland_surface,
-			NULL, XCB_STACK_MODE_ABOVE);
-	}
 }
 
 static void
@@ -935,7 +983,7 @@ xwayland_view_create(struct server *server,
 	xwayland_view->xwayland_surface = xsurface;
 	xsurface->data = view;
 
-	view->workspace = server->workspace_current;
+	view->workspace = server->workspaces.current;
 	view->scene_tree = wlr_scene_tree_create(view->workspace->tree);
 	node_descriptor_create(&view->scene_tree->node, LAB_NODE_DESC_VIEW, view);
 
@@ -957,6 +1005,7 @@ xwayland_view_create(struct server *server,
 	CONNECT_SIGNAL(xsurface, xwayland_view, set_override_redirect);
 	CONNECT_SIGNAL(xsurface, xwayland_view, set_strut_partial);
 	CONNECT_SIGNAL(xsurface, xwayland_view, set_window_type);
+	CONNECT_SIGNAL(xsurface, xwayland_view, map_request);
 
 	wl_list_insert(&view->server->views, &view->link);
 
@@ -1022,6 +1071,9 @@ sync_atoms(xcb_connection_t *xcb_conn)
 static void
 handle_server_ready(struct wl_listener *listener, void *data)
 {
+	/* Fire an Xwayland startup script if one (or many) can be found */
+	session_run_script("xinitrc");
+
 	xcb_connection_t *xcb_conn = xcb_connect(NULL, NULL);
 	if (xcb_connection_has_error(xcb_conn)) {
 		wlr_log(WLR_ERROR, "Failed to create xcb connection");
@@ -1052,7 +1104,8 @@ void
 xwayland_server_init(struct server *server, struct wlr_compositor *compositor)
 {
 	server->xwayland =
-		wlr_xwayland_create(server->wl_display, compositor, true);
+		wlr_xwayland_create(server->wl_display,
+			compositor, /* lazy */ !rc.xwayland_persistence);
 	if (!server->xwayland) {
 		wlr_log(WLR_ERROR, "cannot create xwayland server");
 		exit(EXIT_FAILURE);
diff --git a/subprojects/libsfdo.wrap b/subprojects/libsfdo.wrap
new file mode 100644
index 00000000..22df1d6a
--- /dev/null
+++ b/subprojects/libsfdo.wrap
@@ -0,0 +1,6 @@
+[wrap-git]
+url = https://gitlab.freedesktop.org/vyivel/libsfdo.git
+revision = v0.1.3
+
+[provide]
+dependency_names = libsfdo-basedir, libsfdo-desktop, libsfdo-icon
diff --git a/subprojects/seatd.wrap b/subprojects/seatd.wrap
deleted file mode 100644
index 2194fc50..00000000
--- a/subprojects/seatd.wrap
+++ /dev/null
@@ -1,4 +0,0 @@
-[wrap-git]
-url=https://git.sr.ht/~kennylevinsen/seatd
-revision=0.6.4
-
diff --git a/subprojects/wlroots.wrap b/subprojects/wlroots.wrap
index 7ae85823..838b2633 100644
--- a/subprojects/wlroots.wrap
+++ b/subprojects/wlroots.wrap
@@ -1,6 +1,7 @@
 [wrap-git]
 url = https://gitlab.freedesktop.org/wlroots/wlroots.git
-revision = 0.17
+revision = 0.18
 
 [provide]
-dependency_names = wlroots
+dependency_names = wlroots-0.18
+wlroots-0.18=wlroots
diff --git a/t/.gitignore b/t/.gitignore
new file mode 100644
index 00000000..a8d6b6c1
--- /dev/null
+++ b/t/.gitignore
@@ -0,0 +1 @@
+*.t
diff --git a/t/buf-simple.c b/t/buf-simple.c
new file mode 100644
index 00000000..3993ae83
--- /dev/null
+++ b/t/buf-simple.c
@@ -0,0 +1,80 @@
+// SPDX-License-Identifier: GPL-2.0-only
+#define _POSIX_C_SOURCE 200809L
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
+#include <cmocka.h>
+#include "common/buf.h"
+#include "common/mem.h"
+
+static void
+test_expand_title(void **state)
+{
+	(void)state;
+
+	struct buf s = BUF_INIT;
+
+	char TEMPLATE[] = "foo ~/bar";
+	char expect[4096];
+	snprintf(expect, sizeof(expect), "foo %s/bar", getenv("HOME"));
+
+	buf_add(&s, TEMPLATE);
+	assert_string_equal(s.data, TEMPLATE);
+	assert_int_equal(s.len, strlen(TEMPLATE));
+
+	// Resolve ~
+	buf_expand_tilde(&s);
+	assert_string_equal(s.data, expect);
+	assert_int_equal(s.len, strlen(expect));
+
+	setenv("bar", "BAR", 1);
+
+	// Resolve $bar and ${bar}
+	s.len = 0;
+	buf_add(&s, "foo $bar baz");
+	buf_expand_shell_variables(&s);
+	assert_string_equal(s.data, "foo BAR baz");
+	assert_int_equal(s.len, 11);
+
+	s.len = 0;
+	buf_add(&s, "foo ${bar} baz");
+	buf_expand_shell_variables(&s);
+	assert_string_equal(s.data, "foo BAR baz");
+	assert_int_equal(s.len, 11);
+
+	// Don't resolve $()
+	s.len = 0;
+	buf_add(&s, "foo $(bar) baz");
+	buf_expand_shell_variables(&s);
+	assert_string_equal(s.data, "foo $(bar) baz");
+	assert_int_equal(s.len, 14);
+
+	unsetenv("bar");
+	free(s.data);
+}
+
+static void
+test_buf_add_fmt(void **state)
+{
+	(void)state;
+
+	struct buf s = BUF_INIT;
+
+	buf_add(&s, "foo");
+	buf_add_fmt(&s, " %s baz %d", "bar", 10);
+	assert_string_equal(s.data, "foo bar baz 10");
+
+	buf_reset(&s);
+}
+
+int main(int argc, char **argv)
+{
+	const struct CMUnitTest tests[] = {
+		cmocka_unit_test(test_expand_title),
+		cmocka_unit_test(test_buf_add_fmt),
+	};
+
+	return cmocka_run_group_tests(tests, NULL, NULL);
+}
diff --git a/t/meson.build b/t/meson.build
new file mode 100644
index 00000000..5517b973
--- /dev/null
+++ b/t/meson.build
@@ -0,0 +1,27 @@
+test_lib = static_library(
+  'test_lib',
+  sources: files(
+    '../src/common/buf.c',
+    '../src/common/mem.c',
+    '../src/common/string-helpers.c'
+  ),
+  include_directories: [labwc_inc],
+  dependencies: [dep_cmocka],
+)
+
+tests = [
+  'buf-simple',
+]
+
+foreach t : tests
+  test(
+    'test_@0@'.format(t),
+    executable(
+      'test_@0@'.format(t),
+      sources: '@0@.c'.format(t),
+      include_directories: [labwc_inc],
+      link_with: [test_lib],
+    ),
+    is_parallel: false,
+  )
+endforeach