diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index 582645a7..8eba3098 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -22,25 +22,28 @@ If this is a regression, please mention which version was working previously.
 **Kernel version**: 
 
 **VR Runtime**:
-- [ ] Monado/WiVRn
-- [ ] SteamVR/ALVR
+- [ ] Monado
+- [ ] WiVRn
+- [ ] ALVR
+- [ ] SteamLink
+- [ ] SteamVR (not SteamLink)
 
 <!-- Run `vulkaninfo --summary` and paste the devices section from the bottom. -->
 **GPU models and driver versions**: 
 
 ## Overlay Logs
 
-<!-- Start the overlay once more with the following environment variables:
-  RUST_BACKTRACE=full
-  RUST_LOG=debug
-If your issue is graphical or crash or freeze, also add:
-  VK_INSTANCE_LAYERS=VK_LAYER_KHRONOS_validation
+<!-- Start the overlay from terminal, with additional environment variables:
 
-Next, create the empty log file: echo > /tmp/wlx.log
+AppImage:
+  RUST_BACKTRACE=full RUST_LOG=debug /path/to/WayVR.AppImage
 
-Be sure to go and reproduce the issue once more, after these have been set.
+System or AUR package:
+  RUST_BACKTRACE=full RUST_LOG=debug wayvr
 
-Upload the log file from: /tmp/wlx.log
+Reproduce the issue once more, while WayVR is running from the terminal.
+
+Upload the log file from: /tmp/wayvr.log
 
 -->
 
diff --git a/.github/workflows/build-all-features.yml b/.github/workflows/build-all-features.yml
index ea748df3..81267f63 100644
--- a/.github/workflows/build-all-features.yml
+++ b/.github/workflows/build-all-features.yml
@@ -11,7 +11,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     defaults:
       run:
         working-directory: ./wayvr
diff --git a/.github/workflows/build-appimage.yml b/.github/workflows/build-appimage.yml
index 826fc778..dc58f894 100644
--- a/.github/workflows/build-appimage.yml
+++ b/.github/workflows/build-appimage.yml
@@ -30,6 +30,9 @@ jobs:
       - name: Cargo Build
         run: |
           ../.github/workflows/scripts/appimage_build_wlx.sh
+      - name: Build xwayland-satellite
+        run: |
+          ../.github/workflows/scripts/appimage_build_satellite.sh
       - name: Package AppImage
         run: |
           ../.github/workflows/scripts/appimage_package.sh
diff --git a/.github/workflows/build-default.yml b/.github/workflows/build-default.yml
index a20e5dfa..3ad4d140 100644
--- a/.github/workflows/build-default.yml
+++ b/.github/workflows/build-default.yml
@@ -11,7 +11,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     defaults:
       run:
         working-directory: ./wayvr
diff --git a/.github/workflows/build-wayland-openvr.yml b/.github/workflows/build-wayland-openvr.yml
index 9b540dc5..dd3beb57 100644
--- a/.github/workflows/build-wayland-openvr.yml
+++ b/.github/workflows/build-wayland-openvr.yml
@@ -11,7 +11,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     defaults:
       run:
         working-directory: ./wayvr
diff --git a/.github/workflows/build-wayland-openxr.yml b/.github/workflows/build-wayland-openxr.yml
index 42a5c33c..9ff5c9d4 100644
--- a/.github/workflows/build-wayland-openxr.yml
+++ b/.github/workflows/build-wayland-openxr.yml
@@ -11,7 +11,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     defaults:
       run:
         working-directory: ./wayvr
diff --git a/.github/workflows/build-x11-openvr.yml b/.github/workflows/build-x11-openvr.yml
index cacd5e5c..2d54b81f 100644
--- a/.github/workflows/build-x11-openvr.yml
+++ b/.github/workflows/build-x11-openvr.yml
@@ -11,7 +11,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     defaults:
       run:
         working-directory: ./wayvr
diff --git a/.github/workflows/build-x11-openxr.yml b/.github/workflows/build-x11-openxr.yml
index 7e045dee..697f0806 100644
--- a/.github/workflows/build-x11-openxr.yml
+++ b/.github/workflows/build-x11-openxr.yml
@@ -11,7 +11,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     defaults:
       run:
         working-directory: ./wayvr
diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml
index 3225e372..2364e20e 100644
--- a/.github/workflows/make-release.yml
+++ b/.github/workflows/make-release.yml
@@ -13,7 +13,7 @@ env:
   
 jobs:
   make_release:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     defaults:
       run:
         working-directory: ./wayvr
@@ -27,6 +27,9 @@ jobs:
       - name: Cargo Build
         run: |
           ../.github/workflows/scripts/appimage_build_wlx.sh
+      - name: Build xwayland-satellite
+        run: |
+          ../.github/workflows/scripts/appimage_build_satellite.sh
       - name: Package AppImage
         run: |
           ../.github/workflows/scripts/appimage_package.sh
diff --git a/.github/workflows/scripts/appimage_build_satellite.sh b/.github/workflows/scripts/appimage_build_satellite.sh
new file mode 100755
index 00000000..8810f47a
--- /dev/null
+++ b/.github/workflows/scripts/appimage_build_satellite.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+sudo apt install \
+    xwayland \
+    libxcb1-dev \
+    libxcb-cursor-dev \
+    clang \
+    pkg-config
+
+git clone https://github.com/Supreeeme/xwayland-satellite.git
+cd xwayland-satellite
+
+cargo build --release
+chmod +x ../target/release/xwayland-satellite
+cd ..
+
+cp xwayland-satellite/target/release/xwayland-satellite ${APPDIR}/usr/bin
diff --git a/.github/workflows/scripts/appimage_prepare_env.sh b/.github/workflows/scripts/appimage_prepare_env.sh
index 7b7f14f3..1151ce61 100755
--- a/.github/workflows/scripts/appimage_prepare_env.sh
+++ b/.github/workflows/scripts/appimage_prepare_env.sh
@@ -1,9 +1,11 @@
 #!/bin/sh
 
-sudo add-apt-repository -syn universe
-sudo add-apt-repository -syn ppa:pipewire-debian/pipewire-upstream || sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 25088A0359807596
 sudo apt-get update
-sudo apt-get install -y fuse cmake pkg-config fontconfig libasound2-dev libxkbcommon-dev libxkbcommon-x11-0 libxkbcommon-x11-dev libopenxr-dev libfontconfig-dev libdbus-1-dev libpipewire-0.3-0 libpipewire-0.3-dev libspa-0.2-dev libx11-6 libxext6 libxrandr2 libx11-dev libxext-dev libxrandr-dev libopenvr-dev libopenvr-api1 libwayland-dev libegl-dev libxcb-glx0 libxcb-glx0-dev
+sudo apt-get install -y fuse cmake pkg-config fontconfig libasound2-dev libxkbcommon-dev libxkbcommon-x11-0 libxkbcommon-x11-dev \
+  libopenxr-dev libfontconfig-dev libdbus-1-dev libpipewire-0.3-0 libpipewire-0.3-dev libspa-0.2-dev libx11-6 libxext6 libxrandr2 \
+  libx11-dev libxext-dev libxrandr-dev libopenvr-dev libopenvr-api1 libwayland-dev libegl-dev libxcb-glx0 libxcb-glx0-dev \
+  dav1d libdav1d-dev libvulkan-dev glslc vulkan-tools libudev-dev libudev1 libinput-dev libinput10
+
 rustup update
 
 if [ "$APPDIR" != "" ]; then
diff --git a/Cargo.lock b/Cargo.lock
index 847a98bf..ee28ae54 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -33,17 +33,6 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
-[[package]]
-name = "aes"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
-dependencies = [
- "cfg-if",
- "cipher",
- "cpufeatures 0.2.17",
-]
-
 [[package]]
 name = "ahash"
 version = "0.8.12"
@@ -98,21 +87,21 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
 name = "alsa"
-version = "0.9.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43"
+checksum = "812947049edcd670a82cd5c73c3661d2e58468577ba8489de58e1a73c04cbd5d"
 dependencies = [
  "alsa-sys",
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "cfg-if",
  "libc",
 ]
 
 [[package]]
 name = "alsa-sys"
-version = "0.3.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527"
+checksum = "ad7569085a265dd3f607ebecce7458eaab2132a84393534c95b18dcbc3f31e04"
 dependencies = [
  "libc",
  "pkg-config",
@@ -120,23 +109,21 @@ dependencies = [
 
 [[package]]
 name = "android-activity"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046"
+checksum = "0f2a1bb052857d5dd49572219344a7332b31b76405648eabac5bc68978251bcd"
 dependencies = [
  "android-properties",
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "cc",
- "cesu8",
- "jni",
- "jni-sys",
+ "jni 0.22.4",
  "libc",
  "log",
  "ndk",
  "ndk-context",
  "ndk-sys",
  "num_enum",
- "thiserror 1.0.69",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -155,10 +142,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "anstream"
-version = "0.6.21"
+name = "annotate-snippets"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a"
+checksum = "710e8eae58854cdc1790fcb56cca04d712a17be849eeb81da2a724bf4bae2bc4"
+dependencies = [
+ "anstyle",
+ "unicode-width 0.2.2",
+]
+
+[[package]]
+name = "anstream"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -171,15 +168,15 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.13"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
+checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.7"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
+checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e"
 dependencies = [
  "utf8parse",
 ]
@@ -206,9 +203,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.102"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
+checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3"
 
 [[package]]
 name = "appendlist"
@@ -244,27 +241,6 @@ version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1"
 
-[[package]]
-name = "arboard"
-version = "3.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0348a1c054491f4bfe6ab86a7b6ab1e44e45d899005de92f58b3df180b36ddaf"
-dependencies = [
- "clipboard-win",
- "image",
- "log",
- "objc2 0.6.3",
- "objc2-app-kit 0.3.2",
- "objc2-core-foundation",
- "objc2-core-graphics",
- "objc2-foundation 0.3.2",
- "parking_lot",
- "percent-encoding",
- "windows-sys 0.60.2",
- "wl-clipboard-rs",
- "x11rb",
-]
-
 [[package]]
 name = "arg_enum_proc_macro"
 version = "0.3.4"
@@ -273,7 +249,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -290,9 +266,9 @@ checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
 
 [[package]]
 name = "arrayvec"
-version = "0.7.6"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+checksum = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56"
 
 [[package]]
 name = "as-raw-xcb-connection"
@@ -318,36 +294,6 @@ dependencies = [
  "libloading 0.8.9",
 ]
 
-[[package]]
-name = "ashpd"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0986d5b4f0802160191ad75f8d33ada000558757db3defb70299ca95d9fcbd"
-dependencies = [
- "async-fs",
- "async-net",
- "enumflags2",
- "futures-channel",
- "futures-util",
- "rand 0.9.2",
- "serde",
- "serde_repr",
- "url",
- "zbus",
-]
-
-[[package]]
-name = "async-broadcast"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435a87a52755b8f27fcf321ac4f04b2802e337c8c4872923137471ec39c37532"
-dependencies = [
- "event-listener",
- "event-listener-strategy",
- "futures-core",
- "pin-project-lite",
-]
-
 [[package]]
 name = "async-channel"
 version = "2.5.0"
@@ -362,9 +308,9 @@ dependencies = [
 
 [[package]]
 name = "async-executor"
-version = "1.13.3"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497c00e0fd83a72a79a39fcbd8e3e2f055d6f6c7e025f3b3d91f4f8e76527fb8"
+checksum = "c96bf972d85afc50bf5ab8fe2d54d1586b4e0b46c97c50a0c9e71e2f7bcd812a"
 dependencies = [
  "async-task",
  "concurrent-queue",
@@ -398,7 +344,7 @@ dependencies = [
  "futures-lite",
  "parking",
  "polling",
- "rustix 1.1.3",
+ "rustix 1.1.4",
  "slab",
  "windows-sys 0.61.2",
 ]
@@ -416,13 +362,13 @@ dependencies = [
 
 [[package]]
 name = "async-native-tls"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9343dc5acf07e79ff82d0c37899f079db3534d99f189a1837c8e549c99405bec"
+checksum = "37dd6b179962fe4048a6f81d4c0d7ed419a21fdf49204b4c6b04971693358e79"
 dependencies = [
  "futures-util",
  "native-tls",
- "thiserror 1.0.69",
+ "thiserror 2.0.18",
  "url",
 ]
 
@@ -452,25 +398,14 @@ dependencies = [
  "cfg-if",
  "event-listener",
  "futures-lite",
- "rustix 1.1.3",
-]
-
-[[package]]
-name = "async-recursion"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.113",
+ "rustix 1.1.4",
 ]
 
 [[package]]
 name = "async-signal"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43c070bbf59cd3570b6b2dd54cd772527c7c3620fce8be898406dd3ed6adc64c"
+checksum = "52b5aaafa020cf5053a01f2a60e8ff5dccf550f0f77ec54a4e47285ac2bab485"
 dependencies = [
  "async-io",
  "async-lock",
@@ -478,7 +413,7 @@ dependencies = [
  "cfg-if",
  "futures-core",
  "futures-io",
- "rustix 1.1.3",
+ "rustix 1.1.4",
  "signal-hook-registry",
  "slab",
  "windows-sys 0.61.2",
@@ -498,7 +433,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -526,9 +461,9 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
 
 [[package]]
 name = "autocxx"
@@ -548,7 +483,7 @@ version = "0.71.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7d41cf081e31a74378456586b47a5bae2b75a98e5f7c248c9d9bf433e3637f4"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "cexpr",
  "clang-sys",
  "itertools 0.13.0",
@@ -556,9 +491,9 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex",
- "rustc-hash 2.1.1",
- "shlex",
- "syn 2.0.113",
+ "rustc-hash",
+ "shlex 1.3.0",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -570,7 +505,7 @@ dependencies = [
  "autocxx-engine",
  "env_logger 0.9.3",
  "indexmap 1.9.3",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -596,7 +531,7 @@ dependencies = [
  "regex",
  "rustversion",
  "serde_json",
- "syn 2.0.113",
+ "syn 2.0.118",
  "tempfile",
  "thiserror 1.0.69",
  "version_check",
@@ -612,7 +547,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -629,7 +564,7 @@ dependencies = [
  "quote",
  "serde",
  "serde_json",
- "syn 2.0.113",
+ "syn 2.0.118",
  "thiserror 1.0.69",
 ]
 
@@ -648,7 +583,7 @@ dependencies = [
  "num-traits",
  "pastey",
  "rayon",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "v_frame",
  "y4m",
 ]
@@ -669,9 +604,9 @@ dependencies = [
 
 [[package]]
 name = "avif-serialize"
-version = "0.8.6"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47c8fbc0f831f4519fe8b810b6a7a91410ec83031b8233f730a0480029f6a23f"
+checksum = "e7178fe5f7d460b13895ebb9dcb28a3a6216d2df2574a0806cb51b555d297f38"
 dependencies = [
  "arrayvec",
 ]
@@ -688,7 +623,7 @@ dependencies = [
  "miniz_oxide",
  "object",
  "rustc-demangle",
- "windows-link 0.2.1",
+ "windows-link",
 ]
 
 [[package]]
@@ -697,12 +632,6 @@ version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
-[[package]]
-name = "base64ct"
-version = "1.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06"
-
 [[package]]
 name = "bcdec_rs"
 version = "0.2.0"
@@ -715,16 +644,19 @@ version = "0.72.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
 dependencies = [
- "bitflags 2.10.0",
+ "annotate-snippets",
+ "bitflags 2.13.0",
  "cexpr",
  "clang-sys",
- "itertools 0.10.5",
+ "itertools 0.13.0",
+ "log",
+ "prettyplease",
  "proc-macro2",
  "quote",
  "regex",
- "rustc-hash 2.1.1",
- "shlex",
- "syn 2.0.113",
+ "rustc-hash",
+ "shlex 1.3.0",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -741,20 +673,32 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.10.0"
+version = "2.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
+checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
 dependencies = [
  "serde_core",
 ]
 
 [[package]]
 name = "bitstream-io"
-version = "4.9.0"
+version = "4.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60d4bd9d1db2c6bdf285e223a7fa369d5ce98ec767dec949c6ca62863ce61757"
+checksum = "7eff00be299a18769011411c9def0d827e8f2d7bf0c3dbf53633147a8867fd1f"
 dependencies = [
- "core2",
+ "no_std_io2",
+]
+
+[[package]]
+name = "bitvec"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddcec3d12c579d40898fe0a9a358a803c23e9c52ca3c425707f81c9436211837"
+dependencies = [
+ "funty",
+ "radium",
+ "tap",
+ "wyz",
 ]
 
 [[package]]
@@ -775,6 +719,15 @@ dependencies = [
  "objc2 0.5.2",
 ]
 
+[[package]]
+name = "block2"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5"
+dependencies = [
+ "objc2 0.6.4",
+]
+
 [[package]]
 name = "blocking"
 version = "1.6.2"
@@ -790,21 +743,21 @@ dependencies = [
 
 [[package]]
 name = "built"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4ad8f11f288f48ca24471bbd51ac257aaeaaa07adae295591266b792902ae64"
+checksum = "5c0e531d93d39c34eef561e929e8a7f86d77a5af08aac4f6d6e39976c51858e9"
 
 [[package]]
 name = "bumpalo"
-version = "3.19.1"
+version = "3.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510"
+checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
 
 [[package]]
 name = "bytemuck"
-version = "1.24.0"
+version = "1.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4"
+checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec"
 dependencies = [
  "bytemuck_derive",
 ]
@@ -817,7 +770,7 @@ checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -834,40 +787,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
 
 [[package]]
 name = "bytes"
-version = "1.11.1"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
-
-[[package]]
-name = "bzip2"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3a53fac24f34a81bc9954b5d6cfce0c21e18ec6959f44f56e8e90e4bb7c346c"
-dependencies = [
- "libbz2-rs-sys",
-]
-
-[[package]]
-name = "cached-path"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e79c94134331f0107c9f5b7caaf15f118ec91de67dcd3fa1145921e9fc27fa"
-dependencies = [
- "flate2",
- "fs2",
- "glob",
- "infer",
- "log",
- "rand 0.10.0",
- "reqwest",
- "serde",
- "serde_json",
- "sha2",
- "tar",
- "tempfile",
- "thiserror 2.0.17",
- "zip",
-]
+checksum = "8ae3f5d315924270530207e2a68396c3cc547f6dca3fbdca317cfb1a51edb593"
 
 [[package]]
 name = "calloop"
@@ -875,7 +797,7 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "log",
  "polling",
  "rustix 0.38.44",
@@ -885,13 +807,13 @@ dependencies = [
 
 [[package]]
 name = "calloop"
-version = "0.14.3"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb9f6e1368bd4621d2c86baa7e37de77a938adf5221e5dd3d6133340101b309e"
+checksum = "4dbf9978365bac10f54d1d4b04f7ce4427e51f71d61f2fe15e3fed5166474df7"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "polling",
- "rustix 1.1.3",
+ "rustix 1.1.4",
  "slab",
  "tracing",
 ]
@@ -914,22 +836,22 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "138efcf0940a02ebf0cc8d1eff41a1682a46b431630f4c52450d6265876021fa"
 dependencies = [
- "calloop 0.14.3",
- "rustix 1.1.3",
+ "calloop 0.14.4",
+ "rustix 1.1.4",
  "wayland-backend",
  "wayland-client",
 ]
 
 [[package]]
 name = "cc"
-version = "1.2.51"
+version = "1.2.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a0aeaff4ff1a90589618835a598e545176939b97874f7abc7851caa0618f203"
+checksum = "f5d6cac793997bd970000024b2934968efe83b382de4fdcf4fcb46b6ee4ad996"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
  "libc",
- "shlex",
+ "shlex 2.0.1",
 ]
 
 [[package]]
@@ -947,22 +869,11 @@ dependencies = [
  "nom 7.1.3",
 ]
 
-[[package]]
-name = "cfb"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f"
-dependencies = [
- "byteorder",
- "fnv",
- "uuid",
-]
-
 [[package]]
 name = "cfg-expr"
-version = "0.15.8"
+version = "0.20.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
+checksum = "fb693542bcafa528e198be0ebd9d3632ca5b7c93dbe7237460e199910835997c"
 dependencies = [
  "smallvec",
  "target-lexicon",
@@ -992,27 +903,27 @@ dependencies = [
 
 [[package]]
 name = "chacha20"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601"
+checksum = "d524456ba66e72eb8b115ff89e01e497f8e6d11d78b70b1aa13c0fbd97540a81"
 dependencies = [
  "cfg-if",
  "cpufeatures 0.3.0",
- "rand_core 0.10.0",
+ "rand_core 0.10.1",
 ]
 
 [[package]]
 name = "chrono"
-version = "0.4.42"
+version = "0.4.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
+checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327"
 dependencies = [
  "iana-time-zone",
  "js-sys",
  "num-traits",
  "pure-rust-locales",
  "wasm-bindgen",
- "windows-link 0.2.1",
+ "windows-link",
 ]
 
 [[package]]
@@ -1025,16 +936,6 @@ dependencies = [
  "phf",
 ]
 
-[[package]]
-name = "cipher"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
-dependencies = [
- "crypto-common",
- "inout",
-]
-
 [[package]]
 name = "clang-sys"
 version = "1.8.1"
@@ -1048,9 +949,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.54"
+version = "4.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6e6ff9dcd79cff5cd969a17a545d79e84ab086e444102a591e288a8aa3ce394"
+checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -1058,9 +959,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.54"
+version = "4.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa42cf4d2b7a41bc8f663a7cab4031ebafa1bf3875705bfaf8466dc60ab52c00"
+checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1070,36 +971,27 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.49"
+version = "4.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671"
+checksum = "f2ce8604710f6733aa641a2b3731eaa1e8b3d9973d5e3565da11800813f997a9"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.7.6"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
-
-[[package]]
-name = "clipboard-win"
-version = "5.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bde03770d3df201d4fb868f2c9c59e66a3e4e2bd06692a0fe701e7103c7e84d4"
-dependencies = [
- "error-code",
-]
+checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9"
 
 [[package]]
 name = "cmake"
-version = "0.1.57"
+version = "0.1.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75443c44cd6b379beb8c5b45d85d0773baf31cce901fe7bb252f4eff3008ef7d"
+checksum = "c0f78a02292a74a88ac736019ab962ece0bc380e3f977bf72e376c5d78ff0678"
 dependencies = [
  "cc",
 ]
@@ -1123,9 +1015,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
 [[package]]
 name = "colorchoice"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
+checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570"
 
 [[package]]
 name = "combine"
@@ -1148,9 +1040,9 @@ dependencies = [
 
 [[package]]
 name = "config"
-version = "0.15.19"
+version = "0.15.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b30fa8254caad766fc03cb0ccae691e14bf3bd72bfff27f72802ce729551b3d6"
+checksum = "b85f248a4de22d204ceabc6299d89d2c70fbd7f09fea53c06c852369652d8139"
 dependencies = [
  "async-trait",
  "convert_case 0.6.0",
@@ -1161,7 +1053,7 @@ dependencies = [
  "serde-untagged",
  "serde_core",
  "serde_json",
- "toml 0.9.10+spec-1.1.0",
+ "toml",
  "winnow",
  "yaml-rust2",
 ]
@@ -1181,17 +1073,11 @@ version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
 dependencies = [
- "getrandom 0.2.16",
+ "getrandom 0.2.17",
  "once_cell",
  "tiny-keccak",
 ]
 
-[[package]]
-name = "constant_time_eq"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d52eff69cd5e647efe296129160853a42795992097e8af39800e1060caeea9b"
-
 [[package]]
 name = "convert_case"
 version = "0.4.0"
@@ -1212,9 +1098,6 @@ name = "cookie-factory"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9885fa71e26b8ab7855e2ec7cae6e9b380edff76cd052e07c683a0319d51b3a2"
-dependencies = [
- "futures",
-]
 
 [[package]]
 name = "core-foundation"
@@ -1226,6 +1109,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "core-foundation"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.7"
@@ -1239,7 +1132,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
 dependencies = [
  "bitflags 1.3.2",
- "core-foundation",
+ "core-foundation 0.9.4",
  "core-graphics-types",
  "foreign-types 0.5.0",
  "libc",
@@ -1252,19 +1145,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
 dependencies = [
  "bitflags 1.3.2",
- "core-foundation",
+ "core-foundation 0.9.4",
  "libc",
 ]
 
-[[package]]
-name = "core2"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "core_maths"
 version = "0.1.1"
@@ -1276,11 +1160,11 @@ dependencies = [
 
 [[package]]
 name = "coreaudio-rs"
-version = "0.13.0"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aae284fbaf7d27aa0e292f7677dfbe26503b0d555026f702940805a630eac17"
+checksum = "7d5d7dca3ebcf65a035582c9ad4385371a9d9ee6537474d2a278f4e1e475bb58"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.13.0",
  "libc",
  "objc2-audio-toolbox",
  "objc2-core-audio",
@@ -1290,20 +1174,20 @@ dependencies = [
 
 [[package]]
 name = "cosmic-text"
-version = "0.15.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "173852283a9a57a3cbe365d86e74dc428a09c50421477d5ad6fe9d9509e37737"
+checksum = "be17b688510d934ce13f48a2beba700e11583e281e0fda99c22bb256a14eda73"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "fontdb",
  "harfrust",
  "linebender_resource_handle",
  "log",
  "rangemap",
- "rustc-hash 1.1.0",
+ "rustc-hash",
  "self_cell",
- "skrifa",
- "smol_str",
+ "skrifa 0.40.0",
+ "smol_str 0.3.6",
  "swash",
  "sys-locale",
  "unicode-bidi",
@@ -1314,14 +1198,14 @@ dependencies = [
 
 [[package]]
 name = "cpal"
-version = "0.16.0"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbd307f43cc2a697e2d1f8bc7a1d824b5269e052209e28883e5bc04d095aaa3f"
+checksum = "d8942da362c0f0d895d7cac616263f2f9424edc5687364dfd1d25ef7eba506d7"
 dependencies = [
  "alsa",
  "coreaudio-rs",
  "dasp_sample",
- "jni",
+ "jni 0.21.1",
  "js-sys",
  "libc",
  "mach2",
@@ -1329,13 +1213,17 @@ dependencies = [
  "ndk-context",
  "num-derive",
  "num-traits",
+ "objc2 0.6.4",
  "objc2-audio-toolbox",
+ "objc2-avf-audio",
  "objc2-core-audio",
  "objc2-core-audio-types",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.2",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "windows 0.54.0",
+ "windows",
 ]
 
 [[package]]
@@ -1423,9 +1311,9 @@ checksum = "f27ae1dd37df86211c42e150270f82743308803d90a6f6e6651cd730d5e1732f"
 
 [[package]]
 name = "cxx"
-version = "1.0.192"
+version = "1.0.196"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbda285ba6e5866529faf76352bdf73801d9b44a6308d7cd58ca2379f378e994"
+checksum = "ac6f8908ed0826ab0aec7c8358a4de3a9b26c5ed391a5dc5135765d2fd1aa8fb"
 dependencies = [
  "cc",
  "cxx-build",
@@ -1438,62 +1326,62 @@ dependencies = [
 
 [[package]]
 name = "cxx-build"
-version = "1.0.192"
+version = "1.0.196"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af9efde466c5d532d57efd92f861da3bdb7f61e369128ce8b4c3fe0c9de4fa4d"
+checksum = "6d8ae25c0ce72ac21a77b5deec4f49b452238ef97072f697dd6fd752b1355ecd"
 dependencies = [
  "cc",
  "codespan-reporting",
- "indexmap 2.12.1",
+ "indexmap 2.14.0",
  "proc-macro2",
  "quote",
  "scratch",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "cxx-gen"
-version = "0.7.192"
+version = "0.7.196"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee08d1131e8f050a1d1acbb7c699e5c8d29c325dffc382331c280d99f98c2618"
+checksum = "7485f0a6ffcedf9ea15636c501ca72f53e279dd8c482f733122dbb76707652c6"
 dependencies = [
  "codespan-reporting",
- "indexmap 2.12.1",
+ "indexmap 2.14.0",
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "cxxbridge-cmd"
-version = "1.0.192"
+version = "1.0.196"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3efb93799095bccd4f763ca07997dc39a69e5e61ab52d2c407d4988d21ce144d"
+checksum = "27d53791812143bd27f74ab6055f22e875f04c59bbef0ca03d714ebec6f6f484"
 dependencies = [
  "clap",
  "codespan-reporting",
- "indexmap 2.12.1",
+ "indexmap 2.14.0",
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.192"
+version = "1.0.196"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3092010228026e143b32a4463ed9fa8f86dca266af4bf5f3b2a26e113dbe4e45"
+checksum = "fd557619f7dc2252bf7373f6bec5600ce60a2b477e5b3b84eb4e074bb297795e"
 
 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.192"
+version = "1.0.196"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31d72ebfcd351ae404fb00ff378dfc9571827a00722c9e735c9181aec320ba0a"
+checksum = "7fe465fc5b9d0231ea141c4fae714a08f4f907855e1a7ca10cc90ab6c8b12ece"
 dependencies = [
- "indexmap 2.12.1",
+ "indexmap 2.14.0",
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -1516,7 +1404,7 @@ dependencies = [
  "ident_case",
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -1527,7 +1415,7 @@ checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -1539,15 +1427,17 @@ dependencies = [
  "chrono",
  "glam",
  "http-body-util",
- "hyper",
  "keyvalues-parser",
  "log",
+ "lz4_flex",
  "rust-embed",
  "serde",
  "serde_json",
  "smol",
  "smol-hyper",
  "strum",
+ "ureq",
+ "uuid",
  "wayvr-ipc",
  "wgui",
  "wlx-common",
@@ -1567,14 +1457,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be1e0bca6c3637f992fc1cc7cbc52a78c1ef6db076dbf1059c4323d6a2048376"
 
 [[package]]
-name = "dbus"
-version = "0.9.10"
+name = "dav1d-sys"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b3aa68d7e7abee336255bd7248ea965cc393f3e70411135a6f6a4b651345d4"
+checksum = "c3c91aea6668645415331133ed6f8ddf0e7f40160cd97a12d59e68716a58704b"
 dependencies = [
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "dbus"
+version = "0.9.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ab69f03cc8c4340c9c8e315114e1658e6775a9b16a04357973aa21cec22b32e"
+dependencies = [
+ "futures-channel",
+ "futures-util",
  "libc",
  "libdbus-sys",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1583,36 +1485,48 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "479dfe1e6737aa9e96c6ac7b69689dc4c32da8383f2c12744739d76afa8b66c4"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "byteorder",
  "enum-primitive-derive",
  "num-traits",
 ]
 
 [[package]]
-name = "deflate64"
-version = "0.1.11"
+name = "defmt"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "807800ff3288b621186fe0a8f3392c4652068257302709c24efd918c3dffcdc2"
+checksum = "e2953bfe4f93bbd20cc71198842756f77d161884c99ebbabc41d80231ded88d1"
+dependencies = [
+ "bitflags 1.3.2",
+ "defmt-macros",
+]
 
 [[package]]
-name = "der"
-version = "0.7.10"
+name = "defmt-macros"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
+checksum = "bad9c72e7ca2137e0dc3813245a0d282fd6daad32fd800af018306a9169b5fe8"
 dependencies = [
- "pem-rfc7468",
- "zeroize",
+ "defmt-parser",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.118",
+]
+
+[[package]]
+name = "defmt-parser"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10d60334b3b2e7c9d91ef8150abfb6fa4c1c39ebbcf4a81c2e346aad939fee3e"
+dependencies = [
+ "thiserror 2.0.18",
 ]
 
 [[package]]
 name = "deranged"
-version = "0.5.5"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587"
-dependencies = [
- "powerfmt",
-]
+checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
 
 [[package]]
 name = "derive_more"
@@ -1624,7 +1538,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -1635,7 +1549,6 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
  "block-buffer",
  "crypto-common",
- "subtle",
 ]
 
 [[package]]
@@ -1646,30 +1559,30 @@ checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
 
 [[package]]
 name = "dispatch2"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec"
+checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
 dependencies = [
- "bitflags 2.10.0",
- "objc2 0.6.3",
+ "bitflags 2.13.0",
+ "objc2 0.6.4",
 ]
 
 [[package]]
 name = "displaydoc"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "dlib"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
+checksum = "ab8ecd87370524b461f8557c119c405552c396ed91fc0a8eec68679eab26f94a"
 dependencies = [
  "libloading 0.8.9",
 ]
@@ -1694,7 +1607,7 @@ checksum = "0fbbb781877580993a8707ec48672673ec7b81eeba04cfd2310bd28c08e47c8f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -1708,9 +1621,9 @@ dependencies = [
 
 [[package]]
 name = "doctest-file"
-version = "1.0.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aac81fa3e28d21450aa4d2ac065992ba96a1d7303efbce51a95f4fd175b67562"
+checksum = "c2db04e74f0a9a93103b50e90b96024c9b2bdca8bce6a632ec71b88736d3d359"
 
 [[package]]
 name = "downcast-rs"
@@ -1732,9 +1645,9 @@ checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4"
 
 [[package]]
 name = "either"
-version = "1.15.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e"
 
 [[package]]
 name = "encoding_rs"
@@ -1745,12 +1658,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "endi"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66b7e2430c6dff6a955451e2cfc438f09cea1965a9d6f87f7e3b90decc014099"
-
 [[package]]
 name = "enum-primitive-derive"
 version = "0.2.2"
@@ -1762,53 +1669,32 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "enumflags2"
-version = "0.7.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1027f7680c853e056ebcec683615fb6fbbc07dbaa13b4d5d9442b146ded4ecef"
-dependencies = [
- "enumflags2_derive",
- "serde",
-]
-
-[[package]]
-name = "enumflags2_derive"
-version = "0.7.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.113",
-]
-
 [[package]]
 name = "enumset"
-version = "1.1.10"
+version = "1.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25b07a8dfbbbfc0064c0a6bdf9edcf966de6b1c33ce344bdeca3b41615452634"
+checksum = "839c4174b41e75c8f7306110b2c51996a293b8d1d850edd529011841d9fede7d"
 dependencies = [
  "enumset_derive",
 ]
 
 [[package]]
 name = "enumset_derive"
-version = "0.14.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43e744e4ea338060faee68ed933e46e722fb7f3617e722a5772d7e856d8b3ce"
+checksum = "4bd536557b58c682b217b8fb199afdff47cd3eff260623f19e77074eb073d63a"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "env_filter"
-version = "0.1.4"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bf3c259d255ca70051b30e2e95b5446cdb8949ac4cd22c0d7fd634d89f568e2"
+checksum = "900d271a03799a1ee8d1ca9b19893b48ca674a9284fefcfb85f05e74ed314217"
 dependencies = [
  "log",
  "regex",
@@ -1829,9 +1715,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.11.8"
+version = "0.11.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f"
+checksum = "de671bd27a75a797dc9ae289ba1e77276e75e2026408aab65185384e2d5cd3f6"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1857,7 +1743,7 @@ checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -1868,9 +1754,9 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "erased-serde"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89e8918065695684b2b0702da20382d5ae6065cf3327bc2d6436bd49a71ce9f3"
+checksum = "d2add8a07dd6a8d93ff627029c51de145e12686fbc36ecb298ac22e74cf02dec"
 dependencies = [
  "serde",
  "serde_core",
@@ -1887,31 +1773,36 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
-[[package]]
-name = "error-code"
-version = "3.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dea2df4cf52843e0452895c455a1a2cfbb842a1e7329671acf418fdc53ed4c59"
-
 [[package]]
 name = "etagere"
-version = "0.2.15"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc89bf99e5dc15954a60f707c1e09d7540e5cd9af85fa75caa0b510bc08c5342"
+checksum = "7ecb5c40d5683a270e077688f53a99eac51c1cb1ae5ba63b55590370cb3536bf"
 dependencies = [
  "euclid",
- "svg_fmt",
 ]
 
 [[package]]
 name = "euclid"
-version = "0.22.11"
+version = "0.22.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad9cdb4b747e485a12abb0e6566612956c7a1bafa3bdb8d682c5b6d403589e48"
+checksum = "f1a05365e3b1c6d1650318537c7460c6923f1abdd272ad6842baa2b509957a06"
 dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "evdev"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25b686663ba7f08d92880ff6ba22170f1df4e83629341cba34cf82cd65ebea99"
+dependencies = [
+ "bitvec",
+ "cfg-if",
+ "libc",
+ "nix",
+]
+
 [[package]]
 name = "event-listener"
 version = "5.4.1"
@@ -1950,29 +1841,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.3.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
-
-[[package]]
-name = "fax"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f05de7d48f37cd6730705cbca900770cab77a89f413d23e100ad7fad7795a0ab"
-dependencies = [
- "fax_derive",
-]
-
-[[package]]
-name = "fax_derive"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0aca10fb742cb43f9e7bb8467c91aa9bcb8e3ffbc6a6f7389bb93ffc920577d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.113",
-]
+checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
 
 [[package]]
 name = "fdeflate"
@@ -1983,22 +1854,11 @@ dependencies = [
  "simd-adler32",
 ]
 
-[[package]]
-name = "filetime"
-version = "0.2.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f98844151eee8917efc50bd9e8318cb963ae8b297431495d3f758616ea5c57db"
-dependencies = [
- "cfg-if",
- "libc",
- "libredox",
-]
-
 [[package]]
 name = "find-msvc-tools"
-version = "0.1.6"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645cbb3a84e60b7531617d5ae4e57f7e27308f6445f5abf653209ea76dec8dff"
+checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
 
 [[package]]
 name = "fixedbitset"
@@ -2014,12 +1874,11 @@ checksum = "b7ac824320a75a52197e8f2d787f6a38b6718bb6897a35142d749af3c0e8f4fe"
 
 [[package]]
 name = "flate2"
-version = "1.1.5"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb"
+checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c"
 dependencies = [
  "crc32fast",
- "libz-rs-sys",
  "miniz_oxide",
 ]
 
@@ -2049,9 +1908,9 @@ checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
 
 [[package]]
 name = "font-types"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39a654f404bbcbd48ea58c617c2993ee91d1cb63727a37bf2323a4edeed1b8c5"
+checksum = "5b38ad915f6dadd993ced50848a8291a543bd41ca62bc10740d5e64e2ab4cfd7"
 dependencies = [
  "bytemuck",
 ]
@@ -2106,7 +1965,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -2131,26 +1990,22 @@ dependencies = [
 ]
 
 [[package]]
-name = "fs2"
-version = "0.4.3"
+name = "fs_extra"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
-dependencies = [
- "libc",
- "winapi",
-]
+checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
 
 [[package]]
-name = "fst"
-version = "0.4.7"
+name = "funty"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a"
+checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "futures"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
+checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2163,9 +2018,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -2173,15 +2028,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
+checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -2190,9 +2045,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718"
 
 [[package]]
 name = "futures-lite"
@@ -2209,32 +2064,32 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893"
 
 [[package]]
 name = "futures-task"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
 
 [[package]]
 name = "futures-util"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2244,7 +2099,6 @@ dependencies = [
  "futures-task",
  "memchr",
  "pin-project-lite",
- "pin-utils",
  "slab",
 ]
 
@@ -2264,8 +2118,8 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8"
 dependencies = [
- "rustix 1.1.3",
- "windows-link 0.2.1",
+ "rustix 1.1.4",
+ "windows-link",
 ]
 
 [[package]]
@@ -2281,9 +2135,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
+checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
 dependencies = [
  "cfg-if",
  "libc",
@@ -2304,25 +2158,21 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
+checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099"
 dependencies = [
  "cfg-if",
- "js-sys",
  "libc",
  "r-efi 6.0.0",
- "rand_core 0.10.0",
- "wasip2",
- "wasip3",
- "wasm-bindgen",
+ "rand_core 0.10.1",
 ]
 
 [[package]]
 name = "gif"
-version = "0.14.1"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5df2ba84018d80c213569363bdcd0c64e6933c67fe4c1d60ecf822971a3c35e"
+checksum = "ee8cfcc411d9adbbaba82fb72661cc1bcca13e8bba98b364e62b2dba8f960159"
 dependencies = [
  "color_quant",
  "weezl",
@@ -2336,9 +2186,9 @@ checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7"
 
 [[package]]
 name = "glam"
-version = "0.30.9"
+version = "0.30.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd47b05dddf0005d850e5644cae7f2b14ac3df487979dbfff3b56f20b1a6ae46"
+checksum = "19fc433e8437a212d1b6f1e68c7824af3aed907da60afa994e7f542d18d12aa9"
 dependencies = [
  "mint",
  "serde_core",
@@ -2352,28 +2202,9 @@ checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
 
 [[package]]
 name = "grid"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9e2d4c0a8296178d8802098410ca05d86b17a10bb5ab559b3fb404c1f948220"
-
-[[package]]
-name = "h2"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386"
-dependencies = [
- "atomic-waker",
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "http",
- "indexmap 2.12.1",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
+checksum = "b40ca9252762c466af32d0b1002e91e4e1bc5398f77455e55474deb466355ff5"
 
 [[package]]
 name = "half"
@@ -2389,14 +2220,14 @@ dependencies = [
 
 [[package]]
 name = "harfrust"
-version = "0.3.2"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92c020db12c71d8a12a3fe7607873cade3a01a6287e29d540c8723276221b9d8"
+checksum = "9da2e5ae821f6e96664977bf974d6d6a2d6682f9ccee23e62ec1d134246845f9"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "bytemuck",
  "core_maths",
- "read-fonts",
+ "read-fonts 0.37.0",
  "smallvec",
 ]
 
@@ -2426,6 +2257,15 @@ name = "hashbrown"
 version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
+dependencies = [
+ "foldhash 0.2.0",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.17.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
 dependencies = [
  "allocator-api2",
  "equivalent",
@@ -2434,11 +2274,11 @@ dependencies = [
 
 [[package]]
 name = "hashlink"
-version = "0.10.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
+checksum = "824e001ac4f3012dd16a264bec811403a67ca9deb6c102fc5049b32c4574b35f"
 dependencies = [
- "hashbrown 0.15.5",
+ "hashbrown 0.16.1",
 ]
 
 [[package]]
@@ -2462,6 +2302,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "hermit-abi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+
 [[package]]
 name = "hermit-abi"
 version = "0.5.2"
@@ -2474,21 +2320,6 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
-[[package]]
-name = "hmac"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
-dependencies = [
- "digest",
-]
-
-[[package]]
-name = "hmac-sha256"
-version = "1.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec9d92d097f4749b64e8cc33d924d9f40a2d4eb91402b458014b781f5733d60f"
-
 [[package]]
 name = "hound"
 version = "3.5.1"
@@ -2497,9 +2328,9 @@ checksum = "62adaabb884c94955b19907d60019f4e145d091c75345379e70d1ee696f7854f"
 
 [[package]]
 name = "http"
-version = "1.4.0"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a"
+checksum = "6970f50e31d6fc17d3fa27329444bfa74e196cf62e95052a3f6fee181dba6425"
 dependencies = [
  "bytes",
  "itoa",
@@ -2536,76 +2367,27 @@ checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
 
 [[package]]
 name = "humantime"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424"
+checksum = "15cdd26707701c53297e2fa6afb323d55fbc1d0810c3aec078ae3ef0424c3c15"
 
 [[package]]
 name = "hyper"
-version = "1.8.1"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11"
+checksum = "55281c53a1894c864990125767da440a4e630446785086f52523b20033b74498"
 dependencies = [
- "atomic-waker",
  "bytes",
- "futures-channel",
- "futures-core",
- "h2",
  "http",
  "http-body",
- "httparse",
- "itoa",
- "pin-project-lite",
- "pin-utils",
- "smallvec",
  "tokio",
- "want",
-]
-
-[[package]]
-name = "hyper-tls"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
-dependencies = [
- "bytes",
- "http-body-util",
- "hyper",
- "hyper-util",
- "native-tls",
- "tokio",
- "tokio-native-tls",
- "tower-service",
-]
-
-[[package]]
-name = "hyper-util"
-version = "0.1.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0"
-dependencies = [
- "base64",
- "bytes",
- "futures-channel",
- "futures-util",
- "http",
- "http-body",
- "hyper",
- "ipnet",
- "libc",
- "percent-encoding",
- "pin-project-lite",
- "socket2",
- "tokio",
- "tower-service",
- "tracing",
 ]
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.64"
+version = "0.1.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb"
+checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -2613,7 +2395,7 @@ dependencies = [
  "js-sys",
  "log",
  "wasm-bindgen",
- "windows-core 0.62.2",
+ "windows-core",
 ]
 
 [[package]]
@@ -2627,12 +2409,13 @@ dependencies = [
 
 [[package]]
 name = "icu_collections"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43"
+checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c"
 dependencies = [
  "displaydoc",
  "potential_utf",
+ "utf8_iter",
  "yoke",
  "zerofrom",
  "zerovec",
@@ -2640,9 +2423,9 @@ dependencies = [
 
 [[package]]
 name = "icu_locale_core"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6"
+checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29"
 dependencies = [
  "displaydoc",
  "litemap",
@@ -2653,9 +2436,9 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599"
+checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4"
 dependencies = [
  "icu_collections",
  "icu_normalizer_data",
@@ -2667,15 +2450,15 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer_data"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a"
+checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38"
 
 [[package]]
 name = "icu_properties"
-version = "2.1.2"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec"
+checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de"
 dependencies = [
  "icu_collections",
  "icu_locale_core",
@@ -2687,15 +2470,15 @@ dependencies = [
 
 [[package]]
 name = "icu_properties_data"
-version = "2.1.2"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af"
+checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14"
 
 [[package]]
 name = "icu_provider"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614"
+checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421"
 dependencies = [
  "displaydoc",
  "icu_locale_core",
@@ -2706,12 +2489,6 @@ dependencies = [
  "zerovec",
 ]
 
-[[package]]
-name = "id-arena"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
-
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -2725,7 +2502,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f913e1c362b7de59b3fddfe286f92470275aef99d33cf96dfd8ec6d1bfb5b6ae"
 dependencies = [
  "hex",
- "rand 0.8.5",
+ "rand 0.8.6",
  "random_color",
  "simple-xml-builder",
 ]
@@ -2748,7 +2525,7 @@ checksum = "ac03bebb34669b3ef9c04ab65926ddf3513f5b5b74b45c540bf250829a1e92eb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -2764,9 +2541,9 @@ dependencies = [
 
 [[package]]
 name = "idna_adapter"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
+checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714"
 dependencies = [
  "icu_normalizer",
  "icu_properties",
@@ -2774,9 +2551,9 @@ dependencies = [
 
 [[package]]
 name = "image"
-version = "0.25.9"
+version = "0.25.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6506c6c10786659413faa717ceebcb8f70731c0a60cbae39795fdf114519c1a"
+checksum = "85ab80394333c02fe689eaf900ab500fbd0c2213da414687ebf995a65d5a6104"
 dependencies = [
  "bytemuck",
  "byteorder-lite",
@@ -2786,12 +2563,11 @@ dependencies = [
  "image-webp",
  "moxcms",
  "num-traits",
- "png 0.18.0",
+ "png",
  "ravif",
  "rayon",
- "tiff",
- "zune-core 0.5.0",
- "zune-jpeg 0.5.8",
+ "zune-core",
+ "zune-jpeg",
 ]
 
 [[package]]
@@ -2819,15 +2595,15 @@ dependencies = [
 
 [[package]]
 name = "imagesize"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285"
+checksum = "09e54e57b4c48b40f7aec75635392b12b3421fa26fe8b4332e63138ed278459c"
 
 [[package]]
 name = "imgref"
-version = "1.12.0"
+version = "1.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7c5cedc30da3a610cac6b4ba17597bdf7152cf974e8aab3afb3d54455e371c8"
+checksum = "89194689a993ab15268672e99e7b0e19da2da3268ac682e8f02d29d4d1434cd7"
 
 [[package]]
 name = "indexmap"
@@ -2842,14 +2618,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.12.1"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2"
+checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
 dependencies = [
  "equivalent",
- "hashbrown 0.16.1",
- "serde",
- "serde_core",
+ "hashbrown 0.17.1",
 ]
 
 [[package]]
@@ -2859,21 +2633,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306"
 
 [[package]]
-name = "infer"
-version = "0.19.0"
+name = "input"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a588916bfdfd92e71cacef98a63d9b1f0d74d6599980d11894290e7ddefffcf7"
+checksum = "fbdc09524a91f9cacd26f16734ff63d7dc650daffadd2b6f84d17a285bd875a9"
 dependencies = [
- "cfb",
-]
-
-[[package]]
-name = "inout"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
-dependencies = [
- "generic-array",
+ "bitflags 2.13.0",
+ "input-sys",
+ "libc",
+ "udev",
 ]
 
 [[package]]
@@ -2883,7 +2651,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b7e8c4821c88b95582ca69234a1d233f87e44182c42e121f740efb0bec1142e0"
 dependencies = [
  "input-linux-sys",
- "nix 0.29.0",
+ "nix",
 ]
 
 [[package]]
@@ -2893,9 +2661,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b91b2248b0eaf0a576ef5e60b7f2107a749e705a876bc0b9fe952ac8d83a724"
 dependencies = [
  "libc",
- "nix 0.29.0",
+ "nix",
 ]
 
+[[package]]
+name = "input-sys"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36eee07d8e02bd95bf52b2e642cf13d33701b94c6e4b04fbf1d1fb07e9cb19e7"
+
 [[package]]
 name = "interpolate_name"
 version = "0.2.4"
@@ -2904,38 +2678,31 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "interprocess"
-version = "2.2.3"
+version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d941b405bd2322993887859a8ee6ac9134945a24ec5ec763a8a962fc64dfec2d"
+checksum = "069323743400cb7ab06a8fe5c1ed911d36b6919ec531661d034c89083629595b"
 dependencies = [
  "doctest-file",
- "futures-core",
  "libc",
  "recvmsg",
- "tokio",
  "widestring",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
-name = "ipnet"
-version = "2.12.0"
+name = "io-lifetimes"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2"
-
-[[package]]
-name = "iri-string"
-version = "0.7.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c91338f0783edbd6195decb37bae672fd3b165faffb89bf7b9e6942f8b1a731a"
+checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
 dependencies = [
- "memchr",
- "serde",
+ "hermit-abi 0.3.9",
+ "libc",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -2982,16 +2749,17 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
 
 [[package]]
 name = "jiff"
-version = "0.2.17"
+version = "0.2.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a87d9b8105c23642f50cbbae03d1f75d8422c5cb98ce7ee9271f7ff7505be6b8"
+checksum = "ccfe6121cbe750cf81efa362d85c0bde7ea298ec43092d3a193baca59cdbd634"
 dependencies = [
+ "defmt",
  "jiff-static",
  "log",
  "portable-atomic",
@@ -3001,13 +2769,13 @@ dependencies = [
 
 [[package]]
 name = "jiff-static"
-version = "0.2.17"
+version = "0.2.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b787bebb543f8969132630c51fd0afab173a86c6abae56ff3b9e5e3e3f9f6e58"
+checksum = "e165e897f662d428f3cd3828a919dbe067c2d42bb1031eede74ef9d27ecdedd2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -3019,7 +2787,7 @@ dependencies = [
  "cesu8",
  "cfg-if",
  "combine",
- "jni-sys",
+ "jni-sys 0.3.1",
  "log",
  "thiserror 1.0.69",
  "walkdir",
@@ -3027,28 +2795,81 @@ dependencies = [
 ]
 
 [[package]]
-name = "jni-sys"
-version = "0.3.0"
+name = "jni"
+version = "0.22.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
+checksum = "5efd9a482cf3a427f00d6b35f14332adc7902ce91efb778580e180ff90fa3498"
+dependencies = [
+ "cfg-if",
+ "combine",
+ "jni-macros",
+ "jni-sys 0.4.1",
+ "log",
+ "simd_cesu8",
+ "thiserror 2.0.18",
+ "walkdir",
+ "windows-link",
+]
+
+[[package]]
+name = "jni-macros"
+version = "0.22.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a00109accc170f0bdb141fed3e393c565b6f5e072365c3bd58f5b062591560a3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "rustc_version",
+ "simd_cesu8",
+ "syn 2.0.118",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41a652e1f9b6e0275df1f15b32661cf0d4b78d4d87ddec5e0c3c20f097433258"
+dependencies = [
+ "jni-sys 0.4.1",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2"
+dependencies = [
+ "jni-sys-macros",
+]
+
+[[package]]
+name = "jni-sys-macros"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264"
+dependencies = [
+ "quote",
+ "syn 2.0.118",
+]
 
 [[package]]
 name = "jobserver"
-version = "0.1.34"
+version = "0.1.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
+checksum = "1c00acbd29eabad4a2392fa0e921c874934dbbf4194312ad20f04a0ed67a3cb3"
 dependencies = [
- "getrandom 0.3.4",
+ "getrandom 0.4.3",
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.83"
+version = "0.3.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8"
+checksum = "53b44bfcdb3f8d5837a46dae1ca9660a837176eee74a28b229bc626816589102"
 dependencies = [
- "once_cell",
+ "cfg-if",
+ "futures-util",
  "wasm-bindgen",
 ]
 
@@ -3071,9 +2892,9 @@ dependencies = [
 
 [[package]]
 name = "json5"
-version = "1.3.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56c86c72f9e1d3fe29baa32cab8896548eef9aae271fce4e796d16b583fdf6d5"
+checksum = "733a844dbd6fef128e98cb4487b887cb55454d92cd9994b1bafe004fabbe670c"
 dependencies = [
  "serde",
  "ucd-trie",
@@ -3082,19 +2903,20 @@ dependencies = [
 [[package]]
 name = "keyvalues-parser"
 version = "0.2.2"
-source = "git+https://github.com/CosmicHorrorDev/vdf-rs.git?rev=fc6dcbea9eb13cacb98dea40063f6f56cde6e145#fc6dcbea9eb13cacb98dea40063f6f56cde6e145"
+source = "git+https://codeberg.org/CosmicHarper/vdf-rs.git?rev=fc6dcbea9eb13cacb98dea40063f6f56cde6e145#fc6dcbea9eb13cacb98dea40063f6f56cde6e145"
 dependencies = [
  "pest",
 ]
 
 [[package]]
 name = "kurbo"
-version = "0.11.3"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62026ae44756f8a599ba21140f350303d4f08dcdcc71b5ad9c9bb8128c13c62"
+checksum = "4b60dfc32f652b926df6192e55525b16d186c69d47876c3ead4da5cc9f8450e2"
 dependencies = [
  "arrayvec",
  "euclid",
+ "polycool",
  "smallvec",
 ]
 
@@ -3104,29 +2926,17 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
-[[package]]
-name = "leb128fmt"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
-
 [[package]]
 name = "lebe"
 version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a79a3332a6609480d7d0c9eab957bca6b455b91bb84e66d19f5ff66294b85b8"
 
-[[package]]
-name = "libbz2-rs-sys"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c4a545a15244c7d945065b5d392b2d2d7f21526fba56ce51467b06ed445e8f7"
-
 [[package]]
 name = "libc"
-version = "0.2.179"
+version = "0.2.186"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5a2d376baa530d1238d133232d15e239abad80d05838b4b59354e5268af431f"
+checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
 
 [[package]]
 name = "libdbus-sys"
@@ -3139,9 +2949,9 @@ dependencies = [
 
 [[package]]
 name = "libfuzzer-sys"
-version = "0.4.10"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5037190e1f70cbeef565bd267599242926f724d3b8a9f510fd7e0b540cfa4404"
+checksum = "a9fd2f41a1cba099f79a0b6b6c35656cf7c03351a7bae8ff0f28f25270f929d2"
 dependencies = [
  "arbitrary",
  "cc",
@@ -3154,7 +2964,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
 dependencies = [
  "cfg-if",
- "windows-link 0.2.1",
+ "windows-link",
 ]
 
 [[package]]
@@ -3164,19 +2974,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "754ca22de805bb5744484a5b151a9e1a8e837d5dc232c2d7d8c2e3492edc8b60"
 dependencies = [
  "cfg-if",
- "windows-link 0.2.1",
+ "windows-link",
 ]
 
 [[package]]
 name = "libm"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
+checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
 
 [[package]]
 name = "libmonado"
 version = "1.6.0"
-source = "git+https://github.com/oo8dev/libmonado-rs.git?rev=fc39940a64dea2df080a0d2c974c7d651006241f#fc39940a64dea2df080a0d2c974c7d651006241f"
+source = "git+https://github.com/wayvr-org/libmonado-rs.git?rev=6f66b26930c24a8a2fc57ddcd85704784894c750#6f66b26930c24a8a2fc57ddcd85704784894c750"
 dependencies = [
  "dlopen2",
  "flagset",
@@ -3190,35 +3000,37 @@ dependencies = [
 
 [[package]]
 name = "libredox"
-version = "0.1.12"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616"
+checksum = "c943259e342f1e06ff2da7a83eabdfe7f92ce10262688dbf1895ff0b3e6e4652"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "libc",
- "redox_syscall 0.7.0",
+ "plain",
+ "redox_syscall 0.9.0",
 ]
 
 [[package]]
 name = "libspa"
-version = "0.8.0"
-source = "git+https://gitlab.freedesktop.org/galister/pipewire-rs.git?rev=6ef2cd1af41e5e8844c63c37ea9a01f0758079b0#6ef2cd1af41e5e8844c63c37ea9a01f0758079b0"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2909f3be29d674e7f10604aff18d1bbe1bb03c4cd61c8a8ba19c0b1d162f7d4e"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "cc",
- "convert_case 0.6.0",
  "cookie-factory",
  "libc",
  "libspa-sys",
- "nix 0.27.1",
- "nom 7.1.3",
+ "nom 8.0.0",
+ "rustix 1.1.4",
  "system-deps",
 ]
 
 [[package]]
 name = "libspa-sys"
-version = "0.8.0"
-source = "git+https://gitlab.freedesktop.org/galister/pipewire-rs.git?rev=6ef2cd1af41e5e8844c63c37ea9a01f0758079b0#6ef2cd1af41e5e8844c63c37ea9a01f0758079b0"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69ad52764fca54818486f3cf75afec844d1f1a1568c24dcee25d41b1ab007dda"
 dependencies = [
  "bindgen",
  "cc",
@@ -3226,12 +3038,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "libz-rs-sys"
-version = "0.5.5"
+name = "libudev-sys"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c10501e7805cee23da17c7790e59df2870c0d4043ec6d03f67d31e2b53e77415"
+checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324"
 dependencies = [
- "zlib-rs",
+ "libc",
+ "pkg-config",
 ]
 
 [[package]]
@@ -3257,15 +3070,15 @@ checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.11.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
+checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
 
 [[package]]
 name = "litemap"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
+checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0"
 
 [[package]]
 name = "lock_api"
@@ -3278,9 +3091,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.29"
+version = "0.4.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
+checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad"
 
 [[package]]
 name = "log-panics"
@@ -3303,33 +3116,27 @@ dependencies = [
 
 [[package]]
 name = "lru"
-version = "0.16.2"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96051b46fc183dc9cd4a223960ef37b9af631b55191852a8274bfef064cda20f"
+checksum = "0b6180140927ee907000b0aa540091f6ea512ead4447c92b8fc35bc72788a5a6"
 dependencies = [
- "hashbrown 0.16.1",
+ "hashbrown 0.17.1",
 ]
 
 [[package]]
-name = "lzma-rust2"
-version = "0.15.7"
+name = "lz4_flex"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1670343e58806300d87950e3401e820b519b9384281bbabfb15e3636689ffd69"
-
-[[package]]
-name = "lzma-rust2"
-version = "0.16.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47bb1e988e6fb779cf720ad431242d3f03167c1b3f2b1aae7f1a94b2495b36ae"
+checksum = "7ef0d4ed8669f8f8826eb00dc878084aa8f253506c4fd5e8f58f5bce72ddb97e"
 dependencies = [
- "sha2",
+ "twox-hash",
 ]
 
 [[package]]
 name = "mach2"
-version = "0.4.3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d640282b302c0bb0a2a8e0233ead9035e3bed871f0b7e81fe4a1ec829765db44"
+checksum = "6a1b95cd5421ec55b445b5ae102f5ea0e768de1f82bd3001e11f426c269c3aea"
 dependencies = [
  "libc",
 ]
@@ -3340,17 +3147,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
 dependencies = [
- "regex-automata 0.4.13",
-]
-
-[[package]]
-name = "matrixmultiply"
-version = "0.3.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06de3016e9fae57a36fd14dba131fccf49f74b40b7fbdb472f96e361ec71a08"
-dependencies = [
- "autocfg",
- "rawpointer",
+ "regex-automata",
 ]
 
 [[package]]
@@ -3365,38 +3162,19 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.6"
+version = "2.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
-
-[[package]]
-name = "memmap"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
-dependencies = [
- "libc",
- "winapi",
-]
+checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4"
 
 [[package]]
 name = "memmap2"
-version = "0.9.9"
+version = "0.9.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "744133e4a0e0a658e1374cf3bf8e415c4052a15a111acd372764c55b4177d490"
+checksum = "d1219ed1b7f229ee7104d281dd01d6802fe28bb6e95d292942c4daacdeb798c0"
 dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "memoffset"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "miette"
 version = "5.10.0"
@@ -3417,7 +3195,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -3442,17 +3220,6 @@ version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
 
-[[package]]
-name = "mio"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc"
-dependencies = [
- "libc",
- "wasi 0.11.1+wasi-snapshot-preview1",
- "windows-sys 0.61.2",
-]
-
 [[package]]
 name = "moveit"
 version = "0.6.0"
@@ -3464,9 +3231,9 @@ dependencies = [
 
 [[package]]
 name = "moxcms"
-version = "0.7.11"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac9557c559cd6fc9867e122e20d2cbefc9ca29d80d027a8e39310920ed2f0a97"
+checksum = "bb85c154ba489f01b25c0d36ae69a87e4a1c73a72631fc6c0eb6dde34a73e44b"
 dependencies = [
  "num-traits",
  "pxfm",
@@ -3480,9 +3247,9 @@ checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084"
 
 [[package]]
 name = "native-tls"
-version = "0.2.14"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
+checksum = "465500e14ea162429d264d44189adc38b199b62b1c21eea9f69e4b73cb03bbf2"
 dependencies = [
  "libc",
  "log",
@@ -3495,29 +3262,14 @@ dependencies = [
  "tempfile",
 ]
 
-[[package]]
-name = "ndarray"
-version = "0.17.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520080814a7a6b4a6e9070823bb24b4531daac8c4627e08ba5de8c5ef2f2752d"
-dependencies = [
- "matrixmultiply",
- "num-complex",
- "num-integer",
- "num-traits",
- "portable-atomic",
- "portable-atomic-util",
- "rawpointer",
-]
-
 [[package]]
 name = "ndk"
 version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
 dependencies = [
- "bitflags 2.10.0",
- "jni-sys",
+ "bitflags 2.13.0",
+ "jni-sys 0.3.1",
  "log",
  "ndk-sys",
  "num_enum",
@@ -3537,7 +3289,7 @@ version = "0.6.0+11769913"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873"
 dependencies = [
- "jni-sys",
+ "jni-sys 0.3.1",
 ]
 
 [[package]]
@@ -3546,40 +3298,25 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
-[[package]]
-name = "nix"
-version = "0.27.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
-dependencies = [
- "bitflags 2.10.0",
- "cfg-if",
- "libc",
-]
-
 [[package]]
 name = "nix"
 version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "cfg-if",
  "cfg_aliases",
  "libc",
 ]
 
 [[package]]
-name = "nix"
-version = "0.30.1"
+name = "no_std_io2"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
+checksum = "418abd1b6d34fbf6cae440dc874771b0525a604428704c76e48b29a5e67b8003"
 dependencies = [
- "bitflags 2.10.0",
- "cfg-if",
- "cfg_aliases",
- "libc",
- "memoffset",
+ "memchr",
 ]
 
 [[package]]
@@ -3609,18 +3346,18 @@ checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8"
 
 [[package]]
 name = "normpath"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf23ab2b905654b4cb177e30b629937b3868311d4e1cba859f899c041046e69b"
+checksum = "b9985ef7269fa99f3b12437bb698381da2428743ab90f20393f399fa14cab21a"
 dependencies = [
  "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "ntapi"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c70f219e21142367c70c0b30c6a9e3a14d55b4d12a204d897fbec83a0363f081"
+checksum = "c3b335231dfd352ffb0f8017f3b6027a4917f7df785ea2143d8af2adc66980ae"
 dependencies = [
  "winapi",
 ]
@@ -3636,28 +3373,19 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.6"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+checksum = "c89e69e7e0f03bea5ef08013795c25018e101932225a656383bd384495ecc367"
 dependencies = [
  "num-integer",
  "num-traits",
 ]
 
-[[package]]
-name = "num-complex"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "num-conv"
-version = "0.2.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050"
+checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441"
 
 [[package]]
 name = "num-derive"
@@ -3667,7 +3395,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -3701,9 +3429,9 @@ dependencies = [
 
 [[package]]
 name = "num_enum"
-version = "0.7.5"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1207a7e20ad57b847bbddc6776b968420d38292bbfe2089accff5e19e82454c"
+checksum = "5d0bca838442ec211fa11de3a8b0e0e8f3a4522575b5c4c06ed722e005036f26"
 dependencies = [
  "num_enum_derive",
  "rustversion",
@@ -3711,14 +3439,14 @@ dependencies = [
 
 [[package]]
 name = "num_enum_derive"
-version = "0.7.5"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7"
+checksum = "680998035259dcfcafe653688bf2aa6d3e2dc05e98be6ab46afb089dc84f1df8"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -3739,9 +3467,9 @@ dependencies = [
 
 [[package]]
 name = "objc2"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7c2599ce0ec54857b29ce62166b0ed9b4f6f1a70ccc9a71165b6154caca8c05"
+checksum = "3a12a8ed07aefc768292f076dc3ac8c48f3781c8f2d5851dd3d98950e8c5a89f"
 dependencies = [
  "objc2-encode",
 ]
@@ -3752,8 +3480,8 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
 dependencies = [
- "bitflags 2.10.0",
- "block2",
+ "bitflags 2.13.0",
+ "block2 0.5.1",
  "libc",
  "objc2 0.5.2",
  "objc2-core-data",
@@ -3762,41 +3490,39 @@ dependencies = [
  "objc2-quartz-core 0.2.2",
 ]
 
-[[package]]
-name = "objc2-app-kit"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
-dependencies = [
- "bitflags 2.10.0",
- "objc2 0.6.3",
- "objc2-core-graphics",
- "objc2-foundation 0.3.2",
-]
-
 [[package]]
 name = "objc2-audio-toolbox"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6948501a91121d6399b79abaa33a8aa4ea7857fe019f341b8c23ad6e81b79b08"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "libc",
- "objc2 0.6.3",
+ "objc2 0.6.4",
  "objc2-core-audio",
  "objc2-core-audio-types",
  "objc2-core-foundation",
  "objc2-foundation 0.3.2",
 ]
 
+[[package]]
+name = "objc2-avf-audio"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13a380031deed8e99db00065c45937da434ca987c034e13b87e4441f9e4090be"
+dependencies = [
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
+]
+
 [[package]]
 name = "objc2-cloud-kit"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
 dependencies = [
- "bitflags 2.10.0",
- "block2",
+ "bitflags 2.13.0",
+ "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-core-location",
  "objc2-foundation 0.2.2",
@@ -3808,7 +3534,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889"
 dependencies = [
- "block2",
+ "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
 ]
@@ -3820,9 +3546,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1eebcea8b0dbff5f7c8504f3107c68fc061a3eb44932051c8cf8a68d969c3b2"
 dependencies = [
  "dispatch2",
- "objc2 0.6.3",
+ "objc2 0.6.4",
  "objc2-core-audio-types",
  "objc2-core-foundation",
+ "objc2-foundation 0.3.2",
 ]
 
 [[package]]
@@ -3831,8 +3558,8 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a89f2ec274a0cf4a32642b2991e8b351a404d290da87bb6a9a9d8632490bd1c"
 dependencies = [
- "bitflags 2.10.0",
- "objc2 0.6.3",
+ "bitflags 2.13.0",
+ "objc2 0.6.4",
 ]
 
 [[package]]
@@ -3841,8 +3568,8 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
 dependencies = [
- "bitflags 2.10.0",
- "block2",
+ "bitflags 2.13.0",
+ "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
 ]
@@ -3853,22 +3580,11 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
+ "block2 0.6.2",
  "dispatch2",
- "objc2 0.6.3",
-]
-
-[[package]]
-name = "objc2-core-graphics"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
-dependencies = [
- "bitflags 2.10.0",
- "dispatch2",
- "objc2 0.6.3",
- "objc2-core-foundation",
- "objc2-io-surface",
+ "libc",
+ "objc2 0.6.4",
 ]
 
 [[package]]
@@ -3877,7 +3593,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"
 dependencies = [
- "block2",
+ "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
  "objc2-metal 0.2.2",
@@ -3889,7 +3605,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781"
 dependencies = [
- "block2",
+ "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-contacts",
  "objc2-foundation 0.2.2",
@@ -3907,8 +3623,8 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
 dependencies = [
- "bitflags 2.10.0",
- "block2",
+ "bitflags 2.13.0",
+ "block2 0.5.1",
  "dispatch",
  "libc",
  "objc2 0.5.2",
@@ -3920,8 +3636,10 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
 dependencies = [
- "bitflags 2.10.0",
- "objc2 0.6.3",
+ "bitflags 2.13.0",
+ "block2 0.6.2",
+ "libc",
+ "objc2 0.6.4",
  "objc2-core-foundation",
 ]
 
@@ -3935,26 +3653,15 @@ dependencies = [
  "objc2-core-foundation",
 ]
 
-[[package]]
-name = "objc2-io-surface"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
-dependencies = [
- "bitflags 2.10.0",
- "objc2 0.6.3",
- "objc2-core-foundation",
-]
-
 [[package]]
 name = "objc2-link-presentation"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398"
 dependencies = [
- "block2",
+ "block2 0.5.1",
  "objc2 0.5.2",
- "objc2-app-kit 0.2.2",
+ "objc2-app-kit",
  "objc2-foundation 0.2.2",
 ]
 
@@ -3964,8 +3671,8 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
 dependencies = [
- "bitflags 2.10.0",
- "block2",
+ "bitflags 2.13.0",
+ "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
 ]
@@ -3976,8 +3683,19 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0125f776a10d00af4152d74616409f0d4a2053a6f57fa5b7d6aa2854ac04794"
 dependencies = [
- "bitflags 2.10.0",
- "objc2 0.6.3",
+ "bitflags 2.13.0",
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
+]
+
+[[package]]
+name = "objc2-open-directory"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb82bed227edf5201dfedf072bba4015a33d3d4a98519837295a90f0a23f676d"
+dependencies = [
+ "objc2 0.6.4",
+ "objc2-core-foundation",
  "objc2-foundation 0.3.2",
 ]
 
@@ -3987,8 +3705,8 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
 dependencies = [
- "bitflags 2.10.0",
- "block2",
+ "bitflags 2.13.0",
+ "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
  "objc2-metal 0.2.2",
@@ -4000,8 +3718,8 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
 dependencies = [
- "bitflags 2.10.0",
- "objc2 0.6.3",
+ "bitflags 2.13.0",
+ "objc2 0.6.4",
  "objc2-core-foundation",
  "objc2-foundation 0.3.2",
  "objc2-metal 0.3.2",
@@ -4023,8 +3741,8 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
 dependencies = [
- "bitflags 2.10.0",
- "block2",
+ "bitflags 2.13.0",
+ "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-cloud-kit",
  "objc2-core-data",
@@ -4044,7 +3762,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe"
 dependencies = [
- "block2",
+ "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
 ]
@@ -4055,8 +3773,8 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
 dependencies = [
- "bitflags 2.10.0",
- "block2",
+ "bitflags 2.13.0",
+ "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-core-location",
  "objc2-foundation 0.2.2",
@@ -4073,9 +3791,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.21.3"
+version = "1.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 
 [[package]]
 name = "once_cell_polyfill"
@@ -4085,15 +3803,14 @@ checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
 
 [[package]]
 name = "openssl"
-version = "0.10.75"
+version = "0.10.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328"
+checksum = "77823a27f0babb03091cb9ed9ef80af3b39dbc82f97e8fa530374b7dafd87a45"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "cfg-if",
  "foreign-types 0.3.2",
  "libc",
- "once_cell",
  "openssl-macros",
  "openssl-sys",
 ]
@@ -4106,20 +3823,20 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.6"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
+checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.111"
+version = "0.9.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321"
+checksum = "b47e7e6bb2c38cd930d25a23b40fa52e068c10e85f3e03a7f5ba5aaca5713695"
 dependencies = [
  "cc",
  "libc",
@@ -4129,9 +3846,9 @@ dependencies = [
 
 [[package]]
 name = "openxr"
-version = "0.21.0"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09a7b5f4a26a71928a11b912f94c387378b1c14caac3bde3d9cecd4bb8870262"
+checksum = "2c2f814a47d257c79c762bc64042859661b6aa2f57cfa1f0ad4d778f419aeb0e"
 dependencies = [
  "libc",
  "libloading 0.9.0",
@@ -4141,9 +3858,9 @@ dependencies = [
 
 [[package]]
 name = "openxr-sys"
-version = "0.13.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b69a1e728e450d419fa7e82fdfb2988d4a0eadd6bdd16fceff72f1b485c4d96b"
+checksum = "4b8d66081de28c2fa40216182a37292fe38aeea20bc184612504d5e64daf5359"
 dependencies = [
  "libc",
  "mint",
@@ -4151,9 +3868,9 @@ dependencies = [
 
 [[package]]
 name = "orbclient"
-version = "0.3.50"
+version = "0.3.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ad2c6bae700b7aa5d1cc30c59bdd3a1c180b09dbaea51e2ae2b8e1cf211fdd"
+checksum = "5df339f526ea9a60e371768d50efc2f2508c7203290731565d1f7a6f71d21747"
 dependencies = [
  "libc",
  "libredox",
@@ -4169,50 +3886,6 @@ dependencies = [
  "hashbrown 0.14.5",
 ]
 
-[[package]]
-name = "ordered-stream"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50"
-dependencies = [
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "ort"
-version = "2.0.0-rc.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7de3af33d24a745ffb8fab904b13478438d1cd52868e6f17735ef6e1f8bf133"
-dependencies = [
- "ndarray",
- "ort-sys",
- "smallvec",
- "tracing",
- "ureq",
-]
-
-[[package]]
-name = "ort-sys"
-version = "2.0.0-rc.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7b497d21a8b6fbb4b5a544f8fadb77e801a09ae0add9e411d31c6f89e3c1e90"
-dependencies = [
- "hmac-sha256",
- "lzma-rust2 0.15.7",
- "ureq",
-]
-
-[[package]]
-name = "os_pipe"
-version = "1.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967"
-dependencies = [
- "libc",
- "windows-sys 0.61.2",
-]
-
 [[package]]
 name = "ouroboros"
 version = "0.18.5"
@@ -4234,7 +3907,7 @@ dependencies = [
  "proc-macro2",
  "proc-macro2-diagnostics",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -4299,7 +3972,7 @@ dependencies = [
  "libc",
  "redox_syscall 0.5.18",
  "smallvec",
- "windows-link 0.2.1",
+ "windows-link",
 ]
 
 [[package]]
@@ -4320,25 +3993,6 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3"
 
-[[package]]
-name = "pbkdf2"
-version = "0.12.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
-dependencies = [
- "digest",
- "hmac",
-]
-
-[[package]]
-name = "pem-rfc7468"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
-dependencies = [
- "base64ct",
-]
-
 [[package]]
 name = "percent-encoding"
 version = "2.3.2"
@@ -4347,9 +4001,9 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
 [[package]]
 name = "pest"
-version = "2.8.5"
+version = "2.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c9eb05c21a464ea704b53158d358a31e6425db2f63a1a7312268b05fe2b75f7"
+checksum = "47627dd7305c6a2d6c8c6bcd24c5a4c17dbbf425f4f9c5313e724b38fc9782e9"
 dependencies = [
  "memchr",
  "ucd-trie",
@@ -4357,9 +4011,9 @@ dependencies = [
 
 [[package]]
 name = "pest_derive"
-version = "2.8.5"
+version = "2.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68f9dbced329c441fa79d80472764b1a2c7e57123553b8519b36663a2fb234ed"
+checksum = "4b4254325ecad416ab689e27ba51da03ba01a9632bc6e108f5fe7c3c4ad29d58"
 dependencies = [
  "pest",
  "pest_generator",
@@ -4367,25 +4021,24 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.8.5"
+version = "2.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bb96d5051a78f44f43c8f712d8e810adb0ebf923fc9ed2655a7f66f63ba8ee5"
+checksum = "6c4c0e91ead7a8f7acecbca6f003fc2e8282b1dbe2dd9c9d2f16aba42995e0a7"
 dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.8.5"
+version = "2.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "602113b5b5e8621770cfd490cfd90b9f84ab29bd2b0e49ad83eb6d186cef2365"
+checksum = "f9744bc48116fee06334924bb5f2bad41eed5e89bd26e29b0b799f9a3f82c210"
 dependencies = [
  "pest",
- "sha2",
 ]
 
 [[package]]
@@ -4396,7 +4049,7 @@ checksum = "8701b58ea97060d5e5b155d383a69952a60943f0e6dfe30b04c287beb0b27455"
 dependencies = [
  "fixedbitset",
  "hashbrown 0.15.5",
- "indexmap 2.12.1",
+ "indexmap 2.14.0",
 ]
 
 [[package]]
@@ -4425,41 +4078,35 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
 
 [[package]]
 name = "pin-project"
-version = "1.1.10"
+version = "1.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a"
+checksum = "2466b2336ed02bcdca6b294417127b90ec92038d1d5c4fbeac971a922e0e0924"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.10"
+version = "1.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
+checksum = "c96395f0a926bc13b1c17622aaddda1ecb55d49c8f1bf9777e4d877800a43f8b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
 
 [[package]]
 name = "piper"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
+checksum = "c835479a4443ded371d6c535cbfd8d31ad92c5d23ae9770a61bc155e4992a3c1"
 dependencies = [
  "atomic-waker",
  "fastrand",
@@ -4468,24 +4115,23 @@ dependencies = [
 
 [[package]]
 name = "pipewire"
-version = "0.8.0"
-source = "git+https://gitlab.freedesktop.org/galister/pipewire-rs.git?rev=6ef2cd1af41e5e8844c63c37ea9a01f0758079b0#6ef2cd1af41e5e8844c63c37ea9a01f0758079b0"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8585aba8a52ad74ccc633b8e293c1dc4277976bd5d510b925533f34fd6685f38"
 dependencies = [
- "anyhow",
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "libc",
  "libspa",
  "libspa-sys",
- "nix 0.27.1",
- "once_cell",
  "pipewire-sys",
- "thiserror 1.0.69",
+ "rustix 1.1.4",
 ]
 
 [[package]]
 name = "pipewire-sys"
-version = "0.8.0"
-source = "git+https://gitlab.freedesktop.org/galister/pipewire-rs.git?rev=6ef2cd1af41e5e8844c63c37ea9a01f0758079b0#6ef2cd1af41e5e8844c63c37ea9a01f0758079b0"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2089f245b548723e60325773c27f586b7a2372c79ea941b246cd0d654706adc"
 dependencies = [
  "bindgen",
  "libspa-sys",
@@ -4494,30 +4140,23 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e"
+
+[[package]]
+name = "plain"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
 
 [[package]]
 name = "png"
-version = "0.17.16"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82151a2fc869e011c153adc57cf2789ccb8d9906ce52c0b39a6b5697749d7526"
+checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
 dependencies = [
- "bitflags 1.3.2",
- "crc32fast",
- "fdeflate",
- "flate2",
- "miniz_oxide",
-]
-
-[[package]]
-name = "png"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97baced388464909d42d89643fe4361939af9b7ce7a31ee32a168f832a70f2a0"
-dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "crc32fast",
  "fdeflate",
  "flate2",
@@ -4534,30 +4173,39 @@ dependencies = [
  "concurrent-queue",
  "hermit-abi 0.5.2",
  "pin-project-lite",
- "rustix 1.1.3",
+ "rustix 1.1.4",
  "windows-sys 0.61.2",
 ]
 
 [[package]]
-name = "portable-atomic"
-version = "1.13.0"
+name = "polycool"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f89776e4d69bb58bc6993e99ffa1d11f228b839984854c7daeb5d37f87cbe950"
+checksum = "50596ddc09eb5ad5f75cacd40209568e66df71baf86e1499a0e99c4cff12a5a6"
+dependencies = [
+ "arrayvec",
+]
+
+[[package]]
+name = "portable-atomic"
+version = "1.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
 
 [[package]]
 name = "portable-atomic-util"
-version = "0.2.4"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
+checksum = "c2a106d1259c23fac8e543272398ae0e3c0b8d33c88ed73d0cc71b0f1d902618"
 dependencies = [
  "portable-atomic",
 ]
 
 [[package]]
 name = "potential_utf"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
+checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564"
 dependencies = [
  "zerovec",
 ]
@@ -4568,12 +4216,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
-[[package]]
-name = "ppmd-rust"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efca4c95a19a79d1c98f791f10aebd5c1363b473244630bb7dbde1dc98455a24"
-
 [[package]]
 name = "ppv-lite86"
 version = "0.2.21"
@@ -4590,16 +4232,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
 dependencies = [
  "proc-macro2",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "proc-macro-crate"
-version = "3.4.0"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
+checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f"
 dependencies = [
- "toml_edit 0.23.10+spec-1.0.0",
+ "toml_edit",
 ]
 
 [[package]]
@@ -4628,9 +4270,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.104"
+version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9695f8df41bb4f3d222c95a67532365f569318332d03d5f3f67f37b20e6ebdf0"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
 dependencies = [
  "unicode-ident",
 ]
@@ -4643,35 +4285,35 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
  "version_check",
  "yansi",
 ]
 
 [[package]]
 name = "profiling"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3eb8486b569e12e2c32ad3e204dbaba5e4b5b216e9367044f25f1dba42341773"
+checksum = "3d595e54a326bc53c1c197b32d295e14b169e3cfeaa8dc82b529f947fba6bcf5"
 dependencies = [
  "profiling-procmacros",
 ]
 
 [[package]]
 name = "profiling-procmacros"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52717f9a02b6965224f95ca2a81e2e0c5c43baacd28ca057577988930b6c3d5b"
+checksum = "4488a4a36b9a4ba6b9334a32a39971f77c1436ec82c38707bce707699cc3bbcb"
 dependencies = [
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "prost"
-version = "0.14.3"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2ea70524a2f82d518bce41317d0fae74151505651af45faf1ffbd6fd33f0568"
+checksum = "528ac67416ff8646872a3c02cad9cc4ee5dc9f9540c9b10771855c95cb2e5ae1"
 dependencies = [
  "bytes",
  "prost-derive",
@@ -4679,9 +4321,9 @@ dependencies = [
 
 [[package]]
 name = "prost-build"
-version = "0.14.3"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "343d3bd7056eda839b03204e68deff7d1b13aba7af2b2fd16890697274262ee7"
+checksum = "03da047801ff44bb6a4d407d4860c05fd70bb81714e6b2f3812603d5b145b042"
 dependencies = [
  "heck 0.5.0",
  "itertools 0.14.0",
@@ -4692,28 +4334,28 @@ dependencies = [
  "prost",
  "prost-types",
  "regex",
- "syn 2.0.113",
+ "syn 2.0.118",
  "tempfile",
 ]
 
 [[package]]
 name = "prost-derive"
-version = "0.14.3"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b"
+checksum = "b570b25f7617e43d59005d0990ccb79e950a423952cea19671b7a876da390adf"
 dependencies = [
  "anyhow",
  "itertools 0.14.0",
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "prost-types"
-version = "0.14.3"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8991c4cbdb8bc5b11f0b074ffe286c30e523de90fee5ba8132f1399f23cb3dd7"
+checksum = "f94967dc7688f3054c7fac87473ffae4cc4c3904800e2d9f5b857246d8963b0a"
 dependencies = [
  "prost",
 ]
@@ -4733,12 +4375,9 @@ checksum = "869675ad2d7541aea90c6d88c81f46a7f4ea9af8cd0395d38f11a95126998a0d"
 
 [[package]]
 name = "pxfm"
-version = "0.1.27"
+version = "0.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7186d3822593aa4393561d186d1393b3923e9d6163d3fbfd6e825e3e6cf3e6a8"
-dependencies = [
- "num-traits",
-]
+checksum = "d55d956fa96f5ec02be2e13af0e20391a5aa83d6a074e3ad368959d0fab299ea"
 
 [[package]]
 name = "quick-error"
@@ -4757,18 +4396,18 @@ dependencies = [
 
 [[package]]
 name = "quick-xml"
-version = "0.38.4"
+version = "0.39.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c"
+checksum = "cdcc8dd4e2f670d309a5f0e83fe36dfdc05af317008fea29144da1a2ac858e5e"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.42"
+version = "1.0.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"
+checksum = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368"
 dependencies = [
  "proc-macro2",
 ]
@@ -4785,6 +4424,12 @@ version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
 
+[[package]]
+name = "radium"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
+
 [[package]]
 name = "rand"
 version = "0.7.3"
@@ -4801,9 +4446,9 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a"
 dependencies = [
  "libc",
  "rand_chacha 0.3.1",
@@ -4812,23 +4457,23 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.9.2"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea"
 dependencies = [
  "rand_chacha 0.9.0",
- "rand_core 0.9.3",
+ "rand_core 0.9.5",
 ]
 
 [[package]]
 name = "rand"
-version = "0.10.0"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc266eb313df6c5c09c1c7b1fbe2510961e5bcd3add930c1e31f7ed9da0feff8"
+checksum = "c7f5fa3a058cd35567ef9bfa5e75732bee0f9e4c55fa90477bef2dfcdbc4be80"
 dependencies = [
  "chacha20",
- "getrandom 0.4.2",
- "rand_core 0.10.0",
+ "getrandom 0.4.3",
+ "rand_core 0.10.1",
 ]
 
 [[package]]
@@ -4858,7 +4503,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
 dependencies = [
  "ppv-lite86",
- "rand_core 0.9.3",
+ "rand_core 0.9.5",
 ]
 
 [[package]]
@@ -4876,23 +4521,23 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.16",
+ "getrandom 0.2.17",
 ]
 
 [[package]]
 name = "rand_core"
-version = "0.9.3"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
 dependencies = [
  "getrandom 0.3.4",
 ]
 
 [[package]]
 name = "rand_core"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba"
+checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
 
 [[package]]
 name = "rand_hc"
@@ -4954,19 +4599,19 @@ dependencies = [
  "num-traits",
  "paste",
  "profiling",
- "rand 0.9.2",
+ "rand 0.9.4",
  "rand_chacha 0.9.0",
  "simd_helpers",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "v_frame",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "ravif"
-version = "0.12.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef69c1990ceef18a116855938e74793a5f7496ee907562bd0857b6ac734ab285"
+checksum = "e52310197d971b0f5be7fe6b57530dcd27beb35c1b013f29d66c1ad73fbbcc45"
 dependencies = [
  "avif-serialize",
  "imgref",
@@ -4989,23 +4634,17 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40d213455a5f1dc59214213c7330e074ddf8114c9a42411eb890c767357ce135"
 dependencies = [
- "objc2 0.6.3",
+ "objc2 0.6.4",
  "objc2-core-foundation",
  "objc2-foundation 0.3.2",
  "objc2-quartz-core 0.3.2",
 ]
 
-[[package]]
-name = "rawpointer"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
-
 [[package]]
 name = "rayon"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
+checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d"
 dependencies = [
  "either",
  "rayon-core",
@@ -5023,15 +4662,25 @@ dependencies = [
 
 [[package]]
 name = "read-fonts"
-version = "0.35.0"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6717cf23b488adf64b9d711329542ba34de147df262370221940dfabc2c91358"
+checksum = "7b634fabf032fab15307ffd272149b622260f55974d9fad689292a5d33df02e5"
 dependencies = [
  "bytemuck",
  "core_maths",
  "font-types",
 ]
 
+[[package]]
+name = "read-fonts"
+version = "0.39.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4ed38b89c2c77ff968c524145ad65fb010f38af5c7a224b53b81d47ac2daa81"
+dependencies = [
+ "bytemuck",
+ "font-types",
+]
+
 [[package]]
 name = "recvmsg"
 version = "1.0.0"
@@ -5053,144 +4702,106 @@ version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.7.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f3fe0889e69e2ae9e41f4d6c4c0181701d00e4697b356fb1f74173a5e0ee27"
+checksum = "c5102a6aaa05aa011a238e178e6bca86d2cb56fc9f586d37cb80f5bca6e07759"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
 ]
 
 [[package]]
 name = "regex"
-version = "1.12.3"
+version = "1.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
+checksum = "f1292b7759ae1cb9ec195452d1390a074f0cd8541ab7a5a8c31cd6db45d4a6ba"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.13",
- "regex-syntax 0.8.8",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
 name = "regex-automata"
-version = "0.1.10"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "fst",
- "regex-syntax 0.6.29",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
+checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.8",
+ "regex-syntax",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.29"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
-
-[[package]]
-name = "reqwest"
-version = "0.12.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147"
-dependencies = [
- "base64",
- "bytes",
- "futures-channel",
- "futures-core",
- "futures-util",
- "http",
- "http-body",
- "http-body-util",
- "hyper",
- "hyper-tls",
- "hyper-util",
- "js-sys",
- "log",
- "native-tls",
- "percent-encoding",
- "pin-project-lite",
- "rustls-pki-types",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper",
- "tokio",
- "tokio-native-tls",
- "tower",
- "tower-http",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
+checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"
 
 [[package]]
 name = "resvg"
-version = "0.45.1"
+version = "0.47.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8928798c0a55e03c9ca6c4c6846f76377427d2c1e1f7e6de3c06ae57942df43"
+checksum = "9be183ad6a216aa96f33e4c8033b0988b8b3ea6fd2359d19af5bac4643fd8e81"
 dependencies = [
  "log",
  "pico-args",
  "rgb",
  "svgtypes",
- "tiny-skia",
+ "tiny-skia 0.12.0",
  "usvg",
 ]
 
 [[package]]
 name = "rgb"
-version = "0.8.52"
+version = "0.8.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c6a884d2998352bb4daf0183589aec883f16a6da1f4dde84d8e2e9a5409a1ce"
+checksum = "47b34b781b31e5d73e9fbc8689c70551fd1ade9a19e3e28cfec8580a79290cc4"
 dependencies = [
  "bytemuck",
 ]
 
 [[package]]
-name = "rodio"
-version = "0.21.1"
+name = "ring"
+version = "0.17.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e40ecf59e742e03336be6a3d53755e789fd05a059fa22dfa0ed624722319e183"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom 0.2.17",
+ "libc",
+ "untrusted",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rodio"
+version = "0.22.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0a536bb79db59098ef71a4dd4246c02eb87b316deceb1b68e0cde7167ec01eb"
 dependencies = [
  "cpal",
  "dasp_sample",
  "hound",
  "num-rational",
+ "rtrb",
  "symphonia",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
 name = "ron"
-version = "0.12.0"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd490c5b18261893f14449cbd28cb9c0b637aebf161cd77900bfdedaff21ec32"
+checksum = "81116b9531d61eabc41aeb228e4b6b2435bcca3233b98cf3b3077d4e6e9debb3"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "once_cell",
  "serde",
  "serde_derive",
@@ -5234,10 +4845,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "rust-embed"
-version = "8.9.0"
+name = "rtrb"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "947d7f3fad52b283d261c4c99a084937e2fe492248cb9a68a8435a861b8798ca"
+checksum = "4ade083ccbb4bf536df69d1f6432cc23deb7acccff86b183f3923a6fd56a1153"
+
+[[package]]
+name = "rust-embed"
+version = "8.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04113cb9355a377d83f06ef1f0a45b8ab8cd7d8b1288160717d66df5c7988d27"
 dependencies = [
  "rust-embed-impl",
  "rust-embed-utils",
@@ -5246,22 +4863,22 @@ dependencies = [
 
 [[package]]
 name = "rust-embed-impl"
-version = "8.9.0"
+version = "8.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fa2c8c9e8711e10f9c4fd2d64317ef13feaab820a4c51541f1a8c8e2e851ab2"
+checksum = "da0902e4c7c8e997159ab384e6d0fc91c221375f6894346ae107f47dd0f3ccaa"
 dependencies = [
  "proc-macro2",
  "quote",
  "rust-embed-utils",
- "syn 2.0.113",
+ "syn 2.0.118",
  "walkdir",
 ]
 
 [[package]]
 name = "rust-embed-utils"
-version = "8.9.0"
+version = "8.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b161f275cb337fe0a44d924a5f4df0ed69c2c39519858f931ce61c779d3475"
+checksum = "5bcdef0be6fe7f6fa333b1073c949729274b05f123a0ad7efcb8efd878e5c3b1"
 dependencies = [
  "sha2",
  "walkdir",
@@ -5279,21 +4896,15 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.26"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace"
+checksum = "b50b8869d9fc858ce7266cce0194bd74df58b9d0e3f6df3a9fc8eb470d95c09d"
 
 [[package]]
 name = "rustc-hash"
-version = "1.1.0"
+version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
-[[package]]
-name = "rustc-hash"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d"
 
 [[package]]
 name = "rustc_version"
@@ -5310,7 +4921,7 @@ version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "errno",
  "libc",
  "linux-raw-sys 0.4.15",
@@ -5319,26 +4930,52 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34"
+checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "errno",
  "libc",
- "linux-raw-sys 0.11.0",
+ "linux-raw-sys 0.12.1",
  "windows-sys 0.61.2",
 ]
 
 [[package]]
-name = "rustls-pki-types"
-version = "1.14.0"
+name = "rustls"
+version = "0.23.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd"
+checksum = "7c2c118cb077cca2822033836dfb1b975355dfb784b5e8da48f7b6c5db74e60e"
+dependencies = [
+ "log",
+ "once_cell",
+ "ring",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "764899a24af3980067ee14bc143654f297b22eaebfe3c7b6b211920a5a59b046"
 dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "rustls-webpki"
+version = "0.103.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e"
+dependencies = [
+ "ring",
+ "rustls-pki-types",
+ "untrusted",
+]
+
 [[package]]
 name = "rustversion"
 version = "1.0.22"
@@ -5356,9 +4993,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a50f4cf475b65d88e057964e0e9bb1f0aa9bbb2036dc65c64596b42932536984"
+checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f"
 
 [[package]]
 name = "same-file"
@@ -5371,9 +5008,9 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.28"
+version = "0.1.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1"
+checksum = "91c1b7e4904c873ef0710c1f407dde2e6287de2bebc1bbbf7d430bb7cbffd939"
 dependencies = [
  "windows-sys 0.61.2",
 ]
@@ -5406,17 +5043,17 @@ dependencies = [
  "log",
  "memmap2",
  "smithay-client-toolkit 0.19.2",
- "tiny-skia",
+ "tiny-skia 0.11.4",
 ]
 
 [[package]]
 name = "security-framework"
-version = "2.11.1"
+version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
+checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d"
 dependencies = [
- "bitflags 2.10.0",
- "core-foundation",
+ "bitflags 2.13.0",
+ "core-foundation 0.10.1",
  "core-foundation-sys",
  "libc",
  "security-framework-sys",
@@ -5424,9 +5061,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.15.0"
+version = "2.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0"
+checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -5440,9 +5077,9 @@ checksum = "b12e76d157a900eb52e81bc6e9f3069344290341720e9178cde2407113ac8d89"
 
 [[package]]
 name = "semver"
-version = "1.0.27"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
+checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
 
 [[package]]
 name = "serde"
@@ -5483,14 +5120,14 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.148"
+version = "1.0.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3084b546a1dd6289475996f182a22aba973866ea8e8b02c51d9f46b1336a22da"
+checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9"
 dependencies = [
  "itoa",
  "memchr",
@@ -5510,71 +5147,28 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_repr"
-version = "0.1.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.113",
-]
-
 [[package]]
 name = "serde_spanned"
-version = "0.6.9"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serde_spanned"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776"
+checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26"
 dependencies = [
  "serde_core",
 ]
 
-[[package]]
-name = "serde_urlencoded"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
-dependencies = [
- "form_urlencoded",
- "itoa",
- "ryu",
- "serde",
-]
-
 [[package]]
 name = "serde_yaml"
 version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap 2.12.1",
+ "indexmap 2.14.0",
  "itoa",
  "ryu",
  "serde",
  "unsafe-libyaml",
 ]
 
-[[package]]
-name = "sha1"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
-dependencies = [
- "cfg-if",
- "cpufeatures 0.2.17",
- "digest",
-]
-
 [[package]]
 name = "sha2"
 version = "0.10.9"
@@ -5629,10 +5223,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
-name = "signal-hook"
-version = "0.3.18"
+name = "shlex"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2"
+checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
+
+[[package]]
+name = "signal-hook"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2a0c28ca5908dbdbcd52e6fdaa00358ab88637f8ab33e1f188dd510eb44b53d"
 dependencies = [
  "libc",
  "signal-hook-registry",
@@ -5650,9 +5250,19 @@ dependencies = [
 
 [[package]]
 name = "simd-adler32"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"
+checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214"
+
+[[package]]
+name = "simd_cesu8"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94f90157bb87cddf702797c5dadfa0be7d266cdf49e22da2fcaa32eff75b2c33"
+dependencies = [
+ "rustc_version",
+ "simdutf8",
+]
 
 [[package]]
 name = "simd_helpers"
@@ -5663,6 +5273,12 @@ dependencies = [
  "quote",
 ]
 
+[[package]]
+name = "simdutf8"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
+
 [[package]]
 name = "simple-xml-builder"
 version = "1.1.0"
@@ -5683,25 +5299,35 @@ dependencies = [
 
 [[package]]
 name = "siphasher"
-version = "1.0.1"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
+checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649"
 
 [[package]]
 name = "skrifa"
-version = "0.37.0"
+version = "0.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c31071dedf532758ecf3fed987cdb4bd9509f900e026ab684b4ecb81ea49841"
+checksum = "7fbdfe3d2475fbd7ddd1f3e5cf8288a30eb3e5f95832829570cd88115a7434ac"
 dependencies = [
  "bytemuck",
- "read-fonts",
+ "read-fonts 0.37.0",
+]
+
+[[package]]
+name = "skrifa"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c34617370ae968efb7161bb2beb517d9084659aae19e24b89e3db25b46e4564"
+dependencies = [
+ "bytemuck",
+ "read-fonts 0.39.2",
 ]
 
 [[package]]
 name = "slab"
-version = "0.4.11"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
+checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
 
 [[package]]
 name = "slabbin"
@@ -5726,9 +5352,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.15.1"
+version = "1.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90"
 
 [[package]]
 name = "smithay"
@@ -5739,24 +5365,24 @@ dependencies = [
  "appendlist",
  "ash",
  "atomic_float",
- "bitflags 2.10.0",
- "calloop 0.14.3",
+ "bitflags 2.13.0",
+ "calloop 0.14.4",
  "cgmath",
  "cursor-icon",
  "downcast-rs",
  "drm-fourcc",
  "encoding_rs",
  "errno",
- "indexmap 2.12.1",
+ "indexmap 2.14.0",
  "libc",
  "profiling",
- "rand 0.9.2",
- "rustix 1.1.3",
+ "rand 0.9.4",
+ "rustix 1.1.4",
  "scopeguard",
  "sha2",
  "smallvec",
  "tempfile",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tracing",
  "wayland-protocols",
  "wayland-protocols-misc",
@@ -5772,7 +5398,7 @@ version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "calloop 0.13.0",
  "calloop-wayland-source 0.3.0",
  "cursor-icon",
@@ -5797,17 +5423,17 @@ version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0512da38f5e2b31201a93524adb8d3136276fa4fe4aafab4e1f727a82b534cc0"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "bytemuck",
- "calloop 0.14.3",
+ "calloop 0.14.4",
  "calloop-wayland-source 0.4.1",
  "cursor-icon",
  "libc",
  "log",
  "memmap2",
  "pkg-config",
- "rustix 1.1.3",
- "thiserror 2.0.17",
+ "rustix 1.1.4",
+ "thiserror 2.0.18",
  "wayland-backend",
  "wayland-client",
  "wayland-csd-frame",
@@ -5821,6 +5447,17 @@ dependencies = [
  "xkeysym",
 ]
 
+[[package]]
+name = "smithay-clipboard"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71704c03f739f7745053bde45fa203a46c58d25bc5c4efba1d9a60e9dba81226"
+dependencies = [
+ "libc",
+ "smithay-client-toolkit 0.20.0",
+ "wayland-backend",
+]
+
 [[package]]
 name = "smol"
 version = "2.0.2"
@@ -5861,25 +5498,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "socket2"
-version = "0.6.1"
+name = "smol_str"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881"
-dependencies = [
- "libc",
- "windows-sys 0.60.2",
-]
-
-[[package]]
-name = "socks"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0c3dbbd9ae980613c6dd8e28a9407b50509d3803b57624d5dfe8315218cd58b"
-dependencies = [
- "byteorder",
- "libc",
- "winapi",
-]
+checksum = "4aaa7368fcf4852a4c2dd92df0cace6a71f2091ca0a23391ce7f3a31833f1523"
 
 [[package]]
 name = "stable_deref_trait"
@@ -5926,7 +5548,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -5935,33 +5557,11 @@ version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
-[[package]]
-name = "super-swipe-type"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22126517bdf94f41b3d0af625fdf69b5ff131b7dd19a59866d3c00a56072af88"
-dependencies = [
- "anyhow",
- "cached-path",
- "fst",
- "memmap",
- "ort",
- "regex",
- "regex-automata 0.1.10",
- "vector2",
-]
-
-[[package]]
-name = "svg_fmt"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0193cc4331cfd2f3d2011ef287590868599a2f33c3e69bc22c1a3d3acf9e02fb"
-
 [[package]]
 name = "svgtypes"
-version = "0.15.3"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68c7541fff44b35860c1a7a47a7cadf3e4a304c457b58f9870d9706ece028afc"
+checksum = "695b5790b3131dafa99b3bbfd25a216edb3d216dad9ca208d4657bfb8f2abc3d"
 dependencies = [
  "kurbo",
  "siphasher",
@@ -5969,11 +5569,11 @@ dependencies = [
 
 [[package]]
 name = "swash"
-version = "0.2.6"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47846491253e976bdd07d0f9cc24b7daf24720d11309302ccbbc6e6b6e53550a"
+checksum = "0811b01ca2c4e8718760713911feaf4675c24f94e50530a015ec646cfb622f7c"
 dependencies = [
- "skrifa",
+ "skrifa 0.42.1",
  "yazi",
  "zeno",
 ]
@@ -6040,24 +5640,15 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.113"
+version = "2.0.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "678faa00651c9eb72dd2020cbdf275d92eccb2400d568e419efdd64838145cb4"
+checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422"
 dependencies = [
  "proc-macro2",
  "quote",
  "unicode-ident",
 ]
 
-[[package]]
-name = "sync_wrapper"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
-dependencies = [
- "futures-core",
-]
-
 [[package]]
 name = "synstructure"
 version = "0.13.2"
@@ -6066,7 +5657,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -6080,36 +5671,37 @@ dependencies = [
 
 [[package]]
 name = "sysinfo"
-version = "0.37.2"
+version = "0.39.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16607d5caffd1c07ce073528f9ed972d88db15dd44023fa57142963be3feb11f"
+checksum = "d2071df9448915b71c4fe6d25deaf1c22f12bd234f01540b77312bb8e41361e6"
 dependencies = [
  "libc",
  "memchr",
  "ntapi",
  "objc2-core-foundation",
  "objc2-io-kit",
- "windows 0.61.3",
+ "objc2-open-directory",
+ "windows",
 ]
 
 [[package]]
 name = "system-deps"
-version = "6.2.2"
+version = "7.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349"
+checksum = "396a35feb67335377e0251fcbc1092fc85c484bd4e3a7a54319399da127796e7"
 dependencies = [
  "cfg-expr",
  "heck 0.5.0",
  "pkg-config",
- "toml 0.8.23",
+ "toml",
  "version-compare",
 ]
 
 [[package]]
 name = "taffy"
-version = "0.9.2"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41ba83ebaf2954d31d05d67340fd46cebe99da2b7133b0dd68d70c65473a437b"
+checksum = "73afc801dd6bd47529eaa7c7e90557f107527d1b7c9c7ed7d7803c7b8d0c357f"
 dependencies = [
  "arrayvec",
  "grid",
@@ -6118,32 +5710,27 @@ dependencies = [
 ]
 
 [[package]]
-name = "tar"
-version = "0.4.44"
+name = "tap"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d863878d212c87a19c1a610eb53bb01fe12951c0501cf5a0d65f724914a667a"
-dependencies = [
- "filetime",
- "libc",
- "xattr",
-]
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.16"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
+checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca"
 
 [[package]]
 name = "tempfile"
-version = "3.24.0"
+version = "3.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "655da9c7eb6305c55742045d5a8d2037996d61d8de95806335c7c86ce0f82e9c"
+checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
 dependencies = [
  "fastrand",
- "getrandom 0.3.4",
+ "getrandom 0.4.3",
  "once_cell",
- "rustix 1.1.3",
+ "rustix 1.1.4",
  "windows-sys 0.61.2",
 ]
 
@@ -6167,11 +5754,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.17"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
+checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
 dependencies = [
- "thiserror-impl 2.0.17",
+ "thiserror-impl 2.0.18",
 ]
 
 [[package]]
@@ -6182,18 +5769,18 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.17"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
+checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -6205,29 +5792,13 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "tiff"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af9605de7fee8d9551863fd692cce7637f548dbd9db9180fcc07ccc6d26c336f"
-dependencies = [
- "fax",
- "flate2",
- "half",
- "quick-error",
- "weezl",
- "zune-jpeg 0.4.21",
-]
-
 [[package]]
 name = "time"
-version = "0.3.47"
+version = "0.3.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c"
+checksum = "18dfaaeddcb932337b5e7866ee7d0ce9b76d2fd092997146f187ec09b4558a50"
 dependencies = [
  "deranged",
- "itoa",
- "js-sys",
  "num-conv",
  "powerfmt",
  "serde_core",
@@ -6237,15 +5808,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
+checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109"
 
 [[package]]
 name = "time-macros"
-version = "0.2.27"
+version = "0.2.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215"
+checksum = "c431b87111666e491a90baa837f914fb45cd5dc3c268591b0220ff5057f2085f"
 dependencies = [
  "num-conv",
  "time-core",
@@ -6271,8 +5842,22 @@ dependencies = [
  "bytemuck",
  "cfg-if",
  "log",
- "png 0.17.16",
- "tiny-skia-path",
+ "tiny-skia-path 0.11.4",
+]
+
+[[package]]
+name = "tiny-skia"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47ffee5eaaf5527f630fb0e356b90ebdec84d5d18d937c5e440350f88c5a91ea"
+dependencies = [
+ "arrayref",
+ "arrayvec",
+ "bytemuck",
+ "cfg-if",
+ "log",
+ "png",
+ "tiny-skia-path 0.12.0",
 ]
 
 [[package]]
@@ -6287,10 +5872,21 @@ dependencies = [
 ]
 
 [[package]]
-name = "tinystr"
-version = "0.8.2"
+name = "tiny-skia-path"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
+checksum = "edca365c3faccca67d06593c5980fa6c57687de727a03131735bb85f01fdeeb9"
+dependencies = [
+ "arrayref",
+ "bytemuck",
+ "strict-num",
+]
+
+[[package]]
+name = "tinystr"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d"
 dependencies = [
  "displaydoc",
  "zerovec",
@@ -6298,9 +5894,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa"
+checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -6313,174 +5909,63 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.49.0"
+version = "1.52.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86"
+checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe"
 dependencies = [
- "bytes",
- "libc",
- "mio",
  "pin-project-lite",
- "socket2",
- "tokio-macros",
- "windows-sys 0.61.2",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.113",
-]
-
-[[package]]
-name = "tokio-native-tls"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
-dependencies = [
- "native-tls",
- "tokio",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.7.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "pin-project-lite",
- "tokio",
 ]
 
 [[package]]
 name = "toml"
-version = "0.8.23"
+version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
-dependencies = [
- "serde",
- "serde_spanned 0.6.9",
- "toml_datetime 0.6.11",
- "toml_edit 0.22.27",
-]
-
-[[package]]
-name = "toml"
-version = "0.9.10+spec-1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0825052159284a1a8b4d6c0c86cbc801f2da5afd2b225fa548c72f2e74002f48"
+checksum = "81f3d15e84cbcd896376e6730314d59fb5a87f31e4b038454184435cd57defee"
 dependencies = [
+ "indexmap 2.14.0",
  "serde_core",
- "serde_spanned 1.0.4",
- "toml_datetime 0.7.5+spec-1.1.0",
+ "serde_spanned",
+ "toml_datetime",
  "toml_parser",
+ "toml_writer",
  "winnow",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.11"
+version = "1.1.1+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.7.5+spec-1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347"
+checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7"
 dependencies = [
  "serde_core",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.27"
+version = "0.25.12+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
+checksum = "d2153edc6955a6c354fad8f5efd38b6a8769bdccf9fe50f8e1329f81b0baa5d7"
 dependencies = [
- "indexmap 2.12.1",
- "serde",
- "serde_spanned 0.6.9",
- "toml_datetime 0.6.11",
- "winnow",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.23.10+spec-1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269"
-dependencies = [
- "indexmap 2.12.1",
- "toml_datetime 0.7.5+spec-1.1.0",
+ "indexmap 2.14.0",
+ "toml_datetime",
  "toml_parser",
  "winnow",
 ]
 
 [[package]]
 name = "toml_parser"
-version = "1.0.6+spec-1.1.0"
+version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44"
+checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526"
 dependencies = [
  "winnow",
 ]
 
 [[package]]
-name = "tower"
-version = "0.5.3"
+name = "toml_writer"
+version = "1.1.1+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4"
-dependencies = [
- "futures-core",
- "futures-util",
- "pin-project-lite",
- "sync_wrapper",
- "tokio",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "tower-http"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8"
-dependencies = [
- "bitflags 2.10.0",
- "bytes",
- "futures-util",
- "http",
- "http-body",
- "iri-string",
- "pin-project-lite",
- "tower",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "tower-layer"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
-
-[[package]]
-name = "tower-service"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
+checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db"
 
 [[package]]
 name = "tracing"
@@ -6502,7 +5987,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -6528,14 +6013,14 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.22"
+version = "0.3.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e"
+checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319"
 dependencies = [
  "matchers",
  "nu-ansi-term",
  "once_cell",
- "regex-automata 0.4.13",
+ "regex-automata",
  "sharded-slab",
  "smallvec",
  "thread_local",
@@ -6544,23 +6029,6 @@ dependencies = [
  "tracing-log",
 ]
 
-[[package]]
-name = "tree_magic_mini"
-version = "3.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8765b90061cba6c22b5831f675da109ae5561588290f9fa2317adab2714d5a6"
-dependencies = [
- "memchr",
- "nom 8.0.0",
- "petgraph",
-]
-
-[[package]]
-name = "try-lock"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
-
 [[package]]
 name = "ttf-parser"
 version = "0.25.1"
@@ -6571,10 +6039,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "typed-path"
-version = "0.12.3"
+name = "twox-hash"
+version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e28f89b80c87b8fb0cf04ab448d5dd0dd0ade2f8891bae878de66a75a28600e"
+checksum = "9ea3136b675547379c4bd395ca6b938e5ad3c3d20fad76e7fe85f9e0d011419c"
 
 [[package]]
 name = "typeid"
@@ -6584,9 +6052,9 @@ checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c"
 
 [[package]]
 name = "typenum"
-version = "1.19.0"
+version = "1.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
+checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20"
 
 [[package]]
 name = "ucd-trie"
@@ -6595,14 +6063,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
 
 [[package]]
-name = "uds_windows"
-version = "1.1.0"
+name = "udev"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9"
+checksum = "af4e37e9ea4401fc841ff54b9ddfc9be1079b1e89434c1a6a865dd68980f7e9f"
 dependencies = [
- "memoffset",
- "tempfile",
- "winapi",
+ "io-lifetimes",
+ "libc",
+ "libudev-sys",
+ "pkg-config",
 ]
 
 [[package]]
@@ -6615,6 +6084,7 @@ dependencies = [
  "log",
  "rust-embed",
  "tracing-subscriber",
+ "ureq",
  "vulkano",
  "vulkano-shaders",
  "wgui",
@@ -6630,9 +6100,9 @@ checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.22"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
 
 [[package]]
 name = "unicode-linebreak"
@@ -6648,9 +6118,9 @@ checksum = "383ad40bb927465ec0ce7720e033cb4ca06912855fc35db31b5755d0de75b1ee"
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.12.0"
+version = "1.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8"
 
 [[package]]
 name = "unicode-width"
@@ -6664,12 +6134,6 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
 
-[[package]]
-name = "unicode-xid"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
-
 [[package]]
 name = "unsafe-libyaml"
 version = "0.2.11"
@@ -6677,28 +6141,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
 
 [[package]]
-name = "ureq"
-version = "3.2.0"
+name = "untrusted"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdc97a28575b85cfedf2a7e7d3cc64b3e11bd8ac766666318003abbacc7a21fc"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
+[[package]]
+name = "ureq"
+version = "3.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dea7109cdcd5864d4eeb1b58a1648dc9bf520360d7af16ec26d0a9354bafcfc0"
 dependencies = [
  "base64",
- "der",
+ "flate2",
  "log",
- "native-tls",
  "percent-encoding",
+ "rustls",
  "rustls-pki-types",
- "socks",
  "ureq-proto",
- "utf-8",
- "webpki-root-certs",
+ "utf8-zero",
+ "webpki-roots",
 ]
 
 [[package]]
 name = "ureq-proto"
-version = "0.5.3"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d81f9efa9df032be5934a46a068815a10a042b494b6a58cb0a1a97bb5467ed6f"
+checksum = "e994ba84b0bd1b1b0cf92878b7ef898a5c1760108fe7b6010327e274917a808c"
 dependencies = [
  "base64",
  "http",
@@ -6708,9 +6177,9 @@ dependencies = [
 
 [[package]]
 name = "url"
-version = "2.5.7"
+version = "2.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b"
+checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -6720,9 +6189,9 @@ dependencies = [
 
 [[package]]
 name = "usvg"
-version = "0.45.1"
+version = "0.47.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80be9b06fbae3b8b303400ab20778c80bbaf338f563afe567cf3c9eea17b47ef"
+checksum = "d46cf96c5f498d36b7a9693bc6a7075c0bb9303189d61b2249b0dc3d309c07de"
 dependencies = [
  "base64",
  "data-url",
@@ -6731,20 +6200,20 @@ dependencies = [
  "kurbo",
  "log",
  "pico-args",
- "roxmltree 0.20.0",
+ "roxmltree 0.21.1",
  "simplecss",
  "siphasher",
  "strict-num",
  "svgtypes",
- "tiny-skia-path",
+ "tiny-skia-path 0.12.0",
  "xmlwriter",
 ]
 
 [[package]]
-name = "utf-8"
-version = "0.7.6"
+name = "utf8-zero"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
+checksum = "b8c0a043c9540bae7c578c88f91dda8bd82e59ae27c21baca69c8b191aaf5a6e"
 
 [[package]]
 name = "utf8_iter"
@@ -6760,13 +6229,13 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.19.0"
+version = "1.23.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e054861b4bd027cd373e18e8d8d8e6548085000e41290d95ce0c373a654b4a"
+checksum = "bf80a72845275afea99e7f2b434723d3bc7e38470fcd1c7ed39a599c73319a53"
 dependencies = [
- "getrandom 0.3.4",
+ "getrandom 0.4.3",
  "js-sys",
- "rand 0.9.2",
+ "rand 0.10.2",
  "serde_core",
  "wasm-bindgen",
 ]
@@ -6794,12 +6263,6 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
-[[package]]
-name = "vector2"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f562f8d4f41867568374e1a63bd12914795f558319f9bf9b0582c4d96a8de04"
-
 [[package]]
 name = "version-compare"
 version = "0.2.1"
@@ -6832,7 +6295,7 @@ dependencies = [
  "foldhash 0.1.5",
  "half",
  "heck 0.4.1",
- "indexmap 2.12.1",
+ "indexmap 2.14.0",
  "libloading 0.8.9",
  "nom 7.1.3",
  "once_cell",
@@ -6858,7 +6321,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -6872,7 +6335,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "shaderc",
- "syn 2.0.113",
+ "syn 2.0.118",
  "vulkano",
 ]
 
@@ -6886,15 +6349,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "want"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
-dependencies = [
- "try-lock",
-]
-
 [[package]]
 name = "wasi"
 version = "0.9.0+wasi-snapshot-preview1"
@@ -6909,27 +6363,18 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasip2"
-version = "1.0.1+wasi-0.2.4"
+version = "1.0.4+wasi-0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
+checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487"
 dependencies = [
- "wit-bindgen 0.46.0",
-]
-
-[[package]]
-name = "wasip3"
-version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
-dependencies = [
- "wit-bindgen 0.51.0",
+ "wit-bindgen",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.106"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd"
+checksum = "4b067c0c11094aef6b7a801c1e34a26affafdf3d051dba08456b868789aaf9a4"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -6940,22 +6385,19 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.56"
+version = "0.4.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "836d9622d604feee9e5de25ac10e3ea5f2d65b41eac0d9ce72eb5deae707ce7c"
+checksum = "c62df1340f32221cb9c54d6a27b030e3dba64361d4a95bed55f9aacb44da291d"
 dependencies = [
- "cfg-if",
  "js-sys",
- "once_cell",
  "wasm-bindgen",
- "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.106"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3"
+checksum = "167ce5e579f6bcf889c4f7175a8a5a585de84e8ff93976ce393efa5f2837aab1"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -6963,69 +6405,35 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.106"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40"
+checksum = "f3997c7839262f4ef12cf90b818d6340c18e80f263f1a94bf157d0ec4420380e"
 dependencies = [
  "bumpalo",
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.106"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4"
+checksum = "dc1b4cb0cc549fcf58d7dfc081778139b3d283a081644e833e84682ad71cea24"
 dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "wasm-encoder"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319"
-dependencies = [
- "leb128fmt",
- "wasmparser",
-]
-
-[[package]]
-name = "wasm-metadata"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
-dependencies = [
- "anyhow",
- "indexmap 2.12.1",
- "wasm-encoder",
- "wasmparser",
-]
-
-[[package]]
-name = "wasmparser"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
-dependencies = [
- "bitflags 2.10.0",
- "hashbrown 0.15.5",
- "indexmap 2.12.1",
- "semver",
-]
-
 [[package]]
 name = "wayland-backend"
-version = "0.3.12"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fee64194ccd96bf648f42a65a7e589547096dfa702f7cadef84347b66ad164f9"
+checksum = "2857dd20b54e916ec7253b3d6b4d5c4d7d4ca2c33c2e11c6c76a99bd8744755d"
 dependencies = [
  "cc",
  "downcast-rs",
- "rustix 1.1.3",
+ "rustix 1.1.4",
  "scoped-tls",
  "smallvec",
  "wayland-sys",
@@ -7033,12 +6441,12 @@ dependencies = [
 
 [[package]]
 name = "wayland-client"
-version = "0.31.12"
+version = "0.31.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8e6faa537fbb6c186cb9f1d41f2f811a4120d1b57ec61f50da451a0c5122bec"
+checksum = "645c7c96bb74690c3189b5c9cb4ca1627062bb23693a4fad9d8c3de958260144"
 dependencies = [
- "bitflags 2.10.0",
- "rustix 1.1.3",
+ "bitflags 2.13.0",
+ "rustix 1.1.4",
  "wayland-backend",
  "wayland-scanner",
 ]
@@ -7049,29 +6457,29 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "cursor-icon",
  "wayland-backend",
 ]
 
 [[package]]
 name = "wayland-cursor"
-version = "0.31.12"
+version = "0.31.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5864c4b5b6064b06b1e8b74ead4a98a6c45a285fe7a0e784d24735f011fdb078"
+checksum = "4a52d18780be9b1314328a3de5f930b73d2200112e3849ca6cb11822793fb34d"
 dependencies = [
- "rustix 1.1.3",
+ "rustix 1.1.4",
  "wayland-client",
  "xcursor",
 ]
 
 [[package]]
 name = "wayland-protocols"
-version = "0.32.10"
+version = "0.32.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baeda9ffbcfc8cd6ddaade385eaf2393bd2115a69523c735f12242353c3df4f3"
+checksum = "23d0c813de3daa2ed6520af85a3bd49b0e722a3078506899aa9686fea58dc4b6"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "wayland-backend",
  "wayland-client",
  "wayland-scanner",
@@ -7084,7 +6492,7 @@ version = "20250721.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40a1f863128dcaaec790d7b4b396cc9b9a7a079e878e18c47e6c2d2c5a8dcbb1"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -7093,11 +6501,11 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols-misc"
-version = "0.3.10"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791c58fdeec5406aa37169dd815327d1e47f334219b523444bc26d70ceb4c34e"
+checksum = "6e9567599ef23e09b8dad6e429e5738d4509dfc46b3b21f32841a304d16b29c8"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -7107,11 +6515,11 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols-plasma"
-version = "0.3.10"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa98634619300a535a9a97f338aed9a5ff1e01a461943e8346ff4ae26007306b"
+checksum = "2b6d8cf1eb2c1c31ed1f5643c88a6e53538129d4af80030c8cabd1f9fa884d91"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -7120,11 +6528,11 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols-wlr"
-version = "0.3.10"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9597cdf02cf0c34cd5823786dce6b5ae8598f05c2daf5621b6e178d4f7345f3"
+checksum = "eb04e52f7836d7c7976c78ca0250d61e33873c34156a2a1fc9474828ec268234"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -7134,33 +6542,33 @@ dependencies = [
 
 [[package]]
 name = "wayland-scanner"
-version = "0.31.8"
+version = "0.31.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5423e94b6a63e68e439803a3e153a9252d5ead12fd853334e2ad33997e3889e3"
+checksum = "9c324a910fd86ebdc364a3e61ec1f11737d3b1d6c273c0239ee8ff4bc0d24b4a"
 dependencies = [
  "proc-macro2",
- "quick-xml 0.38.4",
+ "quick-xml 0.39.4",
  "quote",
 ]
 
 [[package]]
 name = "wayland-server"
-version = "0.31.11"
+version = "0.31.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9297ab90f8d1f597711d36455c5b1b2290eca59b8134485e377a296b80b118c9"
+checksum = "cc1846eb04c49182e04f4a099e2a830a2b745610bbc1d61246e206f29c7000a0"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "downcast-rs",
- "rustix 1.1.3",
+ "rustix 1.1.4",
  "wayland-backend",
  "wayland-scanner",
 ]
 
 [[package]]
 name = "wayland-sys"
-version = "0.31.8"
+version = "0.31.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e6dbfc3ac5ef974c92a2235805cc0114033018ae1290a72e474aa8b28cbbdfd"
+checksum = "d8eab23fefc9e41f8e841df4a9c707e8a8c4ed26e944ef69297184de2785e3be"
 dependencies = [
  "dlib",
  "log",
@@ -7170,27 +6578,30 @@ dependencies = [
 
 [[package]]
 name = "wayvr"
-version = "26.2.1"
+version = "26.7.1"
 dependencies = [
  "anyhow",
- "arboard",
  "ash",
  "bytes",
+ "calloop 0.14.4",
+ "calloop-wayland-source 0.4.1",
  "chrono",
  "chrono-tz",
  "clap",
  "config",
  "dash-frontend",
  "dbus",
+ "evdev",
  "futures",
  "glam",
  "idmap",
  "idmap-derive",
  "image_dds",
+ "input",
  "input-linux",
  "interprocess",
  "json",
- "json5 1.3.0",
+ "json5 1.3.1",
  "libc",
  "libmonado",
  "log",
@@ -7198,6 +6609,7 @@ dependencies = [
  "mint",
  "openxr",
  "ovr_overlay",
+ "pipewire",
  "prost",
  "pure-rust-locales",
  "regex",
@@ -7211,19 +6623,22 @@ dependencies = [
  "slotmap",
  "smallvec",
  "smithay",
+ "smithay-clipboard",
  "smol",
  "strum",
- "super-swipe-type",
  "sysinfo",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tracing",
  "tracing-subscriber",
  "uuid",
  "vulkano",
  "vulkano-shaders",
  "wayland-client",
+ "wayland-protocols",
+ "wayland-protocols-misc",
  "wayvr-ipc",
  "wgui",
+ "whisper-rs",
  "winit",
  "wlx-capture",
  "wlx-common",
@@ -7237,36 +6652,38 @@ name = "wayvr-ipc"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "async-channel",
+ "async-io",
  "bytes",
  "interprocess",
  "log",
  "serde",
  "serde_json",
+ "slotmap",
  "smallvec",
- "tokio",
- "tokio-util",
+ "smol",
 ]
 
 [[package]]
 name = "wayvrctl"
-version = "26.2.1"
+version = "26.7.1"
 dependencies = [
  "anyhow",
  "clap",
- "env_logger 0.11.8",
+ "env_logger 0.11.11",
  "log",
  "serde",
  "serde_json",
  "shell-words",
- "tokio",
+ "smol",
  "wayvr-ipc",
 ]
 
 [[package]]
 name = "web-sys"
-version = "0.3.83"
+version = "0.3.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b32828d774c412041098d182a8b38b16ea816958e07cf40eec2bc080ae137ac"
+checksum = "8622dcb61c0bcc9fffa6938bed81210af2da9a7e4a1a834b2e37a59b6dfb6141"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -7283,10 +6700,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "webpki-root-certs"
-version = "1.0.6"
+name = "webpki-roots"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "804f18a4ac2676ffb4e8b5b5fa9ae38af06df08162314f96a68d2a363e21a8ca"
+checksum = "bf85cb06032201fa7c6f829d7db5a7e5aa45bcc0655327713065f6f0576731bf"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -7302,7 +6719,9 @@ name = "wgui"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "bytes",
  "cosmic-text",
+ "dav1d-sys",
  "etagere",
  "flate2",
  "glam",
@@ -7315,15 +6734,39 @@ dependencies = [
  "resvg",
  "roxmltree 0.21.1",
  "rust-embed",
- "rustc-hash 2.1.1",
+ "rustc-hash",
  "serde_json",
  "slotmap",
  "smallvec",
+ "strum",
  "taffy",
  "vulkano",
  "vulkano-shaders",
 ]
 
+[[package]]
+name = "whisper-rs"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2088172d00f936c348d6a72f488dc2660ab3f507263a195df308a3c2383229f6"
+dependencies = [
+ "libc",
+ "whisper-rs-sys",
+]
+
+[[package]]
+name = "whisper-rs-sys"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6986c0fe081241d391f09b9a071fbcbb59720c3563628c3c829057cf69f2a56f"
+dependencies = [
+ "bindgen",
+ "cfg-if",
+ "cmake",
+ "fs_extra",
+ "semver",
+]
+
 [[package]]
 name = "widestring"
 version = "1.2.1"
@@ -7363,57 +6806,23 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows"
-version = "0.54.0"
+version = "0.62.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49"
-dependencies = [
- "windows-core 0.54.0",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows"
-version = "0.61.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893"
+checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580"
 dependencies = [
  "windows-collections",
- "windows-core 0.61.2",
+ "windows-core",
  "windows-future",
- "windows-link 0.1.3",
  "windows-numerics",
 ]
 
 [[package]]
 name = "windows-collections"
-version = "0.2.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8"
+checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610"
 dependencies = [
- "windows-core 0.61.2",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.54.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65"
-dependencies = [
- "windows-result 0.1.2",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.61.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
-dependencies = [
- "windows-implement",
- "windows-interface",
- "windows-link 0.1.3",
- "windows-result 0.3.4",
- "windows-strings 0.4.2",
+ "windows-core",
 ]
 
 [[package]]
@@ -7424,19 +6833,19 @@ checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
 dependencies = [
  "windows-implement",
  "windows-interface",
- "windows-link 0.2.1",
- "windows-result 0.4.1",
- "windows-strings 0.5.1",
+ "windows-link",
+ "windows-result",
+ "windows-strings",
 ]
 
 [[package]]
 name = "windows-future"
-version = "0.2.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
+checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb"
 dependencies = [
- "windows-core 0.61.2",
- "windows-link 0.1.3",
+ "windows-core",
+ "windows-link",
  "windows-threading",
 ]
 
@@ -7448,7 +6857,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -7459,15 +6868,9 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
-[[package]]
-name = "windows-link"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
-
 [[package]]
 name = "windows-link"
 version = "0.2.1"
@@ -7476,30 +6879,12 @@ checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
 [[package]]
 name = "windows-numerics"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
+checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26"
 dependencies = [
- "windows-core 0.61.2",
- "windows-link 0.1.3",
-]
-
-[[package]]
-name = "windows-result"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-result"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
-dependencies = [
- "windows-link 0.1.3",
+ "windows-core",
+ "windows-link",
 ]
 
 [[package]]
@@ -7508,16 +6893,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
 dependencies = [
- "windows-link 0.2.1",
-]
-
-[[package]]
-name = "windows-strings"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
-dependencies = [
- "windows-link 0.1.3",
+ "windows-link",
 ]
 
 [[package]]
@@ -7526,7 +6902,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
 dependencies = [
- "windows-link 0.2.1",
+ "windows-link",
 ]
 
 [[package]]
@@ -7538,6 +6914,15 @@ dependencies = [
  "windows-targets 0.42.2",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.52.0"
@@ -7556,22 +6941,13 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.60.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
-dependencies = [
- "windows-targets 0.53.5",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
 dependencies = [
- "windows-link 0.2.1",
+ "windows-link",
 ]
 
 [[package]]
@@ -7589,6 +6965,21 @@ dependencies = [
  "windows_x86_64_msvc 0.42.2",
 ]
 
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.52.6"
@@ -7598,37 +6989,20 @@ dependencies = [
  "windows_aarch64_gnullvm 0.52.6",
  "windows_aarch64_msvc 0.52.6",
  "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm 0.52.6",
+ "windows_i686_gnullvm",
  "windows_i686_msvc 0.52.6",
  "windows_x86_64_gnu 0.52.6",
  "windows_x86_64_gnullvm 0.52.6",
  "windows_x86_64_msvc 0.52.6",
 ]
 
-[[package]]
-name = "windows-targets"
-version = "0.53.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
-dependencies = [
- "windows-link 0.2.1",
- "windows_aarch64_gnullvm 0.53.1",
- "windows_aarch64_msvc 0.53.1",
- "windows_i686_gnu 0.53.1",
- "windows_i686_gnullvm 0.53.1",
- "windows_i686_msvc 0.53.1",
- "windows_x86_64_gnu 0.53.1",
- "windows_x86_64_gnullvm 0.53.1",
- "windows_x86_64_msvc 0.53.1",
-]
-
 [[package]]
 name = "windows-threading"
-version = "0.1.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6"
+checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37"
 dependencies = [
- "windows-link 0.1.3",
+ "windows-link",
 ]
 
 [[package]]
@@ -7639,15 +7013,15 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.6"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.53.1"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -7657,15 +7031,15 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.6"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.53.1"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -7675,15 +7049,15 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.6"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.53.1"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
 [[package]]
 name = "windows_i686_gnullvm"
@@ -7691,12 +7065,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.42.2"
@@ -7705,15 +7073,15 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.6"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.53.1"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -7723,15 +7091,15 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.6"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.53.1"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -7741,15 +7109,15 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.6"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.53.1"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -7757,34 +7125,34 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
-
 [[package]]
 name = "winit"
-version = "0.30.12"
+version = "0.30.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c66d4b9ed69c4009f6321f762d6e61ad8a2389cd431b97cb1e146812e9e6c732"
+checksum = "a6755fa58a9f8350bd1e472d4c3fcc25f824ec358933bba33306d0b63df5978d"
 dependencies = [
  "ahash",
  "android-activity",
  "atomic-waker",
- "bitflags 2.10.0",
- "block2",
+ "bitflags 2.13.0",
+ "block2 0.5.1",
  "bytemuck",
  "calloop 0.13.0",
  "cfg_aliases",
  "concurrent-queue",
- "core-foundation",
+ "core-foundation 0.9.4",
  "core-graphics",
  "cursor-icon",
  "dpi",
@@ -7793,7 +7161,7 @@ dependencies = [
  "memmap2",
  "ndk",
  "objc2 0.5.2",
- "objc2-app-kit 0.2.2",
+ "objc2-app-kit",
  "objc2-foundation 0.2.2",
  "objc2-ui-kit",
  "orbclient",
@@ -7804,7 +7172,7 @@ dependencies = [
  "rustix 0.38.44",
  "sctk-adwaita",
  "smithay-client-toolkit 0.19.2",
- "smol_str",
+ "smol_str 0.2.2",
  "tracing",
  "unicode-segmentation",
  "wasm-bindgen",
@@ -7823,136 +7191,31 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.7.14"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829"
+checksum = "0592e1c9d151f854e6fd382574c3a0855250e1d9b2f99d9281c6e6391af352f1"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "wit-bindgen"
-version = "0.46.0"
+version = "0.57.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
-
-[[package]]
-name = "wit-bindgen"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
-dependencies = [
- "wit-bindgen-rust-macro",
-]
-
-[[package]]
-name = "wit-bindgen-core"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc"
-dependencies = [
- "anyhow",
- "heck 0.5.0",
- "wit-parser",
-]
-
-[[package]]
-name = "wit-bindgen-rust"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
-dependencies = [
- "anyhow",
- "heck 0.5.0",
- "indexmap 2.12.1",
- "prettyplease",
- "syn 2.0.113",
- "wasm-metadata",
- "wit-bindgen-core",
- "wit-component",
-]
-
-[[package]]
-name = "wit-bindgen-rust-macro"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a"
-dependencies = [
- "anyhow",
- "prettyplease",
- "proc-macro2",
- "quote",
- "syn 2.0.113",
- "wit-bindgen-core",
- "wit-bindgen-rust",
-]
-
-[[package]]
-name = "wit-component"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
-dependencies = [
- "anyhow",
- "bitflags 2.10.0",
- "indexmap 2.12.1",
- "log",
- "serde",
- "serde_derive",
- "serde_json",
- "wasm-encoder",
- "wasm-metadata",
- "wasmparser",
- "wit-parser",
-]
-
-[[package]]
-name = "wit-parser"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
-dependencies = [
- "anyhow",
- "id-arena",
- "indexmap 2.12.1",
- "log",
- "semver",
- "serde",
- "serde_derive",
- "serde_json",
- "unicode-xid",
- "wasmparser",
-]
-
-[[package]]
-name = "wl-clipboard-rs"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9651471a32e87d96ef3a127715382b2d11cc7c8bb9822ded8a7cc94072eb0a3"
-dependencies = [
- "libc",
- "log",
- "os_pipe",
- "rustix 1.1.3",
- "thiserror 2.0.17",
- "tree_magic_mini",
- "wayland-backend",
- "wayland-client",
- "wayland-protocols",
- "wayland-protocols-wlr",
-]
+checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
 
 [[package]]
 name = "wlx-capture"
 version = "0.6.0"
 dependencies = [
- "ashpd",
+ "dbus",
  "drm-fourcc",
  "idmap",
  "libc",
  "log",
  "pipewire",
  "rxscreen",
+ "slotmap",
  "smithay-client-toolkit 0.20.0",
  "wayland-client",
  "wayland-protocols",
@@ -7974,6 +7237,8 @@ dependencies = [
  "rust-ini",
  "serde",
  "serde_json",
+ "serde_json5",
+ "slotmap",
  "smol",
  "strum",
  "walkdir",
@@ -7984,9 +7249,18 @@ dependencies = [
 
 [[package]]
 name = "writeable"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
+checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
+
+[[package]]
+name = "wyz"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
+dependencies = [
+ "tap",
+]
 
 [[package]]
 name = "x11-dl"
@@ -8010,7 +7284,7 @@ dependencies = [
  "libc",
  "libloading 0.8.9",
  "once_cell",
- "rustix 1.1.3",
+ "rustix 1.1.4",
  "x11rb-protocol",
 ]
 
@@ -8020,16 +7294,6 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd"
 
-[[package]]
-name = "xattr"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156"
-dependencies = [
- "libc",
- "rustix 1.1.3",
-]
-
 [[package]]
 name = "xcb"
 version = "1.7.0"
@@ -8078,7 +7342,7 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "dlib",
  "log",
  "once_cell",
@@ -8120,9 +7384,9 @@ checksum = "7a5a4b21e1a62b67a2970e6831bc091d7b87e119e7f9791aef9702e3bef04448"
 
 [[package]]
 name = "yaml-rust2"
-version = "0.10.4"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2462ea039c445496d8793d052e13787f2b90e750b833afee748e601c17621ed9"
+checksum = "631a50d867fafb7093e709d75aaee9e0e0d5deb934021fcea25ac2fe09edc51e"
 dependencies = [
  "arraydeque",
  "encoding_rs",
@@ -8143,9 +7407,9 @@ checksum = "e01738255b5a16e78bbb83e7fbba0a1e7dd506905cfc53f4622d89015a03fbb5"
 
 [[package]]
 name = "yoke"
-version = "0.8.1"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954"
+checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5"
 dependencies = [
  "stable_deref_trait",
  "yoke-derive",
@@ -8154,77 +7418,16 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
+checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
  "synstructure",
 ]
 
-[[package]]
-name = "zbus"
-version = "5.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b622b18155f7a93d1cd2dc8c01d2d6a44e08fb9ebb7b3f9e6ed101488bad6c91"
-dependencies = [
- "async-broadcast",
- "async-executor",
- "async-io",
- "async-lock",
- "async-process",
- "async-recursion",
- "async-task",
- "async-trait",
- "blocking",
- "enumflags2",
- "event-listener",
- "futures-core",
- "futures-lite",
- "hex",
- "nix 0.30.1",
- "ordered-stream",
- "serde",
- "serde_repr",
- "tracing",
- "uds_windows",
- "uuid",
- "windows-sys 0.61.2",
- "winnow",
- "zbus_macros",
- "zbus_names",
- "zvariant",
-]
-
-[[package]]
-name = "zbus_macros"
-version = "5.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cdb94821ca8a87ca9c298b5d1cbd80e2a8b67115d99f6e4551ac49e42b6a314"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn 2.0.113",
- "zbus_names",
- "zvariant",
- "zvariant_utils",
-]
-
-[[package]]
-name = "zbus_names"
-version = "4.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7be68e64bf6ce8db94f63e72f0c7eb9a60d733f7e0499e628dfab0f84d6bcb97"
-dependencies = [
- "serde",
- "static_assertions",
- "winnow",
- "zvariant",
-]
-
 [[package]]
 name = "zeno"
 version = "0.3.3"
@@ -8233,70 +7436,56 @@ checksum = "6df3dc4292935e51816d896edcd52aa30bc297907c26167fec31e2b0c6a32524"
 
 [[package]]
 name = "zerocopy"
-version = "0.8.31"
+version = "0.8.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3"
+checksum = "ce1022995ff5ff5d841ad7d994facc23098cd40152f2c1d11cd607c6f530653f"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.31"
+version = "0.8.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a"
+checksum = "1ae7f38b72ec2a254e2b87ef277cf2cd4fb97cbebf944faa6f33354da0867930"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "zerofrom"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
+checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272"
 dependencies = [
  "zerofrom-derive",
 ]
 
 [[package]]
 name = "zerofrom-derive"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
+checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
  "synstructure",
 ]
 
 [[package]]
 name = "zeroize"
-version = "1.8.2"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
-dependencies = [
- "zeroize_derive",
-]
-
-[[package]]
-name = "zeroize_derive"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.113",
-]
+checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e"
 
 [[package]]
 name = "zerotrie"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851"
+checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf"
 dependencies = [
  "displaydoc",
  "yoke",
@@ -8305,9 +7494,9 @@ dependencies = [
 
 [[package]]
 name = "zerovec"
-version = "0.11.5"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
+checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239"
 dependencies = [
  "yoke",
  "zerofrom",
@@ -8316,105 +7505,26 @@ dependencies = [
 
 [[package]]
 name = "zerovec-derive"
-version = "0.11.2"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
+checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.113",
+ "syn 2.0.118",
 ]
 
-[[package]]
-name = "zip"
-version = "8.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b680f2a0cd479b4cff6e1233c483fdead418106eae419dc60200ae9850f6d004"
-dependencies = [
- "aes",
- "bzip2",
- "constant_time_eq",
- "crc32fast",
- "deflate64",
- "flate2",
- "getrandom 0.4.2",
- "hmac",
- "indexmap 2.12.1",
- "lzma-rust2 0.16.2",
- "memchr",
- "pbkdf2",
- "ppmd-rust",
- "sha1",
- "time",
- "typed-path",
- "zeroize",
- "zopfli",
- "zstd",
-]
-
-[[package]]
-name = "zlib-rs"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40990edd51aae2c2b6907af74ffb635029d5788228222c4bb811e9351c0caad3"
-
 [[package]]
 name = "zmij"
-version = "1.0.10"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30e0d8dffbae3d840f64bda38e28391faef673a7b5a6017840f2a106c8145868"
-
-[[package]]
-name = "zopfli"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f05cd8797d63865425ff89b5c4a48804f35ba0ce8d125800027ad6017d2b5249"
-dependencies = [
- "bumpalo",
- "crc32fast",
- "log",
- "simd-adler32",
-]
-
-[[package]]
-name = "zstd"
-version = "0.13.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a"
-dependencies = [
- "zstd-safe",
-]
-
-[[package]]
-name = "zstd-safe"
-version = "7.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d"
-dependencies = [
- "zstd-sys",
-]
-
-[[package]]
-name = "zstd-sys"
-version = "2.0.16+zstd.1.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748"
-dependencies = [
- "cc",
- "pkg-config",
-]
+checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
 
 [[package]]
 name = "zune-core"
-version = "0.4.12"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a"
-
-[[package]]
-name = "zune-core"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "111f7d9820f05fd715df3144e254d6fc02ee4088b0644c0ffd0efc9e6d9d2773"
+checksum = "cb8a0807f7c01457d0379ba880ba6322660448ddebc890ce29bb64da71fb40f9"
 
 [[package]]
 name = "zune-inflate"
@@ -8427,59 +7537,9 @@ dependencies = [
 
 [[package]]
 name = "zune-jpeg"
-version = "0.4.21"
+version = "0.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29ce2c8a9384ad323cf564b67da86e21d3cfdff87908bc1223ed5c99bc792713"
+checksum = "27bc9d5b815bc103f142aa054f561d9187d191692ec7c2d1e2b4737f8dbd7296"
 dependencies = [
- "zune-core 0.4.12",
-]
-
-[[package]]
-name = "zune-jpeg"
-version = "0.5.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e35aee689668bf9bd6f6f3a6c60bb29ba1244b3b43adfd50edd554a371da37d5"
-dependencies = [
- "zune-core 0.5.0",
-]
-
-[[package]]
-name = "zvariant"
-version = "5.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2be61892e4f2b1772727be11630a62664a1826b62efa43a6fe7449521cb8744c"
-dependencies = [
- "endi",
- "enumflags2",
- "serde",
- "url",
- "winnow",
- "zvariant_derive",
- "zvariant_utils",
-]
-
-[[package]]
-name = "zvariant_derive"
-version = "5.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da58575a1b2b20766513b1ec59d8e2e68db2745379f961f86650655e862d2006"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn 2.0.113",
- "zvariant_utils",
-]
-
-[[package]]
-name = "zvariant_utils"
-version = "3.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6949d142f89f6916deca2232cf26a8afacf2b9fdc35ce766105e104478be599"
-dependencies = [
- "proc-macro2",
- "quote",
- "serde",
- "syn 2.0.113",
- "winnow",
+ "zune-core",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 5488eca7..b57a0502 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,3 +1,63 @@
+[workspace]
+resolver = "3"
+members = [
+  "dash-frontend",
+  "scripts/prost_build",
+  "uidev",
+  "wayvr",
+  "wayvr-ipc",
+  "wayvrctl",
+  "wgui",
+  "wlx-capture",
+  "wlx-common",
+]
+
+[workspace.dependencies]
+anyhow = "1.0.100"
+async-channel = "2.3"
+async-io = "2.1"
+bytes = { version = "1.11.1" }
+chrono = "0.4.42"
+clap = { version = "4.5.53", features = ["derive"] }
+dbus = { version = "0.9.12" }
+glam = { version = "0.30.9", features = ["mint", "serde"] }
+idmap = "0.2.2"
+idmap-derive = "0.2.22"
+interprocess = { version = "2.2.3" }
+libc = "0.2.178"
+log = "0.4.29"
+pipewire = { version = "0.10", features = ["v0_3_33", "v0_3_65"] }
+regex = "1.12.2"
+rust-embed = "8.9.0"
+serde = { version = "1", features = ["derive"] }
+serde_json = "1.0.145"
+serde_json5 = "0.2.1"
+slotmap = "1.1.1"
+smallvec = "1.15.2"
+smol = "2.0.2"
+strum = { version = "0.27.2", features = ["derive"] }
+tracing-subscriber = { version = "0.3.22", features = ["env-filter"] }
+uuid = { version = "1.19.0", features = ["fast-rng", "serde", "v4"] }
+vulkano = {
+  version = "0.35.2",
+  default-features = false,
+  features = [
+    "macros",
+  ]
+}
+vulkano-shaders = "0.35.0"
+wayland-client = { version = "0.31" }
+wayland-protocols = { version = "0.32" }
+wayland-protocols-misc = { version = "0.3.12" }
+winit = "0.30.12"
+xdg = "3.0.0"
+
+[patch.crates-io]
+vulkano = {
+  git = "https://github.com/galister/vulkano.git",
+  rev = "cf7f92867928a56ce16b376037c1120f2b167678"
+}
+
 [profile.dev]
 opt-level = 1
 debug = true
@@ -19,41 +79,3 @@ incremental = true
 [profile.release-with-debug]
 inherits = "release"
 debug = true
-
-[workspace]
-members = [
-  "uidev",
-  "wgui",
-  "wlx-common",
-  "wayvr",
-  "wlx-capture",
-  "dash-frontend",
-  "wayvr-ipc",
-  "wayvrctl",
-  "scripts/prost_build",
-]
-resolver = "3"
-
-[patch.crates-io]
-vulkano = { git = "https://github.com/galister/vulkano.git", rev = "cf7f92867928a56ce16b376037c1120f2b167678" }
-
-[workspace.dependencies]
-anyhow = "1.0.100"
-smol = "2.0.2"
-glam = { version = "0.30.9", features = ["mint", "serde"] }
-clap = { version = "4.5.53", features = ["derive"] }
-xdg = "3.0.0"
-idmap = "0.2.2"
-idmap-derive = "0.2.22"
-log = "0.4.29"
-regex = "1.12.2"
-rust-embed = "8.9.0"
-serde = { version = "1", features = ["derive"] }
-serde_json = "1.0.145"
-slotmap = "1.1.1"
-strum = { version = "0.27.2", features = ["derive"] }
-vulkano = { version = "0.35.2", default-features = false, features = [
-  "macros",
-] }
-vulkano-shaders = "0.35.0"
-wayland-client = { version = "0.31.11" }
diff --git a/README.md b/README.md
index f591edc4..a7deebfa 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,7 @@ There are multiple ways to install WayVR:
 1. AppImage: Download from [Releases](https://github.com/wayvr-org/wayvr/releases)
 1. AUR package: [wayvr](https://aur.archlinux.org/packages/wayvr) or [wayvr-git](https://aur.archlinux.org/packages/wayvr-git)
 1. Nix package: [wayvr](https://search.nixos.org/packages?channel=unstable&show=wayvr&query=wayvr) or [unstable package from nixpkgs-xr](https://github.com/nix-community/nixpkgs-xr)
+1. [Homebrew-XR](https://tangled.org/matrixfurry.com/homebrew-xr) package (for Bazzite, etc.): [wayvr](https://tangled.org/matrixfurry.com/homebrew-xr/#installing-applications)
 1. [Docs: Building from source](https://wayvr.org/docs/basics/building-from-source/).
 
 ### General Setup
@@ -83,7 +84,9 @@ Show and hide the working set using:
 - Non-vive controller: double-tap B or Y on the left controller.
 - Vive controller: double-tap the menu button on the left controller (for SteamVR, the `showhide` binding must be bound)
 
-See the [bindings](#default-bindings) section on how to grab, move and resize overlay windows.
+Moving overlays: Grab + Joystick
+
+Resizing overlays: Grab + Click + Joystick
 
 ### Pointer Modes AKA Laser Colors
 
@@ -98,20 +101,29 @@ Please see the bindings section below on how to activate these modes.
 
 The guide here uses the colors for ease of getting started.
 
+### Edit mode
+
+Ways to enter Edit mode:
+- Edit mode button on Watch face
+- Taskbar (top of keyboard) hamburger menu
+- Edit mode button on the title bar of WayVR apps (next to X button)
+
+Edit mode lets you grab overlays and reposition them in yourset.
+
+It's also possible to change overlay behavior and tweak your overlays in different way.
+
+While in edit mode, try hovering over various overlays to see their options!
+
 ### The watch
 
 Check your left wrist for the watch. The watch is the primary tool for controlling the app.
 
 The top of the watch shows device batteries, and the bottom shows your overlay controls.
 
-Enter edit mode (the leftmost button at the bottom) to edit your overlay sets.
-
 While in edit mode, the watch can also be grabbed and passed between your hands.
 
 After grabbing, the watch will automatically attach to the hand that's opposite from the one that held it.
 
-In edit mode, try hovering over other overlays to see their advanced options!
-
 ### The screens
 
 Hovering a pointer over a screen will move the mouse. If more than one pointer is hovering over a screen, the pointer that was last used to click will take precedence.
@@ -125,6 +137,10 @@ The click type depends on the laser color:
 
 ### The keyboard
 
+The keyboard sends keys to the screen or WayVR application with the most recent mouse interaction.
+
+On top of the keyboard is the taskbar, which lists WayVR apps as well as screens, mirrors and panels overlays.
+
 Typing
 
 - Use the BLUE laser when typing regularly.
@@ -145,12 +161,9 @@ Typing
 
 ### Changing Bindings
 
-SteamVR: Simply change the bindings from the SteamVR bindings section. If WayVR doesn't show up on the list, select any other title and then press back on the top left. (SteamVR is weird like that sometimes)
-
-OpenXR (Monado/WiVRn): See [Docs: OpenXR Bindings](https://wayvr.org/docs/various/openxr-bindings/)
-
-If your controllers are not supported, please reach out. \
-We would like to work with you and include additional bindings.
+- SteamVR: Simply change the bindings from the SteamVR bindings section. 
+  - If WayVR doesn't show up on the list, select any other title and then press back on the top left. (SteamVR bug)
+- Monado/WiVRn: See WayVR Dashboard → Settings → Controls.
 
 ## Customization
 
@@ -170,14 +183,16 @@ Check [here](https://wayvr.org/docs/various/troubleshooting/) for tips.
 
 ## Known Issues
 
-### Mouse is not where it should be
+### Mouse movement is wrong
 
-If the mouse is moving on a completely different screen, the screens were likely selected in the wrong order:
+**If the mouse is moving on a completely different screen**, the screens were likely selected in the wrong order:
 
 - Go to Settings and press `Clear PipeWire tokens` and then `Restart software`
 - Pay attention to your notifications, which tell you in which order to pick the screens.
 - If notifications don't show, try starting WayVR from the terminal and look for instructions in there.
 
+**If the mouse is on the correct screen but moves in weird ways**, enter Edit Mode, hover the screen and under Mouse Fixes, select the mode that works.
+
 COSMIC desktop:
 
 - Due to limitations with COSMIC, the mouse can only move on a single display.
@@ -188,19 +203,12 @@ X11 users:
 - DPI scaling is not supported and will mess with the mouse.
 - Upright screens are not supported and will mess with the mouse.
 
-### Screens are blank or black or frozen on SteamVR 2.14+
+### Screens or launched apps don't work when auto-started by SteamVR or WiVRn
 
-As of SteamVR version 2.14.x, PipeWire capture no longer works when using Steam Link.
+SteamVR starts WayVR in the Steam runtime, and systemd/flatpak WiVRn can also start WayVR in a sub-optimal environment.
 
-We're unable to completely troubleshoot how and why SteamVR interferes with PipeWire, so consider the following workarounds for the time being:
-
-- Use another streamer, such as WiVRn or ALVR. Note that SteamVR on Linux is considered experimental by Valve themselves [disclaimer](https://github.com/ValveSoftware/SteamVR-for-Linux?tab=readme-ov-file#steamvr-release-notes-and-known-issues).
-- If your desktop [supports ScreenCopy](https://wayland.app/protocols/wlr-screencopy-unstable-v1#compositor-support), go to Settings and set `Wayland capture method` to `ScreenCopy`
-- If your desktop has an X11 mode, try using that
-
-### Modifiers get stuck
-
-Hiding the keyboard will unpress all of its buttons. Alternatively, go to Settings and use the `Restart software` button.
+The easiest fix is to start WayVR separately. It's possible to start WayVR before starting SteamVR/WiVRn by passing `--wait`:
+- `wayvr --wait` or `/path/to/WayVR.AppImage --wait`
 
 ### X11 limitations
 
diff --git a/dash-frontend/Cargo.toml b/dash-frontend/Cargo.toml
index 06f1b010..bfe5064b 100644
--- a/dash-frontend/Cargo.toml
+++ b/dash-frontend/Cargo.toml
@@ -13,21 +13,26 @@ wgui = { path = "../wgui/" }
 wlx-common = { path = "../wlx-common" }
 
 anyhow.workspace = true
+chrono.workspace = true
 glam = { workspace = true, features = ["mint", "serde"] }
 log.workspace = true
-xdg.workspace = true
 rust-embed.workspace = true
 serde = { workspace = true, features = ["rc"] }
 serde_json.workspace = true
-strum.workspace = true
-
-chrono = "0.4.42"
-keyvalues-parser = { git = "https://github.com/CosmicHorrorDev/vdf-rs.git", rev = "fc6dcbea9eb13cacb98dea40063f6f56cde6e145" }
 smol = { workspace = true }
-hyper = { version = "1.8.1", features = ["client", "http1", "http2"] }
+strum.workspace = true
+uuid.workspace = true
+xdg.workspace = true
+
+async-native-tls = "0.6.0"
 http-body-util = "0.1.3"
-async-native-tls = "0.5.0"
+keyvalues-parser = {
+  git = "https://codeberg.org/CosmicHarper/vdf-rs.git",
+  rev = "fc6dcbea9eb13cacb98dea40063f6f56cde6e145"
+}
+lz4_flex = { version = "0.13.1", features = ["frame"] }
 smol-hyper = "0.1.1"
+ureq = "3.3.0"
 
 [features]
 default = ["monado"]
diff --git a/dash-frontend/assets/dashboard/avatars/galister.png b/dash-frontend/assets/dashboard/avatars/galister.png
new file mode 100644
index 00000000..106037e3
Binary files /dev/null and b/dash-frontend/assets/dashboard/avatars/galister.png differ
diff --git a/dash-frontend/assets/dashboard/avatars/oo8dev.png b/dash-frontend/assets/dashboard/avatars/oo8dev.png
new file mode 100644
index 00000000..6b9aee5c
Binary files /dev/null and b/dash-frontend/assets/dashboard/avatars/oo8dev.png differ
diff --git a/dash-frontend/assets/dashboard/builtin-skybox-preview.jpg b/dash-frontend/assets/dashboard/builtin-skybox-preview.jpg
new file mode 100644
index 00000000..7ca3e583
Binary files /dev/null and b/dash-frontend/assets/dashboard/builtin-skybox-preview.jpg differ
diff --git a/dash-frontend/assets/dashboard/cancel.svg b/dash-frontend/assets/dashboard/cancel.svg
new file mode 100644
index 00000000..74c27b23
--- /dev/null
+++ b/dash-frontend/assets/dashboard/cancel.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="#F55" d="m8.4 17l3.6-3.6l3.6 3.6l1.4-1.4l-3.6-3.6L17 8.4L15.6 7L12 10.6L8.4 7L7 8.4l3.6 3.6L7 15.6zm3.6 5q-2.075 0-3.9-.788t-3.175-2.137T2.788 15.9T2 12t.788-3.9t2.137-3.175T8.1 2.788T12 2t3.9.788t3.175 2.137T21.213 8.1T22 12t-.788 3.9t-2.137 3.175t-3.175 2.138T12 22m0-2q3.35 0 5.675-2.325T20 12t-2.325-5.675T12 4T6.325 6.325T4 12t2.325 5.675T12 20m0-8"/></svg>
diff --git a/dash-frontend/assets/dashboard/check.svg b/dash-frontend/assets/dashboard/check.svg
new file mode 100644
index 00000000..d4ba7af0
--- /dev/null
+++ b/dash-frontend/assets/dashboard/check.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="#33FF99" d="m9.55 18l-5.7-5.7l1.425-1.425L9.55 15.15l9.175-9.175L20.15 7.4z"/></svg>
diff --git a/dash-frontend/assets/dashboard/check_3d.png b/dash-frontend/assets/dashboard/check_3d.png
new file mode 100644
index 00000000..bac93cc3
Binary files /dev/null and b/dash-frontend/assets/dashboard/check_3d.png differ
diff --git a/dash-frontend/assets/dashboard/click.svg b/dash-frontend/assets/dashboard/click.svg
new file mode 100644
index 00000000..10d55cff
--- /dev/null
+++ b/dash-frontend/assets/dashboard/click.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M11.7 18q-2.4-.125-4.05-1.85T6 12q0-2.5 1.75-4.25T12 6q2.425 0 4.15 1.65T18 11.7l-2.1-.625q-.325-1.35-1.4-2.212T12 8q-1.65 0-2.825 1.175T8 12q0 1.425.863 2.5t2.212 1.4zm8.825 4.5l-4.275-4.275L15 22l-3-10l10 3l-3.775 1.25l4.275 4.275z"/></svg>
diff --git a/dash-frontend/assets/dashboard/donate.svg b/dash-frontend/assets/dashboard/donate.svg
new file mode 100644
index 00000000..fc746fb5
--- /dev/null
+++ b/dash-frontend/assets/dashboard/donate.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Iconoir by Luca Burgio - https://github.com/iconoir-icons/iconoir/blob/main/LICENSE --><g fill="none" stroke="currentColor" stroke-linejoin="round" stroke-width="1.5"><path d="M16 6.28a2.28 2.28 0 0 1-.662 1.606c-.976.984-1.923 2.01-2.936 2.958a.597.597 0 0 1-.822-.017l-2.918-2.94a2.28 2.28 0 0 1 0-3.214a2.277 2.277 0 0 1 3.232 0L12 4.78l.106-.107A2.276 2.276 0 0 1 16 6.28Z"/><path stroke-linecap="round" d="m18 20l3.824-3.824a.6.6 0 0 0 .176-.424V10.5A1.5 1.5 0 0 0 20.5 9v0a1.5 1.5 0 0 0-1.5 1.5V15"/><path stroke-linecap="round" d="m18 16l.858-.858a.48.48 0 0 0 .142-.343v0a.49.49 0 0 0-.268-.433l-.443-.221a2 2 0 0 0-2.308.374l-.895.895a2 2 0 0 0-.586 1.414V20M6 20l-3.824-3.824A.6.6 0 0 1 2 15.752V10.5A1.5 1.5 0 0 1 3.5 9v0A1.5 1.5 0 0 1 5 10.5V15"/><path stroke-linecap="round" d="m6 16l-.858-.858A.5.5 0 0 1 5 14.799v0c0-.183.104-.35.268-.433l.443-.221a2 2 0 0 1 2.308.374l.895.895a2 2 0 0 1 .586 1.414V20"/></g></svg>
\ No newline at end of file
diff --git a/dash-frontend/assets/dashboard/download.svg b/dash-frontend/assets/dashboard/download.svg
new file mode 100644
index 00000000..f446969b
--- /dev/null
+++ b/dash-frontend/assets/dashboard/download.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="m12 16l-5-5l1.4-1.45l2.6 2.6V4h2v8.15l2.6-2.6L17 11zm-6 4q-.825 0-1.412-.587T4 18v-3h2v3h12v-3h2v3q0 .825-.587 1.413T18 20z"/></svg>
diff --git a/dash-frontend/assets/dashboard/drag.svg b/dash-frontend/assets/dashboard/drag.svg
new file mode 100644
index 00000000..9710d6bd
--- /dev/null
+++ b/dash-frontend/assets/dashboard/drag.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="m12 22l-4.25-4.25l1.425-1.425L11 18.15V13H5.875L7.7 14.8l-1.45 1.45L2 12l4.225-4.225L7.65 9.2L5.85 11H11V5.85L9.175 7.675L7.75 6.25L12 2l4.25 4.25l-1.425 1.425L13 5.85V11h5.125L16.3 9.2l1.45-1.45L22 12l-4.25 4.25l-1.425-1.425L18.15 13H13v5.125l1.8-1.825l1.45 1.45z"/></svg>
\ No newline at end of file
diff --git a/dash-frontend/assets/dashboard/error.svg b/dash-frontend/assets/dashboard/error.svg
new file mode 100644
index 00000000..fa2fe4b7
--- /dev/null
+++ b/dash-frontend/assets/dashboard/error.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="#FF4455" d="M12 17q.425 0 .713-.288T13 16t-.288-.712T12 15t-.712.288T11 16t.288.713T12 17m-1-4h2V7h-2zm1 9q-2.075 0-3.9-.788t-3.175-2.137T2.788 15.9T2 12t.788-3.9t2.137-3.175T8.1 2.788T12 2t3.9.788t3.175 2.137T21.213 8.1T22 12t-.788 3.9t-2.137 3.175t-3.175 2.138T12 22m0-2q3.35 0 5.675-2.325T20 12t-2.325-5.675T12 4T6.325 6.325T4 12t2.325 5.675T12 20m0-8"/></svg>
diff --git a/dash-frontend/assets/dashboard/gravity.svg b/dash-frontend/assets/dashboard/gravity.svg
new file mode 100644
index 00000000..bec06901
--- /dev/null
+++ b/dash-frontend/assets/dashboard/gravity.svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="32"
+   height="32"
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="svg1"
+   sodipodi:docname="gravity.svg"
+   inkscape:version="1.4.4 (dcaf3e7d9e, 2026-05-05)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="23.234375"
+     inkscape:cx="17.861466"
+     inkscape:cy="22.488231"
+     inkscape:window-width="1582"
+     inkscape:window-height="1302"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg1" />
+  <defs
+     id="defs1" />
+  <!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE -->
+  <!-- Modified it a little bit, there's no "space gravity" icon available. -->
+  <path
+     fill="currentColor"
+     d="m 15.76786,18.274928 -1.391472,0.295932 -0.674684,-2.9751 -3.051267,-0.735557 -2.4062791,-3.292082 -0.8846145,1.824345 1.561484,2.213127 -1.1706157,0.808349 -1.9932655,-2.862487 1.752944,-3.7745856 Q 7.740355,9.2978686 8.2693798,9.1366908 8.7984057,8.9755132 9.3446883,8.9671549 9.9537305,8.9704882 10.547911,8.8283107 11.142091,8.6861403 11.667399,8.364791 12.192707,8.0434408 12.541821,7.5511898 12.890935,7.0589389 13.170167,6.5208564 l 1.228561,0.6477209 q -0.321651,0.575352 -0.696034,1.1164692 -0.374382,0.5411172 -0.890945,0.9726251 -0.466314,0.3718768 -0.998843,0.6112737 -0.532529,0.2393967 -1.117089,0.3386867 L 12,12 l 2.176682,-1.469824 4.352172,0.934365 -0.326914,1.35612 -3.582453,-0.734464 -2.11263,1.442217 2.281549,0.535655 z M 7.5517982,8.9044443 Q 7.0233673,9.1322023 6.4853273,8.9182692 5.9472884,8.7043353 5.7186139,8.1755407 5.4899403,7.6467461 5.7054294,7.108795 5.9209195,6.5708439 6.4475175,6.3423563 6.9741154,6.1138698 7.5149037,6.3288971 8.0556931,6.5439235 8.2807018,7.07126 8.5057095,7.5985974 8.2948017,8.1383704 8.0838948,8.6781445 7.5517982,8.9044443"
+     id="path1"
+     style="stroke-width:0.697484" />
+  <path
+     id="path2"
+     style="fill:none;stroke:currentColor;stroke-width:2.43525;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:0, 7.30575"
+     d="M 22.480952,12 C 22.480952,17.78847 17.78847,22.480952 12,22.480952 6.2115299,22.480952 1.5190477,17.78847 1.5190477,12 1.5190475,6.2115298 6.2115298,1.5190477 12,1.5190477 c 0.653263,0 1.292568,0.059766 1.912744,0.1741274 C 18.787854,2.5921561 22.480952,6.8647934 22.480952,12 Z"
+     sodipodi:nodetypes="ssssss" />
+</svg>
diff --git a/dash-frontend/assets/dashboard/hand_left.svg b/dash-frontend/assets/dashboard/hand_left.svg
new file mode 100644
index 00000000..b780d430
--- /dev/null
+++ b/dash-frontend/assets/dashboard/hand_left.svg
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="48"
+   height="48"
+   viewBox="0 0 384.00001 383.99998"
+   version="1.1"
+   id="svg1"
+   sodipodi:docname="hand_left.svg"
+   inkscape:version="1.4.4 (dcaf3e7d9e, 2026-05-05)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:clip-to-page="false"
+     inkscape:zoom="8"
+     inkscape:cx="24"
+     inkscape:cy="15.9375"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1" />
+  <defs
+     id="defs1" />
+  <!-- Icon from Phosphor by Phosphor Icons - https://github.com/phosphor-icons/core/blob/main/LICENSE -->
+  <path
+     fill="currentColor"
+     d="m 223.99926,120.14002 v 90.93 c 0,46.2 -36.85,84.55 -83,85.06 a 83.7,83.7 0 0 1 -60.400003,-24.59 c -21.81,-23.07 -46.45,-79.4 -46.45,-79.4 a 16,16 0 0 1 6.53,-22.23 c 7.66,-4 17.1,-0.84 21.4,6.62 l 21,36.44 a 6.09,6.09 0 0 0 6,3.09 h 0.12 a 8.19,8.19 0 0 0 6.800001,-8.18 v -103.74 A 16,16 0 0 1 112.76926,88.140018 c 8.61,0.4 15.23,7.82 15.23,16.430002 v 63.57 a 8,8 0 0 0 8.53,8 8.17,8.17 0 0 0 7.47,-8.25 V 88.140018 a 16,16 0 0 1 16.77,-15.999999 c 8.61,0.4 15.23,7.82 15.23,16.429999 v 87.570002 a 8,8 0 0 0 8.53,8 8.17,8.17 0 0 0 7.47,-8.25 v -55.3 c 0,-8.61 6.62,-16 15.23,-16.43 a 16,16 0 0 1 16.77,15.98"
+     id="path1" />
+  <path
+     fill="currentColor"
+     d="M 263.19112,258.73409 V 112.03922 h 18.49095 v 130.25847 h 64.10196 v 16.4364 z"
+     id="text1"
+     aria-label="L" />
+</svg>
diff --git a/dash-frontend/assets/dashboard/hand_right.svg b/dash-frontend/assets/dashboard/hand_right.svg
new file mode 100644
index 00000000..9f44db82
--- /dev/null
+++ b/dash-frontend/assets/dashboard/hand_right.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="48"
+   height="48"
+   viewBox="0 0 384 383.99998"
+   version="1.1"
+   id="svg1"
+   sodipodi:docname="hand_right.svg"
+   inkscape:version="1.4.4 (dcaf3e7d9e, 2026-05-05)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="8"
+     inkscape:cx="24"
+     inkscape:cy="15.9375"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1" />
+  <defs
+     id="defs1" />
+  <!-- Icon from Phosphor by Phosphor Icons - https://github.com/phosphor-icons/core/blob/main/LICENSE -->
+  <path
+     fill="currentColor"
+     d="M 30.079989,119.60999 V 210.54 c 0,46.2 36.85,84.55 83.000011,85.06 a 83.7,83.7 0 0 0 60.4,-24.59 c 21.81,-23.07 46.45,-79.4 46.45,-79.4 a 16,16 0 0 0 -6.53,-22.23 c -7.66,-4.00001 -17.1,-0.84 -21.4,6.62 l -21,36.44 a 6.09,6.09 0 0 1 -6,3.09 h -0.12 a 8.19,8.19 0 0 1 -6.8,-8.18 V 103.60999 a 16,16 0 0 0 -16.77,-16 c -8.61,0.4 -15.23,7.82 -15.23,16.43 V 167.61 a 8,8 0 0 1 -8.53,8 8.17,8.17 0 0 1 -7.47,-8.25 V 87.60999 A 16,16 0 0 0 93.309986,71.609992 c -8.609997,0.4 -15.229997,7.819999 -15.229997,16.429998 V 175.61 a 8,8 0 0 1 -8.53,8 8.17,8.17 0 0 1 -7.47,-8.25 v -55.30001 c 0,-8.61 -6.62,-16 -15.23,-16.43 a 16,16 0 0 0 -16.77,15.98"
+     id="path1" />
+  <path
+     d="m 301.74274,111.50919 q 27.32551,0 40.26918,10.4782 13.14912,10.27275 13.14912,31.22916 0,11.71094 -4.31456,19.51824 -4.31455,7.80729 -11.09457,12.53275 -6.57456,4.52001 -13.97094,7.19093 l 40.26918,65.7456 h -21.57277 l -35.54372,-60.60923 h -29.17461 v 60.60923 H 261.2681 V 111.50919 Z m -1.02728,16.02549 h -20.95641 v 54.44558 h 21.98369 q 17.87458,0 26.09278,-6.98547 8.2182,-7.19092 8.2182,-20.95642 0,-14.38185 -8.62911,-20.34004 -8.62911,-6.16365 -26.70915,-6.16365 z"
+     id="text1"
+     fill="currentColor"
+     aria-label="R" />
+</svg>
diff --git a/dash-frontend/assets/dashboard/heart_minus.svg b/dash-frontend/assets/dashboard/heart_minus.svg
new file mode 100644
index 00000000..adf802f1
--- /dev/null
+++ b/dash-frontend/assets/dashboard/heart_minus.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M15 14v-2h8v2zm-4 7l-3.175-2.85q-1.8-1.625-3.088-2.9t-2.125-2.4t-1.225-2.175T1 8.475q0-2.35 1.575-3.912T6.5 3q1.3 0 2.475.538T11 5.075q.85-1 2.025-1.537T15.5 3q2.125 0 3.563 1.288T20.85 7.3q-.45-.175-.9-.262t-.875-.088q-2.525 0-4.3 1.763T13 13q0 1.3.525 2.463T15 17.45q-.475.425-1.237 1.088T12.45 19.7z"/></svg>
\ No newline at end of file
diff --git a/dash-frontend/assets/dashboard/heart_plus.svg b/dash-frontend/assets/dashboard/heart_plus.svg
new file mode 100644
index 00000000..fe000dac
--- /dev/null
+++ b/dash-frontend/assets/dashboard/heart_plus.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M18.288 16.713Q18 16.425 18 16v-2h-2q-.425 0-.712-.288T15 13t.288-.712T16 12h2v-2q0-.425.288-.712T19 9t.713.288T20 10v2h2q.425 0 .713.288T23 13t-.288.713T22 14h-2v2q0 .425-.288.713T19 17t-.712-.288M1.75 23.626v-3.8zM10.3 20.2q-.35-.125-.625-.4q-1.1-1-2.6-2.275t-2.85-2.737t-2.287-3.063T1 8.475q0-2.35 1.575-3.912T6.5 3q1.3 0 2.475.538T11 5.075q.85-1 2.025-1.537T15.5 3q1.575 0 2.788.738T20.2 5.6q.275.475-.087.963T19.075 7h-.4q-2.125 0-3.9 1.713T13 13q0 1.05.338 1.988T14.4 16.7q.275.3.238.7t-.338.675l-1.975 1.75q-.275.275-.625.388t-.7.112t-.7-.125"/></svg>
\ No newline at end of file
diff --git a/dash-frontend/assets/dashboard/info.svg b/dash-frontend/assets/dashboard/info.svg
new file mode 100644
index 00000000..6ee22632
--- /dev/null
+++ b/dash-frontend/assets/dashboard/info.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M11 17h2v-6h-2zm1.713-8.287Q13 8.425 13 8t-.288-.712T12 7t-.712.288T11 8t.288.713T12 9t.713-.288M12 22q-2.075 0-3.9-.788t-3.175-2.137T2.788 15.9T2 12t.788-3.9t2.137-3.175T8.1 2.788T12 2t3.9.788t3.175 2.137T21.213 8.1T22 12t-.788 3.9t-2.137 3.175t-3.175 2.138T12 22"/></svg>
diff --git a/dash-frontend/assets/dashboard/loading.svg b/dash-frontend/assets/dashboard/loading.svg
new file mode 100644
index 00000000..1c800c12
--- /dev/null
+++ b/dash-frontend/assets/dashboard/loading.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Design Icons by Pictogrammers - https://github.com/Templarian/MaterialDesign/blob/master/LICENSE --><path fill="currentColor" d="M12 4V2A10 10 0 0 0 2 12h2a8 8 0 0 1 8-8"/></svg>
diff --git a/dash-frontend/assets/dashboard/opencollective.svg b/dash-frontend/assets/dashboard/opencollective.svg
new file mode 100644
index 00000000..fa9687af
--- /dev/null
+++ b/dash-frontend/assets/dashboard/opencollective.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 256 256"><!-- Icon from SVG Logos by Gil Barbara - https://raw.githubusercontent.com/gilbarbara/logos/master/LICENSE.txt --><path fill="#b8d3f4" d="M209.765 128.15c0 16.013-4.9 31.34-13.266 44.575l33.447 33.447a128.9 128.9 0 0 0 25.783-77.35c0-29.265-9.754-55.751-26.47-77.336l-32.776 32.729a79.44 79.44 0 0 1 13.267 43.888z"/><path fill="#7fadf2" d="M127.513 210.355c-45.367-.086-82.125-36.838-82.22-82.205c.069-45.386 36.835-82.166 82.22-82.252c16.732 0 32.058 4.901 44.607 13.267l32.744-32.776A128.97 128.97 0 0 0 127.514.636C57.123.636 0 57.76 0 128.15c0 70.359 57.124 127.513 127.513 127.513a125.13 125.13 0 0 0 77.351-26.501l-33.447-33.431c-11.861 9.754-27.157 14.624-43.904 14.624"/></svg>
\ No newline at end of file
diff --git a/dash-frontend/assets/dashboard/opencollective_logo.svg b/dash-frontend/assets/dashboard/opencollective_logo.svg
new file mode 100644
index 00000000..2972751e
--- /dev/null
+++ b/dash-frontend/assets/dashboard/opencollective_logo.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="168"
+   height="28"
+   viewBox="0 0 168 28"
+   fill="none"
+   version="1.1"
+   id="svg3"
+   sodipodi:docname="opencollective_logo.svg"
+   inkscape:version="1.4.4 (dcaf3e7d9e, 2026-05-05)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs3" />
+  <sodipodi:namedview
+     id="namedview3"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="5.9872583"
+     inkscape:cx="56.286197"
+     inkscape:cy="5.0941513"
+     inkscape:window-width="3072"
+     inkscape:window-height="1664"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg3" />
+  <path
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     d="M106.727 5H108.459C108.494 5 108.529 5.03604 108.565 5.10811V20.1712C108.565 20.2432 108.529 20.2793 108.459 20.2793H106.727C106.657 20.2793 106.621 20.2432 106.621 20.1712V5.10811C106.621 5.03604 106.657 5 106.727 5ZM140.011 9.68468H141.954C141.99 9.68468 142.06 9.75676 142.06 9.79279V11.5586C142.06 11.6306 142.025 11.6667 141.954 11.6667H140.011C139.976 11.6667 139.94 11.7027 139.94 11.7387V20.1712C139.94 20.2432 139.905 20.2793 139.834 20.2793H138.103C138.032 20.2793 137.997 20.2432 137.997 20.1712V11.7387C137.997 11.7027 137.962 11.6667 137.926 11.6667H136.018C135.948 11.6667 135.912 11.6306 135.912 11.5586V9.79279C135.912 9.72072 135.948 9.68468 136.018 9.68468H137.926C137.962 9.68468 137.997 9.64865 137.997 9.61261V5.10811C137.997 5.03604 138.032 5 138.103 5H139.834C139.905 5 139.94 5.03604 139.94 5.10811V9.61261C139.94 9.64865 139.976 9.68468 140.011 9.68468ZM145.523 6.2973H143.792C143.721 6.2973 143.686 6.33334 143.686 6.40541V8.17118C143.686 8.24325 143.721 8.27928 143.792 8.27928H145.523C145.594 8.27928 145.629 8.24325 145.629 8.17118V6.40541C145.629 6.33334 145.594 6.2973 145.523 6.2973ZM159.727 17.3243C160.363 18.0451 161.246 18.4775 162.271 18.4775C163.578 18.4775 164.709 17.7207 165.345 16.6397C165.345 16.5676 165.415 16.5676 165.451 16.5676L167.182 16.8919C167.253 16.8919 167.288 16.964 167.253 17.036C166.44 19.018 164.532 20.4234 162.306 20.4234C159.232 20.4234 156.794 17.8288 156.935 14.6937C157.041 11.8829 159.338 9.61263 162.094 9.50452C164.709 9.39641 166.935 11.2342 167.5 13.7207C167.5 13.7568 167.5 13.7928 167.429 13.8288L165.698 14.5856L159.762 17.1442C159.691 17.1802 159.691 17.2523 159.727 17.3243ZM164.815 12.6757C164.214 11.955 163.295 11.4865 162.271 11.4865C160.363 11.4865 158.808 13.036 158.843 15.018V15.3063C158.843 15.3424 158.914 15.4144 158.985 15.3784C159.055 15.3424 164.779 12.8559 164.779 12.8559C164.85 12.8198 164.85 12.7478 164.815 12.6757ZM156.688 9.68469H154.992C154.957 9.68469 154.921 9.72073 154.886 9.75676L152.13 18.009C152.059 18.1892 151.847 18.1892 151.777 18.009L149.021 9.75676C149.021 9.72073 148.985 9.68469 148.915 9.68469H147.219C147.148 9.68469 147.113 9.75676 147.113 9.82884L150.611 20.2072C150.611 20.2433 150.646 20.2793 150.717 20.2793H153.119C153.155 20.2793 153.19 20.2433 153.225 20.2072L156.723 9.82884C156.794 9.75676 156.759 9.68469 156.688 9.68469ZM143.792 9.68469H145.523C145.594 9.68469 145.629 9.75676 145.629 9.7928V20.1712C145.629 20.2433 145.594 20.2793 145.523 20.2793H143.792C143.721 20.2793 143.686 20.2433 143.686 20.1712V9.7928C143.686 9.72073 143.721 9.68469 143.792 9.68469ZM130.612 18.4775C128.492 18.4775 126.832 16.5315 127.22 14.2973C127.432 13.0721 128.634 11.8108 129.835 11.5586C131.142 11.2703 132.379 11.7387 133.156 12.6396C133.192 12.6757 133.262 12.6757 133.298 12.6396L134.534 11.3784C134.57 11.3423 134.57 11.2703 134.534 11.2342C133.51 10.0811 131.99 9.39639 130.33 9.46847C127.609 9.61261 125.348 11.8829 125.206 14.6577C125.065 17.7928 127.503 20.3874 130.577 20.3874C132.132 20.3874 133.545 19.7027 134.534 18.6216C134.57 18.5856 134.57 18.5495 134.534 18.5135L133.298 17.2523C133.262 17.2162 133.192 17.2162 133.156 17.2523C132.556 18.045 131.637 18.4775 130.612 18.4775ZM112.239 5H110.508C110.437 5 110.402 5.03604 110.402 5.10811V20.1712C110.402 20.2432 110.437 20.2793 110.508 20.2793H112.239C112.31 20.2793 112.345 20.2432 112.345 20.1712V5.10811C112.345 5.03604 112.275 5 112.239 5ZM86.7287 14.2973C86.3401 16.5315 88.0007 18.4775 90.1207 18.4775C91.1454 18.4775 92.064 18.045 92.6647 17.2523C92.7 17.2162 92.7707 17.2162 92.806 17.2523L94.0427 18.5135C94.078 18.5495 94.078 18.5856 94.0427 18.6216C93.0533 19.7027 91.64 20.3874 90.0854 20.3874C87.0114 20.3874 84.5734 17.7928 84.7147 14.6577C84.8561 11.8829 87.1174 9.61261 89.838 9.46847C91.4987 9.39639 93.018 10.0811 94.0427 11.2342C94.078 11.2703 94.078 11.3423 94.0427 11.3784L92.806 12.6396C92.7707 12.6757 92.7 12.6757 92.6647 12.6396C91.8873 11.7387 90.6507 11.2703 89.3434 11.5586C88.142 11.8108 86.9407 13.0721 86.7287 14.2973ZM74.6383 9.5045C73.5076 9.5045 72.2003 10.2252 71.5997 11.0901C71.5643 11.1622 71.423 11.1261 71.423 11.0541V9.79279C71.423 9.75675 71.3877 9.68468 71.317 9.68468H69.5857C69.5503 9.68468 69.4797 9.72072 69.4797 9.79279V15.018V20.2072C69.4797 20.2432 69.515 20.3153 69.5857 20.3153H71.317C71.3523 20.3153 71.423 20.2793 71.423 20.2072V15.018C71.423 13.036 72.7303 11.6306 74.603 11.6306C77.0763 11.6306 77.8183 13.2883 77.8183 15.2342V20.2072C77.8183 20.2432 77.8536 20.3153 77.9243 20.3153H79.6556C79.6909 20.3153 79.7616 20.2793 79.7616 20.2072V15.2342C79.7969 12.2072 78.3836 9.5045 74.6383 9.5045ZM60.6818 17.3243C61.3178 18.045 62.2011 18.4775 63.2257 18.4775C64.5331 18.4775 65.6637 17.7207 66.2997 16.6396C66.2997 16.5676 66.3704 16.5676 66.4057 16.5676L68.137 16.8919C68.2077 16.8919 68.243 16.964 68.2077 17.036C67.395 19.018 65.4871 20.4234 63.2611 20.4234C60.1871 20.4234 57.7491 17.8288 57.8905 14.6937C57.9965 11.8829 60.2931 9.61261 63.0491 9.5045C65.6637 9.39639 67.8897 11.2342 68.455 13.7207C68.455 13.7568 68.455 13.7928 68.3844 13.8288L66.653 14.5856L60.7171 17.1441C60.6464 17.1802 60.6464 17.2522 60.6818 17.3243ZM119.058 18.4775C118.034 18.4775 117.15 18.045 116.514 17.3243C116.479 17.2522 116.479 17.1802 116.55 17.1441L122.486 14.5856L124.217 13.8288C124.288 13.7928 124.288 13.7568 124.288 13.7207C123.722 11.2342 121.496 9.39639 118.882 9.5045C116.126 9.61261 113.829 11.8829 113.723 14.6937C113.582 17.8288 116.02 20.4234 119.094 20.4234C121.32 20.4234 123.228 19.018 124.04 17.036C124.076 16.964 124.04 16.8919 123.97 16.8919L122.238 16.5676C122.203 16.5676 122.132 16.5676 122.132 16.6396C121.496 17.7207 120.33 18.4775 119.058 18.4775ZM119.058 11.4865C120.083 11.4865 121.002 11.9549 121.602 12.6757C121.638 12.7477 121.638 12.8198 121.567 12.8558C121.567 12.8558 115.843 15.3423 115.772 15.3784C115.702 15.4144 115.631 15.3423 115.631 15.3063V15.018C115.596 13.036 117.15 11.4865 119.058 11.4865ZM94.608 14.982C94.608 11.955 97.0106 9.5045 99.9786 9.5045C102.947 9.5045 105.349 11.955 105.349 14.982C105.349 18.009 102.947 20.4595 99.9786 20.4595C97.0106 20.4595 94.608 18.009 94.608 14.982ZM99.9786 11.4865C101.887 11.4865 103.406 13.0721 103.406 14.982C103.406 16.8919 101.851 18.4775 99.9786 18.4775C98.1059 18.4775 96.5513 16.8919 96.5513 14.982C96.5513 13.0721 98.0706 11.4865 99.9786 11.4865ZM63.2257 11.4865C64.2504 11.4865 65.1691 11.9549 65.7697 12.6757C65.8051 12.7477 65.8051 12.8198 65.7344 12.8558C65.7344 12.8558 60.0104 15.3423 59.9398 15.3784C59.8691 15.4144 59.7984 15.3423 59.7984 15.3063V15.018C59.7984 13.036 61.3531 11.4865 63.2257 11.4865ZM48.3505 10.8739C49.0925 9.97297 50.1525 9.43243 51.4952 9.39639C54.0745 9.36036 56.4065 11.2342 56.8305 13.8649C57.4665 17.3243 54.8518 20.3513 51.5658 20.3513C50.1525 20.3513 49.0572 19.7748 48.3152 18.8739C48.2445 18.8018 48.1385 18.8378 48.1385 18.9459V24.8919C48.1385 24.964 48.1032 25 48.0325 25H46.3366C46.2659 25 46.2306 24.964 46.2306 24.8919V9.79279C46.2306 9.72072 46.2659 9.68468 46.3366 9.68468H48.0679C48.1385 9.68468 48.1739 9.72072 48.1739 9.79279V10.8018C48.1739 10.9099 48.2799 10.9459 48.3505 10.8739ZM48.2092 14.2973C47.8205 16.6757 49.8345 18.7297 52.1665 18.3333C53.5798 18.0811 54.7458 16.9279 54.9578 15.4865C55.3465 13.1081 53.3325 11.054 51.0005 11.4504C49.5872 11.6667 48.4565 12.8558 48.2092 14.2973ZM39.8706 9.5045C36.9026 9.5045 34.5 11.955 34.5 14.982C34.5 18.009 36.9026 20.4595 39.8706 20.4595C42.8386 20.4595 45.2412 18.009 45.2412 14.982C45.2412 11.955 42.8386 9.5045 39.8706 9.5045ZM39.8706 11.4865C41.7786 11.4865 43.2979 13.0721 43.2979 14.982C43.2979 16.8919 41.7433 18.4775 39.8706 18.4775C37.998 18.4775 36.4433 16.8919 36.4433 14.982C36.4433 13.0721 37.998 11.4865 39.8706 11.4865Z"
+     fill="#4B4E52"
+     id="path1"
+     style="fill:#ffffff;fill-opacity:1" />
+  <path
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     d="M26.009 6.02649C27.5796 8.28932 28.5 11.037 28.5 14C28.5 16.963 27.5796 19.711 26.009 21.9735L22.3826 18.3471C23.0948 17.0585 23.5001 15.5764 23.5001 14C23.5001 12.4236 23.0948 10.9418 22.3826 9.65324L26.009 6.02649Z"
+     fill="#99CFFF"
+     id="path2" />
+  <path
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     d="M22.4735 2.49111L18.8468 6.11758C17.5582 5.40539 16.0764 5.00002 14.5 5.00002C9.5295 5.00002 5.4999 9.02962 5.4999 14.0001C5.4999 18.9706 9.5295 23.0002 14.5 23.0002C16.0764 23.0002 17.5582 22.5949 18.8468 21.8827L22.4735 25.5091C20.2107 27.0796 17.463 28.0001 14.5 28.0001C6.76808 28.0001 0.5 21.732 0.5 14.0001C0.5 6.26819 6.76808 0.00012207 14.5 0.00012207C17.463 0.00012207 20.2107 0.920596 22.4735 2.49111Z"
+     fill="#1F87FF"
+     id="path3" />
+</svg>
diff --git a/dash-frontend/assets/dashboard/splash.png b/dash-frontend/assets/dashboard/splash.png
new file mode 100644
index 00000000..15a9b387
Binary files /dev/null and b/dash-frontend/assets/dashboard/splash.png differ
diff --git a/dash-frontend/assets/dashboard/trash.svg b/dash-frontend/assets/dashboard/trash.svg
new file mode 100644
index 00000000..914fd402
--- /dev/null
+++ b/dash-frontend/assets/dashboard/trash.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M7 21q-.825 0-1.412-.587T5 19V6H4V4h5V3h6v1h5v2h-1v13q0 .825-.587 1.413T17 21zM17 6H7v13h10zM9 17h2V8H9zm4 0h2V8h-2zM7 6v13z"/></svg>
\ No newline at end of file
diff --git a/dash-frontend/assets/dashboard/watch.svg b/dash-frontend/assets/dashboard/watch.svg
new file mode 100644
index 00000000..c5dc7581
--- /dev/null
+++ b/dash-frontend/assets/dashboard/watch.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Google Material Icons by Material Design Authors - https://github.com/material-icons/material-icons/blob/master/LICENSE --><path fill="currentColor" d="M20 12c0-2.54-1.19-4.81-3.04-6.27L16 0H8l-.95 5.73C5.19 7.19 4 9.45 4 12s1.19 4.81 3.05 6.27L8 24h8l.96-5.73A7.98 7.98 0 0 0 20 12M6 12c0-3.31 2.69-6 6-6s6 2.69 6 6s-2.69 6-6 6s-6-2.69-6-6"/></svg>
diff --git a/dash-frontend/assets/dashboard/welcome.svg b/dash-frontend/assets/dashboard/welcome.svg
new file mode 100644
index 00000000..1e79ee67
--- /dev/null
+++ b/dash-frontend/assets/dashboard/welcome.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Design Icons by Pictogrammers - https://github.com/Templarian/MaterialDesign/blob/master/LICENSE --><path fill="currentColor" d="M1.5 4v1.5c0 4.15 2.21 7.78 5.5 9.8V20h15v-2c0-2.66-5.33-4-8-4h-.25C9 14 5 10 5 5.5V4m9 0a4 4 0 0 0-4 4a4 4 0 0 0 4 4a4 4 0 0 0 4-4a4 4 0 0 0-4-4"/></svg>
diff --git a/dash-frontend/assets/gui/dashboard.xml b/dash-frontend/assets/gui/dashboard.xml
index 7d5a9a4c..c94ad66a 100644
--- a/dash-frontend/assets/gui/dashboard.xml
+++ b/dash-frontend/assets/gui/dashboard.xml
@@ -1,6 +1,4 @@
 <layout>
-  <include src="theme.xml" />
-
   <theme>
     <var key="side_size" value="48" />
     <var key="top_size" value="40" />
@@ -14,10 +12,8 @@
       round="100%"
       width="~side_button_size"
       height="~side_button_size"
-      color="#44444400"
-      hover_color="#333333ff"
-      border_color="#00000000"
-      hover_border_color="#555555ff"
+      color="background_contrast(transparent)"
+      border_color="background_contrast"
       tooltip="${tooltip}"
       tooltip_side="${tooltip_side}"
     >
@@ -39,7 +35,7 @@
         <rectangle
           width="100%"
           round="100%"
-          color="~color_menu_dark"
+          color="background_contrast"
           flex_direction="column"
           justify_content="center"
           align_items="center"
@@ -49,7 +45,7 @@
           <SideButton id="btn_side_apps" src_builtin="dashboard/apps.svg" tooltip="APPLICATIONS" tooltip_side="right" />
           <SideButton id="btn_side_games" src_builtin="dashboard/games.svg" tooltip="GAMES" tooltip_side="right" />
           <SideButton id="btn_side_monado" src_builtin="dashboard/monado.svg" tooltip="MONADO_RUNTIME" tooltip_side="right" />
-          <rectangle height="2" color="#FFFFFF33" width="~side_sprite_size" />
+          <rectangle height="2" color="outline" width="~side_sprite_size" />
           <SideButton id="btn_side_settings" src_builtin="dashboard/settings.svg" tooltip="SETTINGS" tooltip_side="right" />
         </rectangle>
       </div>
@@ -65,13 +61,14 @@
         <div position="relative" width="100%" height="~top_size" min_height="~top_size" max_height="~top_size" justify_content="end">
           <!-- Title bar -->
           <div width="100%" align_items="center" justify_content="center">
-            <rectangle min_width="300" height="100%" consume_mouse_events="1" round="100%" color="~color_top_panel" align_items="center" justify_content="center" gap="8">
-              <sprite id="sprite_titlebar_icon" width="24" height="24" />
-              <label id="label_titlebar_title" weight="bold" size="16" text="Title" />
+            <rectangle min_width="300" height="100%" consume_mouse_events="1" round="100%" color="background_contrast" align_items="center" justify_content="center" gap="8">
+              <sprite id="sprite_titlebar_icon" width="24" height="24" color="on_background_contrast" />
+              <label id="label_titlebar_title" weight="bold" size="16" text="Title" color="on_background_contrast" />
             </rectangle>
           </div>
           <!-- Close button -->
-          <Button position="absolute" id="btn_close" color="~color_top_panel" round="100%" width="~top_size" height="~top_size" tooltip="CLOSE_WINDOW" tooltip_side="left">
+          <Button position="absolute" id="btn_close" color="background_contrast" border_color="background_contrast" round="100%" width="~top_size" height="~top_size" tooltip="CLOSE_WINDOW" tooltip_side="left"
+            hover_color="danger" hover_border_color="danger(rgb-mult-0.5)" >
             <sprite src_builtin="dashboard/close.svg" width="32" height="32" />
           </Button>
         </div>
@@ -80,28 +77,29 @@
         <!-- color and color2 alpha will be modified at runtime -->
         <rectangle
           id="rect_content"
-          color2="#0d131a00"
-          color="#252f5300"
+          color2="background_contrast"
+          color="background"
           gradient="vertical"
           round="8"
           flex_grow="1"
           width="100%"
-          overflow_y="scroll"
+          overflow="scroll"
+          position="relative"
         >
           <!-- radial gradient -->
           <rectangle
             position="absolute" width="100%" height="100%"
-            gradient="radial" color="#44BBFF11" color2="#00000000" />
+            gradient="radial" color="background_variant(opacity-0.5)" color2="background_variant(transparent)" />
 
           <div overflow_x="scroll" overflow_y="scroll" width="100%" height="100%">
             <div
               id="content"
               flex_direction="column"
-              padding="16"
               gap="8"
               width="100%"
               height="100%"
             >
+              <!-- padding set at runtime -->
               <!-- filled-in at runtime -->
             </div>
           </div>
@@ -119,36 +117,36 @@
           flex_direction="row"
           align_items="center"
           justify_content="space_between"
-          color="~color_bottom_panel"
+          color="background"
         >
           <!-- left gradient -->
           <div position="absolute" width="100%" height="100%" justify_content="start">
-            <rectangle position="absolute" width="40%" height="100%" color="#0a0a0a" color2="#0a0a0a00" round="8" gradient="horizontal" />
+            <rectangle position="absolute" width="40%" height="100%" color="shadow" color2="shadow(transparent)" round="8" gradient="horizontal" />
           </div>
 
           <!-- right gradient -->
           <div position="absolute" width="100%" height="100%" justify_content="end">
-            <rectangle position="absolute" width="40%" height="100%" color2="#0a0a0a" color="#0a0a0a00" round="8" gradient="horizontal" />
+            <rectangle position="absolute" width="40%" height="100%" color2="shadow" color="shadow(transparent)" round="8" gradient="horizontal" />
           </div>
 
           <!-- top shine -->
           <div position="absolute" width="100%" height="100%" justify_content="center">
-            <rectangle position="absolute" width="99%" height="2" color="#FFFFFF22" round="4" />
+            <rectangle position="absolute" width="99%" height="2" color="highlight(opacity-0.2)" round="4" />
           </div>
 
           <!-- Left bottom side -->
           <div margin_left="8">
-            <Button id="btn_audio" color="#FFFFFF00" border_color="#FFFFFF00" tooltip="AUDIO.VOLUME" tooltip_side="top">
+            <Button id="btn_audio" color="background(transparent)" border_color="background(transparent)" tooltip="AUDIO.VOLUME" tooltip_side="top">
               <sprite src_builtin="dashboard/volume.svg" width="24" height="24" margin="8" />
             </Button>
-            <Button id="btn_recenter" color="#FFFFFF00" border_color="#FFFFFF00" tooltip="ACTIONS.RECENTER_PLAYSPACE" tooltip_side="top">
+            <Button id="btn_recenter" color="background(transparent)" border_color="background(transparent)" tooltip="ACTIONS.RECENTER_PLAYSPACE" tooltip_side="top">
               <sprite src_builtin="dashboard/recenter.svg" width="24" height="24" margin="8" />
             </Button>
           </div>
 
           <!-- Right bottom side -->
           <div margin_right="16">
-            <label id="label_time" size="16" weight="light" />
+            <label id="label_time" weight="bold" size="16" color="on_background" />
           </div>
         </rectangle>
       </div>
diff --git a/dash-frontend/assets/gui/t_dropdown_button.xml b/dash-frontend/assets/gui/t_dropdown_button.xml
index e99feb90..c240285d 100644
--- a/dash-frontend/assets/gui/t_dropdown_button.xml
+++ b/dash-frontend/assets/gui/t_dropdown_button.xml
@@ -1,25 +1,23 @@
 <layout>
-  <include src="theme.xml" />
-
   <macro name="dropdown_button"
     flex_direction="row"
     border="2"
-    color="#00000055"
-    border_color="#FFFFFF66"
+    color="background"
+    border_color="outline"
     justify_content="space_between" />
 
-  <!-- id, text, translation, tooltip -->
+  <!-- id, text, translation, tooltip, min_width -->
   <template name="DropdownButton">
     <label text="${text}" translation="${translation}" />
     <Button id="${id}" height="32" tooltip="${tooltip}" >
-      <div padding_left="8" padding_right="8" min_width="200">
+      <div padding_left="8" padding_right="8" min_width="${min_width}">
         <label id="${id}_value" weight="bold" />
       </div>
       <div gap="2">
         <div padding_top="4" padding_bottom="4">
-          <rectangle width="2" height="100%" color="#FFFFFF66" />
+          <rectangle width="2" height="100%" color="outline" />
         </div>
-        <sprite margin_left="-4" width="30" height="30" color="~color_text" src_builtin="dashboard/down.svg" />
+        <sprite margin_left="-4" width="30" height="30" src_builtin="dashboard/down.svg" />
       </div>
     </Button>
   </template>
diff --git a/dash-frontend/assets/gui/t_group_box.xml b/dash-frontend/assets/gui/t_group_box.xml
index 8292d2c6..286c415a 100644
--- a/dash-frontend/assets/gui/t_group_box.xml
+++ b/dash-frontend/assets/gui/t_group_box.xml
@@ -1,12 +1,10 @@
 <layout>
-  <include src="theme.xml" />
-
   <macro name="group_box"
     flex_direction="column"
     align_items="baseline"
     border="2"
-    color="#00000055"
-    border_color="#FFFFFF66"
+    color="background_contrast(opacity-0.5)"
+    border_color="outline"
     padding="12"
     gap="8"
     round="8" />
@@ -14,9 +12,9 @@
   <!-- src_builtin, text, translation -->
   <template name="GroupBoxTitle">
     <div flex_direction="row" align_items="center" gap="8">
-      <sprite src_builtin="${src_builtin}" width="24" height="24" />
-      <label text="${text}" translation="${translation}" weight="bold" size="18" />
+      <sprite src_builtin="${src_builtin}" width="24" height="24" color="secondary" />
+      <label text="${text}" translation="${translation}" weight="bold" size="18" color="secondary" />
     </div>
-    <rectangle color="#FFFFFF44" width="100%" height="2" />
+    <rectangle color="outline" width="100%" height="2" />
   </template>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/dash-frontend/assets/gui/t_loading.xml b/dash-frontend/assets/gui/t_loading.xml
new file mode 100644
index 00000000..79e5c0c2
--- /dev/null
+++ b/dash-frontend/assets/gui/t_loading.xml
@@ -0,0 +1,16 @@
+<layout>
+  <template name="LoadingWithText">
+    <div id="root" width="100%" height="100%" align_items="center" justify_content="center">
+      <div flex_direction="row" gap="8" align_items="center" >
+        <sprite id="sprite_loading" src_builtin="dashboard/loading.svg" width="32" height="32" color="on_background"/>
+        <label translation="LOADING" weight="bold"/>
+      </div>
+    </div>
+  </template>
+
+  <template name="LoadingWithoutText">
+    <div id="root" width="100%" height="100%" align_items="center" justify_content="center">
+      <sprite id="sprite_loading" src_builtin="dashboard/loading.svg" width="32" height="32" color="on_background"/>
+    </div>
+  </template>
+</layout>
diff --git a/dash-frontend/assets/gui/t_menu_button.xml b/dash-frontend/assets/gui/t_menu_button.xml
index 2aed09a0..565b62d4 100644
--- a/dash-frontend/assets/gui/t_menu_button.xml
+++ b/dash-frontend/assets/gui/t_menu_button.xml
@@ -1,16 +1,12 @@
 <layout>
-  <include src="theme.xml" />
+  <macro name="home_button" round="8" hover_color="primary" hover_border_color="on_primary" />
 
   <template name="MenuButton">
     <Button
       id="${id}"
       width="120"
       height="82"
-      color="#00000033"
-      border_color="#FFFFFF77"
-      hover_color="~color_accent"
-      hover_border_color="#FFFFFF"
-      round="8">
+      macro="home_button">
       <div gap="8"
         align_items="center"
         justify_content="center"
@@ -20,4 +16,4 @@
       </div>
     </Button>
   </template>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/dash-frontend/assets/gui/t_separator.xml b/dash-frontend/assets/gui/t_separator.xml
index 92a8285c..6271c431 100644
--- a/dash-frontend/assets/gui/t_separator.xml
+++ b/dash-frontend/assets/gui/t_separator.xml
@@ -1,5 +1,5 @@
 <layout>
   <template name="Separator">
-    <rectangle width="100%" height="1" color="#FFFFFF77" />
+    <rectangle width="100%" min_height="2" color="#FFFFFF10" />
   </template>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/dash-frontend/assets/gui/tab/apps.xml b/dash-frontend/assets/gui/tab/apps.xml
index 2095745e..11be8a1d 100644
--- a/dash-frontend/assets/gui/tab/apps.xml
+++ b/dash-frontend/assets/gui/tab/apps.xml
@@ -1,14 +1,14 @@
 <layout>
-  <include src="../theme.xml" />
+  <include src="../t_group_box.xml" />
 
+  <!-- tooltip, src, src_ext, name -->
   <template name="AppEntry">
     <Button
-      id="button" width="116" max_width="140" min_height="100" flex_grow="1"
+      id="button" tooltip_side="bottom" tooltip="${tooltip}" width="116" max_width="140" min_height="100" flex_grow="1"
       flex_direction="column" overflow="visible" align_items="center" justify_content="center" gap="4"
-      color="#3385FF10"
     >
       <div>
-        <sprite src="${src}" src_ext="${src_ext}" width="64" height="64" />
+        <sprite src="${src}" src_ext="${src_ext}" width="64" height="64" color="#FFFFFF" parent_color="ignore" />
       </div>
       <div align_items="center" justify_content="center">
         <label width="116" weight="bold" text="${name}" size="12" wrap="1" align="center" padding_left="16" padding_right="16" />
@@ -17,9 +17,9 @@
   </template>
 
   <template name="CategoryText">
-    <rectangle width="100%" flex_direction="column" round="8" border="2" gradient="vertical" color2="#4477FF09" color="#5588FF10" border_color="#FFFFFF00">
+    <rectangle width="100%" flex_direction="column" round="8" border="2" gradient="vertical" color2="background" color="background_variant" border_color="outline">
       <label margin="8" text="${text}" weight="bold" size="22" />
-      <rectangle height="2" color="~color_accent" margin_left="4" margin_right="4" />
+      <rectangle height="2" color="primary" margin_left="4" margin_right="4" />
     </rectangle>
   </template>
 
@@ -39,6 +39,15 @@
       </rectangle>
     </div>
     -->
+    <rectangle macro="group_box">
+      <div align_items="center" gap="8">
+        <sprite src_builtin="dashboard/heart_plus.svg" color="primary"  min_width="24" min_height="24"/>
+        <label translation="PINNED_APPS"/>
+      </div>
+      <div id="pinned_apps_parent" flex_direction="row" flex_wrap="wrap" gap="4">
+        <!-- filled-in at runtime -->
+      </div>
+    </rectangle>
     <div
       id="app_list_parent"
       flex_direction="row"
@@ -46,4 +55,4 @@
       gap="4"
     />
   </elements>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/dash-frontend/assets/gui/tab/donate.xml b/dash-frontend/assets/gui/tab/donate.xml
new file mode 100644
index 00000000..92faaede
--- /dev/null
+++ b/dash-frontend/assets/gui/tab/donate.xml
@@ -0,0 +1,47 @@
+<layout>
+  <include src="../t_group_box.xml" />
+
+  <!-- icon, nickname -->
+  <template name="Avatar">
+    <div flex_direction="column" gap="12" align_items="center">
+      <image src_builtin="${icon}" width="72" height="72" round="100%" position="relative">
+        <rectangle position="absolute" margin_left="-2" margin_top="-2" width="76" height="76" color="highlight" round="100%"/>
+      </image>
+      <label size="14" text="${nickname}"/>
+    </div>
+  </template>
+  
+  <elements>
+    <div position="absolute" width="100%" height="100%" padding="4">
+      <!-- <rectangle width="100%" height="100%" color="#000000" round="6"/> -->
+    </div>    
+    <div margin="32" flex_direction="column" align_items="center" justify_content="center" gap="16" height="100%">
+      <div gap="16" align_items="center" width="100%">
+        <sprite color="#FFAAAA" src_builtin="dashboard/donate.svg" min_width="64" min_height="64"/>
+        <label wrap="1" size="20" translation="DONATE.DESCRIPTION" color="on_background"/>
+      </div>
+
+      <div flex_direction="column" gap="8" align_items="center" margin_top="16">
+        <Button id="btn_donate" tooltip="DONATE.BUTTON_TOOLTIP" align_self="baseline">
+          <image src_builtin="dashboard/opencollective_logo.svg" width="252" height="42" margin="8" margin_left="16" margin_right="16"/>
+        </Button>
+        <label text="opencollective.com/wayvr-org"/>
+      </div>
+
+      <label weight="bold" size="24" translation="DONATE.THANK_YOU_WAYVR" color="on_background"/>
+
+      <div gap="32" margin_top="16">
+        <Avatar icon="dashboard/avatars/galister.png" nickname="galister"/>
+        <Avatar icon="dashboard/avatars/oo8dev.png" nickname="oo8dev"/>
+      </div>
+  
+      <!--
+      <rectangle color="#FFFFFF33" width="100%" height="2"/>
+
+      <rectangle macro="group_box" align_self="start" width="100%">
+        <label weight="bold" size="18" translation="DONATE.CURRENT_SUPPORTERS"/>
+      </rectangle>
+      -->
+    </div>
+  </elements>
+</layout>
diff --git a/dash-frontend/assets/gui/tab/home.xml b/dash-frontend/assets/gui/tab/home.xml
index 2ad3fc76..0f3d0c38 100644
--- a/dash-frontend/assets/gui/tab/home.xml
+++ b/dash-frontend/assets/gui/tab/home.xml
@@ -8,8 +8,8 @@
       align_items="center"
       flex_grow="1"
       gap="24">
-      <sprite src_builtin="dashboard/wayvr_dashboard.png" width="96" height="96" />
-      <label id="label_hello" size="32" weight="bold" />
+      <image src_builtin="dashboard/splash.png" width="300" height="89" />
+      <label id="label_hello" size="32" weight="bold" color="on_background" />
 
       <!-- main button list -->
       <div flex_direction="row" gap="8">
@@ -18,6 +18,20 @@
         <MenuButton id="btn_monado" icon="dashboard/monado.svg" text="Monado" />
         <MenuButton id="btn_settings" icon="dashboard/settings.svg" translation="SETTINGS" />
       </div>
+
+      <div gap="8">
+        <Button id="btn_welcome_screen" macro="home_button" tooltip="APP_SETTINGS.SHOW_WELCOME_SCREEN">
+          <sprite src_builtin="dashboard/welcome.svg" width="32" height="32" margin="16" />
+        </Button>
+
+        <Button id="btn_website" macro="home_button" tooltip_str="wayvr.org">
+          <sprite src_builtin="dashboard/globe.svg" width="32" height="32" margin="16" />
+        </Button>
+
+        <Button id="btn_donate" macro="home_button" tooltip="DONATE.SUPPORT_US">
+          <sprite src_builtin="dashboard/opencollective.svg" width="32" height="32" margin="16" />
+        </Button>
+      </div>
     </div>
   </elements>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/dash-frontend/assets/gui/tab/monado.xml b/dash-frontend/assets/gui/tab/monado.xml
index 171717f8..4c9da380 100644
--- a/dash-frontend/assets/gui/tab/monado.xml
+++ b/dash-frontend/assets/gui/tab/monado.xml
@@ -2,8 +2,8 @@
   <elements>
     <div gap="4">
       <Tabs id="tabs">
-        <Tab name="general_settings" translation="GENERAL_SETTINGS" sprite_src_builtin="dashboard/settings.svg" />
         <Tab name="process_list" translation="PROCESS_LIST" sprite_src_builtin="dashboard/cpu.svg" />
+        <Tab name="general_settings" translation="GENERAL_SETTINGS" sprite_src_builtin="dashboard/settings.svg" />
         <Tab name="debug_timings" translation="DEBUG_INFO" sprite_src_builtin="dashboard/not_a_bug.svg" />
       </Tabs>
       <div gap="4" id="content" width="100%">
@@ -11,4 +11,4 @@
       </div>
     </div>
   </elements>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/dash-frontend/assets/gui/tab/monado_tab_general_settings.xml b/dash-frontend/assets/gui/tab/monado_tab_general_settings.xml
index d8329b63..c99cbf21 100644
--- a/dash-frontend/assets/gui/tab/monado_tab_general_settings.xml
+++ b/dash-frontend/assets/gui/tab/monado_tab_general_settings.xml
@@ -1,12 +1,56 @@
 <layout>
   <include src="../t_group_box.xml" />
 
-  <elements>
-    <rectangle macro="group_box">
-      <GroupBoxTitle src_builtin="dashboard/settings.svg" translation="GENERAL_SETTINGS" />
+  <macro name="slider" width="100%" height="24"/>
 
-      <label translation="DISPLAY_BRIGHTNESS" />
-      <Slider id="slider_brightness" width="300" height="24" min_value="0" max_value="140" />
-    </rectangle>
+  <theme>
+    <var key="s_width" value="500"/>
+  </theme>
+
+  <elements>
+    <div flex_direction="column" gap="8">
+      <rectangle macro="group_box">
+        <GroupBoxTitle src_builtin="dashboard/settings.svg" translation="GENERAL_SETTINGS" />
+
+        <label translation="DISPLAY_BRIGHTNESS" />
+        <Slider id="slider_brightness" width="300" height="24" min_value="0" max_value="140" />
+      </rectangle>
+      <rectangle macro="group_box">
+        <GroupBoxTitle src_builtin="dashboard/settings.svg" translation="APP_SETTINGS.COLOR_KEYING" />
+        <div gap="8" width="~s_width">
+          <div gap="8" flex_direction="column" width="100%">
+            <label text="Color"/>
+            <ColorSelector id="cs_keying" height="24" width="100%"/>
+          </div>
+
+          <div gap="8" flex_direction="column" width="100%">
+            <label text="Despill"/>
+            <Slider id="slider_keying_despill" min_value="0" max_value="100" macro="slider"/>
+          </div>
+    
+          <div gap="8" flex_direction="column" width="100%">
+            <label text="Curve (0 = disabled)"/>
+            <Slider id="slider_keying_curve" min_value="0" max_value="100" macro="slider"/>
+          </div>
+        </div>
+
+        <div gap="8" width="~s_width">
+          <div gap="8" flex_direction="column" width="100%">
+            <label text="Hue range"/>
+            <Slider id="slider_keying_hue_range" min_value="0" max_value="100" macro="slider"/>
+          </div>
+    
+          <div gap="8" flex_direction="column" width="100%">
+            <label text="Saturation range"/>
+            <Slider id="slider_keying_saturation_range" min_value="0" max_value="100" macro="slider"/>
+          </div>
+
+          <div gap="8" flex_direction="column" width="100%">
+            <label text="Value range"/>
+            <Slider id="slider_keying_value_range" min_value="0" max_value="100" macro="slider"/>
+          </div>
+        </div>
+      </rectangle>
+    </div>
   </elements>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/dash-frontend/assets/gui/tab/settings.xml b/dash-frontend/assets/gui/tab/settings.xml
index 9ca21283..5480b658 100644
--- a/dash-frontend/assets/gui/tab/settings.xml
+++ b/dash-frontend/assets/gui/tab/settings.xml
@@ -13,8 +13,13 @@
   </template>
 
   <template name="SliderSetting">
-    <label text="${text}" translation="${translation}" />
-    <Slider id="${id}" width="250" height="24" min_value="${min}" max_value="${max}" step="${step}" value="${value}" tooltip="${tooltip}" />
+    <Slider id="${id}" width="200" height="24" min_value="${min}" max_value="${max}" step="${step}" value="${value}" tooltip="${tooltip}" />
+    <label text="${text}" weight="bold" translation="${translation}" />
+  </template>
+
+  <template name="RangeSetting">
+    <Slider id="${id}" width="200" height="24" min_value="${min}" max_value="${max}" step="${step}" value="${value}" value2="${value2}" tooltip="${tooltip}" />
+    <label text="${text}" weight="bold" translation="${translation}" />
   </template>
 
   <template name="SelectSetting">
@@ -26,8 +31,15 @@
     <RadioBox text="${text}" translation="${translation}" value="${value}" tooltip="${tooltip}" />
   </template>
 
+  <template name="ButtonText">
+    <Button id="${id}" height="32" tooltip="${translation}_HELP" padding="4" gap="8">
+      <sprite src_builtin="${icon}" height="24" width="24" />
+      <label align="left" translation="${translation}" weight="bold" min_width="200" />
+    </Button>
+  </template>
+
   <template name="DangerButton">
-    <Button id="${id}" color="#AA3333" height="32" tooltip="${translation}_HELP" padding="4" gap="8">
+    <Button id="${id}" color="danger" border_color="danger(rgb-mult-0.5)" height="32" tooltip="${translation}_HELP" padding="4" gap="8">
       <sprite src_builtin="${icon}" height="24" width="24" />
       <label align="left" translation="${translation}" weight="bold" min_width="200" />
     </Button>
@@ -35,7 +47,8 @@
 
   <template name="AutostartApp">
     <div id="${id}_root" flex_direction="row">
-      <Button id="${id}" color="#AA3333" height="24" padding="4" margin_top="-2" margin_bottom="-2">
+      <Button id="${id}" color="#AA3333" height="24" padding="4" margin_top="-2" margin_bottom="-2"
+        hover_color="danger" hover_border_color="danger(rgb-mult-0.5)" >
         <sprite src_builtin="dashboard/close.svg" height="20" width="20" />
       </Button>
       <div padding_left="8">
@@ -44,19 +57,23 @@
     </div>
   </template>
 
+  <macro name="tab_style" color="background" />
+
   <elements>
     <div gap="4">
       <Tabs id="tabs">
-        <Tab name="look_and_feel" translation="APP_SETTINGS.LOOK_AND_FEEL" sprite_src_builtin="dashboard/palette.svg" />
-        <Tab name="features" translation="APP_SETTINGS.FEATURES" sprite_src_builtin="dashboard/options.svg" />
-        <Tab name="controls" translation="APP_SETTINGS.CONTROLS" sprite_src_builtin="dashboard/controller.svg" />
-        <Tab name="misc" translation="APP_SETTINGS.MISC" sprite_src_builtin="dashboard/blocks.svg" />
-        <Tab name="autostart_apps" translation="APP_SETTINGS.AUTOSTART_APPS" sprite_src_builtin="dashboard/apps.svg" />
-        <Tab name="troubleshooting" translation="APP_SETTINGS.TROUBLESHOOTING" sprite_src_builtin="dashboard/cpu.svg" />
+        <Tab macro="tab_style" name="look_and_feel" translation="APP_SETTINGS.LOOK_AND_FEEL" sprite_src_builtin="dashboard/palette.svg" />
+        <Tab macro="tab_style" name="skybox" translation="APP_SETTINGS.SKYBOX" sprite_src_builtin="dashboard/globe.svg" />
+        <Tab macro="tab_style" name="features" translation="APP_SETTINGS.FEATURES" sprite_src_builtin="dashboard/options.svg" />
+        <Tab macro="tab_style" name="controls" translation="APP_SETTINGS.CONTROLS" sprite_src_builtin="dashboard/controller.svg" />
+        <Tab macro="tab_style" name="space_drag" translation="APP_SETTINGS.SPACE_DRAG" sprite_src_builtin="dashboard/drag.svg" />
+        <Tab macro="tab_style" name="misc" translation="APP_SETTINGS.MISC" sprite_src_builtin="dashboard/blocks.svg" />
+        <Tab macro="tab_style" name="autostart_apps" translation="APP_SETTINGS.AUTOSTART_APPS" sprite_src_builtin="dashboard/apps.svg" />
+        <Tab macro="tab_style" name="troubleshooting" translation="APP_SETTINGS.TROUBLESHOOTING" sprite_src_builtin="dashboard/cpu.svg" />
       </Tabs>
       <div flex_wrap="wrap" justify_content="stretch" gap="4" id="settings_root" width="100%">
         <!-- filled-in at runtime -->
       </div>
     </div>
   </elements>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/dash-frontend/assets/gui/tab/settings_tab_space_drag.xml b/dash-frontend/assets/gui/tab/settings_tab_space_drag.xml
new file mode 100644
index 00000000..3f8f9cf7
--- /dev/null
+++ b/dash-frontend/assets/gui/tab/settings_tab_space_drag.xml
@@ -0,0 +1,14 @@
+<layout>
+  <include src="../t_group_box.xml" />
+
+  <elements>
+    <div id="common_options_parent" flex_direction="column" gap="8"/>
+    <rectangle macro="group_box">
+      <GroupBoxTitle src_builtin="dashboard/gravity.svg" translation="APP_SETTINGS.SPACE_GRAVITY_GRAVITY" />
+      <div id="gravity_enabled_parent"/>
+      <div id="space_gravity_parent" flex_direction="column" gap="8">
+        <!-- filled-in at runtime -->
+      </div>
+    </rectangle>
+  </elements>
+</layout>
diff --git a/dash-frontend/assets/gui/tab/welcome.xml b/dash-frontend/assets/gui/tab/welcome.xml
new file mode 100644
index 00000000..dbc9de7f
--- /dev/null
+++ b/dash-frontend/assets/gui/tab/welcome.xml
@@ -0,0 +1,24 @@
+<layout>
+  <template name="Pip">
+    <rectangle id="pip" width="8" height="8" round="100%" color="${COLOR}"/>
+  </template>
+  
+  <elements>
+    <div position="relative" flex_grow="1">
+      <!-- Content -->
+      <div position="absolute" id="content" flex_direction="column" flex_grow="1" align_items="center" justify_content="center" gap="16" width="100%" height="100%">
+        <!-- filled-in at runtime -->
+      </div>
+      <!-- Page buttons -->
+      <div position="absolute" align_self="end" justify_self="end" width="100%" flex_direction="column" align_items="center" margin_bottom="8">
+        <div flex_direction="row" gap="8" align_items="center">
+          <Button id="btn_prev" width="32" height="32" round="100%" sprite_src_builtin="dashboard/arrow_left.svg" />
+          <div id="pips" gap="4" align_items="center">
+            <!-- filled-in at runtime -->
+          </div>
+          <Button id="btn_next" width="32" height="32" round="100%" sprite_src_builtin="dashboard/arrow_right.svg" />
+        </div>
+      </div>
+    </div>
+  </elements>
+</layout>
diff --git a/dash-frontend/assets/gui/tab/welcome_common.xml b/dash-frontend/assets/gui/tab/welcome_common.xml
new file mode 100644
index 00000000..7cabbb93
--- /dev/null
+++ b/dash-frontend/assets/gui/tab/welcome_common.xml
@@ -0,0 +1,22 @@
+<layout>
+  <!-- icon, title -->
+  <template name="PageTitle">
+    <div position="absolute" align_self="start" justify_self="center" width="100%" margin_top="16" gap="8" align_items="center" justify_content="center">
+      <sprite width="48" height="48" src_builtin="${icon}" color="#FFFFFF"/>
+      <label size="28" weight="bold" translation="${translation}" color="#FFFFFF" shadow="#000000" shadow_x="3" shadow_y="3" />
+    </div>
+  </template>
+
+  <!-- text -->
+  <template name="TextDesc">
+    <label wrap="1" translation="${translation}" size="20" width="500" color="#FFFFFF" shadow="#000000" weight="bold"/>
+  </template>
+
+  <template name="TextDescBig">
+    <label translation="${translation}" size="24" shadow="#000000" weight="bold" color="${color}"/>
+  </template>
+
+  <macro name="video_overlay_component" looping="1" width="100%" height="auto" max_height="100%" aspect_ratio="1.777777" position="relative"/>
+
+  <macro name="video_overlay_content" new_pass="1" position="absolute" width="100%" height="100%" padding_bottom="32"/>
+</layout>
diff --git a/dash-frontend/assets/gui/tab/welcome_page_0.xml b/dash-frontend/assets/gui/tab/welcome_page_0.xml
new file mode 100644
index 00000000..d6a59d44
--- /dev/null
+++ b/dash-frontend/assets/gui/tab/welcome_page_0.xml
@@ -0,0 +1,26 @@
+<layout>
+  <elements>
+    <image src_builtin="dashboard/splash.png" min_width="336" min_height="100" />
+
+    <rectangle color="#FFFFFF11" width="100%" height="2"/>
+      
+    <label weight="bold" size="28" translation="WELCOME.GREETING"/>
+    <label weight="bold" size="16" translation="WELCOME.THANKS_FOR_INSTALLING"/>
+    
+    <label size="20" translation="WELCOME.GUIDE_INTRO"/>
+
+    <div gap="4" align_items="center" margin_top="8">
+      <sprite min_width="16" min_height="16" src_builtin="dashboard/info.svg" color="on_background"/>
+      <label wrap="1" size="14" translation="WELCOME.REPOSITION_THIS_WINDOW_BY_GRABBING"/>
+    </div>
+
+    <div gap="4" align_items="center">
+      <sprite min_width="16" min_height="16" src_builtin="dashboard/info.svg" color="on_background"/>
+      <label wrap="1" size="14" translation="WELCOME.LAST_PAGE_INFO"/>
+    </div>
+
+    <label size="20" weight="bold" translation="WELCOME.NEXT_BUTTON"/>
+
+    <div height="38"/> <!-- empty space -->
+  </elements>
+</layout>
diff --git a/dash-frontend/assets/gui/tab/welcome_page_1.xml b/dash-frontend/assets/gui/tab/welcome_page_1.xml
new file mode 100644
index 00000000..412a3846
--- /dev/null
+++ b/dash-frontend/assets/gui/tab/welcome_page_1.xml
@@ -0,0 +1,15 @@
+<layout>
+  <include src_builtin="welcome_common.xml"/>
+  
+  <elements>
+    <rectangle color="#103142" width="100%" height="100%" position="absolute"/>
+    <Video macro="video_overlay_component" src_builtin="video/onboarding_watch.ivf" aspect_ratio="1.0">
+      <div macro="video_overlay_content">
+        <PageTitle icon="dashboard/watch.svg" translation="WELCOME.WATCH"/>
+        <div position="relative" align_self="end" padding="16">
+          <TextDesc translation="WELCOME.LOOK_AT_LEFT_WRIST"/>
+        </div>
+      </div>
+    </Video>
+  </elements>
+</layout>
diff --git a/dash-frontend/assets/gui/tab/welcome_page_2.xml b/dash-frontend/assets/gui/tab/welcome_page_2.xml
new file mode 100644
index 00000000..dda5dad2
--- /dev/null
+++ b/dash-frontend/assets/gui/tab/welcome_page_2.xml
@@ -0,0 +1,14 @@
+<layout>
+  <include src_builtin="welcome_common.xml"/>
+  
+  <elements>
+    <Video macro="video_overlay_component" src_builtin="video/onboarding_double_press.ivf">
+      <div macro="video_overlay_content">
+        <PageTitle icon="dashboard/panorama.svg" translation="WELCOME.WORKING_SET"/>
+        <div position="relative" align_self="end" padding="16">
+          <TextDesc translation="WELCOME.DOUBLE_PRESS_TO_TOGGLE"/>
+        </div>
+      </div>
+    </Video>
+  </elements>
+</layout>
diff --git a/dash-frontend/assets/gui/tab/welcome_page_3.xml b/dash-frontend/assets/gui/tab/welcome_page_3.xml
new file mode 100644
index 00000000..68523d6d
--- /dev/null
+++ b/dash-frontend/assets/gui/tab/welcome_page_3.xml
@@ -0,0 +1,19 @@
+<layout>
+  <include src_builtin="welcome_common.xml"/>
+    
+  <elements>
+    <Video macro="video_overlay_component" src_builtin="video/onboarding_laser_colors.ivf">
+      <div macro="video_overlay_content">
+        <PageTitle icon="dashboard/click.svg" translation="WELCOME.LASER_COLORS"/>
+        <div position="relative" flex_direction="row" gap="16" margin="16" align_self="end" justify_self="end" align_items="center">
+          <rectangle flex_direction="column" gap="8" padding="8" round="4" border_color="outline" border="2" >
+            <label size="12" weight="bold" color="#00FFFF" translation="WELCOME.REGULAR_MODE_BLUE_LASER"/>
+            <label size="12" weight="bold" color="#FFAA00" translation="WELCOME.RIGHT_CLICK_MODE_ORANGE_LASER"/>
+            <label size="12" weight="bold" color="#FF88FF" translation="WELCOME.MIDDLE_CLICK_MODE_PURPLE_LASER"/>
+          </rectangle>
+          <label wrap="1" size="18" width="450" weight="bold" color="#ffffff" shadow="#000000" translation="WELCOME.LASER_FUNCTIONALITY"/>
+        </div>
+      </div>
+    </Video>
+  </elements>
+</layout>
diff --git a/dash-frontend/assets/gui/tab/welcome_page_4.xml b/dash-frontend/assets/gui/tab/welcome_page_4.xml
new file mode 100644
index 00000000..dcc53903
--- /dev/null
+++ b/dash-frontend/assets/gui/tab/welcome_page_4.xml
@@ -0,0 +1,20 @@
+<layout>
+  <include src_builtin="welcome_common.xml"/>
+  
+  <elements>
+    <rectangle color="#0A2939" width="100%" height="100%" position="absolute"/>
+    <Video macro="video_overlay_component" src_builtin="video/onboarding_center_marker.ivf" aspect_ratio="1.33333">
+      <div macro="video_overlay_content">
+        <PageTitle icon="dashboard/panorama.svg" translation="WELCOME.MOVING_YOUR_SET"/>
+        <div position="relative" align_self="end" padding="16" flex_direction="column" gap="4">
+          <label shadow="#000000" size="14" weight="bold" wrap="1" color="#aaffcc" translation="WELCOME.GRAB_ONE_HAND"/>
+          <label shadow="#000000" size="14" weight="bold" wrap="1" color="#ccaaff" translation="WELCOME.GRAB_BOTH_HANDS"/>
+          <div align_items="center" gap="8">
+            <sprite src_builtin="dashboard/info.svg" min_width="48" min_height="48" max_width="48" max_height="48" color="#ffff00"/>
+            <label shadow="#000000" size="16" weight="bold" wrap="1" color="#ffff00" translation="WELCOME.CENTER_MARKER"/>
+          </div>
+        </div>
+      </div>
+    </Video>
+  </elements>
+</layout>
diff --git a/dash-frontend/assets/gui/tab/welcome_page_5.xml b/dash-frontend/assets/gui/tab/welcome_page_5.xml
new file mode 100644
index 00000000..48c04d36
--- /dev/null
+++ b/dash-frontend/assets/gui/tab/welcome_page_5.xml
@@ -0,0 +1,28 @@
+<layout>
+  <include src_builtin="welcome_common.xml"/>
+  
+  <elements>
+    <div flex_direction="row" align_items="center">
+      <image src_builtin="dashboard/check_3d.png" width="256" height="256"/>
+      <div flex_direction="column" gap="16" max_width="480">
+        <TextDescBig translation="WELCOME.ALL_SET" color="tertiary"/>
+        
+        <rectangle color="#AAFFAA33" width="100%" min_height="2"/>
+        
+        <label size="16" wrap="1" translation="WELCOME.BASICS"/>
+        <label size="16" wrap="1" translation="WELCOME.FEATURES_DOCUMENTATION"/>
+        <Button id="btn_wayvr_org" align_self="baseline" min_height="32">
+          <sprite src_builtin="dashboard/globe.svg" width="24" height="24" margin="8"/>
+          <label size="18" weight="bold" text="wayvr.org" margin_right="8" />
+        </Button>
+
+        <rectangle color="#FFFFFF33" width="100%" min_height="2"/>
+        
+        <Button id="btn_home_screen" min_height="48" >
+          <sprite src_builtin="dashboard/check.svg" width="32" height="32"  margin="8"/>
+          <label color="on_background" size="20" weight="bold" translation="WELCOME.FINISH_TUTORIAL" margin_right="8" />
+        </Button>
+      </div>
+    </div>
+  </elements>
+</layout>
diff --git a/dash-frontend/assets/gui/theme.xml b/dash-frontend/assets/gui/theme.xml
deleted file mode 100644
index cbfcdaba..00000000
--- a/dash-frontend/assets/gui/theme.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<layout>
-  <theme>
-    <var key="color_menu_dark" value="#0A0A0ACC" />
-    <var key="color_accent" value="#008cff" />
-    <var key="color_top_panel" value="#00000099" />
-    <var key="color_bottom_panel" value="#141e28" />
-  </theme>
-</layout>
\ No newline at end of file
diff --git a/dash-frontend/assets/gui/view/app_launcher.xml b/dash-frontend/assets/gui/view/app_launcher.xml
index 7f1c314d..eb112519 100644
--- a/dash-frontend/assets/gui/view/app_launcher.xml
+++ b/dash-frontend/assets/gui/view/app_launcher.xml
@@ -1,8 +1,8 @@
 <layout>
   <template name="Subtext">
-    <div flex_direction="row" gap="8">
-      <label weight="bold" text="${title}" />
-      <label id="${label_id}" />
+    <div flex_direction="row" gap="8" max_width="100%">
+      <label weight="bold" text="${title}" wrap="1" />
+      <label id="${label_id}" wrap="1" />
     </div>
   </template>
 
@@ -15,12 +15,10 @@
 
   <elements>
     <div flex_direction="row" gap="16" flex_grow="1">
-      <rectangle macro="group_box" id="icon_parent" padding="16" color="#0033aa66" color2="#00000022" gradient="vertical" justify_content="center">
-
-      </rectangle>
-      <div flex_direction="column" gap="8" flex_grow="1" max_width="720">
+      <rectangle macro="group_box" id="icon_parent" padding="16" color="background_variant(opacity-0.5)" color2="background(opacity-0.5)" gradient="vertical" justify_content="center"/>
+      <div flex_direction="column" gap="8" flex_grow="1">
         <label id="label_title" weight="bold" size="32" overflow="hidden" />
-        <Subtext label_id="label_exec" overflow="hidden" />
+        <Subtext label_id="label_exec"/>
         <Separator />
         <RadioGroup id="radio_compositor" flex_direction="row" gap="16">
           <RadioBox translation="APP_LAUNCHER.MODE.NATIVE" value="Native" checked="1" />
@@ -30,14 +28,14 @@
         <label translation="APP_LAUNCHER.RES_TITLE" />
         <RadioGroup id="radio_res" flex_direction="row" gap="16">
           <RadioBox text="1440p" value="Res1440" />
-          <RadioBox text="1080p" value="Res1080" checked="1" />
+          <RadioBox text="1080p" value="Res1080"/>
           <RadioBox text="720p" value="Res720" />
           <RadioBox text="480p" value="Res480" />
         </RadioGroup>
         <Separator />
         <label translation="APP_LAUNCHER.ASPECT_TITLE" />
         <RadioGroup id="radio_orientation" flex_direction="row" gap="16">
-          <RadioBox translation="APP_LAUNCHER.ASPECT.WIDE" value="Wide" tooltip_str="16:9" checked="1" />
+          <RadioBox translation="APP_LAUNCHER.ASPECT.WIDE" value="Wide" tooltip_str="16:9"/>
           <RadioBox translation="APP_LAUNCHER.ASPECT.SEMI_WIDE" value="SemiWide" tooltip_str="3:2" />
           <RadioBox translation="APP_LAUNCHER.ASPECT.SQUARE" value="Square" tooltip_str="1:1" />
           <RadioBox translation="APP_LAUNCHER.ASPECT.SEMI_TALL" value="SemiTall" tooltip_str="2:3" />
@@ -51,14 +49,22 @@
           <RadioBox translation="APP_LAUNCHER.POS.STATIC" value="Static" tooltip_str="APP_LAUNCHER.POS.STATIC_HELP" />
         </RadioGroup -->
         <Separator />
-        <div flex_direction="row" justify_content="space_between" gap="16">
-          <CheckBox id="cb_autostart" translation="APP_LAUNCHER.AUTOSTART" />
-          <Button id="btn_launch" align_self="baseline" color="#44ce22FF" padding_top="4" padding_bottom="4" round="8" padding_right="12" min_height="40">
+        <CheckBox id="cb_autostart" translation="APP_LAUNCHER.AUTOSTART" align_self="baseline"/>
+        <div flex_direction="row" align_items="end" justify_content="center" gap="8" margin_top="8">
+          <Button id="btn_unpin" color="danger" padding_left="8" padding_right="8" round="8" min_height="40">
+            <sprite src_builtin="dashboard/heart_minus.svg" width="32" height="32" />
+            <label translation="REMOVE_FROM_FAVOURITES" weight="bold" size="17" />
+          </Button>
+          <Button id="btn_pin" color="secondary" padding_left="8" padding_right="8" round="8" min_height="40" tooltip="ADD_TO_FAVOURITES_HINT">
+            <sprite src_builtin="dashboard/heart_plus.svg" width="32" height="32" />
+            <label translation="ADD_TO_FAVOURITES" weight="bold" size="17" />
+          </Button>
+          <Button id="btn_launch" color="primary" padding_left="8" padding_right="8" round="8" min_width="200" min_height="40">
             <sprite src_builtin="dashboard/play.svg" width="32" height="32" />
-            <label translation="APP_LAUNCHER.LAUNCH" weight="bold" size="17" shadow="#00000099" />
+            <label translation="APP_LAUNCHER.LAUNCH" weight="bold" size="17" />
           </Button>
         </div>
       </div>
     </div>
   </elements>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/dash-frontend/assets/gui/view/audio_settings.xml b/dash-frontend/assets/gui/view/audio_settings.xml
index e1dbabc2..a25a2cbd 100644
--- a/dash-frontend/assets/gui/view/audio_settings.xml
+++ b/dash-frontend/assets/gui/view/audio_settings.xml
@@ -5,8 +5,8 @@
   <template name="DeviceSlider">
     <rectangle macro="group_box">
       <div width="100%" align_items="center" justify_content="center" gap="8">
-        <sprite src_builtin="${device_icon}" width="16" height="16" />
-        <label text="${device_name}" margin_right="8" size="12" weight="bold" />
+        <sprite src_builtin="${device_icon}" width="16" height="16" color="on_background" />
+        <label text="${device_name}" margin_right="8" size="12" weight="bold" color="on_background" />
       </div>
       <div width="100%" align_items="center">
         <CheckBox id="checkbox" />
@@ -20,7 +20,7 @@
   <template name="Card">
     <rectangle macro="group_box">
       <div width="100%" align_items="center" justify_content="center">
-        <label text="${card_name}" size="12" weight="bold" />
+        <label text="${card_name}" size="12" weight="bold" color="on_background" />
       </div>
       <Button id="btn_card" text="${profile_name}" width="100%" height="32" />
     </rectangle>
@@ -29,7 +29,7 @@
   <template name="SelectAudioProfileText">
     <div align_items="center" gap="8">
       <Button width="48" height="32" id="btn_back">
-        <sprite src_builtin="dashboard/back.svg" width="24" height="24" />
+        <sprite src_builtin="dashboard/back.svg" width="24" height="24" color="on_background" />
       </Button>
       <label translation="AUDIO.SELECT_AUDIO_CARD_PROFILE" size="14" weight="bold" />
     </div>
@@ -58,7 +58,8 @@
           sprite_src_builtin="dashboard/magic_wand.svg"
           min_width="32"
           tooltip="AUDIO.AUTO_SWITCH_TO_VR_AUDIO"
-          color="~color_accent"
+          color="primary"
+          sprite_color="on_primary"
           tooltip_side="right" />
 
         <BottomButton id="btn_sinks" src_builtin="dashboard/volume.svg" translation="AUDIO.SPEAKERS" />
diff --git a/dash-frontend/assets/gui/view/bindings.xml b/dash-frontend/assets/gui/view/bindings.xml
new file mode 100644
index 00000000..7e35170e
--- /dev/null
+++ b/dash-frontend/assets/gui/view/bindings.xml
@@ -0,0 +1,35 @@
+<layout>
+  <include src="../t_group_box.xml" />
+
+  <!-- used at runtime [!!!] -->
+  <include src="../t_dropdown_button.xml" />
+
+  <!-- id, min, max, step, value, value2, tooltip -->
+  <template name="ThresholdSlider">
+    <Slider id="${id}" width="200" height="24" min_value="${min}" max_value="${max}" step="${step}" value="${value}" value2="${value2}" tooltip="${tooltip}" />
+  </template>
+
+  <!-- id, translation  -->
+  <template name="ActionRow">
+    <rectangle macro="group_box" id="${id}">
+      <!-- top row -->
+      <div flex_direction="row" gap="8" align_items="center">
+        <sprite src_builtin="dashboard/controller.svg" width="24" height="24" color="on_background"/>
+        <label translation="${translation}" color="primary" weight="bold" size="14" />
+      </div>
+      <!-- filled-in at runtime -->
+    </rectangle>
+  </template>
+
+  <elements>
+    <div flex_direction="column" gap="8" width="100%">
+      <div flex_direction="column" gap="8" align_items="center" overflow_y="scroll" width="100%" padding="16">
+        <div id="list_parent" flex_direction="column" gap="6" width="100%"></div>
+      </div>
+      <rectangle color="background_contrast" flex_direction="row" gap="8" justify_content="end" padding="8">
+        <Button id="btn_cancel" sprite_src_builtin="dashboard/cancel.svg" min_width="100" height="32" translation="APP_SETTINGS.CANCEL" />
+        <Button id="btn_save" sprite_src_builtin="dashboard/check.svg" min_width="100" height="32" translation="APP_SETTINGS.SAVE" />
+      </rectangle>
+    </div>
+  </elements>
+</layout>
diff --git a/dash-frontend/assets/gui/view/color_palettes.xml b/dash-frontend/assets/gui/view/color_palettes.xml
new file mode 100644
index 00000000..336d9982
--- /dev/null
+++ b/dash-frontend/assets/gui/view/color_palettes.xml
@@ -0,0 +1,27 @@
+<layout>
+  <template name="ColorPaletteButton">
+    <Button id="${id}" width="350" flex_direction="column" justify_content="space_around" tooltip="${tooltip}" tooltip_side="bottom"
+      color="${background}" hover_color="${background_variant}" border_color="${outline}" hover_border_color="${highlight}" padding="16" margin="4" >
+      <label text="${text}" size="24" weight="bold" color="${on_background}" parent_color="ignore"/>
+      <div flex_direction="row" width="100%" justify_content="space_evenly" padding_top="16" >
+        <rectangle round="100%" width="32" height="32" color="${primary}" border="2" border_color="${on_primary}" />
+        <rectangle round="100%" width="32" height="32" color="${secondary}" border="2" border_color="${on_secondary}" />
+        <rectangle round="100%" width="32" height="32" color="${tertiary}" border="2" border_color="${on_tertiary}" />
+        <rectangle round="100%" width="32" height="32" color="${danger}" border="2" border_color="${on_danger}" />
+      </div>
+    </Button>
+  </template>
+
+  <template name="CustomPaletteButton">
+    <Button id="custom_btn" width="350" flex_direction="column" justify_content="space_around" padding="16" margin="4" >
+      <label translation="APP_SETTINGS.COLOR_PALETTE_CUSTOM_URL" size="16" weight="bold" />
+      <label translation="APP_SETTINGS.COLOR_PALETTE_CUSTOM_URL2" size="14" color="on_background_variant" />
+    </Button>
+  </template>
+
+  <elements>
+    <div flex_direction="column" gap="8" width="100%" align_items="center">
+      <div id="list_parent" flex_grow="1" flex_wrap="wrap" flex_direction="row" gap="4" width="100%" justify_content="center"></div>
+    </div>
+  </elements>
+</layout>
diff --git a/dash-frontend/assets/gui/view/dialog_box.xml b/dash-frontend/assets/gui/view/dialog_box.xml
new file mode 100644
index 00000000..0c3f87cf
--- /dev/null
+++ b/dash-frontend/assets/gui/view/dialog_box.xml
@@ -0,0 +1,15 @@
+<layout>
+  <template name="DialogBoxButton">
+    <Button id="btn" translation="CLOSE_WINDOW" align_self="start" sprite_src_builtin="${icon}"/>
+  </template>
+  
+  <elements>
+    <div flex_direction="column" align_items="center" justify_content="center" width="100%" gap="32">
+      <label id="label_message" size="18" weight="bold"/>
+
+      <div id="buttons" gap="8">
+        <!-- filled-in at runtime -->
+      </div>
+    </div>
+  </elements>
+</layout>
diff --git a/dash-frontend/assets/gui/view/download_file.xml b/dash-frontend/assets/gui/view/download_file.xml
new file mode 100644
index 00000000..836372bd
--- /dev/null
+++ b/dash-frontend/assets/gui/view/download_file.xml
@@ -0,0 +1,22 @@
+<layout>
+  <include src="../t_separator.xml"/>
+
+  <template name="btn_close">
+    <Button id="btn" translation="CLOSE_WINDOW" align_self="start" sprite_src_builtin="dashboard/check.svg"/>
+  </template>
+  
+  <elements>
+    <div align_items="center" justify_content="center" width="100%">
+      <div id="content" flex_direction="column" gap="8" width="100%">
+        <label translation="DOWNLOADING_FILE" size="24" weight="bold"/>
+        <Separator/>
+        <label id="label_target_path" color="on_background" />
+
+        <div gap="8" align_items="center">
+          <div id="loading_parent"/>
+          <label id="label_status"/>
+        </div>
+      </div>
+    </div>
+  </elements>
+</layout>
diff --git a/dash-frontend/assets/gui/view/game_launcher.xml b/dash-frontend/assets/gui/view/game_launcher.xml
index 5268af98..15cf6feb 100644
--- a/dash-frontend/assets/gui/view/game_launcher.xml
+++ b/dash-frontend/assets/gui/view/game_launcher.xml
@@ -9,11 +9,11 @@
           <label weight="bold" id="label_author" text="Unknown" />
         </div>
         <label id="label_description" wrap="1" text="No description available" />
-        <Button id="btn_launch" align_self="baseline" color="#44ce22FF" padding_top="4" padding_bottom="4" round="8" padding_right="12" min_width="200" min_height="40">
+        <Button id="btn_launch" align_self="baseline" color="primary" border_color="primary(rgb-mult-0.5)" padding_top="4" padding_bottom="4" round="8" padding_right="12" min_width="200" min_height="40">
           <sprite src_builtin="dashboard/play.svg" width="32" height="32" />
-          <label text="Launch" weight="bold" size="17" shadow="#00000099" />
+          <label text="Launch" weight="bold" size="17" />
         </Button>
       </div>
     </div>
   </elements>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/dash-frontend/assets/gui/view/input_profiles.xml b/dash-frontend/assets/gui/view/input_profiles.xml
new file mode 100644
index 00000000..88406da7
--- /dev/null
+++ b/dash-frontend/assets/gui/view/input_profiles.xml
@@ -0,0 +1,15 @@
+<layout>
+  <!-- id, text -->
+  <template name="InputProfileButton">
+    <Button id="${id}" width="350" gap="8" justify_content="start" >
+      <sprite margin_left="8" src_builtin="dashboard/controller.svg" min_width="24" min_height="24" />
+      <label text="${text}" weight="bold"/>
+    </Button>
+  </template>
+
+  <elements>
+    <div flex_direction="column" gap="8" width="100%" align_items="center">
+      <div id="list_parent" flex_grow="1" flex_wrap="wrap" flex_direction="row" gap="4" width="100%" justify_content="center"></div>
+    </div>
+  </elements>
+</layout>
diff --git a/dash-frontend/assets/gui/view/popup_window.xml b/dash-frontend/assets/gui/view/popup_window.xml
index 1f1f6fed..fca9b563 100644
--- a/dash-frontend/assets/gui/view/popup_window.xml
+++ b/dash-frontend/assets/gui/view/popup_window.xml
@@ -1,6 +1,4 @@
 <layout>
-  <include src="../theme.xml" />
-
   <elements>
     <div
       consume_mouse_events="1"
@@ -9,37 +7,43 @@
       width="100%"
       height="100%"
       flex_direction="column"
+      position="absolute"
     >
-      <!-- Top black bar -->
+      <!-- Top bar -->
       <rectangle
         position="relative"
-        color="#000000"
+        color="background_contrast"
         width="100%" height="48"
       >
 
         <!-- Shine effect at the top -->
-        <rectangle position="absolute" width="100%" height="2" round="4" color="#ffffff22" />
+        <rectangle position="absolute" width="100%" height="3" round="4" color="highlight(opacity-0.1)" />
 
         <!-- Top bar contents -->
         <div gap="16" align_items="center">
           <!-- Back button -->
-          <Button id="but_back" width="48" height="48" color="#ffffff00" border_color="#ffffff00">
-            <sprite src_builtin="dashboard/back.svg" width="24" height="24" />
+          <Button id="but_back" width="48" height="48" color="on_background_contrast(transparent)" border_color="on_background_contrast(transparent)">
+            <sprite src_builtin="dashboard/back.svg" width="24" height="24" color="on_background_contrast" />
           </Button>
 
           <!-- Title -->
-          <label id="popup_title" weight="bold" size="18" />
+          <label id="popup_title" color="on_background_contrast" weight="bold" size="18" />
         </div>
       </rectangle>
 
-      <!-- Content -->
-      <rectangle height="100%"
-        color="#010310fe"
-        color2="#051c55fc"
+      <rectangle
+        width="100%"
+        height="100%"
+        color="background_contrast(opacity-0.98)"
+        color2="background(opacity-0.99)"
         gradient="vertical"
-        padding="16"
-        id="content">
+        position="relative"
+      >
+        <div id="content" width="100%" height="100%" position="absolute" overflow_y="scroll">
+          <!-- Padding set at runtime -->
+          <!-- Content, filled-in at runtime -->
+        </div>      
       </rectangle>
     </div>
   </elements>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/dash-frontend/assets/gui/view/remote_skymap_downloader.xml b/dash-frontend/assets/gui/view/remote_skymap_downloader.xml
new file mode 100644
index 00000000..457125df
--- /dev/null
+++ b/dash-frontend/assets/gui/view/remote_skymap_downloader.xml
@@ -0,0 +1,36 @@
+<layout>
+
+  <!--
+  parameters:
+    "text"
+    "sprite"
+  
+  ids:
+    "button"
+  -->
+  <template name="ResolutionButton">
+    <Button id="button" sprite_src_builtin="${sprite}" text="${text}"/>
+  </template>
+
+  <include src="../t_separator.xml"/>
+
+  <elements>
+    <div gap="8" flex_direction="column" min_width="100%" overflow_y="scroll">
+      <div gap="8" flex_direction="column" align_items="center">
+        <div id="resolution_buttons" gap="8" flex_direction="row">
+          <!-- filled-in at runtime -->
+        </div>
+        <image id="image" width="400" height="200" round="8" border="2" border_color="primary"/>
+        <label id="label_author" weight="bold"/>
+        <label id="label_description" wrap="1"/>
+        <Separator/>
+        <!-- nerdy stuff below -->
+        <div gap="24" justify_content="center">
+          <label size="10" id="label_creation_date"/>
+          <label size="10" id="label_modification_date"/>
+          <label size="10" id="label_version"/>
+        </div>
+      </div>
+    </div>
+  </elements>
+</layout>
diff --git a/dash-frontend/assets/gui/view/remote_skymap_list.xml b/dash-frontend/assets/gui/view/remote_skymap_list.xml
new file mode 100644
index 00000000..e2f3603a
--- /dev/null
+++ b/dash-frontend/assets/gui/view/remote_skymap_list.xml
@@ -0,0 +1,7 @@
+<layout>
+  <elements>
+    <div id="list" gap="8" flex_wrap="wrap" align_self="baseline">
+      <!-- filled-in at runtime -->
+    </div>
+  </elements>
+</layout>
diff --git a/dash-frontend/assets/gui/view/skymap_list.xml b/dash-frontend/assets/gui/view/skymap_list.xml
new file mode 100644
index 00000000..b32b0ec1
--- /dev/null
+++ b/dash-frontend/assets/gui/view/skymap_list.xml
@@ -0,0 +1,11 @@
+<layout>
+  <elements>
+    <div flex_direction="column" gap="8" width="100%" align_items="center">
+      <div flex_direction="row" gap="4" align_self="end">
+        <Button id="btn_refresh" tooltip="RELOAD_FROM_DISK" width="32" height="32" sprite_src_builtin="dashboard/refresh.svg" />
+        <Button id="btn_download_skymaps" height="32" translation="APP_SETTINGS.BROWSE_ONLINE_CATALOG" sprite_src_builtin="dashboard/download.svg"/>
+      </div>
+      <div id="list_parent" gap="8" flex_direction="row" flex_wrap="wrap" />
+    </div>
+  </elements>
+</layout>
diff --git a/dash-frontend/assets/gui/view/skymap_list_cell.xml b/dash-frontend/assets/gui/view/skymap_list_cell.xml
new file mode 100644
index 00000000..ba286753
--- /dev/null
+++ b/dash-frontend/assets/gui/view/skymap_list_cell.xml
@@ -0,0 +1,40 @@
+<layout>
+
+  <!--
+  ids:
+    "button"
+    "image_preview"
+    "label_title"
+    "label_desc"
+  -->
+  <template name="Cell">
+    <Button
+      id="button"
+      padding="8"
+      round="8"
+      flex_direction="column"
+      gap="4"
+      width="256"
+      align_items="center"
+      align_self="start">
+      <image id="image_preview" width="100%" height="128" round="6">
+        <!-- new_pass is required, because we need to render rectangles at the top of the image. Sorry. -->
+        <div new_pass="1" id="resolution_pips" gap="4" margin="6"/>
+      </image>
+      <label id="label_title" wrap="1" weight="bold"/>
+      <label id="label_author" wrap="1"/>
+    </Button>
+  </template>
+
+  <!--
+
+  params:
+    "color"
+    "text"
+  -->
+  <template name="ResolutionPip">
+    <rectangle color="${color}" padding_left="4" padding_right="4" padding_top="2" padding_bottom="2" round="3" align_self="start">
+      <label text="${text}" weight="bold" size="12" color="#FFFFFF" shadow="#000000" shadow_x="2" shadow_y="2"/>
+    </rectangle>
+  </template>
+</layout>
diff --git a/dash-frontend/assets/lang/de.json b/dash-frontend/assets/lang/de.json
index 5d3d933f..f671d5ad 100644
--- a/dash-frontend/assets/lang/de.json
+++ b/dash-frontend/assets/lang/de.json
@@ -1,166 +1,331 @@
 {
-  "HOME_SCREEN": "Startbildschirm",
-  "MONADO_RUNTIME": "Monado-Laufzeitumgebung",
-  "APPLICATIONS": "Anwendungen",
-  "GAMES": "Spiele",
-  "SETTINGS": "Einstellungen",
-  "HELLO_USER": "Hallo, {USER}!",
-  "GENERAL_SETTINGS": "Allgemeine Einstellungen",
-  "APPLICATION_LAUNCHER": "Anwendung Launcher",
-  "APP_SETTINGS": {
-    "HIDE_USERNAME": "Benutzernamen ausblenden",
-    "OPAQUE_BACKGROUND": "Undurchsichtiger Hintergrund",
-    "LOOK_AND_FEEL": "Aussehen und Verhalten",
-    "HIDE_GRAB_HELP": "Greif-Hilfe ausblenden",
-    "ANIMATION_SPEED": "UI-Animationsgeschwindigkeit",
-    "ROUND_MULTIPLIER": "UI-Kantenrundung",
-    "USE_SKYBOX": "Skybox aktivieren",
-    "USE_PASSTHROUGH": "Passthrough aktivieren",
-    "CLOCK_12H": "12-Stunden-Uhr",
-    "FEATURES": "Funktionen",
-    "NOTIFICATIONS_ENABLED": "Benachrichtigungen aktivieren",
-    "NOTIFICATIONS_SOUND_ENABLED": "Benachrichtigungstöne",
-    "KEYBOARD_SOUND_ENABLED": "Tastengeräusche",
-    "SPACE_DRAG_MULTIPLIER": "Raum-Drag-Multiplikator",
-    "SPACE_DRAG_UNLOCKED": "Erlaube Space-Drag auf allen Achsen",
-    "SPACE_ROTATE_UNLOCKED": "Erlaube Drehungen in allen Achsen",
-    "BLOCK_GAME_INPUT": "Spieleingabe blockieren",
-    "BLOCK_GAME_INPUT_IGNORE_WATCH": "Ignoriere Watch beim Blockieren der Eingabe",
-    "CONTROLS": "Steuerung",
-    "FOCUS_FOLLOWS_MOUSE_MODE": "Mausbewegung bei Triggerberührung",
-    "LEFT_HANDED_MOUSE": "Linkshändige Maus",
-    "ALLOW_SLIDING": "Stabinteraktion während des Greifens",
-    "INVERT_SCROLL_DIRECTION_X": "Horizontale Scrollrichtung umkehren",
-    "INVERT_SCROLL_DIRECTION_Y": "Vertikale Bildlaufrichtung umkehren",
-    "SCROLL_SPEED": "Scrollgeschwindigkeit",
-    "LONG_PRESS_DURATION": "Dauer für lange Drückvorgänge",
-    "POINTER_LERP_FACTOR": "Zeigerglättung",
-    "XR_CLICK_SENSITIVITY": "XR-Klicksensitivität",
-    "XR_CLICK_SENSITIVITY_RELEASE": "XR-Loslassempfindlichkeit",
-    "CLICK_FREEZE_TIME_MS": "Klick-Freeze-Zeit (ms)",
-    "MISC": "Verschiedenes",
-    "XWAYLAND_BY_DEFAULT": "Standardmäßig Apps im Kompatibilitätsmodus ausführen",
-    "UPRIGHT_SCREEN_FIX": "Bildschirm-Drehkorrektur",
-    "DOUBLE_CURSOR_FIX": "Doppelter Cursor Fix",
-    "SCREEN_RENDER_DOWN": "Bildschirm bei niedrigerer Auflösung rendern",
-    "UPRIGHT_SCREEN_FIX_HELP": "Behebt hochstehende Bildschirme auf einigen Desktops",
-    "DOUBLE_CURSOR_FIX_HELP": "Aktivieren Sie dies, wenn Sie 2 Cursor sehen",
-    "XR_CLICK_SENSITIVITY_HELP": "Analoge Trigger-Empfindlichkeit",
-    "XR_CLICK_SENSITIVITY_RELEASE_HELP": "Muss niedriger als Klick sein",
-    "CLICK_FREEZE_TIME_MS_HELP": "Hilft bei der Präzision von Doppelklicks",
-    "LEFT_HANDED_MOUSE_HELP": "Verwenden Sie diese Option, wenn die Maustasten vertauscht sind",
-    "BLOCK_GAME_INPUT_HELP": "Blockiert alle Eingaben, wenn ein Overlay angefahren wird",
-    "BLOCK_GAME_INPUT_IGNORE_WATCH_HELP": "Blockiere die Eingabe nicht, wenn die Überwachung aktiviert ist",
-    "USE_SKYBOX_HELP": "Zeige einen Skybox, wenn keine Szenen-App oder Passthrough vorhanden ist",
-    "USE_PASSTHROUGH_HELP": "Aktiviere Passthrough, falls die XR-Laufzeitumgebung dies unterstützt",
-    "SCREEN_RENDER_DOWN_HELP": "Hilft bei Aliasing auf hochauflösenden Bildschirmen",
-    "SETS_ON_WATCH": "Sets auf der Watch",
-    "TROUBLESHOOTING": "Fehlerbehebung",
-    "CLEAR_SAVED_STATE": "Gespeicherten Zustand löschen",
-    "CLEAR_PIPEWIRE_TOKENS": "PipeWire Tokens löschen",
-    "DELETE_ALL_CONFIGS": "Konfiguration löschen",
-    "RESTART_SOFTWARE": "Software neu starten",
-    "CLEAR_SAVED_STATE_HELP": "Sets und Overlay-Positionen zurücksetzen",
-    "CLEAR_PIPEWIRE_TOKENS_HELP": "Bildschirmauswahl beim nächsten Start abfragen",
-    "DELETE_ALL_CONFIGS_HELP": "Entfernen Sie alle Konfigurationsdateien aus conf.d",
-    "RESTART_SOFTWARE_HELP": "Einstellungen anwenden, die einen Neustart erfordern",
-    "CAPTURE_METHOD": "Wayland-Bildschirmaufnahme",
-    "CAPTURE_METHOD_HELP": "Versuchen Sie, dies zu ändern, wenn Sie\nschwarze oder fehlerhafte Bildschirme erleben",
-    "KEYBOARD_MIDDLE_CLICK": "Keyboard-Mittelklick",
-    "KEYBOARD_MIDDLE_CLICK_HELP": "Modifikator bei Eingabe mit violettem Laser",
-    "OPTION": {
-      "AUTO": "Automatisch",
-      "AUTO_HELP": "Bildschirmkopie GPU falls unterstützt,\nansonsten PipeWire GPU.",
-      "PIPEWIRE_HELP": "Schnelle GPU-Erfassung,\nStandard auf allen Desktops.",
-      "PW_FALLBACK_HELP": "Langsame Methode mit hoher CPU-Auslastung.\nVersuchen Sie es, falls PipeWire GPU nicht funktioniert.",
-      "SCREENCOPY_GPU_HELP": "Schnell, keine Bildschirmfreigabe-Popups.\nFunktioniert mit: Hyprland, Niri, River, Sway",
-      "SCREENCOPY_HELP": "Langsam, keine Bildschirmfreigabe-Popups.\nFunktioniert mit: Hyprland, Niri, River, Sway",
-      "NONE": "Keine",
-      "HMD_PINCH": "HMD + Kneifen",
-      "EYE_PINCH": "Auge + Kneifen",
-      "EYE_ONLY": "Nur Auge",
-      "HMD_ONLY": "Nur HMD"
-    },
-    "AUTOSTART_APPS": "Anwendungen, die beim Start ausgeführt werden sollen",
-    "HANDSFREE_POINTER": "Freihändige Modus",
-    "HANDSFREE_POINTER_HELP": "Eingabe, die bei Bewegung\nder Controller verwendet wird, wenn diese nicht verfügbar sind.\nLinkes Kneifen greift, rechtes klickt.",
-    "UI_GRADIENT_INTENSITY": "UI-Verlaufsintensität",
-    "RESET_PLAYSPACE": "Spielbereich zurücksetzen",
-    "RESET_PLAYSPACE_HELP": "Den Abstand des Spielbereichs zurücksetzen.",
-    "BLOCK_POSES_ON_KBD_INTERACTION": "Posen beim Interagieren mit der Tastatur blockieren",
-    "BLOCK_POSES_ON_KBD_INTERACTION_HELP": "Verhindert, dass das Spiel Posen empfängt, wenn die Tastatur angefahren wird und „Spieleingabe blockieren“ aktiviert ist",
-    "LANGUAGE": "Sprache",
-    "REQUIRES_RESTART": "Erfordert Neustart",
-    "GRID_OPACITY": "Bodenraster-Undurchsichtigkeit",
-    "GRID_OPACITY_HELP": "Undurchsichtigkeit des Bodenrasters, wenn der Skybox aktiviert ist"
-  },
-  "HELLO": "Hallo!",
-  "AUDIO": {
-    "VOLUME": "Lautstärke",
-    "SETTINGS": "Audioeinstellungen",
-    "AUTO_SWITCH_TO_VR_AUDIO": "Automatisch auf VR-Audio umschalten",
-    "SPEAKERS": "Lautsprecher",
-    "MICROPHONES": "Mikrofone",
-    "CARDS": "Sound-Karten",
-    "SELECT_AUDIO_CARD_PROFILE": "Wählen Sie das Sound-Kartenprofil",
-    "NO_VR_SPEAKERS_FOUND_SWITCH_MANUALLY": "Keine VR-Lautsprecher gefunden. Schalten Sie diese manuell um.",
-    "NO_VR_MICROPHONE_SWITCH_MANUALLY": "Kein VR-Mikrofon gefunden. Schalten Sie es manuell um.",
-    "FAILED_TO_SWITCH_MICROPHONE": "Fehler beim Wechseln des Mikrofons",
-    "MICROPHONE_SET_SUCCESSFULLY": "Mikrofon erfolgreich umgeschaltet",
-    "SPEAKERS_SET_SUCCESSFULLY": "Lautsprecher erfolgreich umgeschaltet"
-  },
-  "ACTIONS": {
-    "RECENTER_PLAYSPACE": "Playspace neu zentrieren"
-  },
-  "POPUP_ADD_DISPLAY": {
-    "RESOLUTION": "Auflösung"
-  },
-  "WIDTH": "Breite",
-  "HEIGHT": "Höhe",
-  "HIDE": "Verbergen",
-  "REMOVE": "Entfernen",
-  "SHOW": "Anzeigen",
-  "FAILED_TO_LAUNCH_APPLICATION": "Fehler beim Starten der Anwendung:",
-  "APPLICATION_STARTED": "Anwendung gestartet",
-  "CLOSE_WINDOW": "Fenster schließen",
-  "GAME_LIST": {
-    "NO_GAMES_FOUND": "Keine Spiele gefunden",
-    "RUNNING_GAMES_LIST": "Liste der laufenden Spiele"
-  },
-  "TERMINATE_PROCESS": "Prozess beenden",
-  "GAME_LAUNCHED": "Spiel gestartet",
-  "APP_LAUNCHER": {
-    "MODE": {
-      "NATIVE": "Nativer Modus",
-      "CAGE": "Kompatibilitätsmodus (Cage)"
-    },
-    "RES_TITLE": "Auflösung",
-    "ASPECT_TITLE": "Seitenverhältnis",
-    "ASPECT": {
-      "WIDE": "Breit",
-      "SEMI_WIDE": "Halb-breit",
-      "SQUARE": "Quadratisch",
-      "SEMI_TALL": "Halbhoch",
-      "TALL": "Hoch"
-    },
-    "POS_TITLE": "Positionierung",
-    "POS": {
-      "FLOATING": "Schwebend",
-      "ANCHORED": "Verankert",
-      "STATIC": "Statisch",
-      "FLOATING_HELP": "Bewegt sich unabhängig, zentriert sich bei Anzeige neu.",
-      "ANCHORED_HELP": "Bleibt relativ zur Mittelmarkierung an Ort und Stelle.",
-      "STATIC_HELP": "Keine Set zugeordnet. Wird nicht zentriert."
-    },
-    "AUTOSTART": "Automatisch beim Start ausführen",
-    "LAUNCH": "Starten"
-  },
-  "DISPLAY_BRIGHTNESS": "Bildschirmhelligkeit",
-  "PROCESS_LIST": "Prozessliste",
-  "REFRESH": "Aktualisieren",
-  "PROCESS": {
-    "STOP": "Stopp",
-    "FORCE_KILL": "Erzwinge Beenden"
-  },
-  "DEBUG_INFO": "Debug-Informationen"
-}
\ No newline at end of file
+	"HOME_SCREEN": "Startbildschirm",
+	"MONADO_RUNTIME": "Monado-Laufzeitumgebung",
+	"APPLICATIONS": "Anwendungen",
+	"GAMES": "Spiele",
+	"SETTINGS": "Einstellungen",
+	"HELLO_USER": "Hallo, {USER}!",
+	"GENERAL_SETTINGS": "Allgemeine Einstellungen",
+	"APPLICATION_LAUNCHER": "Anwendung Launcher",
+	"APP_SETTINGS": {
+		"HIDE_USERNAME": "Benutzernamen ausblenden",
+		"OPAQUE_BACKGROUND": "Undurchsichtiger Hintergrund",
+		"LOOK_AND_FEEL": "Aussehen und Verhalten",
+		"HIDE_GRAB_HELP": "Greif-Hilfe ausblenden",
+		"ANIMATION_SPEED": "UI-Animationsgeschwindigkeit",
+		"ROUND_MULTIPLIER": "UI-Kantenrundung",
+		"USE_SKYBOX": "Skybox aktivieren",
+		"USE_PASSTHROUGH": "Passthrough aktivieren",
+		"CLOCK_12H": "12-Stunden-Uhr",
+		"FEATURES": "Funktionen",
+		"NOTIFICATIONS_ENABLED": "Benachrichtigungen aktivieren",
+		"NOTIFICATIONS_SOUND_ENABLED": "Benachrichtigungstöne",
+		"KEYBOARD_SOUND_ENABLED": "Tastengeräusche",
+		"SPACE_DRAG_MULTIPLIER": "Raum-Drag-Multiplikator",
+		"SPACE_DRAG_UNLOCKED": "Erlaube Space-Drag auf allen Achsen",
+		"SPACE_ROTATE_UNLOCKED": "Erlaube Drehungen in allen Achsen",
+		"BLOCK_GAME_INPUT": "Spieleingabe blockieren",
+		"BLOCK_GAME_INPUT_IGNORE_WATCH": "Ignoriere Watch beim Blockieren der Eingabe",
+		"CONTROLS": "Steuerung",
+		"FOCUS_FOLLOWS_MOUSE_MODE": "Mausbewegung bei Triggerberührung",
+		"LEFT_HANDED_MOUSE": "Linkshändige Maus",
+		"ALLOW_SLIDING": "Stabinteraktion während des Greifens",
+		"INVERT_SCROLL_DIRECTION_X": "Horizontale Scrollrichtung umkehren",
+		"INVERT_SCROLL_DIRECTION_Y": "Vertikale Bildlaufrichtung umkehren",
+		"SCROLL_SPEED": "Scrollgeschwindigkeit",
+		"LONG_PRESS_DURATION": "Dauer für lange Drückvorgänge",
+		"POINTER_LERP_FACTOR": "Zeigerglättung",
+		"CLICK_FREEZE_TIME_MS": "Klick-Freeze-Zeit (ms)",
+		"MISC": "Verschiedenes",
+		"XWAYLAND_BY_DEFAULT": "Standardmäßig Apps im Kompatibilitätsmodus ausführen",
+		"UPRIGHT_SCREEN_FIX": "Bildschirm-Drehkorrektur",
+		"DOUBLE_CURSOR_FIX": "Doppelter Cursor Fix",
+		"SCREEN_RENDER_DOWN": "Bildschirm bei niedrigerer Auflösung rendern",
+		"UPRIGHT_SCREEN_FIX_HELP": "Behebt hochstehende Bildschirme auf einigen Desktops",
+		"DOUBLE_CURSOR_FIX_HELP": "Aktivieren Sie dies, wenn Sie 2 Cursor sehen",
+		"CLICK_FREEZE_TIME_MS_HELP": "Hilft bei der Präzision von Doppelklicks",
+		"LEFT_HANDED_MOUSE_HELP": "Verwenden Sie diese Option, wenn die Maustasten vertauscht sind",
+		"BLOCK_GAME_INPUT_HELP": "Blockiert alle Eingaben, wenn ein Overlay angefahren wird",
+		"BLOCK_GAME_INPUT_IGNORE_WATCH_HELP": "Blockiere die Eingabe nicht, wenn die Überwachung aktiviert ist",
+		"USE_SKYBOX_HELP": "Zeige einen Skybox, wenn keine Szenen-App oder Passthrough vorhanden ist",
+		"USE_PASSTHROUGH_HELP": "Aktiviere Passthrough, falls die XR-Laufzeitumgebung dies unterstützt",
+		"SCREEN_RENDER_DOWN_HELP": "Hilft bei Aliasing auf hochauflösenden Bildschirmen",
+		"SETS_ON_WATCH": "Sets auf der Watch",
+		"TROUBLESHOOTING": "Fehlerbehebung",
+		"CLEAR_SAVED_STATE": "Gespeicherten Zustand löschen",
+		"CLEAR_PIPEWIRE_TOKENS": "PipeWire Tokens löschen",
+		"DELETE_ALL_CONFIGS": "Konfiguration löschen",
+		"RESTART_SOFTWARE": "Software neu starten",
+		"CLEAR_SAVED_STATE_HELP": "Sets und Overlay-Positionen zurücksetzen",
+		"CLEAR_PIPEWIRE_TOKENS_HELP": "Bildschirmauswahl beim nächsten Start abfragen",
+		"DELETE_ALL_CONFIGS_HELP": "Entfernen Sie alle Konfigurationsdateien aus conf.d",
+		"RESTART_SOFTWARE_HELP": "Einstellungen anwenden, die einen Neustart erfordern",
+		"CAPTURE_METHOD": "Wayland-Bildschirmaufnahme",
+		"CAPTURE_METHOD_HELP": "Versuchen Sie, dies zu ändern, wenn Sie\nschwarze oder fehlerhafte Bildschirme erleben",
+		"KEYBOARD_MIDDLE_CLICK": "Keyboard-Mittelklick",
+		"KEYBOARD_MIDDLE_CLICK_HELP": "Modifikator bei Eingabe mit violettem Laser",
+		"OPTION": {
+			"AUTO": "Automatisch",
+			"AUTO_HELP": "Bildschirmkopie GPU falls unterstützt,\nansonsten PipeWire GPU.",
+			"PIPEWIRE_HELP": "Schnelle GPU-Erfassung,\nStandard auf allen Desktops.",
+			"PW_FALLBACK_HELP": "Langsame Methode mit hoher CPU-Auslastung.\nVersuchen Sie es, falls PipeWire GPU nicht funktioniert.",
+			"SCREENCOPY_GPU_HELP": "Schnell, keine Bildschirmfreigabe-Popups.\nFunktioniert mit: Hyprland, Niri, River, Sway",
+			"SCREENCOPY_HELP": "Langsam, keine Bildschirmfreigabe-Popups.\nFunktioniert mit: Hyprland, Niri, River, Sway",
+			"NONE": "Keine",
+			"HMD_PINCH": "HMD + Kneifen",
+			"EYE_PINCH": "Auge + Kneifen",
+			"NONE_INPUT_HELP": "Maus und Tastatur nicht emulieren.\nEs wird nicht möglich sein, mit Displays zu interagieren.",
+			"UINPUT": "Gerätesimulation",
+			"WL_VIRTUAL": "Wayland-virtueller Input",
+			"WL_VIRTUAL_HELP": "Sendet Ereignisse an den Wayland-Compositor unter Verwendung von\nzwlr_virtual_pointer und zwp_virtual_keyboard.\nFunktioniert nur zuverlässig auf einigen Desktops.\nFunktioniert NICHT auf KDE, GNOME oder COSMIC.",
+			"EYE_ONLY": "Augenlaser",
+			"HMD_ONLY": "HMD-Laser",
+			"NONE_INPUT_CAPTURE_HELP": "Maus und Tastatur nicht erfassen.\nDie physische Maus oder Tastatur kann in den \ninnerhalb von WayVR gestarteten Apps nicht verwendet werden.",
+			"UINPUT_HELP": "Verwendet das uinput-Modul, um ein Gerät zu emulieren.\nFunktioniert auf den meisten Desktops zuverlässig.",
+			"EVDEV_HELP": "Eingabegeräte für die exklusive Nutzung erfassen.\nIhr Benutzer muss Mitglied der Input-Gruppe sein."
+		},
+		"AUTOSTART_APPS": "Anwendungen, die beim Start ausgeführt werden sollen",
+		"HANDSFREE_POINTER": "Freihändige Modus",
+		"HANDSFREE_POINTER_HELP": "Eingabe, die bei Bewegung\nder Controller verwendet wird, wenn diese nicht verfügbar sind.\nLinkes Kneifen greift, rechtes klickt.",
+		"UI_GRADIENT_INTENSITY": "UI-Verlaufsintensität",
+		"RESET_PLAYSPACE": "Spielbereich zurücksetzen",
+		"RESET_PLAYSPACE_HELP": "Den Abstand des Spielbereichs zurücksetzen.",
+		"BLOCK_POSES_ON_KBD_INTERACTION": "Posen beim Interagieren mit der Tastatur blockieren",
+		"BLOCK_POSES_ON_KBD_INTERACTION_HELP": "Verhindert, dass das Spiel Posen empfängt, wenn die Tastatur angefahren wird und „Spieleingabe blockieren“ aktiviert ist",
+		"LANGUAGE": "Sprache",
+		"REQUIRES_RESTART": "Erfordert Neustart",
+		"GRID_OPACITY": "Bodenraster-Undurchsichtigkeit",
+		"GRID_OPACITY_HELP": "Undurchsichtigkeit des Bodenrasters, wenn der Skybox aktiviert ist",
+		"BROWSE_ONLINE_CATALOG": "Online-Katalog durchsuchen...",
+		"BROWSE_SKYMAPS": "Skymaps durchsuchen",
+		"COLOR_KEYING": "Farbschlüsselung",
+		"NO_SKYMAPS_FOUND": "Keine Skymaps gefunden",
+		"SELECT_VARIANT": "Variante auswählen",
+		"SHOW_WELCOME_SCREEN": "Begrüßungsbildschirm anzeigen",
+		"SKYBOX": "Skybox",
+		"SKYMAP_ALREADY_DOWNLOADED": "Diese Skymap wurde bereits heruntergeladen. Wählen Sie die gewünschte Aktion aus.",
+		"WATCH_VIEW_ANGLE": "Betrachtungswinkel der Watch",
+		"WATCH_VIEW_ANGLE_HELP": "Steuerung, wie die Watch ausgeblendet wird",
+		"BINDINGS": {
+			"COMP": {
+				"CLICK": "Klicken",
+				"FORCE": "Kraft",
+				"TOUCH": "Berührung",
+				"VALUE": "Wert",
+				"PROXIMITY": "Nähe",
+				"X_AXIS": "X-Achse",
+				"Y_AXIS": "Y-Achse"
+			},
+			"TYPE": {
+				"BUMPER": "Bumper",
+				"DPAD_UP": "D-Pad oben",
+				"DPAD_DOWN": "D-Pad Runter",
+				"DPAD_LEFT": "D-Pad Links",
+				"DPAD_RIGHT": "D-Pad Rechts",
+				"JOYSTICK": "Joystick",
+				"MENU": "Menü",
+				"SHOULDER": "Schulter",
+				"SQUEEZE": "Greifen",
+				"SYSTEM": "System",
+				"THUMBREST": "Daumenuflage",
+				"THUMBSTICK": "Thumbstick",
+				"TRACKPAD": "Trackpad",
+				"TRIGGER": "Trigger",
+				"VIEW": "Ansehen"
+			},
+			"CLICK": {
+				"ANY": "Beliebig",
+				"DOUBLE": "Doppeltippen",
+				"TRIPLE": "Dreifach-Tippen",
+				"TYPE": "Anzahl der Taps"
+			},
+			"ACTION": {
+				"CLICK": "Klick*",
+				"GRAB": "Greifen*",
+				"ALT_CLICK": "Benutzerdefiniertes Shell-Exec (alt_click in Konfiguration festlegen)",
+				"SHOW_HIDE": "Anzeigen, ausblenden, neuzentrieren*",
+				"TOGGLE_DASHBOARD": "Dashboard umschalten",
+				"SPACE_DRAG": "Playspace-Drag",
+				"SPACE_ROTATE": "Playspace rotieren",
+				"SPACE_RESET": "Playspace zurücksetzen",
+				"CLICK_MODIFIER_RIGHT": "Rechtsklick-Modifikator",
+				"CLICK_MODIFIER_MIDDLE": "Mittlere Maustaste-Modifier",
+				"MOVE_MOUSE": "Maus bewegen (falls standardmäßig deaktiviert)",
+				"SCROLL": "Scrollen*"
+			},
+			"LEFT": "Links",
+			"RIGHT": "Rechts",
+			"COMPONENT": "Auslösetyp",
+			"SUBPATH": "Betätigungskontrolle",
+			"THRESHOLD": "Aktivieren, wenn oberer Wert überschritten\nDeaktivieren, wenn unterer Wert unterschritten"
+		},
+		"ENABLED": "Aktiviert",
+		"INPUT_EMULATION_METHOD": "Methode zur Eingabeemulation",
+		"INPUT_EMULATION_METHOD_HELP": "Versuchen Sie dies zu ändern, falls Maus- oder\nTastatureingaben nicht registriert werden.",
+		"INPUT_PROFILES": "Eingabesteuerungen ändern",
+		"INPUT_PROFILES_HELP": "OpenXR-Controller-Eingabebindungen",
+		"NOT_SUPPORTED": "Nicht unterstützt",
+		"ENABLE_WATCH": "Watch aktivieren",
+		"SPACE_DRAG": "Space-drag",
+		"SPACE_GRAVITY_DAMPING": "Dämpfung",
+		"SPACE_GRAVITY_DAMPING_HELP": "Künstlicher Widerstand, um die Bewegung zu verlangsamen. 0,1 - hoher Widerstand, 1,0 - kein Widerstand",
+		"SPACE_GRAVITY_FLING_STRENGTH": "Wurfstärke",
+		"SPACE_GRAVITY_FLING_STRENGTH_HELP": "Intensitätsmultiplikator der Schwerkraft-Abstoßungskraft nach dem Space-drag.\n0.0 - gar keine Bewegung, 2.0 - doppelte Intensität",
+		"SPACE_GRAVITY_GRAVITY": "Gravitation",
+		"SPACE_GRAVITY_GRAVITY_HELP": "Betrag der Abwärtskraft. 0.0 - keine Schwerkraft",
+		"SPACE_GRAVITY_GROUND_FRICTION": "Bodenreibung",
+		"SPACE_GRAVITY_GROUND_FRICTION_HELP": "Das Ausmaß der Reibung, das Sie verlangsamt, wenn Sie den Boden berühren.\n0.0 - keine Reibung (wie auf Eis), 1.0 - raue Oberfläche",
+		"SPACE_GRAVITY_FLOOR_HEIGHT": "Bodenhöhe",
+		"SPACE_GRAVITY_FLOOR_HEIGHT_HELP": "Die Y-Position, an der sich der Boden befindet. Die Schwerkraft wird gestoppt, wenn Sie diese Höhe erreichen.",
+		"SAVE": "Speichern",
+		"CANCEL": "Abbrechen",
+		"WHISPER": {
+			"NEED_TO_DOWNLOAD_MODEL": "Das ausgewählte Modell muss heruntergeladen werden.\nJetzt herunterladen?",
+			"REMOVE_UNUSED_MODELS": "Sie schalten die Sprache-zu-Text-Funktion aus.\nMöchten Sie die heruntergeladenen Whisper-Modelle entfernen, um Speicherplatz freizugeben?"
+		},
+		"WHISPER_MODEL": "Sprach-zu-Text-Modell",
+		"WHISPER_MODEL_HELP": "Zu verwendendes Whisper-Modell.\nGrößere Modelle liefern genauere\nErgebnisse, verbrauchen jedoch mehr VRAM.",
+		"DEFAULT_OVERLAY_SCALE": "Standardgröße des Overlays",
+		"DEFAULT_OVERLAY_SCALE_HELP": "Neue Overlays werden in dieser Skalierung erstellt.",
+		"COLOR_PALETTE": "Farbpalette",
+		"COLOR_PALETTES": "Farbpaletten",
+		"COLOR_PALETTE_CURRENT": "Derzeit aktives Thema.",
+		"COLOR_PALETTE_ACTIVATE": "Klicken Sie hier, um dieses Thema zu verwenden.",
+		"COLOR_PALETTE_HELP": "Klicken, um Farbpaletten zu durchsuchen.\nUm eigene zu erstellen, besuche die Webseite!",
+		"COLOR_PALETTE_CUSTOM_URL": "Füge dein eigenes benutzerdefiniertes Thema hinzu!",
+		"COLOR_PALETTE_CUSTOM_URL2": "Klicken Sie hier, um das Web-Handbuch zu öffnen.",
+		"SNAP_ANGLE_DEG": "Snap-Winkel für Fensterneigung und Rollwinkel",
+		"SNAP_ANGLE_DEG_HELP": "Gegriffene Fenster rasten in diesem Winkel auf der Nick- und Rollachse ein.",
+		"SAVE_PLAYSPACE_CENTER": "Playspace-Zentrum speichern",
+		"SAVE_PLAYSPACE_CENTER_HELP": "Nutzen Sie den aktuellen Playspace für die Zuweisung zum Zurücksetzen des Playspaces.",
+		"RESET_PLAYSPACE_CENTER": "Playspace-Zentrum zurücksetzen",
+		"RESET_PLAYSPACE_CENTER_HELP": "Zuvor festgelegtes Playspace-Zentrum zurücksetzen.",
+		"HANDSFREE_ALT_TAB": "App-Switcher-Ziel",
+		"HANDSFREE_ALT_TAB_HELP": "Super+X gedrückt halten, auf das gewünschte Fenster zielen und dann loslassen, um den Fokus zu wechseln.",
+		"INPUT_CAPTURE_METHOD": "Eingabe-Erfassungsmethode",
+		"POINTER_ACCELERATION": "Mausbeschleunigung",
+		"POINTER_ACCELERATION_HELP": "An: Adaptive Mausbeschleunigung\nAus: Konstante Geschwindigkeit",
+		"POINTER_SPEED": "Mausgeschwindigkeit",
+		"INPUT_CAPTURE_METHOD_HELP": "Ermöglicht die Nutzung physischer Peripheriegeräte innerhalb von WayVR.\n Super+Z: Eingabe zwischen WayVR und echtem Desktop umschalten\n Super+X: Zwischen WayVR-Apps umschalten",
+		"SPACE_DRAG_AFFECTS_WORLD": "Space-Drag bewegt Overlays"
+	},
+	"HELLO": "Hallo!",
+	"AUDIO": {
+		"VOLUME": "Lautstärke",
+		"SETTINGS": "Audioeinstellungen",
+		"AUTO_SWITCH_TO_VR_AUDIO": "Automatisch auf VR-Audio umschalten",
+		"SPEAKERS": "Lautsprecher",
+		"MICROPHONES": "Mikrofone",
+		"CARDS": "Sound-Karten",
+		"SELECT_AUDIO_CARD_PROFILE": "Wählen Sie das Sound-Kartenprofil",
+		"NO_VR_SPEAKERS_FOUND_SWITCH_MANUALLY": "Keine VR-Lautsprecher gefunden. Schalten Sie diese manuell um.",
+		"NO_VR_MICROPHONE_SWITCH_MANUALLY": "Kein VR-Mikrofon gefunden. Schalten Sie es manuell um.",
+		"FAILED_TO_SWITCH_MICROPHONE": "Fehler beim Wechseln des Mikrofons",
+		"MICROPHONE_SET_SUCCESSFULLY": "Mikrofon erfolgreich umgeschaltet",
+		"SPEAKERS_SET_SUCCESSFULLY": "Lautsprecher erfolgreich umgeschaltet"
+	},
+	"ACTIONS": {
+		"RECENTER_PLAYSPACE": "Playspace neu zentrieren"
+	},
+	"POPUP_ADD_DISPLAY": {
+		"RESOLUTION": "Auflösung"
+	},
+	"WIDTH": "Breite",
+	"HEIGHT": "Höhe",
+	"HIDE": "Verbergen",
+	"REMOVE": "Entfernen",
+	"SHOW": "Anzeigen",
+	"FAILED_TO_LAUNCH_APPLICATION": "Fehler beim Starten der Anwendung:",
+	"APPLICATION_STARTED": "Anwendung gestartet",
+	"CLOSE_WINDOW": "Fenster schließen",
+	"GAME_LIST": {
+		"NO_GAMES_FOUND": "Keine Spiele gefunden",
+		"RUNNING_GAMES_LIST": "Liste der laufenden Spiele"
+	},
+	"TERMINATE_PROCESS": "Prozess beenden",
+	"GAME_LAUNCHED": "Spiel gestartet",
+	"APP_LAUNCHER": {
+		"MODE": {
+			"NATIVE": "Nativer Modus",
+			"CAGE": "Kompatibilitätsmodus (Cage)"
+		},
+		"RES_TITLE": "Auflösung",
+		"ASPECT_TITLE": "Seitenverhältnis",
+		"ASPECT": {
+			"WIDE": "Breit",
+			"SEMI_WIDE": "Halb-breit",
+			"SQUARE": "Quadratisch",
+			"SEMI_TALL": "Halbhoch",
+			"TALL": "Hoch"
+		},
+		"POS_TITLE": "Positionierung",
+		"POS": {
+			"FLOATING": "Schwebend",
+			"ANCHORED": "Verankert",
+			"STATIC": "Statisch",
+			"FLOATING_HELP": "Bewegt sich unabhängig, zentriert sich bei Anzeige neu.",
+			"ANCHORED_HELP": "Bleibt relativ zur Mittelmarkierung an Ort und Stelle.",
+			"STATIC_HELP": "Keine Set zugeordnet. Wird nicht zentriert."
+		},
+		"AUTOSTART": "Automatisch beim Start ausführen",
+		"LAUNCH": "Starten"
+	},
+	"DISPLAY_BRIGHTNESS": "Bildschirmhelligkeit",
+	"PROCESS_LIST": "Prozessliste",
+	"REFRESH": "Aktualisieren",
+	"PROCESS": {
+		"STOP": "Stopp",
+		"FORCE_KILL": "Erzwinge Beenden"
+	},
+	"DEBUG_INFO": "Debug-Informationen",
+	"CREATION_DATE": "Erstellungsdatum",
+	"DOWNLOADER": "Downloader",
+	"DOWNLOAD_AGAIN": "Erneut herunterladen",
+	"DOWNLOADING_FILE": "Datei wird heruntergeladen...",
+	"GETTING_STARTED": "Erste Schritte",
+	"MODIFICATION_DATE": "Änderungsdatum",
+	"LOADING": "Laden...",
+	"APPLY": "Anwenden",
+	"RELOAD_FROM_DISK": "Von Festplatte neu laden",
+	"TARGET_PATH": "Zielpfad",
+	"VERSION": "Version",
+	"DONATE": {
+		"SUPPORT_US": "Unterstütze uns",
+		"DESCRIPTION": "Wir sind ein kleines Team aus zwei Entwicklern, die WayVR in ihrer Freizeit bauen. Wenn Ihnen die Nutzung dieser Software Spaß macht, unterstützen Sie uns bitte – jede Spende hilft uns, weiterzumachen.",
+		"BUTTON_TOOLTIP": "Spenden über Open Collective",
+		"CURRENT_SUPPORTERS": "Aktuelle Unterstützer",
+		"THANK_YOU_WAYVR": "Vielen Dank vom WayVR-Team!"
+	},
+	"WELCOME": {
+		"ALL_SET": "Du bist startklar!",
+		"BASICS": "Diese Grundlagen ermöglichen Ihnen einen einfachen Einstieg in die Nutzung von WayVR.",
+		"FEATURES_DOCUMENTATION": "Es gibt viele weitere Funktionen, die es wert sind, angepasst zu werden. Weitere Informationen finden Sie in der Dokumentation unter",
+		"FINISH_TUTORIAL": "Tutorial beenden",
+		"GRAB_BOTH_HANDS": "Greifen Sie es mit beiden Händen, wenn Sie ein bestimmtes Overlay in Ihrem Set bewegen möchten.",
+		"GRAB_ONE_HAND": "Greife es mit einer Hand, um dein Set zu bewegen.",
+		"GREETING": "Hallo!",
+		"GUIDE_INTRO": "Lassen Sie sich durch Ihre ersten Schritte führen.",
+		"LASER_COLORS": "Laserfarben",
+		"LASER_FUNCTIONALITY": "Ein Großteil der Funktionalität in WayVR hängt davon ab, welche Laserfarbe verwendet wird, um mit einem UI-Element zu interagieren. Sie müssen diese Schaltflächen nicht drücken, berühren Sie sie einfach!",
+		"LAST_PAGE_INFO": "Dieses Tutorial wird nicht mehr angezeigt, sobald du die letzte Seite erreicht hast.",
+		"LOOK_AT_LEFT_WRIST": "Schau auf dein linkes Handgelenk. Das ist deine Watch.",
+		"MIDDLE_CLICK_MODE_PURPLE_LASER": "— Mittlere Maustaste-Modus: Lila Laser",
+		"MOVING_YOUR_SET": "Ihr Set wird verschoben",
+		"NEXT_BUTTON": "Drücke die Schaltfläche „Weiter“ unten, um zu beginnen.",
+		"REGULAR_MODE_BLUE_LASER": "— Regulärer Modus: Blauer Laser",
+		"REPOSITION_THIS_WINDOW_BY_GRABBING": "Positionieren Sie dieses Fenster neu, indem Sie die Greifaktion Ihres Controllers verwenden.",
+		"RIGHT_CLICK_MODE_ORANGE_LASER": "— Rechtsklick-Modus: Oranger Laser",
+		"THANKS_FOR_INSTALLING": "Vielen Dank für die Installation von WayVR!",
+		"WATCH": "Watch",
+		"WORKING_SET": "Arbeits-Set",
+		"DOUBLE_PRESS_TO_TOGGLE": "Drücke B (beim Index) oder Y (beim Meta) doppelt, um dein Set anzuzeigen, neu zu zentrieren oder auszublenden. Probier es jetzt aus.",
+		"CENTER_MARKER": "Der Zentrierungsmarker ist das, was bei der Neuzentrierung vor dir erscheint. Platziere Overlays darum herum!"
+	},
+	"DOWNLOAD": "Herunterladen",
+	"SAVED_TO_FAVOURITES": "Zu Favoriten hinzugefügt",
+	"ADD_TO_FAVOURITES": "Zu Favoriten hinzufügen",
+	"ADD_TO_FAVOURITES_HINT": "Voreinstellung speichern und an den App-Drawer anheften",
+	"REMOVE_FROM_FAVOURITES": "Aus Favoriten entfernen",
+	"EMPTY": "Leer",
+	"PINNED_APPS": "Angepinnte Anwendungen"
+}
diff --git a/dash-frontend/assets/lang/en.json b/dash-frontend/assets/lang/en.json
index 96b56062..0629f776 100644
--- a/dash-frontend/assets/lang/en.json
+++ b/dash-frontend/assets/lang/en.json
@@ -38,8 +38,71 @@
 		"BLOCK_GAME_INPUT_IGNORE_WATCH_HELP": "Do not block input when watch is hovered",
 		"BLOCK_POSES_ON_KBD_INTERACTION": "Block poses when interacting with keyboard",
 		"BLOCK_POSES_ON_KBD_INTERACTION_HELP": "Blocks the game from receiving poses when the keyboard is hovered and 'Block game input' is enabled",
+		"BINDINGS": {
+			"COMP": {
+				"CLICK": "Click",
+				"FORCE": "Force",
+				"TOUCH": "Touch",
+				"VALUE": "Value",
+				"PROXIMITY": "Proximity",
+				"X_AXIS": "X axis",
+				"Y_AXIS": "Y axis"
+			},
+			"TYPE": {
+				"BUMPER": "Bumper",
+				"DPAD_UP": "D-pad Up",
+				"DPAD_DOWN": "D-pad Down",
+				"DPAD_LEFT": "D-pad Left",
+				"DPAD_RIGHT": "D-pad Right",
+				"JOYSTICK": "Joystick",
+				"MENU": "Menu",
+				"SHOULDER": "Shoulder",
+				"SQUEEZE": "Grip",
+				"SYSTEM": "System",
+				"THUMBREST": "Thumbrest",
+				"THUMBSTICK": "Thumbstick",
+				"TRACKPAD": "Trackpad",
+				"TRIGGER": "Trigger",
+				"VIEW": "View"
+			},
+			"CLICK": {
+				"ANY": "Any",
+				"DOUBLE": "Double-tap",
+				"TRIPLE": "Triple-tap",
+				"TYPE": "Tap count"
+			},
+			"ACTION": {
+				"CLICK": "Click*",
+				"GRAB": "Grab*",
+				"ALT_CLICK": "Custom shell exec (set alt_click in config)",
+				"SHOW_HIDE": "Show, hide, recenter*",
+				"TOGGLE_DASHBOARD": "Toggle dashboard",
+				"SPACE_DRAG": "Playspace drag",
+				"SPACE_ROTATE": "Playspace rotate",
+				"SPACE_RESET": "Playspace reset",
+				"CLICK_MODIFIER_RIGHT": "Right-click modifier",
+				"CLICK_MODIFIER_MIDDLE": "Middle-click modifier",
+				"MOVE_MOUSE": "Move mouse (if off by default)",
+				"SCROLL": "Scroll*"
+			},
+			"LEFT": "Left",
+			"RIGHT": "Right",
+			"COMPONENT": "Actuation type",
+			"SUBPATH": "Actuating control",
+			"THRESHOLD": "Activate when above upper value\nDeactivate when below lower value"
+		},
+		"BROWSE_ONLINE_CATALOG": "Browse online catalog...",
+		"BROWSE_SKYMAPS": "Browse skymaps",
 		"CAPTURE_METHOD": "Wayland screen capture",
 		"CAPTURE_METHOD_HELP": "Try changing this if you are\nexperiencing black or glitchy screens",
+		"COLOR_KEYING": "Color keying",
+		"COLOR_PALETTE": "Color palette",
+		"COLOR_PALETTE_HELP": "Click to browse color palettes.\nTo create custom ones, see website!",
+		"COLOR_PALETTES": "Color palettes",
+		"COLOR_PALETTE_CURRENT": "Currently active theme.",
+		"COLOR_PALETTE_CUSTOM_URL": "Add your own custom theme!",
+		"COLOR_PALETTE_CUSTOM_URL2": "Click to open web manual.",
+		"COLOR_PALETTE_ACTIVATE": "Click to use this theme.",
 		"CLEAR_PIPEWIRE_TOKENS": "Clear PipeWire tokens",
 		"CLEAR_PIPEWIRE_TOKENS_HELP": "Prompt for screen selection on next start",
 		"CLEAR_SAVED_STATE": "Clear saved state",
@@ -52,12 +115,23 @@
 		"DELETE_ALL_CONFIGS_HELP": "Remove all configuration files from conf.d",
 		"DOUBLE_CURSOR_FIX": "Double cursor fix",
 		"DOUBLE_CURSOR_FIX_HELP": "Enable this if you see 2 cursors",
+		"DEFAULT_OVERLAY_SCALE": "Default overlay size",
+		"DEFAULT_OVERLAY_SCALE_HELP": "Spawn new overlays at this scale.",
+		"ENABLED": "Enabled",
 		"FEATURES": "Features",
 		"FOCUS_FOLLOWS_MOUSE_MODE": "Mouse move on trigger touch",
 		"HANDSFREE_POINTER": "Handsfree mode",
 		"HANDSFREE_POINTER_HELP": "Input to use when motion\ncontrollers are unavailable.\nLeft pinch is grab, right is click.",
+		"HANDSFREE_ALT_TAB": "App switcher aim",
+		"HANDSFREE_ALT_TAB_HELP": "Hold Super+X, aim at the desired window, then release to switch focus.",
 		"HIDE_GRAB_HELP": "Hide grab help",
 		"HIDE_USERNAME": "Hide username",
+		"INPUT_EMULATION_METHOD": "Input emulation method",
+		"INPUT_EMULATION_METHOD_HELP": "Try change this in case mouse or\nkeyboard input does not register.",
+		"INPUT_CAPTURE_METHOD": "Input capture method",
+		"INPUT_CAPTURE_METHOD_HELP": "Allows using physical peripherial inside WayVR.\n Super+Z: Switch input between WayVR and real desktop\n Super+X: Switch between WayVR apps",
+		"INPUT_PROFILES": "Change Input Bindings",
+		"INPUT_PROFILES_HELP": "OpenXR controller input bindings",
 		"INVERT_SCROLL_DIRECTION_X": "Invert horizontal scroll direction",
 		"INVERT_SCROLL_DIRECTION_Y": "Invert vertical scroll direction",
 		"KEYBOARD_MIDDLE_CLICK": "Keyboard middle click",
@@ -73,33 +147,68 @@
 		"MISC": "Miscellaneous",
 		"NOTIFICATIONS_ENABLED": "Enable notifications",
 		"NOTIFICATIONS_SOUND_ENABLED": "Notification sounds",
+		"NOT_SUPPORTED": "Not supported",
+		"NO_SKYMAPS_FOUND": "No skymaps found",
 		"OPAQUE_BACKGROUND": "Opaque background",
 		"OPTION": {
 			"AUTO": "Automatic",
 			"AUTO_HELP": "ScreenCopy GPU if supported,\notherwise PipeWire GPU.",
-			"EYE_ONLY": "Eye only",
+			"EYE_ONLY": "Eye laser",
 			"EYE_PINCH": "Eye + pinch",
-			"HMD_ONLY": "HMD only",
+			"HMD_ONLY": "HMD laser",
 			"HMD_PINCH": "HMD + pinch",
 			"NONE": "None",
+			"NONE_INPUT_HELP": "Do not emulate mouse and keyboard.\nWill not be able to interact with screens.",
+			"NONE_INPUT_CAPTURE_HELP": "Do not capture mouse and keyboard.\nWill not be able to use physical mouse or\nkeyboard in apps launched inside WayVR.",
 			"PIPEWIRE_HELP": "Fast GPU capture,\nstandard on all desktops.",
 			"PW_FALLBACK_HELP": "Slow method with high CPU usage.\nTry in case PipeWire GPU doesn't work",
 			"SCREENCOPY_GPU_HELP": "Fast, no screen share popups.\nWorks on: Hyprland, Niri, River, Sway",
-			"SCREENCOPY_HELP": "Slow, no screen share popups.\nWorks on: Hyprland, Niri, River, Sway"
+			"SCREENCOPY_HELP": "Slow, no screen share popups.\nWorks on: Hyprland, Niri, River, Sway",
+			"UINPUT": "Device emulation",
+			"UINPUT_HELP": "Uses the uinput module to emulate a device.\nKnown to work well on most desktops.",
+			"EVDEV_HELP": "Grab input devices for exclusive use.\nYour user must be in the input group.",
+			"WL_VIRTUAL": "Wayland virtual input",
+			"WL_VIRTUAL_HELP": "Send events to the Wayland compositor using\nzwlr_virtual_pointer and zwp_virtual_keyboard.\nOnly works reliably on some desktops.\nDoes NOT work on KDE, GNOME or COSMIC."
 		},
+		"POINTER_ACCELERATION": "Mouse acceleration",
+		"POINTER_ACCELERATION_HELP": "On: Adaptive mouse acceleration\nOff: Constant speed",
 		"POINTER_LERP_FACTOR": "Pointer smoothing",
+		"POINTER_SPEED": "Mouse speed",
 		"REQUIRES_RESTART": "Requires restart",
 		"RESET_PLAYSPACE": "Reset playspace",
 		"RESET_PLAYSPACE_HELP": "Clear the stage space offset.",
+		"SAVE_PLAYSPACE_CENTER": "Save playspace center",
+		"SAVE_PLAYSPACE_CENTER_HELP": "Use current playspace for reset playspace binding.",
+		"RESET_PLAYSPACE_CENTER": "Reset playspace center",
+		"RESET_PLAYSPACE_CENTER_HELP": "Clear previously set playspace center.",
 		"RESTART_SOFTWARE": "Restart software",
 		"RESTART_SOFTWARE_HELP": "Apply settings that require a restart",
 		"ROUND_MULTIPLIER": "UI Edge roundness",
 		"SCREEN_RENDER_DOWN": "Render screen at lower resolution",
 		"SCREEN_RENDER_DOWN_HELP": "Helps with aliasing on high-res screens",
 		"SCROLL_SPEED": "Scroll speed",
+		"SELECT_VARIANT": "Select variant",
+		"SNAP_ANGLE_DEG": "Window pitch & roll snap angle",
+		"SNAP_ANGLE_DEG_HELP": "Grabbed windows snap to this angle on pitch and roll axis.",
+		"ENABLE_WATCH": "Enable watch",
 		"SETS_ON_WATCH": "Sets on watch",
+		"SHOW_WELCOME_SCREEN": "Show welcome screen",
+		"SKYBOX": "Skybox",
+		"SKYMAP_ALREADY_DOWNLOADED": "This skymap is already downloaded. Select desired action.",
+		"SPACE_DRAG": "Space drag",
 		"SPACE_DRAG_MULTIPLIER": "Space drag multiplier",
+		"SPACE_DRAG_AFFECTS_WORLD": "Space drag moves overlays",
 		"SPACE_DRAG_UNLOCKED": "Allow space drag on all axes",
+		"SPACE_GRAVITY_DAMPING": "Damping",
+		"SPACE_GRAVITY_DAMPING_HELP": "Artificial drag to slow down movement. 0.1 - high drag, 1.0 - no drag",
+		"SPACE_GRAVITY_FLING_STRENGTH": "Fling strength",
+		"SPACE_GRAVITY_FLING_STRENGTH_HELP": "Intensity multiplier of gravitational launch force after space-drag.\n0.0 - no movement at all, 2.0 - double intensity",
+		"SPACE_GRAVITY_GRAVITY": "Gravity",
+		"SPACE_GRAVITY_GRAVITY_HELP": "Amount of downwards force. 0.0 - no gravity",
+		"SPACE_GRAVITY_GROUND_FRICTION": "Ground friction",
+		"SPACE_GRAVITY_GROUND_FRICTION_HELP": "Amount of friction slowing you down if you're touching the ground.\n0.0 - no friction (just like on ice), 1.0 - rough surface",
+		"SPACE_GRAVITY_FLOOR_HEIGHT": "Floor height",
+		"SPACE_GRAVITY_FLOOR_HEIGHT_HELP": "The Y position where the floor is. Gravity stops when you reach this height.",
 		"SPACE_ROTATE_UNLOCKED": "Allow space rotate on all axes",
 		"TROUBLESHOOTING": "Troubleshooting",
 		"UI_GRADIENT_INTENSITY": "UI Gradient intensity",
@@ -109,13 +218,19 @@
 		"USE_PASSTHROUGH_HELP": "Allow passthrough if the XR runtime supports it",
 		"USE_SKYBOX": "Enable skybox",
 		"USE_SKYBOX_HELP": "Show a skybox if there's no scene app or passthrough",
+		"WATCH_VIEW_ANGLE": "Watch view angles",
+		"WATCH_VIEW_ANGLE_HELP": "Control how the watch fades away",
+		"WHISPER": {
+			"NEED_TO_DOWNLOAD_MODEL": "The selected model needs to be downloaded.\nDownload it right now?",
+			"REMOVE_UNUSED_MODELS": "You are turning off the speech-to-text feature.\nWould you like to remove downloaded Whisper models to free up space?"
+		},
+		"WHISPER_MODEL": "Speech-to-text model",
+		"WHISPER_MODEL_HELP": "Whisper model to use.\nLarger models produce more accurate\nresults, but consume more VRAM.",
 		"GRID_OPACITY": "Floor grid opacity",
 		"GRID_OPACITY_HELP": "Opacity of the floor grid when the skybox is enabled",
-		"XR_CLICK_SENSITIVITY": "XR click sensitivity",
-		"XR_CLICK_SENSITIVITY_HELP": "Analog trigger sensitivity",
-		"XR_CLICK_SENSITIVITY_RELEASE": "XR release sensitivity",
-		"XR_CLICK_SENSITIVITY_RELEASE_HELP": "Must be lower than click",
-		"XWAYLAND_BY_DEFAULT": "Run apps in Compatibility mode by default"
+		"XWAYLAND_BY_DEFAULT": "Run apps in Compatibility mode by default",
+		"SAVE": "Save",
+		"CANCEL": "Cancel"
 	},
 	"APPLICATION_LAUNCHER": "Application launcher",
 	"APPLICATION_STARTED": "Application started",
@@ -135,8 +250,45 @@
 		"VOLUME": "Volume"
 	},
 	"CLOSE_WINDOW": "Close window",
+	"CREATION_DATE": "Creation date",
 	"DEBUG_INFO": "Debug info",
 	"DISPLAY_BRIGHTNESS": "Display brightness",
+	"DONATE": {
+		"SUPPORT_US": "Support us",
+		"DESCRIPTION": "We're a small team of 2 developers building WayVR in our free time. If you enjoy using this software, please consider supporting us - every donation helps us keep going.",
+		"THANK_YOU_WAYVR": "Thank you from the WayVR Team!",
+		"BUTTON_TOOLTIP": "Donate via Open Collective",
+		"CURRENT_SUPPORTERS": "Current Supporters"
+	},
+	"DOWNLOAD": "Download",
+	"DOWNLOADER": "Downloader",
+	"WELCOME": {
+		"ALL_SET": "You're all set!",
+		"BASICS": "These basics will allow you to start using WayVR with ease.",
+		"CENTER_MARKER": "Center marker is what will appear in front of you when recentering. Place overlays around it!",
+		"DOUBLE_PRESS_TO_TOGGLE": "Double-press B (on Index) or Y (on Meta) to show, recenter or hide your set. Try it now.",
+		"FEATURES_DOCUMENTATION": "There are many other features worth customizing. For more information, check the documentation at",
+		"FINISH_TUTORIAL": "Finish tutorial",
+		"GRAB_BOTH_HANDS": "Grab it with both hands if you want to move a specific overlay in your set.",
+		"GRAB_ONE_HAND": "Grab it with one hand to move your set.",
+		"GREETING": "Hi there!",
+		"GUIDE_INTRO": "Let us guide you through your first steps.",
+		"LASER_COLORS": "Laser Colors",
+		"LASER_FUNCTIONALITY": "Much of the functionality in WayVR depends on what color of laser is used to interact with a UI element. You don't need to press these buttons, just touch them!",
+		"LAST_PAGE_INFO": "This tutorial will stop showing up once you get to the last page.",
+		"LOOK_AT_LEFT_WRIST": "Look at your left wrist. That's your watch.",
+		"MIDDLE_CLICK_MODE_PURPLE_LASER": "— Middle-click Mode: Purple laser",
+		"MOVING_YOUR_SET": "Moving your set",
+		"NEXT_BUTTON": "Press \"Next\" button below to get started.",
+		"REGULAR_MODE_BLUE_LASER": "— Regular Mode: Blue laser",
+		"REPOSITION_THIS_WINDOW_BY_GRABBING": "Reposition this window using your controller's grip action.",
+		"RIGHT_CLICK_MODE_ORANGE_LASER": "— Right-click Mode: Orange laser",
+		"THANKS_FOR_INSTALLING": "Thank you for installing WayVR!",
+		"WATCH": "Watch",
+		"WORKING_SET": "Working Set"
+	},
+	"DOWNLOAD_AGAIN": "Download again",
+	"DOWNLOADING_FILE": "Downloading file...",
 	"FAILED_TO_LAUNCH_APPLICATION": "Failed to launch a application:",
 	"GAME_LAUNCHED": "Game launched",
 	"GAME_LIST": {
@@ -145,12 +297,15 @@
 	},
 	"GAMES": "Games",
 	"GENERAL_SETTINGS": "General settings",
+	"GETTING_STARTED": "Getting started",
 	"HEIGHT": "Height",
 	"HELLO": "Hello!",
 	"HELLO_USER": "Hello, {USER}!",
 	"HIDE": "Hide",
 	"HOME_SCREEN": "Home",
+	"MODIFICATION_DATE": "Modification date",
 	"MONADO_RUNTIME": "Monado runtime",
+	"LOADING": "Loading...",
 	"POPUP_ADD_DISPLAY": {
 		"RESOLUTION": "Resolution"
 	},
@@ -161,8 +316,18 @@
 	"PROCESS_LIST": "Process list",
 	"REFRESH": "Refresh",
 	"REMOVE": "Remove",
+	"APPLY": "Apply",
+	"RELOAD_FROM_DISK": "Reload from disk",
 	"SETTINGS": "Settings",
 	"SHOW": "Show",
+	"TARGET_PATH": "Target path",
 	"TERMINATE_PROCESS": "Terminate process",
-	"WIDTH": "Width"
+	"VERSION": "Version",
+	"WIDTH": "Width",
+	"SAVED_TO_FAVOURITES": "Saved to favourites",
+	"ADD_TO_FAVOURITES": "Add to favourites",
+	"ADD_TO_FAVOURITES_HINT": "Save preset and pin it to the app drawer",
+	"REMOVE_FROM_FAVOURITES": "Remove from favourites",
+	"EMPTY": "Empty",
+	"PINNED_APPS": "Pinned applications"
 }
diff --git a/dash-frontend/assets/lang/es.json b/dash-frontend/assets/lang/es.json
index b9dac274..883a4602 100644
--- a/dash-frontend/assets/lang/es.json
+++ b/dash-frontend/assets/lang/es.json
@@ -1,166 +1,331 @@
 {
-  "HOME_SCREEN": "Inicio",
-  "MONADO_RUNTIME": "Monado tiempo de ejecución",
-  "APPLICATIONS": "Aplicaciones",
-  "GAMES": "Juegos",
-  "SETTINGS": "Ajustes",
-  "HELLO_USER": "¡Hola, {USER}!",
-  "GENERAL_SETTINGS": "Ajustes generales",
-  "APPLICATION_LAUNCHER": "Lanzador de aplicaciones",
-  "APP_SETTINGS": {
-    "HIDE_USERNAME": "Ocultar nombre de usuario",
-    "OPAQUE_BACKGROUND": "Fondo opaco",
-    "LOOK_AND_FEEL": "Apariencia y estilo",
-    "HIDE_GRAB_HELP": "Ocultar ayuda para agarrar",
-    "ANIMATION_SPEED": "Velocidad de animación de la IU",
-    "ROUND_MULTIPLIER": "Redondeo de bordes de la IU",
-    "USE_SKYBOX": "Activar skybox",
-    "USE_PASSTHROUGH": "Activar passthrough",
-    "CLOCK_12H": "Reloj de 12 horas",
-    "FEATURES": "Funciones",
-    "NOTIFICATIONS_ENABLED": "Habilitar notificaciones",
-    "NOTIFICATIONS_SOUND_ENABLED": "Sonidos de notificación",
-    "KEYBOARD_SOUND_ENABLED": "Sonidos del teclado",
-    "SPACE_DRAG_MULTIPLIER": "Multiplicador de arrastre espacial",
-    "SPACE_DRAG_UNLOCKED": "Permitir arrastre del espacio en todos los ejes",
-    "SPACE_ROTATE_UNLOCKED": "Permitir rotación espacial en todos los ejes",
-    "BLOCK_GAME_INPUT": "Bloquear entrada del juego",
-    "BLOCK_GAME_INPUT_IGNORE_WATCH": "Ignorar watch al bloquear la entrada",
-    "CONTROLS": "Controles",
-    "FOCUS_FOLLOWS_MOUSE_MODE": "El movimiento del ratón en el disparador",
-    "LEFT_HANDED_MOUSE": "Ratón para zurdos",
-    "ALLOW_SLIDING": "Interacción con el stick durante el agarre",
-    "INVERT_SCROLL_DIRECTION_X": "Invertir dirección de desplazamiento horizontal",
-    "INVERT_SCROLL_DIRECTION_Y": "Invertir la dirección del desplazamiento vertical",
-    "SCROLL_SPEED": "Velocidad de desplazamiento",
-    "LONG_PRESS_DURATION": "Duración de la pulsación larga",
-    "POINTER_LERP_FACTOR": "Suavizado del puntero",
-    "XR_CLICK_SENSITIVITY": "Sensibilidad del clic XR",
-    "XR_CLICK_SENSITIVITY_RELEASE": "Sensibilidad de liberación de OpenXR",
-    "CLICK_FREEZE_TIME_MS": "Tiempo de congelación al hacer clic (ms)",
-    "MISC": "Miscelánea",
-    "XWAYLAND_BY_DEFAULT": "Ejecutar aplicaciones en modo de compatibilidad por defecto",
-    "UPRIGHT_SCREEN_FIX": "Corrección de pantalla vertical",
-    "DOUBLE_CURSOR_FIX": "Solución de doble cursor",
-    "SCREEN_RENDER_DOWN": "Renderizar pantalla a menor resolución",
-    "UPRIGHT_SCREEN_FIX_HELP": "Corrige pantallas en posición vertical en algunos escritorios",
-    "DOUBLE_CURSOR_FIX_HELP": "Habilita esto si ves 2 cursores",
-    "XR_CLICK_SENSITIVITY_HELP": "Sensibilidad del gatillo analógico",
-    "XR_CLICK_SENSITIVITY_RELEASE_HELP": "Debe ser inferior a 'click'",
-    "CLICK_FREEZE_TIME_MS_HELP": "Ayuda con la precisión de los dobles clics",
-    "LEFT_HANDED_MOUSE_HELP": "Utilice esto si los botones del ratón están intercambiados",
-    "BLOCK_GAME_INPUT_HELP": "Bloquea toda la entrada cuando se pasa el cursor sobre un overlay",
-    "BLOCK_GAME_INPUT_IGNORE_WATCH_HELP": "No bloquear la entrada cuando el cursor está sobre la ventana",
-    "USE_SKYBOX_HELP": "Mostrar una skybox si no hay una aplicación de escena o passthrough",
-    "USE_PASSTHROUGH_HELP": "Permitir passthrough si el entorno de ejecución XR lo admite",
-    "SCREEN_RENDER_DOWN_HELP": "Ayuda a reducir el aliasing en pantallas de alta resolución",
-    "SETS_ON_WATCH": "Conjuntos en el reloj",
-    "TROUBLESHOOTING": "Solución de problemas",
-    "CLEAR_SAVED_STATE": "Borrar estado guardado",
-    "CLEAR_PIPEWIRE_TOKENS": "Limpiar tokens de PipeWire",
-    "DELETE_ALL_CONFIGS": "Borrar configuración",
-    "RESTART_SOFTWARE": "Reiniciar software",
-    "CLEAR_SAVED_STATE_HELP": "Restablecer sets y posiciones de superposición",
-    "CLEAR_PIPEWIRE_TOKENS_HELP": "Solicitar la selección de pantalla al iniciar la próxima vez",
-    "DELETE_ALL_CONFIGS_HELP": "Eliminar todos los archivos de configuración de conf.d",
-    "RESTART_SOFTWARE_HELP": "Aplicar la configuración que requiere un reinicio",
-    "CAPTURE_METHOD": "Captura de pantalla de Wayland",
-    "CAPTURE_METHOD_HELP": "Intente cambiar esta opción si\nexperimenta pantallas negras o con fallos",
-    "KEYBOARD_MIDDLE_CLICK": "Clic del botón central del teclado",
-    "KEYBOARD_MIDDLE_CLICK_HELP": "Modificador para usar al escribir\ncon láser púrpura",
-    "OPTION": {
-      "AUTO": "Automático",
-      "AUTO_HELP": "Copiar pantalla usando la GPU si es compatible,\nde lo contrario, GPU de PipeWire.",
-      "PIPEWIRE_HELP": "Captura de GPU rápida,\nestándar en todos los escritorios.",
-      "PW_FALLBACK_HELP": "Método lento con alto uso de CPU.\nPruébalo si PipeWire GPU no funciona",
-      "SCREENCOPY_GPU_HELP": "Rápido, sin ventanas emergentes de uso compartido de pantalla.\nFunciona en: Hyprland, Niri, River, Sway",
-      "SCREENCOPY_HELP": "Lento, sin ventanas emergentes de uso compartido de pantalla.\nFunciona en: Hyprland, Niri, River, Sway",
-      "NONE": "Ninguno",
-      "HMD_PINCH": "HMD + pellizco",
-      "EYE_PINCH": "Ojo + pellizco",
-      "EYE_ONLY": "Solo ojo",
-      "HMD_ONLY": "Solo HMD"
-    },
-    "AUTOSTART_APPS": "Aplicaciones a ejecutar al inicio",
-    "HANDSFREE_POINTER": "Modo manos libres",
-    "HANDSFREE_POINTER_HELP": "Entrada a utilizar cuando no\nestén disponibles los mandos de movimiento.\nPellizco con la izquierda para agarrar, con la derecha para hacer clic.",
-    "UI_GRADIENT_INTENSITY": "Intensidad del degradado de la IU",
-    "RESET_PLAYSPACE": "Restablecer espacio de juego",
-    "RESET_PLAYSPACE_HELP": "Borrar el desplazamiento del espacio de juego.",
-    "BLOCK_POSES_ON_KBD_INTERACTION": "Bloquear poses al interactuar con el teclado",
-    "BLOCK_POSES_ON_KBD_INTERACTION_HELP": "Bloquea que el juego reciba poses cuando el teclado está sobre él y 'Bloquear entrada del juego' está habilitado",
-    "LANGUAGE": "Idioma",
-    "REQUIRES_RESTART": "Requiere reinicio",
-    "GRID_OPACITY": "Opacidad de la cuadrícula del suelo",
-    "GRID_OPACITY_HELP": "Opacidad de la cuadrícula del suelo cuando el skybox está habilitado"
-  },
-  "HELLO": "¡Hola!",
-  "AUDIO": {
-    "VOLUME": "Volumen",
-    "SETTINGS": "Configuración de audio",
-    "AUTO_SWITCH_TO_VR_AUDIO": "Conmutar automáticamente al audio VR",
-    "SPEAKERS": "Altavoces",
-    "MICROPHONES": "Micrófonos",
-    "CARDS": "Tarjetas",
-    "SELECT_AUDIO_CARD_PROFILE": "Seleccionar perfil de tarjeta de audio",
-    "NO_VR_SPEAKERS_FOUND_SWITCH_MANUALLY": "No se encontraron altavoces VR. Actívelos manualmente.",
-    "NO_VR_MICROPHONE_SWITCH_MANUALLY": "No se encontró micrófono VR. Actívelo manualmente.",
-    "FAILED_TO_SWITCH_MICROPHONE": "No se pudo cambiar el micrófono",
-    "MICROPHONE_SET_SUCCESSFULLY": "Micrófono configurado correctamente",
-    "SPEAKERS_SET_SUCCESSFULLY": "Altavoces configurados correctamente"
-  },
-  "ACTIONS": {
-    "RECENTER_PLAYSPACE": "Re-centrar espacio de juego"
-  },
-  "POPUP_ADD_DISPLAY": {
-    "RESOLUTION": "Resolución"
-  },
-  "WIDTH": "Ancho",
-  "HEIGHT": "Altura",
-  "HIDE": "Ocultar",
-  "REMOVE": "Eliminar",
-  "SHOW": "Mostrar",
-  "FAILED_TO_LAUNCH_APPLICATION": "No se pudo iniciar la aplicación:",
-  "APPLICATION_STARTED": "Aplicación iniciada",
-  "CLOSE_WINDOW": "Cerrar ventana",
-  "GAME_LIST": {
-    "NO_GAMES_FOUND": "No se encontraron juegos",
-    "RUNNING_GAMES_LIST": "Lista de juegos en ejecución"
-  },
-  "TERMINATE_PROCESS": "Finalizar proceso",
-  "GAME_LAUNCHED": "Juego lanzado",
-  "APP_LAUNCHER": {
-    "MODE": {
-      "NATIVE": "Modo nativo",
-      "CAGE": "Modo de compatibilidad (Cage)"
-    },
-    "RES_TITLE": "Resolución",
-    "ASPECT_TITLE": "Aspecto",
-    "ASPECT": {
-      "WIDE": "Ancho",
-      "SEMI_WIDE": "Semi-ancho",
-      "SQUARE": "Cuadrado",
-      "SEMI_TALL": "Semi alto",
-      "TALL": "Alto"
-    },
-    "POS_TITLE": "Posicionamiento",
-    "POS": {
-      "FLOATING": "Flotante",
-      "ANCHORED": "Anclado",
-      "STATIC": "Estático",
-      "FLOATING_HELP": "Se mueve independientemente, se recentra al mostrarse.",
-      "ANCHORED_HELP": "Se mantiene en su lugar con respecto al marcador central.",
-      "STATIC_HELP": "No pertenece a ningún conjunto. No se recentra."
-    },
-    "AUTOSTART": "Ejecutar automáticamente al inicio",
-    "LAUNCH": "Iniciar"
-  },
-  "DISPLAY_BRIGHTNESS": "Brillo de la pantalla",
-  "PROCESS_LIST": "Lista de procesos",
-  "REFRESH": "Actualizar",
-  "PROCESS": {
-    "STOP": "Detener",
-    "FORCE_KILL": "Forzar cierre"
-  },
-  "DEBUG_INFO": "Información de depuración"
-}
\ No newline at end of file
+	"HOME_SCREEN": "Inicio",
+	"MONADO_RUNTIME": "Monado tiempo de ejecución",
+	"APPLICATIONS": "Aplicaciones",
+	"GAMES": "Juegos",
+	"SETTINGS": "Ajustes",
+	"HELLO_USER": "¡Hola, {USER}!",
+	"GENERAL_SETTINGS": "Ajustes generales",
+	"APPLICATION_LAUNCHER": "Lanzador de aplicaciones",
+	"APP_SETTINGS": {
+		"HIDE_USERNAME": "Ocultar nombre de usuario",
+		"OPAQUE_BACKGROUND": "Fondo opaco",
+		"LOOK_AND_FEEL": "Apariencia y estilo",
+		"HIDE_GRAB_HELP": "Ocultar ayuda para agarrar",
+		"ANIMATION_SPEED": "Velocidad de animación de la IU",
+		"ROUND_MULTIPLIER": "Redondeo de bordes de la IU",
+		"USE_SKYBOX": "Activar skybox",
+		"USE_PASSTHROUGH": "Activar passthrough",
+		"CLOCK_12H": "Reloj de 12 horas",
+		"FEATURES": "Funciones",
+		"NOTIFICATIONS_ENABLED": "Habilitar notificaciones",
+		"NOTIFICATIONS_SOUND_ENABLED": "Sonidos de notificación",
+		"KEYBOARD_SOUND_ENABLED": "Sonidos del teclado",
+		"SPACE_DRAG_MULTIPLIER": "Multiplicador de arrastre espacial",
+		"SPACE_DRAG_UNLOCKED": "Permitir arrastre del espacio en todos los ejes",
+		"SPACE_ROTATE_UNLOCKED": "Permitir rotación espacial en todos los ejes",
+		"BLOCK_GAME_INPUT": "Bloquear entrada del juego",
+		"BLOCK_GAME_INPUT_IGNORE_WATCH": "Ignorar watch al bloquear la entrada",
+		"CONTROLS": "Controles",
+		"FOCUS_FOLLOWS_MOUSE_MODE": "El movimiento del ratón en el disparador",
+		"LEFT_HANDED_MOUSE": "Ratón para zurdos",
+		"ALLOW_SLIDING": "Interacción con el stick durante el agarre",
+		"INVERT_SCROLL_DIRECTION_X": "Invertir dirección de desplazamiento horizontal",
+		"INVERT_SCROLL_DIRECTION_Y": "Invertir la dirección del desplazamiento vertical",
+		"SCROLL_SPEED": "Velocidad de desplazamiento",
+		"LONG_PRESS_DURATION": "Duración de la pulsación larga",
+		"POINTER_LERP_FACTOR": "Suavizado del puntero",
+		"CLICK_FREEZE_TIME_MS": "Tiempo de congelación al hacer clic (ms)",
+		"MISC": "Miscelánea",
+		"XWAYLAND_BY_DEFAULT": "Ejecutar aplicaciones en modo de compatibilidad por defecto",
+		"UPRIGHT_SCREEN_FIX": "Corrección de pantalla vertical",
+		"DOUBLE_CURSOR_FIX": "Solución de doble cursor",
+		"SCREEN_RENDER_DOWN": "Renderizar pantalla a menor resolución",
+		"UPRIGHT_SCREEN_FIX_HELP": "Corrige pantallas en posición vertical en algunos escritorios",
+		"DOUBLE_CURSOR_FIX_HELP": "Habilita esto si ves 2 cursores",
+		"CLICK_FREEZE_TIME_MS_HELP": "Ayuda con la precisión de los dobles clics",
+		"LEFT_HANDED_MOUSE_HELP": "Utilice esto si los botones del ratón están intercambiados",
+		"BLOCK_GAME_INPUT_HELP": "Bloquea toda la entrada cuando se pasa el cursor sobre un overlay",
+		"BLOCK_GAME_INPUT_IGNORE_WATCH_HELP": "No bloquear la entrada cuando el cursor está sobre la ventana",
+		"USE_SKYBOX_HELP": "Mostrar una skybox si no hay una aplicación de escena o passthrough",
+		"USE_PASSTHROUGH_HELP": "Permitir passthrough si el entorno de ejecución XR lo admite",
+		"SCREEN_RENDER_DOWN_HELP": "Ayuda a reducir el aliasing en pantallas de alta resolución",
+		"SETS_ON_WATCH": "Conjuntos en el reloj",
+		"TROUBLESHOOTING": "Solución de problemas",
+		"CLEAR_SAVED_STATE": "Borrar estado guardado",
+		"CLEAR_PIPEWIRE_TOKENS": "Limpiar tokens de PipeWire",
+		"DELETE_ALL_CONFIGS": "Borrar configuración",
+		"RESTART_SOFTWARE": "Reiniciar software",
+		"CLEAR_SAVED_STATE_HELP": "Restablecer sets y posiciones de superposición",
+		"CLEAR_PIPEWIRE_TOKENS_HELP": "Solicitar la selección de pantalla al iniciar la próxima vez",
+		"DELETE_ALL_CONFIGS_HELP": "Eliminar todos los archivos de configuración de conf.d",
+		"RESTART_SOFTWARE_HELP": "Aplicar la configuración que requiere un reinicio",
+		"CAPTURE_METHOD": "Captura de pantalla de Wayland",
+		"CAPTURE_METHOD_HELP": "Intente cambiar esta opción si\nexperimenta pantallas negras o con fallos",
+		"KEYBOARD_MIDDLE_CLICK": "Clic del botón central del teclado",
+		"KEYBOARD_MIDDLE_CLICK_HELP": "Modificador para usar al escribir\ncon láser púrpura",
+		"OPTION": {
+			"AUTO": "Automático",
+			"AUTO_HELP": "Copiar pantalla usando la GPU si es compatible,\nde lo contrario, GPU de PipeWire.",
+			"PIPEWIRE_HELP": "Captura de GPU rápida,\nestándar en todos los escritorios.",
+			"PW_FALLBACK_HELP": "Método lento con alto uso de CPU.\nPruébalo si PipeWire GPU no funciona",
+			"SCREENCOPY_GPU_HELP": "Rápido, sin ventanas emergentes de uso compartido de pantalla.\nFunciona en: Hyprland, Niri, River, Sway",
+			"SCREENCOPY_HELP": "Lento, sin ventanas emergentes de uso compartido de pantalla.\nFunciona en: Hyprland, Niri, River, Sway",
+			"NONE": "Ninguno",
+			"HMD_PINCH": "HMD + pellizco",
+			"EYE_PINCH": "Ojo + pellizco",
+			"NONE_INPUT_HELP": "No emular ratón y teclado.\nNo podrá interactuar con las pantallas.",
+			"UINPUT": "Emulación de dispositivo",
+			"WL_VIRTUAL": "Entrada virtual de Wayland",
+			"WL_VIRTUAL_HELP": "Enviar eventos al compositor de Wayland usando\nzwlr_virtual_pointer y zwp_virtual_keyboard.\nSolo funciona de forma fiable en algunos escritorios.\nNO funciona en KDE, GNOME o COSMIC.",
+			"EYE_ONLY": "Láser ocular",
+			"HMD_ONLY": "Láser del HMD",
+			"NONE_INPUT_CAPTURE_HELP": "No capturar el ratón ni el teclado.\nNo se podrá usar el ratón físico ni el\nteclado en las aplicaciones lanzadas dentro de WayVR.",
+			"UINPUT_HELP": "Utiliza el módulo uinput para emular un dispositivo.\nSe sabe que funciona bien en la mayoría de los escritorios.",
+			"EVDEV_HELP": "Captura los dispositivos de entrada para uso exclusivo.\nTu usuario debe pertenecer al grupo 'input'."
+		},
+		"AUTOSTART_APPS": "Aplicaciones a ejecutar al inicio",
+		"HANDSFREE_POINTER": "Modo manos libres",
+		"HANDSFREE_POINTER_HELP": "Entrada a utilizar cuando no\nestén disponibles los mandos de movimiento.\nPellizco con la izquierda para agarrar, con la derecha para hacer clic.",
+		"UI_GRADIENT_INTENSITY": "Intensidad del degradado de la IU",
+		"RESET_PLAYSPACE": "Restablecer espacio de juego",
+		"RESET_PLAYSPACE_HELP": "Borrar el desplazamiento del espacio de juego.",
+		"BLOCK_POSES_ON_KBD_INTERACTION": "Bloquear poses al interactuar con el teclado",
+		"BLOCK_POSES_ON_KBD_INTERACTION_HELP": "Bloquea que el juego reciba poses cuando el teclado está sobre él y 'Bloquear entrada del juego' está habilitado",
+		"LANGUAGE": "Idioma",
+		"REQUIRES_RESTART": "Requiere reinicio",
+		"GRID_OPACITY": "Opacidad de la cuadrícula del suelo",
+		"GRID_OPACITY_HELP": "Opacidad de la cuadrícula del suelo cuando el skybox está habilitado",
+		"BROWSE_ONLINE_CATALOG": "Explorar catálogo en línea...",
+		"BROWSE_SKYMAPS": "Explorar skymaps",
+		"COLOR_KEYING": "Clave de color",
+		"NO_SKYMAPS_FOUND": "No se encontraron skymaps",
+		"SELECT_VARIANT": "Seleccionar variante",
+		"SHOW_WELCOME_SCREEN": "Mostrar pantalla de bienvenida",
+		"SKYBOX": "Skybox",
+		"SKYMAP_ALREADY_DOWNLOADED": "Esta skymap ya ha sido descargada. Selecciona la acción deseada.",
+		"WATCH_VIEW_ANGLE": "Ángulos de visión del Watch",
+		"WATCH_VIEW_ANGLE_HELP": "Controla cómo se desvanece el Watch",
+		"BINDINGS": {
+			"COMP": {
+				"CLICK": "Click",
+				"FORCE": "Fuerza",
+				"TOUCH": "Tocar",
+				"VALUE": "Valor",
+				"PROXIMITY": "Proximidad",
+				"X_AXIS": "Eje X",
+				"Y_AXIS": "Eje Y"
+			},
+			"TYPE": {
+				"BUMPER": "Bumper",
+				"DPAD_UP": "D-pad arriba",
+				"DPAD_DOWN": "D-pad hacia abajo",
+				"DPAD_LEFT": "D-pad izquierda",
+				"DPAD_RIGHT": "D-pad derecha",
+				"JOYSTICK": "Joystick",
+				"MENU": "Menú",
+				"SHOULDER": "Hombro",
+				"SQUEEZE": "Agarre",
+				"SYSTEM": "Sistema",
+				"THUMBREST": "Thumbrest",
+				"THUMBSTICK": "Stick analógico",
+				"TRACKPAD": "Trackpad",
+				"TRIGGER": "Gatillo",
+				"VIEW": "Ver"
+			},
+			"CLICK": {
+				"ANY": "Cualquiera",
+				"DOUBLE": "Doble toque",
+				"TRIPLE": "Triple toque",
+				"TYPE": "Número de toques"
+			},
+			"ACTION": {
+				"CLICK": "Clic*",
+				"GRAB": "Agarrar*",
+				"ALT_CLICK": "Ejecución de shell personalizada (establecer alt_click en la configuración)",
+				"SHOW_HIDE": "Mostrar, ocultar, recentrar*",
+				"TOGGLE_DASHBOARD": "Alternar dashboard",
+				"SPACE_DRAG": "Arrastre del playspace",
+				"SPACE_ROTATE": "Rotar playspace",
+				"SPACE_RESET": "Reinicio del Playspace",
+				"CLICK_MODIFIER_RIGHT": "Modificador de clic derecho",
+				"CLICK_MODIFIER_MIDDLE": "Modificador de clic central",
+				"MOVE_MOUSE": "Mover ratón (si está desactivado por defecto)",
+				"SCROLL": "Desplazamiento*"
+			},
+			"LEFT": "Izquierda",
+			"RIGHT": "Derecha",
+			"COMPONENT": "Tipo de actuación",
+			"SUBPATH": "Control de actuación",
+			"THRESHOLD": "Activar cuando supere el valor superior\nDesactivar cuando sea inferior al valor inferior"
+		},
+		"ENABLED": "Activado",
+		"INPUT_EMULATION_METHOD": "Método de emulación de entrada",
+		"INPUT_EMULATION_METHOD_HELP": "Prueba a cambiar esto en caso de que la entrada del\nratón o el teclado no se registre.",
+		"INPUT_PROFILES": "Cambiar la configuración de entrada",
+		"INPUT_PROFILES_HELP": "Vinculaciones de entrada del controlador OpenXR",
+		"NOT_SUPPORTED": "No compatible",
+		"ENABLE_WATCH": "Activar watch",
+		"SPACE_DRAG": "Space drag",
+		"SPACE_GRAVITY_DAMPING": "Amortiguación",
+		"SPACE_GRAVITY_DAMPING_HELP": "Resistencia artificial para ralentizar el movimiento. 0.1 - alta resistencia, 1.0 - sin resistencia",
+		"SPACE_GRAVITY_FLING_STRENGTH": "Fuerza de lanzamiento",
+		"SPACE_GRAVITY_FLING_STRENGTH_HELP": "Multiplicador de intensidad de la fuerza de lanzamiento gravitacional tras el space-drag.\n0.0 - sin movimiento alguno, 2.0 - doble intensidad",
+		"SPACE_GRAVITY_GRAVITY": "Gravedad",
+		"SPACE_GRAVITY_GRAVITY_HELP": "Cantidad de fuerza hacia abajo. 0.0 - sin gravedad",
+		"SPACE_GRAVITY_GROUND_FRICTION": "Fricción del suelo",
+		"SPACE_GRAVITY_GROUND_FRICTION_HELP": "Cantidad de fricción que te ralentiza si estás tocando el suelo.\n0.0 - sin fricción (como si fuera hielo), 1.0 - superficie rugosa",
+		"SPACE_GRAVITY_FLOOR_HEIGHT": "Altura del suelo",
+		"SPACE_GRAVITY_FLOOR_HEIGHT_HELP": "La posición Y donde se encuentra el suelo. La gravedad se detiene cuando alcanzas esta altura.",
+		"SAVE": "Guardar",
+		"CANCEL": "Cancelar",
+		"WHISPER": {
+			"NEED_TO_DOWNLOAD_MODEL": "El modelo seleccionado debe ser descargado.\n¿Deseas descargarlo ahora?",
+			"REMOVE_UNUSED_MODELS": "Estás desactivando la función de voz a texto.\n¿Te gustaría eliminar los modelos de Whisper descargados para liberar espacio?"
+		},
+		"WHISPER_MODEL": "Modelo de voz a texto",
+		"WHISPER_MODEL_HELP": "Modelo de Whisper a utilizar.\nLos modelos más grandes producen\nresultados más precisos, pero consumen más VRAM.",
+		"DEFAULT_OVERLAY_SCALE": "Tamaño de la superposición predeterminado",
+		"DEFAULT_OVERLAY_SCALE_HELP": "Genera nuevas capas de superposición con esta escala.",
+		"COLOR_PALETTE": "Paleta de colores",
+		"COLOR_PALETTES": "Paletas de colores",
+		"COLOR_PALETTE_CURRENT": "Tema actualmente activo.",
+		"COLOR_PALETTE_ACTIVATE": "Haz clic para usar este tema.",
+		"COLOR_PALETTE_HELP": "Haz clic para explorar paletas de colores.\nPara crear paletas personalizadas, ¡visita el sitio web!",
+		"COLOR_PALETTE_CUSTOM_URL": "¡Añade tu propio tema personalizado!",
+		"COLOR_PALETTE_CUSTOM_URL2": "Haz clic para abrir el manual web.",
+		"SNAP_ANGLE_DEG": "Ángulo de ajuste de cabeceo y alabeo de la ventana",
+		"SNAP_ANGLE_DEG_HELP": "Las ventanas agarradas se ajustan a este ángulo en los ejes de cabeceo y balanceo.",
+		"SAVE_PLAYSPACE_CENTER": "Guardar centro del playspace",
+		"SAVE_PLAYSPACE_CENTER_HELP": "Usa el playspace actual para el comando de restablecer playspace.",
+		"RESET_PLAYSPACE_CENTER": "Reiniciar centro del playspace",
+		"RESET_PLAYSPACE_CENTER_HELP": "Borra el centro del playspace establecido previamente.",
+		"HANDSFREE_ALT_TAB": "Puntero del selector de aplicaciones",
+		"HANDSFREE_ALT_TAB_HELP": "Mantén presionadas Super+X, apunta a la ventana deseada y luego suelta para cambiar el foco.",
+		"INPUT_CAPTURE_METHOD": "Método de captura de entrada",
+		"POINTER_ACCELERATION": "Aceleración del ratón",
+		"POINTER_ACCELERATION_HELP": "Activado: Aceleración adaptativa del ratón\nDesactivado: Velocidad constante",
+		"POINTER_SPEED": "Velocidad del ratón",
+		"INPUT_CAPTURE_METHOD_HELP": "Permite usar periféricos físicos dentro de WayVR.\n Super+Z: Cambiar la entrada entre WayVR y el escritorio real\n Super+X: Cambiar entre aplicaciones de WayVR",
+		"SPACE_DRAG_AFFECTS_WORLD": "Space-drag mueve las superposiciones"
+	},
+	"HELLO": "¡Hola!",
+	"AUDIO": {
+		"VOLUME": "Volumen",
+		"SETTINGS": "Configuración de audio",
+		"AUTO_SWITCH_TO_VR_AUDIO": "Conmutar automáticamente al audio VR",
+		"SPEAKERS": "Altavoces",
+		"MICROPHONES": "Micrófonos",
+		"CARDS": "Tarjetas",
+		"SELECT_AUDIO_CARD_PROFILE": "Seleccionar perfil de tarjeta de audio",
+		"NO_VR_SPEAKERS_FOUND_SWITCH_MANUALLY": "No se encontraron altavoces VR. Actívelos manualmente.",
+		"NO_VR_MICROPHONE_SWITCH_MANUALLY": "No se encontró micrófono VR. Actívelo manualmente.",
+		"FAILED_TO_SWITCH_MICROPHONE": "No se pudo cambiar el micrófono",
+		"MICROPHONE_SET_SUCCESSFULLY": "Micrófono configurado correctamente",
+		"SPEAKERS_SET_SUCCESSFULLY": "Altavoces configurados correctamente"
+	},
+	"ACTIONS": {
+		"RECENTER_PLAYSPACE": "Re-centrar espacio de juego"
+	},
+	"POPUP_ADD_DISPLAY": {
+		"RESOLUTION": "Resolución"
+	},
+	"WIDTH": "Ancho",
+	"HEIGHT": "Altura",
+	"HIDE": "Ocultar",
+	"REMOVE": "Eliminar",
+	"SHOW": "Mostrar",
+	"FAILED_TO_LAUNCH_APPLICATION": "No se pudo iniciar la aplicación:",
+	"APPLICATION_STARTED": "Aplicación iniciada",
+	"CLOSE_WINDOW": "Cerrar ventana",
+	"GAME_LIST": {
+		"NO_GAMES_FOUND": "No se encontraron juegos",
+		"RUNNING_GAMES_LIST": "Lista de juegos en ejecución"
+	},
+	"TERMINATE_PROCESS": "Finalizar proceso",
+	"GAME_LAUNCHED": "Juego lanzado",
+	"APP_LAUNCHER": {
+		"MODE": {
+			"NATIVE": "Modo nativo",
+			"CAGE": "Modo de compatibilidad (Cage)"
+		},
+		"RES_TITLE": "Resolución",
+		"ASPECT_TITLE": "Aspecto",
+		"ASPECT": {
+			"WIDE": "Ancho",
+			"SEMI_WIDE": "Semi-ancho",
+			"SQUARE": "Cuadrado",
+			"SEMI_TALL": "Semi alto",
+			"TALL": "Alto"
+		},
+		"POS_TITLE": "Posicionamiento",
+		"POS": {
+			"FLOATING": "Flotante",
+			"ANCHORED": "Anclado",
+			"STATIC": "Estático",
+			"FLOATING_HELP": "Se mueve independientemente, se recentra al mostrarse.",
+			"ANCHORED_HELP": "Se mantiene en su lugar con respecto al marcador central.",
+			"STATIC_HELP": "No pertenece a ningún conjunto. No se recentra."
+		},
+		"AUTOSTART": "Ejecutar automáticamente al inicio",
+		"LAUNCH": "Iniciar"
+	},
+	"DISPLAY_BRIGHTNESS": "Brillo de la pantalla",
+	"PROCESS_LIST": "Lista de procesos",
+	"REFRESH": "Actualizar",
+	"PROCESS": {
+		"STOP": "Detener",
+		"FORCE_KILL": "Forzar cierre"
+	},
+	"DEBUG_INFO": "Información de depuración",
+	"CREATION_DATE": "Fecha de creación",
+	"DOWNLOADER": "Descargador",
+	"DOWNLOAD_AGAIN": "Descargar de nuevo",
+	"DOWNLOADING_FILE": "Descargando archivo...",
+	"GETTING_STARTED": "Primeros pasos",
+	"MODIFICATION_DATE": "Fecha de modificación",
+	"LOADING": "Cargando...",
+	"APPLY": "Aplicar",
+	"RELOAD_FROM_DISK": "Recargar desde el disco",
+	"TARGET_PATH": "Ruta de destino",
+	"VERSION": "Versión",
+	"DONATE": {
+		"SUPPORT_US": "Apóyanos",
+		"DESCRIPTION": "Somos un pequeño equipo de 2 desarrolladores que creamos WayVR en nuestro tiempo libre. Si disfrutas usando este software, por favor considera apoyarnos; cada donación nos ayuda a seguir adelante.",
+		"BUTTON_TOOLTIP": "Donar vía Open Collective",
+		"CURRENT_SUPPORTERS": "Colaboradores actuales",
+		"THANK_YOU_WAYVR": "¡Gracias de parte del equipo de WayVR!"
+	},
+	"WELCOME": {
+		"ALL_SET": "¡Todo listo!",
+		"BASICS": "Estos conceptos básicos te permitirán empezar a usar WayVR con facilidad.",
+		"FEATURES_DOCUMENTATION": "Hay muchas otras funciones que merece la pena personalizar. Para más información, consulta la documentación en",
+		"FINISH_TUTORIAL": "Finalizar tutorial",
+		"GRAB_BOTH_HANDS": "Agarra el elemento con ambas manos si quieres mover un overlay específico en tu set.",
+		"GRAB_ONE_HAND": "Agárralo con una mano para mover tu set.",
+		"GREETING": "¡Hola!",
+		"GUIDE_INTRO": "Permítenos guiarte en tus primeros pasos.",
+		"LASER_COLORS": "Colores del láser",
+		"LASER_FUNCTIONALITY": "Gran parte de la funcionalidad de WayVR depende del color de láser que se utilice para interactuar con un elemento de la interfaz. ¡No hace falta pulsar estos botones, solo tocarlos!",
+		"LAST_PAGE_INFO": "Este tutorial dejará de aparecer una vez que llegues a la última página.",
+		"LOOK_AT_LEFT_WRIST": "Mira tu muñeca izquierda. Ese es tu watch.",
+		"MIDDLE_CLICK_MODE_PURPLE_LASER": "— Modo de clic central: Láser morado",
+		"MOVING_YOUR_SET": "Moviendo tu set",
+		"NEXT_BUTTON": "Pulsa el botón \"Siguiente\" de abajo para comenzar.",
+		"REGULAR_MODE_BLUE_LASER": "— Modo Regular: Láser azul",
+		"REPOSITION_THIS_WINDOW_BY_GRABBING": "Reposiciona esta ventana usando la acción de agarre de tu controlador.",
+		"RIGHT_CLICK_MODE_ORANGE_LASER": "— Modo de clic derecho: Láser naranja",
+		"THANKS_FOR_INSTALLING": "¡Gracias por instalar WayVR!",
+		"WATCH": "Watch",
+		"WORKING_SET": "Set de trabajo",
+		"DOUBLE_PRESS_TO_TOGGLE": "Presiona dos veces B (en Index) o Y (en Meta) para mostrar, recentrar u ocultar tu set. Pruébalo ahora.",
+		"CENTER_MARKER": "El marcador de centrado es lo que aparecerá frente a ti al recentrar. ¡Coloca las capas alrededor de él!"
+	},
+	"DOWNLOAD": "Descargar",
+	"SAVED_TO_FAVOURITES": "Guardado en favoritos",
+	"ADD_TO_FAVOURITES": "Añadir a favoritos",
+	"ADD_TO_FAVOURITES_HINT": "Guarda el ajuste preestablecido y ánclalo al cajón de aplicaciones",
+	"REMOVE_FROM_FAVOURITES": "Eliminar de favoritos",
+	"EMPTY": "Vacío",
+	"PINNED_APPS": "Aplicaciones ancladas"
+}
diff --git a/dash-frontend/assets/lang/it.json b/dash-frontend/assets/lang/it.json
index fd02f8b0..1eb9b658 100644
--- a/dash-frontend/assets/lang/it.json
+++ b/dash-frontend/assets/lang/it.json
@@ -1,166 +1,331 @@
 {
-  "ACTIONS": {
-    "RECENTER_PLAYSPACE": "Recentra lo spazio di gioco"
-  },
-  "APP_LAUNCHER": {
-    "ASPECT": {
-      "SEMI_TALL": "Semi-alto",
-      "SEMI_WIDE": "Semi-ampio",
-      "SQUARE": "Quadrato",
-      "TALL": "Alto",
-      "WIDE": "Ampio"
-    },
-    "ASPECT_TITLE": "Proporzioni",
-    "AUTOSTART": "Avvia automaticamente all'avvio",
-    "LAUNCH": "Avvia",
-    "MODE": {
-      "CAGE": "Modalità compatibilità (Cage)",
-      "NATIVE": "Modalità nativa"
-    },
-    "POS": {
-      "ANCHORED": "Ancorato",
-      "ANCHORED_HELP": "Rimane fermo rispetto al marcatore centrale.",
-      "FLOATING": "Fluttuante",
-      "FLOATING_HELP": "Si muove in modo indipendente, si recentra quando viene mostrato.",
-      "STATIC": "Statico",
-      "STATIC_HELP": "Non fa parte di alcun set. Non recentra."
-    },
-    "POS_TITLE": "Posizionamento",
-    "RES_TITLE": "Risoluzione"
-  },
-  "APP_SETTINGS": {
-    "ALLOW_SLIDING": "Interazione tramite stick durante l'afferrare",
-    "ANIMATION_SPEED": "Velocità dell'animazione dell'interfaccia utente",
-    "BLOCK_GAME_INPUT": "Blocca l'input di gioco",
-    "BLOCK_GAME_INPUT_HELP": "Blocca tutti gli input quando il cursore è sopra un overlay",
-    "BLOCK_GAME_INPUT_IGNORE_WATCH": "Ignora il Watch quando si blocca l'input",
-    "BLOCK_GAME_INPUT_IGNORE_WATCH_HELP": "Non bloccare l'input quando il watch è evidenziato",
-    "CAPTURE_METHOD": "Acquisizione dello schermo Wayland",
-    "CAPTURE_METHOD_HELP": "Prova a modificare questa impostazione se riscontri schermate nere o con artefatti.",
-    "CLEAR_PIPEWIRE_TOKENS": "Cancella i token PipeWire",
-    "CLEAR_PIPEWIRE_TOKENS_HELP": "Richiedi la selezione dello schermo all'avvio successivo",
-    "CLEAR_SAVED_STATE": "Cancella stato salvato",
-    "CLEAR_SAVED_STATE_HELP": "Ripristina set e posizioni degli overlay",
-    "CLICK_FREEZE_TIME_MS": "Tempo di congelamento del click (ms)",
-    "CLICK_FREEZE_TIME_MS_HELP": "Aiuta con la precisione dei doppi clic",
-    "CLOCK_12H": "Orologio a 12 ore",
-    "CONTROLS": "Controlli",
-    "DELETE_ALL_CONFIGS": "Elimina configurazione",
-    "DELETE_ALL_CONFIGS_HELP": "Rimuovi tutti i file di configurazione da conf.d",
-    "DOUBLE_CURSOR_FIX": "Correzione doppio cursore",
-    "DOUBLE_CURSOR_FIX_HELP": "Abilita questa opzione se vedi 2 cursori",
-    "FEATURES": "Funzionalità",
-    "FOCUS_FOLLOWS_MOUSE_MODE": "Movimento del mouse al tocco del grilletto",
-    "HIDE_GRAB_HELP": "Nascondi l'aiuto per l'afferrare",
-    "HIDE_USERNAME": "Nascondi nome utente",
-    "INVERT_SCROLL_DIRECTION_X": "Inverti direzione dello scorrimento orizzontale",
-    "INVERT_SCROLL_DIRECTION_Y": "Inverti direzione dello scorrimento verticale",
-    "KEYBOARD_MIDDLE_CLICK": "Click centrale del tasto",
-    "KEYBOARD_MIDDLE_CLICK_HELP": "Modificatore da usare durante la digitazione\ncon laser viola",
-    "KEYBOARD_SOUND_ENABLED": "Suoni della tastiera",
-    "LEFT_HANDED_MOUSE": "Mouse per mancini",
-    "LEFT_HANDED_MOUSE_HELP": "Usalo se i pulsanti del mouse sono invertiti",
-    "LONG_PRESS_DURATION": "Durata pressione prolungata",
-    "LOOK_AND_FEEL": "Aspetto",
-    "MISC": "Varie",
-    "NOTIFICATIONS_ENABLED": "Abilita notifiche",
-    "NOTIFICATIONS_SOUND_ENABLED": "Suoni di notifica",
-    "OPAQUE_BACKGROUND": "Sfondo opaco",
-    "OPTION": {
-      "AUTO": "Automatico",
-      "AUTO_HELP": "Copia dello schermo tramite GPU se supportata,\naltrimenti tramite GPU PipeWire.",
-      "PIPEWIRE_HELP": "Acquisizione GPU veloce,\nstandard su tutti i desktop.",
-      "PW_FALLBACK_HELP": "Metodo lento con elevato utilizzo della CPU.\nProva in caso PipeWire GPU non funzioni",
-      "SCREENCOPY_GPU_HELP": "Veloce, senza popup di condivisione schermo.\nFunziona su: Hyprland, Niri, River, Sway",
-      "SCREENCOPY_HELP": "Lento, nessuna finestra pop-up per la condivisione dello schermo.\nFunziona su: Hyprland, Niri, River, Sway",
-      "NONE": "Nessuno",
-      "HMD_PINCH": "HMD + pizzico",
-      "EYE_PINCH": "Occhio + pizzico",
-      "EYE_ONLY": "Solo occhio",
-      "HMD_ONLY": "Solo HMD"
-    },
-    "POINTER_LERP_FACTOR": "Smussamento puntatore",
-    "RESTART_SOFTWARE": "Riavvia il software",
-    "RESTART_SOFTWARE_HELP": "Applica impostazioni che richiedono un riavvio",
-    "ROUND_MULTIPLIER": "Arrotondamento bordi UI",
-    "SCREEN_RENDER_DOWN": "Rendering dello schermo a risoluzione inferiore",
-    "SCREEN_RENDER_DOWN_HELP": "Aiuta a ridurre l'aliasing su schermi ad alta risoluzione",
-    "SCROLL_SPEED": "Velocità di scorrimento",
-    "SETS_ON_WATCH": "Set sul Watch",
-    "SPACE_DRAG_MULTIPLIER": "Moltiplicatore space-drag",
-    "SPACE_DRAG_UNLOCKED": "Consenti lo space-drag su tutti gli assi",
-    "SPACE_ROTATE_UNLOCKED": "Consenti la rotazione dello spazio su tutti gli assi",
-    "TROUBLESHOOTING": "Risoluzione dei problemi",
-    "UPRIGHT_SCREEN_FIX": "Correzione schermo verticale",
-    "UPRIGHT_SCREEN_FIX_HELP": "Corregge schermi verticali su alcuni desktop",
-    "USE_PASSTHROUGH": "Abilita passthrough",
-    "USE_PASSTHROUGH_HELP": "Consenti il passthrough se supportato dal runtime XR",
-    "USE_SKYBOX": "Abilita skybox",
-    "USE_SKYBOX_HELP": "Mostra uno skybox se non c'è un'app di scena o passthrough",
-    "XR_CLICK_SENSITIVITY": "Sensibilità del click XR",
-    "XR_CLICK_SENSITIVITY_HELP": "Sensibilità del trigger analogico",
-    "XR_CLICK_SENSITIVITY_RELEASE": "Sensibilità di rilascio XR",
-    "XR_CLICK_SENSITIVITY_RELEASE_HELP": "Deve essere inferiore al clic",
-    "XWAYLAND_BY_DEFAULT": "Esegui le app in modalità Compatibilità per impostazione predefinita",
-    "AUTOSTART_APPS": "App da avviare all'avvio",
-    "HANDSFREE_POINTER": "Modalità a mani libere",
-    "HANDSFREE_POINTER_HELP": "Input da usare quando i\ncontroller di movimento non sono disponibili.\nPizzico sinistro per afferrare, destro per cliccare.",
-    "UI_GRADIENT_INTENSITY": "Intensità gradiente dell'interfaccia utente",
-    "RESET_PLAYSPACE": "Ripristina playspace",
-    "RESET_PLAYSPACE_HELP": "Cancella l'offset dello spazio di gioco.",
-    "BLOCK_POSES_ON_KBD_INTERACTION": "Blocca le pose durante l'interazione con la tastiera",
-    "BLOCK_POSES_ON_KBD_INTERACTION_HELP": "Impedisce al gioco di ricevere pose quando la tastiera è evidenziata e 'Blocca input di gioco' è abilitato",
-    "LANGUAGE": "Lingua",
-    "REQUIRES_RESTART": "Richiede riavvio",
-    "GRID_OPACITY": "Opacità della griglia del pavimento",
-    "GRID_OPACITY_HELP": "Opacità della griglia del pavimento quando lo skybox è abilitato"
-  },
-  "APPLICATION_LAUNCHER": "Lanciatore applicazioni",
-  "APPLICATION_STARTED": "Applicazione avviata",
-  "APPLICATIONS": "Applicazioni",
-  "AUDIO": {
-    "AUTO_SWITCH_TO_VR_AUDIO": "Passa automaticamente all'audio VR",
-    "CARDS": "Schede",
-    "FAILED_TO_SWITCH_MICROPHONE": "Impossibile cambiare microfono",
-    "MICROPHONE_SET_SUCCESSFULLY": "Microfono impostato con successo",
-    "MICROPHONES": "Microfoni",
-    "NO_VR_MICROPHONE_SWITCH_MANUALLY": "Nessun microfono VR trovato. Attivalo manualmente.",
-    "NO_VR_SPEAKERS_FOUND_SWITCH_MANUALLY": "Nessun altoparlante VR trovato. Selezionali manualmente.",
-    "SELECT_AUDIO_CARD_PROFILE": "Seleziona profilo scheda audio",
-    "SETTINGS": "Impostazioni audio",
-    "SPEAKERS": "Altoparlanti",
-    "SPEAKERS_SET_SUCCESSFULLY": "Altoparlanti impostati correttamente",
-    "VOLUME": "Volume"
-  },
-  "CLOSE_WINDOW": "Chiudi finestra",
-  "DISPLAY_BRIGHTNESS": "Luminosità display",
-  "FAILED_TO_LAUNCH_APPLICATION": "Impossibile avviare l'applicazione:",
-  "GAME_LAUNCHED": "Gioco lanciato",
-  "GAME_LIST": {
-    "NO_GAMES_FOUND": "Nessun gioco trovato",
-    "RUNNING_GAMES_LIST": "Lista dei giochi in esecuzione"
-  },
-  "GAMES": "Giochi",
-  "GENERAL_SETTINGS": "Impostazioni generali",
-  "HEIGHT": "Altezza",
-  "HELLO": "Ciao!",
-  "HELLO_USER": "Ciao, {USER}!",
-  "HIDE": "Nascondi",
-  "HOME_SCREEN": "Home",
-  "MONADO_RUNTIME": "Runtime Monado",
-  "POPUP_ADD_DISPLAY": {
-    "RESOLUTION": "Risoluzione"
-  },
-  "REMOVE": "Rimuovi",
-  "SETTINGS": "Impostazioni",
-  "SHOW": "Mostra",
-  "TERMINATE_PROCESS": "Termina processo",
-  "WIDTH": "Larghezza",
-  "PROCESS_LIST": "Elenco processi",
-  "REFRESH": "Aggiorna",
-  "PROCESS": {
-    "STOP": "Interrompi",
-    "FORCE_KILL": "Uccidi forzatamente"
-  },
-  "DEBUG_INFO": "Informazioni di debug"
-}
\ No newline at end of file
+	"ACTIONS": {
+		"RECENTER_PLAYSPACE": "Recentra lo spazio di gioco"
+	},
+	"APP_LAUNCHER": {
+		"ASPECT": {
+			"SEMI_TALL": "Semi-alto",
+			"SEMI_WIDE": "Semi-ampio",
+			"SQUARE": "Quadrato",
+			"TALL": "Alto",
+			"WIDE": "Ampio"
+		},
+		"ASPECT_TITLE": "Proporzioni",
+		"AUTOSTART": "Avvia automaticamente all'avvio",
+		"LAUNCH": "Avvia",
+		"MODE": {
+			"CAGE": "Modalità compatibilità (Cage)",
+			"NATIVE": "Modalità nativa"
+		},
+		"POS": {
+			"ANCHORED": "Ancorato",
+			"ANCHORED_HELP": "Rimane fermo rispetto al marcatore centrale.",
+			"FLOATING": "Fluttuante",
+			"FLOATING_HELP": "Si muove in modo indipendente, si recentra quando viene mostrato.",
+			"STATIC": "Statico",
+			"STATIC_HELP": "Non fa parte di alcun set. Non recentra."
+		},
+		"POS_TITLE": "Posizionamento",
+		"RES_TITLE": "Risoluzione"
+	},
+	"APP_SETTINGS": {
+		"ALLOW_SLIDING": "Interazione tramite stick durante l'afferrare",
+		"ANIMATION_SPEED": "Velocità dell'animazione dell'interfaccia utente",
+		"BLOCK_GAME_INPUT": "Blocca l'input di gioco",
+		"BLOCK_GAME_INPUT_HELP": "Blocca tutti gli input quando il cursore è sopra un overlay",
+		"BLOCK_GAME_INPUT_IGNORE_WATCH": "Ignora il Watch quando si blocca l'input",
+		"BLOCK_GAME_INPUT_IGNORE_WATCH_HELP": "Non bloccare l'input quando il watch è evidenziato",
+		"CAPTURE_METHOD": "Acquisizione dello schermo Wayland",
+		"CAPTURE_METHOD_HELP": "Prova a modificare questa impostazione se riscontri schermate nere o con artefatti.",
+		"CLEAR_PIPEWIRE_TOKENS": "Cancella i token PipeWire",
+		"CLEAR_PIPEWIRE_TOKENS_HELP": "Richiedi la selezione dello schermo all'avvio successivo",
+		"CLEAR_SAVED_STATE": "Cancella stato salvato",
+		"CLEAR_SAVED_STATE_HELP": "Ripristina set e posizioni degli overlay",
+		"CLICK_FREEZE_TIME_MS": "Tempo di congelamento del click (ms)",
+		"CLICK_FREEZE_TIME_MS_HELP": "Aiuta con la precisione dei doppi clic",
+		"CLOCK_12H": "Orologio a 12 ore",
+		"CONTROLS": "Controlli",
+		"DELETE_ALL_CONFIGS": "Elimina configurazione",
+		"DELETE_ALL_CONFIGS_HELP": "Rimuovi tutti i file di configurazione da conf.d",
+		"DOUBLE_CURSOR_FIX": "Correzione doppio cursore",
+		"DOUBLE_CURSOR_FIX_HELP": "Abilita questa opzione se vedi 2 cursori",
+		"FEATURES": "Funzionalità",
+		"FOCUS_FOLLOWS_MOUSE_MODE": "Movimento del mouse al tocco del grilletto",
+		"HIDE_GRAB_HELP": "Nascondi l'aiuto per l'afferrare",
+		"HIDE_USERNAME": "Nascondi nome utente",
+		"INVERT_SCROLL_DIRECTION_X": "Inverti direzione dello scorrimento orizzontale",
+		"INVERT_SCROLL_DIRECTION_Y": "Inverti direzione dello scorrimento verticale",
+		"KEYBOARD_MIDDLE_CLICK": "Click centrale del tasto",
+		"KEYBOARD_MIDDLE_CLICK_HELP": "Modificatore da usare durante la digitazione\ncon laser viola",
+		"KEYBOARD_SOUND_ENABLED": "Suoni della tastiera",
+		"LEFT_HANDED_MOUSE": "Mouse per mancini",
+		"LEFT_HANDED_MOUSE_HELP": "Usalo se i pulsanti del mouse sono invertiti",
+		"LONG_PRESS_DURATION": "Durata pressione prolungata",
+		"LOOK_AND_FEEL": "Aspetto",
+		"MISC": "Varie",
+		"NOTIFICATIONS_ENABLED": "Abilita notifiche",
+		"NOTIFICATIONS_SOUND_ENABLED": "Suoni di notifica",
+		"OPAQUE_BACKGROUND": "Sfondo opaco",
+		"OPTION": {
+			"AUTO": "Automatico",
+			"AUTO_HELP": "Copia dello schermo tramite GPU se supportata,\naltrimenti tramite GPU PipeWire.",
+			"PIPEWIRE_HELP": "Acquisizione GPU veloce,\nstandard su tutti i desktop.",
+			"PW_FALLBACK_HELP": "Metodo lento con elevato utilizzo della CPU.\nProva in caso PipeWire GPU non funzioni",
+			"SCREENCOPY_GPU_HELP": "Veloce, senza popup di condivisione schermo.\nFunziona su: Hyprland, Niri, River, Sway",
+			"SCREENCOPY_HELP": "Lento, nessuna finestra pop-up per la condivisione dello schermo.\nFunziona su: Hyprland, Niri, River, Sway",
+			"NONE": "Nessuno",
+			"HMD_PINCH": "HMD + pizzico",
+			"EYE_PINCH": "Occhio + pizzico",
+			"NONE_INPUT_HELP": "Non emulare mouse e tastiera.\nNon sarà possibile interagire con gli schermi.",
+			"UINPUT": "Emulazione dispositivo",
+			"WL_VIRTUAL": "Input virtuale Wayland",
+			"WL_VIRTUAL_HELP": "Invia eventi al compositor Wayland utilizzando\nzwlr_virtual_pointer e zwp_virtual_keyboard.\nFunziona in modo affidabile solo su alcuni desktop.\nNON funziona su KDE, GNOME o COSMIC.",
+			"EYE_ONLY": "Laser oculare",
+			"HMD_ONLY": "Laser HMD",
+			"NONE_INPUT_CAPTURE_HELP": "Non acquisire mouse e tastiera.\nNon sarà possibile utilizzare il mouse fisico o\nla tastiera nelle app lanciate all'interno di WayVR.",
+			"UINPUT_HELP": "Utilizza il modulo uinput per emulare un dispositivo.\nNoto per funzionare bene sulla maggior parte dei desktop.",
+			"EVDEV_HELP": "Acquisisci i dispositivi di input per l'uso esclusivo.\nL'utente deve appartenere al gruppo 'input'."
+		},
+		"POINTER_LERP_FACTOR": "Smussamento puntatore",
+		"RESTART_SOFTWARE": "Riavvia il software",
+		"RESTART_SOFTWARE_HELP": "Applica impostazioni che richiedono un riavvio",
+		"ROUND_MULTIPLIER": "Arrotondamento bordi UI",
+		"SCREEN_RENDER_DOWN": "Rendering dello schermo a risoluzione inferiore",
+		"SCREEN_RENDER_DOWN_HELP": "Aiuta a ridurre l'aliasing su schermi ad alta risoluzione",
+		"SCROLL_SPEED": "Velocità di scorrimento",
+		"SETS_ON_WATCH": "Set sul Watch",
+		"SPACE_DRAG_MULTIPLIER": "Moltiplicatore space-drag",
+		"SPACE_DRAG_UNLOCKED": "Consenti lo space-drag su tutti gli assi",
+		"SPACE_ROTATE_UNLOCKED": "Consenti la rotazione dello spazio su tutti gli assi",
+		"TROUBLESHOOTING": "Risoluzione dei problemi",
+		"UPRIGHT_SCREEN_FIX": "Correzione schermo verticale",
+		"UPRIGHT_SCREEN_FIX_HELP": "Corregge schermi verticali su alcuni desktop",
+		"USE_PASSTHROUGH": "Abilita passthrough",
+		"USE_PASSTHROUGH_HELP": "Consenti il passthrough se supportato dal runtime XR",
+		"USE_SKYBOX": "Abilita skybox",
+		"USE_SKYBOX_HELP": "Mostra uno skybox se non c'è un'app di scena o passthrough",
+		"XWAYLAND_BY_DEFAULT": "Esegui le app in modalità Compatibilità per impostazione predefinita",
+		"AUTOSTART_APPS": "App da avviare all'avvio",
+		"HANDSFREE_POINTER": "Modalità a mani libere",
+		"HANDSFREE_POINTER_HELP": "Input da usare quando i\ncontroller di movimento non sono disponibili.\nPizzico sinistro per afferrare, destro per cliccare.",
+		"UI_GRADIENT_INTENSITY": "Intensità gradiente dell'interfaccia utente",
+		"RESET_PLAYSPACE": "Ripristina playspace",
+		"RESET_PLAYSPACE_HELP": "Cancella l'offset dello spazio di gioco.",
+		"BLOCK_POSES_ON_KBD_INTERACTION": "Blocca le pose durante l'interazione con la tastiera",
+		"BLOCK_POSES_ON_KBD_INTERACTION_HELP": "Impedisce al gioco di ricevere pose quando la tastiera è evidenziata e 'Blocca input di gioco' è abilitato",
+		"LANGUAGE": "Lingua",
+		"REQUIRES_RESTART": "Richiede riavvio",
+		"GRID_OPACITY": "Opacità della griglia del pavimento",
+		"GRID_OPACITY_HELP": "Opacità della griglia del pavimento quando lo skybox è abilitato",
+		"BROWSE_ONLINE_CATALOG": "Sfoglia catalogo online...",
+		"BROWSE_SKYMAPS": "Sfoglia skymap",
+		"COLOR_KEYING": "Keying del colore",
+		"NO_SKYMAPS_FOUND": "Nessuna skymap trovata",
+		"SELECT_VARIANT": "Seleziona variante",
+		"SHOW_WELCOME_SCREEN": "Mostra schermata di benvenuto",
+		"SKYBOX": "Skybox",
+		"SKYMAP_ALREADY_DOWNLOADED": "Questa skymap è già stata scaricata. Seleziona l'azione desiderata.",
+		"WATCH_VIEW_ANGLE": "Angoli di visualizzazione Watch",
+		"WATCH_VIEW_ANGLE_HELP": "Controlla come l'orologio sfuma",
+		"BINDINGS": {
+			"COMP": {
+				"CLICK": "Clic",
+				"FORCE": "Forza",
+				"TOUCH": "Tocco",
+				"VALUE": "Valore",
+				"PROXIMITY": "Prossimità",
+				"X_AXIS": "Asse X",
+				"Y_AXIS": "Asse Y"
+			},
+			"TYPE": {
+				"BUMPER": "Bumper",
+				"DPAD_UP": "D-pad su",
+				"DPAD_DOWN": "D-pad Giù",
+				"DPAD_LEFT": "D-pad Sinistra",
+				"DPAD_RIGHT": "D-pad Destra",
+				"JOYSTICK": "Joystick",
+				"MENU": "Menu",
+				"SHOULDER": "Spalla",
+				"SQUEEZE": "Grip",
+				"SYSTEM": "Sistema",
+				"THUMBREST": "Appoggio del pollice",
+				"THUMBSTICK": "Thumbstick",
+				"TRACKPAD": "Trackpad",
+				"TRIGGER": "Grilletto",
+				"VIEW": "Visualizza"
+			},
+			"CLICK": {
+				"ANY": "Qualsiasi",
+				"DOUBLE": "Doppio tocco",
+				"TRIPLE": "Triplo tocco",
+				"TYPE": "Numero di tocchi"
+			},
+			"ACTION": {
+				"CLICK": "Click*",
+				"GRAB": "Afferra*",
+				"ALT_CLICK": "Esecuzione shell personalizzata (imposta alt_click nella configurazione)",
+				"SHOW_HIDE": "Mostra, nascondi, recentra*",
+				"TOGGLE_DASHBOARD": "Attiva/disattiva dashboard",
+				"SPACE_DRAG": "Trascinamento playspace",
+				"SPACE_ROTATE": "Rotazione playspace",
+				"SPACE_RESET": "Reset playspace",
+				"CLICK_MODIFIER_RIGHT": "Modificatore click destro",
+				"CLICK_MODIFIER_MIDDLE": "Modificatore click centrale",
+				"MOVE_MOUSE": "Muovi mouse (se disattivato di default)",
+				"SCROLL": "Scorrimento*"
+			},
+			"LEFT": "Sinistra",
+			"RIGHT": "Destra",
+			"COMPONENT": "Tipo di attivazione",
+			"SUBPATH": "Controllo di attivazione",
+			"THRESHOLD": "Attiva quando sopra il valore superiore\nDisattiva quando sotto il valore inferiore"
+		},
+		"ENABLED": "Abilitato",
+		"INPUT_EMULATION_METHOD": "Metodo di emulazione input",
+		"INPUT_EMULATION_METHOD_HELP": "Prova a cambiare questa impostazione nel caso in cui l'input del mouse o \ndella tastiera non venga registrato.",
+		"INPUT_PROFILES": "Cambia i binding di input",
+		"INPUT_PROFILES_HELP": "Binding di input del controller OpenXR",
+		"NOT_SUPPORTED": "Non supportato",
+		"ENABLE_WATCH": "Abilita watch",
+		"SPACE_DRAG": "Space drag",
+		"SPACE_GRAVITY_DAMPING": "Smorzamento",
+		"SPACE_GRAVITY_DAMPING_HELP": "Resistenza artificiale per rallentare il movimento. 0.1 - alta resistenza, 1.0 - nessuna resistenza",
+		"SPACE_GRAVITY_FLING_STRENGTH": "Forza del lancio",
+		"SPACE_GRAVITY_FLING_STRENGTH_HELP": "Moltiplicatore dell'intensità della forza di lancio gravitazionale dopo lo space-drag.\n0.0 - nessun movimento, 2.0 - intensità doppia",
+		"SPACE_GRAVITY_GRAVITY": "Gravità",
+		"SPACE_GRAVITY_GRAVITY_HELP": "Quantità di forza verso il basso. 0.0 - nessuna gravità",
+		"SPACE_GRAVITY_GROUND_FRICTION": "Attrito del terreno",
+		"SPACE_GRAVITY_GROUND_FRICTION_HELP": "Quantità di attrito che ti rallenta se tocchi il suolo.\n0.0 - nessuna frizione (proprio come sul ghiaccio), 1.0 - superficie ruvida",
+		"SPACE_GRAVITY_FLOOR_HEIGHT": "Altezza del pavimento",
+		"SPACE_GRAVITY_FLOOR_HEIGHT_HELP": "La posizione Y in cui si trova il pavimento. La gravità si ferma quando raggiungi questa altezza.",
+		"SAVE": "Salva",
+		"CANCEL": "Annulla",
+		"WHISPER": {
+			"NEED_TO_DOWNLOAD_MODEL": "Il modello selezionato deve essere scaricato.\nVuoi scaricarlo adesso?",
+			"REMOVE_UNUSED_MODELS": "Stai disattivando la funzione di sintesi vocale.\nDesideri rimuovere i modelli Whisper scaricati per liberare spazio?"
+		},
+		"WHISPER_MODEL": "Modello di sintesi vocale (speech-to-text)",
+		"WHISPER_MODEL_HELP": "Modello Whisper da utilizzare.\nI modelli più grandi producono risultati\npiù accurati, ma consumano più VRAM.",
+		"DEFAULT_OVERLAY_SCALE": "Dimensioni overlay predefinite",
+		"DEFAULT_OVERLAY_SCALE_HELP": "Genera nuovi overlay con questa scala.",
+		"COLOR_PALETTE": "Tavolozza colori",
+		"COLOR_PALETTES": "Tavolozze colori",
+		"COLOR_PALETTE_CURRENT": "Tema attualmente attivo.",
+		"COLOR_PALETTE_ACTIVATE": "Clicca per usare questo tema.",
+		"COLOR_PALETTE_HELP": "Clicca per sfogliare le palette di colori.\nPer crearne di personalizzate, visita il sito web!",
+		"COLOR_PALETTE_CUSTOM_URL": "Aggiungi il tuo tema personalizzato!",
+		"COLOR_PALETTE_CUSTOM_URL2": "Clicca per aprire il manuale web.",
+		"SNAP_ANGLE_DEG": "Angolo di scatto beccheggio e rollio finestra",
+		"SNAP_ANGLE_DEG_HELP": "Le finestre afferrate si allineano a questo angolo sugli assi di beccheggio e rollio.",
+		"SAVE_PLAYSPACE_CENTER": "Salva centro playspace",
+		"SAVE_PLAYSPACE_CENTER_HELP": "Usa il playspace corrente per il comando di reset del playspace.",
+		"RESET_PLAYSPACE_CENTER": "Ripristina centro playspace",
+		"RESET_PLAYSPACE_CENTER_HELP": "Ripristina il centro del playspace impostato precedentemente.",
+		"HANDSFREE_ALT_TAB": "Mira commutatore app",
+		"HANDSFREE_ALT_TAB_HELP": "Tieni premuto Super+X, punta alla finestra desiderata, poi rilascia per cambiare focus.",
+		"INPUT_CAPTURE_METHOD": "Metodo di acquisizione input",
+		"POINTER_ACCELERATION": "Accelerazione del mouse",
+		"POINTER_ACCELERATION_HELP": "Attivo: Accelerazione adattiva del mouse\nDisattivo: Velocità costante",
+		"POINTER_SPEED": "Velocità mouse",
+		"INPUT_CAPTURE_METHOD_HELP": "Consente l'uso di periferiche fisiche all'interno di WayVR.\n Super+Z: Passa l'input tra WayVR e il desktop reale\n Super+X: Passa tra le app di WayVR",
+		"SPACE_DRAG_AFFECTS_WORLD": "Lo Space-drag sposta gli overlay"
+	},
+	"APPLICATION_LAUNCHER": "Lanciatore applicazioni",
+	"APPLICATION_STARTED": "Applicazione avviata",
+	"APPLICATIONS": "Applicazioni",
+	"AUDIO": {
+		"AUTO_SWITCH_TO_VR_AUDIO": "Passa automaticamente all'audio VR",
+		"CARDS": "Schede",
+		"FAILED_TO_SWITCH_MICROPHONE": "Impossibile cambiare microfono",
+		"MICROPHONE_SET_SUCCESSFULLY": "Microfono impostato con successo",
+		"MICROPHONES": "Microfoni",
+		"NO_VR_MICROPHONE_SWITCH_MANUALLY": "Nessun microfono VR trovato. Attivalo manualmente.",
+		"NO_VR_SPEAKERS_FOUND_SWITCH_MANUALLY": "Nessun altoparlante VR trovato. Selezionali manualmente.",
+		"SELECT_AUDIO_CARD_PROFILE": "Seleziona profilo scheda audio",
+		"SETTINGS": "Impostazioni audio",
+		"SPEAKERS": "Altoparlanti",
+		"SPEAKERS_SET_SUCCESSFULLY": "Altoparlanti impostati correttamente",
+		"VOLUME": "Volume"
+	},
+	"CLOSE_WINDOW": "Chiudi finestra",
+	"DISPLAY_BRIGHTNESS": "Luminosità display",
+	"FAILED_TO_LAUNCH_APPLICATION": "Impossibile avviare l'applicazione:",
+	"GAME_LAUNCHED": "Gioco lanciato",
+	"GAME_LIST": {
+		"NO_GAMES_FOUND": "Nessun gioco trovato",
+		"RUNNING_GAMES_LIST": "Lista dei giochi in esecuzione"
+	},
+	"GAMES": "Giochi",
+	"GENERAL_SETTINGS": "Impostazioni generali",
+	"HEIGHT": "Altezza",
+	"HELLO": "Ciao!",
+	"HELLO_USER": "Ciao, {USER}!",
+	"HIDE": "Nascondi",
+	"HOME_SCREEN": "Home",
+	"MONADO_RUNTIME": "Runtime Monado",
+	"POPUP_ADD_DISPLAY": {
+		"RESOLUTION": "Risoluzione"
+	},
+	"REMOVE": "Rimuovi",
+	"SETTINGS": "Impostazioni",
+	"SHOW": "Mostra",
+	"TERMINATE_PROCESS": "Termina processo",
+	"WIDTH": "Larghezza",
+	"PROCESS_LIST": "Elenco processi",
+	"REFRESH": "Aggiorna",
+	"PROCESS": {
+		"STOP": "Interrompi",
+		"FORCE_KILL": "Uccidi forzatamente"
+	},
+	"DEBUG_INFO": "Informazioni di debug",
+	"CREATION_DATE": "Data di creazione",
+	"DOWNLOADER": "Downloader",
+	"DOWNLOAD_AGAIN": "Scarica di nuovo",
+	"DOWNLOADING_FILE": "Download del file in corso...",
+	"GETTING_STARTED": "Inizio rapido",
+	"MODIFICATION_DATE": "Data di modifica",
+	"LOADING": "Caricamento...",
+	"APPLY": "Applica",
+	"RELOAD_FROM_DISK": "Ricarica da disco",
+	"TARGET_PATH": "Percorso di destinazione",
+	"VERSION": "Versione",
+	"DONATE": {
+		"SUPPORT_US": "Sostienici",
+		"DESCRIPTION": "Siamo un piccolo team di 2 sviluppatori che crea WayVR nel tempo libero. Se ti piace usare questo software, considera di supportarci: ogni donazione ci aiuta a continuare.",
+		"BUTTON_TOOLTIP": "Dona tramite Open Collective",
+		"CURRENT_SUPPORTERS": "Sostenitori attuali",
+		"THANK_YOU_WAYVR": "Grazie dal team WayVR!"
+	},
+	"WELCOME": {
+		"ALL_SET": "Sei pronto!",
+		"BASICS": "Queste nozioni di base ti permetteranno di iniziare a usare WayVR con facilità.",
+		"FEATURES_DOCUMENTATION": "Ci sono molte altre funzioni che vale la pena personalizzare. Per ulteriori informazioni, consulta la documentazione all'indirizzo",
+		"FINISH_TUTORIAL": "Termina tutorial",
+		"GRAB_BOTH_HANDS": "Afferralo con entrambe le mani se vuoi spostare un overlay specifico nel tuo set.",
+		"GRAB_ONE_HAND": "Afferralo con una mano per muovere il tuo set.",
+		"GREETING": "Ciao!",
+		"GUIDE_INTRO": "Lascia che ti guidiamo nei tuoi primi passi.",
+		"LASER_COLORS": "Colori Laser",
+		"LASER_FUNCTIONALITY": "Gran parte delle funzionalità in WayVR dipende dal colore del laser utilizzato per interagire con un elemento dell'interfaccia utente. Non è necessario premere questi pulsanti, basta toccarli!",
+		"LAST_PAGE_INFO": "Questo tutorial smetterà di apparire una volta raggiunta l'ultima pagina.",
+		"LOOK_AT_LEFT_WRIST": "Guarda il tuo polso sinistro. È il tuo watch.",
+		"MIDDLE_CLICK_MODE_PURPLE_LASER": "— Modalità click centrale: Laser viola",
+		"MOVING_YOUR_SET": "Spostamento del tuo set",
+		"NEXT_BUTTON": "Premi il pulsante \"Avanti\" qui sotto per iniziare.",
+		"REGULAR_MODE_BLUE_LASER": "— Modalità Standard: Laser blu",
+		"REPOSITION_THIS_WINDOW_BY_GRABBING": "Riposiziona questa finestra usando l'azione grip del tuo controller.",
+		"RIGHT_CLICK_MODE_ORANGE_LASER": "— Modalità tasto destro: Laser arancione",
+		"THANKS_FOR_INSTALLING": "Grazie per aver installato WayVR!",
+		"WATCH": "Watch",
+		"WORKING_SET": "Set di lavoro",
+		"DOUBLE_PRESS_TO_TOGGLE": "Premi due volte B (su Index) o Y (su Meta) per mostrare, ricentrare o nascondere il tuo set. Provalo ora.",
+		"CENTER_MARKER": "Il marker di centraggio è ciò che apparirà davanti a te durante il ricentramento. Posiziona gli overlay intorno ad esso!"
+	},
+	"DOWNLOAD": "Scarica",
+	"SAVED_TO_FAVOURITES": "Salvato nei preferiti",
+	"ADD_TO_FAVOURITES": "Aggiungi ai preferiti",
+	"ADD_TO_FAVOURITES_HINT": "Salva il preset e fissalo al cassetto delle app",
+	"REMOVE_FROM_FAVOURITES": "Rimuovi dai preferiti",
+	"EMPTY": "Vuoto",
+	"PINNED_APPS": "Applicazioni fissate"
+}
diff --git a/dash-frontend/assets/lang/ja.json b/dash-frontend/assets/lang/ja.json
index 92acc7bf..6dbb6ca4 100644
--- a/dash-frontend/assets/lang/ja.json
+++ b/dash-frontend/assets/lang/ja.json
@@ -1,166 +1,331 @@
 {
-  "HOME_SCREEN": "ホーム",
-  "MONADO_RUNTIME": "「Monado」ランタイム",
-  "APPLICATIONS": "アプリ",
-  "GAMES": "ゲーム",
-  "SETTINGS": "設定",
-  "HELLO_USER": "こんにちは、{USER}！",
-  "GENERAL_SETTINGS": "全般設定",
-  "APPLICATION_LAUNCHER": "アプリケーションランチャー",
-  "APP_SETTINGS": {
-    "HIDE_USERNAME": "ユーザー名を非表示",
-    "OPAQUE_BACKGROUND": "不透明な背景",
-    "LOOK_AND_FEEL": "外観",
-    "HIDE_GRAB_HELP": "グリップ動作中にのヘルプを非表示",
-    "ANIMATION_SPEED": "UIアニメーション速度",
-    "ROUND_MULTIPLIER": "UI の丸み",
-    "USE_SKYBOX": "スカイボックスを有効",
-    "USE_PASSTHROUGH": "パススルーを有効",
-    "CLOCK_12H": "12時間制",
-    "FEATURES": "機能",
-    "NOTIFICATIONS_ENABLED": "通知を有効にする",
-    "NOTIFICATIONS_SOUND_ENABLED": "通知音",
-    "KEYBOARD_SOUND_ENABLED": "キーボード音",
-    "SPACE_DRAG_MULTIPLIER": "スペースドラッグ倍率",
-    "SPACE_DRAG_UNLOCKED": "全軸のスペースドラッグ",
-    "SPACE_ROTATE_UNLOCKED": "全軸のスペース回転",
-    "BLOCK_GAME_INPUT": "ゲームの入力をブロック",
-    "BLOCK_GAME_INPUT_IGNORE_WATCH": "入力ブロック時に監視を無視",
-    "CONTROLS": "コントロール",
-    "FOCUS_FOLLOWS_MOUSE_MODE": "トリガータッチでマウス移動",
-    "LEFT_HANDED_MOUSE": "左利きマウス",
-    "ALLOW_SLIDING": "グリップ動作中にスティックを有効",
-    "INVERT_SCROLL_DIRECTION_X": "水平スクロール方向を反転",
-    "INVERT_SCROLL_DIRECTION_Y": "垂直スクロール方向を反転",
-    "SCROLL_SPEED": "スクロール速度",
-    "LONG_PRESS_DURATION": "長押し時間",
-    "POINTER_LERP_FACTOR": "ポインターのスムージング",
-    "XR_CLICK_SENSITIVITY": "XRクリック感度",
-    "XR_CLICK_SENSITIVITY_RELEASE": "XRリリース感度",
-    "CLICK_FREEZE_TIME_MS": "クリックで一時停止時間 (ms)",
-    "MISC": "その他",
-    "XWAYLAND_BY_DEFAULT": "アプリ実行のデフォルトは互換モード",
-    "UPRIGHT_SCREEN_FIX": "画面の縦向き修正",
-    "DOUBLE_CURSOR_FIX": "ダブルカーソル修正",
-    "SCREEN_RENDER_DOWN": "画面の解像度を縮小",
-    "UPRIGHT_SCREEN_FIX_HELP": "一部のデスクトップで縦向きの画面を修正",
-    "DOUBLE_CURSOR_FIX_HELP": "2つのカーソルが表示される場合は、これを有効にします",
-    "XR_CLICK_SENSITIVITY_HELP": "アナログトリガの感度",
-    "XR_CLICK_SENSITIVITY_RELEASE_HELP": "クリックより低くする必要があります",
-    "CLICK_FREEZE_TIME_MS_HELP": "ダブルクリックの精度向上に役立ちます",
-    "LEFT_HANDED_MOUSE_HELP": "マウスボタンが入れ替わっている場合に有効にします",
-    "BLOCK_GAME_INPUT_HELP": "オーバーレイ上にマウスカーソルがあるときに入力をブロックします",
-    "BLOCK_GAME_INPUT_IGNORE_WATCH_HELP": "ウォッチがホバーされているときは入力をブロックしない",
-    "USE_SKYBOX_HELP": "シーンアプリまたはパススルーがない場合にスカイボックスを表示します",
-    "USE_PASSTHROUGH_HELP": "XRランタイムがサポートしていれば、パススルーを有効にします",
-    "SCREEN_RENDER_DOWN_HELP": "高解像度スクリーンでのエイリアシングを軽減します",
-    "SETS_ON_WATCH": "ウォッチのセット",
-    "TROUBLESHOOTING": "トラブルシューティング",
-    "CLEAR_SAVED_STATE": "保存された状態をクリア",
-    "CLEAR_PIPEWIRE_TOKENS": "PipeWire トークンをクリア",
-    "DELETE_ALL_CONFIGS": "設定を消去",
-    "RESTART_SOFTWARE": "ソフトウェアを再起動",
-    "CLEAR_SAVED_STATE_HELP": "セットとオーバーレイの位置をリセット",
-    "CLEAR_PIPEWIRE_TOKENS_HELP": "次の起動時に画面選択のプロンプトを表示",
-    "DELETE_ALL_CONFIGS_HELP": "conf.d 内のすべての設定ファイルを削除",
-    "RESTART_SOFTWARE_HELP": "再起動が必要な設定を適用",
-    "CAPTURE_METHOD": "Waylandスクリーンキャプチャ",
-    "CAPTURE_METHOD_HELP": "画面が黒くなる、または乱れる場合は、\nこの設定を変更してみてください。",
-    "KEYBOARD_MIDDLE_CLICK": "キーボードの中ボタンクリック",
-    "KEYBOARD_MIDDLE_CLICK_HELP": "紫色のレーザーで入力する際の修飾キー",
-    "OPTION": {
-      "AUTO": "自動",
-      "AUTO_HELP": "サポートされている場合はScreenCopy GPU、\nそうでない場合はPipeWire GPU。",
-      "PIPEWIRE_HELP": "GPU高速キャプチャ。\nすべてのデスクトップで標準です。",
-      "PW_FALLBACK_HELP": "CPU使用量が多い低速な方法です。\nPipeWire GPUが動作しない場合に試してください。",
-      "SCREENCOPY_GPU_HELP": "高速で、スクリーン共有ポップアップはありません。\n動作する環境: Hyprland, Niri, River, Sway",
-      "SCREENCOPY_HELP": "遅延あり、画面共有ポップアップなし。\n動作する環境: Hyprland, Niri, River, Sway",
-      "NONE": "なし",
-      "HMD_PINCH": "HMD + ピンチ",
-      "EYE_PINCH": "つまんで目を合わせる",
-      "EYE_ONLY": "視野のみ",
-      "HMD_ONLY": "HMDのみ"
-    },
-    "AUTOSTART_APPS": "起動時に実行するアプリ",
-    "HANDSFREE_POINTER": "ハンズフリーモード",
-    "HANDSFREE_POINTER_HELP": "モーションコントローラーが利用できない場合の入力方法。\n左手のピンチは掴み、右手のピンチはクリックです。",
-    "UI_GRADIENT_INTENSITY": "UIグラデーションの強さ",
-    "RESET_PLAYSPACE": "プレイエリアをリセット",
-    "RESET_PLAYSPACE_HELP": "プレイエリアのオフセットをクリアします。",
-    "BLOCK_POSES_ON_KBD_INTERACTION": "キーボード操作時のポーズをブロック",
-    "BLOCK_POSES_ON_KBD_INTERACTION_HELP": "キーボードがホバーされ、「ゲーム入力をブロック」が有効になっている場合、ゲームがポーズを受信することをブロックします",
-    "LANGUAGE": "言語",
-    "REQUIRES_RESTART": "再起動が必要です",
-    "GRID_OPACITY": "フロアグリッドの不透明度",
-    "GRID_OPACITY_HELP": "スカイボックスが有効なときの床グリッドの不透明度"
-  },
-  "HELLO": "こんにちは！",
-  "AUDIO": {
-    "VOLUME": "音量",
-    "SETTINGS": "オーディオ設定",
-    "AUTO_SWITCH_TO_VR_AUDIO": "VRオーディオに自動切り替え",
-    "SPEAKERS": "スピーカー",
-    "MICROPHONES": "マイク",
-    "CARDS": "カード",
-    "SELECT_AUDIO_CARD_PROFILE": "オーディオカードプロファイルを選択",
-    "NO_VR_SPEAKERS_FOUND_SWITCH_MANUALLY": "VRスピーカーが見つかりませんでした。手動で切り替えてください。",
-    "NO_VR_MICROPHONE_SWITCH_MANUALLY": "VRマイクが見つかりませんでした。手動で切り替えてください。",
-    "FAILED_TO_SWITCH_MICROPHONE": "マイクの切り替えに失敗しました",
-    "MICROPHONE_SET_SUCCESSFULLY": "マイクの設定が完了しました",
-    "SPEAKERS_SET_SUCCESSFULLY": "スピーカーを設定しました"
-  },
-  "ACTIONS": {
-    "RECENTER_PLAYSPACE": "プレイスペースを再中央"
-  },
-  "POPUP_ADD_DISPLAY": {
-    "RESOLUTION": "解像度"
-  },
-  "WIDTH": "幅",
-  "HEIGHT": "高さ",
-  "HIDE": "隠す",
-  "REMOVE": "削除",
-  "SHOW": "表示",
-  "FAILED_TO_LAUNCH_APPLICATION": "アプリケーションの起動に失敗しました：",
-  "APPLICATION_STARTED": "アプリケーションが起動しました",
-  "CLOSE_WINDOW": "ウィンドウを閉じる",
-  "GAME_LIST": {
-    "NO_GAMES_FOUND": "ゲームが見つかりませんでした",
-    "RUNNING_GAMES_LIST": "実行中のゲーム一覧"
-  },
-  "TERMINATE_PROCESS": "プロセスを終了する",
-  "GAME_LAUNCHED": "ゲームが起動しました",
-  "APP_LAUNCHER": {
-    "MODE": {
-      "NATIVE": "ネイティブモード",
-      "CAGE": "互換モード（Cage）"
-    },
-    "RES_TITLE": "解像度",
-    "ASPECT_TITLE": "アスペクト",
-    "ASPECT": {
-      "WIDE": "ワイド",
-      "SEMI_WIDE": "半広角",
-      "SQUARE": "正方形",
-      "SEMI_TALL": "半縦長",
-      "TALL": "縦長"
-    },
-    "POS_TITLE": "配置",
-    "POS": {
-      "FLOATING": "フローティング",
-      "ANCHORED": "固定",
-      "STATIC": "固定",
-      "FLOATING_HELP": "独立して移動し、表示時に中央に再配置されます。",
-      "ANCHORED_HELP": "中央マーカーに対して固定された位置に留まります。",
-      "STATIC_HELP": "どのセットにも属していません。リセンターされません。"
-    },
-    "AUTOSTART": "起動時に自動実行",
-    "LAUNCH": "起動"
-  },
-  "DISPLAY_BRIGHTNESS": "ディスプレイの明るさ",
-  "PROCESS_LIST": "プロセスリスト",
-  "REFRESH": "更新",
-  "PROCESS": {
-    "STOP": "停止",
-    "FORCE_KILL": "強制終了"
-  },
-  "DEBUG_INFO": "デバッグ情報"
-}
\ No newline at end of file
+	"HOME_SCREEN": "ホーム",
+	"MONADO_RUNTIME": "「Monado」ランタイム",
+	"APPLICATIONS": "アプリ",
+	"GAMES": "ゲーム",
+	"SETTINGS": "設定",
+	"HELLO_USER": "こんにちは、{USER}！",
+	"GENERAL_SETTINGS": "全般設定",
+	"APPLICATION_LAUNCHER": "アプリケーションランチャー",
+	"APP_SETTINGS": {
+		"HIDE_USERNAME": "ユーザー名を非表示",
+		"OPAQUE_BACKGROUND": "不透明な背景",
+		"LOOK_AND_FEEL": "外観",
+		"HIDE_GRAB_HELP": "グリップ動作中にのヘルプを非表示",
+		"ANIMATION_SPEED": "UIアニメーション速度",
+		"ROUND_MULTIPLIER": "UI の丸み",
+		"USE_SKYBOX": "スカイボックスを有効",
+		"USE_PASSTHROUGH": "パススルーを有効",
+		"CLOCK_12H": "12時間制",
+		"FEATURES": "機能",
+		"NOTIFICATIONS_ENABLED": "通知を有効にする",
+		"NOTIFICATIONS_SOUND_ENABLED": "通知音",
+		"KEYBOARD_SOUND_ENABLED": "キーボード音",
+		"SPACE_DRAG_MULTIPLIER": "スペースドラッグ倍率",
+		"SPACE_DRAG_UNLOCKED": "全軸のスペースドラッグ",
+		"SPACE_ROTATE_UNLOCKED": "全軸のスペース回転",
+		"BLOCK_GAME_INPUT": "ゲームの入力をブロック",
+		"BLOCK_GAME_INPUT_IGNORE_WATCH": "入力ブロック時に監視を無視",
+		"CONTROLS": "コントロール",
+		"FOCUS_FOLLOWS_MOUSE_MODE": "トリガータッチでマウス移動",
+		"LEFT_HANDED_MOUSE": "左利きマウス",
+		"ALLOW_SLIDING": "グリップ動作中にスティックを有効",
+		"INVERT_SCROLL_DIRECTION_X": "水平スクロール方向を反転",
+		"INVERT_SCROLL_DIRECTION_Y": "垂直スクロール方向を反転",
+		"SCROLL_SPEED": "スクロール速度",
+		"LONG_PRESS_DURATION": "長押し時間",
+		"POINTER_LERP_FACTOR": "ポインターのスムージング",
+		"CLICK_FREEZE_TIME_MS": "クリックで一時停止時間 (ms)",
+		"MISC": "その他",
+		"XWAYLAND_BY_DEFAULT": "アプリ実行のデフォルトは互換モード",
+		"UPRIGHT_SCREEN_FIX": "画面の縦向き修正",
+		"DOUBLE_CURSOR_FIX": "ダブルカーソル修正",
+		"SCREEN_RENDER_DOWN": "画面の解像度を縮小",
+		"UPRIGHT_SCREEN_FIX_HELP": "一部のデスクトップで縦向きの画面を修正",
+		"DOUBLE_CURSOR_FIX_HELP": "2つのカーソルが表示される場合は、これを有効にします",
+		"CLICK_FREEZE_TIME_MS_HELP": "ダブルクリックの精度向上に役立ちます",
+		"LEFT_HANDED_MOUSE_HELP": "マウスボタンが入れ替わっている場合に有効にします",
+		"BLOCK_GAME_INPUT_HELP": "オーバーレイ上にマウスカーソルがあるときに入力をブロックします",
+		"BLOCK_GAME_INPUT_IGNORE_WATCH_HELP": "ウォッチがホバーされているときは入力をブロックしない",
+		"USE_SKYBOX_HELP": "シーンアプリまたはパススルーがない場合にスカイボックスを表示します",
+		"USE_PASSTHROUGH_HELP": "XRランタイムがサポートしていれば、パススルーを有効にします",
+		"SCREEN_RENDER_DOWN_HELP": "高解像度スクリーンでのエイリアシングを軽減します",
+		"SETS_ON_WATCH": "ウォッチのセット",
+		"TROUBLESHOOTING": "トラブルシューティング",
+		"CLEAR_SAVED_STATE": "保存された状態をクリア",
+		"CLEAR_PIPEWIRE_TOKENS": "PipeWire トークンをクリア",
+		"DELETE_ALL_CONFIGS": "設定を消去",
+		"RESTART_SOFTWARE": "ソフトウェアを再起動",
+		"CLEAR_SAVED_STATE_HELP": "セットとオーバーレイの位置をリセット",
+		"CLEAR_PIPEWIRE_TOKENS_HELP": "次の起動時に画面選択のプロンプトを表示",
+		"DELETE_ALL_CONFIGS_HELP": "conf.d 内のすべての設定ファイルを削除",
+		"RESTART_SOFTWARE_HELP": "再起動が必要な設定を適用",
+		"CAPTURE_METHOD": "Waylandスクリーンキャプチャ",
+		"CAPTURE_METHOD_HELP": "画面が黒くなる、または乱れる場合は、\nこの設定を変更してみてください。",
+		"KEYBOARD_MIDDLE_CLICK": "キーボードの中ボタンクリック",
+		"KEYBOARD_MIDDLE_CLICK_HELP": "紫色のレーザーで入力する際の修飾キー",
+		"OPTION": {
+			"AUTO": "自動",
+			"AUTO_HELP": "サポートされている場合はScreenCopy GPU、\nそうでない場合はPipeWire GPU。",
+			"PIPEWIRE_HELP": "GPU高速キャプチャ。\nすべてのデスクトップで標準です。",
+			"PW_FALLBACK_HELP": "CPU使用量が多い低速な方法です。\nPipeWire GPUが動作しない場合に試してください。",
+			"SCREENCOPY_GPU_HELP": "高速で、スクリーン共有ポップアップはありません。\n動作する環境: Hyprland, Niri, River, Sway",
+			"SCREENCOPY_HELP": "遅延あり、画面共有ポップアップなし。\n動作する環境: Hyprland, Niri, River, Sway",
+			"NONE": "なし",
+			"HMD_PINCH": "HMD + ピンチ",
+			"EYE_PINCH": "つまんで目を合わせる",
+			"NONE_INPUT_HELP": "マウスとキーボードをエミュレートしません。\nディスプレイを操作できなくなります。",
+			"UINPUT": "デバイス・エミュレーション",
+			"WL_VIRTUAL": "Wayland 仮想入力",
+			"WL_VIRTUAL_HELP": "zwlr_virtual_pointer および zwp_virtual_keyboard を使用して、Wayland コンポジタにイベントを送信します。\n一部のデスクトップ環境でのみ、安定して動作します。\nKDE、GNOME、または COSMIC では動作しません。",
+			"EYE_ONLY": "視線レーザー",
+			"HMD_ONLY": "HMDレーザー",
+			"NONE_INPUT_CAPTURE_HELP": "マウスとキーボードをキャプチャしない。\nWayVR内で起動したアプリで物理マウスや\nキーボードを使用できなくなります。",
+			"UINPUT_HELP": "uinputモジュールを使用してデバイスをエミュレートします。\nほとんどのデスクトップでうまく動作することが確認されています。",
+			"EVDEV_HELP": "入力デバイスを排他的に使用するために確保します。\nユーザーがinputグループに属している必要があります。"
+		},
+		"AUTOSTART_APPS": "起動時に実行するアプリ",
+		"HANDSFREE_POINTER": "ハンズフリーモード",
+		"HANDSFREE_POINTER_HELP": "モーションコントローラーが利用できない場合の入力方法。\n左手のピンチは掴み、右手のピンチはクリックです。",
+		"UI_GRADIENT_INTENSITY": "UIグラデーションの強さ",
+		"RESET_PLAYSPACE": "プレイエリアをリセット",
+		"RESET_PLAYSPACE_HELP": "プレイエリアのオフセットをクリアします。",
+		"BLOCK_POSES_ON_KBD_INTERACTION": "キーボード操作時のポーズをブロック",
+		"BLOCK_POSES_ON_KBD_INTERACTION_HELP": "キーボードがホバーされ、「ゲーム入力をブロック」が有効になっている場合、ゲームがポーズを受信することをブロックします",
+		"LANGUAGE": "言語",
+		"REQUIRES_RESTART": "再起動が必要です",
+		"GRID_OPACITY": "フロアグリッドの不透明度",
+		"GRID_OPACITY_HELP": "スカイボックスが有効なときの床グリッドの不透明度",
+		"BROWSE_ONLINE_CATALOG": "オンラインカタログを閲覧...",
+		"BROWSE_SKYMAPS": "Skymapを閲覧",
+		"COLOR_KEYING": "カラーキーイング",
+		"NO_SKYMAPS_FOUND": "スカイマップが見つかりません",
+		"SELECT_VARIANT": "バリアントを選択",
+		"SHOW_WELCOME_SCREEN": "ウェルカムスクリーンを表示する",
+		"SKYBOX": "スカイボックス",
+		"SKYMAP_ALREADY_DOWNLOADED": "このスカイマップは既にダウンロードされています。希望のアクションを選択してください。",
+		"WATCH_VIEW_ANGLE": "Watchの表示角度",
+		"WATCH_VIEW_ANGLE_HELP": "ウォッチのフェードアウト具合を調整する",
+		"BINDINGS": {
+			"COMP": {
+				"CLICK": "クリック",
+				"FORCE": "Force",
+				"TOUCH": "タッチ",
+				"VALUE": "値",
+				"PROXIMITY": "近接度",
+				"X_AXIS": "X軸",
+				"Y_AXIS": "Y軸"
+			},
+			"TYPE": {
+				"BUMPER": "バンパー",
+				"DPAD_UP": "Dパッド上",
+				"DPAD_DOWN": "Dパッド 下",
+				"DPAD_LEFT": "Dパッド左",
+				"DPAD_RIGHT": "Dパッド右",
+				"JOYSTICK": "ジョイスティック",
+				"MENU": "メニュー",
+				"SHOULDER": "ショルダー",
+				"SQUEEZE": "グリップ",
+				"SYSTEM": "システム",
+				"THUMBREST": "サムレスト",
+				"THUMBSTICK": "サムスティック",
+				"TRACKPAD": "トラックパッド",
+				"TRIGGER": "トリガー",
+				"VIEW": "表示"
+			},
+			"CLICK": {
+				"ANY": "任意",
+				"DOUBLE": "ダブルタップ",
+				"TRIPLE": "トリプルタップ",
+				"TYPE": "タップ回数"
+			},
+			"ACTION": {
+				"CLICK": "クリック*",
+				"GRAB": "掴む*",
+				"ALT_CLICK": "カスタムシェル実行 (configでalt_clickを設定)",
+				"SHOW_HIDE": "表示・非表示、再中心化*",
+				"TOGGLE_DASHBOARD": "ダッシュボードの切り替え",
+				"SPACE_DRAG": "スペースドラッグ",
+				"SPACE_ROTATE": "スペース回転",
+				"SPACE_RESET": "スペース リセット",
+				"CLICK_MODIFIER_RIGHT": "右クリック修飾キー",
+				"CLICK_MODIFIER_MIDDLE": "中クリック修飾キー",
+				"MOVE_MOUSE": "マウスを移動 (デフォルトでオフの場合)",
+				"SCROLL": "スクロール*"
+			},
+			"LEFT": "左",
+			"RIGHT": "右",
+			"COMPONENT": "作動タイプ",
+			"SUBPATH": "アクチュエーション制御",
+			"THRESHOLD": "上限値を超えたときに有効化\n下限値を下回ったときに無効化"
+		},
+		"ENABLED": "有効",
+		"INPUT_EMULATION_METHOD": "入力エミュレーション方法",
+		"INPUT_EMULATION_METHOD_HELP": "マウスやキーボードの入力が\n認識されない場合は、ここを変更してみてください。",
+		"INPUT_PROFILES": "入力バインドの変更",
+		"INPUT_PROFILES_HELP": "OpenXRコントローラーの入力バインディング",
+		"NOT_SUPPORTED": "未対応",
+		"ENABLE_WATCH": "ヴォッチを有効にする",
+		"SPACE_DRAG": "スペースムーバー",
+		"SPACE_GRAVITY_DAMPING": "減衰",
+		"SPACE_GRAVITY_DAMPING_HELP": "動きを減速させるための人工的な抵抗です。0.1 - 強い抵抗、1.0 - 抵抗なし",
+		"SPACE_GRAVITY_FLING_STRENGTH": "スリングの強さ",
+		"SPACE_GRAVITY_FLING_STRENGTH_HELP": "Space-drag 後の重力による打ち出し強度の倍率です。\n0.0 - 全く動きません、2.0 - 強度が2倍になります",
+		"SPACE_GRAVITY_GRAVITY": "重力",
+		"SPACE_GRAVITY_GRAVITY_HELP": "下向きの力の強さ。0.0 - 重力なし",
+		"SPACE_GRAVITY_GROUND_FRICTION": "地面の摩擦",
+		"SPACE_GRAVITY_GROUND_FRICTION_HELP": "地面に触れている際に、移動を遅らせる摩擦の強さです。\n0.0 - 摩擦なし（氷の上のような状態）、1.0 - 粗い表面",
+		"SPACE_GRAVITY_FLOOR_HEIGHT": "床の高さ",
+		"SPACE_GRAVITY_FLOOR_HEIGHT_HELP": "床のY座標です。この高さに達すると重力が停止します。",
+		"SAVE": "保存",
+		"CANCEL": "キャンセル",
+		"WHISPER": {
+			"NEED_TO_DOWNLOAD_MODEL": "選択されたモデルをダウンロードする必要があります。\n今すぐダウンロードしますか？",
+			"REMOVE_UNUSED_MODELS": "文字起こし機能をオフにします。\n空き容量を増やすために、ダウンロード済みのモデルファイルを削除しますか？"
+		},
+		"WHISPER_MODEL": "文字起こしモデル",
+		"WHISPER_MODEL_HELP": "使用するWhisperモデル。\nモデルが大きいほど精度は向上しますが、\nVRAMの消費量が増加します。",
+		"DEFAULT_OVERLAY_SCALE": "デフォルトのオーバーレイサイズ",
+		"DEFAULT_OVERLAY_SCALE_HELP": "新しいオーバーレイをこのスケールで生成します。",
+		"COLOR_PALETTE": "カラーパレット",
+		"COLOR_PALETTES": "カラーパレット",
+		"COLOR_PALETTE_CURRENT": "現在有効なテーマ。",
+		"COLOR_PALETTE_ACTIVATE": "クリックしてこのテーマを適用します。",
+		"COLOR_PALETTE_HELP": "クリックしてカラーパレットを選択してください。\nカスタムパレットの作成については、ウェブサイトを参照してください！",
+		"COLOR_PALETTE_CUSTOM_URL": "カスタムテーマを追加しましょう！",
+		"COLOR_PALETTE_CUSTOM_URL2": "クリックしてウェブマニュアルを開く。",
+		"SNAP_ANGLE_DEG": "ウィンドウのピッチ・ロールのスナップ角度",
+		"SNAP_ANGLE_DEG_HELP": "掴んでいるウィンドウが、ピッチ軸とロール軸でこの角度にスナップします。",
+		"SAVE_PLAYSPACE_CENTER": "プレイスペースの中心を保存",
+		"SAVE_PLAYSPACE_CENTER_HELP": "現在のプレイスペースを、プレイスペースのリセットバインディングに使用します。",
+		"RESET_PLAYSPACE_CENTER": "スペースの中心をリセット",
+		"RESET_PLAYSPACE_CENTER_HELP": "スペースセンターをリセットします。",
+		"HANDSFREE_ALT_TAB": "アプリ切り替えの照準",
+		"HANDSFREE_ALT_TAB_HELP": "Super+Xを押し続け、切り替えたいウィンドウに照準を合わせ、離してフォーカスを切り替えます。",
+		"INPUT_CAPTURE_METHOD": "入力キャプチャ方式",
+		"POINTER_ACCELERATION": "マウス加速",
+		"POINTER_ACCELERATION_HELP": "オン: 適応型マウス加速\nオフ: 一定速度",
+		"POINTER_SPEED": "マウス速度",
+		"INPUT_CAPTURE_METHOD_HELP": "WayVR内で物理周辺機器を使用できるようにします。\n Super+Z: WayVRと実際のデスクトップ間で入力を切り替え\n Super+X: WayVRアプリ間で切り替え",
+		"SPACE_DRAG_AFFECTS_WORLD": "スペースドラッグでオーバーレイを移動"
+	},
+	"HELLO": "こんにちは！",
+	"AUDIO": {
+		"VOLUME": "音量",
+		"SETTINGS": "オーディオ設定",
+		"AUTO_SWITCH_TO_VR_AUDIO": "VRオーディオに自動切り替え",
+		"SPEAKERS": "スピーカー",
+		"MICROPHONES": "マイク",
+		"CARDS": "カード",
+		"SELECT_AUDIO_CARD_PROFILE": "オーディオカードプロファイルを選択",
+		"NO_VR_SPEAKERS_FOUND_SWITCH_MANUALLY": "VRスピーカーが見つかりませんでした。手動で切り替えてください。",
+		"NO_VR_MICROPHONE_SWITCH_MANUALLY": "VRマイクが見つかりませんでした。手動で切り替えてください。",
+		"FAILED_TO_SWITCH_MICROPHONE": "マイクの切り替えに失敗しました",
+		"MICROPHONE_SET_SUCCESSFULLY": "マイクの設定が完了しました",
+		"SPEAKERS_SET_SUCCESSFULLY": "スピーカーを設定しました"
+	},
+	"ACTIONS": {
+		"RECENTER_PLAYSPACE": "プレイスペースを再中央"
+	},
+	"POPUP_ADD_DISPLAY": {
+		"RESOLUTION": "解像度"
+	},
+	"WIDTH": "幅",
+	"HEIGHT": "高さ",
+	"HIDE": "隠す",
+	"REMOVE": "削除",
+	"SHOW": "表示",
+	"FAILED_TO_LAUNCH_APPLICATION": "アプリケーションの起動に失敗しました：",
+	"APPLICATION_STARTED": "アプリケーションが起動しました",
+	"CLOSE_WINDOW": "ウィンドウを閉じる",
+	"GAME_LIST": {
+		"NO_GAMES_FOUND": "ゲームが見つかりませんでした",
+		"RUNNING_GAMES_LIST": "実行中のゲーム一覧"
+	},
+	"TERMINATE_PROCESS": "プロセスを終了する",
+	"GAME_LAUNCHED": "ゲームが起動しました",
+	"APP_LAUNCHER": {
+		"MODE": {
+			"NATIVE": "ネイティブモード",
+			"CAGE": "互換モード（Cage）"
+		},
+		"RES_TITLE": "解像度",
+		"ASPECT_TITLE": "アスペクト",
+		"ASPECT": {
+			"WIDE": "ワイド",
+			"SEMI_WIDE": "半広角",
+			"SQUARE": "正方形",
+			"SEMI_TALL": "半縦長",
+			"TALL": "縦長"
+		},
+		"POS_TITLE": "配置",
+		"POS": {
+			"FLOATING": "フローティング",
+			"ANCHORED": "固定",
+			"STATIC": "固定",
+			"FLOATING_HELP": "独立して移動し、表示時に中央に再配置されます。",
+			"ANCHORED_HELP": "中央マーカーに対して固定された位置に留まります。",
+			"STATIC_HELP": "どのセットにも属していません。リセンターされません。"
+		},
+		"AUTOSTART": "起動時に自動実行",
+		"LAUNCH": "起動"
+	},
+	"DISPLAY_BRIGHTNESS": "ディスプレイの明るさ",
+	"PROCESS_LIST": "プロセスリスト",
+	"REFRESH": "更新",
+	"PROCESS": {
+		"STOP": "停止",
+		"FORCE_KILL": "強制終了"
+	},
+	"DEBUG_INFO": "デバッグ情報",
+	"CREATION_DATE": "作成日",
+	"DOWNLOADER": "ダウンローダー",
+	"DOWNLOAD_AGAIN": "再ダウンロード",
+	"DOWNLOADING_FILE": "ファイルをダウンロード中...",
+	"GETTING_STARTED": "はじめに",
+	"MODIFICATION_DATE": "更新日",
+	"LOADING": "読み込み中...",
+	"APPLY": "適用",
+	"RELOAD_FROM_DISK": "ディスクからリロード",
+	"TARGET_PATH": "ターゲットパス",
+	"VERSION": "バージョン",
+	"DONATE": {
+		"SUPPORT_US": "私たちを支援する",
+		"DESCRIPTION": "私たちは、空き時間にWayVRを開発している2人の開発者からなる小さなチームです。もしこのソフトウェアを気に入っていただけたなら、ぜひ支援をご検討ください。皆様からの寄付は、開発を継続していくための大きな助けとなります。",
+		"BUTTON_TOOLTIP": "Open Collectiveで寄付する",
+		"CURRENT_SUPPORTERS": "現在のサポーター",
+		"THANK_YOU_WAYVR": "WayVRチーム一同より、感謝を込めて！"
+	},
+	"WELCOME": {
+		"ALL_SET": "準備完了です！",
+		"BASICS": "これらの基本操作を学ぶことで、WayVRを簡単に使い始めることができます。",
+		"FEATURES_DOCUMENTATION": "他にもカスタマイズする価値のある機能がたくさんあります。詳細については、以下のドキュメントを確認してください。",
+		"FINISH_TUTORIAL": "チュートリアルを終了する",
+		"GRAB_BOTH_HANDS": "セット内の特定のオーバーレイを移動させたい場合は、両手で掴んでください。",
+		"GRAB_ONE_HAND": "片手で掴んでセットを移動させます。",
+		"GREETING": "こんにちは！",
+		"GUIDE_INTRO": "最初の手順をご案内します。",
+		"LASER_COLORS": "レーザーの色",
+		"LASER_FUNCTIONALITY": "WayVRの機能の多くは、UI要素を操作する際に使用されるレーザーの色に依存しています。これらのボタンは押す必要はなく、ただ触れるだけで操作できます！",
+		"LAST_PAGE_INFO": "最後のページに到達すると、このチュートリアルは表示されなくなります。",
+		"LOOK_AT_LEFT_WRIST": "左手首を見てください。それがあなたのWatchです。",
+		"MIDDLE_CLICK_MODE_PURPLE_LASER": "— ミドルクリックモード：紫色のレーザー",
+		"MOVING_YOUR_SET": "セットを移動中",
+		"NEXT_BUTTON": "「次へ」ボタンを押して開始してください。",
+		"REGULAR_MODE_BLUE_LASER": "— 通常モード: ブルーレーザー",
+		"REPOSITION_THIS_WINDOW_BY_GRABBING": "コントローラーのグリップアクションを使用して、このウィンドウの位置を再設定します。",
+		"RIGHT_CLICK_MODE_ORANGE_LASER": "— 右クリックモード：オレンジ色のレーザー",
+		"THANKS_FOR_INSTALLING": "WayVRをインストールしていただきありがとうございます！",
+		"WATCH": "Watch",
+		"WORKING_SET": "ワーキングセット",
+		"DOUBLE_PRESS_TO_TOGGLE": "Bボタン（Index）またはYボタン（Meta）を2回押して、セットの表示・中心合わせ・非表示を切り替えてください。今すぐ試してみましょう。",
+		"CENTER_MARKER": "リセンタリング時に目の前に表示されるのがセンターマーカーです。このマーカーを中心にオーバーレイを配置してください！"
+	},
+	"DOWNLOAD": "ダウンロード",
+	"SAVED_TO_FAVOURITES": "お気に入りに保存しました",
+	"ADD_TO_FAVOURITES": "お気に入りに追加",
+	"ADD_TO_FAVOURITES_HINT": "プリセットを保存してアプリドロワーにピン留めします",
+	"REMOVE_FROM_FAVOURITES": "お気に入りから削除",
+	"EMPTY": "空",
+	"PINNED_APPS": "ピン留めされたアプリケーション"
+}
diff --git a/dash-frontend/assets/lang/pl.json b/dash-frontend/assets/lang/pl.json
index 2f5f83fa..aa372bd0 100644
--- a/dash-frontend/assets/lang/pl.json
+++ b/dash-frontend/assets/lang/pl.json
@@ -1,166 +1,331 @@
 {
-  "ACTIONS": {
-    "RECENTER_PLAYSPACE": "Wycentruj przestrzeń"
-  },
-  "APP_SETTINGS": {
-    "HIDE_USERNAME": "Ukryj nazwę użytkownika",
-    "OPAQUE_BACKGROUND": "Nieprzezroczyste tło",
-    "LOOK_AND_FEEL": "Wygląd i działanie",
-    "HIDE_GRAB_HELP": "Ukryj pomoc dotyczącą chwytania",
-    "ANIMATION_SPEED": "Prędkość animacji UI",
-    "ROUND_MULTIPLIER": "Zaokrąglenie krawędzi UI",
-    "USE_SKYBOX": "Włącz niebo",
-    "USE_PASSTHROUGH": "Włącz passthrough",
-    "CLOCK_12H": "Zegar 12-godzinny",
-    "FEATURES": "Funkcje",
-    "NOTIFICATIONS_ENABLED": "Włącz powiadomienia",
-    "NOTIFICATIONS_SOUND_ENABLED": "Dźwięki powiadomień",
-    "KEYBOARD_SOUND_ENABLED": "Dźwięki klawiatury",
-    "SPACE_DRAG_MULTIPLIER": "Mnożnik przesuwania przestrzeni",
-    "SPACE_DRAG_UNLOCKED": "Pozwól na przesuwanie przestrzeni na wszystkich osiach",
-    "SPACE_ROTATE_UNLOCKED": "Pozwól na rotację przestrzeni na wszystkich osiach",
-    "BLOCK_GAME_INPUT": "Blokuj input z gry",
-    "BLOCK_GAME_INPUT_IGNORE_WATCH": "Nie blokuj inputu gry, gdy zegarek jest używany",
-    "CONTROLS": "Sterowanie",
-    "FOCUS_FOLLOWS_MOUSE_MODE": "Ruch myszą po dotknięciu spustu",
-    "LEFT_HANDED_MOUSE": "Myszka dla leworęcznych",
-    "ALLOW_SLIDING": "Interakcja z drążkami podczas chwytania",
-    "INVERT_SCROLL_DIRECTION_X": "Odwróć kierunek przewijania w poziomie",
-    "INVERT_SCROLL_DIRECTION_Y": "Odwróć kierunek przewijania w pionie",
-    "SCROLL_SPEED": "Prędkość przewijania",
-    "LONG_PRESS_DURATION": "Czas długiego przytrzymania",
-    "POINTER_LERP_FACTOR": "Wygładzanie wskaźnika",
-    "XR_CLICK_SENSITIVITY": "Czułość kliknięć XR",
-    "XR_CLICK_SENSITIVITY_RELEASE": "Czułość zwalniania XR",
-    "CLICK_FREEZE_TIME_MS": "Czas zamrożenia po kliknięciu (ms)",
-    "XWAYLAND_BY_DEFAULT": "Uruchamiaj aplikacje domyślnie w trybie kompatybilności",
-    "UPRIGHT_SCREEN_FIX": "Naprawa pozycji ekranu",
-    "DOUBLE_CURSOR_FIX": "Naprawa podwójnego kursora",
-    "SCREEN_RENDER_DOWN": "Renderuj ekran w niższej rozdzielczości",
-    "UPRIGHT_SCREEN_FIX_HELP": "Naprawia pionowe ekrany na niektórych komputerach",
-    "DOUBLE_CURSOR_FIX_HELP": "Włącz to, jeśli widzisz 2 kursory",
-    "XR_CLICK_SENSITIVITY_HELP": "Czułość analogowego spustu",
-    "XR_CLICK_SENSITIVITY_RELEASE_HELP": "Musi być niższa niż kliknięcie",
-    "CLICK_FREEZE_TIME_MS_HELP": "Pomaga w precyzji podwójnego kliknięcia",
-    "LEFT_HANDED_MOUSE_HELP": "Użyj tego, jeśli przyciski myszy są zamienione",
-    "BLOCK_GAME_INPUT_HELP": "Blokuje wszystkie dane wejściowe, gdy kursor najedzie na nakładkę",
-    "BLOCK_GAME_INPUT_IGNORE_WATCH_HELP": "Nie blokuj inputu, gdy wskaźnik jest najedzony",
-    "USE_SKYBOX_HELP": "Wyświetlaj niebo, jeśli nie ma aplikacji sceny lub passthrough",
-    "USE_PASSTHROUGH_HELP": "Pozwól na passthrough, jeśli runtime XR to obsługuje",
-    "SCREEN_RENDER_DOWN_HELP": "Pomaga redukować aliasing na ekranach o wysokiej rozdzielczości",
-    "SETS_ON_WATCH": "Lista zestawów na zegarku",
-    "TROUBLESHOOTING": "Rozwiązywanie problemów",
-    "CLEAR_SAVED_STATE": "Wyczyść zapisany stan",
-    "CLEAR_PIPEWIRE_TOKENS": "Wyczyść tokeny PipeWire",
-    "DELETE_ALL_CONFIGS": "Wyczyść konfigurację",
-    "RESTART_SOFTWARE": "Restartuj WayVR",
-    "CLEAR_SAVED_STATE_HELP": "Zresetuj zestawy i pozycje nakładek",
-    "CLEAR_PIPEWIRE_TOKENS_HELP": "Zapytaj o wybór ekranu przy następnym uruchomieniu",
-    "DELETE_ALL_CONFIGS_HELP": "Usuń wszystkie pliki konfiguracyjne z katalogu conf.d",
-    "RESTART_SOFTWARE_HELP": "Zastosuj ustawienia wymagające ponownego uruchomienia",
-    "CAPTURE_METHOD": "Przechwytywanie ekranu Wayland",
-    "CAPTURE_METHOD_HELP": "Spróbuj zmienić tę opcję, jeśli masz\nproblemy z czarnym lub migoczącym ekranem",
-    "KEYBOARD_MIDDLE_CLICK": "Środkowy przycisk myszy na klawiaturze",
-    "KEYBOARD_MIDDLE_CLICK_HELP": "Modyfikator, który ma zostać użyty podczas pisania\nfioletową wiązką lasera",
-    "OPTION": {
-      "AUTO": "Automatycznie",
-      "AUTO_HELP": "Skopiuj ekran za pomocą GPU, jeśli obsługiwane,\nw przeciwnym razie GPU PipeWire.",
-      "PIPEWIRE_HELP": "Szybkie przechwytywanie GPU,\nstandard na wszystkich komputerach.",
-      "PW_FALLBACK_HELP": "Powolna metoda z wysokim użyciem procesora.\nWypróbuj w przypadku, gdy PipeWire GPU nie działa",
-      "SCREENCOPY_GPU_HELP": "Szybkie działanie, brak wyskakujących okien z informacją o udostępnianiu ekranu.\nDziała na: Hyprland, Niri, River, Sway",
-      "SCREENCOPY_HELP": "Wolne, bez wyskakujących okienek udostępniania ekranu.\nDziała na: Hyprland, Niri, River, Sway",
-      "NONE": "Brak",
-      "HMD_PINCH": "HMD + ściśnięcie placami",
-      "EYE_PINCH": "Ściśnięcie palcami + oko",
-      "EYE_ONLY": "Tylko oko",
-      "HMD_ONLY": "Tylko HMD"
-    },
-    "AUTOSTART_APPS": "Aplikacje auto-start",
-    "HANDSFREE_POINTER": "Tryb bez użycia rąk",
-    "HANDSFREE_POINTER_HELP": "Wejście do użycia, gdy kontrolery ruchu\nsą niedostępne. Lewy szczyptak to chwyt,\nprawy to kliknięcie.",
-    "UI_GRADIENT_INTENSITY": "Intensywność gradientu UI",
-    "RESET_PLAYSPACE": "Zresetuj przestrzeń gry",
-    "RESET_PLAYSPACE_HELP": "Wyczyść przesunięcie przestrzeni gry.",
-    "BLOCK_POSES_ON_KBD_INTERACTION": "Blokuj pozy podczas interakcji z klawiaturą",
-    "BLOCK_POSES_ON_KBD_INTERACTION_HELP": "Blokuje odbieranie póz przez grę, gdy kursor myszy znajduje się nad klawiaturą i włączona jest opcja 'Blokuj dane wejściowe z gry'",
-    "LANGUAGE": "Język",
-    "REQUIRES_RESTART": "Wymaga restartu",
-    "MISC": "Różne",
-    "GRID_OPACITY": "Przezroczystość siatki podłogowej",
-    "GRID_OPACITY_HELP": "Przezroczystość siatki podłogowej, gdy włączony jest skybox"
-  },
-  "APPLICATION_LAUNCHER": "Uruchamiacz aplikacji",
-  "APPLICATIONS": "Aplikacje",
-  "AUDIO": {
-    "AUTO_SWITCH_TO_VR_AUDIO": "Automatyczne przełączanie na dźwięk VR",
-    "CARDS": "Karty",
-    "FAILED_TO_SWITCH_MICROPHONE": "Nie udało się przełączyć mikrofon",
-    "MICROPHONE_SET_SUCCESSFULLY": "Mikrofon ustawiono pomyślnie",
-    "MICROPHONES": "Mikrofony",
-    "NO_VR_MICROPHONE_SWITCH_MANUALLY": "Brak mikrofonu VR. Włącz go ręcznie.",
-    "NO_VR_SPEAKERS_FOUND_SWITCH_MANUALLY": "Brak głośników VR. Włącz je ręcznie.",
-    "SELECT_AUDIO_CARD_PROFILE": "Wybierz profil karty dźwiękowej",
-    "SETTINGS": "Ustawienia dźwięku",
-    "SPEAKERS": "Głośniki",
-    "SPEAKERS_SET_SUCCESSFULLY": "Głośniki ustawiono pomyślnie",
-    "VOLUME": "Głośność"
-  },
-  "GAMES": "Gry",
-  "GENERAL_SETTINGS": "Ustawienia ogólne",
-  "HEIGHT": "Wysokość",
-  "HELLO": "Witaj!",
-  "HELLO_USER": "Witaj, {USER}!",
-  "HIDE": "Ukryj",
-  "HOME_SCREEN": "Ekran główny",
-  "MONADO_RUNTIME": "Środowisko Monado",
-  "POPUP_ADD_DISPLAY": {
-    "RESOLUTION": "Rozdzielczość"
-  },
-  "REMOVE": "Usuń",
-  "SETTINGS": "Ustawienia",
-  "SHOW": "Pokaż",
-  "WIDTH": "Szerokość",
-  "FAILED_TO_LAUNCH_APPLICATION": "Nie udało się uruchomić aplikacji:",
-  "APPLICATION_STARTED": "Aplikacja uruchomiona",
-  "CLOSE_WINDOW": "Zamknij okno",
-  "GAME_LIST": {
-    "NO_GAMES_FOUND": "Nie znaleziono gier",
-    "RUNNING_GAMES_LIST": "Lista uruchomionych gier"
-  },
-  "TERMINATE_PROCESS": "Zakończ proces",
-  "GAME_LAUNCHED": "Gra uruchomiona",
-  "APP_LAUNCHER": {
-    "MODE": {
-      "NATIVE": "Tryb natywny",
-      "CAGE": "Tryb kompatybilności (Cage)"
-    },
-    "RES_TITLE": "Rozdzielczość",
-    "ASPECT_TITLE": "Proporcje",
-    "ASPECT": {
-      "WIDE": "Szeroki",
-      "SEMI_WIDE": "Półszeroki",
-      "SQUARE": "Kwadrat",
-      "SEMI_TALL": "Pół-wysoki",
-      "TALL": "Wysoki"
-    },
-    "POS_TITLE": "Pozycjonowanie",
-    "POS": {
-      "FLOATING": "Pływający",
-      "ANCHORED": "Przymocowane",
-      "STATIC": "Statyczny",
-      "FLOATING_HELP": "Porusza się niezależnie, wycentrowuje się po otwarciu.",
-      "ANCHORED_HELP": "Pozostaje nieruchoma względem centralnego znacznika.",
-      "STATIC_HELP": "Nie należy do żadnego zestawu. Nie wyśrodkowuje."
-    },
-    "AUTOSTART": "Uruchom automatycznie przy starcie",
-    "LAUNCH": "Uruchom"
-  },
-  "DISPLAY_BRIGHTNESS": "Jasność wyświetlacza",
-  "PROCESS_LIST": "Lista procesów",
-  "REFRESH": "Odśwież",
-  "PROCESS": {
-    "STOP": "Zatrzymaj",
-    "FORCE_KILL": "Wymuś zakończenie"
-  },
-  "DEBUG_INFO": "Informacje debugowania"
-}
\ No newline at end of file
+	"ACTIONS": {
+		"RECENTER_PLAYSPACE": "Wycentruj przestrzeń"
+	},
+	"APP_SETTINGS": {
+		"HIDE_USERNAME": "Ukryj nazwę użytkownika",
+		"OPAQUE_BACKGROUND": "Nieprzezroczyste tło",
+		"LOOK_AND_FEEL": "Wygląd i działanie",
+		"HIDE_GRAB_HELP": "Ukryj pomoc dotyczącą chwytania",
+		"ANIMATION_SPEED": "Prędkość animacji UI",
+		"ROUND_MULTIPLIER": "Zaokrąglenie krawędzi UI",
+		"USE_SKYBOX": "Włącz niebo",
+		"USE_PASSTHROUGH": "Włącz passthrough",
+		"CLOCK_12H": "Zegar 12-godzinny",
+		"FEATURES": "Funkcje",
+		"NOTIFICATIONS_ENABLED": "Włącz powiadomienia",
+		"NOTIFICATIONS_SOUND_ENABLED": "Dźwięki powiadomień",
+		"KEYBOARD_SOUND_ENABLED": "Dźwięki klawiatury",
+		"SPACE_DRAG_MULTIPLIER": "Mnożnik przesuwania przestrzeni",
+		"SPACE_DRAG_UNLOCKED": "Pozwól na przesuwanie przestrzeni na wszystkich osiach",
+		"SPACE_ROTATE_UNLOCKED": "Pozwól na rotację przestrzeni na wszystkich osiach",
+		"BLOCK_GAME_INPUT": "Blokuj input z gry",
+		"BLOCK_GAME_INPUT_IGNORE_WATCH": "Nie blokuj inputu gry, gdy zegarek jest używany",
+		"CONTROLS": "Sterowanie",
+		"FOCUS_FOLLOWS_MOUSE_MODE": "Ruch myszą po dotknięciu spustu",
+		"LEFT_HANDED_MOUSE": "Myszka dla leworęcznych",
+		"ALLOW_SLIDING": "Interakcja z drążkami podczas chwytania",
+		"INVERT_SCROLL_DIRECTION_X": "Odwróć kierunek przewijania w poziomie",
+		"INVERT_SCROLL_DIRECTION_Y": "Odwróć kierunek przewijania w pionie",
+		"SCROLL_SPEED": "Prędkość przewijania",
+		"LONG_PRESS_DURATION": "Czas długiego przytrzymania",
+		"POINTER_LERP_FACTOR": "Wygładzanie wskaźnika",
+		"CLICK_FREEZE_TIME_MS": "Czas zamrożenia po kliknięciu (ms)",
+		"XWAYLAND_BY_DEFAULT": "Uruchamiaj aplikacje domyślnie w trybie kompatybilności",
+		"UPRIGHT_SCREEN_FIX": "Naprawa pozycji ekranu",
+		"DOUBLE_CURSOR_FIX": "Naprawa podwójnego kursora",
+		"SCREEN_RENDER_DOWN": "Renderuj ekran w niższej rozdzielczości",
+		"UPRIGHT_SCREEN_FIX_HELP": "Naprawia pionowe ekrany na niektórych komputerach",
+		"DOUBLE_CURSOR_FIX_HELP": "Włącz to, jeśli widzisz 2 kursory",
+		"CLICK_FREEZE_TIME_MS_HELP": "Pomaga w precyzji podwójnego kliknięcia",
+		"LEFT_HANDED_MOUSE_HELP": "Użyj tego, jeśli przyciski myszy są zamienione",
+		"BLOCK_GAME_INPUT_HELP": "Blokuje wszystkie dane wejściowe, gdy kursor najedzie na nakładkę",
+		"BLOCK_GAME_INPUT_IGNORE_WATCH_HELP": "Nie blokuj inputu, gdy wskaźnik jest najedzony",
+		"USE_SKYBOX_HELP": "Wyświetlaj niebo, jeśli nie ma aplikacji sceny lub passthrough",
+		"USE_PASSTHROUGH_HELP": "Pozwól na passthrough, jeśli runtime XR to obsługuje",
+		"SCREEN_RENDER_DOWN_HELP": "Pomaga redukować aliasing na ekranach o wysokiej rozdzielczości",
+		"ENABLE_WATCH": "Włącz zegarek",
+		"SETS_ON_WATCH": "Lista zestawów na zegarku",
+		"TROUBLESHOOTING": "Rozwiązywanie problemów",
+		"CLEAR_SAVED_STATE": "Wyczyść zapisany stan",
+		"CLEAR_PIPEWIRE_TOKENS": "Wyczyść tokeny PipeWire",
+		"DELETE_ALL_CONFIGS": "Wyczyść konfigurację",
+		"RESTART_SOFTWARE": "Restartuj WayVR",
+		"CLEAR_SAVED_STATE_HELP": "Zresetuj zestawy i pozycje nakładek",
+		"CLEAR_PIPEWIRE_TOKENS_HELP": "Zapytaj o wybór ekranu przy następnym uruchomieniu",
+		"DELETE_ALL_CONFIGS_HELP": "Usuń wszystkie pliki konfiguracyjne z katalogu conf.d",
+		"RESTART_SOFTWARE_HELP": "Zastosuj ustawienia wymagające ponownego uruchomienia",
+		"CAPTURE_METHOD": "Przechwytywanie ekranu Wayland",
+		"CAPTURE_METHOD_HELP": "Spróbuj zmienić tę opcję, jeśli masz\nproblemy z czarnym lub migoczącym ekranem",
+		"KEYBOARD_MIDDLE_CLICK": "Środkowy przycisk myszy na klawiaturze",
+		"KEYBOARD_MIDDLE_CLICK_HELP": "Modyfikator, który ma zostać użyty podczas pisania\nfioletową wiązką lasera",
+		"OPTION": {
+			"AUTO": "Automatycznie",
+			"AUTO_HELP": "Skopiuj ekran za pomocą GPU, jeśli obsługiwane,\nw przeciwnym razie GPU PipeWire.",
+			"PIPEWIRE_HELP": "Szybkie przechwytywanie GPU,\nstandard na wszystkich komputerach.",
+			"PW_FALLBACK_HELP": "Powolna metoda z wysokim użyciem procesora.\nWypróbuj w przypadku, gdy PipeWire GPU nie działa",
+			"SCREENCOPY_GPU_HELP": "Szybkie działanie, brak wyskakujących okien z informacją o udostępnianiu ekranu.\nDziała na: Hyprland, Niri, River, Sway",
+			"SCREENCOPY_HELP": "Wolne, bez wyskakujących okienek udostępniania ekranu.\nDziała na: Hyprland, Niri, River, Sway",
+			"NONE": "Brak",
+			"HMD_PINCH": "HMD + ściśnięcie placami",
+			"EYE_PINCH": "Ściśnięcie palcami + oko",
+			"NONE_INPUT_HELP": "Nie emuluj myszy ani klawiatury.\nBrak możliwości interakcji z ekranami.",
+			"UINPUT": "Emulacja urządzenia",
+			"WL_VIRTUAL": "Wirtualne wejście Wayland",
+			"WL_VIRTUAL_HELP": "Wysyłaj wejście myszki/klawiatury do kompozytora Wayland za pomocą\nzwlr_virtual_pointer i zwp_virtual_keyboard.\nDziała niezawodnie tylko na niektórych pulpitach.\nNIE działa na KDE, GNOME ani COSMIC.",
+			"EYE_ONLY": "Laser oczami",
+			"HMD_ONLY": "Laser HMD",
+			"NONE_INPUT_CAPTURE_HELP": "Nie przechwytuj myszy i klawiatury.\nFizyczna mysz lub klawiatura nie będą\ndostępne w aplikacjach uruchomionych w WayVR.",
+			"UINPUT_HELP": "Używa modułu uinput do emulacji urządzenia.\nSprawdzono, że działa dobrze na większości komputerów stacjonarnych.",
+			"EVDEV_HELP": "Przejmij urządzenia wejściowe do wyłącznego użytku.\nUżytkownik musi należeć do grupy 'input'."
+		},
+		"AUTOSTART_APPS": "Aplikacje auto-start",
+		"HANDSFREE_POINTER": "Tryb bez użycia rąk",
+		"HANDSFREE_POINTER_HELP": "Wejście do użycia, gdy kontrolery ruchu\nsą niedostępne. Lewy szczyptak to chwyt,\nprawy to kliknięcie.",
+		"UI_GRADIENT_INTENSITY": "Intensywność gradientu UI",
+		"RESET_PLAYSPACE": "Zresetuj przestrzeń gry",
+		"RESET_PLAYSPACE_HELP": "Wyczyść przesunięcie przestrzeni gry.",
+		"BLOCK_POSES_ON_KBD_INTERACTION": "Blokuj pozy podczas interakcji z klawiaturą",
+		"BLOCK_POSES_ON_KBD_INTERACTION_HELP": "Blokuje odbieranie póz przez grę, gdy kursor myszy znajduje się nad klawiaturą i włączona jest opcja 'Blokuj dane wejściowe z gry'",
+		"LANGUAGE": "Język",
+		"REQUIRES_RESTART": "Wymaga restartu",
+		"MISC": "Różne",
+		"GRID_OPACITY": "Przezroczystość siatki podłogowej",
+		"GRID_OPACITY_HELP": "Przezroczystość siatki podłogowej, gdy włączony jest skybox",
+		"BROWSE_ONLINE_CATALOG": "Przeglądaj katalog online...",
+		"BROWSE_SKYMAPS": "Przeglądaj skymaps",
+		"COLOR_KEYING": "Kluczowanie kolorem",
+		"NO_SKYMAPS_FOUND": "Nie znaleziono skymap",
+		"SELECT_VARIANT": "Wybierz wariant",
+		"SHOW_WELCOME_SCREEN": "Pokaż ekran powitalny",
+		"SKYBOX": "Skymap",
+		"SKYMAP_ALREADY_DOWNLOADED": "Ta skymapa została już pobrana. Wybierz żądaną akcję.",
+		"WATCH_VIEW_ANGLE": "Kąty widzenia Watch",
+		"WATCH_VIEW_ANGLE_HELP": "Kontroluj, jak zegarek zanika",
+		"BINDINGS": {
+			"COMP": {
+				"CLICK": "Kliknięcie",
+				"FORCE": "Siła",
+				"TOUCH": "Dotyk",
+				"VALUE": "Wartość",
+				"PROXIMITY": "Bliskość",
+				"X_AXIS": "Oś X",
+				"Y_AXIS": "Oś Y"
+			},
+			"TYPE": {
+				"BUMPER": "Bumper",
+				"DPAD_UP": "D-pad w górę",
+				"DPAD_DOWN": "D-pad w dół",
+				"DPAD_LEFT": "D-pad w lewo",
+				"DPAD_RIGHT": "D-pad w prawo",
+				"JOYSTICK": "Joystick",
+				"MENU": "Menu",
+				"SHOULDER": "Boczny przycisk",
+				"SQUEEZE": "Chwyt",
+				"SYSTEM": "System",
+				"THUMBREST": "Thumbrest",
+				"THUMBSTICK": "Thumbstick",
+				"TRACKPAD": "Trackpad",
+				"TRIGGER": "Spust",
+				"VIEW": "Widok"
+			},
+			"CLICK": {
+				"ANY": "Dowolny",
+				"DOUBLE": "Podwójne kliknięcie",
+				"TRIPLE": "Potrójne kliknięcie",
+				"TYPE": "Liczba kliknięć"
+			},
+			"ACTION": {
+				"CLICK": "Kliknięcie*",
+				"GRAB": "Chwyć*",
+				"ALT_CLICK": "Własne polecenie shell exec (ustaw alt_click w konfiguracji)",
+				"SHOW_HIDE": "Pokaż, ukryj, wycentruj ponownie*",
+				"TOGGLE_DASHBOARD": "Przełącz dashboard",
+				"SPACE_DRAG": "Przesuwanie Playspace",
+				"SPACE_ROTATE": "Obrót Playspace",
+				"SPACE_RESET": "Resetowanie playspace",
+				"CLICK_MODIFIER_RIGHT": "Modyfikator prawego kliknięcia",
+				"CLICK_MODIFIER_MIDDLE": "Modyfikator środkowego kliknięcia",
+				"MOVE_MOUSE": "Ruszaj myszą (jeśli domyślnie wyłączone)",
+				"SCROLL": "Przewijanie*"
+			},
+			"LEFT": "Lewy",
+			"RIGHT": "Prawy",
+			"COMPONENT": "Typ aktywacji",
+			"SUBPATH": "Sterowanie aktywacją",
+			"THRESHOLD": "Aktywuj po przekroczeniu górnej wartości\nDezaktywuj po spadku poniżej dolnej wartości"
+		},
+		"ENABLED": "Włączone",
+		"INPUT_EMULATION_METHOD": "Metoda emulacji wejścia",
+		"INPUT_EMULATION_METHOD_HELP": "Spróbuj zmienić tę opcję w przypadku, gdy wejście myszy lub\nklawiatury nie jest rejestrowane.",
+		"INPUT_PROFILES": "Zmień klawiszologię",
+		"INPUT_PROFILES_HELP": "Przypisania przycisków kontrolera OpenXR",
+		"NOT_SUPPORTED": "Nieobsługiwane",
+		"SPACE_DRAG": "Space-drag",
+		"SPACE_GRAVITY_DAMPING": "Spowalnianie",
+		"SPACE_GRAVITY_DAMPING_HELP": "Sztuczne spowalnianie mające na celu zatrzymywanie ruchu po pewnym czasie. 0.1 - wysokie spowolnienie, 1.0 - brak spowolnienia",
+		"SPACE_GRAVITY_FLING_STRENGTH": "Siła wyrzutu",
+		"SPACE_GRAVITY_FLING_STRENGTH_HELP": "Mnożnik intensywności siły grawitacyjnego wyrzutu po użyciu funkcji space-drag.\n0.0 - brak ruchu, 2.0 - podwójna intensywność",
+		"SPACE_GRAVITY_GRAVITY": "Grawitacja",
+		"SPACE_GRAVITY_GRAVITY_HELP": "Wielkość siły działającej w dół. 0.0 - brak grawitacji",
+		"SPACE_GRAVITY_GROUND_FRICTION": "Tarcie podłoża",
+		"SPACE_GRAVITY_GROUND_FRICTION_HELP": "Moc tarcia spowalniającego Cię podczas kontaktu z podłożem.\n0.0 - brak tarcia (jak na lodzie), 1.0 - chropowata powierzchnia",
+		"SPACE_GRAVITY_FLOOR_HEIGHT": "Wysokość podłogi",
+		"SPACE_GRAVITY_FLOOR_HEIGHT_HELP": "Pozycja Y, w której znajduje się podłoga. Grawitacja przestaje działać po osiągnięciu tej wysokości.",
+		"SAVE": "Zapisz",
+		"CANCEL": "Anuluj",
+		"WHISPER": {
+			"NEED_TO_DOWNLOAD_MODEL": "Wybrany model musi zostać pobrany.\nPobrać go teraz?",
+			"REMOVE_UNUSED_MODELS": "Wyłączasz funkcję zamiany mowy na tekst.\nCzy chcesz usunąć pobrane modele Whisper, aby zwolnić miejsce?"
+		},
+		"WHISPER_MODEL": "Model mowy na tekst",
+		"WHISPER_MODEL_HELP": "Model Whisper do wykorzystania.\nWiększe modele dają dokładniejsze\nwyniki, ale zużywają więcej pamięci VRAM.",
+		"DEFAULT_OVERLAY_SCALE": "Domyślny rozmiar nakładki",
+		"DEFAULT_OVERLAY_SCALE_HELP": "Twórz nowe nakładki w tej skali.",
+		"COLOR_PALETTE": "Paleta kolorów",
+		"COLOR_PALETTES": "Palety kolorów",
+		"COLOR_PALETTE_CURRENT": "Obecnie aktywny motyw.",
+		"COLOR_PALETTE_ACTIVATE": "Kliknij, aby użyć tego motywu.",
+		"COLOR_PALETTE_HELP": "Kliknij, aby przeglądać palety kolorów.\nAby stworzyć własne, odwiedź stronę internetową!",
+		"COLOR_PALETTE_CUSTOM_URL": "Dodaj własny motyw!",
+		"COLOR_PALETTE_CUSTOM_URL2": "Kliknij, aby otworzyć instrukcję internetową.",
+		"SNAP_ANGLE_DEG": "Kąt przyciągania pochylenia i przechyłu okna",
+		"SNAP_ANGLE_DEG_HELP": "Chwycone okna przyciągają się do tego kąta na osi pochylenia i obrotu.",
+		"SAVE_PLAYSPACE_CENTER": "Zapisz centrum obszaru gry",
+		"SAVE_PLAYSPACE_CENTER_HELP": "Użyj aktualnego obszaru gry dla przypisania resetowania obszaru gry.",
+		"RESET_PLAYSPACE_CENTER": "Zresetuj środek obszaru gry",
+		"RESET_PLAYSPACE_CENTER_HELP": "Wyczyść poprzednio ustawiony środek obszaru playspace.",
+		"HANDSFREE_ALT_TAB": "Cel przełącznika aplikacji",
+		"HANDSFREE_ALT_TAB_HELP": "Przytrzymaj Super+X, wyceluj w żądane okno, a następnie puść, aby zmienić fokus.",
+		"INPUT_CAPTURE_METHOD": "Metoda przechwytywania wejścia",
+		"POINTER_ACCELERATION": "Akceleracja myszy",
+		"POINTER_ACCELERATION_HELP": "Wł.: Adaptacyjna akceleracja myszy\nWył.: Stała prędkość",
+		"POINTER_SPEED": "Prędkość myszy",
+		"INPUT_CAPTURE_METHOD_HELP": "Umożliwia korzystanie z fizycznych urządzeń peryferyjnych wewnątrz WayVR.\n Super+Z: Przełącz wejście między WayVR a rzeczywistym pulpitem\n Super+X: Przełącz między aplikacjami WayVR",
+		"SPACE_DRAG_AFFECTS_WORLD": "Space-drag przesuwa nakładki"
+	},
+	"APPLICATION_LAUNCHER": "Uruchamiacz aplikacji",
+	"APPLICATIONS": "Aplikacje",
+	"AUDIO": {
+		"AUTO_SWITCH_TO_VR_AUDIO": "Automatyczne przełączanie na dźwięk VR",
+		"CARDS": "Karty",
+		"FAILED_TO_SWITCH_MICROPHONE": "Nie udało się przełączyć mikrofon",
+		"MICROPHONE_SET_SUCCESSFULLY": "Mikrofon ustawiono pomyślnie",
+		"MICROPHONES": "Mikrofony",
+		"NO_VR_MICROPHONE_SWITCH_MANUALLY": "Brak mikrofonu VR. Włącz go ręcznie.",
+		"NO_VR_SPEAKERS_FOUND_SWITCH_MANUALLY": "Brak głośników VR. Włącz je ręcznie.",
+		"SELECT_AUDIO_CARD_PROFILE": "Wybierz profil karty dźwiękowej",
+		"SETTINGS": "Ustawienia dźwięku",
+		"SPEAKERS": "Głośniki",
+		"SPEAKERS_SET_SUCCESSFULLY": "Głośniki ustawiono pomyślnie",
+		"VOLUME": "Głośność"
+	},
+	"GAMES": "Gry",
+	"GENERAL_SETTINGS": "Ustawienia ogólne",
+	"HEIGHT": "Wysokość",
+	"HELLO": "Witaj!",
+	"HELLO_USER": "Witaj, {USER}!",
+	"HIDE": "Ukryj",
+	"HOME_SCREEN": "Ekran główny",
+	"MONADO_RUNTIME": "Środowisko Monado",
+	"POPUP_ADD_DISPLAY": {
+		"RESOLUTION": "Rozdzielczość"
+	},
+	"REMOVE": "Usuń",
+	"SETTINGS": "Ustawienia",
+	"SHOW": "Pokaż",
+	"WIDTH": "Szerokość",
+	"FAILED_TO_LAUNCH_APPLICATION": "Nie udało się uruchomić aplikacji:",
+	"APPLICATION_STARTED": "Aplikacja uruchomiona",
+	"CLOSE_WINDOW": "Zamknij okno",
+	"GAME_LIST": {
+		"NO_GAMES_FOUND": "Nie znaleziono gier",
+		"RUNNING_GAMES_LIST": "Lista uruchomionych gier"
+	},
+	"TERMINATE_PROCESS": "Zakończ proces",
+	"GAME_LAUNCHED": "Gra uruchomiona",
+	"APP_LAUNCHER": {
+		"MODE": {
+			"NATIVE": "Tryb natywny",
+			"CAGE": "Tryb kompatybilności (Cage)"
+		},
+		"RES_TITLE": "Rozdzielczość",
+		"ASPECT_TITLE": "Proporcje",
+		"ASPECT": {
+			"WIDE": "Szeroki",
+			"SEMI_WIDE": "Półszeroki",
+			"SQUARE": "Kwadrat",
+			"SEMI_TALL": "Pół-wysoki",
+			"TALL": "Wysoki"
+		},
+		"POS_TITLE": "Pozycjonowanie",
+		"POS": {
+			"FLOATING": "Pływający",
+			"ANCHORED": "Przymocowane",
+			"STATIC": "Statyczny",
+			"FLOATING_HELP": "Porusza się niezależnie, wycentrowuje się po otwarciu.",
+			"ANCHORED_HELP": "Pozostaje nieruchoma względem centralnego znacznika.",
+			"STATIC_HELP": "Nie należy do żadnego zestawu. Nie wyśrodkowuje."
+		},
+		"AUTOSTART": "Uruchom automatycznie przy starcie",
+		"LAUNCH": "Uruchom"
+	},
+	"DISPLAY_BRIGHTNESS": "Jasność wyświetlacza",
+	"PROCESS_LIST": "Lista procesów",
+	"REFRESH": "Odśwież",
+	"PROCESS": {
+		"STOP": "Zatrzymaj",
+		"FORCE_KILL": "Wymuś zakończenie"
+	},
+	"DEBUG_INFO": "Informacje debugowania",
+	"CREATION_DATE": "Data utworzenia",
+	"DOWNLOADER": "Pobieranie",
+	"DOWNLOAD_AGAIN": "Pobierz ponownie",
+	"DOWNLOADING_FILE": "Pobieranie pliku...",
+	"GETTING_STARTED": "Rozpoczęcie",
+	"MODIFICATION_DATE": "Data modyfikacji",
+	"LOADING": "Ładowanie...",
+	"APPLY": "Zastosuj",
+	"RELOAD_FROM_DISK": "Przeładuj z dysku",
+	"TARGET_PATH": "Ścieżka docelowa",
+	"VERSION": "Wersja",
+	"DONATE": {
+		"SUPPORT_US": "Wesprzyj nas",
+		"DESCRIPTION": "Jesteśmy małym, dwuosobowym zespołem programistów, którzy tworzą WayVR w wolnym czasie. Jeśli korzystanie z tego oprogramowania sprawia Ci przyjemność, rozważ wsparcie nas – każda darowizna pomaga nam działać dalej.",
+		"BUTTON_TOOLTIP": "Przekaż darowiznę przez Open Collective",
+		"CURRENT_SUPPORTERS": "Obecni Wspierający",
+		"THANK_YOU_WAYVR": "Dziękujemy od zespołu WayVR!"
+	},
+	"WELCOME": {
+		"ALL_SET": "Wszystko gotowe!",
+		"BASICS": "Te podstawowe informacje pozwolą Ci z łatwością zacząć korzystać z WayVR.",
+		"FEATURES_DOCUMENTATION": "Istnieje wiele innych funkcji, które warto spersonalizować. Aby uzyskać więcej informacji, sprawdź dokumentację pod adresem:",
+		"FINISH_TUTORIAL": "Zakończ samouczek",
+		"GRAB_BOTH_HANDS": "Chwyć to obiema rękami, jeśli chcesz przenieść konkretny overlay ze swojego zestawu.",
+		"GRAB_ONE_HAND": "Chwyć to jedną ręką, aby przemieścić swój zestaw.",
+		"GREETING": "Cześć!",
+		"GUIDE_INTRO": "Pozwól nam przeprowadzić Cię przez Twoje pierwsze kroki.",
+		"LASER_COLORS": "Kolory lasera",
+		"LASER_FUNCTIONALITY": "Wiele funkcji w WayVR zależy od koloru lasera używanego do interakcji z elementami interfejsu użytkownika. Nie musisz naciskać tych przycisków, wystarczy je dotknąć!",
+		"LAST_PAGE_INFO": "Ten samouczek przestanie się pojawiać po dotarciu do ostatniej strony.",
+		"LOOK_AT_LEFT_WRIST": "Spójrz na swój lewy nadgarstek. To jest Twój watch.",
+		"MIDDLE_CLICK_MODE_PURPLE_LASER": "— Tryb środkowego przycisku: Fioletowy laser",
+		"MOVING_YOUR_SET": "Przesuwanie Twojego zestawu",
+		"NEXT_BUTTON": "Naciśnij poniższy przycisk „Dalej”, aby rozpocząć.",
+		"REGULAR_MODE_BLUE_LASER": "— Tryb regularny: Niebieski laser",
+		"REPOSITION_THIS_WINDOW_BY_GRABBING": "Zmień położenie tego okna, używając przycisku chwytu (grip) na kontrolerze.",
+		"RIGHT_CLICK_MODE_ORANGE_LASER": "— Tryb prawego przycisku: Pomarańczowy laser",
+		"THANKS_FOR_INSTALLING": "Dziękujemy za zainstalowanie WayVR!",
+		"WATCH": "Watch",
+		"WORKING_SET": "Aktywny zestaw",
+		"DOUBLE_PRESS_TO_TOGGLE": "Naciśnij dwukrotnie przycisk B (na Index) lub Y (na Meta), aby wyświetlić, wycentrować lub ukryć swój zestaw. Wypróbuj to teraz.",
+		"CENTER_MARKER": "Znacznik środka to punkt, który pojawi się przed Tobą podczas centrowania. Umieść wokół niego nakładki!"
+	},
+	"DOWNLOAD": "Pobierz",
+	"SAVED_TO_FAVOURITES": "Dodano do ulubionych",
+	"ADD_TO_FAVOURITES": "Dodaj do ulubionych",
+	"ADD_TO_FAVOURITES_HINT": "Zapisz ustawienie i przypnij je do szuflady aplikacji",
+	"REMOVE_FROM_FAVOURITES": "Usuń z ulubionych",
+	"EMPTY": "Puste",
+	"PINNED_APPS": "Przypięte aplikacje"
+}
diff --git a/dash-frontend/assets/lang/zh_CN.json b/dash-frontend/assets/lang/zh_CN.json
index 915487e2..a9437312 100644
--- a/dash-frontend/assets/lang/zh_CN.json
+++ b/dash-frontend/assets/lang/zh_CN.json
@@ -1,166 +1,331 @@
 {
-  "ACTIONS": {
-    "RECENTER_PLAYSPACE": "重置游玩区中心"
-  },
-  "APP_LAUNCHER": {
-    "ASPECT": {
-      "SEMI_TALL": "略高",
-      "SEMI_WIDE": "略宽",
-      "SQUARE": "正方形",
-      "TALL": "高",
-      "WIDE": "宽"
-    },
-    "ASPECT_TITLE": "比例",
-    "AUTOSTART": "启动时自动运行",
-    "LAUNCH": "启动",
-    "MODE": {
-      "CAGE": "兼容模式 (Cage)",
-      "NATIVE": "原生模式"
-    },
-    "POS": {
-      "ANCHORED": "锚定",
-      "ANCHORED_HELP": "相对于中心标记保持固定。",
-      "FLOATING": "悬浮",
-      "FLOATING_HELP": "独立移动，显示时自动重置中心。",
-      "STATIC": "静态",
-      "STATIC_HELP": "不属于任何集合。不会重置中心。"
-    },
-    "POS_TITLE": "定位",
-    "RES_TITLE": "分辨率"
-  },
-  "APP_SETTINGS": {
-    "ALLOW_SLIDING": "抓取时允许摇杆交互",
-    "ANIMATION_SPEED": "UI 动画速度",
-    "BLOCK_GAME_INPUT": "屏蔽游戏输入",
-    "BLOCK_GAME_INPUT_HELP": "悬停在覆盖层上时屏蔽所有输入",
-    "BLOCK_GAME_INPUT_IGNORE_WATCH": "屏蔽输入时忽略手表",
-    "BLOCK_GAME_INPUT_IGNORE_WATCH_HELP": "悬停在手表上时不屏蔽输入",
-    "CAPTURE_METHOD": "Wayland 屏幕采集",
-    "CAPTURE_METHOD_HELP": "如果您遇到黑屏或花屏，请尝试更改此项",
-    "CLEAR_PIPEWIRE_TOKENS": "清除 PipeWire 令牌",
-    "CLEAR_PIPEWIRE_TOKENS_HELP": "下次启动时提示选择屏幕",
-    "CLEAR_SAVED_STATE": "清除保存的状态",
-    "CLEAR_SAVED_STATE_HELP": "重置集合与覆盖层位置",
-    "CLICK_FREEZE_TIME_MS": "点击冻结时间 (毫秒)",
-    "CLICK_FREEZE_TIME_MS_HELP": "有助于提高双击精度",
-    "CLOCK_12H": "12 小时制时钟",
-    "CONTROLS": "控制",
-    "DELETE_ALL_CONFIGS": "擦除配置",
-    "DELETE_ALL_CONFIGS_HELP": "从 conf.d 中删除所有配置文件",
-    "DOUBLE_CURSOR_FIX": "双光标修复",
-    "DOUBLE_CURSOR_FIX_HELP": "如果您看到两个光标，请启用此项",
-    "FEATURES": "功能",
-    "FOCUS_FOLLOWS_MOUSE_MODE": "触摸扳机时移动鼠标",
-    "HIDE_GRAB_HELP": "隐藏抓取帮助",
-    "HIDE_USERNAME": "隐藏用户名",
-    "INVERT_SCROLL_DIRECTION_X": "反转水平滚动方向",
-    "INVERT_SCROLL_DIRECTION_Y": "反转垂直滚动方向",
-    "KEYBOARD_MIDDLE_CLICK": "键盘中键点击",
-    "KEYBOARD_MIDDLE_CLICK_HELP": "使用紫色激光打字时的修饰键",
-    "KEYBOARD_SOUND_ENABLED": "键盘音效",
-    "LEFT_HANDED_MOUSE": "左手鼠标",
-    "LEFT_HANDED_MOUSE_HELP": "如果鼠标按钮反置，请使用此项",
-    "LONG_PRESS_DURATION": "长按持续时间",
-    "LOOK_AND_FEEL": "外观与体验",
-    "MISC": "杂项",
-    "NOTIFICATIONS_ENABLED": "启用通知",
-    "NOTIFICATIONS_SOUND_ENABLED": "通知音效",
-    "OPAQUE_BACKGROUND": "不透明背景",
-    "OPTION": {
-      "AUTO": "自动",
-      "AUTO_HELP": "如果支持，则使用 ScreenCopy GPU，\n否则使用 PipeWire GPU。",
-      "PIPEWIRE_HELP": "快速 GPU 采集，\n所有桌面环境的标准方式。",
-      "PW_FALLBACK_HELP": "高 CPU 占用的慢速方法。\n在 PipeWire GPU 不起作用时尝试。",
-      "SCREENCOPY_GPU_HELP": "快速，无屏幕共享弹窗。\n支持：Hyprland, Niri, River, Sway",
-      "SCREENCOPY_HELP": "慢速，无屏幕共享弹窗。\n支持：Hyprland, Niri, River, Sway",
-      "NONE": "无",
-      "HMD_PINCH": "HMD + 捏合",
-      "EYE_PINCH": "眼睛 + 捏合",
-      "EYE_ONLY": "仅眼球",
-      "HMD_ONLY": "仅限头显"
-    },
-    "POINTER_LERP_FACTOR": "指针平滑",
-    "RESTART_SOFTWARE": "重启软件",
-    "RESTART_SOFTWARE_HELP": "应用需要重启的设置",
-    "ROUND_MULTIPLIER": "UI 边缘圆角",
-    "SCREEN_RENDER_DOWN": "以较低分辨率渲染屏幕",
-    "SCREEN_RENDER_DOWN_HELP": "有助于解决高分辨率屏幕的锯齿问题",
-    "SCROLL_SPEED": "滚动速度",
-    "SETS_ON_WATCH": "在手表上显示集合",
-    "SPACE_DRAG_MULTIPLIER": "空间拖拽倍率",
-    "SPACE_DRAG_UNLOCKED": "允许在所有轴上进行空间拖拽",
-    "SPACE_ROTATE_UNLOCKED": "允许在所有轴上进行空间旋转",
-    "TROUBLESHOOTING": "故障排除",
-    "UPRIGHT_SCREEN_FIX": "垂直屏幕修复",
-    "UPRIGHT_SCREEN_FIX_HELP": "修复某些桌面上的垂直屏幕问题",
-    "USE_PASSTHROUGH": "启用穿透",
-    "USE_PASSTHROUGH_HELP": "如果 XR 运行时支持，则允许穿透",
-    "USE_SKYBOX": "启用天空盒",
-    "USE_SKYBOX_HELP": "如果没有场景应用或穿透，则显示天空盒",
-    "XR_CLICK_SENSITIVITY": "XR 点击灵敏度",
-    "XR_CLICK_SENSITIVITY_HELP": "模拟扳机灵敏度",
-    "XR_CLICK_SENSITIVITY_RELEASE": "XR 释放灵敏度",
-    "XR_CLICK_SENSITIVITY_RELEASE_HELP": "必须低于点击灵敏度",
-    "XWAYLAND_BY_DEFAULT": "默认以兼容模式运行应用",
-    "AUTOSTART_APPS": "开机启动应用",
-    "HANDSFREE_POINTER": "免提模式",
-    "HANDSFREE_POINTER_HELP": "当运动控制器不可用时使用的输入。\n左手捏合为抓取，右手为点击。",
-    "UI_GRADIENT_INTENSITY": "UI 渐变强度",
-    "RESET_PLAYSPACE": "重置游戏空间",
-    "RESET_PLAYSPACE_HELP": "清除舞台空间偏移。",
-    "BLOCK_POSES_ON_KBD_INTERACTION": "与键盘交互时阻止姿势",
-    "BLOCK_POSES_ON_KBD_INTERACTION_HELP": "当键盘悬停且启用“阻止游戏输入”时，阻止游戏接收姿势",
-    "LANGUAGE": "语言",
-    "REQUIRES_RESTART": "需要重启",
-    "GRID_OPACITY": "地面网格不透明度",
-    "GRID_OPACITY_HELP": "启用天空盒时地板网格的不透明度"
-  },
-  "APPLICATION_LAUNCHER": "应用启动器",
-  "APPLICATION_STARTED": "应用已启动",
-  "APPLICATIONS": "应用",
-  "AUDIO": {
-    "AUTO_SWITCH_TO_VR_AUDIO": "自动切换到 VR 音频",
-    "CARDS": "声卡",
-    "FAILED_TO_SWITCH_MICROPHONE": "切换麦克风失败",
-    "MICROPHONE_SET_SUCCESSFULLY": "麦克风设置成功",
-    "MICROPHONES": "麦克风",
-    "NO_VR_MICROPHONE_SWITCH_MANUALLY": "未找到 VR 麦克风。请手动切换。",
-    "NO_VR_SPEAKERS_FOUND_SWITCH_MANUALLY": "未找到 VR 扬声器。请手动切换。",
-    "SELECT_AUDIO_CARD_PROFILE": "选择声卡配置",
-    "SETTINGS": "音频设置",
-    "SPEAKERS": "扬声器",
-    "SPEAKERS_SET_SUCCESSFULLY": "扬声器设置成功",
-    "VOLUME": "音量"
-  },
-  "CLOSE_WINDOW": "关闭窗口",
-  "DISPLAY_BRIGHTNESS": "显示亮度",
-  "FAILED_TO_LAUNCH_APPLICATION": "启动应用失败：",
-  "GAME_LAUNCHED": "游戏已启动",
-  "GAME_LIST": {
-    "NO_GAMES_FOUND": "未找到游戏",
-    "RUNNING_GAMES_LIST": "正在运行的游戏列表"
-  },
-  "GAMES": "游戏",
-  "GENERAL_SETTINGS": "通用设置",
-  "HEIGHT": "高度",
-  "HELLO": "你好！",
-  "HELLO_USER": "你好，{USER}！",
-  "HIDE": "隐藏",
-  "HOME_SCREEN": "主页",
-  "MONADO_RUNTIME": "Monado 运行时",
-  "POPUP_ADD_DISPLAY": {
-    "RESOLUTION": "分辨率"
-  },
-  "REMOVE": "移除",
-  "SETTINGS": "设置",
-  "SHOW": "显示",
-  "TERMINATE_PROCESS": "终止进程",
-  "WIDTH": "宽度",
-  "PROCESS_LIST": "进程列表",
-  "REFRESH": "刷新",
-  "PROCESS": {
-    "STOP": "停止",
-    "FORCE_KILL": "强制关闭"
-  },
-  "DEBUG_INFO": "调试信息"
-}
\ No newline at end of file
+	"ACTIONS": {
+		"RECENTER_PLAYSPACE": "重置游玩区中心"
+	},
+	"APP_LAUNCHER": {
+		"ASPECT": {
+			"SEMI_TALL": "略高",
+			"SEMI_WIDE": "略宽",
+			"SQUARE": "正方形",
+			"TALL": "高",
+			"WIDE": "宽"
+		},
+		"ASPECT_TITLE": "比例",
+		"AUTOSTART": "启动时自动运行",
+		"LAUNCH": "启动",
+		"MODE": {
+			"CAGE": "兼容模式 (Cage)",
+			"NATIVE": "原生模式"
+		},
+		"POS": {
+			"ANCHORED": "锚定",
+			"ANCHORED_HELP": "相对于中心标记保持固定。",
+			"FLOATING": "悬浮",
+			"FLOATING_HELP": "独立移动，显示时自动重置中心。",
+			"STATIC": "静态",
+			"STATIC_HELP": "不属于任何集合。不会重置中心。"
+		},
+		"POS_TITLE": "定位",
+		"RES_TITLE": "分辨率"
+	},
+	"APP_SETTINGS": {
+		"ALLOW_SLIDING": "抓取时允许摇杆交互",
+		"ANIMATION_SPEED": "UI 动画速度",
+		"BLOCK_GAME_INPUT": "屏蔽游戏输入",
+		"BLOCK_GAME_INPUT_HELP": "悬停在覆盖层上时屏蔽所有输入",
+		"BLOCK_GAME_INPUT_IGNORE_WATCH": "屏蔽输入时忽略手表",
+		"BLOCK_GAME_INPUT_IGNORE_WATCH_HELP": "悬停在手表上时不屏蔽输入",
+		"CAPTURE_METHOD": "Wayland 屏幕采集",
+		"CAPTURE_METHOD_HELP": "如果您遇到黑屏或花屏，请尝试更改此项",
+		"CLEAR_PIPEWIRE_TOKENS": "清除 PipeWire 令牌",
+		"CLEAR_PIPEWIRE_TOKENS_HELP": "下次启动时提示选择屏幕",
+		"CLEAR_SAVED_STATE": "清除保存的状态",
+		"CLEAR_SAVED_STATE_HELP": "重置集合与覆盖层位置",
+		"CLICK_FREEZE_TIME_MS": "点击冻结时间 (毫秒)",
+		"CLICK_FREEZE_TIME_MS_HELP": "有助于提高双击精度",
+		"CLOCK_12H": "12 小时制时钟",
+		"CONTROLS": "控制",
+		"DELETE_ALL_CONFIGS": "擦除配置",
+		"DELETE_ALL_CONFIGS_HELP": "从 conf.d 中删除所有配置文件",
+		"DOUBLE_CURSOR_FIX": "双光标修复",
+		"DOUBLE_CURSOR_FIX_HELP": "如果您看到两个光标，请启用此项",
+		"FEATURES": "功能",
+		"FOCUS_FOLLOWS_MOUSE_MODE": "触摸扳机时移动鼠标",
+		"HIDE_GRAB_HELP": "隐藏抓取帮助",
+		"HIDE_USERNAME": "隐藏用户名",
+		"INVERT_SCROLL_DIRECTION_X": "反转水平滚动方向",
+		"INVERT_SCROLL_DIRECTION_Y": "反转垂直滚动方向",
+		"KEYBOARD_MIDDLE_CLICK": "键盘中键点击",
+		"KEYBOARD_MIDDLE_CLICK_HELP": "使用紫色激光打字时的修饰键",
+		"KEYBOARD_SOUND_ENABLED": "键盘音效",
+		"LEFT_HANDED_MOUSE": "左手鼠标",
+		"LEFT_HANDED_MOUSE_HELP": "如果鼠标按钮反置，请使用此项",
+		"LONG_PRESS_DURATION": "长按持续时间",
+		"LOOK_AND_FEEL": "外观与体验",
+		"MISC": "杂项",
+		"NOTIFICATIONS_ENABLED": "启用通知",
+		"NOTIFICATIONS_SOUND_ENABLED": "通知音效",
+		"OPAQUE_BACKGROUND": "不透明背景",
+		"OPTION": {
+			"AUTO": "自动",
+			"AUTO_HELP": "如果支持，则使用 ScreenCopy GPU，\n否则使用 PipeWire GPU。",
+			"PIPEWIRE_HELP": "快速 GPU 采集，\n所有桌面环境的标准方式。",
+			"PW_FALLBACK_HELP": "高 CPU 占用的慢速方法。\n在 PipeWire GPU 不起作用时尝试。",
+			"SCREENCOPY_GPU_HELP": "快速，无屏幕共享弹窗。\n支持：Hyprland, Niri, River, Sway",
+			"SCREENCOPY_HELP": "慢速，无屏幕共享弹窗。\n支持：Hyprland, Niri, River, Sway",
+			"NONE": "无",
+			"HMD_PINCH": "HMD + 捏合",
+			"EYE_PINCH": "眼睛 + 捏合",
+			"NONE_INPUT_HELP": "不模拟鼠标和键盘。\n将无法与屏幕进行交互。",
+			"UINPUT": "设备模拟",
+			"WL_VIRTUAL": "Wayland 虚拟输入",
+			"WL_VIRTUAL_HELP": "使用 zwlr_virtual_pointer 和 zwp_virtual_keyboard 向 Wayland 合成器发送事件。\n仅在部分桌面环境下能可靠工作。\n在 KDE、GNOME 或 COSMIC 上无法工作。",
+			"EYE_ONLY": "眼部激光",
+			"HMD_ONLY": "HMD 激光指针",
+			"NONE_INPUT_CAPTURE_HELP": "不捕捉鼠标和键盘。\n在 WayVR 中启动的应用里将无法\n使用物理鼠标或键盘。",
+			"UINPUT_HELP": "使用 uinput 模块来模拟设备。\n已知在大多数桌面环境下运行良好。",
+			"EVDEV_HELP": "独占使用输入设备。\n您的用户必须在 input 组中。"
+		},
+		"POINTER_LERP_FACTOR": "指针平滑",
+		"RESTART_SOFTWARE": "重启软件",
+		"RESTART_SOFTWARE_HELP": "应用需要重启的设置",
+		"ROUND_MULTIPLIER": "UI 边缘圆角",
+		"SCREEN_RENDER_DOWN": "以较低分辨率渲染屏幕",
+		"SCREEN_RENDER_DOWN_HELP": "有助于解决高分辨率屏幕的锯齿问题",
+		"SCROLL_SPEED": "滚动速度",
+		"SETS_ON_WATCH": "在手表上显示集合",
+		"SPACE_DRAG_MULTIPLIER": "空间拖拽倍率",
+		"SPACE_DRAG_UNLOCKED": "允许在所有轴上进行空间拖拽",
+		"SPACE_ROTATE_UNLOCKED": "允许在所有轴上进行空间旋转",
+		"TROUBLESHOOTING": "故障排除",
+		"UPRIGHT_SCREEN_FIX": "垂直屏幕修复",
+		"UPRIGHT_SCREEN_FIX_HELP": "修复某些桌面上的垂直屏幕问题",
+		"USE_PASSTHROUGH": "启用穿透",
+		"USE_PASSTHROUGH_HELP": "如果 XR 运行时支持，则允许穿透",
+		"USE_SKYBOX": "启用天空盒",
+		"USE_SKYBOX_HELP": "如果没有场景应用或穿透，则显示天空盒",
+		"XWAYLAND_BY_DEFAULT": "默认以兼容模式运行应用",
+		"AUTOSTART_APPS": "开机启动应用",
+		"HANDSFREE_POINTER": "免提模式",
+		"HANDSFREE_POINTER_HELP": "当运动控制器不可用时使用的输入。\n左手捏合为抓取，右手为点击。",
+		"UI_GRADIENT_INTENSITY": "UI 渐变强度",
+		"RESET_PLAYSPACE": "重置游戏空间",
+		"RESET_PLAYSPACE_HELP": "清除舞台空间偏移。",
+		"BLOCK_POSES_ON_KBD_INTERACTION": "与键盘交互时阻止姿势",
+		"BLOCK_POSES_ON_KBD_INTERACTION_HELP": "当键盘悬停且启用“阻止游戏输入”时，阻止游戏接收姿势",
+		"LANGUAGE": "语言",
+		"REQUIRES_RESTART": "需要重启",
+		"GRID_OPACITY": "地面网格不透明度",
+		"GRID_OPACITY_HELP": "启用天空盒时地板网格的不透明度",
+		"BROWSE_ONLINE_CATALOG": "浏览在线目录...",
+		"BROWSE_SKYMAPS": "浏览 Skymaps",
+		"COLOR_KEYING": "颜色键控",
+		"NO_SKYMAPS_FOUND": "未找到 Skymaps",
+		"SELECT_VARIANT": "选择变体",
+		"SHOW_WELCOME_SCREEN": "显示欢迎屏幕",
+		"SKYBOX": "Skybox",
+		"SKYMAP_ALREADY_DOWNLOADED": "此 Skymap 已下载。请选择所需操作。",
+		"WATCH_VIEW_ANGLE": "Watch 视角角度",
+		"WATCH_VIEW_ANGLE_HELP": "控制表盘的淡出方式",
+		"BINDINGS": {
+			"COMP": {
+				"CLICK": "点击",
+				"FORCE": "力度",
+				"TOUCH": "触摸",
+				"VALUE": "值",
+				"PROXIMITY": "临近度",
+				"X_AXIS": "X 轴",
+				"Y_AXIS": "Y 轴"
+			},
+			"TYPE": {
+				"BUMPER": "侧键",
+				"DPAD_UP": "方向键上",
+				"DPAD_DOWN": "方向键下",
+				"DPAD_LEFT": "方向键左",
+				"DPAD_RIGHT": "方向键右",
+				"JOYSTICK": "摇杆",
+				"MENU": "菜单",
+				"SHOULDER": "肩键",
+				"SQUEEZE": "抓取",
+				"SYSTEM": "系统",
+				"THUMBREST": "拇指托",
+				"THUMBSTICK": "摇杆",
+				"TRACKPAD": "触控板",
+				"TRIGGER": "扳机键",
+				"VIEW": "视图"
+			},
+			"CLICK": {
+				"ANY": "任意",
+				"DOUBLE": "双击",
+				"TRIPLE": "三击",
+				"TYPE": "点击次数"
+			},
+			"ACTION": {
+				"CLICK": "点击*",
+				"GRAB": "抓取*",
+				"ALT_CLICK": "自定义 Shell 执行 (在配置中设置 alt_click)",
+				"SHOW_HIDE": "显示、隐藏、重新中心化*",
+				"TOGGLE_DASHBOARD": "切换控制面板",
+				"SPACE_DRAG": "Playspace 拖拽",
+				"SPACE_ROTATE": "Playspace 旋转",
+				"SPACE_RESET": "Playspace 重置",
+				"CLICK_MODIFIER_RIGHT": "右键修饰键",
+				"CLICK_MODIFIER_MIDDLE": "中键修饰键",
+				"MOVE_MOUSE": "移动鼠标 (如果默认关闭)",
+				"SCROLL": "滚动*"
+			},
+			"LEFT": "左侧",
+			"RIGHT": "右",
+			"COMPONENT": "触发类型",
+			"SUBPATH": "动作控制",
+			"THRESHOLD": "高于上限值时激活\n低于下限值时停用"
+		},
+		"ENABLED": "已启用",
+		"INPUT_EMULATION_METHOD": "输入仿真方法",
+		"INPUT_EMULATION_METHOD_HELP": "如果鼠标或键盘输入未被识别，请尝试更改此设置。",
+		"INPUT_PROFILES": "更改输入绑定",
+		"INPUT_PROFILES_HELP": "OpenXR 控制器输入绑定",
+		"NOT_SUPPORTED": "不支持",
+		"ENABLE_WATCH": "启用手表",
+		"SPACE_DRAG": "空间拖拽",
+		"SPACE_GRAVITY_DAMPING": "阻尼",
+		"SPACE_GRAVITY_DAMPING_HELP": "用于减缓移动速度的人造阻力。0.1 - 高阻力，1.0 - 无阻力",
+		"SPACE_GRAVITY_FLING_STRENGTH": "投掷力度",
+		"SPACE_GRAVITY_FLING_STRENGTH_HELP": "Space-drag 后的重力发射力强度倍数。\n0.0 - 完全没有位移，2.0 - 双倍强度",
+		"SPACE_GRAVITY_GRAVITY": "重力",
+		"SPACE_GRAVITY_GRAVITY_HELP": "向下作用的力的大小。0.0 - 无重力",
+		"SPACE_GRAVITY_GROUND_FRICTION": "地面摩擦力",
+		"SPACE_GRAVITY_GROUND_FRICTION_HELP": "如果你接触地面时，减慢你移动速度的摩擦力大小。\n0.0 - 无摩擦（就像在冰面上一样），1.0 - 粗糙表面",
+		"SPACE_GRAVITY_FLOOR_HEIGHT": "地面高度",
+		"SPACE_GRAVITY_FLOOR_HEIGHT_HELP": "地面所在 Y 轴位置。达到该高度时重力停止。",
+		"SAVE": "保存",
+		"CANCEL": "取消",
+		"WHISPER": {
+			"NEED_TO_DOWNLOAD_MODEL": "所选模型需要下载。\n现在开始下载吗？",
+			"REMOVE_UNUSED_MODELS": "您正在关闭语音转文本功能。\n是否删除已下载的 Whisper 模型以释放空间？"
+		},
+		"WHISPER_MODEL": "语音转文本模型",
+		"WHISPER_MODEL_HELP": "要使用的 Whisper 模型。\n模型越大，结果越准确，\n但消耗的显存 (VRAM) 越多。",
+		"DEFAULT_OVERLAY_SCALE": "默认叠加层大小",
+		"DEFAULT_OVERLAY_SCALE_HELP": "以该比例生成新的叠加层。",
+		"COLOR_PALETTE": "调色板",
+		"COLOR_PALETTES": "配色方案",
+		"COLOR_PALETTE_CURRENT": "当前激活的主题。",
+		"COLOR_PALETTE_ACTIVATE": "点击以使用此主题。",
+		"COLOR_PALETTE_HELP": "点击浏览配色方案。\n如需创建自定义配色，请参阅网站！",
+		"COLOR_PALETTE_CUSTOM_URL": "添加自定义主题！",
+		"COLOR_PALETTE_CUSTOM_URL2": "点击打开网页版手册。",
+		"SNAP_ANGLE_DEG": "窗口俯仰与翻滚捕捉角度",
+		"SNAP_ANGLE_DEG_HELP": "抓取的窗口在俯仰轴和翻滚轴上将对齐到此角度。",
+		"SAVE_PLAYSPACE_CENTER": "保存 Playspace 中心",
+		"SAVE_PLAYSPACE_CENTER_HELP": "将当前活动空间用于重置活动空间的绑定。",
+		"RESET_PLAYSPACE_CENTER": "重置游玩区域中心",
+		"RESET_PLAYSPACE_CENTER_HELP": "清除之前设置的 Playspace 中心。",
+		"HANDSFREE_ALT_TAB": "应用切换瞄准点",
+		"HANDSFREE_ALT_TAB_HELP": "按住 Super+X，对准目标窗口，然后松开以切换焦点。",
+		"INPUT_CAPTURE_METHOD": "输入捕获方式",
+		"POINTER_ACCELERATION": "鼠标加速",
+		"POINTER_ACCELERATION_HELP": "开启：自适应鼠标加速\n关闭：恒定速度",
+		"POINTER_SPEED": "鼠标速度",
+		"INPUT_CAPTURE_METHOD_HELP": "允许在 WayVR 中使用物理外设。\n Super+Z: 在 WayVR 和真实桌面之间切换输入\n Super+X: 在 WayVR 应用之间切换",
+		"SPACE_DRAG_AFFECTS_WORLD": "空间拖拽移动覆盖层"
+	},
+	"APPLICATION_LAUNCHER": "应用启动器",
+	"APPLICATION_STARTED": "应用已启动",
+	"APPLICATIONS": "应用",
+	"AUDIO": {
+		"AUTO_SWITCH_TO_VR_AUDIO": "自动切换到 VR 音频",
+		"CARDS": "声卡",
+		"FAILED_TO_SWITCH_MICROPHONE": "切换麦克风失败",
+		"MICROPHONE_SET_SUCCESSFULLY": "麦克风设置成功",
+		"MICROPHONES": "麦克风",
+		"NO_VR_MICROPHONE_SWITCH_MANUALLY": "未找到 VR 麦克风。请手动切换。",
+		"NO_VR_SPEAKERS_FOUND_SWITCH_MANUALLY": "未找到 VR 扬声器。请手动切换。",
+		"SELECT_AUDIO_CARD_PROFILE": "选择声卡配置",
+		"SETTINGS": "音频设置",
+		"SPEAKERS": "扬声器",
+		"SPEAKERS_SET_SUCCESSFULLY": "扬声器设置成功",
+		"VOLUME": "音量"
+	},
+	"CLOSE_WINDOW": "关闭窗口",
+	"DISPLAY_BRIGHTNESS": "显示亮度",
+	"FAILED_TO_LAUNCH_APPLICATION": "启动应用失败：",
+	"GAME_LAUNCHED": "游戏已启动",
+	"GAME_LIST": {
+		"NO_GAMES_FOUND": "未找到游戏",
+		"RUNNING_GAMES_LIST": "正在运行的游戏列表"
+	},
+	"GAMES": "游戏",
+	"GENERAL_SETTINGS": "通用设置",
+	"HEIGHT": "高度",
+	"HELLO": "你好！",
+	"HELLO_USER": "你好，{USER}！",
+	"HIDE": "隐藏",
+	"HOME_SCREEN": "主页",
+	"MONADO_RUNTIME": "Monado 运行时",
+	"POPUP_ADD_DISPLAY": {
+		"RESOLUTION": "分辨率"
+	},
+	"REMOVE": "移除",
+	"SETTINGS": "设置",
+	"SHOW": "显示",
+	"TERMINATE_PROCESS": "终止进程",
+	"WIDTH": "宽度",
+	"PROCESS_LIST": "进程列表",
+	"REFRESH": "刷新",
+	"PROCESS": {
+		"STOP": "停止",
+		"FORCE_KILL": "强制关闭"
+	},
+	"DEBUG_INFO": "调试信息",
+	"CREATION_DATE": "创建日期",
+	"DOWNLOADER": "下载器",
+	"DOWNLOAD_AGAIN": "重新下载",
+	"DOWNLOADING_FILE": "正在下载文件...",
+	"GETTING_STARTED": "入门指南",
+	"MODIFICATION_DATE": "修改日期",
+	"LOADING": "正在加载...",
+	"APPLY": "应用",
+	"RELOAD_FROM_DISK": "从磁盘重新加载",
+	"TARGET_PATH": "目标路径",
+	"VERSION": "版本",
+	"DONATE": {
+		"SUPPORT_US": "支持我们",
+		"DESCRIPTION": "我们是一个由 2 名开发者组成的精简团队，在业余时间开发 WayVR。如果您喜欢这款软件，请考虑支持我们 —— 每一次捐赠都能帮助我们继续开发下去。",
+		"BUTTON_TOOLTIP": "通过 Open Collective 捐赠",
+		"CURRENT_SUPPORTERS": "当前支持者",
+		"THANK_YOU_WAYVR": "WayVR 团队向您表示感谢！"
+	},
+	"WELCOME": {
+		"ALL_SET": "你已准备就绪！",
+		"BASICS": "这些基础知识将帮助您轻松开始使用 WayVR。",
+		"FEATURES_DOCUMENTATION": "还有许多其他值得自定义的功能。欲了解更多信息，请查看文档：",
+		"FINISH_TUTORIAL": "完成教程",
+		"GRAB_BOTH_HANDS": "如果你想移动 Set 中的特定叠加层，请用双手抓取。",
+		"GRAB_ONE_HAND": "用一只手抓取即可移动你的 Set。",
+		"GREETING": "你好！",
+		"GUIDE_INTRO": "让我们引导你完成初步设置。",
+		"LASER_COLORS": "激光颜色",
+		"LASER_FUNCTIONALITY": "WayVR 中的许多功能都取决于使用何种颜色的激光来与 UI 元素进行交互。您不需要按下这些按钮，只需触摸它们即可！",
+		"LAST_PAGE_INFO": "一旦你到达最后一页，此教程将不再显示。",
+		"LOOK_AT_LEFT_WRIST": "看向你的左手腕。那就是你的手表。",
+		"MIDDLE_CLICK_MODE_PURPLE_LASER": "— 中键模式：紫色激光",
+		"MOVING_YOUR_SET": "正在移动您的 Set",
+		"NEXT_BUTTON": "按下下方的“下一步”按钮以开始。",
+		"REGULAR_MODE_BLUE_LASER": "— 普通模式：蓝色激光",
+		"REPOSITION_THIS_WINDOW_BY_GRABBING": "使用控制器的抓取操作重新定位此窗口。",
+		"RIGHT_CLICK_MODE_ORANGE_LASER": "— 右键模式：橙色激光",
+		"THANKS_FOR_INSTALLING": "感谢安装 WayVR！",
+		"WATCH": "Watch",
+		"WORKING_SET": "工作集",
+		"DOUBLE_PRESS_TO_TOGGLE": "双击 B 键 (Index) 或 Y 键 (Meta) 以显示、重新居中或隐藏您的集合。现在就试一下吧。",
+		"CENTER_MARKER": "中心标记是重新居中时出现在你面前的标志。请将覆盖层放置在它周围！"
+	},
+	"DOWNLOAD": "下载",
+	"SAVED_TO_FAVOURITES": "已保存至收藏夹",
+	"ADD_TO_FAVOURITES": "添加到收藏",
+	"ADD_TO_FAVOURITES_HINT": "保存预设并将其固定到应用抽屉",
+	"REMOVE_FROM_FAVOURITES": "从收藏中移除",
+	"EMPTY": "空",
+	"PINNED_APPS": "已固定应用程序"
+}
diff --git a/dash-frontend/assets/sound/save.mp3 b/dash-frontend/assets/sound/save.mp3
new file mode 100644
index 00000000..dc365b10
Binary files /dev/null and b/dash-frontend/assets/sound/save.mp3 differ
diff --git a/dash-frontend/assets/video/onboarding_center_marker.ivf b/dash-frontend/assets/video/onboarding_center_marker.ivf
new file mode 100644
index 00000000..300c0be0
Binary files /dev/null and b/dash-frontend/assets/video/onboarding_center_marker.ivf differ
diff --git a/dash-frontend/assets/video/onboarding_double_press.ivf b/dash-frontend/assets/video/onboarding_double_press.ivf
new file mode 100644
index 00000000..724cefc3
Binary files /dev/null and b/dash-frontend/assets/video/onboarding_double_press.ivf differ
diff --git a/dash-frontend/assets/video/onboarding_laser_colors.ivf b/dash-frontend/assets/video/onboarding_laser_colors.ivf
new file mode 100644
index 00000000..750ede45
Binary files /dev/null and b/dash-frontend/assets/video/onboarding_laser_colors.ivf differ
diff --git a/dash-frontend/assets/video/onboarding_watch.ivf b/dash-frontend/assets/video/onboarding_watch.ivf
new file mode 100644
index 00000000..24e8e2ed
Binary files /dev/null and b/dash-frontend/assets/video/onboarding_watch.ivf differ
diff --git a/dash-frontend/src/frontend.rs b/dash-frontend/src/frontend.rs
index 18f1d579..7be4bd61 100644
--- a/dash-frontend/src/frontend.rs
+++ b/dash-frontend/src/frontend.rs
@@ -2,15 +2,18 @@ use std::{path::PathBuf, rc::Rc};
 
 use chrono::Timelike;
 use glam::Vec2;
+use strum::EnumCount;
 use wgui::{
 	assets::{AssetPath, AssetProvider},
 	components::button::ComponentButton,
+	event::{CallbackDataCommon, StyleSetRequest},
 	font_config::WguiFontConfig,
 	globals::WguiGlobals,
 	i18n::Translation,
-	layout::{Layout, LayoutParams, LayoutUpdateParams, LayoutUpdateResult, WidgetID},
+	layout::{Layout, LayoutParams, LayoutTask, LayoutUpdateParams, LayoutUpdateResult, WidgetID},
 	parser::{Fetchable, ParseDocumentParams, ParserState},
 	renderer_vk::text::custom_glyph::CustomGlyphData,
+	taffy::{self},
 	task::Tasks,
 	theme::WguiTheme,
 	widget::{label::WidgetLabel, rectangle::WidgetRectangle, sprite::WidgetSprite},
@@ -19,16 +22,20 @@ use wgui::{
 use wlx_common::{
 	async_executor::AsyncExecutor,
 	audio,
-	dash_interface::{BoxDashInterface, RecenterMode},
+	dash_interface::{BoxDashInterface, ConfigChangeKind, DashPlayspaceTask},
 	locale::WayVRLangProvider,
+	palette::load_palette,
 	timestep::{self, Timestep},
 };
 
 use crate::{
 	assets,
-	tab::{Tab, TabType, apps::TabApps, games::TabGames, home::TabHome, monado::TabMonado, settings::TabSettings},
+	tab::{
+		Tab, TabType, apps::TabApps, donate::TabDonate, games::TabGames, home::TabHome, monado::TabMonado,
+		settings::TabSettings, welcome::TabWelcome,
+	},
 	util::{
-		popup_manager::{MountPopupParams, PopupManager, PopupManagerParams},
+		popup_manager::{MountPopupOnceParams, PopupManager, PopupManagerParams},
 		toast_manager::ToastManager,
 	},
 	views,
@@ -56,6 +63,7 @@ pub struct Frontend<T> {
 	state: ParserState,
 
 	current_tab: Option<Box<dyn Tab<T>>>,
+	side_buttons: Vec<(TabType, Rc<ComponentButton>)>,
 
 	pub tasks: FrontendTasks,
 
@@ -86,14 +94,17 @@ pub struct FrontendUpdateResult {
 pub struct InitParams<'a, T> {
 	pub interface: BoxDashInterface<T>,
 	pub lang_provider: &'a WayVRLangProvider,
+	pub show_welcome: bool,
 	pub has_monado: bool,
 	pub theme: Rc<WguiTheme>,
+	pub color_palette: &'a str,
 }
 
 #[derive(Clone)]
 pub enum SoundType {
 	Startup,
 	Launch,
+	Save,
 }
 
 #[derive(Clone)]
@@ -101,14 +112,16 @@ pub enum FrontendTask {
 	SetTab(TabType),
 	RefreshClock,
 	RefreshBackground,
-	MountPopup(MountPopupParams),
+	MountPopupOnce(MountPopupOnceParams),
 	RefreshPopupManager,
 	ShowAudioSettings,
 	UpdateAudioSettingsView,
 	RecenterPlayspace,
 	PushToast(Translation),
 	PlaySound(SoundType),
+	OpenURL(Rc<str>),
 	HideDashboard,
+	MarkTutorialGraduated,
 }
 
 impl<T: 'static> Frontend<T> {
@@ -119,6 +132,8 @@ impl<T: 'static> Frontend<T> {
 		let font_binary_regular = assets.load_from_path_gzip("Quicksand-Regular.ttf.gz")?;
 		let font_binary_light = assets.load_from_path_gzip("Quicksand-Light.ttf.gz")?;
 
+		let palette = load_palette(params.color_palette);
+
 		let globals = WguiGlobals::new(
 			assets,
 			params.lang_provider,
@@ -129,6 +144,7 @@ impl<T: 'static> Frontend<T> {
 				family_name_monospace: "",
 			},
 			PathBuf::new(), //FIXME: pass from somewhere else
+			palette,
 		)?;
 
 		let (layout, state) = wgui::parser::new_layout_from_assets(
@@ -151,7 +167,13 @@ impl<T: 'static> Frontend<T> {
 		let toast_manager = ToastManager::new();
 
 		let tasks = FrontendTasks::new();
-		tasks.push(FrontendTask::SetTab(TabType::Home));
+
+		let init_tab = if params.show_welcome {
+			TabType::Welcome
+		} else {
+			TabType::Home
+		};
+		tasks.push(FrontendTask::SetTab(init_tab));
 
 		let id_label_time = state.get_widget_id("label_time")?;
 		let id_rect_content = state.get_widget_id("rect_content")?;
@@ -164,6 +186,7 @@ impl<T: 'static> Frontend<T> {
 			layout,
 			state,
 			current_tab: None,
+			side_buttons: Vec::with_capacity(TabType::COUNT),
 			globals,
 			tasks,
 			ticks: 0,
@@ -202,6 +225,7 @@ impl<T: 'static> Frontend<T> {
 		let path = match sound_type {
 			SoundType::Startup => "sound/startup.mp3",
 			SoundType::Launch => "sound/app_start.mp3",
+			SoundType::Save => "sound/save.mp3",
 		};
 
 		// try loading a custom sound; if one doesn't exist (or it failed to load), use the built-in asset
@@ -279,10 +303,8 @@ impl<T: 'static> Frontend<T> {
 	}
 
 	fn update_time(&mut self, data: &mut T) -> anyhow::Result<()> {
-		let mut c = self.layout.start_common();
-		let mut common = c.common();
-
 		{
+			let mut common = self.layout.common();
 			let mut label = common
 				.state
 				.widgets
@@ -303,27 +325,20 @@ impl<T: 'static> Frontend<T> {
 			label.set_text(&mut common, Translation::from_raw_text(&text));
 		}
 
-		c.finish()?;
 		Ok(())
 	}
 
-	fn mount_popup(&mut self, params: MountPopupParams, data: &mut T) -> anyhow::Result<()> {
+	fn mount_popup_once(&mut self, params: MountPopupOnceParams, data: &mut T) -> anyhow::Result<()> {
 		let config = self.interface.general_config(data);
 
-		self.popup_manager.mount_popup(
-			self.globals.clone(),
-			&mut self.layout,
-			self.tasks.clone(),
-			params,
-			config,
-		)?;
+		self
+			.popup_manager
+			.mount_popup_once(&self.globals, &mut self.layout, &self.tasks, params, config)?;
 		Ok(())
 	}
 
 	fn refresh_popup_manager(&mut self) -> anyhow::Result<()> {
-		let mut c = self.layout.start_common();
-		self.popup_manager.refresh(c.common().alterables);
-		c.finish()?;
+		self.popup_manager.refresh(&mut self.layout.alterables);
 		Ok(())
 	}
 
@@ -345,8 +360,8 @@ impl<T: 'static> Frontend<T> {
 			(0.8666, 0.9333)
 		};
 
-		rect.params.color.a = alpha1;
-		rect.params.color2.a = alpha2;
+		rect.params.color = rect.params.color.with_alpha(alpha1);
+		rect.params.color2 = rect.params.color2.with_alpha(alpha2);
 
 		Ok(())
 	}
@@ -356,7 +371,7 @@ impl<T: 'static> Frontend<T> {
 			FrontendTask::SetTab(tab_type) => self.set_tab(params.data, tab_type)?,
 			FrontendTask::RefreshClock => self.update_time(params.data)?,
 			FrontendTask::RefreshBackground => self.update_background(params.data)?,
-			FrontendTask::MountPopup(popup_params) => self.mount_popup(popup_params, params.data)?,
+			FrontendTask::MountPopupOnce(popup_params) => self.mount_popup_once(popup_params, params.data)?,
 			FrontendTask::RefreshPopupManager => self.refresh_popup_manager()?,
 			FrontendTask::ShowAudioSettings => self.action_show_audio_settings()?,
 			FrontendTask::UpdateAudioSettingsView => self.action_update_audio_settings()?,
@@ -364,13 +379,14 @@ impl<T: 'static> Frontend<T> {
 			FrontendTask::PushToast(content) => self.toast_manager.push(content),
 			FrontendTask::PlaySound(sound_type) => self.queue_play_sound(sound_type),
 			FrontendTask::HideDashboard => self.action_hide_dashboard(params.data),
+			FrontendTask::OpenURL(url) => self.action_open_url(url),
+			FrontendTask::MarkTutorialGraduated => self.action_tutorial_graduated(params.data),
 		};
 		Ok(())
 	}
 
 	fn set_tab_title(&mut self, translation: &str, icon: &str) -> anyhow::Result<()> {
-		let mut c = self.layout.start_common();
-		let mut common = c.common();
+		let mut common = self.layout.common();
 
 		{
 			let mut label = common
@@ -386,12 +402,11 @@ impl<T: 'static> Frontend<T> {
 				.widgets
 				.cast_as::<WidgetSprite>(self.widgets.id_sprite_titlebar_icon)?;
 			sprite.set_content(
-				&mut common,
+				common.alterables,
 				Some(CustomGlyphData::from_assets(&self.globals, AssetPath::BuiltIn(icon))?),
 			);
 		}
 
-		c.finish()?;
 		Ok(())
 	}
 
@@ -400,26 +415,45 @@ impl<T: 'static> Frontend<T> {
 		let widget_content = self.state.fetch_widget(&self.layout.state, "content")?;
 		self.layout.remove_children(widget_content.id);
 
+		let padding = tab_type.get_preferred_padding();
+		self.layout.tasks.push(LayoutTask::SetWidgetStyle(
+			widget_content.id,
+			StyleSetRequest::Padding(taffy::Rect::length(padding)),
+		));
+
 		let (tab_translation, icon_path) = match tab_type {
+			TabType::Welcome => ("GETTING_STARTED", "dashboard/welcome.svg"),
 			TabType::Home => ("HOME_SCREEN", "dashboard/home.svg"),
 			TabType::Apps => ("APPLICATIONS", "dashboard/apps.svg"),
 			TabType::Games => ("GAMES", "dashboard/games.svg"),
 			TabType::Monado => ("MONADO_RUNTIME", "dashboard/monado.svg"),
 			TabType::Settings => ("SETTINGS", "dashboard/settings.svg"),
+			TabType::Donate => ("DONATE.SUPPORT_US", "dashboard/opencollective.svg"),
 		};
 
 		self.set_tab_title(tab_translation, icon_path)?;
 
 		let tab: Box<dyn Tab<T>> = match tab_type {
+			TabType::Welcome => Box::new(TabWelcome::new(self, widget_content.id, data)?),
 			TabType::Home => Box::new(TabHome::new(self, widget_content.id, data)?),
 			TabType::Apps => Box::new(TabApps::new(self, widget_content.id, data)?),
 			TabType::Games => Box::new(TabGames::new(self, widget_content.id)?),
 			TabType::Monado => Box::new(TabMonado::new(self, widget_content.id)?),
 			TabType::Settings => Box::new(TabSettings::new(self, widget_content.id, data)?),
+			TabType::Donate => Box::new(TabDonate::new(self, widget_content.id, data)?),
 		};
 
 		self.current_tab = Some(tab);
 
+		let mut common = CallbackDataCommon {
+			state: &self.layout.state,
+			alterables: &mut self.layout.alterables,
+		};
+
+		for (t, btn) in self.side_buttons.iter() {
+			btn.set_sticky_state(&mut common, tab_type == *t);
+		}
+
 		Ok(())
 	}
 
@@ -435,34 +469,29 @@ impl<T: 'static> Frontend<T> {
 		// ################################
 
 		// "Home" side button
-		self.tasks.handle_button(
-			&self.state.fetch_component_as::<ComponentButton>("btn_side_home")?,
-			FrontendTask::SetTab(TabType::Home),
-		);
+		let btn = self.state.fetch_component_as::<ComponentButton>("btn_side_home")?;
+		self.tasks.handle_button(&btn, FrontendTask::SetTab(TabType::Home));
+		self.side_buttons.push((TabType::Home, btn));
 
 		// "Apps" side button
-		self.tasks.handle_button(
-			&self.state.fetch_component_as::<ComponentButton>("btn_side_apps")?,
-			FrontendTask::SetTab(TabType::Apps),
-		);
+		let btn = self.state.fetch_component_as::<ComponentButton>("btn_side_apps")?;
+		self.tasks.handle_button(&btn, FrontendTask::SetTab(TabType::Apps));
+		self.side_buttons.push((TabType::Apps, btn));
 
 		// "Games" side button
-		self.tasks.handle_button(
-			&self.state.fetch_component_as::<ComponentButton>("btn_side_games")?,
-			FrontendTask::SetTab(TabType::Games),
-		);
+		let btn = self.state.fetch_component_as::<ComponentButton>("btn_side_games")?;
+		self.tasks.handle_button(&btn, FrontendTask::SetTab(TabType::Games));
+		self.side_buttons.push((TabType::Games, btn));
 
 		// "Monado side button"
-		self.tasks.handle_button(
-			&self.state.fetch_component_as::<ComponentButton>("btn_side_monado")?,
-			FrontendTask::SetTab(TabType::Monado),
-		);
+		let btn = self.state.fetch_component_as::<ComponentButton>("btn_side_monado")?;
+		self.tasks.handle_button(&btn, FrontendTask::SetTab(TabType::Monado));
+		self.side_buttons.push((TabType::Monado, btn));
 
 		// "Settings" side button
-		self.tasks.handle_button(
-			&self.state.fetch_component_as::<ComponentButton>("btn_side_settings")?,
-			FrontendTask::SetTab(TabType::Settings),
-		);
+		let btn = self.state.fetch_component_as::<ComponentButton>("btn_side_settings")?;
+		self.tasks.handle_button(&btn, FrontendTask::SetTab(TabType::Settings));
+		self.side_buttons.push((TabType::Settings, btn));
 
 		// ################################
 		// BOTTOM BAR BUTTONS
@@ -485,7 +514,6 @@ impl<T: 'static> Frontend<T> {
 
 	fn action_show_audio_settings(&mut self) -> anyhow::Result<()> {
 		self.window_audio_settings.open(&mut WguiWindowParams {
-			globals: &self.globals,
 			position: Vec2::new(64.0, 64.0),
 			layout: &mut self.layout,
 			extra: WguiWindowParamsExtra {
@@ -525,11 +553,27 @@ impl<T: 'static> Frontend<T> {
 	}
 
 	fn action_recenter_playspace(&mut self, data: &mut T) -> anyhow::Result<()> {
-		self.interface.recenter_playspace(data, RecenterMode::Recenter)?;
+		self.interface.playspace_task(data, DashPlayspaceTask::Recenter)?;
 		Ok(())
 	}
 
 	fn action_hide_dashboard(&mut self, data: &mut T) {
 		self.interface.toggle_dashboard(data);
 	}
+
+	fn action_tutorial_graduated(&mut self, data: &mut T) {
+		let config = self.interface.general_config(data);
+		config.tutorial_graduated = true;
+		self.interface.config_changed(data, ConfigChangeKind::Other);
+	}
+
+	fn action_open_url(&mut self, url: Rc<str>) {
+		let _ = std::process::Command::new("xdg-open").arg(url.as_ref()).spawn();
+		self
+			.tasks
+			.push(FrontendTask::PushToast(Translation::from_raw_text_string(format!(
+				"Opened URL: {}",
+				url
+			))));
+	}
 }
diff --git a/dash-frontend/src/tab/apps.rs b/dash-frontend/src/tab/apps.rs
index 7e17ff39..6d6e5011 100644
--- a/dash-frontend/src/tab/apps.rs
+++ b/dash-frontend/src/tab/apps.rs
@@ -1,44 +1,41 @@
-use std::{
-	cell::RefCell,
-	collections::{HashMap, VecDeque},
-	marker::PhantomData,
-	rc::Rc,
-};
-
+use std::{cell::RefCell, collections::VecDeque, marker::PhantomData, rc::Rc};
 use wgui::{
 	assets::AssetPath,
 	components::button::{ButtonClickCallback, ComponentButton},
 	globals::WguiGlobals,
 	i18n::Translation,
 	layout::{WidgetID, WidgetPair},
-	parser::{Fetchable, ParseDocumentParams, ParserState},
+	parser::{Fetchable, ParseDocumentParams, ParserState, TemplateParams},
 	task::Tasks,
 };
-use wlx_common::desktop_finder::DesktopEntry;
+use wlx_common::{config::PinnedApp, desktop_finder::DesktopEntry};
 
 use crate::{
-	frontend::{Frontend, FrontendTask, FrontendTasks},
+	frontend::{Frontend, FrontendTasks},
 	tab::{Tab, TabType},
-	util::popup_manager::{MountPopupParams, PopupHandle},
-	views::{self, app_launcher},
+	util::{popup_manager::PopupHolder, wgui_simple},
+	views::{self},
 };
 
-enum Task {
-	CloseLauncher,
+struct State {
+	#[allow(dead_code)]
+	parser_state: ParserState,
+	view_launcher: PopupHolder<views::app_launcher::View>,
 }
 
-struct State {
-	view_launcher: Option<(PopupHandle, views::app_launcher::View)>,
+#[derive(Clone)]
+enum Task {
+	RefreshPinnedApps,
 }
 
 pub struct TabApps<T> {
-	#[allow(dead_code)]
-	parser_state: ParserState,
-
 	state: Rc<RefCell<State>>,
 	app_list: AppList,
-	tasks: Tasks<Task>,
 	marker: PhantomData<T>,
+
+	pinned_apps_parent: WidgetID,
+
+	tasks: Tasks<Task>,
 }
 
 impl<T> Tab<T> for TabApps<T> {
@@ -49,25 +46,100 @@ impl<T> Tab<T> for TabApps<T> {
 	fn update(&mut self, frontend: &mut Frontend<T>, _time_ms: u32, data: &mut T) -> anyhow::Result<()> {
 		let mut state = self.state.borrow_mut();
 
+		self.app_list.tick(frontend, &self.tasks, &mut state, &self.state)?;
+
 		for task in self.tasks.drain() {
 			match task {
-				Task::CloseLauncher => state.view_launcher = None,
+				Task::RefreshPinnedApps => self.refresh_pinned_apps(&mut state, frontend, data)?,
 			}
 		}
 
-		self
-			.app_list
-			.tick(frontend, &self.state, &self.tasks, &mut self.parser_state)?;
+		state
+			.view_launcher
+			.with_view_res(|view| view.update(&mut frontend.interface, data))?;
+		Ok(())
+	}
+}
 
-		if let Some((_, launcher)) = &mut state.view_launcher {
-			launcher.update(&mut frontend.interface, data)?;
+fn find_entry_from_app_name<'a>(app_id: &str, entries: &'a [DesktopEntry]) -> Option<&'a DesktopEntry> {
+	entries.iter().find(|&entry| *entry.app_id == *app_id)
+}
+
+impl<T> TabApps<T> {
+	fn refresh_pinned_apps(&self, state: &mut State, frontend: &mut Frontend<T>, data: &mut T) -> anyhow::Result<()> {
+		frontend.layout.remove_children(self.pinned_apps_parent);
+		let globals = frontend.globals.clone();
+
+		let mut stale_entries = Vec::<Rc<str>>::new();
+
+		let mut pinned_desktop_entries = Vec::<(PinnedApp, &DesktopEntry)>::new();
+
+		// collect pinned desktop entries
+		{
+			let config = frontend.interface.general_config(data);
+			for pinned_app in &config.pinned_apps {
+				let Some(desktop_entry) = find_entry_from_app_name(&pinned_app.app_id, &self.app_list.all_entries) else {
+					stale_entries.push(pinned_app.app_id.clone());
+					continue;
+				};
+
+				pinned_desktop_entries.push((pinned_app.clone(), desktop_entry));
+			}
+			// cleanup:
+			// remove non-existent app ids from pinned apps
+			config.pinned_apps.retain(|pinned_app| {
+				for app_id in &stale_entries {
+					if *app_id == pinned_app.app_id {
+						return false;
+					}
+				}
+				true
+			});
 		}
+
+		if pinned_desktop_entries.is_empty() {
+			wgui_simple::create_label(
+				&mut frontend.layout,
+				self.pinned_apps_parent,
+				Translation::from_translation_key("EMPTY"),
+			)?;
+		}
+
+		// mount pinned desktop entries
+		for (pinned_app, desktop_entry) in pinned_desktop_entries {
+			let tooltip_string = format!(
+				"{}\n{}\n{}",
+				pinned_app.compositor_mode.as_ref(),
+				pinned_app.orientation_mode.as_ref(),
+				pinned_app.res_mode.as_ref()
+			);
+
+			let button = mount_entry(
+				frontend,
+				&mut state.parser_state,
+				&doc_params(frontend.globals.clone()),
+				self.pinned_apps_parent,
+				desktop_entry,
+				Some(tooltip_string),
+			)?;
+
+			button.on_click(on_app_click(
+				frontend.tasks.clone(),
+				self.tasks.clone(),
+				globals.clone(),
+				desktop_entry.clone(),
+				self.state.clone(),
+				Some(pinned_app.clone()),
+			));
+		}
+
 		Ok(())
 	}
 }
 
 struct AppList {
 	//data: Vec<ParserData>,
+	all_entries: Vec<DesktopEntry>,
 	entries_to_mount: VecDeque<DesktopEntry>,
 	list_parent: WidgetPair,
 	prev_category_name: String,
@@ -76,43 +148,21 @@ struct AppList {
 // called after the user clicks any desktop entry
 fn on_app_click(
 	frontend_tasks: FrontendTasks,
+	tasks: Tasks<Task>,
 	globals: WguiGlobals,
 	entry: DesktopEntry,
 	state: Rc<RefCell<State>>,
-	tasks: Tasks<Task>,
+	pinned_app: Option<PinnedApp>,
 ) -> ButtonClickCallback {
 	Rc::new(move |_common, _evt| {
-		frontend_tasks.push(FrontendTask::MountPopup(MountPopupParams {
-			title: Translation::from_raw_text(&entry.app_name),
-			on_content: {
-				// this is awful
-				let state = state.clone();
-				let entry = entry.clone();
-				let globals = globals.clone();
-				let frontend_tasks = frontend_tasks.clone();
-				let tasks = tasks.clone();
-
-				Rc::new(move |data| {
-					let on_launched = {
-						let tasks = tasks.clone();
-						Box::new(move || tasks.push(Task::CloseLauncher))
-					};
-
-					let view = app_launcher::View::new(app_launcher::Params {
-						entry: entry.clone(),
-						globals: &globals,
-						layout: data.layout,
-						parent_id: data.id_content,
-						frontend_tasks: &frontend_tasks,
-						config: data.config,
-						on_launched,
-					})?;
-
-					state.borrow_mut().view_launcher = Some((data.handle, view));
-					Ok(())
-				})
-			},
-		}));
+		views::app_launcher::mount_popup(
+			frontend_tasks.clone(),
+			globals.clone(),
+			entry.clone(),
+			state.borrow_mut().view_launcher.clone(),
+			tasks.make_callback_box(Task::RefreshPinnedApps),
+			pinned_app.clone(),
+		);
 		Ok(())
 	})
 }
@@ -128,19 +178,24 @@ fn doc_params(globals: WguiGlobals) -> ParseDocumentParams<'static> {
 impl<T> TabApps<T> {
 	pub fn new(frontend: &mut Frontend<T>, parent_id: WidgetID, data: &mut T) -> anyhow::Result<Self> {
 		let globals = frontend.layout.state.globals.clone();
-		let tasks = Tasks::new();
-		let state = Rc::new(RefCell::new(State { view_launcher: None }));
-
 		let parser_state = wgui::parser::parse_from_assets(&doc_params(globals.clone()), &mut frontend.layout, parent_id)?;
-		let app_list_parent = parser_state.fetch_widget(&frontend.layout.state, "app_list_parent")?;
 
-		let mut entries_sorted: Vec<_> = frontend
+		let app_list_parent = parser_state.fetch_widget(&frontend.layout.state, "app_list_parent")?;
+		let pinned_apps_parent = parser_state.fetch_widget(&frontend.layout.state, "pinned_apps_parent")?;
+
+		let state = Rc::new(RefCell::new(State {
+			view_launcher: Default::default(),
+			parser_state,
+		}));
+
+		let entries: Vec<_> = frontend
 			.interface
 			.desktop_finder(data)
 			.find_entries()
 			.into_values()
 			.collect();
 
+		let mut entries_sorted = entries.clone();
 		entries_sorted.sort_by(|a, b| {
 			let cat_name_a = get_category_name(a);
 			let cat_name_b = get_category_name(b);
@@ -148,17 +203,21 @@ impl<T> TabApps<T> {
 		});
 
 		let app_list = AppList {
+			all_entries: entries,
 			entries_to_mount: entries_sorted.drain(..).collect(),
 			list_parent: app_list_parent,
 			prev_category_name: String::new(),
 		};
 
+		let tasks = Tasks::<Task>::new();
+		tasks.push(Task::RefreshPinnedApps);
+
 		Ok(Self {
 			app_list,
-			parser_state,
 			state,
 			tasks,
 			marker: PhantomData,
+			pinned_apps_parent: pinned_apps_parent.id,
 		})
 	}
 }
@@ -272,83 +331,93 @@ fn get_category_name(entry: &DesktopEntry) -> &str {
 	}
 }
 
-impl AppList {
-	fn mount_entry<T>(
-		&mut self,
-		frontend: &mut Frontend<T>,
-		parser_state: &mut ParserState,
-		doc_params: &ParseDocumentParams,
-		entry: &DesktopEntry,
-	) -> anyhow::Result<Rc<ComponentButton>> {
-		let category_name = get_category_name(entry);
-		if category_name != self.prev_category_name {
-			self.prev_category_name = String::from(category_name);
-			let mut params = HashMap::<Rc<str>, Rc<str>>::new();
-			params.insert("text".into(), category_name.into());
+fn mount_entry<T>(
+	frontend: &mut Frontend<T>,
+	parser_state: &mut ParserState,
+	doc_params: &ParseDocumentParams,
+	id_parent: WidgetID,
+	entry: &DesktopEntry,
+	tooltip: Option<String>,
+) -> anyhow::Result<Rc<ComponentButton>> {
+	{
+		let mut params = TemplateParams::new();
 
-			parser_state.realize_template(
-				doc_params,
-				"CategoryText",
-				&mut frontend.layout,
-				self.list_parent.id,
-				params,
-			)?;
-		}
+		if let Some(tooltip) = tooltip {
+			params.insert_str("tooltip", tooltip);
+		};
 
-		{
-			let mut params = HashMap::new();
+		// entry icon
+		params.insert_rc(
+			"src_ext",
+			entry
+				.icon_path
+				.as_ref()
+				.map_or_else(|| "".into(), |icon_path| icon_path.clone()),
+		);
 
-			// entry icon
-			params.insert(
-				"src_ext".into(),
-				entry
-					.icon_path
-					.as_ref()
-					.map_or_else(|| "".into(), |icon_path| icon_path.clone()),
-			);
+		// entry fallback (question mark) icon
+		params.insert(
+			"src",
+			if entry.icon_path.is_none() {
+				"dashboard/terminal.svg"
+			} else {
+				""
+			},
+		);
+		params.insert("name", &entry.app_name);
 
-			// entry fallback (question mark) icon
-			params.insert(
-				"src".into(),
-				if entry.icon_path.is_none() {
-					"dashboard/terminal.svg".into()
-				} else {
-					"".into()
-				},
-			);
-			params.insert("name".into(), entry.app_name.clone());
+		let data = parser_state.realize_template(doc_params, "AppEntry", &mut frontend.layout, id_parent, params)?;
 
-			let data = parser_state.realize_template(
-				doc_params,
-				"AppEntry",
-				&mut frontend.layout,
-				self.list_parent.id,
-				params,
-			)?;
-
-			data.fetch_component_as::<ComponentButton>("button")
-		}
+		data.fetch_component_as::<ComponentButton>("button")
 	}
+}
 
+impl AppList {
 	fn tick<T>(
 		&mut self,
 		frontend: &mut Frontend<T>,
-		state: &Rc<RefCell<State>>,
 		tasks: &Tasks<Task>,
-		parser_state: &mut ParserState,
+		state: &mut State,
+		rc_state: &Rc<RefCell<State>>,
 	) -> anyhow::Result<()> {
-		// load 4 entries for a single frame at most
-		for _ in 0..4 {
+		let parser_state = &mut state.parser_state;
+
+		// load 30 entries for a single frame at most
+		for _ in 0..30 {
 			if let Some(entry) = self.entries_to_mount.pop_front() {
 				let globals = frontend.layout.state.globals.clone();
-				let button = self.mount_entry(frontend, parser_state, &doc_params(globals.clone()), &entry)?;
+
+				let category_name = get_category_name(&entry);
+				if category_name != self.prev_category_name {
+					self.prev_category_name = String::from(category_name);
+					let mut params = TemplateParams::new();
+					params.insert("text", category_name);
+
+					parser_state.realize_template(
+						&doc_params(globals.clone()),
+						"CategoryText",
+						&mut frontend.layout,
+						self.list_parent.id,
+						params,
+					)?;
+				}
+
+				let button = mount_entry(
+					frontend,
+					parser_state,
+					&doc_params(globals.clone()),
+					self.list_parent.id,
+					&entry,
+					None,
+				)?;
 
 				button.on_click(on_app_click(
 					frontend.tasks.clone(),
+					tasks.clone(),
 					globals.clone(),
 					entry.clone(),
-					state.clone(),
-					tasks.clone(),
+					rc_state.clone(),
+					None,
 				));
 			} else {
 				break;
diff --git a/dash-frontend/src/tab/donate.rs b/dash-frontend/src/tab/donate.rs
new file mode 100644
index 00000000..4ab8c0b2
--- /dev/null
+++ b/dash-frontend/src/tab/donate.rs
@@ -0,0 +1,68 @@
+use std::{marker::PhantomData, rc::Rc};
+
+use wgui::{
+	assets::AssetPath,
+	components::button::ComponentButton,
+	globals::WguiGlobals,
+	layout::WidgetID,
+	parser::{Fetchable, ParseDocumentParams, ParserState},
+	task::Tasks,
+};
+
+use crate::{
+	frontend::{Frontend, FrontendTask},
+	tab::{Tab, TabType},
+};
+
+#[derive(Clone)]
+#[allow(clippy::enum_variant_names)]
+enum Task {}
+
+pub struct TabDonate<T> {
+	#[allow(dead_code)]
+	pub state: ParserState,
+	marker: PhantomData<T>,
+	#[allow(dead_code)]
+	tasks: Tasks<Task>,
+}
+
+impl<T> Tab<T> for TabDonate<T> {
+	fn get_type(&self) -> TabType {
+		TabType::Donate
+	}
+
+	fn update(&mut self, _frontend: &mut Frontend<T>, _time_ms: u32, _user_data: &mut T) -> anyhow::Result<()> {
+		// for task in self.tasks.drain() {
+		// 	match task {}
+		// }
+
+		Ok(())
+	}
+}
+
+fn doc_params(globals: &WguiGlobals) -> ParseDocumentParams<'_> {
+	ParseDocumentParams {
+		globals: globals.clone(),
+		path: AssetPath::BuiltIn("gui/tab/donate.xml"),
+		extra: Default::default(),
+	}
+}
+
+impl<T> TabDonate<T> {
+	pub fn new(frontend: &mut Frontend<T>, parent_id: WidgetID, _data: &mut T) -> anyhow::Result<Self> {
+		let state = wgui::parser::parse_from_assets(&doc_params(&frontend.globals), &mut frontend.layout, parent_id)?;
+
+		frontend.tasks.handle_button(
+			&state.fetch_component_as::<ComponentButton>("btn_donate")?,
+			FrontendTask::OpenURL(Rc::from("https://opencollective.com/wayvr-org")),
+		);
+
+		let tasks = Tasks::<Task>::new();
+
+		Ok(Self {
+			state,
+			marker: PhantomData,
+			tasks,
+		})
+	}
+}
diff --git a/dash-frontend/src/tab/games.rs b/dash-frontend/src/tab/games.rs
index fcdc3cad..514b7c3e 100644
--- a/dash-frontend/src/tab/games.rs
+++ b/dash-frontend/src/tab/games.rs
@@ -10,7 +10,7 @@ use crate::{
 	frontend::Frontend,
 	tab::{Tab, TabType},
 	util::steam_utils::SteamUtils,
-	views::{game_list, running_games_list},
+	views::{ViewTrait, ViewUpdateParams, game_list, running_games_list},
 };
 
 pub struct TabGames<T> {
@@ -19,7 +19,6 @@ pub struct TabGames<T> {
 
 	view_game_list: game_list::View,
 	view_running_games_list: running_games_list::View,
-	steam_utils: SteamUtils,
 	marker: PhantomData<T>,
 }
 
@@ -28,10 +27,20 @@ impl<T> Tab<T> for TabGames<T> {
 		TabType::Games
 	}
 
-	fn update(&mut self, frontend: &mut Frontend<T>, time_ms: u32, _data: &mut T) -> anyhow::Result<()> {
-		self
-			.view_game_list
-			.update(&mut frontend.layout, &mut self.steam_utils, &frontend.executor)?;
+	fn update(&mut self, frontend: &mut Frontend<T>, time_ms: u32, data: &mut T) -> anyhow::Result<()> {
+		let mut config_change_kind = None;
+
+		self.view_game_list.update(&mut ViewUpdateParams {
+			layout: &mut frontend.layout,
+			executor: &frontend.executor,
+			general_config: frontend.interface.general_config(data),
+			config_change_kind: &mut config_change_kind,
+		})?;
+
+		if let Some(kind) = config_change_kind {
+			frontend.interface.config_changed(data, kind);
+		}
+
 		self.view_running_games_list.update(&mut frontend.layout, time_ms)?;
 		Ok(())
 	}
@@ -54,16 +63,17 @@ impl<T> TabGames<T> {
 		let game_list_parent = state.get_widget_id("game_list_parent")?;
 		let id_running_games_list_parent = state.get_widget_id("running_games_list_parent")?;
 
+		let mut steam_utils = SteamUtils::new()?;
+
 		let view_game_list = game_list::View::new(game_list::Params {
 			executor: frontend.executor.clone(),
 			frontend_tasks: frontend.tasks.clone(),
 			globals: globals.clone(),
 			layout: &mut frontend.layout,
 			parent_id: game_list_parent,
+			steam_utils: &steam_utils,
 		})?;
 
-		let mut steam_utils = SteamUtils::new()?;
-
 		let view_running_games_list = running_games_list::View::new(running_games_list::Params {
 			globals: globals.clone(),
 			layout: &mut frontend.layout,
@@ -77,7 +87,6 @@ impl<T> TabGames<T> {
 			view_game_list,
 			view_running_games_list,
 			marker: PhantomData,
-			steam_utils,
 		})
 	}
 }
diff --git a/dash-frontend/src/tab/home.rs b/dash-frontend/src/tab/home.rs
index 57e967cd..b6b6a03e 100644
--- a/dash-frontend/src/tab/home.rs
+++ b/dash-frontend/src/tab/home.rs
@@ -59,22 +59,29 @@ impl<T> TabHome<T> {
 			parent_id,
 		)?;
 
-		let mut c = frontend.layout.start_common();
-		let widget_label = state.fetch_widget(&c.layout.state, "label_hello")?.widget;
-		configure_label_hello(&mut c.common(), widget_label, frontend.interface.general_config(data));
+		let widget_label = state.fetch_widget(&frontend.layout.state, "label_hello")?.widget;
+		configure_label_hello(
+			&mut frontend.layout.common(),
+			widget_label,
+			frontend.interface.general_config(data),
+		);
 
 		let btn_apps = state.fetch_component_as::<ComponentButton>("btn_apps")?;
 		let btn_games = state.fetch_component_as::<ComponentButton>("btn_games")?;
 		let btn_monado = state.fetch_component_as::<ComponentButton>("btn_monado")?;
-		//let btn_processes = state.fetch_component_as::<ComponentButton>("btn_processes")?;
 		let btn_settings = state.fetch_component_as::<ComponentButton>("btn_settings")?;
+		let btn_welcome_screen = state.fetch_component_as::<ComponentButton>("btn_welcome_screen")?;
+		let btn_donate = state.fetch_component_as::<ComponentButton>("btn_donate")?;
+		let btn_website = state.fetch_component_as::<ComponentButton>("btn_website")?;
 
 		let tasks = &mut frontend.tasks;
 		tasks.handle_button(&btn_apps, FrontendTask::SetTab(TabType::Apps));
 		tasks.handle_button(&btn_games, FrontendTask::SetTab(TabType::Games));
 		tasks.handle_button(&btn_monado, FrontendTask::SetTab(TabType::Monado));
-		//tasks.handle_button(&btn_processes, FrontendTask::SetTab(TabType::Processes));
 		tasks.handle_button(&btn_settings, FrontendTask::SetTab(TabType::Settings));
+		tasks.handle_button(&btn_welcome_screen, FrontendTask::SetTab(TabType::Welcome));
+		tasks.handle_button(&btn_donate, FrontendTask::SetTab(TabType::Donate));
+		tasks.handle_button(&btn_website, FrontendTask::OpenURL("https://wayvr.org".into()));
 
 		Ok(Self {
 			state,
diff --git a/dash-frontend/src/tab/mod.rs b/dash-frontend/src/tab/mod.rs
index 68e7fb03..881084de 100644
--- a/dash-frontend/src/tab/mod.rs
+++ b/dash-frontend/src/tab/mod.rs
@@ -1,18 +1,33 @@
+use strum::EnumCount;
+
 use crate::frontend::Frontend;
 
 pub mod apps;
+pub mod donate;
 pub mod games;
 pub mod home;
 pub mod monado;
 pub mod settings;
+pub mod welcome;
 
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, EnumCount)]
 pub enum TabType {
 	Home,
 	Apps,
 	Games,
 	Monado,
 	Settings,
+	Welcome,
+	Donate,
+}
+
+impl TabType {
+	pub fn get_preferred_padding(&self) -> f32 {
+		match self {
+			TabType::Welcome | TabType::Donate => 0.0,
+			_ => 16.0,
+		}
+	}
 }
 
 pub trait Tab<T> {
diff --git a/dash-frontend/src/tab/monado.rs b/dash-frontend/src/tab/monado.rs
index 0f714306..cac91366 100644
--- a/dash-frontend/src/tab/monado.rs
+++ b/dash-frontend/src/tab/monado.rs
@@ -6,16 +6,20 @@ use wgui::{
 		bar_graph::{ComponentBarGraph, ValueCell},
 		button::ComponentButton,
 		checkbox::ComponentCheckbox,
-		slider::ComponentSlider,
+		color_selector::{ColorSelectorChangedCallback, ComponentColorSelector},
+		slider::{ComponentSlider, SliderValueChangedCallback},
 		tabs::ComponentTabs,
 	},
 	drawing::Color,
 	globals::WguiGlobals,
 	layout::{Layout, WidgetID},
-	parser::{self, Fetchable, ParseDocumentParams, ParserState},
+	parser::{self, Fetchable, ParseDocumentParams, ParserState, TemplateParams},
 	task::Tasks,
 };
-use wlx_common::dash_interface::{self, MonadoDumpSessionFrame};
+use wlx_common::{
+	config::GeneralConfig,
+	dash_interface::{self, ConfigChangeKind, MonadoDumpSessionFrame},
+};
 
 use crate::{
 	frontend::Frontend,
@@ -24,22 +28,23 @@ use crate::{
 
 #[derive(Clone)]
 enum TabNameEnum {
-	GeneralSettings,
 	ProcessList,
+	GeneralSettings,
 	DebugTimings,
 }
 
 impl TabNameEnum {
 	fn from_string(s: &str) -> Option<Self> {
 		match s {
-			"general_settings" => Some(TabNameEnum::GeneralSettings),
 			"process_list" => Some(TabNameEnum::ProcessList),
+			"general_settings" => Some(TabNameEnum::GeneralSettings),
 			"debug_timings" => Some(TabNameEnum::DebugTimings),
 			_ => None,
 		}
 	}
 }
 
+#[derive(Clone)]
 enum Task {
 	SetBrightness(f32),
 	SetTab(TabNameEnum),
@@ -51,6 +56,8 @@ enum Task {
 	// `DebugTimings` tab
 	DebugTimingsRefreshSessionList,
 	DebugTimingsSetSessionId(i64),
+
+	GeneralSettingsChromaUpdate,
 }
 
 struct SubtabProcessList {
@@ -62,6 +69,13 @@ struct SubtabProcessList {
 struct SubtabGeneralSettings {
 	#[allow(dead_code)]
 	state: ParserState,
+
+	slider_keying_curve: Rc<ComponentSlider>,
+	slider_keying_despill: Rc<ComponentSlider>,
+	slider_keying_hue_range: Rc<ComponentSlider>,
+	slider_keying_saturation_range: Rc<ComponentSlider>,
+	slider_keying_value_range: Rc<ComponentSlider>,
+	cs_keying: Rc<ComponentColorSelector>,
 }
 
 struct DebugGraph {
@@ -112,8 +126,8 @@ struct SubtabDebugTimings {
 #[allow(clippy::large_enum_variant)]
 enum Subtab {
 	Empty,
-	GeneralSettings(SubtabGeneralSettings),
 	ProcessList(SubtabProcessList),
+	GeneralSettings(SubtabGeneralSettings),
 	DebugTimings(SubtabDebugTimings),
 }
 
@@ -158,10 +172,22 @@ impl<T> Tab<T> for TabMonado<T> {
 						tab.set_session_id(&mut frontend.layout, session_id)?;
 					}
 				}
+				Task::GeneralSettingsChromaUpdate => {
+					if let Subtab::GeneralSettings(tab) = &mut self.subtab {
+						tab.chroma_update(frontend.interface.general_config(data));
+						frontend
+							.interface
+							.config_changed(data, ConfigChangeKind::EnvironmentBlend);
+					}
+				}
 				Task::SetBrightness(brightness) => self.set_brightness(frontend, data, brightness),
 				Task::SetTab(tab) => {
 					frontend.layout.remove_children(self.id_content);
 					match tab {
+						TabNameEnum::ProcessList => {
+							self.tasks.push(Task::ProcessListRefresh);
+							self.subtab = Subtab::ProcessList(SubtabProcessList::new(self.id_content, frontend)?)
+						}
 						TabNameEnum::GeneralSettings => {
 							self.subtab = Subtab::GeneralSettings(SubtabGeneralSettings::new(
 								self.id_content,
@@ -170,10 +196,6 @@ impl<T> Tab<T> for TabMonado<T> {
 								&self.tasks,
 							)?)
 						}
-						TabNameEnum::ProcessList => {
-							self.tasks.push(Task::ProcessListRefresh);
-							self.subtab = Subtab::ProcessList(SubtabProcessList::new(self.id_content, frontend)?)
-						}
 						TabNameEnum::DebugTimings => {
 							self.subtab = Subtab::DebugTimings(SubtabDebugTimings::new(self.id_content, frontend, &self.tasks)?)
 						}
@@ -184,7 +206,6 @@ impl<T> Tab<T> for TabMonado<T> {
 
 		match &mut self.subtab {
 			Subtab::Empty => {}
-			Subtab::GeneralSettings(_) => {}
 			Subtab::ProcessList(_) => {
 				// every few seconds
 				if let Subtab::ProcessList(_) = &self.subtab
@@ -193,6 +214,7 @@ impl<T> Tab<T> for TabMonado<T> {
 					self.tasks.push(Task::ProcessListRefresh);
 				}
 			}
+			Subtab::GeneralSettings(_) => {}
 			Subtab::DebugTimings(timings) => {
 				timings.update(&self.tasks, data, frontend)?;
 			}
@@ -243,6 +265,8 @@ fn yesno(n: bool) -> &'static str {
 	}
 }
 
+const SLIDER_MULTIPLIER: f32 = 100.0;
+
 impl SubtabGeneralSettings {
 	fn new<T>(
 		parent_id: WidgetID,
@@ -259,20 +283,91 @@ impl SubtabGeneralSettings {
 		// get brightness
 		let slider_brightness = state.fetch_component_as::<ComponentSlider>("slider_brightness")?;
 		if let Some(brightness) = frontend.interface.monado_brightness_get(data) {
-			let mut c = frontend.layout.start_common();
-			slider_brightness.set_value(&mut c.common(), brightness * 100.0);
-			c.finish()?;
+			slider_brightness.set_value_primary(&mut frontend.layout.common(), brightness * 100.0);
 
 			slider_brightness.on_value_changed({
 				let tasks = tasks.clone();
 				Box::new(move |_common, e| {
 					tasks.push(Task::SetBrightness(e.value / 100.0));
-					Ok(())
 				})
 			});
 		}
 
-		Ok(Self { state })
+		let config = frontend.interface.general_config(data);
+
+		let cs_keying = state.fetch_component_as::<ComponentColorSelector>("cs_keying")?;
+		let slider_keying_despill = state.fetch_component_as::<ComponentSlider>("slider_keying_despill")?;
+		let slider_keying_curve = state.fetch_component_as::<ComponentSlider>("slider_keying_curve")?;
+		let slider_keying_hue_range = state.fetch_component_as::<ComponentSlider>("slider_keying_hue_range")?;
+		let slider_keying_saturation_range =
+			state.fetch_component_as::<ComponentSlider>("slider_keying_saturation_range")?;
+		let slider_keying_value_range = state.fetch_component_as::<ComponentSlider>("slider_keying_value_range")?;
+
+		{
+			let mut common = frontend.layout.common();
+
+			// set initial values
+			let (rgb, range_h, range_s, range_v) = config.chroma_key_params.get_rgb_and_hsv_ranges();
+			slider_keying_curve.set_value_primary(&mut common, config.chroma_key_params.curve * SLIDER_MULTIPLIER);
+			slider_keying_despill.set_value_primary(&mut common, config.chroma_key_params.despill * SLIDER_MULTIPLIER);
+			slider_keying_hue_range.set_value_primary(&mut common, range_h * SLIDER_MULTIPLIER);
+			slider_keying_saturation_range.set_value_primary(&mut common, range_s * SLIDER_MULTIPLIER);
+			slider_keying_value_range.set_value_primary(&mut common, range_v * SLIDER_MULTIPLIER);
+			cs_keying.set_color(&mut common, rgb);
+
+			// prepare callbacks
+			fn get_slider_callback(tasks: &Tasks<Task>) -> SliderValueChangedCallback {
+				Box::new({
+					let tasks = tasks.clone();
+					move |_, _| {
+						tasks.push(Task::GeneralSettingsChromaUpdate);
+					}
+				})
+			}
+
+			fn get_color_selector_callback(tasks: &Tasks<Task>) -> ColorSelectorChangedCallback {
+				Box::new({
+					let tasks = tasks.clone();
+					move |_, _| {
+						tasks.push(Task::GeneralSettingsChromaUpdate);
+					}
+				})
+			}
+			slider_keying_curve.on_value_changed(get_slider_callback(tasks));
+			slider_keying_despill.on_value_changed(get_slider_callback(tasks));
+			slider_keying_hue_range.on_value_changed(get_slider_callback(tasks));
+			slider_keying_saturation_range.on_value_changed(get_slider_callback(tasks));
+			slider_keying_value_range.on_value_changed(get_slider_callback(tasks));
+			cs_keying.on_changed(get_color_selector_callback(tasks));
+		}
+
+		Ok(Self {
+			state,
+			slider_keying_curve,
+			slider_keying_despill,
+			slider_keying_hue_range,
+			slider_keying_saturation_range,
+			slider_keying_value_range,
+			cs_keying,
+		})
+	}
+
+	fn chroma_update(&mut self, config: &mut GeneralConfig) {
+		let val_curve = self.slider_keying_curve.get_value_primary();
+		let val_despill = self.slider_keying_despill.get_value_primary();
+		let val_range_h = self.slider_keying_hue_range.get_value_primary();
+		let val_range_s = self.slider_keying_saturation_range.get_value_primary();
+		let val_range_v = self.slider_keying_value_range.get_value_primary();
+		let val_rgb = self.cs_keying.get_color();
+
+		config.chroma_key_params.despill = val_despill / SLIDER_MULTIPLIER;
+		config.chroma_key_params.curve = val_curve / SLIDER_MULTIPLIER;
+		config.chroma_key_params.update_hsv_range_from_rgb(
+			val_rgb,
+			val_range_h / SLIDER_MULTIPLIER,
+			val_range_s / SLIDER_MULTIPLIER,
+			val_range_v / SLIDER_MULTIPLIER,
+		);
 	}
 }
 
@@ -288,15 +383,16 @@ fn mount_sessions_list(
 	layout.remove_children(id_parent);
 
 	for (session_id, session) in sessions {
-		let mut params = HashMap::new();
+		let mut params = TemplateParams::new();
 
-		params.insert(
-			Rc::from("text"),
-			Rc::from(format!(
+		params.insert_rc(
+			"text",
+			format!(
 				"{} (ID {})",
 				session.resolved_name.as_ref().map_or("Unknown", |s| s.as_str()),
 				session_id,
-			)),
+			)
+			.into(),
 		);
 
 		let data = state.realize_template(
@@ -332,10 +428,10 @@ fn mount_graph(
 	limits: (f32, f32),
 ) -> anyhow::Result<DebugGraph> {
 	let globals = layout.state.globals.clone();
-	let mut params = HashMap::new();
-	params.insert(Rc::from("name"), Rc::from(name));
-	params.insert(Rc::from("limit_min"), Rc::from(limits.0.to_string()));
-	params.insert(Rc::from("limit_max"), Rc::from(limits.1.to_string()));
+	let mut params = TemplateParams::new();
+	params.insert("name", name);
+	params.insert_rc("limit_min", limits.0.to_string().into());
+	params.insert_rc("limit_max", limits.1.to_string().into());
 
 	let data = state.realize_template(
 		&doc_params_tab_debug_timings(&globals),
@@ -557,25 +653,15 @@ impl SubtabProcessList {
 		client: &dash_interface::MonadoClient,
 		tasks: &Tasks<Task>,
 	) -> anyhow::Result<()> {
-		let mut par = HashMap::<Rc<str>, Rc<str>>::new();
-		par.insert(
-			"checked".into(),
-			if client.is_primary {
-				Rc::from("1")
-			} else {
-				Rc::from("0")
-			},
-		);
-		par.insert(
-			"name".into(),
-			format!("{} (Client ID: {})", client.name, client.id).into(),
-		);
-		par.insert("flag_active".into(), yesno(client.is_active).into());
-		par.insert("flag_focused".into(), yesno(client.is_focused).into());
-		par.insert("flag_io_active".into(), yesno(client.is_io_active).into());
-		par.insert("flag_overlay".into(), yesno(client.is_overlay).into());
-		par.insert("flag_primary".into(), yesno(client.is_primary).into());
-		par.insert("flag_visible".into(), yesno(client.is_visible).into());
+		let mut par = TemplateParams::new();
+		par.insert("checked", if client.is_primary { "1" } else { "0" });
+		par.insert_rc("name", format!("{} (Client ID: {})", client.name, client.id).into());
+		par.insert("flag_active", yesno(client.is_active));
+		par.insert("flag_focused", yesno(client.is_focused));
+		par.insert("flag_io_active", yesno(client.is_io_active));
+		par.insert("flag_overlay", yesno(client.is_overlay));
+		par.insert("flag_primary", yesno(client.is_primary));
+		par.insert("flag_visible", yesno(client.is_visible));
 
 		let globals = layout.state.globals.clone();
 
diff --git a/dash-frontend/src/tab/settings/macros.rs b/dash-frontend/src/tab/settings/macros.rs
index 8c761412..9593f806 100644
--- a/dash-frontend/src/tab/settings/macros.rs
+++ b/dash-frontend/src/tab/settings/macros.rs
@@ -1,4 +1,4 @@
-use std::{collections::HashMap, rc::Rc};
+use std::rc::Rc;
 
 use crate::tab::settings::{self, SettingType, Task, horiz_cell, mount_requires_restart};
 use wgui::{
@@ -8,7 +8,7 @@ use wgui::{
 		slider::ComponentSlider,
 	},
 	layout::{Layout, WidgetID},
-	parser::{Fetchable, ParseDocumentParams, ParserState},
+	parser::{Fetchable, ParseDocumentParams, ParserState, TemplateParams},
 	task::Tasks,
 	widget::label::WidgetLabel,
 	windowing::context_menu,
@@ -24,10 +24,10 @@ pub fn options_category(
 	let id = mp.idx.to_string();
 	mp.idx += 1;
 
-	let mut params: HashMap<Rc<str>, Rc<str>> = HashMap::new();
-	params.insert(Rc::from("translation"), Rc::from(translation));
-	params.insert(Rc::from("icon"), Rc::from(icon));
-	params.insert(Rc::from("id"), Rc::from(id.as_ref()));
+	let mut params = TemplateParams::new();
+	params.insert("translation", translation);
+	params.insert("icon", icon);
+	params.insert("id", &id);
 
 	mp.parser_state
 		.instantiate_template(mp.doc_params, "SettingsGroupBox", mp.layout, parent, params)?;
@@ -39,20 +39,20 @@ pub fn options_checkbox(mp: &mut MacroParams, parent: WidgetID, setting: Setting
 	let id = mp.idx.to_string();
 	mp.idx += 1;
 
-	let mut params: HashMap<Rc<str>, Rc<str>> = HashMap::new();
-	params.insert(Rc::from("id"), Rc::from(id.as_ref()));
+	let mut params = TemplateParams::new();
+	params.insert("id", &id);
 
 	match setting.get_translation() {
-		Ok(translation) => params.insert(Rc::from("translation"), translation.into()),
-		Err(raw_text) => params.insert(Rc::from("text"), raw_text.into()),
+		Ok(translation) => params.insert("translation", translation),
+		Err(raw_text) => params.insert("text", raw_text),
 	};
 
 	if let Some(tooltip) = setting.get_tooltip() {
-		params.insert(Rc::from("tooltip"), Rc::from(tooltip));
+		params.insert("tooltip", tooltip);
 	}
 
 	let checked = if *setting.mut_bool(mp.config) { "1" } else { "0" };
-	params.insert(Rc::from("checked"), Rc::from(checked));
+	params.insert("checked", checked);
 
 	let id_cell = horiz_cell(mp.layout, parent)?;
 
@@ -86,23 +86,23 @@ pub fn options_slider_f32(
 	let id = mp.idx.to_string();
 	mp.idx += 1;
 
-	let mut params: HashMap<Rc<str>, Rc<str>> = HashMap::new();
-	params.insert(Rc::from("id"), Rc::from(id.as_ref()));
+	let mut params = TemplateParams::new();
+	params.insert("id", &id);
 
 	match setting.get_translation() {
-		Ok(translation) => params.insert(Rc::from("translation"), translation.into()),
-		Err(raw_text) => params.insert(Rc::from("text"), raw_text.into()),
+		Ok(translation) => params.insert("translation", translation),
+		Err(raw_text) => params.insert("text", raw_text),
 	};
 
 	if let Some(tooltip) = setting.get_tooltip() {
-		params.insert(Rc::from("tooltip"), Rc::from(tooltip));
+		params.insert("tooltip", tooltip);
 	}
 
 	let value = setting.mut_f32(mp.config).to_string();
-	params.insert(Rc::from("value"), Rc::from(value));
-	params.insert(Rc::from("min"), Rc::from(min.to_string()));
-	params.insert(Rc::from("max"), Rc::from(max.to_string()));
-	params.insert(Rc::from("step"), Rc::from(step.to_string()));
+	params.insert_rc("value", value.into());
+	params.insert_rc("min", min.to_string().into());
+	params.insert_rc("max", max.to_string().into());
+	params.insert_rc("step", step.to_string().into());
 
 	let id_cell = horiz_cell(mp.layout, parent)?;
 
@@ -118,7 +118,62 @@ pub fn options_slider_f32(
 		let tasks = mp.tasks.clone();
 		move |_common, e| {
 			tasks.push(Task::UpdateFloat(setting, e.value));
-			Ok(())
+		}
+	}));
+
+	Ok(())
+}
+
+pub fn options_range_f32(
+	mp: &mut MacroParams,
+	parent: WidgetID,
+	setting: SettingType,
+	setting2: SettingType,
+	min: f32,
+	max: f32,
+	step: f32,
+) -> anyhow::Result<()> {
+	let id = mp.idx.to_string();
+	mp.idx += 1;
+
+	let mut params = TemplateParams::new();
+	params.insert("id", &id);
+
+	match setting.get_translation() {
+		Ok(translation) => params.insert("translation", translation),
+		Err(raw_text) => params.insert("text", raw_text),
+	};
+
+	if let Some(tooltip) = setting.get_tooltip() {
+		params.insert("tooltip", tooltip);
+	}
+
+	let value = setting.mut_f32(mp.config).to_string();
+	let value2 = setting2.mut_f32(mp.config).to_string();
+	params.insert_rc("value", value.into());
+	params.insert_rc("value2", value2.into());
+	params.insert_rc("min", min.to_string().into());
+	params.insert_rc("max", max.to_string().into());
+	params.insert_rc("step", step.to_string().into());
+
+	let id_cell = horiz_cell(mp.layout, parent)?;
+
+	mp.parser_state
+		.instantiate_template(mp.doc_params, "RangeSetting", mp.layout, id_cell, params)?;
+
+	if setting.requires_restart() {
+		mount_requires_restart(mp.layout, id_cell)?;
+	}
+
+	let slider = mp.parser_state.fetch_component_as::<ComponentSlider>(&id)?;
+	slider.on_value_changed(Box::new({
+		let tasks = mp.tasks.clone();
+		move |_common, e| {
+			if matches!(e.index, wgui::components::slider::ValueIndex::Primary) {
+				tasks.push(Task::UpdateFloat(setting, e.value));
+			} else {
+				tasks.push(Task::UpdateFloat(setting2, e.value));
+			}
 		}
 	}));
 
@@ -136,25 +191,25 @@ pub fn options_slider_i32(
 	let id = mp.idx.to_string();
 	mp.idx += 1;
 
-	let mut params: HashMap<Rc<str>, Rc<str>> = HashMap::new();
-	params.insert(Rc::from("id"), Rc::from(id.as_ref()));
+	let mut params = TemplateParams::new();
+	params.insert("id", &id);
 
 	match setting.get_translation() {
-		Ok(translation) => params.insert(Rc::from("translation"), translation.into()),
-		Err(raw_text) => params.insert(Rc::from("text"), raw_text.into()),
+		Ok(translation) => params.insert("translation", translation),
+		Err(raw_text) => params.insert("text", raw_text),
 	};
 
 	if let Some(tooltip) = setting.get_tooltip() {
-		params.insert(Rc::from("tooltip"), Rc::from(tooltip));
+		params.insert("tooltip", tooltip);
 	}
 
 	let id_cell = horiz_cell(mp.layout, parent)?;
 
 	let value = setting.mut_i32(mp.config).to_string();
-	params.insert(Rc::from("value"), Rc::from(value));
-	params.insert(Rc::from("min"), Rc::from(min.to_string()));
-	params.insert(Rc::from("max"), Rc::from(max.to_string()));
-	params.insert(Rc::from("step"), Rc::from(step.to_string()));
+	params.insert_rc("value", value.into());
+	params.insert_rc("min", min.to_string().into());
+	params.insert_rc("max", max.to_string().into());
+	params.insert_rc("step", step.to_string().into());
 
 	mp.parser_state
 		.instantiate_template(mp.doc_params, "SliderSetting", mp.layout, id_cell, params)?;
@@ -168,7 +223,6 @@ pub fn options_slider_i32(
 		let tasks = mp.tasks.clone();
 		move |_common, e| {
 			tasks.push(Task::UpdateInt(setting, e.value as i32));
-			Ok(())
 		}
 	}));
 	Ok(())
@@ -185,16 +239,16 @@ where
 	let id = mp.idx.to_string();
 	mp.idx += 1;
 
-	let mut params: HashMap<Rc<str>, Rc<str>> = HashMap::new();
-	params.insert(Rc::from("id"), Rc::from(id.as_ref()));
+	let mut params = TemplateParams::new();
+	params.insert("id", &id);
 
 	match setting.get_translation() {
-		Ok(translation) => params.insert(Rc::from("translation"), translation.into()),
-		Err(raw_text) => params.insert(Rc::from("text"), raw_text.into()),
+		Ok(translation) => params.insert("translation", translation),
+		Err(raw_text) => params.insert("text", raw_text),
 	};
 
 	if let Some(tooltip) = setting.get_tooltip() {
-		params.insert(Rc::from("tooltip"), Rc::from(tooltip));
+		params.insert("tooltip", tooltip);
 	}
 
 	let id_cell = horiz_cell(mp.layout, parent)?;
@@ -262,10 +316,10 @@ pub fn options_danger_button(
 	let id = mp.idx.to_string();
 	mp.idx += 1;
 
-	let mut params: HashMap<Rc<str>, Rc<str>> = HashMap::new();
-	params.insert(Rc::from("id"), Rc::from(id.as_ref()));
-	params.insert(Rc::from("translation"), Rc::from(translation));
-	params.insert(Rc::from("icon"), Rc::from(icon));
+	let mut params = TemplateParams::new();
+	params.insert("id", &id);
+	params.insert("translation", translation);
+	params.insert("icon", icon);
 
 	mp.parser_state
 		.instantiate_template(mp.doc_params, "DangerButton", mp.layout, parent, params)?;
@@ -282,6 +336,36 @@ pub fn options_danger_button(
 	Ok(())
 }
 
+pub fn options_button(
+	mp: &mut MacroParams,
+	parent: WidgetID,
+	translation: &str,
+	icon: &str,
+	task: Task,
+) -> anyhow::Result<()> {
+	let id = mp.idx.to_string();
+	mp.idx += 1;
+
+	let mut params = TemplateParams::new();
+	params.insert("id", &id);
+	params.insert("translation", translation);
+	params.insert("icon", icon);
+
+	mp.parser_state
+		.instantiate_template(mp.doc_params, "ButtonText", mp.layout, parent, params)?;
+
+	let btn = mp.parser_state.fetch_component_as::<ComponentButton>(&id)?;
+	btn.on_click(Rc::new({
+		let tasks = mp.tasks.clone();
+		move |_common, _e| {
+			tasks.push(task.clone());
+			Ok(())
+		}
+	}));
+
+	Ok(())
+}
+
 pub fn options_autostart_app(
 	mp: &mut MacroParams,
 	parent: WidgetID,
@@ -291,9 +375,9 @@ pub fn options_autostart_app(
 	let id = mp.idx.to_string();
 	mp.idx += 1;
 
-	let mut params: HashMap<Rc<str>, Rc<str>> = HashMap::new();
-	params.insert(Rc::from("id"), Rc::from(id.as_ref()));
-	params.insert(Rc::from("text"), Rc::from(text));
+	let mut params = TemplateParams::new();
+	params.insert("id", &id);
+	params.insert("text", text);
 
 	mp.parser_state
 		.instantiate_template(mp.doc_params, "AutostartApp", mp.layout, parent, params)?;
diff --git a/dash-frontend/src/tab/settings/mod.rs b/dash-frontend/src/tab/settings/mod.rs
index 55eb02a9..bff41c0c 100644
--- a/dash-frontend/src/tab/settings/mod.rs
+++ b/dash-frontend/src/tab/settings/mod.rs
@@ -3,15 +3,15 @@ use std::{marker::PhantomData, rc::Rc, str::FromStr};
 use strum::{AsRefStr, EnumProperty, EnumString};
 use wgui::{
 	assets::AssetPath,
+	color::WguiColorName,
 	components::tabs::ComponentTabs,
-	drawing,
-	event::{CallbackDataCommon, EventAlterables},
+	event::StyleSetRequest,
 	globals::WguiGlobals,
 	i18n::Translation,
 	layout::{Layout, WidgetID},
 	log::LogErr,
 	parser::{Fetchable, ParseDocumentParams, ParserState},
-	renderer_vk::text::{FontWeight, TextStyle},
+	renderer_vk::text::{FontWeight, TextStyle, WguiTextShadow},
 	taffy::{self, prelude::length},
 	task::Tasks,
 	widget::{
@@ -20,11 +20,16 @@ use wgui::{
 	},
 	windowing::context_menu::{self, Blueprint, ContextMenu, TickResult},
 };
-use wlx_common::{config::GeneralConfig, config_io::ConfigRoot, dash_interface::RecenterMode};
+use wlx_common::{
+	config::GeneralConfig,
+	config_io::ConfigRoot,
+	dash_interface::{ConfigChangeKind, DashPlayspaceTask, InterfaceFeats},
+};
 
 use crate::{
-	frontend::{Frontend, FrontendTask},
+	frontend::{Frontend, FrontendTask, FrontendTasks},
 	tab::{Tab, TabType, settings::macros::MacroParams},
+	views::ViewUpdateParams,
 };
 
 mod macros;
@@ -33,26 +38,32 @@ mod tab_controls;
 mod tab_features;
 mod tab_look_and_feel;
 mod tab_misc;
+mod tab_skybox;
+mod tab_space_drag;
 mod tab_troubleshooting;
 
 #[derive(Clone)]
-enum TabNameEnum {
-	LookAndFeel,
-	Features,
-	Controls,
-	Misc,
+pub(crate) enum TabNameEnum {
 	AutostartApps,
+	Controls,
+	Features,
+	LookAndFeel,
+	Misc,
+	Skybox,
+	SpaceDrag,
 	Troubleshooting,
 }
 
 impl TabNameEnum {
 	fn from_string(s: &str) -> Option<Self> {
 		match s {
-			"look_and_feel" => Some(TabNameEnum::LookAndFeel),
-			"features" => Some(TabNameEnum::Features),
-			"controls" => Some(TabNameEnum::Controls),
-			"misc" => Some(TabNameEnum::Misc),
 			"autostart_apps" => Some(TabNameEnum::AutostartApps),
+			"controls" => Some(TabNameEnum::Controls),
+			"features" => Some(TabNameEnum::Features),
+			"look_and_feel" => Some(TabNameEnum::LookAndFeel),
+			"misc" => Some(TabNameEnum::Misc),
+			"skybox" => Some(TabNameEnum::Skybox),
+			"space_drag" => Some(TabNameEnum::SpaceDrag),
 			"troubleshooting" => Some(TabNameEnum::Troubleshooting),
 			_ => None,
 		}
@@ -60,19 +71,55 @@ impl TabNameEnum {
 }
 
 #[derive(Clone)]
-enum Task {
-	UpdateBool(SettingType, bool),
-	UpdateFloat(SettingType, f32),
-	UpdateInt(SettingType, i32),
-	SettingUpdated(SettingType),
-	OpenContextMenu(Vec2, Vec<context_menu::Cell>),
+pub(crate) enum Task {
 	ClearPipewireTokens,
 	ClearSavedState,
 	DeleteAllConfigs,
-	ResetPlayspace,
-	RestartSoftware,
+	OpenContextMenu(Vec2, Vec<context_menu::Cell>),
 	RemoveAutostartApp(Rc<str>),
+	ResetPlayspace,
+	ResetPlayspaceCenter,
+	RestartSoftware,
+	SavePlayspaceCenter,
 	SetTab(TabNameEnum),
+	SettingUpdated(SettingType),
+	UpdateBool(SettingType, bool),
+	UpdateFloat(SettingType, f32),
+	UpdateInt(SettingType, i32),
+}
+
+struct SettingsMountParams<'a> {
+	mp: &'a mut MacroParams<'a>,
+	frontend_tasks: &'a FrontendTasks,
+	id_parent: WidgetID,
+	feats: InterfaceFeats,
+}
+
+struct SettingUpdatedParams<'a> {
+	layout: &'a mut Layout,
+	config: &'a GeneralConfig,
+	setting_type: SettingType,
+}
+
+trait SettingsTab {
+	fn update(&mut self, _par: &mut ViewUpdateParams) -> anyhow::Result<()> {
+		Ok(())
+	}
+
+	fn setting_updated(&mut self, _sup: &mut SettingUpdatedParams) -> anyhow::Result<()> {
+		Ok(())
+	}
+
+	fn context_menu_custom(
+		&mut self,
+		_action: Rc<str>,
+		_config: &mut GeneralConfig,
+		_change_kind: &mut Option<ConfigChangeKind>,
+		_layout: &mut Layout,
+		_state: &mut ParserState,
+	) -> anyhow::Result<()> {
+		Ok(())
+	}
 }
 
 pub struct TabSettings<T> {
@@ -81,8 +128,11 @@ pub struct TabSettings<T> {
 	app_button_ids: Vec<Rc<str>>,
 	context_menu: ContextMenu,
 
+	current_tab: Option<Box<dyn SettingsTab>>,
+
 	tasks: Tasks<Task>,
 	marker: PhantomData<T>,
+	frontend_tasks: FrontendTasks,
 }
 
 impl<T> Tab<T> for TabSettings<T> {
@@ -91,7 +141,22 @@ impl<T> Tab<T> for TabSettings<T> {
 	}
 
 	fn update(&mut self, frontend: &mut Frontend<T>, _time_ms: u32, data: &mut T) -> anyhow::Result<()> {
-		let mut changed = false;
+		if let Some(tab) = &mut self.current_tab {
+			let mut config_change_kind = None;
+
+			tab.update(&mut ViewUpdateParams {
+				layout: &mut frontend.layout,
+				executor: &frontend.executor,
+				general_config: frontend.interface.general_config(data),
+				config_change_kind: &mut config_change_kind,
+			})?;
+
+			if let Some(kind) = config_change_kind {
+				frontend.interface.config_changed(data, kind);
+			}
+		}
+
+		let mut changed = None;
 		for task in self.tasks.drain() {
 			match task {
 				Task::SetTab(tab) => {
@@ -104,7 +169,7 @@ impl<T> Tab<T> for TabSettings<T> {
 					}
 					let config = frontend.interface.general_config(data);
 					*setting.mut_bool(config) = n;
-					changed = true;
+					changed = Some(setting.change_kind());
 				}
 				Task::UpdateFloat(setting, n) => {
 					self.tasks.push(Task::SettingUpdated(setting));
@@ -113,7 +178,7 @@ impl<T> Tab<T> for TabSettings<T> {
 					}
 					let config = frontend.interface.general_config(data);
 					*setting.mut_f32(config) = n;
-					changed = true;
+					changed = Some(setting.change_kind());
 				}
 				Task::UpdateInt(setting, n) => {
 					self.tasks.push(Task::SettingUpdated(setting));
@@ -122,7 +187,7 @@ impl<T> Tab<T> for TabSettings<T> {
 					}
 					let config = frontend.interface.general_config(data);
 					*setting.mut_i32(config) = n;
-					changed = true;
+					changed = Some(setting.change_kind());
 				}
 				Task::ClearPipewireTokens => {
 					let _ = std::fs::remove_file(ConfigRoot::Generic.get_conf_d_path().join("pw_tokens.yaml"))
@@ -137,8 +202,18 @@ impl<T> Tab<T> for TabSettings<T> {
 					std::fs::remove_dir_all(&path)?;
 					std::fs::create_dir(&path)?;
 				}
+				Task::SavePlayspaceCenter => {
+					frontend.interface.playspace_task(data, DashPlayspaceTask::SaveCenter)?;
+					return Ok(());
+				}
+				Task::ResetPlayspaceCenter => {
+					frontend
+						.interface
+						.playspace_task(data, DashPlayspaceTask::ResetCenter)?;
+					return Ok(());
+				}
 				Task::ResetPlayspace => {
-					frontend.interface.recenter_playspace(data, RecenterMode::Reset)?;
+					frontend.interface.playspace_task(data, DashPlayspaceTask::Reset)?;
 					return Ok(());
 				}
 				Task::RestartSoftware => {
@@ -161,50 +236,64 @@ impl<T> Tab<T> for TabSettings<T> {
 						let config = frontend.interface.general_config(data);
 						config.autostart_apps.remove(idx);
 						frontend.layout.remove_widget(widget);
-						changed = true;
+						changed = Some(ConfigChangeKind::OverlayConfig);
 					}
 				}
-				Task::SettingUpdated(setting) => match setting {
-					SettingType::UiAnimationSpeed | SettingType::UiGradientIntensity | SettingType::UiRoundMultiplier => {
-						// todo: currently, wayvr restart is required to apply these changes (WguiTheme is Rc)
+				Task::SettingUpdated(setting) => {
+					if let Some(tab) = &mut self.current_tab {
+						tab.setting_updated(&mut SettingUpdatedParams {
+							layout: &mut frontend.layout,
+							config: frontend.interface.general_config(data),
+							setting_type: setting,
+						})?;
 					}
-					_ => { /* do nothing */ }
-				},
+					match setting {
+						SettingType::UiAnimationSpeed | SettingType::UiGradientIntensity | SettingType::UiRoundMultiplier => {
+							// todo: currently, wayvr restart is required to apply these changes (WguiTheme is Rc)
+						}
+						_ => { /* do nothing */ }
+					}
+				}
 			}
 		}
 
 		// Dropdown handling
-		if let TickResult::Action(name) = self.context_menu.tick(&mut frontend.layout, &mut self.state)?
-			&& let (Some(setting), Some(id), Some(value), Some(text), Some(translated)) = {
+		if let TickResult::Action(name) = self.context_menu.tick(&mut frontend.layout, &mut self.state)? {
+			if name.starts_with(';')
+				&& let Some(tab) = self.current_tab.as_mut()
+			{
+				let config = frontend.interface.general_config(data);
+				let mut change_kind: Option<ConfigChangeKind> = None;
+				tab.context_menu_custom(name, config, &mut change_kind, &mut frontend.layout, &mut self.state)?;
+				if let Some(change_kind) = change_kind {
+					frontend.interface.config_changed(data, change_kind);
+				}
+			} else if let (Some(setting), Some(id), Some(value), Some(text), Some(translated)) = {
 				let mut s = name.splitn(5, ';');
 				(s.next(), s.next(), s.next(), s.next(), s.next())
 			} {
-			let mut label = self
-				.state
-				.fetch_widget_as::<WidgetLabel>(&frontend.layout.state, &format!("{id}_value"))?;
+				let mut common = frontend.layout.common();
+				let mut label = self
+					.state
+					.fetch_widget_as::<WidgetLabel>(common.state, &format!("{id}_value"))?;
 
-			let mut alterables = EventAlterables::default();
-			let mut common = CallbackDataCommon {
-				alterables: &mut alterables,
-				state: &frontend.layout.state,
-			};
+				let translation = Translation {
+					text: text.into(),
+					translated: translated == "1",
+				};
 
-			let translation = Translation {
-				text: text.into(),
-				translated: translated == "1",
-			};
+				label.set_text(&mut common, translation);
 
-			label.set_text(&mut common, translation);
-
-			let setting = SettingType::from_str(setting).expect("Invalid Enum string");
-			let config = frontend.interface.general_config(data);
-			setting.set_enum(config, value);
-			changed = true;
+				let setting = SettingType::from_str(setting).expect("Invalid Enum string");
+				let config = frontend.interface.general_config(data);
+				setting.set_enum(config, value);
+				changed = Some(ConfigChangeKind::OverlayConfig);
+			}
 		}
 
 		// Notify overlays of the change
-		if changed {
-			frontend.interface.config_changed(data);
+		if let Some(changed) = changed {
+			frontend.interface.config_changed(data, changed);
 		}
 
 		Ok(())
@@ -213,8 +302,8 @@ impl<T> Tab<T> for TabSettings<T> {
 
 // Sorted alphabetically
 #[allow(clippy::enum_variant_names)]
-#[derive(Clone, Copy, AsRefStr, EnumString)]
-enum SettingType {
+#[derive(Clone, Copy, Eq, PartialEq, AsRefStr, EnumString)]
+pub(crate) enum SettingType {
 	AllowSliding,
 	BlockGameInput,
 	BlockGameInputIgnoreWatch,
@@ -223,10 +312,15 @@ enum SettingType {
 	ClickFreezeTimeMs,
 	Clock12h,
 	DoubleCursorFix,
+	EnableWatch,
 	FocusFollowsMouseMode,
+	GridOpacity,
+	HandsfreeAltTab,
 	HandsfreePointer,
 	HideGrabHelp,
 	HideUsername,
+	InputCaptureMethod,
+	InputEmulationMethod,
 	InvertScrollDirectionX,
 	InvertScrollDirectionY,
 	KeyboardMiddleClick,
@@ -237,13 +331,24 @@ enum SettingType {
 	LongPressDuration,
 	NotificationsEnabled,
 	NotificationsSoundEnabled,
+	DefaultOverlayScale,
 	OpaqueBackground,
+	MouseAcceleration,
 	PointerLerpFactor,
+	MouseSpeed,
 	ScreenRenderDown,
 	ScrollSpeed,
+	SnapAngleDeg,
 	SetsOnWatch,
+	SpaceDragAffectsWorld,
 	SpaceDragMultiplier,
 	SpaceDragUnlocked,
+	SpaceGravityDamping,
+	SpaceGravityEnabled,
+	SpaceGravityFlingStrength,
+	SpaceGravityGravity,
+	SpaceGravityGroundFriction,
+	SpaceGravityFloorHeight,
 	SpaceRotateUnlocked,
 	UiAnimationSpeed,
 	UiGradientIntensity,
@@ -251,38 +356,49 @@ enum SettingType {
 	UprightScreenFix,
 	UsePassthrough,
 	UseSkybox,
-	GridOpacity,
-	XrClickSensitivity,
-	XrClickSensitivityRelease,
+	WatchViewAngleMax,
+	WatchViewAngleMin,
 	XwaylandByDefault,
 }
 
 impl SettingType {
+	pub fn change_kind(self) -> ConfigChangeKind {
+		match self {
+			Self::MouseAcceleration | Self::MouseSpeed => ConfigChangeKind::WvrServerConfig,
+			Self::UseSkybox | Self::UsePassthrough => ConfigChangeKind::EnvironmentBlend,
+			_ => ConfigChangeKind::OverlayConfig,
+		}
+	}
+
 	pub fn mut_bool(self, config: &mut GeneralConfig) -> &mut bool {
 		match self {
-			Self::InvertScrollDirectionX => &mut config.invert_scroll_direction_x,
-			Self::InvertScrollDirectionY => &mut config.invert_scroll_direction_y,
-			Self::NotificationsEnabled => &mut config.notifications_enabled,
-			Self::NotificationsSoundEnabled => &mut config.notifications_sound_enabled,
-			Self::KeyboardSoundEnabled => &mut config.keyboard_sound_enabled,
-			Self::UprightScreenFix => &mut config.upright_screen_fix,
-			Self::DoubleCursorFix => &mut config.double_cursor_fix,
-			Self::SetsOnWatch => &mut config.sets_on_watch,
-			Self::HideGrabHelp => &mut config.hide_grab_help,
 			Self::AllowSliding => &mut config.allow_sliding,
-			Self::FocusFollowsMouseMode => &mut config.focus_follows_mouse_mode,
-			Self::LeftHandedMouse => &mut config.left_handed_mouse,
 			Self::BlockGameInput => &mut config.block_game_input,
 			Self::BlockGameInputIgnoreWatch => &mut config.block_game_input_ignore_watch,
 			Self::BlockPosesOnKbdInteraction => &mut config.block_poses_on_kbd_interaction,
-			Self::UseSkybox => &mut config.use_skybox,
-			Self::UsePassthrough => &mut config.use_passthrough,
-			Self::ScreenRenderDown => &mut config.screen_render_down,
-			Self::SpaceDragUnlocked => &mut config.space_drag_unlocked,
-			Self::SpaceRotateUnlocked => &mut config.space_rotate_unlocked,
 			Self::Clock12h => &mut config.clock_12h,
+			Self::DoubleCursorFix => &mut config.double_cursor_fix,
+			Self::EnableWatch => &mut config.enable_watch,
+			Self::FocusFollowsMouseMode => &mut config.focus_follows_mouse_mode,
+			Self::HideGrabHelp => &mut config.hide_grab_help,
 			Self::HideUsername => &mut config.hide_username,
+			Self::InvertScrollDirectionX => &mut config.invert_scroll_direction_x,
+			Self::InvertScrollDirectionY => &mut config.invert_scroll_direction_y,
+			Self::KeyboardSoundEnabled => &mut config.keyboard_sound_enabled,
+			Self::LeftHandedMouse => &mut config.left_handed_mouse,
+			Self::NotificationsEnabled => &mut config.notifications_enabled,
+			Self::NotificationsSoundEnabled => &mut config.notifications_sound_enabled,
 			Self::OpaqueBackground => &mut config.opaque_background,
+			Self::MouseAcceleration => &mut config.wvr_mouse_acceleration,
+			Self::ScreenRenderDown => &mut config.screen_render_down,
+			Self::SetsOnWatch => &mut config.sets_on_watch,
+			Self::SpaceDragAffectsWorld => &mut config.space_drag_affects_world,
+			Self::SpaceDragUnlocked => &mut config.space_drag_unlocked,
+			Self::SpaceGravityEnabled => &mut config.space_gravity_enabled,
+			Self::SpaceRotateUnlocked => &mut config.space_rotate_unlocked,
+			Self::UprightScreenFix => &mut config.upright_screen_fix,
+			Self::UsePassthrough => &mut config.use_passthrough,
+			Self::UseSkybox => &mut config.use_skybox,
 			Self::XwaylandByDefault => &mut config.xwayland_by_default,
 			Self::KeyboardSwipeToTypeEnabled => &mut config.keyboard_swipe_to_type_enabled,
 			_ => panic!("Requested bool for non-bool SettingType"),
@@ -291,16 +407,24 @@ impl SettingType {
 
 	pub fn mut_f32(self, config: &mut GeneralConfig) -> &mut f32 {
 		match self {
+			Self::DefaultOverlayScale => &mut config.default_overlay_scale,
+			Self::GridOpacity => &mut config.grid_opacity,
+			Self::LongPressDuration => &mut config.long_press_duration,
+			Self::PointerLerpFactor => &mut config.pointer_lerp_factor,
+			Self::MouseSpeed => &mut config.wvr_mouse_speed,
+			Self::ScrollSpeed => &mut config.scroll_speed,
+			Self::SnapAngleDeg => &mut config.snap_angle_deg,
+			Self::SpaceDragMultiplier => &mut config.space_drag_multiplier,
+			Self::SpaceGravityDamping => &mut config.space_gravity_damping,
+			Self::SpaceGravityFlingStrength => &mut config.space_gravity_fling_strength,
+			Self::SpaceGravityGravity => &mut config.space_gravity_gravity,
+			Self::SpaceGravityGroundFriction => &mut config.space_gravity_ground_friction,
+			Self::SpaceGravityFloorHeight => &mut config.space_gravity_floor_height,
 			Self::UiAnimationSpeed => &mut config.ui_animation_speed,
 			Self::UiGradientIntensity => &mut config.ui_gradient_intensity,
 			Self::UiRoundMultiplier => &mut config.ui_round_multiplier,
-			Self::ScrollSpeed => &mut config.scroll_speed,
-			Self::LongPressDuration => &mut config.long_press_duration,
-			Self::XrClickSensitivity => &mut config.xr_click_sensitivity,
-			Self::XrClickSensitivityRelease => &mut config.xr_click_sensitivity_release,
-			Self::SpaceDragMultiplier => &mut config.space_drag_multiplier,
-			Self::PointerLerpFactor => &mut config.pointer_lerp_factor,
-			Self::GridOpacity => &mut config.grid_opacity,
+			Self::WatchViewAngleMax => &mut config.watch_view_angle_max,
+			Self::WatchViewAngleMin => &mut config.watch_view_angle_min,
 			_ => panic!("Requested f32 for non-f32 SettingType"),
 		}
 	}
@@ -317,10 +441,20 @@ impl SettingType {
 			Self::CaptureMethod => {
 				config.capture_method = wlx_common::config::CaptureMethod::from_str(value).expect("Invalid enum value!")
 			}
+			Self::InputCaptureMethod => {
+				config.wvr_input_capture = wlx_common::config::InputCaptureMethod::from_str(value).expect("Invalid enum value!")
+			}
+			Self::InputEmulationMethod => {
+				config.input_emulation_method =
+					wlx_common::config::InputEmulationMethod::from_str(value).expect("Invalid enum value!")
+			}
 			Self::KeyboardMiddleClick => {
 				config.keyboard_middle_click_mode =
 					wlx_common::config::AltModifier::from_str(value).expect("Invalid enum value!")
 			}
+			Self::HandsfreeAltTab => {
+				config.handsfree_alt_tab = wlx_common::config::HandsfreeAltTab::from_str(value).expect("Invalid enum value!")
+			}
 			Self::HandsfreePointer => {
 				config.handsfree_pointer = wlx_common::config::HandsfreePointer::from_str(value).expect("Invalid enum value!")
 			}
@@ -334,8 +468,11 @@ impl SettingType {
 	fn get_enum_title(self, config: &mut GeneralConfig) -> Translation {
 		match self {
 			Self::CaptureMethod => Self::get_enum_title_inner(config.capture_method),
+			Self::InputCaptureMethod => Self::get_enum_title_inner(config.wvr_input_capture),
+			Self::InputEmulationMethod => Self::get_enum_title_inner(config.input_emulation_method),
 			Self::KeyboardMiddleClick => Self::get_enum_title_inner(config.keyboard_middle_click_mode),
 			Self::HandsfreePointer => Self::get_enum_title_inner(config.handsfree_pointer),
+			Self::HandsfreeAltTab => Self::get_enum_title_inner(config.handsfree_alt_tab),
 			Self::Language => match &config.language {
 				Some(lang) => Self::get_enum_title_inner(*lang),
 				None => Translation::from_translation_key("APP_SETTINGS.OPTION.AUTO"),
@@ -373,12 +510,16 @@ impl SettingType {
 			Self::CaptureMethod => Ok("APP_SETTINGS.CAPTURE_METHOD"),
 			Self::ClickFreezeTimeMs => Ok("APP_SETTINGS.CLICK_FREEZE_TIME_MS"),
 			Self::Clock12h => Ok("APP_SETTINGS.CLOCK_12H"),
+			Self::DefaultOverlayScale => Ok("APP_SETTINGS.DEFAULT_OVERLAY_SCALE"),
 			Self::DoubleCursorFix => Ok("APP_SETTINGS.DOUBLE_CURSOR_FIX"),
 			Self::FocusFollowsMouseMode => Ok("APP_SETTINGS.FOCUS_FOLLOWS_MOUSE_MODE"),
 			Self::GridOpacity => Ok("APP_SETTINGS.GRID_OPACITY"),
+			Self::HandsfreeAltTab => Ok("APP_SETTINGS.HANDSFREE_ALT_TAB"),
 			Self::HandsfreePointer => Ok("APP_SETTINGS.HANDSFREE_POINTER"),
 			Self::HideGrabHelp => Ok("APP_SETTINGS.HIDE_GRAB_HELP"),
 			Self::HideUsername => Ok("APP_SETTINGS.HIDE_USERNAME"),
+			Self::InputCaptureMethod => Ok("APP_SETTINGS.INPUT_CAPTURE_METHOD"),
+			Self::InputEmulationMethod => Ok("APP_SETTINGS.INPUT_EMULATION_METHOD"),
 			Self::InvertScrollDirectionX => Ok("APP_SETTINGS.INVERT_SCROLL_DIRECTION_X"),
 			Self::InvertScrollDirectionY => Ok("APP_SETTINGS.INVERT_SCROLL_DIRECTION_Y"),
 			Self::KeyboardMiddleClick => Ok("APP_SETTINGS.KEYBOARD_MIDDLE_CLICK"),
@@ -390,12 +531,23 @@ impl SettingType {
 			Self::NotificationsEnabled => Ok("APP_SETTINGS.NOTIFICATIONS_ENABLED"),
 			Self::NotificationsSoundEnabled => Ok("APP_SETTINGS.NOTIFICATIONS_SOUND_ENABLED"),
 			Self::OpaqueBackground => Ok("APP_SETTINGS.OPAQUE_BACKGROUND"),
+			Self::MouseSpeed => Ok("APP_SETTINGS.POINTER_SPEED"),
+			Self::MouseAcceleration => Ok("APP_SETTINGS.POINTER_ACCELERATION"),
 			Self::PointerLerpFactor => Ok("APP_SETTINGS.POINTER_LERP_FACTOR"),
 			Self::ScreenRenderDown => Ok("APP_SETTINGS.SCREEN_RENDER_DOWN"),
 			Self::ScrollSpeed => Ok("APP_SETTINGS.SCROLL_SPEED"),
+			Self::EnableWatch => Ok("APP_SETTINGS.ENABLE_WATCH"),
 			Self::SetsOnWatch => Ok("APP_SETTINGS.SETS_ON_WATCH"),
+			Self::SnapAngleDeg => Ok("APP_SETTINGS.SNAP_ANGLE_DEG"),
+			Self::SpaceDragAffectsWorld => Ok("APP_SETTINGS.SPACE_DRAG_AFFECTS_WORLD"),
 			Self::SpaceDragMultiplier => Ok("APP_SETTINGS.SPACE_DRAG_MULTIPLIER"),
 			Self::SpaceDragUnlocked => Ok("APP_SETTINGS.SPACE_DRAG_UNLOCKED"),
+			Self::SpaceGravityDamping => Ok("APP_SETTINGS.SPACE_GRAVITY_DAMPING"),
+			Self::SpaceGravityEnabled => Ok("APP_SETTINGS.ENABLED"),
+			Self::SpaceGravityFlingStrength => Ok("APP_SETTINGS.SPACE_GRAVITY_FLING_STRENGTH"),
+			Self::SpaceGravityGravity => Ok("APP_SETTINGS.SPACE_GRAVITY_GRAVITY"),
+			Self::SpaceGravityGroundFriction => Ok("APP_SETTINGS.SPACE_GRAVITY_GROUND_FRICTION"),
+			Self::SpaceGravityFloorHeight => Ok("APP_SETTINGS.SPACE_GRAVITY_FLOOR_HEIGHT"),
 			Self::SpaceRotateUnlocked => Ok("APP_SETTINGS.SPACE_ROTATE_UNLOCKED"),
 			Self::UiAnimationSpeed => Ok("APP_SETTINGS.ANIMATION_SPEED"),
 			Self::UiGradientIntensity => Ok("APP_SETTINGS.UI_GRADIENT_INTENSITY"),
@@ -403,8 +555,8 @@ impl SettingType {
 			Self::UprightScreenFix => Ok("APP_SETTINGS.UPRIGHT_SCREEN_FIX"),
 			Self::UsePassthrough => Ok("APP_SETTINGS.USE_PASSTHROUGH"),
 			Self::UseSkybox => Ok("APP_SETTINGS.USE_SKYBOX"),
-			Self::XrClickSensitivity => Ok("APP_SETTINGS.XR_CLICK_SENSITIVITY"),
-			Self::XrClickSensitivityRelease => Ok("APP_SETTINGS.XR_CLICK_SENSITIVITY_RELEASE"),
+			Self::WatchViewAngleMax => Ok("APP_SETTINGS.WATCH_VIEW_ANGLE"),
+			Self::WatchViewAngleMin => Ok("APP_SETTINGS.WATCH_VIEW_ANGLE"),
 			Self::XwaylandByDefault => Ok("APP_SETTINGS.XWAYLAND_BY_DEFAULT"),
 		}
 	}
@@ -416,18 +568,29 @@ impl SettingType {
 			Self::BlockGameInputIgnoreWatch => Some("APP_SETTINGS.BLOCK_GAME_INPUT_IGNORE_WATCH_HELP"),
 			Self::BlockPosesOnKbdInteraction => Some("APP_SETTINGS.BLOCK_POSES_ON_KBD_INTERACTION_HELP"),
 			Self::CaptureMethod => Some("APP_SETTINGS.CAPTURE_METHOD_HELP"),
+			Self::DefaultOverlayScale => Some("APP_SETTINGS.DEFAULT_OVERLAY_SCALE_HELP"),
 			Self::DoubleCursorFix => Some("APP_SETTINGS.DOUBLE_CURSOR_FIX_HELP"),
 			Self::GridOpacity => Some("APP_SETTINGS.GRID_OPACITY_HELP"),
+			Self::HandsfreeAltTab => Some("APP_SETTINGS.HANDSFREE_ALT_TAB_HELP"),
 			Self::HandsfreePointer => Some("APP_SETTINGS.HANDSFREE_POINTER_HELP"),
+			Self::InputCaptureMethod => Some("APP_SETTINGS.INPUT_CAPTURE_METHOD_HELP"),
+			Self::InputEmulationMethod => Some("APP_SETTINGS.INPUT_EMULATION_METHOD_HELP"),
 			Self::KeyboardMiddleClick => Some("APP_SETTINGS.KEYBOARD_MIDDLE_CLICK_HELP"),
 			Self::KeyboardSwipeToTypeEnabled => Some("APP_SETTINGS.KEYBOARD_SWIPE_TO_TYPE_ENABLED_HELP"),
 			Self::LeftHandedMouse => Some("APP_SETTINGS.LEFT_HANDED_MOUSE_HELP"),
+			Self::MouseAcceleration => Some("APP_SETTINGS.POINTER_ACCELERATION_HELP"),
 			Self::ScreenRenderDown => Some("APP_SETTINGS.SCREEN_RENDER_DOWN_HELP"),
+			Self::SnapAngleDeg => Some("APP_SETTINGS.SNAP_ANGLE_DEG_HELP"),
+			Self::SpaceGravityDamping => Some("APP_SETTINGS.SPACE_GRAVITY_DAMPING_HELP"),
+			Self::SpaceGravityFlingStrength => Some("APP_SETTINGS.SPACE_GRAVITY_FLING_STRENGTH_HELP"),
+			Self::SpaceGravityFloorHeight => Some("APP_SETTINGS.SPACE_GRAVITY_FLOOR_HEIGHT_HELP"),
+			Self::SpaceGravityGravity => Some("APP_SETTINGS.SPACE_GRAVITY_GRAVITY_HELP"),
+			Self::SpaceGravityGroundFriction => Some("APP_SETTINGS.SPACE_GRAVITY_GROUND_FRICTION_HELP"),
 			Self::UprightScreenFix => Some("APP_SETTINGS.UPRIGHT_SCREEN_FIX_HELP"),
 			Self::UsePassthrough => Some("APP_SETTINGS.USE_PASSTHROUGH_HELP"),
 			Self::UseSkybox => Some("APP_SETTINGS.USE_SKYBOX_HELP"),
-			Self::XrClickSensitivity => Some("APP_SETTINGS.XR_CLICK_SENSITIVITY_HELP"),
-			Self::XrClickSensitivityRelease => Some("APP_SETTINGS.XR_CLICK_SENSITIVITY_RELEASE_HELP"),
+			Self::WatchViewAngleMax => Some("APP_SETTINGS.WATCH_VIEW_ANGLE_HELP"),
+			Self::WatchViewAngleMin => Some("APP_SETTINGS.WATCH_VIEW_ANGLE_HELP"),
 			_ => None,
 		}
 	}
@@ -440,9 +603,9 @@ impl SettingType {
 				| Self::UiGradientIntensity
 				| Self::UprightScreenFix
 				| Self::DoubleCursorFix
-				| Self::ScreenRenderDown
 				| Self::Language
 				| Self::CaptureMethod
+				| Self::InputEmulationMethod
 		)
 	}
 
@@ -456,13 +619,13 @@ impl SettingType {
 }
 
 // creates a simple div with horizontal, centered flow
-fn horiz_cell(layout: &mut Layout, parent: WidgetID) -> anyhow::Result<WidgetID> {
+pub fn horiz_cell(layout: &mut Layout, parent: WidgetID) -> anyhow::Result<WidgetID> {
 	let (pair, _) = layout.add_child(
 		parent,
 		WidgetDiv::create(),
 		taffy::Style {
 			flex_direction: taffy::FlexDirection::Row,
-			align_items: Some(taffy::AlignItems::Center),
+			align_items: Some(taffy::AlignItems::CENTER),
 			gap: length(8.0),
 			..Default::default()
 		},
@@ -479,11 +642,17 @@ fn mount_requires_restart(layout: &mut Layout, parent: WidgetID) -> anyhow::Resu
 			content,
 			style: TextStyle {
 				wrap: false,
-				color: Some(drawing::Color::new(1.0, 0.5, 0.5, 1.0)),
+				color: Some(WguiColorName::Danger.into()),
 				weight: Some(FontWeight::Bold),
 				size: Some(10.0),
+				shadow: Some(WguiTextShadow {
+					x: 2.0,
+					y: 2.0,
+					..Default::default()
+				}),
 				..Default::default()
 			},
+			..Default::default()
 		},
 	);
 
@@ -504,6 +673,9 @@ impl<T> TabSettings<T> {
 		let root = self.state.get_widget_id("settings_root")?;
 		frontend.layout.remove_children(root);
 		let globals = frontend.layout.state.globals.clone();
+		self.current_tab = None;
+
+		let feats = frontend.interface.get_feats(data);
 
 		let mut mp = MacroParams {
 			layout: &mut frontend.layout,
@@ -514,31 +686,47 @@ impl<T> TabSettings<T> {
 			idx: 9001,
 		};
 
+		let settings_mount_params = SettingsMountParams {
+			mp: &mut mp,
+			id_parent: root,
+			frontend_tasks: &self.frontend_tasks,
+			feats,
+		};
+
 		match name {
 			TabNameEnum::LookAndFeel => {
-				tab_look_and_feel::mount(&mut mp, root)?;
+				self.current_tab = Some(Box::new(tab_look_and_feel::State::mount(settings_mount_params)?));
 			}
 			TabNameEnum::Features => {
-				tab_features::mount(&mut mp, root)?;
+				self.current_tab = Some(Box::new(tab_features::State::mount(settings_mount_params)?));
+			}
+			TabNameEnum::SpaceDrag => {
+				self.current_tab = Some(Box::new(tab_space_drag::State::mount(settings_mount_params)?));
 			}
 			TabNameEnum::Controls => {
-				tab_controls::mount(&mut mp, root)?;
+				self.current_tab = Some(Box::new(tab_controls::State::mount(settings_mount_params)?));
 			}
 			TabNameEnum::Misc => {
-				tab_misc::mount(&mut mp, root)?;
+				self.current_tab = Some(Box::new(tab_misc::State::mount(settings_mount_params)?));
 			}
 			TabNameEnum::AutostartApps => {
-				tab_autostart_apps::mount(&mut mp, root, &mut self.app_button_ids)?;
+				self.current_tab = Some(Box::new(tab_autostart_apps::State::mount(
+					settings_mount_params,
+					&mut self.app_button_ids,
+				)?));
 			}
 			TabNameEnum::Troubleshooting => {
-				tab_troubleshooting::mount(&mut mp, root)?;
+				self.current_tab = Some(Box::new(tab_troubleshooting::State::mount(settings_mount_params)?));
+			}
+			TabNameEnum::Skybox => {
+				self.current_tab = Some(Box::new(tab_skybox::State::mount(settings_mount_params)?));
 			}
 		}
 
 		Ok(())
 	}
 
-	pub fn new(frontend: &mut Frontend<T>, parent_id: WidgetID, _data: &mut T) -> anyhow::Result<Self> {
+	pub fn new(frontend: &mut Frontend<T>, parent_id: WidgetID, data: &mut T) -> anyhow::Result<Self> {
 		let doc_params = ParseDocumentParams {
 			globals: frontend.layout.state.globals.clone(),
 			path: AssetPath::BuiltIn("gui/tab/settings.xml"),
@@ -548,6 +736,16 @@ impl<T> TabSettings<T> {
 		let parser_state = wgui::parser::parse_from_assets(&doc_params, &mut frontend.layout, parent_id)?;
 		let tasks = Tasks::default();
 		let tabs = parser_state.fetch_component_as::<ComponentTabs>("tabs")?;
+
+		if !frontend.interface.get_feats(data).openxr {
+			let skybox_btn = tabs.get_tab_button("skybox").unwrap();
+			frontend
+				.layout
+				.common()
+				.alterables
+				.set_style(skybox_btn.get_rect(), StyleSetRequest::Display(taffy::Display::None));
+		}
+
 		tabs.on_select({
 			let tasks = tasks.clone();
 			Rc::new(move |_common, evt| {
@@ -566,6 +764,8 @@ impl<T> TabSettings<T> {
 			state: parser_state,
 			marker: PhantomData,
 			context_menu: ContextMenu::default(),
+			current_tab: None,
+			frontend_tasks: frontend.tasks.clone(),
 		})
 	}
 }
diff --git a/dash-frontend/src/tab/settings/tab_autostart_apps.rs b/dash-frontend/src/tab/settings/tab_autostart_apps.rs
index 6483fc94..76986f88 100644
--- a/dash-frontend/src/tab/settings/tab_autostart_apps.rs
+++ b/dash-frontend/src/tab/settings/tab_autostart_apps.rs
@@ -1,19 +1,33 @@
 use std::rc::Rc;
 
-use crate::tab::settings::macros::{MacroParams, options_autostart_app, options_category};
-use wgui::layout::WidgetID;
+use crate::tab::settings::{
+	SettingsMountParams, SettingsTab,
+	macros::{options_autostart_app, options_category},
+};
 
-pub fn mount(mp: &mut MacroParams, parent: WidgetID, app_button_ids: &mut Vec<Rc<str>>) -> anyhow::Result<()> {
-	*app_button_ids = Vec::new();
+pub struct State {}
 
-	if !mp.config.autostart_apps.is_empty() {
-		let c = options_category(mp, parent, "APP_SETTINGS.AUTOSTART_APPS", "dashboard/apps.svg")?;
+impl SettingsTab for State {}
 
-		// todo: prevent clone
-		let autostart_apps = mp.config.autostart_apps.clone();
-		for app in autostart_apps {
-			options_autostart_app(mp, c, &app.name, app_button_ids)?;
+impl State {
+	pub fn mount(par: SettingsMountParams, app_button_ids: &mut Vec<Rc<str>>) -> anyhow::Result<State> {
+		*app_button_ids = Vec::new();
+
+		if !par.mp.config.autostart_apps.is_empty() {
+			let c = options_category(
+				par.mp,
+				par.id_parent,
+				"APP_SETTINGS.AUTOSTART_APPS",
+				"dashboard/apps.svg",
+			)?;
+
+			// todo: prevent clone
+			let autostart_apps = par.mp.config.autostart_apps.clone();
+			for app in autostart_apps {
+				options_autostart_app(par.mp, c, &app.name, app_button_ids)?;
+			}
 		}
+
+		Ok(State {})
 	}
-	Ok(())
 }
diff --git a/dash-frontend/src/tab/settings/tab_controls.rs b/dash-frontend/src/tab/settings/tab_controls.rs
index 27b1f10b..41ec4dab 100644
--- a/dash-frontend/src/tab/settings/tab_controls.rs
+++ b/dash-frontend/src/tab/settings/tab_controls.rs
@@ -1,23 +1,126 @@
-use crate::tab::settings::{
-	SettingType,
-	macros::{MacroParams, options_category, options_checkbox, options_dropdown, options_slider_f32, options_slider_i32},
+use std::rc::Rc;
+use wgui::parser::TemplateParams;
+use wgui::{
+	components::button::ComponentButton, globals::WguiGlobals, layout::WidgetID, parser::Fetchable, task::Tasks,
 };
-use wgui::layout::WidgetID;
 
-pub fn mount(mp: &mut MacroParams, parent: WidgetID) -> anyhow::Result<()> {
-	let c = options_category(mp, parent, "APP_SETTINGS.CONTROLS", "dashboard/controller.svg")?;
-	options_dropdown::<wlx_common::config::AltModifier>(mp, c, &SettingType::KeyboardMiddleClick)?;
-	options_dropdown::<wlx_common::config::HandsfreePointer>(mp, c, &SettingType::HandsfreePointer)?;
-	options_checkbox(mp, c, SettingType::FocusFollowsMouseMode)?;
-	options_checkbox(mp, c, SettingType::LeftHandedMouse)?;
-	options_checkbox(mp, c, SettingType::AllowSliding)?;
-	options_checkbox(mp, c, SettingType::InvertScrollDirectionX)?;
-	options_checkbox(mp, c, SettingType::InvertScrollDirectionY)?;
-	options_slider_f32(mp, c, SettingType::ScrollSpeed, 0.1, 5.0, 0.1)?;
-	options_slider_f32(mp, c, SettingType::LongPressDuration, 0.1, 2.0, 0.1)?;
-	options_slider_f32(mp, c, SettingType::PointerLerpFactor, 0.1, 1.0, 0.1)?;
-	options_slider_f32(mp, c, SettingType::XrClickSensitivity, 0.1, 1.0, 0.1)?;
-	options_slider_f32(mp, c, SettingType::XrClickSensitivityRelease, 0.1, 1.0, 0.1)?;
-	options_slider_i32(mp, c, SettingType::ClickFreezeTimeMs, 0, 500, 50)?;
+use crate::tab::settings::{horiz_cell, mount_requires_restart};
+use crate::util::popup_manager::PopupHolder;
+
+use crate::{
+	frontend::FrontendTasks,
+	tab::settings::{
+		SettingType, SettingsMountParams, SettingsTab,
+		macros::{options_category, options_checkbox, options_dropdown, options_slider_f32, options_slider_i32},
+	},
+	views::{ViewUpdateParams, input_profiles},
+};
+
+#[derive(Clone)]
+enum Task {
+	OpenInputProfiles,
+}
+
+pub struct State {
+	popup_input_profiles: PopupHolder<input_profiles::View>,
+	frontend_tasks: FrontendTasks,
+	globals: WguiGlobals,
+	tasks: Tasks<Task>,
+}
+
+impl SettingsTab for State {
+	fn update(&mut self, par: &mut ViewUpdateParams) -> anyhow::Result<()> {
+		self.popup_input_profiles.update(par)?;
+
+		for task in self.tasks.drain() {
+			match task {
+				Task::OpenInputProfiles => {
+					input_profiles::mount_popup(
+						self.frontend_tasks.clone(),
+						self.globals.clone(),
+						self.popup_input_profiles.clone(),
+					);
+				}
+			}
+		}
+
+		Ok(())
+	}
+}
+
+fn create_input_profiles_button(
+	mp: &mut crate::tab::settings::macros::MacroParams,
+	parent: WidgetID,
+	tasks: Tasks<Task>,
+	_popup: &PopupHolder<input_profiles::View>,
+) -> anyhow::Result<()> {
+	let id = mp.idx.to_string();
+	mp.idx += 1;
+
+	let id_cell = horiz_cell(mp.layout, parent)?;
+
+	let mut params = TemplateParams::new();
+	params.insert("id", &id);
+	params.insert("translation", "APP_SETTINGS.INPUT_PROFILES");
+	params.insert("icon", "dashboard/controller.svg");
+
+	mp.parser_state
+		.instantiate_template(mp.doc_params, "ButtonText", mp.layout, id_cell, params)?;
+
+	let btn = mp.parser_state.fetch_component_as::<ComponentButton>(&id)?;
+	btn.on_click(Rc::new({
+		let tasks = tasks.clone();
+		move |_common, _e| {
+			tasks.push(Task::OpenInputProfiles);
+			Ok(())
+		}
+	}));
+
+	mount_requires_restart(mp.layout, id_cell)?;
+
 	Ok(())
 }
+
+impl State {
+	pub fn mount(par: SettingsMountParams) -> anyhow::Result<State> {
+		let tasks = Tasks::<Task>::new();
+		let popup = PopupHolder::<input_profiles::View>::default();
+
+		let c = options_category(
+			par.mp,
+			par.id_parent,
+			"APP_SETTINGS.CONTROLS",
+			"dashboard/controller.svg",
+		)?;
+		if par.feats.openxr {
+			create_input_profiles_button(par.mp, c, tasks.clone(), &popup)?;
+		}
+		options_dropdown::<wlx_common::config::AltModifier>(par.mp, c, &SettingType::KeyboardMiddleClick)?;
+		options_dropdown::<wlx_common::config::HandsfreePointer>(par.mp, c, &SettingType::HandsfreePointer)?;
+		options_dropdown::<wlx_common::config::HandsfreeAltTab>(par.mp, c, &SettingType::HandsfreeAltTab)?;
+		options_checkbox(par.mp, c, SettingType::FocusFollowsMouseMode)?;
+		options_checkbox(par.mp, c, SettingType::LeftHandedMouse)?;
+		options_checkbox(par.mp, c, SettingType::AllowSliding)?;
+		options_checkbox(par.mp, c, SettingType::InvertScrollDirectionX)?;
+		options_checkbox(par.mp, c, SettingType::InvertScrollDirectionY)?;
+		options_slider_f32(par.mp, c, SettingType::ScrollSpeed, 0.1, 5.0, 0.1)?;
+		options_slider_f32(par.mp, c, SettingType::LongPressDuration, 0.1, 2.0, 0.1)?;
+		options_slider_f32(par.mp, c, SettingType::SnapAngleDeg, 0., 45., 5.)?;
+
+		if par.feats.openxr {
+			options_slider_f32(par.mp, c, SettingType::PointerLerpFactor, 0.1, 1.0, 0.1)?;
+		}
+
+		options_slider_i32(par.mp, c, SettingType::ClickFreezeTimeMs, 0, 500, 50)?;
+
+		options_slider_f32(par.mp, c, SettingType::MouseSpeed, -1., 1., 0.05)?;
+		options_checkbox(par.mp, c, SettingType::MouseAcceleration)?;
+
+		Ok(State {
+			popup_input_profiles: popup,
+			frontend_tasks: par.frontend_tasks.clone(),
+			globals: par.mp.doc_params.globals.clone(),
+			tasks,
+		})
+	}
+}
diff --git a/dash-frontend/src/tab/settings/tab_features.rs b/dash-frontend/src/tab/settings/tab_features.rs
index 264a40fd..75c8db7f 100644
--- a/dash-frontend/src/tab/settings/tab_features.rs
+++ b/dash-frontend/src/tab/settings/tab_features.rs
@@ -1,20 +1,357 @@
-use crate::tab::settings::{
-	SettingType,
-	macros::{MacroParams, options_category, options_checkbox, options_slider_f32},
-};
-use wgui::layout::WidgetID;
+use std::rc::Rc;
+
+use wgui::{
+	components::button::{ButtonClickEvent, ComponentButton},
+	globals::WguiGlobals,
+	i18n::Translation,
+	layout::WidgetID,
+	log::LogErr,
+	parser::{Fetchable, TemplateParams},
+	task::Tasks,
+	widget::label::WidgetLabel,
+	windowing::context_menu::{self},
+};
+use wlx_common::{async_executor::AsyncExecutor, config::GeneralConfig, dash_interface::ConfigChangeKind};
+
+use crate::{
+	frontend::FrontendTasks,
+	tab::settings::{
+		SettingType, SettingsMountParams, SettingsTab, TabNameEnum, Task as ParentTask, horiz_cell,
+		macros::{MacroParams, options_category, options_checkbox, options_range_f32},
+	},
+	util::{
+		popup_manager::PopupHolder,
+		whisper::{
+			WHISPER_MODELS, WhisperModel, whisper_any_models_downloaded, whisper_delete_all_models, whisper_model_from_name,
+			whisper_model_path,
+		},
+	},
+	views::{self, ViewUpdateParams},
+};
+
+#[derive(Clone)]
+enum Task {
+	WhisperDownloadClosed,
+	WhisperRemoveUnused,
+	WhisperDownload(&'static WhisperModel),
+	WhisperDownloadDone,
+	CloseDialog,
+	ReloadTab,
+}
+
+pub struct State {
+	popup_download: PopupHolder<views::download_file::View>,
+	popup_dialog: PopupHolder<views::dialog_box::View>,
+	frontend_tasks: FrontendTasks,
+	globals: WguiGlobals,
+	tasks: Tasks<Task>,
+	parent_tasks: Tasks<ParentTask>,
+	pending_download: Option<&'static WhisperModel>,
+}
+
+impl SettingsTab for State {
+	fn update(&mut self, par: &mut ViewUpdateParams) -> anyhow::Result<()> {
+		self.popup_download.update(par)?;
+		self.popup_dialog.update(par)?;
+
+		for task in self.tasks.drain() {
+			match task {
+				Task::WhisperDownloadClosed => {
+					if let Some(model) = self.pending_download.take() {
+						if !whisper_model_path(model.file_name).exists() {
+							// download failed, set to selection to none
+							par.general_config.whisper_model = "".into();
+							par.config_change_kind.replace(ConfigChangeKind::Other);
+							// reload the tab
+							self.parent_tasks.push(ParentTask::SetTab(TabNameEnum::Features));
+						}
+					}
+				}
+				Task::WhisperRemoveUnused => {
+					let _ = whisper_delete_all_models().log_err("could not remove whisper models");
+				}
+				Task::WhisperDownload(model) => {
+					self.pending_download = Some(model);
+					self.show_whisper_download_dialog(model, par.executor.clone());
+				}
+				Task::WhisperDownloadDone => {
+					if let Some(model) = self.pending_download.take() {
+						par.general_config.whisper_model = model.file_name.into();
+						par.config_change_kind.replace(ConfigChangeKind::Other);
+
+						// reload tab so that the downloaded checkmarks get populated
+						self.parent_tasks.push(ParentTask::SetTab(TabNameEnum::Features));
+					}
+				}
+				Task::CloseDialog => {
+					let close_dialog = self.popup_dialog.get_close_callback(par.layout);
+					close_dialog();
+				}
+				Task::ReloadTab => {
+					self.parent_tasks.push(ParentTask::SetTab(TabNameEnum::Features));
+				}
+			}
+		}
+
+		Ok(())
+	}
+
+	fn context_menu_custom(
+		&mut self,
+		action: Rc<str>,
+		config: &mut GeneralConfig,
+		change_kind: &mut Option<ConfigChangeKind>,
+		layout: &mut wgui::layout::Layout,
+		state: &mut wgui::parser::ParserState,
+	) -> anyhow::Result<()> {
+		if let (Some(_), Some(id), Some(model_name)) = {
+			let mut s = action.splitn(3, ';');
+			(s.next(), s.next(), s.next())
+		} {
+			if !model_name.is_empty()
+				&& let Some(model) = whisper_model_from_name(model_name)
+			{
+				let mut common = layout.common();
+				let mut label = state.fetch_widget_as::<WidgetLabel>(common.state, &format!("{id}_value"))?;
+				label.set_text(&mut common, Translation::from_raw_text(model.display_name));
+
+				config.whisper_model = model.file_name.into();
+				if !whisper_model_path(model.file_name).exists() {
+					self.show_whisper_model_dialog_box_download(model)?;
+				} else {
+					change_kind.replace(ConfigChangeKind::Other);
+				}
+			} else {
+				config.whisper_model = "".into();
+				change_kind.replace(ConfigChangeKind::Other);
+				// re-init the whole tab
+				if whisper_any_models_downloaded().unwrap_or_default() {
+					self.show_whisper_model_dialog_box_cleanup()?;
+				} else {
+					self.parent_tasks.push(ParentTask::SetTab(TabNameEnum::Features));
+				}
+			}
+		}
+
+		Ok(())
+	}
+}
+
+impl State {
+	pub fn mount(par: SettingsMountParams) -> anyhow::Result<State> {
+		let tasks = Tasks::<Task>::new();
+		let popup_download = PopupHolder::<views::download_file::View>::default();
+		let popup_dialog = PopupHolder::<views::dialog_box::View>::default();
+
+		let c = options_category(par.mp, par.id_parent, "APP_SETTINGS.FEATURES", "dashboard/options.svg")?;
+
+		if par.feats.whisper {
+			whisper_models_dropdown(par.mp, c)?;
+		}
+
+		options_checkbox(par.mp, c, SettingType::NotificationsEnabled)?;
+		options_checkbox(par.mp, c, SettingType::NotificationsSoundEnabled)?;
+		options_checkbox(par.mp, c, SettingType::KeyboardSoundEnabled)?;
+		if !par.feats.openxr || par.feats.monado {
+			// monado or openvr
+			options_checkbox(par.mp, c, SettingType::BlockGameInput)?;
+			options_checkbox(par.mp, c, SettingType::BlockGameInputIgnoreWatch)?;
+		}
+		if par.feats.monado {
+			// monado-only
+			options_checkbox(par.mp, c, SettingType::BlockPosesOnKbdInteraction)?;
+		}
+
+		options_range_f32(
+			par.mp,
+			c,
+			SettingType::WatchViewAngleMin,
+			SettingType::WatchViewAngleMax,
+			0.1,
+			1.0,
+			0.1,
+		)?;
+		Ok(State {
+			tasks,
+			parent_tasks: par.mp.tasks.clone(),
+			popup_download,
+			popup_dialog,
+			frontend_tasks: par.frontend_tasks.clone(),
+			globals: par.mp.doc_params.globals.clone(),
+			pending_download: None,
+		})
+	}
+
+	fn show_whisper_download_dialog(&mut self, model: &WhisperModel, executor: AsyncExecutor) {
+		views::download_file::mount_popup(
+			self.popup_download.clone(),
+			self.frontend_tasks.clone(),
+			self.tasks.make_callback_box(Task::WhisperDownloadClosed),
+			views::download_file::Params {
+				globals: self.globals.clone(),
+				executor,
+				target_path: whisper_model_path(model.file_name),
+				url: model.url.into(),
+				on_downloaded: self.tasks.make_callback_box(Task::WhisperDownloadDone),
+			},
+		);
+	}
+
+	fn show_whisper_model_dialog_box_download(&mut self, model: &'static WhisperModel) -> anyhow::Result<()> {
+		const ACTION_DOWNLOAD: &str = "download";
+		const ACTION_CANCEL: &str = "cancel";
+
+		self.pending_download = Some(model);
+
+		let tasks = self.tasks.clone();
+		views::dialog_box::mount_popup(
+			self.popup_dialog.clone(),
+			self.frontend_tasks.clone(),
+			views::dialog_box::Params {
+				globals: self.globals.clone(),
+				message: Translation::from_translation_key("APP_SETTINGS.WHISPER.NEED_TO_DOWNLOAD_MODEL"),
+				entries: vec![
+					views::dialog_box::ButtonEntry {
+						content: Translation::from_translation_key("APP_SETTINGS.CANCEL"),
+						icon: "dashboard/close.svg",
+						action: ACTION_CANCEL,
+					},
+					views::dialog_box::ButtonEntry {
+						content: Translation::from_translation_key("DOWNLOAD"),
+						icon: "dashboard/download.svg",
+						action: ACTION_DOWNLOAD,
+					},
+				],
+				on_action_click: Box::new(move |action| match action {
+					ACTION_DOWNLOAD => {
+						tasks.push(Task::WhisperDownload(model));
+					}
+					ACTION_CANCEL => {
+						tasks.push(Task::CloseDialog);
+						// treat as failed download
+						tasks.push(Task::WhisperDownloadClosed);
+					}
+					_ => unreachable!(),
+				}),
+			},
+		);
+
+		Ok(())
+	}
+
+	fn show_whisper_model_dialog_box_cleanup(&mut self) -> anyhow::Result<()> {
+		const ACTION_REMOVE: &str = "remove";
+		const ACTION_CANCEL: &str = "cancel";
+
+		let tasks = self.tasks.clone();
+
+		views::dialog_box::mount_popup(
+			self.popup_dialog.clone(),
+			self.frontend_tasks.clone(),
+			views::dialog_box::Params {
+				globals: self.globals.clone(),
+				message: Translation::from_translation_key("APP_SETTINGS.WHISPER.REMOVE_UNUSED_MODELS"),
+				entries: vec![
+					views::dialog_box::ButtonEntry {
+						content: Translation::from_translation_key("APP_SETTINGS.CANCEL"),
+						icon: "dashboard/close.svg",
+						action: ACTION_CANCEL,
+					},
+					views::dialog_box::ButtonEntry {
+						content: Translation::from_translation_key("REMOVE"),
+						icon: "dashboard/trash.svg",
+						action: ACTION_REMOVE,
+					},
+				],
+				on_action_click: Box::new(move |action| match action {
+					ACTION_REMOVE => {
+						tasks.push(Task::WhisperRemoveUnused);
+						tasks.push(Task::CloseDialog);
+						tasks.push(Task::ReloadTab);
+					}
+					ACTION_CANCEL => {
+						tasks.push(Task::CloseDialog);
+						tasks.push(Task::ReloadTab);
+					}
+					_ => unreachable!(),
+				}),
+			},
+		);
+
+		Ok(())
+	}
+}
+
+fn whisper_models_dropdown(mp: &mut MacroParams, parent: WidgetID) -> anyhow::Result<()> {
+	let id = mp.idx.to_string();
+	mp.idx += 1;
+
+	let parent = horiz_cell(mp.layout, parent)?;
+
+	let mut downloaded_models = vec![];
+	for (idx, m) in WHISPER_MODELS.iter().enumerate() {
+		if whisper_model_path(m.file_name).exists() {
+			downloaded_models.push(idx);
+		}
+	}
+
+	let current_file = mp.config.whisper_model.as_ref();
+	let current_translation = whisper_model_from_name(current_file)
+		.map_or(Translation::from_translation_key("APP_SETTINGS.OPTION.NONE"), |x| {
+			Translation::from_raw_text(x.display_name)
+		});
+
+	let mut params = TemplateParams::new();
+	params.insert("id", &id);
+	params.insert("translation", "APP_SETTINGS.WHISPER_MODEL".into());
+	params.insert("tooltip", "APP_SETTINGS.WHISPER_MODEL_HELP".into());
+
+	mp.parser_state
+		.instantiate_template(mp.doc_params, "DropdownButton", mp.layout, parent, params)?;
+
+	{
+		let mut label = mp
+			.parser_state
+			.fetch_widget_as::<WidgetLabel>(&mp.layout.state, &format!("{id}_value"))?;
+		label.set_text_simple(&mut mp.layout.state.globals.get(), current_translation);
+	}
+
+	let btn = mp.parser_state.fetch_component_as::<ComponentButton>(&id)?;
+	btn.on_click(Rc::new({
+		let parent_tasks = mp.tasks.clone();
+		move |_common, e: ButtonClickEvent| {
+			let mut cells = WHISPER_MODELS
+				.iter()
+				.enumerate()
+				.map(|(idx, item)| context_menu::Cell {
+					action_name: Some(format!(";{id};{}", item.file_name).into()),
+					title: Translation::from_raw_text_string(format!(
+						"{}{}",
+						item.display_name,
+						if downloaded_models.contains(&idx) { " ✅" } else { "" }
+					)),
+					tooltip: None,
+					attribs: vec![],
+				})
+				.collect::<Vec<_>>();
+
+			cells.insert(
+				0,
+				context_menu::Cell {
+					action_name: Some(format!(";{id};").into()),
+					title: Translation::from_translation_key("APP_SETTINGS.OPTION.NONE"),
+					tooltip: None,
+					attribs: vec![],
+				},
+			);
+
+			parent_tasks.push(ParentTask::OpenContextMenu(
+				e.mouse_pos_absolute.unwrap_or_default(),
+				cells,
+			));
+			Ok(())
+		}
+	}));
 
-pub fn mount(mp: &mut MacroParams, parent: WidgetID) -> anyhow::Result<()> {
-	let c = options_category(mp, parent, "APP_SETTINGS.FEATURES", "dashboard/options.svg")?;
-	options_checkbox(mp, c, SettingType::NotificationsEnabled)?;
-	options_checkbox(mp, c, SettingType::NotificationsSoundEnabled)?;
-	options_checkbox(mp, c, SettingType::KeyboardSoundEnabled)?;
-	options_checkbox(mp, c, SettingType::KeyboardSwipeToTypeEnabled)?;
-	options_checkbox(mp, c, SettingType::SpaceDragUnlocked)?;
-	options_checkbox(mp, c, SettingType::SpaceRotateUnlocked)?;
-	options_slider_f32(mp, c, SettingType::SpaceDragMultiplier, -10.0, 10.0, 0.5)?;
-	options_checkbox(mp, c, SettingType::BlockGameInput)?;
-	options_checkbox(mp, c, SettingType::BlockGameInputIgnoreWatch)?;
-	options_checkbox(mp, c, SettingType::BlockPosesOnKbdInteraction)?;
 	Ok(())
 }
diff --git a/dash-frontend/src/tab/settings/tab_look_and_feel.rs b/dash-frontend/src/tab/settings/tab_look_and_feel.rs
index 6fe40420..bc264bb0 100644
--- a/dash-frontend/src/tab/settings/tab_look_and_feel.rs
+++ b/dash-frontend/src/tab/settings/tab_look_and_feel.rs
@@ -1,22 +1,117 @@
-use crate::tab::settings::{
-	SettingType,
-	macros::{MacroParams, options_category, options_checkbox, options_dropdown, options_slider_f32},
-};
-use wgui::layout::WidgetID;
+use std::rc::Rc;
+
+use wgui::{
+	components::button::ComponentButton,
+	globals::WguiGlobals,
+	layout::WidgetID,
+	parser::{Fetchable, TemplateParams},
+	task::Tasks,
+};
+
+use crate::{
+	frontend::FrontendTasks,
+	tab::settings::{
+		SettingType, SettingsMountParams, SettingsTab, horiz_cell,
+		macros::{options_category, options_checkbox, options_dropdown, options_slider_f32},
+		mount_requires_restart,
+	},
+	util::popup_manager::PopupHolder,
+	views::{ViewUpdateParams, color_palettes},
+};
+
+#[derive(Clone)]
+enum Task {
+	OpenColorPalettes,
+}
+
+pub struct State {
+	popup_color_palettes: PopupHolder<color_palettes::View>,
+	frontend_tasks: FrontendTasks,
+	globals: WguiGlobals,
+	tasks: Tasks<Task>,
+}
+
+impl SettingsTab for State {
+	fn update(&mut self, par: &mut ViewUpdateParams) -> anyhow::Result<()> {
+		self.popup_color_palettes.update(par)?;
+
+		for task in self.tasks.drain() {
+			match task {
+				Task::OpenColorPalettes => {
+					color_palettes::mount_popup(
+						self.frontend_tasks.clone(),
+						self.globals.clone(),
+						self.popup_color_palettes.clone(),
+						par.general_config.color_palette.clone(),
+					);
+				}
+			}
+		}
+		Ok(())
+	}
+}
+
+impl State {
+	pub fn mount(par: SettingsMountParams) -> anyhow::Result<State> {
+		let tasks = Tasks::<Task>::new();
+		let popup = PopupHolder::<color_palettes::View>::default();
+
+		let c = options_category(
+			par.mp,
+			par.id_parent,
+			"APP_SETTINGS.LOOK_AND_FEEL",
+			"dashboard/palette.svg",
+		)?;
+		create_color_palettes_button(par.mp, c, tasks.clone(), &popup)?;
+		options_dropdown::<wlx_common::locale::Language>(par.mp, c, &SettingType::Language)?;
+		options_checkbox(par.mp, c, SettingType::OpaqueBackground)?;
+		options_checkbox(par.mp, c, SettingType::HideUsername)?;
+		options_checkbox(par.mp, c, SettingType::HideGrabHelp)?;
+		options_slider_f32(par.mp, c, SettingType::DefaultOverlayScale, 0.7, 1.5, 0.05)?; // min, max, step
+		options_slider_f32(par.mp, c, SettingType::UiAnimationSpeed, 0.5, 5.0, 0.1)?; // min, max, step
+		options_slider_f32(par.mp, c, SettingType::UiGradientIntensity, 0.0, 1.0, 0.05)?; // min, max, step
+		options_slider_f32(par.mp, c, SettingType::UiRoundMultiplier, 0.1, 5.0, 0.1)?;
+		options_checkbox(par.mp, c, SettingType::EnableWatch)?;
+		options_checkbox(par.mp, c, SettingType::SetsOnWatch)?;
+		options_checkbox(par.mp, c, SettingType::Clock12h)?;
+		Ok(State {
+			popup_color_palettes: popup,
+			frontend_tasks: par.frontend_tasks.clone(),
+			globals: par.mp.doc_params.globals.clone(),
+			tasks,
+		})
+	}
+}
+
+fn create_color_palettes_button(
+	mp: &mut crate::tab::settings::macros::MacroParams,
+	parent: WidgetID,
+	tasks: Tasks<Task>,
+	_popup: &PopupHolder<color_palettes::View>,
+) -> anyhow::Result<()> {
+	let id = mp.idx.to_string();
+	mp.idx += 1;
+
+	let id_cell = horiz_cell(mp.layout, parent)?;
+
+	let mut params = TemplateParams::new();
+	params.insert("id", &id);
+	params.insert("translation", "APP_SETTINGS.COLOR_PALETTE");
+	params.insert("icon", "dashboard/palette.svg");
+
+	mp.parser_state
+		.instantiate_template(mp.doc_params, "ButtonText", mp.layout, id_cell, params)?;
+
+	let btn = mp.parser_state.fetch_component_as::<ComponentButton>(&id)?;
+	btn.on_click(Rc::new({
+		let tasks = tasks.clone();
+		move |_common, _e| {
+			tasks.push(Task::OpenColorPalettes);
+			Ok(())
+		}
+	}));
+
+	mount_requires_restart(mp.layout, id_cell)?;
 
-pub fn mount(mp: &mut MacroParams, parent: WidgetID) -> anyhow::Result<()> {
-	let c = options_category(mp, parent, "APP_SETTINGS.LOOK_AND_FEEL", "dashboard/palette.svg")?;
-	options_dropdown::<wlx_common::locale::Language>(mp, c, &SettingType::Language)?;
-	options_checkbox(mp, c, SettingType::OpaqueBackground)?;
-	options_checkbox(mp, c, SettingType::HideUsername)?;
-	options_checkbox(mp, c, SettingType::HideGrabHelp)?;
-	options_slider_f32(mp, c, SettingType::UiAnimationSpeed, 0.5, 5.0, 0.1)?; // min, max, step
-	options_slider_f32(mp, c, SettingType::UiGradientIntensity, 0.0, 1.0, 0.05)?; // min, max, step
-	options_slider_f32(mp, c, SettingType::UiRoundMultiplier, 0.5, 5.0, 0.1)?;
-	options_checkbox(mp, c, SettingType::SetsOnWatch)?;
-	options_checkbox(mp, c, SettingType::UseSkybox)?;
-	options_slider_f32(mp, c, SettingType::GridOpacity, 0.0, 1.0, 0.05)?; // min, max, step
-	options_checkbox(mp, c, SettingType::UsePassthrough)?;
-	options_checkbox(mp, c, SettingType::Clock12h)?;
 	Ok(())
 }
diff --git a/dash-frontend/src/tab/settings/tab_misc.rs b/dash-frontend/src/tab/settings/tab_misc.rs
index 9fa6f429..d1fa6ca9 100644
--- a/dash-frontend/src/tab/settings/tab_misc.rs
+++ b/dash-frontend/src/tab/settings/tab_misc.rs
@@ -1,15 +1,22 @@
 use crate::tab::settings::{
-	SettingType,
-	macros::{MacroParams, options_category, options_checkbox, options_dropdown},
+	SettingType, SettingsMountParams, SettingsTab,
+	macros::{options_category, options_checkbox, options_dropdown},
 };
-use wgui::layout::WidgetID;
 
-pub fn mount(mp: &mut MacroParams, parent: WidgetID) -> anyhow::Result<()> {
-	let c = options_category(mp, parent, "APP_SETTINGS.MISC", "dashboard/blocks.svg")?;
-	options_dropdown::<wlx_common::config::CaptureMethod>(mp, c, &SettingType::CaptureMethod)?;
-	options_checkbox(mp, c, SettingType::XwaylandByDefault)?;
-	options_checkbox(mp, c, SettingType::UprightScreenFix)?;
-	options_checkbox(mp, c, SettingType::DoubleCursorFix)?;
-	options_checkbox(mp, c, SettingType::ScreenRenderDown)?;
-	Ok(())
+pub struct State {}
+
+impl SettingsTab for State {}
+
+impl State {
+	pub fn mount(par: SettingsMountParams) -> anyhow::Result<State> {
+		let c = options_category(par.mp, par.id_parent, "APP_SETTINGS.MISC", "dashboard/blocks.svg")?;
+		options_dropdown::<wlx_common::config::InputEmulationMethod>(par.mp, c, &SettingType::InputEmulationMethod)?;
+		options_dropdown::<wlx_common::config::InputCaptureMethod>(par.mp, c, &SettingType::InputCaptureMethod)?;
+		options_dropdown::<wlx_common::config::CaptureMethod>(par.mp, c, &SettingType::CaptureMethod)?;
+		options_checkbox(par.mp, c, SettingType::XwaylandByDefault)?;
+		options_checkbox(par.mp, c, SettingType::UprightScreenFix)?;
+		options_checkbox(par.mp, c, SettingType::DoubleCursorFix)?;
+		options_checkbox(par.mp, c, SettingType::ScreenRenderDown)?;
+		Ok(State {})
+	}
 }
diff --git a/dash-frontend/src/tab/settings/tab_skybox.rs b/dash-frontend/src/tab/settings/tab_skybox.rs
new file mode 100644
index 00000000..66c2edf8
--- /dev/null
+++ b/dash-frontend/src/tab/settings/tab_skybox.rs
@@ -0,0 +1,70 @@
+use wgui::{assets::AssetPath, i18n::Translation, layout::Layout, task::Tasks};
+
+use crate::{
+	frontend::FrontendTasks,
+	tab::settings::{
+		SettingType, SettingsMountParams, SettingsTab,
+		macros::{options_category, options_checkbox, options_slider_f32},
+	},
+	util::{popup_manager::PopupHolder, wgui_simple},
+	views::{self, ViewUpdateParams, skymap_list},
+};
+
+#[derive(Clone)]
+enum Task {
+	ShowSkymapList,
+}
+
+pub struct State {
+	popup_skymap_list: PopupHolder<skymap_list::View>,
+	tasks: Tasks<Task>,
+	frontend_tasks: FrontendTasks,
+}
+
+impl SettingsTab for State {
+	fn update(&mut self, par: &mut ViewUpdateParams) -> anyhow::Result<()> {
+		self.popup_skymap_list.update(par)?;
+
+		for task in self.tasks.drain() {
+			match task {
+				Task::ShowSkymapList => self.show_skymap_list(par.layout),
+			}
+		}
+
+		Ok(())
+	}
+}
+
+impl State {
+	pub fn mount(par: SettingsMountParams) -> anyhow::Result<Self> {
+		let id_category = options_category(par.mp, par.id_parent, "APP_SETTINGS.SKYBOX", "dashboard/globe.svg")?;
+		options_checkbox(par.mp, id_category, SettingType::UseSkybox)?;
+		options_checkbox(par.mp, id_category, SettingType::UsePassthrough)?;
+		options_slider_f32(par.mp, id_category, SettingType::GridOpacity, 0.0, 1.0, 0.05)?;
+
+		let tasks = Tasks::<Task>::new();
+
+		// "Browse skymaps" button
+		wgui_simple::create_button(wgui_simple::CreateButtonParams {
+			id_parent: id_category,
+			layout: par.mp.layout,
+			content: Translation::from_translation_key("APP_SETTINGS.BROWSE_SKYMAPS"),
+			icon_builtin: AssetPath::BuiltIn("dashboard/globe.svg"),
+			on_click: tasks.get_button_click_callback(Task::ShowSkymapList),
+		})?;
+
+		Ok(Self {
+			popup_skymap_list: Default::default(),
+			frontend_tasks: par.frontend_tasks.clone(),
+			tasks,
+		})
+	}
+
+	fn show_skymap_list(&mut self, layout: &mut Layout) {
+		views::skymap_list::mount_popup(
+			self.frontend_tasks.clone(),
+			layout.state.globals.clone(),
+			self.popup_skymap_list.clone(),
+		);
+	}
+}
diff --git a/dash-frontend/src/tab/settings/tab_space_drag.rs b/dash-frontend/src/tab/settings/tab_space_drag.rs
new file mode 100644
index 00000000..fab2c5c6
--- /dev/null
+++ b/dash-frontend/src/tab/settings/tab_space_drag.rs
@@ -0,0 +1,165 @@
+use wgui::{
+	assets::AssetPath,
+	i18n::Translation,
+	layout::{Layout, LayoutTask, WidgetID},
+	parser::{Fetchable, ParseDocumentParams},
+};
+
+use crate::{
+	tab::settings::{
+		SettingType, SettingsMountParams, SettingsTab,
+		macros::{options_button, options_category, options_checkbox, options_slider_f32},
+	},
+	util::wgui_simple,
+};
+
+pub struct State {
+	id_space_gravity_parent: WidgetID,
+}
+
+fn set_visible(parent: WidgetID, layout: &mut Layout, n: bool) {
+	layout.tasks.push(LayoutTask::SetWidgetVisible(parent, n));
+}
+
+impl SettingsTab for State {
+	fn setting_updated(&mut self, sup: &mut super::SettingUpdatedParams) -> anyhow::Result<()> {
+		if sup.setting_type == SettingType::SpaceGravityEnabled {
+			set_visible(
+				self.id_space_gravity_parent,
+				sup.layout,
+				sup.config.space_gravity_enabled,
+			);
+		}
+		Ok(())
+	}
+}
+
+impl State {
+	pub fn mount(par: SettingsMountParams) -> anyhow::Result<State> {
+		let c = options_category(par.mp, par.id_parent, "APP_SETTINGS.SPACE_DRAG", "dashboard/drag.svg")?;
+
+		let globals = par.mp.layout.state.globals.clone();
+
+		let tab_state = wgui::parser::parse_from_assets(
+			&ParseDocumentParams {
+				globals,
+				path: AssetPath::BuiltIn("gui/tab/settings_tab_space_drag.xml"),
+				extra: Default::default(),
+			},
+			par.mp.layout,
+			c,
+		)?;
+
+		let id_common_options_parent = tab_state.get_widget_id("common_options_parent")?;
+		let id_gravity_enabled_parent = tab_state.get_widget_id("gravity_enabled_parent")?;
+		let id_space_gravity_parent = tab_state.get_widget_id("space_gravity_parent")?;
+
+		if !par.feats.openxr || par.feats.monado {
+			// monado or openvr
+
+			options_button(
+				par.mp,
+				c,
+				"APP_SETTINGS.RESET_PLAYSPACE",
+				"dashboard/refresh.svg",
+				super::Task::ResetPlayspace,
+			)?;
+
+			options_button(
+				par.mp,
+				c,
+				"APP_SETTINGS.SAVE_PLAYSPACE_CENTER",
+				"dashboard/recenter.svg",
+				super::Task::SavePlayspaceCenter,
+			)?;
+
+			options_button(
+				par.mp,
+				c,
+				"APP_SETTINGS.RESET_PLAYSPACE_CENTER",
+				"dashboard/trash.svg",
+				super::Task::ResetPlayspaceCenter,
+			)?;
+
+			options_checkbox(par.mp, id_common_options_parent, SettingType::SpaceDragUnlocked)?;
+
+			options_checkbox(par.mp, id_common_options_parent, SettingType::SpaceDragAffectsWorld)?;
+
+			options_slider_f32(
+				par.mp,
+				id_common_options_parent,
+				SettingType::SpaceDragMultiplier,
+				-10.0,
+				10.0,
+				0.5,
+			)?;
+		}
+
+		if par.feats.monado {
+			// openvr can only ever rotate yaw
+			options_checkbox(par.mp, id_common_options_parent, SettingType::SpaceRotateUnlocked)?;
+		}
+
+		if par.feats.monado {
+			/* space gravity section */
+			options_checkbox(par.mp, id_gravity_enabled_parent, SettingType::SpaceGravityEnabled)?;
+
+			options_slider_f32(
+				par.mp,
+				id_space_gravity_parent,
+				SettingType::SpaceGravityGravity,
+				0.0,
+				10.0,
+				0.5,
+			)?;
+			options_slider_f32(
+				par.mp,
+				id_space_gravity_parent,
+				SettingType::SpaceGravityDamping,
+				0.1,
+				1.0,
+				0.01,
+			)?;
+			options_slider_f32(
+				par.mp,
+				id_space_gravity_parent,
+				SettingType::SpaceGravityFlingStrength,
+				0.0,
+				3.0,
+				0.1,
+			)?;
+			options_slider_f32(
+				par.mp,
+				id_space_gravity_parent,
+				SettingType::SpaceGravityGroundFriction,
+				0.0,
+				1.0,
+				0.01,
+			)?;
+			options_slider_f32(
+				par.mp,
+				id_space_gravity_parent,
+				SettingType::SpaceGravityFloorHeight,
+				-5.0,
+				5.0,
+				0.1,
+			)?;
+		} else {
+			wgui_simple::create_label(
+				par.mp.layout,
+				id_gravity_enabled_parent,
+				Translation::from_translation_key("APP_SETTINGS.NOT_SUPPORTED"),
+			)?;
+		}
+
+		set_visible(
+			id_space_gravity_parent,
+			par.mp.layout,
+			par.mp.config.space_gravity_enabled,
+		);
+
+		Ok(State {
+			id_space_gravity_parent,
+		})
+	}
+}
diff --git a/dash-frontend/src/tab/settings/tab_troubleshooting.rs b/dash-frontend/src/tab/settings/tab_troubleshooting.rs
index 9e16fd4b..4327c267 100644
--- a/dash-frontend/src/tab/settings/tab_troubleshooting.rs
+++ b/dash-frontend/src/tab/settings/tab_troubleshooting.rs
@@ -1,45 +1,48 @@
 use crate::tab::settings::{
-	Task,
-	macros::{MacroParams, options_category, options_danger_button},
+	SettingsMountParams, SettingsTab, Task,
+	macros::{options_category, options_danger_button},
 };
-use wgui::layout::WidgetID;
 
-pub fn mount(mp: &mut MacroParams, parent: WidgetID) -> anyhow::Result<()> {
-	let c = options_category(mp, parent, "APP_SETTINGS.TROUBLESHOOTING", "dashboard/cpu.svg")?;
-	options_danger_button(
-		mp,
-		c,
-		"APP_SETTINGS.RESET_PLAYSPACE",
-		"dashboard/recenter.svg",
-		Task::ResetPlayspace,
-	)?;
-	options_danger_button(
-		mp,
-		c,
-		"APP_SETTINGS.CLEAR_PIPEWIRE_TOKENS",
-		"dashboard/display.svg",
-		Task::ClearPipewireTokens,
-	)?;
-	options_danger_button(
-		mp,
-		c,
-		"APP_SETTINGS.CLEAR_SAVED_STATE",
-		"dashboard/binary.svg",
-		Task::ClearSavedState,
-	)?;
-	options_danger_button(
-		mp,
-		c,
-		"APP_SETTINGS.DELETE_ALL_CONFIGS",
-		"dashboard/circle.svg",
-		Task::DeleteAllConfigs,
-	)?;
-	options_danger_button(
-		mp,
-		c,
-		"APP_SETTINGS.RESTART_SOFTWARE",
-		"dashboard/refresh.svg",
-		Task::RestartSoftware,
-	)?;
-	Ok(())
+pub struct State {}
+
+impl SettingsTab for State {}
+
+impl State {
+	pub fn mount(par: SettingsMountParams) -> anyhow::Result<Self> {
+		let c = options_category(
+			par.mp,
+			par.id_parent,
+			"APP_SETTINGS.TROUBLESHOOTING",
+			"dashboard/cpu.svg",
+		)?;
+		options_danger_button(
+			par.mp,
+			c,
+			"APP_SETTINGS.CLEAR_PIPEWIRE_TOKENS",
+			"dashboard/display.svg",
+			Task::ClearPipewireTokens,
+		)?;
+		options_danger_button(
+			par.mp,
+			c,
+			"APP_SETTINGS.CLEAR_SAVED_STATE",
+			"dashboard/binary.svg",
+			Task::ClearSavedState,
+		)?;
+		options_danger_button(
+			par.mp,
+			c,
+			"APP_SETTINGS.DELETE_ALL_CONFIGS",
+			"dashboard/circle.svg",
+			Task::DeleteAllConfigs,
+		)?;
+		options_danger_button(
+			par.mp,
+			c,
+			"APP_SETTINGS.RESTART_SOFTWARE",
+			"dashboard/refresh.svg",
+			Task::RestartSoftware,
+		)?;
+		Ok(State {})
+	}
 }
diff --git a/dash-frontend/src/tab/welcome.rs b/dash-frontend/src/tab/welcome.rs
new file mode 100644
index 00000000..fd1f3859
--- /dev/null
+++ b/dash-frontend/src/tab/welcome.rs
@@ -0,0 +1,175 @@
+use std::{marker::PhantomData, rc::Rc};
+
+use wgui::{
+	assets::AssetPath,
+	components::button::ComponentButton,
+	globals::WguiGlobals,
+	layout::{Layout, WidgetID},
+	parser::{Fetchable, ParseDocumentParams, ParserState, TemplateParams},
+	task::Tasks,
+};
+
+use crate::{
+	frontend::{Frontend, FrontendTask, FrontendTasks},
+	tab::{Tab, TabType},
+};
+
+#[derive(Clone)]
+#[allow(clippy::enum_variant_names)]
+enum Task {
+	SetPage(u8),
+	SetPageNext,
+	SetPagePrev,
+}
+
+pub struct TabWelcome<T> {
+	#[allow(dead_code)]
+	pub state: ParserState,
+	marker: PhantomData<T>,
+	tasks: Tasks<Task>,
+	current_page: u8,
+	id_pips: WidgetID,
+	id_content: WidgetID,
+	frontend_tasks: FrontendTasks,
+
+	state_tab: Option<ParserState>,
+}
+
+const PAGE_COUNT: u8 = 6; // 0-5 inclusive
+
+impl<T> Tab<T> for TabWelcome<T> {
+	fn get_type(&self) -> TabType {
+		TabType::Welcome
+	}
+
+	fn update(&mut self, frontend: &mut Frontend<T>, _time_ms: u32, _user_data: &mut T) -> anyhow::Result<()> {
+		for task in self.tasks.drain() {
+			match task {
+				Task::SetPage(page_num) => {
+					self.set_page(&mut frontend.layout, page_num)?;
+				}
+				Task::SetPageNext => {
+					if self.current_page < PAGE_COUNT - 1 {
+						self.tasks.push(Task::SetPage(self.current_page + 1));
+					}
+				}
+				Task::SetPagePrev => {
+					if self.current_page > 0 {
+						self.tasks.push(Task::SetPage(self.current_page - 1));
+					}
+				}
+			}
+		}
+
+		Ok(())
+	}
+}
+
+fn doc_params(globals: &WguiGlobals) -> ParseDocumentParams<'_> {
+	ParseDocumentParams {
+		globals: globals.clone(),
+		path: AssetPath::BuiltIn("gui/tab/welcome.xml"),
+		extra: Default::default(),
+	}
+}
+
+impl<T> TabWelcome<T> {
+	pub fn new(frontend: &mut Frontend<T>, parent_id: WidgetID, _data: &mut T) -> anyhow::Result<Self> {
+		let state = wgui::parser::parse_from_assets(&doc_params(&frontend.globals), &mut frontend.layout, parent_id)?;
+
+		let tasks = Tasks::<Task>::new();
+
+		let btn_prev = state.fetch_component_as::<ComponentButton>("btn_prev")?;
+		let btn_next = state.fetch_component_as::<ComponentButton>("btn_next")?;
+
+		tasks.handle_button(&btn_prev, Task::SetPagePrev);
+		tasks.handle_button(&btn_next, Task::SetPageNext);
+
+		let id_pips = state.get_widget_id("pips")?;
+		let id_content = state.get_widget_id("content")?;
+
+		tasks.push(Task::SetPage(0));
+
+		Ok(Self {
+			state,
+			marker: PhantomData,
+			current_page: 0,
+			id_pips,
+			id_content,
+			tasks,
+			state_tab: None,
+			frontend_tasks: frontend.tasks.clone(),
+		})
+	}
+
+	fn refresh_pips(&mut self, layout: &mut Layout) -> anyhow::Result<()> {
+		layout.remove_children(self.id_pips);
+
+		let globals = layout.state.globals.clone();
+
+		for i in 0..PAGE_COUNT {
+			let mut params = TemplateParams::new();
+			let is_selected = i == self.current_page;
+			params.insert(
+				"COLOR",
+				if is_selected {
+					"primary"
+				} else {
+					"on_background(opacity-0.25)"
+				},
+			);
+
+			self
+				.state
+				.instantiate_template(&doc_params(&globals), "Pip", layout, self.id_pips, params)?
+		}
+
+		Ok(())
+	}
+
+	fn fill_page(&mut self, layout: &mut Layout) -> anyhow::Result<()> {
+		layout.remove_children(self.id_content);
+
+		let globals = layout.state.globals.clone();
+
+		let state = wgui::parser::parse_from_assets(
+			&ParseDocumentParams {
+				globals,
+				path: AssetPath::BuiltIn(&format!("gui/tab/welcome_page_{}.xml", self.current_page)),
+				extra: Default::default(),
+			},
+			layout,
+			self.id_content,
+		)?;
+
+		if let Ok(btn) = state.fetch_component_as::<ComponentButton>("btn_home_screen") {
+			btn.on_click({
+				let tasks = self.frontend_tasks.clone();
+				Rc::new(move |_, _| {
+					tasks.push(FrontendTask::SetTab(TabType::Home));
+					tasks.push(FrontendTask::MarkTutorialGraduated);
+					Ok(())
+				})
+			});
+		}
+
+		if let Ok(btn) = state.fetch_component_as::<ComponentButton>("btn_wayvr_org") {
+			self
+				.frontend_tasks
+				.handle_button(&btn, FrontendTask::OpenURL(Rc::from("https://wayvr.org")));
+		}
+
+		self.state_tab = Some(state);
+
+		Ok(())
+	}
+
+	fn set_page(&mut self, layout: &mut Layout, page_num: u8) -> anyhow::Result<()> {
+		self.current_page = page_num;
+
+		self.refresh_pips(layout)?;
+		self.fill_page(layout)?;
+
+		Ok(())
+	}
+}
diff --git a/dash-frontend/src/util/cached_fetcher.rs b/dash-frontend/src/util/cached_fetcher.rs
index 5c7f84bc..54d55d31 100644
--- a/dash-frontend/src/util/cached_fetcher.rs
+++ b/dash-frontend/src/util/cached_fetcher.rs
@@ -1,15 +1,14 @@
+use crate::util::{networking::http_client, steam_utils::AppID};
 use anyhow::Context;
 use serde::Deserialize;
-use wlx_common::{async_executor::AsyncExecutor, cache_dir};
-
-use crate::util::{http_client, steam_utils::AppID};
+use wlx_common::cache_dir;
 
 pub struct CoverArt {
 	// can be empty in case if data couldn't be fetched (use a fallback image then)
 	pub compressed_image_data: Vec<u8>,
 }
 
-pub async fn request_image(executor: AsyncExecutor, app_id: AppID) -> anyhow::Result<CoverArt> {
+pub async fn request_image(app_id: AppID) -> anyhow::Result<CoverArt> {
 	let cache_file_path = format!("cover_arts/{}.bin", app_id);
 
 	// check if file already exists in cache directory
@@ -24,7 +23,7 @@ pub async fn request_image(executor: AsyncExecutor, app_id: AppID) -> anyhow::Re
 		app_id
 	);
 
-	match http_client::get(&executor, &url).await {
+	match http_client::get_simple(&url).await {
 		Ok(response) => {
 			log::info!("Success");
 			cache_dir::set_data(&cache_file_path, &response.data).await?;
@@ -56,11 +55,7 @@ pub struct AppDetailsJSONData {
 	pub developers: Vec<String>,              // ["Valve"]
 }
 
-async fn get_app_details_json_internal(
-	executor: AsyncExecutor,
-	cache_file_path: &str,
-	app_id: AppID,
-) -> anyhow::Result<AppDetailsJSONData> {
+async fn get_app_details_json_internal(cache_file_path: &str, app_id: AppID) -> anyhow::Result<AppDetailsJSONData> {
 	// check if file already exists in cache directory
 	if let Some(data) = cache_dir::get_data(cache_file_path).await {
 		return Ok(serde_json::from_value(serde_json::from_slice(&data)?)?);
@@ -69,7 +64,7 @@ async fn get_app_details_json_internal(
 	// Fetch from Steam API
 	log::info!("Fetching app detail ID {}", app_id);
 	let url = format!("https://store.steampowered.com/api/appdetails?appids={}", app_id);
-	let response = http_client::get(&executor, &url).await?;
+	let response = http_client::get_simple(&url).await?;
 	let res_utf8 = String::from_utf8(response.data)?;
 	let root = serde_json::from_str::<serde_json::Value>(&res_utf8)?;
 	let body = root.get(&app_id).context("invalid body")?;
@@ -89,10 +84,10 @@ async fn get_app_details_json_internal(
 	Ok(app_details)
 }
 
-pub async fn get_app_details_json(executor: AsyncExecutor, app_id: AppID) -> Option<AppDetailsJSONData> {
+pub async fn get_app_details_json(app_id: AppID) -> Option<AppDetailsJSONData> {
 	let cache_file_path = format!("app_details/{}.json", app_id);
 
-	match get_app_details_json_internal(executor, &cache_file_path, app_id).await {
+	match get_app_details_json_internal(&cache_file_path, app_id).await {
 		Ok(r) => Some(r),
 		Err(e) => {
 			log::error!("Failed to get app details: {:?}", e);
diff --git a/dash-frontend/src/util/http_client.rs b/dash-frontend/src/util/http_client.rs
deleted file mode 100644
index 875d509e..00000000
--- a/dash-frontend/src/util/http_client.rs
+++ /dev/null
@@ -1,133 +0,0 @@
-//
-// example smol+hyper usage derived from
-// https://github.com/smol-rs/smol/blob/master/examples/hyper-client.rs
-// under Apache-2.0 + MIT license.
-// Repository URL: https://github.com/smol-rs/smol
-//
-
-use anyhow::Context as _;
-use async_native_tls::TlsStream;
-use http_body_util::{BodyStream, Empty};
-use hyper::Request;
-use smol::{net::TcpStream, prelude::*};
-use std::convert::TryInto;
-use std::pin::Pin;
-use std::task::{Context, Poll};
-use wlx_common::async_executor::AsyncExecutor;
-pub struct HttpClientResponse {
-	pub data: Vec<u8>,
-}
-
-pub async fn get(executor: &AsyncExecutor, url: &str) -> anyhow::Result<HttpClientResponse> {
-	log::info!("fetching URL \"{}\"", url);
-
-	let url: hyper::Uri = url.try_into()?;
-	let req = Request::builder()
-		.header(
-			hyper::header::HOST,
-			url.authority().context("invalid authority")?.clone().as_str(),
-		)
-		.uri(url)
-		.body(Empty::new())?;
-
-	let resp = fetch(executor, req).await?;
-
-	if !resp.status().is_success() {
-		// non-200 HTTP response
-		anyhow::bail!("non-200 HTTP response: {}", resp.status().as_str());
-	}
-
-	let body = BodyStream::new(resp.into_body())
-		.try_fold(Vec::new(), |mut body, chunk| {
-			if let Some(chunk) = chunk.data_ref() {
-				body.extend_from_slice(chunk);
-			}
-			Ok(body)
-		})
-		.await?;
-
-	Ok(HttpClientResponse { data: body })
-}
-
-async fn fetch(
-	ex: &AsyncExecutor,
-	req: hyper::Request<http_body_util::Empty<&'static [u8]>>,
-) -> anyhow::Result<hyper::Response<hyper::body::Incoming>> {
-	let io = {
-		let host = req.uri().host().context("cannot parse host")?;
-
-		match req.uri().scheme_str() {
-			Some("http") => {
-				let stream = {
-					let port = req.uri().port_u16().unwrap_or(80);
-					smol::net::TcpStream::connect((host, port)).await?
-				};
-				SmolStream::Plain(stream)
-			}
-			Some("https") => {
-				// In case of HTTPS, establish a secure TLS connection first.
-				let stream = {
-					let port = req.uri().port_u16().unwrap_or(443);
-					smol::net::TcpStream::connect((host, port)).await?
-				};
-				let stream = async_native_tls::connect(host, stream).await?;
-				SmolStream::Tls(stream)
-			}
-			scheme => anyhow::bail!("unsupported scheme: {:?}", scheme),
-		}
-	};
-
-	// Spawn the HTTP/1 connection.
-	let (mut sender, conn) = hyper::client::conn::http1::handshake(smol_hyper::rt::FuturesIo::new(io)).await?;
-	ex.spawn(async move {
-		if let Err(e) = conn.await {
-			println!("Connection failed: {:?}", e);
-		}
-	})
-	.detach();
-
-	// Get the result
-	let result = sender.send_request(req).await?;
-	Ok(result)
-}
-
-/// A TCP or TCP+TLS connection.
-enum SmolStream {
-	/// A plain TCP connection.
-	Plain(TcpStream),
-
-	/// A TCP connection secured by TLS.
-	Tls(TlsStream<TcpStream>),
-}
-
-impl AsyncRead for SmolStream {
-	fn poll_read(mut self: Pin<&mut Self>, cx: &mut Context<'_>, buf: &mut [u8]) -> Poll<smol::io::Result<usize>> {
-		match &mut *self {
-			SmolStream::Plain(stream) => Pin::new(stream).poll_read(cx, buf),
-			SmolStream::Tls(stream) => Pin::new(stream).poll_read(cx, buf),
-		}
-	}
-}
-
-impl AsyncWrite for SmolStream {
-	fn poll_write(mut self: Pin<&mut Self>, cx: &mut Context<'_>, buf: &[u8]) -> Poll<smol::io::Result<usize>> {
-		match &mut *self {
-			SmolStream::Plain(stream) => Pin::new(stream).poll_write(cx, buf),
-			SmolStream::Tls(stream) => Pin::new(stream).poll_write(cx, buf),
-		}
-	}
-
-	fn poll_close(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<smol::io::Result<()>> {
-		match &mut *self {
-			SmolStream::Plain(stream) => Pin::new(stream).poll_close(cx),
-			SmolStream::Tls(stream) => Pin::new(stream).poll_close(cx),
-		}
-	}
-
-	fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<smol::io::Result<()>> {
-		match &mut *self {
-			SmolStream::Plain(stream) => Pin::new(stream).poll_flush(cx),
-			SmolStream::Tls(stream) => Pin::new(stream).poll_flush(cx),
-		}
-	}
-}
diff --git a/dash-frontend/src/util/mod.rs b/dash-frontend/src/util/mod.rs
index e5290607..7eda5e07 100644
--- a/dash-frontend/src/util/mod.rs
+++ b/dash-frontend/src/util/mod.rs
@@ -1,7 +1,9 @@
 pub mod cached_fetcher;
-pub mod http_client;
+pub mod networking;
+pub mod openxr_bindings;
 pub mod pactl_wrapper;
 pub mod popup_manager;
 pub mod steam_utils;
 pub mod toast_manager;
 pub mod wgui_simple;
+pub mod whisper;
diff --git a/dash-frontend/src/util/networking/http_client.rs b/dash-frontend/src/util/networking/http_client.rs
new file mode 100644
index 00000000..ea5b2b34
--- /dev/null
+++ b/dash-frontend/src/util/networking/http_client.rs
@@ -0,0 +1,240 @@
+use anyhow::Context as _;
+use smol::{
+	Task,
+	channel::{Receiver, bounded},
+	io::AsyncWriteExt as _,
+};
+use std::{io::Read as _, path::Path, str, sync::OnceLock};
+
+const IO_BUFFER_SIZE: usize = 256 * 1024;
+const CHANNEL_CAPACITY: usize = 4;
+const MAX_INITIAL_ALLOCATION: usize = 8 * 1024 * 1024;
+
+pub struct HttpClientResponse {
+	pub data: Vec<u8>,
+}
+
+impl HttpClientResponse {
+	pub fn into_json<T>(self) -> anyhow::Result<T>
+	where
+		T: serde::de::DeserializeOwned,
+	{
+		let utf8 = str::from_utf8(&self.data)?;
+		Ok(serde_json::from_str(utf8)?)
+	}
+}
+
+#[derive(Debug, Clone, Copy)]
+pub struct ProgressFuncData {
+	pub bytes_downloaded: u64,
+	pub file_size: u64,
+}
+
+pub type ProgressFunc<'a> = Box<dyn FnMut(ProgressFuncData) + 'a>;
+
+pub struct GetParams<'a> {
+	pub url: &'a str,
+	pub on_progress: Option<ProgressFunc<'a>>,
+}
+
+struct DownloadStream {
+	file_size: u64,
+	chunks: Receiver<Vec<u8>>,
+	worker: Task<anyhow::Result<()>>,
+}
+
+static HTTP_AGENT: OnceLock<ureq::Agent> = OnceLock::new();
+
+fn http_agent() -> &'static ureq::Agent {
+	HTTP_AGENT.get_or_init(|| {
+		ureq::Agent::config_builder()
+			.max_redirects(10)
+			.http_status_as_error(false)
+			.build()
+			.new_agent()
+	})
+}
+
+/// Starts a blocking HTTP request and streams its body through a bounded
+/// asynchronous channel.
+///
+/// The request, TLS operations, and all BodyReader reads remain inside one
+/// blocking worker. Only owned byte chunks cross back to the async task.
+async fn start_download(url: &str, allow_missing_content_length: bool) -> anyhow::Result<DownloadStream> {
+	let url = url.to_owned();
+	let agent = http_agent().clone();
+
+	let (metadata_tx, metadata_rx) = bounded::<u64>(1);
+
+	let (chunk_tx, chunk_rx) = bounded::<Vec<u8>>(CHANNEL_CAPACITY);
+
+	let worker = smol::unblock(move || -> anyhow::Result<()> {
+		log::info!("fetching URL \"{}\"", url);
+
+		let response = agent
+			.get(&url)
+			.header("Accept-Encoding", "identity")
+			.call()
+			.with_context(|| format!("failed to fetch URL \"{url}\""))?;
+
+		if !response.status().is_success() {
+			anyhow::bail!("non-200 HTTP response: {}", response.status().as_u16(),);
+		}
+
+		let file_size = match response.body().content_length() {
+			Some(file_size) => file_size,
+
+			None if allow_missing_content_length => 0,
+
+			None => {
+				anyhow::bail!("HTTP response has no Content-Length header");
+			}
+		};
+
+		if metadata_tx.send_blocking(file_size).is_err() {
+			return Ok(());
+		}
+
+		drop(metadata_tx);
+
+		let mut reader = response.into_body().into_reader();
+		let mut buffer = [0_u8; IO_BUFFER_SIZE];
+
+		loop {
+			let count = reader.read(&mut buffer).with_context(|| {
+				format!(
+					"failed while reading HTTP response body \
+						 from \"{url}\""
+				)
+			})?;
+
+			if count == 0 {
+				break;
+			}
+
+			let chunk = buffer[..count].to_vec();
+
+			if chunk_tx.send_blocking(chunk).is_err() {
+				return Ok(());
+			}
+		}
+
+		Ok(())
+	});
+
+	let file_size = match metadata_rx.recv().await {
+		Ok(file_size) => file_size,
+
+		Err(_) => {
+			worker.await?;
+
+			anyhow::bail!("HTTP worker stopped before providing response metadata");
+		}
+	};
+
+	Ok(DownloadStream {
+		file_size,
+		chunks: chunk_rx,
+		worker,
+	})
+}
+
+/// Downloads a response into memory.
+///
+/// This fails if the server does not provide a Content-Length header.
+pub async fn get(mut params: GetParams<'_>) -> anyhow::Result<HttpClientResponse> {
+	let DownloadStream {
+		file_size,
+		chunks,
+		worker,
+	} = start_download(params.url, false).await?;
+
+	let initial_capacity = usize::try_from(file_size).unwrap_or(0).min(MAX_INITIAL_ALLOCATION);
+
+	let mut data = Vec::with_capacity(initial_capacity);
+	let mut bytes_downloaded = 0_u64;
+
+	while let Ok(chunk) = chunks.recv().await {
+		bytes_downloaded += chunk.len() as u64;
+		data.extend_from_slice(&chunk);
+
+		if let Some(on_progress) = params.on_progress.as_mut() {
+			on_progress(ProgressFuncData {
+				bytes_downloaded,
+				file_size,
+			});
+		}
+	}
+
+	worker.await?;
+
+	if bytes_downloaded != file_size {
+		anyhow::bail!(
+			"HTTP response size mismatch: expected {} bytes, received {}",
+			file_size,
+			bytes_downloaded,
+		);
+	}
+
+	Ok(HttpClientResponse { data })
+}
+
+/// Downloads a response directly to a file.
+///
+/// Unlike `get`, this permits responses without a Content-Length header. In
+/// that case, `ProgressFuncData::file_size` is zero.
+///
+/// An existing file is truncated. If the download fails after the file is
+/// created, a partial file may remain at `path`.
+pub async fn download_to_file(mut params: GetParams<'_>, path: impl AsRef<Path>) -> anyhow::Result<()> {
+	let path = path.as_ref().to_owned();
+
+	let DownloadStream {
+		file_size,
+		chunks,
+		worker,
+	} = start_download(params.url, true).await?;
+
+	let mut file = smol::fs::File::create(&path)
+		.await
+		.with_context(|| format!("failed to create download file {:?}", path,))?;
+
+	let mut bytes_downloaded = 0_u64;
+
+	while let Ok(chunk) = chunks.recv().await {
+		file
+			.write_all(&chunk)
+			.await
+			.with_context(|| format!("failed to write download file {:?}", path,))?;
+
+		bytes_downloaded += chunk.len() as u64;
+
+		if let Some(on_progress) = params.on_progress.as_mut() {
+			on_progress(ProgressFuncData {
+				bytes_downloaded,
+				file_size,
+			});
+		}
+	}
+
+	worker.await?;
+
+	file
+		.flush()
+		.await
+		.with_context(|| format!("failed to flush download file {:?}", path,))?;
+
+	if file_size != 0 && bytes_downloaded != file_size {
+		anyhow::bail!(
+			"HTTP response size mismatch: expected {} bytes, received {}",
+			file_size,
+			bytes_downloaded,
+		);
+	}
+
+	Ok(())
+}
+
+pub async fn get_simple(url: &str) -> anyhow::Result<HttpClientResponse> {
+	get(GetParams { url, on_progress: None }).await
+}
diff --git a/dash-frontend/src/util/networking/image_fetch.rs b/dash-frontend/src/util/networking/image_fetch.rs
new file mode 100644
index 00000000..91039cd3
--- /dev/null
+++ b/dash-frontend/src/util/networking/image_fetch.rs
@@ -0,0 +1,11 @@
+use std::rc::Rc;
+
+use wgui::{globals::WguiGlobals, renderer_vk::text::custom_glyph::CustomGlyphData};
+
+use crate::util::networking::http_client;
+
+pub async fn fetch_to_glyph_data(globals: &WguiGlobals, url: &str) -> anyhow::Result<(CustomGlyphData, Rc<Vec<u8>>)> {
+	let res = http_client::get_simple(url).await?;
+	let glyph_data = CustomGlyphData::from_bytes_raster(globals, url, &res.data)?;
+	Ok((glyph_data, Rc::new(res.data)))
+}
diff --git a/dash-frontend/src/util/networking/mod.rs b/dash-frontend/src/util/networking/mod.rs
new file mode 100644
index 00000000..3c83a713
--- /dev/null
+++ b/dash-frontend/src/util/networking/mod.rs
@@ -0,0 +1,6 @@
+pub mod http_client;
+pub mod image_fetch;
+pub mod skymap_catalog;
+
+// pub const WAYVR_ROOT_URL: &str = "https://wayvr.org";
+pub const WAYVR_SKYMAPS_ROOT: &str = "https://wayvr.org/skymaps";
diff --git a/dash-frontend/src/util/networking/skymap_catalog.rs b/dash-frontend/src/util/networking/skymap_catalog.rs
new file mode 100644
index 00000000..44f21a45
--- /dev/null
+++ b/dash-frontend/src/util/networking/skymap_catalog.rs
@@ -0,0 +1,189 @@
+use crate::util::networking::{self, WAYVR_SKYMAPS_ROOT, http_client};
+use serde::{Deserialize, Serialize};
+use std::path::PathBuf;
+use wlx_common::config_io;
+pub type SkymapUuid = uuid::Uuid;
+
+#[derive(Copy, Clone, Serialize, Deserialize, Debug)]
+pub enum SkymapResolution {
+	Res2k,
+	Res4k,
+	Res8k,
+}
+
+impl SkymapResolution {
+	pub const fn get_display_str(&self) -> &'static str {
+		match self {
+			SkymapResolution::Res2k => "2K (2 MiB VRAM)",
+			SkymapResolution::Res4k => "4K (8 MiB VRAM)",
+			SkymapResolution::Res8k => "8K (33 MiB VRAM)",
+		}
+	}
+
+	pub const fn get_display_str_simple(&self) -> &'static str {
+		match self {
+			SkymapResolution::Res2k => "2K",
+			SkymapResolution::Res4k => "4K",
+			SkymapResolution::Res8k => "8K",
+		}
+	}
+
+	pub fn from_display_str_simple(text: &str) -> Option<SkymapResolution> {
+		match text {
+			"2K" => Some(SkymapResolution::Res2k),
+			"4K" => Some(SkymapResolution::Res4k),
+			"8K" => Some(SkymapResolution::Res8k),
+			_ => None,
+		}
+	}
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct SkymapCatalogEntryFiles {
+	pub size_8k: Option<String>, // "my_skymap_8k.dds"
+	pub size_4k: Option<String>, // "my_skymap_4k.dds"
+	pub size_2k: String,         // we should have *at least* this
+	pub preview: String,
+}
+
+impl SkymapCatalogEntryFiles {
+	pub fn get_url_preview(&self) -> String {
+		format!("{}/files/{}", WAYVR_SKYMAPS_ROOT, self.preview)
+	}
+
+	pub fn get_filename_from_res(&self, res: SkymapResolution) -> Option<String> {
+		match res {
+			SkymapResolution::Res2k => Some(&self.size_2k),
+			SkymapResolution::Res4k => self.size_4k.as_ref(),
+			SkymapResolution::Res8k => self.size_8k.as_ref(),
+		}
+		.map(|raw_filename| {
+			// sanitize filename, do not allow "../" just in case
+			PathBuf::from(raw_filename)
+				.file_name()
+				.map(|s| String::from(s.to_string_lossy()))
+		})?
+	}
+
+	// example result: "https://wayvr.org/skymaps/files/my_skymap_8k.dds"
+	pub fn get_url_from_res(&self, res: SkymapResolution) -> Option<String> {
+		let filename = self.get_filename_from_res(res)?;
+		Some(format!("{}/files/{}", WAYVR_SKYMAPS_ROOT, filename))
+	}
+
+	pub fn get_preview_path(&self) -> PathBuf {
+		config_io::get_skymaps_root().join(&self.preview)
+	}
+
+	pub fn save_preview_to_file(&self, data: &[u8]) -> anyhow::Result<()> {
+		std::fs::write(self.get_preview_path(), data)?;
+		Ok(())
+	}
+
+	pub fn remove_preview_file(&self) {
+		let _dont_care = std::fs::remove_file(self.get_preview_path());
+	}
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct SkymapCatalogEntry {
+	pub uuid: SkymapUuid,
+	pub created_at: String,
+	pub modified_at: String,
+	pub version: u32,
+	pub name: String,
+	pub description: String,
+	pub author: String,
+	pub files: SkymapCatalogEntryFiles,
+}
+
+impl SkymapCatalogEntry {
+	pub fn get_destination_path(&self, resolution: SkymapResolution) -> Option<PathBuf> {
+		let filename = self.files.get_filename_from_res(resolution)?;
+		Some(config_io::get_skymaps_root().join(filename))
+	}
+
+	pub fn get_destination_metadata_path(&self) -> PathBuf {
+		config_io::get_skymaps_root().join(format!("{}.json", self.uuid))
+	}
+
+	pub fn is_downloaded(&self, resolution: SkymapResolution) -> anyhow::Result<bool> {
+		let Some(full_path) = self.get_destination_path(resolution) else {
+			return Ok(false);
+		};
+
+		Ok(std::fs::exists(full_path)?)
+	}
+
+	pub fn has_any_downloaded(&self) -> bool {
+		self.is_downloaded(SkymapResolution::Res2k).unwrap_or(false)
+			|| self.is_downloaded(SkymapResolution::Res4k).unwrap_or(false)
+			|| self.is_downloaded(SkymapResolution::Res8k).unwrap_or(false)
+	}
+
+	pub fn remove_file(&self, resolution: SkymapResolution) {
+		let Some(full_path) = self.get_destination_path(resolution) else {
+			return;
+		};
+
+		let _dont_care = std::fs::remove_file(full_path);
+	}
+
+	pub fn save_metadata(&self) -> anyhow::Result<()> {
+		let json = serde_json::to_string_pretty(self)?;
+		std::fs::write(self.get_destination_metadata_path(), json)?;
+		Ok(())
+	}
+
+	pub fn remove_metadata(&self) {
+		let _dont_care = std::fs::remove_file(self.get_destination_metadata_path());
+	}
+}
+
+#[derive(Clone, Debug, Deserialize)]
+pub struct SkymapCatalog {
+	pub version: u32,
+	pub r#type: String,
+	pub entries: Vec<SkymapCatalogEntry>,
+}
+
+impl SkymapCatalog {
+	fn validate(&self) -> anyhow::Result<()> {
+		if self.version != 1 {
+			anyhow::bail!("Unsupported version");
+		}
+
+		if self.r#type != "wayvr_skymaps" {
+			anyhow::bail!("Unsupported type");
+		}
+		Ok(())
+	}
+}
+
+pub async fn request_catalog() -> anyhow::Result<SkymapCatalog> {
+	log::info!("Fetching skymap list");
+
+	let res = http_client::get_simple(&format!("{}/catalog.json", networking::WAYVR_SKYMAPS_ROOT)).await?;
+	let catalog = res.into_json::<SkymapCatalog>()?;
+	catalog.validate()?;
+
+	Ok(catalog)
+}
+
+pub fn get_entries_from_disk() -> anyhow::Result<Vec<SkymapCatalogEntry>> {
+	let mut entries = Vec::<SkymapCatalogEntry>::new();
+
+	let skymaps_root = config_io::get_skymaps_root();
+
+	for uuid in config_io::get_skymaps_uuids().unwrap_or_default() {
+		let metadata_path = skymaps_root.join(format!("{}.json", uuid));
+		let Ok(data) = std::fs::read_to_string(metadata_path) else {
+			continue;
+		};
+
+		let entry = serde_json::from_str::<SkymapCatalogEntry>(&data)?;
+		entries.push(entry);
+	}
+
+	Ok(entries)
+}
diff --git a/dash-frontend/src/util/openxr_bindings.rs b/dash-frontend/src/util/openxr_bindings.rs
new file mode 100644
index 00000000..bb4e420e
--- /dev/null
+++ b/dash-frontend/src/util/openxr_bindings.rs
@@ -0,0 +1,126 @@
+use std::rc::Rc;
+
+use anyhow::{Context, bail};
+use serde::{Deserialize, Serialize};
+use strum::{AsRefStr, EnumProperty, EnumString};
+use wgui::i18n::Translation;
+use wlx_common::openxr_bindings_schema::{XrInputComponent, XrInputSide, XrInputSubpathKind};
+
+#[derive(Default, Debug, Clone, Copy, Serialize, Deserialize, PartialEq, EnumString, AsRefStr, EnumProperty)]
+#[strum(ascii_case_insensitive, serialize_all = "snake_case")]
+pub enum ClickType {
+	#[default]
+	#[strum(props(Translation = "APP_SETTINGS.BINDINGS.CLICK.ANY"))]
+	Any,
+	#[strum(props(Translation = "APP_SETTINGS.BINDINGS.CLICK.DOUBLE"))]
+	Double,
+	#[strum(props(Translation = "APP_SETTINGS.BINDINGS.CLICK.TRIPLE"))]
+	Triple,
+}
+
+pub trait BindingsDropdown {
+	fn translation(&self) -> Translation;
+	fn action_str(&self, action: &str, side: XrInputSide) -> Rc<str>;
+	fn clear_str(action: &str, side: XrInputSide) -> Option<Rc<str>>;
+}
+
+impl BindingsDropdown for ClickType {
+	fn translation(&self) -> Translation {
+		self
+			.get_str("Translation")
+			.map(Translation::from_translation_key)
+			.or_else(|| self.get_str("Text").map(Translation::from_raw_text))
+			.unwrap_or_else(|| Translation::from_raw_text(self.as_ref()))
+	}
+	fn action_str(&self, action: &str, _side: XrInputSide) -> Rc<str> {
+		let value = self.as_ref();
+		format!("click;{action};-;{value}").into()
+	}
+	fn clear_str(_action: &str, _side: XrInputSide) -> Option<Rc<str>> {
+		None
+	}
+}
+
+impl BindingsDropdown for XrInputSubpathKind {
+	fn translation(&self) -> Translation {
+		self
+			.get_str("Translation")
+			.map(Translation::from_translation_key)
+			.unwrap_or_else(|| {
+				let mut chars = self.as_ref().chars();
+				let capitalized = match chars.next() {
+					None => String::new(),
+					Some(first) => first.to_ascii_uppercase().to_string() + chars.as_str(),
+				};
+				Translation::from_raw_text(&capitalized)
+			})
+	}
+	fn action_str(&self, action: &str, side: XrInputSide) -> Rc<str> {
+		let value = self.as_ref();
+		let side = side.as_ref();
+		format!("subpath;{action};{side};{value}").into()
+	}
+	fn clear_str(action: &str, side: XrInputSide) -> Option<Rc<str>> {
+		let side = side.as_ref();
+		Some(format!("clear;{action};{side};-").into())
+	}
+}
+
+impl BindingsDropdown for XrInputComponent {
+	fn translation(&self) -> Translation {
+		self
+			.get_str("Translation")
+			.map(Translation::from_translation_key)
+			.or_else(|| self.get_str("Text").map(Translation::from_raw_text))
+			.unwrap_or_else(|| Translation::from_raw_text(self.as_ref()))
+	}
+	fn action_str(&self, action: &str, side: XrInputSide) -> Rc<str> {
+		let value = self.as_ref();
+		let side = side.as_ref();
+		format!("comp;{action};{side};{value}").into()
+	}
+	fn clear_str(_action: &str, _side: XrInputSide) -> Option<Rc<str>> {
+		None
+	}
+}
+
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub struct ParsedOpenXrInputPath {
+	pub side: XrInputSide,
+	pub subpath: XrInputSubpathKind,
+	pub component: XrInputComponent,
+}
+
+impl TryFrom<&str> for ParsedOpenXrInputPath {
+	type Error = anyhow::Error;
+
+	fn try_from(path: &str) -> anyhow::Result<Self> {
+		let (side, rest) = if let Some(rest) = path.strip_prefix("/user/hand/left/") {
+			(XrInputSide::Left, rest)
+		} else if let Some(rest) = path.strip_prefix("/user/hand/right/") {
+			(XrInputSide::Right, rest)
+		} else {
+			bail!("missing hand prefix");
+		};
+
+		let (input, rest) = rest.split_once('/').context("path too short")?;
+		if input != "input" {
+			bail!("missing input prefix");
+		}
+
+		let (identifier, component) = rest.rsplit_once('/').context("missing identifier or component")?;
+
+		if identifier.is_empty() || component.is_empty() {
+			bail!("identifier or component empty");
+		}
+
+		let component = XrInputComponent::try_from(component).context("bad component")?;
+		let subpath = XrInputSubpathKind::try_from(identifier).context("bad subpath")?;
+
+		Ok(Self {
+			side,
+			subpath,
+			component,
+		})
+	}
+}
diff --git a/dash-frontend/src/util/popup_manager.rs b/dash-frontend/src/util/popup_manager.rs
index ff46f515..d2160455 100644
--- a/dash-frontend/src/util/popup_manager.rs
+++ b/dash-frontend/src/util/popup_manager.rs
@@ -11,12 +11,15 @@ use wgui::{
 	i18n::Translation,
 	layout::{Layout, LayoutTask, LayoutTasks, WidgetID},
 	parser::{Fetchable, ParseDocumentParams, ParserState},
-	taffy::Display,
+	taffy::Rect,
 	widget::label::WidgetLabel,
 };
 use wlx_common::config::GeneralConfig;
 
-use crate::frontend::{FrontendTask, FrontendTasks};
+use crate::{
+	frontend::{FrontendTask, FrontendTasks},
+	views::{ViewTrait, ViewUpdateParams},
+};
 
 pub struct PopupManagerParams {
 	pub parent_id: WidgetID,
@@ -34,15 +37,136 @@ pub struct MountedPopup {
 	frontend_tasks: FrontendTasks,
 }
 
+#[derive(Default)]
 struct MountedPopupState {
 	mounted_popup: Option<MountedPopup>,
+	closed_callback: Option<PopupClosedCallback>,
 }
 
-#[derive(Clone)]
+#[derive(Default, Clone)]
 pub struct PopupHandle {
 	state: Rc<RefCell<MountedPopupState>>,
 }
 
+struct PopupHolderState<ViewType: ViewTrait> {
+	popup_handle: PopupHandle,
+	view: Option<ViewType>,
+	on_view_close: Option<Box<dyn FnOnce()>>,
+}
+
+// we can't use #[derive(Default)] due to the fact that ViewType can't be Default.
+impl<ViewType: ViewTrait> Default for PopupHolderState<ViewType> {
+	fn default() -> Self {
+		Self {
+			popup_handle: Default::default(),
+			view: None,
+			on_view_close: None,
+		}
+	}
+}
+
+pub struct PopupHolder<ViewType: ViewTrait> {
+	state: Rc<RefCell<PopupHolderState<ViewType>>>,
+}
+
+impl<ViewType: ViewTrait> Default for PopupHolder<ViewType> {
+	fn default() -> Self {
+		Self {
+			state: Rc::new(RefCell::new(PopupHolderState::default())),
+		}
+	}
+}
+
+impl<ViewType: ViewTrait> PopupHolderState<ViewType> {
+	fn close(&mut self) {
+		if self.view.is_some() {
+			self.view = None;
+			if let Some(on_close) = self.on_view_close.take() {
+				on_close();
+			}
+		}
+		self.popup_handle.close();
+	}
+}
+
+impl<ViewType: ViewTrait> Drop for PopupHolderState<ViewType> {
+	fn drop(&mut self) {
+		self.close();
+	}
+}
+
+// we can't derive(Clone) due to the fact that ViewType is non-cloneable
+impl<ViewType: ViewTrait> Clone for PopupHolder<ViewType> {
+	fn clone(&self) -> Self {
+		Self {
+			state: self.state.clone(),
+		}
+	}
+}
+
+impl<ViewType: ViewTrait> PopupHolder<ViewType> {
+	pub fn update(&self, par: &mut ViewUpdateParams) -> anyhow::Result<()> {
+		let mut state = self.state.borrow_mut();
+		let Some(view) = &mut state.view else {
+			return Ok(());
+		};
+
+		view.update(par)
+	}
+
+	pub fn set_view(&self, handle: PopupHandle, view: ViewType, on_view_close: Option<Box<dyn FnOnce()>>) {
+		let mut state = self.state.borrow_mut();
+		state.view = Some(view);
+		state.popup_handle = handle;
+		state.on_view_close = on_view_close;
+	}
+
+	// Get underlying ViewType object in a closure and return its value
+	// example usage:
+	//
+	// ```rs
+	// holder.with_view(|view| {
+	//   view.foo();
+	// })
+	// ```
+	//
+	pub fn with_view<F, R>(&self, f: F) -> Option<R>
+	where
+		F: FnOnce(&mut ViewType) -> R,
+	{
+		let mut state = self.state.borrow_mut();
+		state.view.as_mut().map(f)
+	}
+
+	// Same as with_view, but the closure expects a simple anyhow::Result<()> type
+	pub fn with_view_res<F>(&self, f: F) -> anyhow::Result<()>
+	where
+		F: FnOnce(&mut ViewType) -> anyhow::Result<()>,
+	{
+		if let Some(res) = self.with_view(f) {
+			return res;
+		}
+		Ok(())
+	}
+
+	pub fn get_close_callback(&self, layout: &Layout) -> Box<dyn FnOnce()>
+	where
+		ViewType: 'static,
+	{
+		let layout_tasks = layout.tasks.clone();
+		let weak_state = Rc::downgrade(&self.state);
+		Box::new(move || {
+			// we can't borrow State here yet, dispatch it.
+			layout_tasks.push(LayoutTask::Dispatch(Box::new(move |_common| {
+				if let Some(state) = weak_state.upgrade() {
+					state.borrow_mut().close();
+				}
+				Ok(())
+			})));
+		})
+	}
+}
+
 impl PopupHandle {
 	pub fn close(&self) {
 		self.state.borrow_mut().mounted_popup = None; // Drop will be called
@@ -61,10 +185,38 @@ pub struct PopupContentFuncData<'a> {
 	pub id_content: WidgetID,
 }
 
+type PopupClosedCallback = Box<dyn FnOnce()>;
+type OnContentCallback = Box<dyn FnOnce(PopupContentFuncData) -> anyhow::Result<PopupClosedCallback>>;
+
+#[derive(Clone, Default)]
+pub enum PopupPadding {
+	#[default]
+	Normal,
+	None,
+}
+
+#[derive(Default, Clone)]
+pub struct MountPopupOnceParamsExtra {
+	pub padding: PopupPadding,
+}
+
+// we need to implement Clone here, but the underlying function can be called only once.
+// on_content will be cleared after the first call
 #[derive(Clone)]
-pub struct MountPopupParams {
-	pub title: Translation,
-	pub on_content: Rc<dyn Fn(PopupContentFuncData) -> anyhow::Result<()>>,
+pub struct MountPopupOnceParams {
+	title: Translation,
+	on_content: Rc<RefCell<Option<OnContentCallback>>>,
+	extra: MountPopupOnceParamsExtra,
+}
+
+impl MountPopupOnceParams {
+	pub fn new(title: Translation, on_content: OnContentCallback, extra: MountPopupOnceParamsExtra) -> Self {
+		Self {
+			title,
+			on_content: Rc::new(RefCell::new(Some(on_content))),
+			extra,
+		}
+	}
 }
 
 impl Drop for MountedPopup {
@@ -78,25 +230,23 @@ impl State {
 	fn refresh_stack(&mut self, alterables: &mut EventAlterables) {
 		// show only the topmost popup
 		self.popup_stack.retain(|weak| {
-			let Some(popup) = weak.upgrade() else {
-				return false;
+			let retain = {
+				let Some(popup) = weak.upgrade() else {
+					return false;
+				};
+				popup.borrow_mut().mounted_popup.is_some()
 			};
-			popup.borrow_mut().mounted_popup.is_some()
+			if !retain {
+				log::debug!("removing popup from popup_stack");
+			}
+			retain
 		});
 
 		for (idx, popup) in self.popup_stack.iter().enumerate() {
 			let popup = popup.upgrade().unwrap(); // safe
 			let popup = popup.borrow_mut();
 			let mounted_popup = popup.mounted_popup.as_ref().unwrap(); // safe;
-
-			alterables.set_style(
-				mounted_popup.id_root,
-				StyleSetRequest::Display(if idx == self.popup_stack.len() - 1 {
-					Display::Flex
-				} else {
-					Display::None
-				}),
-			);
+			alterables.set_widget_visible(mounted_popup.id_root, idx == self.popup_stack.len() - 1);
 		}
 	}
 }
@@ -116,16 +266,14 @@ impl PopupManager {
 		state.refresh_stack(alterables);
 	}
 
-	/// Mount a new popup on top of the existing popup stack.
-	/// Only the topmost popup is visible.
-	pub fn mount_popup(
-		&mut self,
-		globals: WguiGlobals,
+	fn mount_popup_prepare(
+		&self,
+		globals: &WguiGlobals,
 		layout: &mut Layout,
-		frontend_tasks: FrontendTasks,
-		params: MountPopupParams,
-		config: &GeneralConfig,
-	) -> anyhow::Result<()> {
+		frontend_tasks: &FrontendTasks,
+		popup_title: &Translation,
+		popup_padding: PopupPadding,
+	) -> anyhow::Result<(PopupHandle, WidgetID /* content widget ID */)> {
 		let doc_params = &ParseDocumentParams {
 			globals: globals.clone(),
 			path: AssetPath::BuiltIn("gui/view/popup_window.xml"),
@@ -136,9 +284,19 @@ impl PopupManager {
 		let id_root = state.get_widget_id("root")?;
 		let id_content = state.get_widget_id("content")?;
 
+		let padding = match popup_padding {
+			PopupPadding::Normal => 16.0,
+			PopupPadding::None => 0.0,
+		};
+
+		layout.tasks.push(LayoutTask::SetWidgetStyle(
+			id_content,
+			StyleSetRequest::Padding(Rect::length(padding)),
+		));
+
 		{
 			let mut label_title = state.fetch_widget_as::<WidgetLabel>(&layout.state, "popup_title")?;
-			label_title.set_text_simple(&mut globals.get(), params.title);
+			label_title.set_text_simple(&mut globals.get(), popup_title.clone());
 		}
 
 		let but_back = state.fetch_component_as::<ComponentButton>("but_back")?;
@@ -152,6 +310,7 @@ impl PopupManager {
 
 		let mounted_popup_state = MountedPopupState {
 			mounted_popup: Some(mounted_popup),
+			closed_callback: None,
 		};
 
 		let popup_handle = PopupHandle {
@@ -159,28 +318,57 @@ impl PopupManager {
 		};
 
 		let mut state = self.state.borrow_mut();
+		log::debug!("pushing popup to popup_stack");
 		state.popup_stack.push(Rc::downgrade(&popup_handle.state));
 
 		but_back.on_click({
 			let popup_handle = Rc::downgrade(&popup_handle.state);
 			Rc::new(move |_common, _evt| {
-				if let Some(popup_handle) = popup_handle.upgrade() {
-					popup_handle.borrow_mut().mounted_popup = None; // will call Drop
+				if let Some(popup_handle) = popup_handle.upgrade()
+					&& let Some(closed_callback) = {
+						let mut state = popup_handle.borrow_mut();
+						state.mounted_popup = None; // will call Drop
+						state.closed_callback.take()
+					} {
+					log::debug!("closed_callback called");
+					closed_callback();
 				}
 				Ok(())
 			})
 		});
 
 		frontend_tasks.push(FrontendTask::RefreshPopupManager);
+		Ok((popup_handle, id_content))
+	}
+
+	/// Mount a new popup on top of the existing popup stack.
+	/// Only the topmost popup is visible.
+	pub fn mount_popup_once(
+		&mut self,
+		globals: &WguiGlobals,
+		layout: &mut Layout,
+		frontend_tasks: &FrontendTasks,
+		params: MountPopupOnceParams,
+		config: &GeneralConfig,
+	) -> anyhow::Result<()> {
+		let mut func = params.on_content.borrow_mut();
+		let Some(on_content_func) = func.take() else {
+			anyhow::bail!("mount_popup_once called more than once");
+		};
+
+		let (popup_handle, id_content) =
+			self.mount_popup_prepare(globals, layout, frontend_tasks, &params.title, params.extra.padding)?;
 
 		// mount user-set popup content
-		(*params.on_content)(PopupContentFuncData {
+		let closed_callback = on_content_func(PopupContentFuncData {
 			layout,
 			handle: popup_handle.clone(),
 			id_content,
 			config,
 		})?;
 
+		popup_handle.state.borrow_mut().closed_callback = Some(closed_callback);
+
 		Ok(())
 	}
 }
diff --git a/dash-frontend/src/util/steam_utils.rs b/dash-frontend/src/util/steam_utils.rs
index a2c6e778..56ce0bb6 100644
--- a/dash-frontend/src/util/steam_utils.rs
+++ b/dash-frontend/src/util/steam_utils.rs
@@ -2,6 +2,7 @@ use keyvalues_parser::{Obj, Vdf};
 use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
 
+#[derive(Clone)]
 pub struct SteamUtils {
 	steam_root: PathBuf,
 }
@@ -55,6 +56,8 @@ fn vdf_parse_libraryfolders<'a>(vdf_root: &'a Vdf<'a>) -> Option<Vec<AppEntry>>
 	let mut res = Vec::<AppEntry>::new();
 
 	let mut num = 0;
+
+	#[allow(clippy::while_let_loop)]
 	loop {
 		let Some(library_folder) = get_obj_first(obj_libraryfolders, format!("{}", num).as_str()) else {
 			// no more libraries to find
@@ -292,7 +295,7 @@ impl SteamUtils {
 				games.sort_by(|a, b| b.name.cmp(&a.name));
 			}
 			GameSortMethod::PlayDateDesc => {
-				games.sort_by(|a, b| b.last_played.cmp(&a.last_played));
+				games.sort_by_key(|b| std::cmp::Reverse(b.last_played));
 			}
 		}
 
diff --git a/dash-frontend/src/util/toast_manager.rs b/dash-frontend/src/util/toast_manager.rs
index b5128957..176bc937 100644
--- a/dash-frontend/src/util/toast_manager.rs
+++ b/dash-frontend/src/util/toast_manager.rs
@@ -1,10 +1,9 @@
-use std::{cell::RefCell, collections::VecDeque, rc::Rc};
-
 use glam::{Mat4, Vec3};
+use std::{cell::RefCell, collections::VecDeque, rc::Rc};
 use wgui::{
 	animation::{Animation, AnimationEasing},
+	color::{WguiColor, WguiColorName},
 	components::tooltip::{TOOLTIP_BORDER_COLOR, TOOLTIP_COLOR},
-	drawing::Color,
 	i18n::Translation,
 	layout::{Layout, LayoutTask, LayoutTasks, WidgetID},
 	renderer_vk::{
@@ -69,8 +68,8 @@ impl ToastManager {
 					width: percent(1.0),
 					height: percent(0.8),
 				},
-				align_items: Some(taffy::AlignItems::End),
-				justify_content: Some(taffy::JustifyContent::Center),
+				align_items: Some(taffy::AlignItems::END),
+				justify_content: Some(taffy::JustifyContent::CENTER),
 				..Default::default()
 			},
 		)?;
@@ -78,8 +77,8 @@ impl ToastManager {
 		let (rect, _) = layout.add_child(
 			root.id,
 			WidgetRectangle::create(WidgetRectangleParams {
-				color: TOOLTIP_COLOR,
-				border_color: TOOLTIP_BORDER_COLOR,
+				color: TOOLTIP_COLOR.into(),
+				border_color: TOOLTIP_BORDER_COLOR.into(),
 				border: 2.0,
 				round: WLength::Percent(1.0),
 				..Default::default()
@@ -111,6 +110,7 @@ impl ToastManager {
 					wrap: true,
 					..Default::default()
 				},
+				..Default::default()
 			},
 		);
 		let (label, _) = layout.add_child(rect.id, label, taffy::Style { ..Default::default() })?;
@@ -132,11 +132,15 @@ impl ToastManager {
 				}
 
 				let rect = data.obj.get_as_mut::<WidgetRectangle>().unwrap();
-				rect.params.color.a = opacity;
-				rect.params.border_color.a = opacity;
+				rect.params.color = rect.params.color.with_alpha(opacity);
+				rect.params.border_color = rect.params.border_color.with_alpha(opacity);
 
 				let mut label = common.state.widgets.get_as::<WidgetLabel>(label.id).unwrap();
-				label.set_color(common, Color::new(1.0, 1.0, 1.0, opacity), true);
+				label.set_color(
+					common,
+					WguiColor::from(WguiColorName::OnBackgroundVariant).with_alpha(opacity),
+					true,
+				);
 				common.alterables.mark_redraw();
 			}),
 		));
diff --git a/dash-frontend/src/util/wgui_simple.rs b/dash-frontend/src/util/wgui_simple.rs
index 44dad5ee..962daed3 100644
--- a/dash-frontend/src/util/wgui_simple.rs
+++ b/dash-frontend/src/util/wgui_simple.rs
@@ -1,12 +1,52 @@
+use glam::{Mat4, Vec2};
 use wgui::{
+	animation::{Animation, AnimationEasing},
+	assets::AssetPath,
+	color::WguiColorName,
+	components::{self, button::ButtonClickCallback},
 	i18n::Translation,
-	layout::{Layout, WidgetID},
-	renderer_vk::text::TextStyle,
-	widget::label::{WidgetLabel, WidgetLabelParams},
+	layout::{Layout, LayoutTask, WidgetID},
+	parser::{Fetchable, ParseDocumentParams},
+	renderer_vk::{
+		text::{FontWeight, TextStyle, custom_glyph::CustomGlyphData},
+		util::centered_matrix,
+	},
+	taffy::{self, prelude::length},
+	widget::{
+		ConstructEssentials,
+		label::{WidgetLabel, WidgetLabelParams},
+		sprite::{WidgetSprite, WidgetSpriteParams},
+	},
 };
 
+pub struct CreateButtonParams<'a> {
+	pub id_parent: WidgetID,
+	pub layout: &'a mut Layout,
+	pub content: Translation,
+	pub icon_builtin: AssetPath<'a>,
+	pub on_click: ButtonClickCallback,
+}
+
+pub fn create_button(par: CreateButtonParams) -> anyhow::Result<()> {
+	let (_, button) = components::button::construct(
+		&mut ConstructEssentials {
+			layout: par.layout,
+			parent: par.id_parent,
+		},
+		components::button::Params {
+			text: Some(par.content),
+			sprite_src: Some(par.icon_builtin),
+			..Default::default()
+		},
+	)?;
+
+	button.on_click(par.on_click);
+
+	Ok(())
+}
+
 #[allow(dead_code)]
-pub fn create_label(layout: &mut Layout, parent: WidgetID, content: Translation) -> anyhow::Result<()> {
+pub fn create_label(layout: &mut Layout, id_parent: WidgetID, content: Translation) -> anyhow::Result<()> {
 	let label = WidgetLabel::create(
 		&mut layout.state,
 		WidgetLabelParams {
@@ -15,6 +55,27 @@ pub fn create_label(layout: &mut Layout, parent: WidgetID, content: Translation)
 				wrap: true,
 				..Default::default()
 			},
+			..Default::default()
+		},
+	);
+
+	layout.add_child(id_parent, label, Default::default())?;
+
+	Ok(())
+}
+
+pub fn create_label_error(layout: &mut Layout, parent: WidgetID, content: String) -> anyhow::Result<()> {
+	let label = WidgetLabel::create(
+		&mut layout.state,
+		WidgetLabelParams {
+			content: Translation::from_raw_text_string(content),
+			style: TextStyle {
+				wrap: true,
+				color: Some(WguiColorName::Danger.into()),
+				weight: Some(FontWeight::Bold),
+				..Default::default()
+			},
+			..Default::default()
 		},
 	);
 
@@ -22,3 +83,80 @@ pub fn create_label(layout: &mut Layout, parent: WidgetID, content: Translation)
 
 	Ok(())
 }
+
+pub fn create_icon(layout: &mut Layout, id_parent: WidgetID, size: Vec2, path: AssetPath) -> anyhow::Result<WidgetID> {
+	let widget_sprite = WidgetSprite::create(WidgetSpriteParams {
+		color: Some(WguiColorName::OnBackground.into()),
+		glyph_data: Some(CustomGlyphData::from_assets(&layout.state.globals, path)?),
+		..Default::default()
+	});
+
+	let size = taffy::Size {
+		width: length(size.x),
+		height: length(size.y),
+	};
+
+	let (widget, _) = layout.add_child(
+		id_parent,
+		widget_sprite,
+		taffy::Style {
+			min_size: size,
+			max_size: size,
+			size,
+			..Default::default()
+		},
+	)?;
+
+	Ok(widget.id)
+}
+
+pub struct CreateLoadingParams<'a> {
+	pub layout: &'a mut Layout,
+	pub parent_id: WidgetID,
+	pub with_text: bool,
+}
+
+pub fn create_loading(par: CreateLoadingParams) -> anyhow::Result<WidgetID> {
+	let doc_params = ParseDocumentParams {
+		globals: par.layout.state.globals.clone(),
+		path: AssetPath::BuiltIn("gui/t_loading.xml"),
+		extra: Default::default(),
+	};
+
+	let mut parser_state = wgui::parser::parse_from_assets(&doc_params, par.layout, par.parent_id)?;
+
+	let data = parser_state.realize_template(
+		&doc_params,
+		if par.with_text {
+			"LoadingWithText"
+		} else {
+			"LoadingWithoutText"
+		},
+		par.layout,
+		par.parent_id,
+		Default::default(),
+	)?;
+
+	let id_root = data.get_widget_id("root")?;
+	let id_sprite_loading = data.get_widget_id("sprite_loading")?;
+
+	par.layout.animations.add(Animation::new(
+		id_sprite_loading,
+		60 * 30, /* spin it for 30 seconds at most */
+		AnimationEasing::Linear,
+		Box::new(move |common, data| {
+			// spin it
+			data.data.transform = centered_matrix(data.widget_boundary.size, &Mat4::from_rotation_z(data.pos * 400.0));
+			if data.pos == 1.0 {
+				// remove the spinner, do not waste energy
+				common
+					.alterables
+					.tasks
+					.push(LayoutTask::RemoveWidget(id_sprite_loading));
+			}
+			common.alterables.mark_redraw();
+		}),
+	));
+
+	Ok(id_root)
+}
diff --git a/dash-frontend/src/util/whisper.rs b/dash-frontend/src/util/whisper.rs
new file mode 100644
index 00000000..9ae5a1f3
--- /dev/null
+++ b/dash-frontend/src/util/whisper.rs
@@ -0,0 +1,75 @@
+use std::{fs, io, path::PathBuf};
+
+use wlx_common::data_dir;
+
+pub struct WhisperModel {
+	pub file_name: &'static str,
+	pub display_name: &'static str,
+	pub url: &'static str,
+}
+
+pub const WHISPER_MODELS: &[WhisperModel] = &[
+	WhisperModel {
+		file_name: "ggml-base-q8_0.bin",
+		display_name: "Base Q8 (78MiB)",
+		url: "https://wayvr.org/files/whisper/ggml-base-q8_0.bin",
+	},
+	WhisperModel {
+		file_name: "ggml-small-q8_0.bin",
+		display_name: "Small Q8 (252MiB)",
+		url: "https://wayvr.org/files/whisper/ggml-small-q8_0.bin",
+	},
+	WhisperModel {
+		file_name: "ggml-large-v3-turbo-q5_0.bin",
+		display_name: "Turbo Q5 (574MiB)",
+		url: "https://wayvr.org/files/whisper/ggml-large-v3-turbo-q5_0.bin",
+	},
+	WhisperModel {
+		file_name: "ggml-large-v3-turbo-q8_0.bin",
+		display_name: "Turbo Q8 (874MiB)",
+		url: "https://wayvr.org/files/whisper/ggml-large-v3-turbo-q8_0.bin",
+	},
+	WhisperModel {
+		file_name: "ggml-large-v3-turbo.bin",
+		display_name: "Turbo (1.5GiB)",
+		url: "https://wayvr.org/files/whisper/ggml-large-v3-turbo.bin",
+	},
+];
+
+pub fn whisper_model_from_name(file_name: &str) -> Option<&'static WhisperModel> {
+	WHISPER_MODELS.iter().find(|x| x.file_name == file_name)
+}
+
+pub fn whisper_model_folder() -> PathBuf {
+	data_dir::get_path("whisper")
+}
+
+pub fn whisper_model_path(file_name: &str) -> PathBuf {
+	whisper_model_folder().join(file_name)
+}
+
+pub fn whisper_any_models_downloaded() -> io::Result<bool> {
+	let path = whisper_model_folder();
+	if !path.is_dir() {
+		return Ok(false);
+	}
+	Ok(fs::read_dir(path)?.count() > 0)
+}
+
+pub fn whisper_delete_all_models() -> io::Result<()> {
+	let path = whisper_model_folder();
+	if !path.is_dir() {
+		return Ok(());
+	}
+
+	for entry in fs::read_dir(path)? {
+		let entry = entry?;
+		let file_type = entry.file_type()?;
+
+		if file_type.is_file() || file_type.is_symlink() {
+			fs::remove_file(entry.path())?;
+		}
+	}
+
+	Ok(())
+}
diff --git a/dash-frontend/src/views/app_launcher.rs b/dash-frontend/src/views/app_launcher.rs
index 76c5b524..63d66181 100644
--- a/dash-frontend/src/views/app_launcher.rs
+++ b/dash-frontend/src/views/app_launcher.rs
@@ -1,72 +1,53 @@
 use std::{collections::HashMap, rc::Rc, str::FromStr};
-
-use strum::{AsRefStr, EnumString, VariantNames};
+use strum::VariantNames;
 use wayvr_ipc::packet_client::{PositionMode, WvrProcessLaunchParams};
 use wgui::{
 	assets::AssetPath,
-	components::{button::ComponentButton, checkbox::ComponentCheckbox, radio_group::ComponentRadioGroup},
+	components::{
+		ComponentTrait, button::ComponentButton, checkbox::ComponentCheckbox, radio_group::ComponentRadioGroup,
+	},
 	globals::WguiGlobals,
 	i18n::Translation,
 	layout::{Layout, WidgetID},
-	parser::{Fetchable, ParseDocumentParams, ParserState},
+	parser::{Fetchable, ParseDocumentParams, ParserState, TemplateParams},
 	task::Tasks,
 	widget::label::WidgetLabel,
 };
-use wlx_common::{config::GeneralConfig, dash_interface::BoxDashInterface, desktop_finder::DesktopEntry};
+use wlx_common::{
+	config::{AppCompositorMode, AppOrientationMode, AppPosMode, AppResMode, GeneralConfig, PinnedApp},
+	dash_interface::BoxDashInterface,
+	desktop_finder::DesktopEntry,
+};
 
-use crate::frontend::{FrontendTask, FrontendTasks, SoundType};
-
-#[derive(Clone, Copy, Eq, PartialEq, EnumString, VariantNames, AsRefStr)]
-enum PosMode {
-	Floating,
-	Anchored,
-	Static,
-}
-
-#[derive(Clone, Copy, Eq, PartialEq, EnumString, VariantNames, AsRefStr)]
-enum ResMode {
-	Res1440,
-	Res1080,
-	Res720,
-	Res480,
-}
-
-#[derive(Clone, Copy, Eq, PartialEq, EnumString, VariantNames, AsRefStr)]
-enum OrientationMode {
-	Wide,
-	SemiWide,
-	Square,
-	SemiTall,
-	Tall,
-}
-
-#[derive(Clone, Copy, Eq, PartialEq, EnumString, VariantNames, AsRefStr)]
-enum CompositorMode {
-	Cage,
-	Native,
-}
+use crate::{
+	frontend::{FrontendTask, FrontendTasks, SoundType},
+	util::popup_manager::{MountPopupOnceParams, PopupHolder},
+	views::{ViewTrait, ViewUpdateParams},
+};
 
 #[derive(Clone)]
 enum Task {
-	SetCompositor(CompositorMode),
-	SetRes(ResMode),
-	SetOrientation(OrientationMode),
+	SetCompositor(AppCompositorMode),
+	SetRes(AppResMode),
+	SetOrientation(AppOrientationMode),
 	SetAutoStart(bool),
 	Launch,
+	PinApp,
+	UnpinApp,
 }
 
 struct LaunchParams<'a, T> {
 	application: &'a DesktopEntry,
-	compositor_mode: CompositorMode,
-	pos_mode: PosMode,
-	res_mode: ResMode,
-	orientation_mode: OrientationMode,
+	compositor_mode: AppCompositorMode,
+	pos_mode: AppPosMode,
+	res_mode: AppResMode,
+	orientation_mode: AppOrientationMode,
 	globals: &'a WguiGlobals,
 	frontend_tasks: &'a FrontendTasks,
 	interface: &'a mut BoxDashInterface<T>,
 	auto_start: bool,
 	data: &'a mut T,
-	on_launched: &'a dyn Fn(),
+	on_launched: Option<Box<dyn FnOnce()>>,
 }
 
 pub struct View {
@@ -84,14 +65,17 @@ pub struct View {
 	#[allow(dead_code)]
 	radio_orientation: Rc<ComponentRadioGroup>,
 
-	compositor_mode: CompositorMode,
-	pos_mode: PosMode,
-	res_mode: ResMode,
-	orientation_mode: OrientationMode,
+	compositor_mode: AppCompositorMode,
+	pos_mode: AppPosMode,
+	res_mode: AppResMode,
+	orientation_mode: AppOrientationMode,
+
+	pinned_app: Option<PinnedApp>,
 
 	auto_start: bool,
 
-	on_launched: Box<dyn Fn()>,
+	on_close_request: Option<Box<dyn FnOnce()>>,
+	on_app_pins_changed: Option<Box<dyn Fn()>>,
 }
 
 pub struct Params<'a> {
@@ -101,7 +85,15 @@ pub struct Params<'a> {
 	pub parent_id: WidgetID,
 	pub config: &'a GeneralConfig,
 	pub frontend_tasks: &'a FrontendTasks,
-	pub on_launched: Box<dyn Fn()>,
+	pub on_close_request: Box<dyn FnOnce()>,
+	pub on_app_pins_changed: Box<dyn Fn()>,
+	pub pinned_app: Option<PinnedApp>,
+}
+
+impl ViewTrait for View {
+	fn update(&mut self, _par: &mut ViewUpdateParams) -> anyhow::Result<()> {
+		Ok(())
+	}
 }
 
 impl View {
@@ -121,6 +113,8 @@ impl View {
 		let cb_autostart = state.fetch_component_as::<ComponentCheckbox>("cb_autostart")?;
 
 		let btn_launch = state.fetch_component_as::<ComponentButton>("btn_launch")?;
+		let btn_pin = state.fetch_component_as::<ComponentButton>("btn_pin")?;
+		let btn_unpin = state.fetch_component_as::<ComponentButton>("btn_unpin")?;
 
 		{
 			let mut label_exec = state.fetch_widget_as::<WidgetLabel>(&params.layout.state, "label_exec")?;
@@ -135,12 +129,22 @@ impl View {
 
 		tasks.handle_button(&btn_launch, Task::Launch);
 
+		if params.pinned_app.is_some() {
+			// "Unpin app"
+			tasks.handle_button(&btn_unpin, Task::UnpinApp);
+			params.layout.remove_widget(btn_pin.base().get_id());
+		} else {
+			// "Pin app"
+			tasks.handle_button(&btn_pin, Task::PinApp);
+			params.layout.remove_widget(btn_unpin.base().get_id());
+		}
+
 		let id_icon_parent = state.get_widget_id("icon_parent")?;
 
 		// app icon
 		if let Some(icon_path) = &params.entry.icon_path {
-			let mut template_params: HashMap<Rc<str>, Rc<str>> = HashMap::new();
-			template_params.insert("path".into(), icon_path.clone());
+			let mut template_params = TemplateParams::new();
+			template_params.insert("path", icon_path);
 			state.instantiate_template(
 				doc_params,
 				"ApplicationIcon",
@@ -150,28 +154,35 @@ impl View {
 			)?;
 		}
 
-		let compositor_mode = if params.config.xwayland_by_default {
-			CompositorMode::Cage
-		} else {
-			CompositorMode::Native
+		let compositor_mode = match &params.pinned_app {
+			Some(pinned_app) => pinned_app.compositor_mode,
+			None => {
+				if params.config.xwayland_by_default {
+					AppCompositorMode::Cage
+				} else {
+					AppCompositorMode::Native
+				}
+			}
 		};
-		radio_compositor.set_value_simple(compositor_mode.as_ref())?;
-		tasks.push(Task::SetCompositor(compositor_mode));
 
-		let res_mode = ResMode::Res1080;
 		// TODO: configurable defaults ?
-		//radio_res.set_value(res_mode.as_ref())?;
-		//tasks.push(Task::SetRes(res_mode));
+		let mut res_mode = AppResMode::Res1080;
+		let mut orientation_mode = AppOrientationMode::Wide;
+		let pos_mode = AppPosMode::Anchored;
 
-		let orientation_mode = OrientationMode::Wide;
-		// TODO: configurable defaults ?
-		//radio_orientation.set_value(orientation_mode.as_ref())?;
-		//tasks.push(Task::SetOrientation(orientation_mode));
+		if let Some(pinned_app) = &params.pinned_app {
+			res_mode = pinned_app.res_mode;
+			orientation_mode = pinned_app.orientation_mode;
+		}
 
-		let pos_mode = PosMode::Anchored;
-		// TODO: configurable defaults ?
-		//radio_pos.set_value(pos_mode.as_ref())?;
-		//tasks.push(Task::SetPos(pos_mode));
+		// update radios
+		{
+			let mut common = params.layout.common();
+			// TODO: pos_mode is disabled as for now
+			radio_compositor.set_value(&mut common, compositor_mode.as_ref())?;
+			radio_res.set_value(&mut common, res_mode.as_ref())?;
+			radio_orientation.set_value(&mut common, orientation_mode.as_ref())?;
+		}
 
 		let auto_start = false;
 
@@ -179,11 +190,11 @@ impl View {
 			let tasks = tasks.clone();
 			Box::new(move |_, ev| {
 				if let Some(mode) = ev.value.and_then(|v| {
-					CompositorMode::from_str(&v)
+					AppCompositorMode::from_str(&v)
 						.inspect_err(|_| {
 							log::error!(
 								"Invalid value for compositor: '{v}'. Valid values are: {:?}",
-								ResMode::VARIANTS
+								AppResMode::VARIANTS
 							)
 						})
 						.ok()
@@ -198,11 +209,11 @@ impl View {
 			let tasks = tasks.clone();
 			Box::new(move |_, ev| {
 				if let Some(mode) = ev.value.and_then(|v| {
-					ResMode::from_str(&v)
+					AppResMode::from_str(&v)
 						.inspect_err(|_| {
 							log::error!(
 								"Invalid value for resolution: '{v}'. Valid values are: {:?}",
-								ResMode::VARIANTS
+								AppResMode::VARIANTS
 							)
 						})
 						.ok()
@@ -236,11 +247,11 @@ impl View {
 			let tasks = tasks.clone();
 			Box::new(move |_, ev| {
 				if let Some(mode) = ev.value.and_then(|v| {
-					OrientationMode::from_str(&v)
+					AppOrientationMode::from_str(&v)
 						.inspect_err(|_| {
 							log::error!(
 								"Invalid value for orientation: '{v}'. Valid values are: {:?}",
-								OrientationMode::VARIANTS
+								AppOrientationMode::VARIANTS
 							)
 						})
 						.ok()
@@ -280,7 +291,9 @@ impl View {
 			entry: params.entry,
 			frontend_tasks: params.frontend_tasks.clone(),
 			globals: params.globals.clone(),
-			on_launched: params.on_launched,
+			on_close_request: Some(params.on_close_request),
+			on_app_pins_changed: Some(params.on_app_pins_changed),
+			pinned_app: params.pinned_app,
 		})
 	}
 
@@ -297,6 +310,14 @@ impl View {
 					Task::SetOrientation(mode) => self.orientation_mode = mode,
 					Task::SetAutoStart(auto_start) => self.auto_start = auto_start,
 					Task::Launch => self.action_launch(interface, data),
+					Task::PinApp => {
+						self.action_pin_app(interface.general_config(data));
+						interface.config_changed(data, Default::default());
+					}
+					Task::UnpinApp => {
+						self.action_unpin_app(interface.general_config(data));
+						interface.config_changed(data, Default::default());
+					}
 				}
 			}
 		}
@@ -304,6 +325,49 @@ impl View {
 		Ok(())
 	}
 
+	fn close(&mut self) {
+		if let Some(c) = self.on_close_request.take() {
+			c();
+		}
+	}
+
+	fn action_unpin_app(&mut self, config: &mut GeneralConfig) {
+		let Some(pinned_app) = &self.pinned_app else {
+			unreachable!();
+		};
+		self.frontend_tasks.push(FrontendTask::PlaySound(SoundType::Save));
+		config.pinned_apps.retain(|p| p != pinned_app);
+
+		if let Some(c) = &self.on_app_pins_changed {
+			c();
+		}
+
+		self.close();
+	}
+
+	fn action_pin_app(&mut self, config: &mut GeneralConfig) {
+		self
+			.frontend_tasks
+			.push(FrontendTask::PushToast(Translation::from_translation_key(
+				"SAVED_TO_FAVOURITES",
+			)));
+		self.frontend_tasks.push(FrontendTask::PlaySound(SoundType::Save));
+
+		config.pinned_apps.push(PinnedApp {
+			app_id: self.entry.app_id.clone(),
+			compositor_mode: self.compositor_mode,
+			pos_mode: self.pos_mode,
+			orientation_mode: self.orientation_mode,
+			res_mode: self.res_mode,
+		});
+
+		if let Some(c) = &self.on_app_pins_changed {
+			c();
+		}
+
+		self.close();
+	}
+
 	fn action_launch<T>(&mut self, interface: &mut BoxDashInterface<T>, data: &mut T) {
 		View::try_launch(LaunchParams {
 			application: &self.entry,
@@ -316,7 +380,7 @@ impl View {
 			auto_start: self.auto_start,
 			interface,
 			data,
-			on_launched: &self.on_launched,
+			on_launched: self.on_close_request.take(),
 		});
 	}
 
@@ -334,10 +398,10 @@ impl View {
 		))));
 	}
 
-	fn launch<T>(params: LaunchParams<T>) -> anyhow::Result<()> {
+	fn launch<T>(mut params: LaunchParams<T>) -> anyhow::Result<()> {
 		let mut env = Vec::<String>::new();
 
-		if params.compositor_mode == CompositorMode::Native {
+		if params.compositor_mode == AppCompositorMode::Native {
 			// This list could be larger, feel free to expand it
 			env.push("QT_QPA_PLATFORM=wayland".into());
 			env.push("GDK_BACKEND=wayland".into());
@@ -347,19 +411,19 @@ impl View {
 		}
 
 		let args = match params.compositor_mode {
-			CompositorMode::Cage => format!("-- {} {}", params.application.exec_path, params.application.exec_args),
-			CompositorMode::Native => params.application.exec_args.to_string(),
+			AppCompositorMode::Cage => format!("-- {} {}", params.application.exec_path, params.application.exec_args),
+			AppCompositorMode::Native => params.application.exec_args.to_string(),
 		};
 
 		let exec = match params.compositor_mode {
-			CompositorMode::Cage => "cage".to_string(),
-			CompositorMode::Native => params.application.exec_path.to_string(),
+			AppCompositorMode::Cage => "cage".to_string(),
+			AppCompositorMode::Native => params.application.exec_path.to_string(),
 		};
 
 		let pos_mode = match params.pos_mode {
-			PosMode::Floating => PositionMode::Float,
-			PosMode::Anchored => PositionMode::Anchor,
-			PosMode::Static => PositionMode::Static,
+			AppPosMode::Floating => PositionMode::Float,
+			AppPosMode::Anchored => PositionMode::Anchor,
+			AppPosMode::Static => PositionMode::Static,
 		};
 
 		let mut userdata = HashMap::new();
@@ -390,26 +454,28 @@ impl View {
 
 		params.frontend_tasks.push(FrontendTask::PlaySound(SoundType::Launch));
 
-		(*params.on_launched)();
+		if let Some(on_launched) = params.on_launched.take() {
+			on_launched();
+		}
 
 		// we're done!
 		Ok(())
 	}
 
-	fn calculate_resolution(res_mode: ResMode, orientation_mode: OrientationMode) -> [u32; 2] {
+	fn calculate_resolution(res_mode: AppResMode, orientation_mode: AppOrientationMode) -> [u32; 2] {
 		let total_pixels = match res_mode {
-			ResMode::Res1440 => 2560 * 1440,
-			ResMode::Res1080 => 1920 * 1080,
-			ResMode::Res720 => 1280 * 720,
-			ResMode::Res480 => 854 * 480,
+			AppResMode::Res1440 => 2560 * 1440,
+			AppResMode::Res1080 => 1920 * 1080,
+			AppResMode::Res720 => 1280 * 720,
+			AppResMode::Res480 => 854 * 480,
 		};
 
 		let (ratio_w, ratio_h) = match orientation_mode {
-			OrientationMode::Wide => (16, 9),
-			OrientationMode::SemiWide => (3, 2),
-			OrientationMode::Square => (1, 1),
-			OrientationMode::SemiTall => (2, 3),
-			OrientationMode::Tall => (9, 16),
+			AppOrientationMode::Wide => (16, 9),
+			AppOrientationMode::SemiWide => (3, 2),
+			AppOrientationMode::Square => (1, 1),
+			AppOrientationMode::SemiTall => (2, 3),
+			AppOrientationMode::Tall => (9, 16),
 		};
 
 		let k = ((total_pixels as f64) / (ratio_w * ratio_h) as f64).sqrt();
@@ -420,3 +486,36 @@ impl View {
 		[width as u32, height as u32]
 	}
 }
+
+pub fn mount_popup(
+	frontend_tasks: FrontendTasks,
+	globals: WguiGlobals,
+	entry: DesktopEntry,
+	popup: PopupHolder<View>,
+	on_app_pins_changed: Box<dyn Fn()>,
+	pinned_app: Option<PinnedApp>,
+) {
+	frontend_tasks
+		.clone()
+		.push(FrontendTask::MountPopupOnce(MountPopupOnceParams::new(
+			Translation::from_raw_text(&entry.app_name),
+			Box::new(move |data| {
+				let on_close_request = popup.get_close_callback(data.layout);
+				let view = View::new(Params {
+					entry: entry.clone(),
+					globals: &globals,
+					layout: data.layout,
+					parent_id: data.id_content,
+					frontend_tasks: &frontend_tasks,
+					config: data.config,
+					on_close_request,
+					on_app_pins_changed,
+					pinned_app,
+				})?;
+
+				popup.set_view(data.handle, view, None);
+				Ok(popup.get_close_callback(data.layout))
+			}),
+			Default::default(), /* extra */
+		)));
+}
diff --git a/dash-frontend/src/views/audio_settings.rs b/dash-frontend/src/views/audio_settings.rs
index 61061d33..3c96778e 100644
--- a/dash-frontend/src/views/audio_settings.rs
+++ b/dash-frontend/src/views/audio_settings.rs
@@ -1,7 +1,8 @@
-use std::{collections::HashMap, rc::Rc};
+use std::rc::Rc;
 
 use wgui::{
 	assets::AssetPath,
+	color::{WguiColor, WguiColorName},
 	components::{
 		self,
 		button::{ButtonClickCallback, ComponentButton},
@@ -11,7 +12,7 @@ use wgui::{
 	globals::WguiGlobals,
 	i18n::Translation,
 	layout::{Layout, WidgetID},
-	parser::{Fetchable, ParseDocumentParams, ParserState},
+	parser::{Fetchable, ParseDocumentParams, ParserState, TemplateParams},
 	task::Tasks,
 	widget::ConstructEssentials,
 };
@@ -110,11 +111,13 @@ struct MultiSelectorParams<'a> {
 }
 
 fn mount_multi_selector(params: MultiSelectorParams) -> anyhow::Result<()> {
-	let accent_color = params.ess.layout.state.theme.accent_color;
-
 	for cell in params.cells {
 		let highlighted = cell.key == params.def_cell;
-		let color = if highlighted { Some(accent_color) } else { None };
+		let color = if highlighted {
+			Some(WguiColor::from(WguiColorName::Primary))
+		} else {
+			None
+		};
 
 		// button
 		let (_, button) = components::button::construct(
@@ -653,9 +656,6 @@ impl View {
 	}
 
 	fn update_button_highlights(&self, layout: &mut Layout) -> anyhow::Result<()> {
-		let mut c = layout.start_common();
-		let mut common = c.common();
-
 		let num: u8 = match &self.mode {
 			CurrentMode::Sinks => 0,
 			CurrentMode::Sources => 1,
@@ -663,20 +663,21 @@ impl View {
 			CurrentMode::CardProfileSelector(_) => 255,
 		};
 
+		let mut com = layout.common();
+
 		let mut perform = |btn_num: u8, btn: &Rc<ComponentButton>| {
 			let color = if num == btn_num {
-				common.state.theme.accent_color
+				WguiColorName::Primary
 			} else {
-				common.state.theme.button_color
+				WguiColorName::BackgroundVariant
 			};
-			btn.set_color(&mut common, color);
+			btn.set_color(&mut com, color.into());
 		};
 
 		perform(0, &self.btn_sinks);
 		perform(1, &self.btn_sources);
 		perform(2, &self.btn_cards);
 
-		c.finish()?;
 		Ok(())
 	}
 
@@ -744,9 +745,9 @@ impl View {
 		let desc = &params.card.properties.device_description;
 		let disp_name = get_profile_display_name(&params.card.active_profile, params.card);
 
-		let mut par = HashMap::<Rc<str>, Rc<str>>::new();
-		par.insert("card_name".into(), desc.as_str().into());
-		par.insert("profile_name".into(), disp_name.name.as_str().into());
+		let mut par = TemplateParams::new();
+		par.insert("card_name", desc);
+		par.insert("profile_name", &disp_name.name);
 
 		let data = self
 			.state
@@ -768,11 +769,11 @@ impl View {
 	}
 
 	fn mount_device_slider(&mut self, params: MountDeviceSliderParams) -> anyhow::Result<()> {
-		let mut par = HashMap::<Rc<str>, Rc<str>>::new();
+		let mut par = TemplateParams::new();
 
 		if let Some(disp) = &params.disp {
-			par.insert("device_name".into(), disp.name.as_str().into());
-			par.insert("device_icon".into(), disp.icon_path.into());
+			par.insert("device_name", &disp.name);
+			par.insert("device_icon", disp.icon_path);
 		} else {
 			let icon_path = if params.alt_desc.contains("WiVRn") {
 				"dashboard/wivrn_head_symbolic.svg"
@@ -780,16 +781,16 @@ impl View {
 				"dashboard/binary.svg"
 			};
 
-			par.insert("device_name".into(), params.alt_desc.into());
-			par.insert("device_icon".into(), icon_path.into());
+			par.insert("device_name", &params.alt_desc);
+			par.insert("device_icon", icon_path);
 		}
 
 		par.insert(
-			"volume_icon".into(),
+			"volume_icon",
 			if params.muted {
-				"dashboard/volume_off.svg".into()
+				"dashboard/volume_off.svg"
 			} else {
-				"dashboard/volume.svg".into()
+				"dashboard/volume.svg"
 			},
 		);
 
@@ -801,14 +802,12 @@ impl View {
 			par,
 		)?;
 
-		let mut c = params.layout.start_common();
-		let mut common = c.common();
-
+		let mut common = params.layout.common();
 		let checkbox = data.fetch_component_as::<ComponentCheckbox>("checkbox")?;
 		let btn_mute = data.fetch_component_as::<ComponentButton>("btn_mute")?;
 		let slider = data.fetch_component_as::<ComponentSlider>("slider")?;
 
-		slider.set_value(&mut common, params.control.on_volume_request()? / VOLUME_MULT);
+		slider.set_value_primary(&mut common, params.control.on_volume_request()? / VOLUME_MULT);
 
 		checkbox.set_checked(&mut common, params.checked);
 
@@ -823,8 +822,10 @@ impl View {
 		slider.on_value_changed({
 			let control = params.control.clone();
 			Box::new(move |_common, event| {
-				control.on_volume_change(event.value * VOLUME_MULT)?;
-				Ok(())
+				if let Err(e) = control.on_volume_change(event.value * VOLUME_MULT) {
+					log::error!("{:?}", e);
+					debug_assert!(false);
+				};
 			})
 		});
 
@@ -836,8 +837,6 @@ impl View {
 			})
 		});
 
-		c.finish()?;
-
 		Ok(())
 	}
 
diff --git a/dash-frontend/src/views/bindings.rs b/dash-frontend/src/views/bindings.rs
new file mode 100644
index 00000000..033a4c1a
--- /dev/null
+++ b/dash-frontend/src/views/bindings.rs
@@ -0,0 +1,703 @@
+use glam::Vec2;
+use std::rc::Rc;
+use strum::EnumProperty;
+use wgui::{
+	assets::AssetPath,
+	components::{
+		button::{ButtonClickEvent, ComponentButton},
+		slider::ComponentSlider,
+	},
+	globals::WguiGlobals,
+	i18n::Translation,
+	layout::{Layout, WidgetID},
+	log::LogErr,
+	parser::{Fetchable, ParseDocumentParams, ParserState, TemplateParams},
+	task::Tasks,
+	widget::label::WidgetLabel,
+	windowing::context_menu::{self, TickResult},
+};
+use wlx_common::{
+	config_io,
+	openxr_actions::{OneOrMany, OpenXrInputAction, OpenXrInputProfile, load_xr_input_profiles},
+	openxr_bindings_schema::{
+		DEFAULT_BUTTON_THRESHOLDS, XrControllerProfile, XrInputComponent, XrInputSide, XrInputSubpathKind,
+	},
+};
+
+use crate::{
+	frontend::{FrontendTask, FrontendTasks},
+	tab::settings::horiz_cell,
+	util::{
+		openxr_bindings::{BindingsDropdown, ClickType, ParsedOpenXrInputPath},
+		popup_manager::{MountPopupOnceParams, MountPopupOnceParamsExtra, PopupHolder, PopupPadding},
+		wgui_simple,
+	},
+	views::{ViewTrait, ViewUpdateParams},
+};
+
+#[derive(Clone)]
+enum Task {
+	Save,
+	Cancel,
+	OpenContextMenu(glam::Vec2, Vec<context_menu::Cell>),
+	UpdateThreshold(Rc<str>, XrInputSide, usize, f32),
+}
+
+pub struct Params<'a> {
+	pub globals: WguiGlobals,
+	pub layout: &'a mut Layout,
+	pub parent_id: WidgetID,
+	pub controller_profile: &'static XrControllerProfile,
+	pub close_callback: Box<dyn FnOnce()>,
+}
+
+pub struct View {
+	parser_state: ParserState,
+	tasks: Tasks<Task>,
+	list_parent: WidgetID,
+	globals: WguiGlobals,
+	profiles: Vec<OpenXrInputProfile>,
+	cur_profile_idx: usize,
+	context_menu: context_menu::ContextMenu,
+	controller_profile: &'static XrControllerProfile,
+	close_callback: Option<Box<dyn FnOnce()>>,
+}
+
+impl ViewTrait for View {
+	fn update(&mut self, par: &mut ViewUpdateParams) -> anyhow::Result<()> {
+		for task in self.tasks.drain() {
+			match task {
+				Task::Save => {
+					let content = serde_json::to_string_pretty(&self.profiles)
+						.map_err(|e| anyhow::anyhow!("Failed to serialize profiles: {e}"))?;
+					config_io::save("openxr_actions.json5", &content)
+						.map_err(|e| anyhow::anyhow!("Failed to save bindings: {e}"))?;
+
+					if let Some(close_callback) = self.close_callback.take() {
+						close_callback();
+					}
+				}
+				Task::Cancel => {
+					if let Some(close_callback) = self.close_callback.take() {
+						close_callback();
+					}
+				}
+				Task::OpenContextMenu(position, cells) => {
+					self.context_menu.open(context_menu::OpenParams {
+						on_custom_attribs: None,
+						position,
+						blueprint: context_menu::Blueprint::Cells(cells),
+					});
+				}
+				Task::UpdateThreshold(action_name, side, i, val) => {
+					let cur_profile = &mut self.profiles[self.cur_profile_idx];
+					let action_mut = get_action_mut(cur_profile, &action_name);
+
+					let threshold = if matches!(side, XrInputSide::Right) {
+						action_mut.threshold_right.get_or_insert(DEFAULT_BUTTON_THRESHOLDS)
+					} else {
+						action_mut.threshold_left.get_or_insert(DEFAULT_BUTTON_THRESHOLDS)
+					};
+
+					threshold[i] = val;
+					log::warn!("UpdateThreshold {action_name} {side:?} {threshold:?}");
+				}
+			}
+		}
+
+		// Dropdown handling
+		if let TickResult::Action(name) = self.context_menu.tick(par.layout, &mut self.parser_state)?
+			&& let (Some(action), Some(action_name), Some(side), Some(value)) = {
+				let mut s = name.splitn(4, ';');
+				(s.next(), s.next(), s.next(), s.next())
+			} {
+			let cur_profile = &mut self.profiles[self.cur_profile_idx];
+			let action_mut = get_action_mut(cur_profile, action_name);
+			let side_mut = if side == "right" {
+				&mut action_mut.right
+			} else {
+				&mut action_mut.left
+			};
+
+			match action {
+				"clear" => {
+					*side_mut = None;
+				}
+				"subpath" => {
+					apply_subpath(side_mut, side, value, self.controller_profile);
+				}
+				"comp" => {
+					apply_comp(side_mut, side, value);
+				}
+				"click" => match value {
+					"triple" => {
+						action_mut.triple_click = Some(true);
+						action_mut.double_click = None;
+					}
+					"double" => {
+						action_mut.triple_click = None;
+						action_mut.double_click = Some(true);
+					}
+					_ => {
+						action_mut.triple_click = None;
+						action_mut.double_click = None;
+					}
+				},
+				_ => log::warn!("Unknown action {action}"),
+			}
+
+			self.refresh(par.layout)?;
+		}
+
+		Ok(())
+	}
+}
+
+impl View {
+	pub fn new(params: Params) -> anyhow::Result<Self> {
+		let doc_params = &ParseDocumentParams {
+			globals: params.globals.clone(),
+			path: AssetPath::BuiltIn("gui/view/bindings.xml"),
+			extra: Default::default(),
+		};
+
+		let mut profiles = load_xr_input_profiles();
+
+		let cur_profile_idx = profiles
+			.iter()
+			.position(|i| i.profile.as_str() == &*params.controller_profile.profile_id)
+			.unwrap_or_else(|| {
+				let idx = profiles.len();
+				profiles.push(OpenXrInputProfile {
+					profile: params.controller_profile.profile_id.to_string(),
+					..Default::default()
+				});
+				idx
+			});
+
+		let parser_state = wgui::parser::parse_from_assets(doc_params, params.layout, params.parent_id)?;
+		let list_parent = parser_state.fetch_widget(&params.layout.state, "list_parent")?.id;
+		let tasks = Tasks::new();
+
+		tasks.handle_button(
+			&parser_state.fetch_component_as::<ComponentButton>("btn_save")?,
+			Task::Save,
+		);
+
+		tasks.handle_button(
+			&parser_state.fetch_component_as::<ComponentButton>("btn_cancel")?,
+			Task::Cancel,
+		);
+
+		let mut me = Self {
+			parser_state,
+			tasks,
+			list_parent,
+			globals: params.globals.clone(),
+			profiles,
+			cur_profile_idx,
+			context_menu: context_menu::ContextMenu::default(),
+			controller_profile: params.controller_profile,
+			close_callback: Some(params.close_callback),
+		};
+
+		me.ensure_pose_and_haptics();
+
+		me.refresh(params.layout)?;
+
+		Ok(me)
+	}
+
+	fn refresh(&mut self, layout: &mut Layout) -> anyhow::Result<()> {
+		let action_names = [
+			"click",
+			"grab",
+			"scroll",
+			"show_hide",
+			"toggle_dashboard",
+			"space_drag",
+			"space_rotate",
+			"space_reset",
+			"click_modifier_right",
+			"click_modifier_middle",
+			"alt_click",
+			"move_mouse",
+		];
+
+		let mut mp = MacroParams {
+			parser_state: &mut self.parser_state,
+			doc_params: &ParseDocumentParams {
+				globals: self.globals.clone(),
+				path: AssetPath::BuiltIn("gui/view/bindings.xml"),
+				extra: Default::default(),
+			},
+			layout,
+			tasks: self.tasks.clone(),
+			idx: 0,
+		};
+
+		mp.layout.remove_children(self.list_parent);
+
+		for action in action_names {
+			let current = get_action_mut(&mut self.profiles[self.cur_profile_idx], action);
+			input_controls_for_action(
+				&mut mp,
+				self.list_parent,
+				action.into(),
+				self.controller_profile,
+				current,
+			)?;
+		}
+
+		Ok(())
+	}
+
+	fn ensure_pose_and_haptics(&mut self) {
+		let cur_profile = &mut self.profiles[self.cur_profile_idx];
+
+		let profile_left = self.controller_profile.find_userpath(XrInputSide::Left);
+		let profile_right = self.controller_profile.find_userpath(XrInputSide::Right);
+
+		let action = cur_profile.pose.get_or_insert_default();
+
+		if action.left.is_none() && profile_left.is_some() {
+			let path = "/user/hand/left/input/aim/pose";
+			action.left = Some(OneOrMany::One(path.into()));
+		}
+
+		if action.right.is_none() && profile_right.is_some() {
+			let path = "/user/hand/right/input/aim/pose";
+			action.right = Some(OneOrMany::One(path.into()));
+		}
+
+		let action = cur_profile.haptic.get_or_insert_default();
+
+		let has_haptic = profile_left
+			.map(|x| x.find_subpath(XrInputSubpathKind::Haptic).is_some())
+			.unwrap_or_default();
+		if action.left.is_none() && has_haptic {
+			let path = "/user/hand/left/output/haptic";
+			action.left = Some(OneOrMany::One(path.into()));
+		}
+
+		let has_haptic = profile_right
+			.map(|x| x.find_subpath(XrInputSubpathKind::Haptic).is_some())
+			.unwrap_or_default();
+		if action.right.is_none() && has_haptic {
+			let path = "/user/hand/right/output/haptic";
+			action.right = Some(OneOrMany::One(path.into()));
+		}
+	}
+}
+
+fn get_action_mut<'a>(profile: &'a mut OpenXrInputProfile, action_name: &str) -> &'a mut OpenXrInputAction {
+	let action = match action_name {
+		"click" => &mut profile.click,
+		"grab" => &mut profile.grab,
+		"alt_click" => &mut profile.alt_click,
+		"show_hide" => &mut profile.show_hide,
+		"toggle_dashboard" => &mut profile.toggle_dashboard,
+		"space_drag" => &mut profile.space_drag,
+		"space_rotate" => &mut profile.space_rotate,
+		"space_reset" => &mut profile.space_reset,
+		"click_modifier_right" => &mut profile.click_modifier_right,
+		"click_modifier_middle" => &mut profile.click_modifier_middle,
+		"move_mouse" => &mut profile.move_mouse,
+		"scroll" => &mut profile.scroll,
+		_ => panic!("unknown action_name: {action_name}"),
+	};
+
+	action.get_or_insert_with(OpenXrInputAction::default)
+}
+
+pub fn mount_popup(
+	frontend_tasks: FrontendTasks,
+	globals: WguiGlobals,
+	popup: PopupHolder<View>,
+	controller_profile: &'static XrControllerProfile,
+) {
+	frontend_tasks
+		.clone()
+		.push(FrontendTask::MountPopupOnce(MountPopupOnceParams::new(
+			Translation::from_raw_text(controller_profile.display_name),
+			Box::new(move |data| {
+				let close_callback = popup.get_close_callback(data.layout);
+				let view = View::new(Params {
+					globals: globals.clone(),
+					layout: data.layout,
+					parent_id: data.id_content,
+					controller_profile,
+					close_callback,
+				})?;
+
+				popup.set_view(data.handle, view, None);
+				Ok(popup.get_close_callback(data.layout))
+			}),
+			MountPopupOnceParamsExtra {
+				padding: PopupPadding::None,
+			},
+		)));
+}
+
+struct MacroParams<'a> {
+	pub layout: &'a mut Layout,
+	pub parser_state: &'a mut ParserState,
+	pub doc_params: &'a ParseDocumentParams<'a>,
+	pub tasks: Tasks<Task>,
+	pub idx: usize,
+}
+
+fn input_controls_for_action(
+	mp: &mut MacroParams,
+	parent: WidgetID,
+	action: Rc<str>,
+	profile: &XrControllerProfile,
+	current: &mut OpenXrInputAction,
+) -> anyhow::Result<()> {
+	let id = mp.idx.to_string();
+	mp.idx += 1;
+
+	let mut params = TemplateParams::new();
+	params.insert("id", &id);
+	params.insert_str(
+		"translation",
+		format!("APP_SETTINGS.BINDINGS.ACTION.{}", action.as_ref().to_uppercase()),
+	);
+
+	mp.parser_state
+		.instantiate_template(mp.doc_params, "ActionRow", mp.layout, parent, params)?;
+
+	let parent = mp.parser_state.get_widget_id(&id)?;
+
+	let click_type = if current.triple_click.unwrap_or_default() {
+		ClickType::Triple
+	} else if current.double_click.unwrap_or_default() {
+		ClickType::Double
+	} else {
+		ClickType::Any
+	};
+
+	let current_left = current.left.as_ref().map(|x| match x {
+		OneOrMany::One(s) => s.as_str(),
+		OneOrMany::Many(s) => s.first().unwrap().as_str(), // safe
+	});
+
+	input_controls_for_hand(
+		mp,
+		parent,
+		current_left,
+		XrInputSide::Left,
+		action.clone(),
+		click_type,
+		profile,
+		current.threshold_left,
+	)?;
+
+	let current_right = current.right.as_ref().map(|x| match x {
+		OneOrMany::One(s) => s.as_str(),
+		OneOrMany::Many(s) => s.first().unwrap().as_str(), // safe
+	});
+
+	input_controls_for_hand(
+		mp,
+		parent,
+		current_right,
+		XrInputSide::Right,
+		action,
+		click_type,
+		profile,
+		current.threshold_right,
+	)
+}
+
+fn input_controls_for_hand(
+	mp: &mut MacroParams,
+	parent: WidgetID,
+	current: Option<&str>,
+	side: XrInputSide,
+	action: Rc<str>,
+	click_type: ClickType,
+	profile: &XrControllerProfile,
+	threshold: Option<[f32; 2]>,
+) -> anyhow::Result<()> {
+	let Some(user_path) = profile.find_userpath(side) else {
+		return Ok(()); // this hand is not available
+	};
+
+	let current = current.and_then(|cur| ParsedOpenXrInputPath::try_from(cur).log_warn(cur).ok());
+
+	let parent = horiz_cell(mp.layout, parent)?;
+
+	let available_components: Rc<[XrInputComponent]> = current
+		.as_ref()
+		.and_then(|par| user_path.find_subpath(par.subpath))
+		.map(|subp| subp.components)
+		.unwrap_or_default()
+		.into();
+
+	let available_subpaths: Rc<[XrInputSubpathKind]> = user_path
+		.paths
+		.iter()
+		.filter(|x| !x.kind.get_bool("Hidden").unwrap_or_default())
+		.map(|x| x.kind)
+		.collect();
+
+	subpath_dropdown(
+		mp,
+		parent,
+		action.clone(),
+		side,
+		available_subpaths,
+		current.as_ref().map(|x| x.subpath),
+	)?;
+
+	if !component_dropdown(
+		mp,
+		parent,
+		action.clone(),
+		side,
+		available_components,
+		current.as_ref().map(|x| x.component),
+	)? {
+		return Ok(());
+	}
+
+	clicks_dropdown(mp, parent, action.clone(), click_type)?;
+
+	if let Some(component) = current.as_ref().map(|x| x.component)
+		&& component.is_analog()
+		&& &*action != "scroll"
+	// hax
+	{
+		threshold_slider(mp, parent, action, side, threshold)?;
+	}
+
+	Ok(())
+}
+
+fn subpath_dropdown(
+	mp: &mut MacroParams,
+	parent: WidgetID,
+	action: Rc<str>,
+	side: XrInputSide,
+	available: Rc<[XrInputSubpathKind]>,
+	current: Option<XrInputSubpathKind>,
+) -> anyhow::Result<()> {
+	let mut params = TemplateParams::new();
+	params.insert("tooltip", "APP_SETTINGS.BINDINGS.SUBPATH");
+	params.insert("min_width", "100");
+
+	// left/right hand icon
+	wgui_simple::create_icon(
+		mp.layout,
+		parent,
+		Vec2::new(32.0, 32.0),
+		AssetPath::BuiltIn(&format!("dashboard/hand_{}.svg", side.as_ref())),
+	)?;
+
+	let current_text = current
+		.map(|c| c.translation())
+		.unwrap_or_else(|| Translation::from_translation_key("APP_SETTINGS.OPTION.NONE"));
+
+	create_dropdown(mp, parent, params, action, side, current_text, available)?;
+
+	Ok(())
+}
+
+fn component_dropdown(
+	mp: &mut MacroParams,
+	parent: WidgetID,
+	action: Rc<str>,
+	side: XrInputSide,
+	available: Rc<[XrInputComponent]>,
+	current: Option<XrInputComponent>,
+) -> anyhow::Result<bool> {
+	if available.is_empty() {
+		return Ok(false);
+	}
+
+	let mut params = TemplateParams::new();
+	params.insert("text", "・");
+	params.insert("tooltip", "APP_SETTINGS.BINDINGS.COMPONENT");
+	params.insert("min_width", "100");
+
+	let current_text = current
+		.map(|c| c.translation())
+		.unwrap_or_else(|| Translation::from_raw_text_rc(Default::default()));
+
+	create_dropdown(mp, parent, params, action, side, current_text, available)?;
+
+	Ok(true)
+}
+
+fn clicks_dropdown(mp: &mut MacroParams, parent: WidgetID, action: Rc<str>, current: ClickType) -> anyhow::Result<()> {
+	let mut params = TemplateParams::new();
+	params.insert("text", "・");
+	params.insert("tooltip", "APP_SETTINGS.BINDINGS.CLICK.TYPE");
+	params.insert("min_width", "100");
+
+	let current_text = current.translation();
+	let available = [ClickType::Any, ClickType::Double, ClickType::Triple].into();
+	create_dropdown(mp, parent, params, action, XrInputSide::Left, current_text, available)?;
+
+	Ok(())
+}
+
+fn threshold_slider(
+	mp: &mut MacroParams,
+	parent: WidgetID,
+	action: Rc<str>,
+	side: XrInputSide,
+	current: Option<[f32; 2]>,
+) -> anyhow::Result<()> {
+	let id = mp.idx.to_string();
+	mp.idx += 1;
+
+	let current = current.unwrap_or(DEFAULT_BUTTON_THRESHOLDS);
+
+	let mut params = TemplateParams::new();
+	params.insert("id", &id);
+	params.insert("tooltip", "APP_SETTINGS.BINDINGS.THRESHOLD");
+	params.insert_str("value", format!("{:.2}", current[0]));
+	params.insert_str("value2", format!("{:.2}", current[1]));
+	params.insert("min", "0.0");
+	params.insert("max", "1.0");
+	params.insert("step", "0.1");
+
+	mp.parser_state
+		.instantiate_template(mp.doc_params, "ThresholdSlider", mp.layout, parent, params)?;
+
+	let slider = mp.parser_state.fetch_component_as::<ComponentSlider>(&id)?;
+	slider.on_value_changed(Box::new({
+		let tasks = mp.tasks.clone();
+		move |_common, e| {
+			if matches!(e.index, wgui::components::slider::ValueIndex::Primary) {
+				tasks.push(Task::UpdateThreshold(action.clone(), side, 0, e.value));
+			} else {
+				tasks.push(Task::UpdateThreshold(action.clone(), side, 1, e.value));
+			}
+		}
+	}));
+
+	Ok(())
+}
+
+fn create_dropdown<B: 'static + BindingsDropdown>(
+	mp: &mut MacroParams,
+	parent: WidgetID,
+	mut params: TemplateParams,
+	action: Rc<str>,
+	side: XrInputSide,
+	current_text: Translation,
+	available: Rc<[B]>,
+) -> anyhow::Result<()> {
+	let id = mp.idx.to_string();
+	mp.idx += 1;
+	params.insert("id", &id);
+
+	mp.parser_state
+		.instantiate_template(mp.doc_params, "DropdownButton", mp.layout, parent, params)?;
+
+	{
+		let mut label = mp
+			.parser_state
+			.fetch_widget_as::<WidgetLabel>(&mp.layout.state, &format!("{id}_value"))?;
+		label.set_text_simple(&mut mp.layout.state.globals.get(), current_text);
+	}
+
+	let btn = mp.parser_state.fetch_component_as::<ComponentButton>(&id)?;
+	btn.on_click(Rc::new({
+		let tasks = mp.tasks.clone();
+		let available = available.clone();
+		move |_common, e: ButtonClickEvent| {
+			let mut cells = available
+				.iter()
+				.map(|item| {
+					let title = item.translation();
+
+					context_menu::Cell {
+						action_name: Some(item.action_str(&action, side)),
+						title,
+						tooltip: None,
+						attribs: vec![],
+					}
+				})
+				.collect::<Vec<_>>();
+
+			if let Some(action_str) = B::clear_str(&action, side) {
+				cells.insert(
+					0,
+					context_menu::Cell {
+						action_name: Some(action_str),
+						title: Translation::from_translation_key("APP_SETTINGS.OPTION.NONE"),
+						tooltip: None,
+						attribs: vec![],
+					},
+				);
+			}
+
+			tasks.push(Task::OpenContextMenu(e.mouse_pos_absolute.unwrap_or_default(), cells));
+			Ok(())
+		}
+	}));
+
+	Ok(())
+}
+
+fn apply_subpath(
+	side_mut: &mut Option<OneOrMany<String>>,
+	side_str: &str,
+	subpath_str: &str,
+	profile: &XrControllerProfile,
+) {
+	let (Ok(side), Ok(subpath)) = (
+		XrInputSide::try_from(side_str),
+		XrInputSubpathKind::try_from(subpath_str),
+	) else {
+		return;
+	};
+	let Some(subpath_obj) = profile.find_userpath(side).and_then(|p| p.find_subpath(subpath)) else {
+		return;
+	};
+
+	let comp: XrInputComponent = if let Some(first) = side_mut.as_ref().map(|x| match x {
+		OneOrMany::One(x) => x.as_str(),
+		OneOrMany::Many(x) => x.first().unwrap().as_str(),
+	}) {
+		let Ok(parsed) = ParsedOpenXrInputPath::try_from(first) else {
+			return;
+		};
+
+		let mut parsed_compo = parsed.component;
+		if !subpath_obj.components.contains(&parsed_compo) {
+			parsed_compo = *subpath_obj.components.first().unwrap();
+		}
+		parsed_compo
+	} else {
+		*subpath_obj.components.first().unwrap()
+	};
+
+	let comp_str = comp.as_ref();
+	*side_mut = Some(OneOrMany::One(format!(
+		"/user/hand/{side_str}/input/{subpath_str}/{comp_str}"
+	)));
+}
+
+fn apply_comp(side_mut: &mut Option<OneOrMany<String>>, side: &str, comp: &str) {
+	if side_mut.is_none() {
+		return;
+	}
+
+	let first = match side_mut.as_ref().unwrap() {
+		OneOrMany::One(x) => x.as_str(),
+		OneOrMany::Many(x) => x.first().unwrap().as_str(),
+	};
+
+	let Ok(parsed) = ParsedOpenXrInputPath::try_from(first) else {
+		return;
+	};
+
+	let subpath = parsed.subpath.as_ref();
+
+	*side_mut = Some(OneOrMany::One(format!("/user/hand/{side}/input/{subpath}/{comp}")));
+}
diff --git a/dash-frontend/src/views/color_palettes.rs b/dash-frontend/src/views/color_palettes.rs
new file mode 100644
index 00000000..26e368d6
--- /dev/null
+++ b/dash-frontend/src/views/color_palettes.rs
@@ -0,0 +1,265 @@
+use crate::{
+	frontend::{FrontendTask, FrontendTasks},
+	util::popup_manager::{MountPopupOnceParams, PopupHolder},
+	views::{ViewTrait, ViewUpdateParams},
+};
+use std::{rc::Rc, sync::Arc};
+use wgui::color::WguiColorName;
+use wgui::{
+	assets::AssetPath,
+	components::button::ComponentButton,
+	globals::WguiGlobals,
+	i18n::Translation,
+	layout::{Layout, LayoutTask, WidgetID},
+	log::LogErr,
+	palette::PALETTES,
+	parser::{Fetchable, ParseDocumentParams, TemplateParams},
+	task::Tasks,
+};
+use wlx_common::{
+	dash_interface::ConfigChangeKind,
+	palette::{list_palette_files, load_custom_palette},
+};
+
+#[derive(Clone)]
+enum Task {
+	SelectPalette(String),
+	CustomPaletteUrl,
+}
+
+pub struct Params<'a> {
+	pub globals: WguiGlobals,
+	pub layout: &'a mut Layout,
+	pub parent_id: WidgetID,
+	pub frontend_tasks: &'a FrontendTasks,
+	pub on_close_request: Box<dyn FnOnce()>,
+	pub current_palette: Arc<str>,
+}
+
+pub struct View {
+	tasks: Tasks<Task>,
+	frontend_tasks: FrontendTasks,
+	on_close_request: Option<Box<dyn FnOnce()>>,
+}
+
+impl ViewTrait for View {
+	fn update(&mut self, par: &mut ViewUpdateParams) -> anyhow::Result<()> {
+		for task in self.tasks.drain() {
+			match task {
+				Task::SelectPalette(profile) => {
+					let mut globals = par.layout.state.globals.get();
+					let new_palette = wlx_common::palette::load_palette(&profile);
+					globals.palette = new_palette;
+					par.general_config.color_palette = profile.into();
+					par.layout.tasks.push(LayoutTask::RefreshPalette);
+					par.config_change_kind.replace(ConfigChangeKind::WguiColorPaletteChange);
+					if let Some(c) = self.on_close_request.take() {
+						c();
+					}
+				}
+				Task::CustomPaletteUrl => {
+					self.frontend_tasks.push(FrontendTask::OpenURL(
+						"https://wayvr.org/docs/basics/customization/".into(),
+					));
+				}
+			}
+		}
+		Ok(())
+	}
+}
+
+macro_rules! insert_colors {
+	(
+		$params:expr,
+		$palette:expr,
+		$( $key:literal => $color:ident ),* $(,)?
+	) => {
+		$(
+			$params.insert_str(
+				$key,
+				WguiColorName::$color
+					.to_wgui_color()
+					.resolve($palette)
+					.to_hex()
+			);
+		)*
+	};
+}
+
+impl View {
+	pub fn new(params: Params) -> anyhow::Result<Self> {
+		let doc_params = &ParseDocumentParams {
+			globals: params.globals.clone(),
+			path: AssetPath::BuiltIn("gui/view/color_palettes.xml"),
+			extra: Default::default(),
+		};
+
+		let mut parser_state = wgui::parser::parse_from_assets(doc_params, params.layout, params.parent_id)?;
+
+		let list_parent = parser_state.fetch_widget(&params.layout.state, "list_parent")?.id;
+
+		let tasks = Tasks::new();
+
+		for (idx, name) in list_palette_files().into_iter().enumerate() {
+			let Ok(palette) = load_custom_palette(&name).log_warn("Could not load custom color palette") else {
+				continue;
+			};
+
+			let id = format!("profile_custom_{idx}");
+			let is_current = &*params.current_palette == name.as_str();
+
+			let mut cell_params = TemplateParams::new();
+			cell_params.insert("id", &id);
+
+			let display_name = &name[..name.len() - 5];
+
+			if is_current {
+				cell_params.insert_str("text", format!("{display_name} ✅"));
+				cell_params.insert("tooltip", "APP_SETTINGS.COLOR_PALETTE_CURRENT");
+			} else {
+				cell_params.insert("text", display_name);
+				cell_params.insert("tooltip", "APP_SETTINGS.COLOR_PALETTE_ACTIVATE");
+			}
+
+			insert_colors!(
+				cell_params,
+				&palette,
+				"primary" => Primary,
+				"on_primary" => OnPrimary,
+				"secondary" => Secondary,
+				"on_secondary" => OnSecondary,
+				"tertiary" => Tertiary,
+				"on_tertiary" => OnTertiary,
+				"danger" => Danger,
+				"on_danger" => OnDanger,
+				"background" => Background,
+				"on_background" => OnBackground,
+				"background_variant" => BackgroundVariant,
+				"outline" => Outline,
+				"highlight" => Highlight,
+			);
+
+			parser_state.instantiate_template(
+				doc_params,
+				"ColorPaletteButton",
+				params.layout,
+				list_parent,
+				cell_params,
+			)?;
+
+			if !is_current {
+				let btn = parser_state.fetch_component_as::<ComponentButton>(&id)?;
+				let tasks_clone = tasks.clone();
+				btn.on_click(Rc::new({
+					move |_common, _e| {
+						tasks_clone.push(Task::SelectPalette(name.to_string()));
+						Ok(())
+					}
+				}));
+			}
+		}
+
+		for (idx, (name, palette)) in PALETTES.iter().enumerate() {
+			let id = format!("profile_builtin_{idx}");
+			let is_current = &*params.current_palette == *name;
+
+			let mut cell_params = TemplateParams::new();
+			cell_params.insert("id", &id);
+
+			if is_current {
+				cell_params.insert_str("text", format!("{name} ✅"));
+				cell_params.insert("tooltip", "APP_SETTINGS.COLOR_PALETTE_CURRENT");
+			} else {
+				cell_params.insert("text", name);
+				cell_params.insert("tooltip", "APP_SETTINGS.COLOR_PALETTE_ACTIVATE");
+			}
+
+			insert_colors!(
+				cell_params,
+				palette,
+				"primary" => Primary,
+				"on_primary" => OnPrimary,
+				"secondary" => Secondary,
+				"on_secondary" => OnSecondary,
+				"tertiary" => Tertiary,
+				"on_tertiary" => OnTertiary,
+				"danger" => Danger,
+				"on_danger" => OnDanger,
+				"background" => Background,
+				"on_background" => OnBackground,
+				"background_variant" => BackgroundVariant,
+				"outline" => Outline,
+				"highlight" => Highlight,
+			);
+
+			parser_state.instantiate_template(
+				doc_params,
+				"ColorPaletteButton",
+				params.layout,
+				list_parent,
+				cell_params,
+			)?;
+
+			if !is_current {
+				let btn = parser_state.fetch_component_as::<ComponentButton>(&id)?;
+				let tasks_clone = tasks.clone();
+				btn.on_click(Rc::new({
+					move |_common, _e| {
+						tasks_clone.push(Task::SelectPalette(name.to_string()));
+						Ok(())
+					}
+				}));
+			}
+		}
+
+		parser_state.instantiate_template(
+			doc_params,
+			"CustomPaletteButton",
+			params.layout,
+			list_parent,
+			TemplateParams::default(),
+		)?;
+		let btn = parser_state.fetch_component_as::<ComponentButton>("custom_btn")?;
+		let tasks_clone = tasks.clone();
+		btn.on_click(Rc::new({
+			move |_common, _e| {
+				tasks_clone.push(Task::CustomPaletteUrl);
+				Ok(())
+			}
+		}));
+
+		Ok(Self {
+			tasks,
+			frontend_tasks: params.frontend_tasks.clone(),
+			on_close_request: Some(params.on_close_request),
+		})
+	}
+}
+
+pub fn mount_popup(
+	frontend_tasks: FrontendTasks,
+	globals: WguiGlobals,
+	popup: PopupHolder<View>,
+	current_palette: Arc<str>,
+) {
+	frontend_tasks
+		.clone()
+		.push(FrontendTask::MountPopupOnce(MountPopupOnceParams::new(
+			Translation::from_translation_key("APP_SETTINGS.COLOR_PALETTES"),
+			Box::new(move |data| {
+				let on_close_request = popup.get_close_callback(data.layout);
+				let view = View::new(Params {
+					globals: globals.clone(),
+					layout: data.layout,
+					parent_id: data.id_content,
+					frontend_tasks: &frontend_tasks,
+					current_palette,
+					on_close_request,
+				})?;
+
+				popup.set_view(data.handle, view, None);
+				Ok(popup.get_close_callback(data.layout))
+			}),
+			Default::default(), /* extra */
+		)));
+}
diff --git a/dash-frontend/src/views/dialog_box.rs b/dash-frontend/src/views/dialog_box.rs
new file mode 100644
index 00000000..b81e4d10
--- /dev/null
+++ b/dash-frontend/src/views/dialog_box.rs
@@ -0,0 +1,126 @@
+use crate::{
+	frontend::{FrontendTask, FrontendTasks},
+	util::popup_manager::{MountPopupOnceParams, PopupHolder},
+	views::{ViewTrait, ViewUpdateParams},
+};
+use wgui::{
+	assets::AssetPath,
+	components::button::ComponentButton,
+	globals::WguiGlobals,
+	i18n::Translation,
+	layout::{Layout, WidgetID},
+	parser::{Fetchable, ParseDocumentParams, ParserState, TemplateParams},
+	task::Tasks,
+	widget::label::WidgetLabel,
+};
+
+pub struct ButtonEntry {
+	pub content: Translation, // button text
+	pub icon: &'static str,   // sprite_src_builtin
+	pub action: &'static str, // action name (will be passed into on_action_click)
+}
+
+pub struct Params {
+	pub globals: WguiGlobals,
+	pub entries: Vec<ButtonEntry>,
+	pub message: Translation,
+	pub on_action_click: Box<dyn FnOnce(&'static str)>,
+}
+
+#[derive(Clone)]
+enum Task {
+	ActionClicked(&'static str),
+}
+
+pub struct View {
+	tasks: Tasks<Task>,
+
+	#[allow(dead_code)]
+	parser_state: ParserState,
+
+	on_action_click: Option<Box<dyn FnOnce(&'static str)>>,
+	on_close_request: Option<Box<dyn FnOnce()>>,
+}
+
+fn doc_params(globals: &WguiGlobals) -> ParseDocumentParams<'_> {
+	ParseDocumentParams {
+		globals: globals.clone(),
+		path: AssetPath::BuiltIn("gui/view/dialog_box.xml"),
+		extra: Default::default(),
+	}
+}
+
+impl ViewTrait for View {
+	fn update(&mut self, _par: &mut ViewUpdateParams) -> anyhow::Result<()> {
+		for task in self.tasks.drain() {
+			match task {
+				Task::ActionClicked(action) => {
+					if let Some(func) = self.on_action_click.take() {
+						func(action);
+					}
+
+					if let Some(on_close) = self.on_close_request.take() {
+						on_close();
+					}
+				}
+			}
+		}
+		Ok(())
+	}
+}
+
+impl View {
+	pub fn new(
+		layout: &mut Layout,
+		id_parent: WidgetID,
+		on_close_request: Box<dyn FnOnce()>,
+		par: Params,
+	) -> anyhow::Result<Self> {
+		let tasks = Tasks::<Task>::new();
+
+		let mut parser_state = wgui::parser::parse_from_assets(&doc_params(&par.globals), layout, id_parent)?;
+		let id_buttons = parser_state.get_widget_id("buttons")?;
+
+		{
+			let label_message = parser_state.fetch_widget(&layout.state, "label_message")?.widget;
+			label_message
+				.cast::<WidgetLabel>()?
+				.set_text(&mut layout.common(), par.message);
+		}
+
+		for entry in par.entries {
+			let mut t_par = TemplateParams::new();
+			t_par.insert("icon", entry.icon);
+
+			let data =
+				parser_state.realize_template(&doc_params(&par.globals), "DialogBoxButton", layout, id_buttons, t_par)?;
+
+			let button = data.fetch_component_as::<ComponentButton>("btn")?;
+			button.set_text(&mut layout.common(), entry.content.clone());
+			button.on_click(tasks.get_button_click_callback(Task::ActionClicked(entry.action)));
+		}
+
+		Ok(Self {
+			tasks,
+			parser_state,
+			on_action_click: Some(par.on_action_click),
+			on_close_request: Some(on_close_request),
+		})
+	}
+}
+
+pub fn mount_popup(popup: PopupHolder<View>, frontend_tasks: FrontendTasks, params: Params) {
+	frontend_tasks
+		.clone()
+		.push(FrontendTask::MountPopupOnce(MountPopupOnceParams::new(
+			Translation::from_raw_text("Info"),
+			Box::new(move |data| {
+				let on_close_request = popup.get_close_callback(data.layout);
+				let view = View::new(data.layout, data.id_content, on_close_request, params)?;
+
+				popup.set_view(data.handle, view, None);
+				Ok(popup.get_close_callback(data.layout))
+			}),
+			Default::default(), /* extra */
+		)));
+}
diff --git a/dash-frontend/src/views/download_file.rs b/dash-frontend/src/views/download_file.rs
new file mode 100644
index 00000000..be80b3c6
--- /dev/null
+++ b/dash-frontend/src/views/download_file.rs
@@ -0,0 +1,253 @@
+use crate::{
+	frontend::{FrontendTask, FrontendTasks},
+	util::{
+		networking::http_client::{self, ProgressFuncData},
+		popup_manager::{MountPopupOnceParams, PopupHolder},
+		wgui_simple,
+	},
+	views::{ViewTrait, ViewUpdateParams},
+};
+use glam::Vec2;
+use std::path::PathBuf;
+use wgui::{
+	assets::AssetPath,
+	components::button::ComponentButton,
+	globals::WguiGlobals,
+	i18n::Translation,
+	layout::{Layout, WidgetID},
+	parser::{Fetchable, ParseDocumentParams, ParserState},
+	task::Tasks,
+	widget::label::WidgetLabel,
+};
+use wlx_common::async_executor::AsyncExecutor;
+
+pub struct Params {
+	pub globals: WguiGlobals,
+	pub executor: AsyncExecutor,
+	pub target_path: PathBuf,
+	pub url: String,
+	pub on_downloaded: Box<dyn FnOnce()>,
+}
+
+#[derive(Clone)]
+enum Task {
+	StartDownload(/*url*/ String, /*target path*/ PathBuf),
+	SetStatusText(String),
+	ShowIconSuccess,
+	ShowIconError,
+	Close,
+}
+
+pub struct View {
+	globals: WguiGlobals,
+	tasks: Tasks<Task>,
+	executor: AsyncExecutor,
+
+	#[allow(dead_code)]
+	parser_state: ParserState,
+
+	id_label_status: WidgetID,
+	id_loading_parent: WidgetID,
+	id_content: WidgetID,
+	on_close_request: Option<Box<dyn FnOnce()>>,
+	on_downloaded: Option<Box<dyn FnOnce()>>,
+}
+
+fn doc_params(globals: &WguiGlobals) -> ParseDocumentParams<'_> {
+	ParseDocumentParams {
+		globals: globals.clone(),
+		path: AssetPath::BuiltIn("gui/view/download_file.xml"),
+		extra: Default::default(),
+	}
+}
+
+impl ViewTrait for View {
+	fn update(&mut self, par: &mut ViewUpdateParams) -> anyhow::Result<()> {
+		for task in self.tasks.drain() {
+			match task {
+				Task::StartDownload(url, path) => {
+					if let Some(on_downloaded) = self.on_downloaded.take() {
+						self
+							.executor
+							.spawn(View::download(self.tasks.clone(), url, path, on_downloaded))
+							.detach();
+					}
+				}
+				Task::SetStatusText(text) => {
+					let widgets = &mut par.layout.state.widgets;
+					widgets
+						.fetch(self.id_label_status)?
+						.cast::<WidgetLabel>()?
+						.set_text(&mut par.layout.common(), Translation::from_raw_text_string(text));
+				}
+				Task::ShowIconSuccess => {
+					par.layout.remove_children(self.id_loading_parent);
+					wgui_simple::create_icon(
+						par.layout,
+						self.id_loading_parent,
+						Vec2::splat(32.0),
+						AssetPath::BuiltIn("dashboard/check.svg"),
+					)?;
+
+					// "Close window" button
+					self
+						.parser_state
+						.realize_template(
+							&doc_params(&self.globals),
+							"btn_close",
+							par.layout,
+							self.id_content,
+							Default::default(),
+						)?
+						.fetch_component_as::<ComponentButton>("btn")?
+						.on_click(self.tasks.get_button_click_callback(Task::Close));
+				}
+				Task::ShowIconError => {
+					par.layout.remove_children(self.id_loading_parent);
+					wgui_simple::create_icon(
+						par.layout,
+						self.id_loading_parent,
+						Vec2::splat(32.0),
+						AssetPath::BuiltIn("dashboard/error.svg"),
+					)?;
+				}
+				Task::Close => {
+					if let Some(on_close) = self.on_close_request.take() {
+						on_close();
+					}
+				}
+			}
+		}
+		Ok(())
+	}
+}
+
+fn handle_async_result<T, E>(error_reason: &'static str, tasks: &Tasks<Task>, result: anyhow::Result<T, E>) -> Option<T>
+where
+	E: std::fmt::Debug,
+{
+	match result {
+		Ok(res) => Some(res),
+		Err(e) => {
+			tasks.push(Task::ShowIconError);
+			tasks.push(Task::SetStatusText(format!("{}: {:?}", error_reason, e)));
+			None
+		}
+	}
+}
+
+impl View {
+	pub fn new(
+		layout: &mut Layout,
+		id_parent: WidgetID,
+		on_close_request: Box<dyn FnOnce()>,
+		par: Params,
+	) -> anyhow::Result<Self> {
+		let tasks = Tasks::<Task>::new();
+
+		let parser_state = wgui::parser::parse_from_assets(&doc_params(&par.globals), layout, id_parent)?;
+		let id_label_status = parser_state.get_widget_id("label_status")?;
+		let id_content = parser_state.get_widget_id("content")?;
+		let id_loading_parent = parser_state.get_widget_id("loading_parent")?;
+
+		wgui_simple::create_loading(wgui_simple::CreateLoadingParams {
+			parent_id: id_loading_parent,
+			layout,
+			with_text: false,
+		})?;
+
+		let str_target_path = par.globals.i18n().translate("TARGET_PATH");
+
+		{
+			let label_target_path = parser_state.fetch_widget(&layout.state, "label_target_path")?.widget;
+			label_target_path.cast::<WidgetLabel>()?.set_text(
+				&mut layout.common(),
+				Translation::from_raw_text_string(format!("{}: {}", str_target_path, par.target_path.display())),
+			);
+		}
+
+		tasks.push(Task::StartDownload(par.url, par.target_path));
+
+		Ok(Self {
+			tasks,
+			globals: par.globals.clone(),
+			executor: par.executor.clone(),
+			parser_state,
+			id_label_status,
+			id_loading_parent,
+			id_content,
+			on_close_request: Some(on_close_request),
+			on_downloaded: Some(par.on_downloaded),
+		})
+	}
+
+	async fn download(
+		tasks: Tasks<Task>,
+		url: String,
+		target_path: PathBuf,
+		on_downloaded: Box<dyn FnOnce()>,
+	) -> Option<()> {
+		tasks.push(Task::SetStatusText(String::from("Connecting to the server...")));
+
+		// create parent directory if it doesn't exist yet
+		if let Some(parent) = target_path.parent() {
+			handle_async_result(
+				"Directory creation failed",
+				&tasks,
+				smol::fs::create_dir_all(parent).await,
+			)?;
+		}
+
+		// start downloading from the server with progress reporting
+		handle_async_result(
+			"Download failed",
+			&tasks,
+			http_client::download_to_file(
+				http_client::GetParams {
+					url: &url,
+					on_progress: Some(Box::new({
+						let tasks = tasks.clone();
+						move |data: ProgressFuncData| {
+							tasks.push(Task::SetStatusText(format!(
+								"{}/{} MiB ({}%)",
+								data.bytes_downloaded / 1024 / 1024,
+								data.file_size / 1024 / 1024,
+								(data.bytes_downloaded as f32 / data.file_size as f32 * 100.0).round()
+							)))
+						}
+					})),
+				},
+				&target_path,
+			)
+			.await,
+		)?;
+
+		tasks.push(Task::SetStatusText(String::from("Download finished")));
+		tasks.push(Task::ShowIconSuccess);
+
+		on_downloaded();
+
+		None
+	}
+}
+
+pub fn mount_popup(
+	popup: PopupHolder<View>,
+	frontend_tasks: FrontendTasks,
+	on_view_close: Box<dyn FnOnce()>,
+	params: Params,
+) {
+	frontend_tasks
+		.clone()
+		.push(FrontendTask::MountPopupOnce(MountPopupOnceParams::new(
+			Translation::from_translation_key("DOWNLOADER"),
+			Box::new(move |data| {
+				let on_close_request = popup.get_close_callback(data.layout);
+				let view = View::new(data.layout, data.id_content, on_close_request, params)?;
+
+				popup.set_view(data.handle, view, Some(on_view_close));
+				Ok(popup.get_close_callback(data.layout))
+			}),
+			Default::default(), /* extra */
+		)));
+}
diff --git a/dash-frontend/src/views/game_cover.rs b/dash-frontend/src/views/game_cover.rs
index 6adc4110..e0c4aae0 100644
--- a/dash-frontend/src/views/game_cover.rs
+++ b/dash-frontend/src/views/game_cover.rs
@@ -11,7 +11,7 @@ use wgui::{
 	globals::WguiGlobals,
 	i18n::Translation,
 	layout::{Layout, WidgetID},
-	renderer_vk::text::{FontWeight, HorizontalAlign, TextShadow, TextStyle, custom_glyph::CustomGlyphData},
+	renderer_vk::text::{FontWeight, HorizontalAlign, TextStyle, WguiTextShadow, custom_glyph::CustomGlyphData},
 	taffy::{
 		self, AlignItems, AlignSelf, JustifyContent, JustifySelf,
 		prelude::{auto, length, percent},
@@ -30,6 +30,7 @@ use wlx_common::async_executor::AsyncExecutor;
 use crate::util::{
 	cached_fetcher::{self, CoverArt},
 	steam_utils::{self, AppID},
+	wgui_simple,
 };
 
 pub struct ViewCommon {
@@ -48,6 +49,7 @@ pub struct Params<'a, 'b> {
 pub struct View {
 	pub button: Rc<ComponentButton>,
 	id_image_parent: WidgetID,
+	id_loading: WidgetID,
 	app_name: String,
 	app_id: AppID,
 }
@@ -59,12 +61,8 @@ const GAME_COVER_SIZE_X: f32 = 140.0;
 const GAME_COVER_SIZE_Y: f32 = 210.0;
 
 impl View {
-	async fn request_cover_image(
-		executor: AsyncExecutor,
-		manifest: steam_utils::AppManifest,
-		on_loaded: Box<dyn FnOnce(CoverArt)>,
-	) {
-		let cover_art = match cached_fetcher::request_image(executor, manifest.app_id.clone()).await {
+	async fn request_cover_image(manifest: steam_utils::AppManifest, on_loaded: Box<dyn FnOnce(CoverArt)>) {
+		let cover_art = match cached_fetcher::request_image(manifest.app_id.clone()).await {
 			Ok(cover_art) => cover_art,
 			Err(e) => {
 				log::error!("request_cover_image failed: {:?}", e);
@@ -105,16 +103,17 @@ impl View {
 				content: Translation::from_raw_text(text),
 				style: TextStyle {
 					weight: Some(FontWeight::Bold),
+					color: Some(drawing::Color::new(1.0, 1.0, 1.0, 1.0).into()),
 					wrap: true,
 					size: Some(16.0),
 					align: Some(HorizontalAlign::Center),
-					shadow: Some(TextShadow {
-						color: drawing::Color::new(0.0, 0.0, 0.0, 1.0),
-						x: 2.0,
-						y: 2.0,
+					shadow: Some(WguiTextShadow {
+						color: drawing::Color::new(0.0, 0.0, 0.0, 1.0).into(),
+						..Default::default()
 					}),
 					..Default::default()
 				},
+				..Default::default()
 			},
 		);
 
@@ -123,8 +122,8 @@ impl View {
 			label,
 			taffy::Style {
 				position: taffy::Position::Absolute,
-				align_self: Some(AlignSelf::Baseline),
-				justify_self: Some(JustifySelf::Center),
+				align_self: Some(AlignSelf::BASELINE),
+				justify_self: Some(JustifySelf::CENTER),
 				margin: taffy::Rect {
 					top: length(32.0),
 					bottom: auto(),
@@ -143,6 +142,8 @@ impl View {
 		layout: &mut Layout,
 		cover_art: &CoverArt,
 	) -> anyhow::Result<()> {
+		layout.remove_widget(self.id_loading);
+
 		if cover_art.compressed_image_data.is_empty() {
 			// mount placeholder
 			let img = view_common.get_placeholder_image()?.clone();
@@ -169,9 +170,9 @@ impl View {
 		let (widget_button, button) = components::button::construct(
 			params.ess,
 			components::button::Params {
-				color: Some(drawing::Color::new(1.0, 1.0, 1.0, 0.0)),
-				border_color: Some(BORDER_COLOR_DEFAULT),
-				hover_border_color: Some(BORDER_COLOR_HOVERED),
+				color: Some(drawing::Color::new(1.0, 1.0, 1.0, 0.0).into()),
+				border_color: Some(BORDER_COLOR_DEFAULT.into()),
+				hover_border_color: Some(BORDER_COLOR_HOVERED.into()),
 				round: WLength::Units(12.0),
 				border: 2.0,
 				tooltip: Some(TooltipInfo {
@@ -180,8 +181,8 @@ impl View {
 				}),
 				style: taffy::Style {
 					position: taffy::Position::Relative,
-					align_items: Some(taffy::AlignItems::Center),
-					justify_content: Some(taffy::JustifyContent::Center),
+					align_items: Some(AlignItems::CENTER),
+					justify_content: Some(JustifyContent::CENTER),
 					size: taffy::Size {
 						width: length(GAME_COVER_SIZE_X * params.scale),
 						height: length(GAME_COVER_SIZE_Y * params.scale),
@@ -202,16 +203,16 @@ impl View {
 					height: percent(1.0),
 				},
 				padding: taffy::Rect::length(2.0),
-				align_items: Some(AlignItems::Center),
-				justify_content: Some(JustifyContent::Center),
+				align_items: Some(AlignItems::CENTER),
+				justify_content: Some(JustifyContent::CENTER),
 				..Default::default()
 			},
 		)?;
 
 		let rect_gradient = |color: drawing::Color, color2: drawing::Color| {
 			rectangle::WidgetRectangle::create(rectangle::WidgetRectangleParams {
-				color,
-				color2,
+				color: color.into(),
+				color2: color2.into(),
 				round: WLength::Units(12.0),
 				gradient: GradientMode::Vertical,
 				..Default::default()
@@ -235,7 +236,7 @@ impl View {
 				drawing::Color::new(1.0, 1.0, 1.0, 0.2),
 				drawing::Color::new(1.0, 1.0, 1.0, 0.02),
 			),
-			rect_gradient_style(taffy::AlignSelf::Baseline, 0.05),
+			rect_gradient_style(taffy::AlignSelf::BASELINE, 0.05),
 		)?;
 
 		// not optimal, this forces us to create a new pass for every created cover art just to overlay various rectangles at the top of the image cover art
@@ -248,7 +249,7 @@ impl View {
 				drawing::Color::new(1.0, 1.0, 1.0, 0.15),
 				drawing::Color::new(1.0, 1.0, 1.0, 0.0),
 			),
-			rect_gradient_style(taffy::AlignSelf::Baseline, 0.5),
+			rect_gradient_style(taffy::AlignSelf::BASELINE, 0.5),
 		)?;
 
 		// bottom black gradient
@@ -258,7 +259,7 @@ impl View {
 				drawing::Color::new(0.0, 0.0, 0.0, 0.0),
 				drawing::Color::new(0.0, 0.0, 0.0, 0.25),
 			),
-			rect_gradient_style(taffy::AlignSelf::End, 0.5),
+			rect_gradient_style(taffy::AlignSelf::END, 0.5),
 		)?;
 
 		// bottom shadow
@@ -268,14 +269,19 @@ impl View {
 				drawing::Color::new(0.0, 0.0, 0.0, 0.1),
 				drawing::Color::new(0.0, 0.0, 0.0, 0.9),
 			),
-			rect_gradient_style(taffy::AlignSelf::End, 0.05),
+			rect_gradient_style(taffy::AlignSelf::END, 0.05),
 		)?;
 
+		let id_loading = wgui_simple::create_loading(wgui_simple::CreateLoadingParams {
+			layout: params.ess.layout,
+			parent_id: image_parent.id,
+			with_text: false,
+		})?;
+
 		// request cover image data from the internet or disk cache
 		params
 			.executor
 			.spawn(View::request_cover_image(
-				params.executor.clone(),
 				params.manifest.clone(),
 				Box::new(params.on_loaded),
 			))
@@ -286,6 +292,7 @@ impl View {
 			id_image_parent: image_parent.id,
 			app_name: params.manifest.name.clone(),
 			app_id: params.manifest.app_id.clone(),
+			id_loading,
 		})
 	}
 }
diff --git a/dash-frontend/src/views/game_launcher.rs b/dash-frontend/src/views/game_launcher.rs
index 03d26d77..f10163e3 100644
--- a/dash-frontend/src/views/game_launcher.rs
+++ b/dash-frontend/src/views/game_launcher.rs
@@ -4,9 +4,10 @@ use crate::{
 	frontend::{FrontendTask, FrontendTasks, SoundType},
 	util::{
 		cached_fetcher::{self, CoverArt},
+		popup_manager::{MountPopupOnceParams, PopupHolder},
 		steam_utils::{self, AppID, AppManifest},
 	},
-	views::game_cover,
+	views::{ViewTrait, ViewUpdateParams, game_cover},
 };
 use wgui::{
 	assets::AssetPath,
@@ -34,13 +35,14 @@ pub struct Params<'a> {
 	pub layout: &'a mut Layout,
 	pub parent_id: WidgetID,
 	pub frontend_tasks: &'a FrontendTasks,
-	pub on_launched: Box<dyn Fn()>,
+	pub on_launched: Box<dyn FnOnce()>,
 }
+
 pub struct View {
 	#[allow(dead_code)]
 	state: ParserState,
 	tasks: Tasks<Task>,
-	on_launched: Box<dyn Fn()>,
+	on_launched: Option<Box<dyn FnOnce()>>,
 	frontend_tasks: FrontendTasks,
 
 	game_cover_view_common: game_cover::ViewCommon,
@@ -48,9 +50,33 @@ pub struct View {
 	app_id: AppID,
 }
 
+impl ViewTrait for View {
+	fn update(&mut self, par: &mut ViewUpdateParams) -> anyhow::Result<()> {
+		loop {
+			let tasks = self.tasks.drain();
+			if tasks.is_empty() {
+				break;
+			}
+			for task in tasks {
+				match task {
+					Task::FillAppDetails(details) => self.action_fill_app_details(par.layout, details)?,
+					Task::Launch => self.action_launch(),
+					Task::SetCoverArt(cover_art) => {
+						let _ = self
+							.view_cover
+							.set_cover_art(&mut self.game_cover_view_common, par.layout, &cover_art);
+					}
+				}
+			}
+		}
+
+		Ok(())
+	}
+}
+
 impl View {
-	async fn fetch_details(executor: AsyncExecutor, tasks: Tasks<Task>, app_id: AppID) {
-		let Some(details) = cached_fetcher::get_app_details_json(executor, app_id).await else {
+	async fn fetch_details(tasks: Tasks<Task>, app_id: AppID) {
+		let Some(details) = cached_fetcher::get_app_details_json(app_id).await else {
 			return;
 		};
 
@@ -77,7 +103,7 @@ impl View {
 		let tasks = Tasks::new();
 
 		// fetch details from the web
-		let fut = View::fetch_details(params.executor.clone(), tasks.clone(), params.manifest.app_id.clone());
+		let fut = View::fetch_details(tasks.clone(), params.manifest.app_id.clone());
 		params.executor.spawn(fut).detach();
 
 		let id_cover_art_parent = state.get_widget_id("cover_art_parent")?;
@@ -104,7 +130,7 @@ impl View {
 		Ok(Self {
 			state,
 			tasks,
-			on_launched: params.on_launched,
+			on_launched: Some(params.on_launched),
 			frontend_tasks: params.frontend_tasks.clone(),
 			game_cover_view_common: game_cover::ViewCommon::new(params.globals.clone()),
 			view_cover,
@@ -112,43 +138,20 @@ impl View {
 		})
 	}
 
-	pub fn update(&mut self, layout: &mut Layout) -> anyhow::Result<()> {
-		loop {
-			let tasks = self.tasks.drain();
-			if tasks.is_empty() {
-				break;
-			}
-			for task in tasks {
-				match task {
-					Task::FillAppDetails(details) => self.action_fill_app_details(layout, details)?,
-					Task::Launch => self.action_launch(),
-					Task::SetCoverArt(cover_art) => {
-						let _ = self
-							.view_cover
-							.set_cover_art(&mut self.game_cover_view_common, layout, &cover_art);
-					}
-				}
-			}
-		}
-
-		Ok(())
-	}
-
 	fn action_fill_app_details(
 		&mut self,
 		layout: &mut Layout,
 		mut details: cached_fetcher::AppDetailsJSONData,
 	) -> anyhow::Result<()> {
-		let mut c = layout.start_common();
-
 		{
-			let label_author = self.state.fetch_widget(&c.layout.state, "label_author")?.widget;
-			let label_description = self.state.fetch_widget(&c.layout.state, "label_description")?.widget;
+			let mut c = layout.common();
+			let label_author = self.state.fetch_widget(c.state, "label_author")?.widget;
+			let label_description = self.state.fetch_widget(c.state, "label_description")?.widget;
 
 			if let Some(developer) = details.developers.pop() {
 				label_author
 					.cast::<WidgetLabel>()?
-					.set_text(&mut c.common(), Translation::from_raw_text_string(developer));
+					.set_text(&mut c, Translation::from_raw_text_string(developer));
 			}
 
 			let desc = if let Some(desc) = &details.short_description {
@@ -162,11 +165,10 @@ impl View {
 			if let Some(desc) = desc {
 				label_description
 					.cast::<WidgetLabel>()?
-					.set_text(&mut c.common(), Translation::from_raw_text(desc));
+					.set_text(&mut c, Translation::from_raw_text(desc));
 			}
 		}
 
-		c.finish()?;
 		Ok(())
 	}
 
@@ -190,6 +192,38 @@ impl View {
 			}
 		}
 
-		(*self.on_launched)();
+		if let Some(on_launched) = self.on_launched.take() {
+			on_launched();
+		}
 	}
 }
+
+pub fn mount_popup(
+	frontend_tasks: FrontendTasks,
+	executor: AsyncExecutor,
+	globals: WguiGlobals,
+	manifest: AppManifest,
+	popup: PopupHolder<View>,
+) {
+	frontend_tasks
+		.clone()
+		.push(FrontendTask::MountPopupOnce(MountPopupOnceParams::new(
+			Translation::from_raw_text(&manifest.name),
+			Box::new(move |data| {
+				let on_launched = popup.get_close_callback(data.layout);
+				let view = View::new(Params {
+					manifest: manifest.clone(),
+					executor: executor.clone(),
+					globals: &globals,
+					layout: data.layout,
+					parent_id: data.id_content,
+					frontend_tasks: &frontend_tasks,
+					on_launched,
+				})?;
+
+				popup.set_view(data.handle, view, None);
+				Ok(popup.get_close_callback(data.layout))
+			}),
+			Default::default(), /* extra */
+		)));
+}
diff --git a/dash-frontend/src/views/game_list.rs b/dash-frontend/src/views/game_list.rs
index 5de3cf64..1097f5f2 100644
--- a/dash-frontend/src/views/game_list.rs
+++ b/dash-frontend/src/views/game_list.rs
@@ -1,4 +1,4 @@
-use std::{cell::RefCell, collections::HashMap, rc::Rc};
+use std::{collections::HashMap, rc::Rc};
 
 use wgui::{
 	assets::AssetPath,
@@ -16,20 +16,19 @@ use wgui::{
 use wlx_common::async_executor::AsyncExecutor;
 
 use crate::{
-	frontend::{FrontendTask, FrontendTasks},
+	frontend::FrontendTasks,
 	util::{
 		cached_fetcher::CoverArt,
-		popup_manager::{MountPopupParams, PopupHandle},
+		popup_manager::PopupHolder,
 		steam_utils::{self, AppID, SteamUtils},
 	},
-	views::{self, game_cover, game_launcher},
+	views::{self, ViewTrait, ViewUpdateParams, game_cover},
 };
 
 #[derive(Clone)]
 enum Task {
 	AppManifestClicked(steam_utils::AppManifest),
 	SetCoverArt(AppID, Rc<CoverArt>),
-	CloseLauncher,
 	LoadManifests,
 	FillPage(u32),
 	PrevPage,
@@ -42,6 +41,7 @@ pub struct Params<'a> {
 	pub frontend_tasks: FrontendTasks,
 	pub layout: &'a mut Layout,
 	pub parent_id: WidgetID,
+	pub steam_utils: &'a SteamUtils,
 }
 
 const MAX_GAMES_PER_PAGE: u32 = 30;
@@ -50,10 +50,6 @@ pub struct GameCoverCell {
 	view_cover: game_cover::View,
 }
 
-struct State {
-	view_launcher: Option<(PopupHandle, views::game_launcher::View)>,
-}
-
 pub struct View {
 	#[allow(dead_code)]
 	parser_state: ParserState,
@@ -63,12 +59,37 @@ pub struct View {
 	id_list_parent: WidgetID,
 	game_cover_view_common: game_cover::ViewCommon,
 	executor: AsyncExecutor,
-	state: Rc<RefCell<State>>,
 	mounted_game_covers: HashMap<AppID, GameCoverCell>,
 	all_manifests: Vec<steam_utils::AppManifest>,
 	cur_page: u32,
 	page_count: u32,
 	id_label_page: WidgetID,
+	view_launcher: PopupHolder<views::game_launcher::View>,
+	steam_utils: SteamUtils,
+}
+
+impl ViewTrait for View {
+	fn update(&mut self, par: &mut ViewUpdateParams) -> anyhow::Result<()> {
+		loop {
+			let tasks = self.tasks.drain();
+			if tasks.is_empty() {
+				break;
+			}
+			for task in tasks {
+				match task {
+					Task::LoadManifests => self.load_manifests(),
+					Task::FillPage(page_idx) => self.fill_page(par.layout, par.executor, page_idx)?,
+					Task::AppManifestClicked(manifest) => self.action_app_manifest_clicked(manifest)?,
+					Task::SetCoverArt(app_id, cover_art) => self.set_cover_art(par.layout, app_id, cover_art),
+					Task::PrevPage => self.page_prev(),
+					Task::NextPage => self.page_next(),
+				}
+			}
+		}
+
+		self.view_launcher.update(par)?;
+		Ok(())
+	}
 }
 
 impl View {
@@ -105,46 +126,15 @@ impl View {
 			id_list_parent: list_parent.id,
 			mounted_game_covers: HashMap::new(),
 			game_cover_view_common: game_cover::ViewCommon::new(params.globals.clone()),
-			state: Rc::new(RefCell::new(State { view_launcher: None })),
 			executor: params.executor,
 			all_manifests: Vec::new(),
 			cur_page: 0,
 			page_count: 0,
 			id_label_page,
+			view_launcher: Default::default(),
+			steam_utils: params.steam_utils.clone(),
 		})
 	}
-
-	pub fn update(
-		&mut self,
-		layout: &mut Layout,
-		steam_utils: &mut SteamUtils,
-		executor: &AsyncExecutor,
-	) -> anyhow::Result<()> {
-		loop {
-			let tasks = self.tasks.drain();
-			if tasks.is_empty() {
-				break;
-			}
-			for task in tasks {
-				match task {
-					Task::LoadManifests => self.load_manifests(steam_utils),
-					Task::FillPage(page_idx) => self.fill_page(layout, executor, page_idx)?,
-					Task::AppManifestClicked(manifest) => self.action_app_manifest_clicked(manifest)?,
-					Task::SetCoverArt(app_id, cover_art) => self.set_cover_art(layout, app_id, cover_art),
-					Task::CloseLauncher => self.state.borrow_mut().view_launcher = None,
-					Task::PrevPage => self.page_prev(),
-					Task::NextPage => self.page_next(),
-				}
-			}
-		}
-
-		let mut state = self.state.borrow_mut();
-		if let Some((_, view)) = &mut state.view_launcher {
-			view.update(layout)?;
-		}
-
-		Ok(())
-	}
 }
 
 fn fill_game_list(
@@ -187,8 +177,11 @@ fn fill_game_list(
 }
 
 impl View {
-	fn load_manifests(&mut self, steam_utils: &mut SteamUtils) {
-		match steam_utils.list_installed_games(steam_utils::GameSortMethod::PlayDateDesc) {
+	fn load_manifests(&mut self) {
+		match self
+			.steam_utils
+			.list_installed_games(steam_utils::GameSortMethod::PlayDateDesc)
+		{
 			Ok(manifests) => {
 				self.page_count = (manifests.len() as u32 + MAX_GAMES_PER_PAGE) / MAX_GAMES_PER_PAGE;
 				self.all_manifests = manifests;
@@ -233,16 +226,14 @@ impl View {
 		}
 
 		// set page text
-		let mut c = layout.start_common();
 		{
-			let mut common = c.common();
-			let mut widget = common.state.widgets.cast_as::<WidgetLabel>(self.id_label_page)?;
+			let mut c = layout.common();
+			let mut widget = c.state.widgets.cast_as::<WidgetLabel>(self.id_label_page)?;
 			widget.set_text(
-				&mut common,
+				&mut c,
 				Translation::from_raw_text_string(format!("{}/{}", self.cur_page + 1, self.page_count)),
 			);
 		}
-		c.finish()?;
 
 		fill_game_list(
 			&mut ConstructEssentials {
@@ -283,36 +274,13 @@ impl View {
 	}
 
 	fn action_app_manifest_clicked(&mut self, manifest: steam_utils::AppManifest) -> anyhow::Result<()> {
-		self.frontend_tasks.push(FrontendTask::MountPopup(MountPopupParams {
-			title: Translation::from_raw_text(&manifest.name),
-			on_content: {
-				let state = self.state.clone();
-				let tasks = self.tasks.clone();
-				let executor = self.executor.clone();
-				let globals = self.globals.clone();
-				let frontend_tasks = self.frontend_tasks.clone();
-
-				Rc::new(move |data| {
-					let on_launched = {
-						let tasks = tasks.clone();
-						Box::new(move || tasks.push(Task::CloseLauncher))
-					};
-
-					let view = game_launcher::View::new(game_launcher::Params {
-						manifest: manifest.clone(),
-						executor: executor.clone(),
-						globals: &globals,
-						layout: data.layout,
-						parent_id: data.id_content,
-						frontend_tasks: &frontend_tasks,
-						on_launched,
-					})?;
-
-					state.borrow_mut().view_launcher = Some((data.handle, view));
-					Ok(())
-				})
-			},
-		}));
+		views::game_launcher::mount_popup(
+			self.frontend_tasks.clone(),
+			self.executor.clone(),
+			self.globals.clone(),
+			manifest,
+			self.view_launcher.clone(),
+		);
 
 		Ok(())
 	}
diff --git a/dash-frontend/src/views/input_profiles.rs b/dash-frontend/src/views/input_profiles.rs
new file mode 100644
index 00000000..ca12b261
--- /dev/null
+++ b/dash-frontend/src/views/input_profiles.rs
@@ -0,0 +1,124 @@
+use std::rc::Rc;
+use wgui::{
+	assets::AssetPath,
+	components::button::ComponentButton,
+	globals::WguiGlobals,
+	i18n::Translation,
+	layout::{Layout, WidgetID},
+	parser::{Fetchable, ParseDocumentParams, TemplateParams},
+	task::Tasks,
+};
+use wlx_common::{openxr_bindings_schema::XrControllerProfile, openxr_controller_profiles::OPENXR_INPUT_PROFILES};
+
+use crate::{
+	frontend::{FrontendTask, FrontendTasks},
+	util::popup_manager::{MountPopupOnceParams, PopupHolder},
+	views::{self, ViewTrait, ViewUpdateParams, bindings},
+};
+
+#[derive(Clone)]
+enum Task {
+	SelectProfile(&'static XrControllerProfile),
+}
+
+pub struct Params<'a> {
+	pub globals: WguiGlobals,
+	pub layout: &'a mut Layout,
+	pub parent_id: WidgetID,
+	pub frontend_tasks: &'a FrontendTasks,
+}
+
+pub struct View {
+	tasks: Tasks<Task>,
+	frontend_tasks: FrontendTasks,
+	globals: WguiGlobals,
+	bindings_popup: PopupHolder<bindings::View>,
+}
+
+impl ViewTrait for View {
+	fn update(&mut self, par: &mut ViewUpdateParams) -> anyhow::Result<()> {
+		self.bindings_popup.update(par)?;
+
+		for task in self.tasks.drain() {
+			match task {
+				Task::SelectProfile(profile) => {
+					views::bindings::mount_popup(
+						self.frontend_tasks.clone(),
+						self.globals.clone(),
+						self.bindings_popup.clone(),
+						profile,
+					);
+				}
+			}
+		}
+		Ok(())
+	}
+}
+
+impl View {
+	pub fn new(params: Params) -> anyhow::Result<Self> {
+		let doc_params = &ParseDocumentParams {
+			globals: params.globals.clone(),
+			path: AssetPath::BuiltIn("gui/view/input_profiles.xml"),
+			extra: Default::default(),
+		};
+
+		let mut parser_state = wgui::parser::parse_from_assets(doc_params, params.layout, params.parent_id)?;
+
+		let list_parent = parser_state.fetch_widget(&params.layout.state, "list_parent")?.id;
+
+		let tasks = Tasks::new();
+
+		for (idx, profile) in OPENXR_INPUT_PROFILES.iter().enumerate() {
+			let id = format!("profile_btn_{idx}");
+
+			let mut cell_params = TemplateParams::new();
+			cell_params.insert("id", &id);
+			cell_params.insert("text", profile.display_name);
+
+			parser_state.instantiate_template(
+				doc_params,
+				"InputProfileButton",
+				params.layout,
+				list_parent,
+				cell_params,
+			)?;
+
+			let btn = parser_state.fetch_component_as::<ComponentButton>(&id)?;
+			let tasks_clone = tasks.clone();
+			btn.on_click(Rc::new({
+				move |_common, _e| {
+					tasks_clone.push(Task::SelectProfile(profile));
+					Ok(())
+				}
+			}));
+		}
+
+		Ok(Self {
+			tasks,
+			frontend_tasks: params.frontend_tasks.clone(),
+			globals: params.globals.clone(),
+			bindings_popup: Default::default(),
+		})
+	}
+}
+
+pub fn mount_popup(frontend_tasks: FrontendTasks, globals: WguiGlobals, popup: PopupHolder<View>) {
+	frontend_tasks
+		.clone()
+		.push(FrontendTask::MountPopupOnce(MountPopupOnceParams::new(
+			Translation::from_translation_key("APP_SETTINGS.INPUT_PROFILES"),
+			Box::new(move |data| {
+				let view = View::new(Params {
+					globals: globals.clone(),
+					layout: data.layout,
+					parent_id: data.id_content,
+					frontend_tasks: &frontend_tasks,
+				})?;
+
+				popup.set_view(data.handle, view, None);
+				Ok(popup.get_close_callback(data.layout))
+			}),
+			Default::default(), /* extra */
+		)));
+}
diff --git a/dash-frontend/src/views/mod.rs b/dash-frontend/src/views/mod.rs
index d2cd9369..1c6b7f06 100644
--- a/dash-frontend/src/views/mod.rs
+++ b/dash-frontend/src/views/mod.rs
@@ -1,6 +1,28 @@
+use wlx_common::{async_executor::AsyncExecutor, config::GeneralConfig, dash_interface::ConfigChangeKind};
+
 pub mod app_launcher;
 pub mod audio_settings;
+pub mod bindings;
+pub mod color_palettes;
+pub mod dialog_box;
+pub mod download_file;
 pub mod game_cover;
 pub mod game_launcher;
 pub mod game_list;
+pub mod input_profiles;
+pub mod remote_skymap_downloader;
+pub mod remote_skymap_list;
 pub mod running_games_list;
+pub mod skymap_list;
+pub mod skymap_list_cell;
+
+pub struct ViewUpdateParams<'a> {
+	pub layout: &'a mut wgui::layout::Layout,
+	pub executor: &'a AsyncExecutor,
+	pub general_config: &'a mut GeneralConfig,
+	pub config_change_kind: &'a mut Option<ConfigChangeKind>,
+}
+
+pub trait ViewTrait {
+	fn update(&mut self, par: &mut ViewUpdateParams) -> anyhow::Result<()>;
+}
diff --git a/dash-frontend/src/views/remote_skymap_downloader.rs b/dash-frontend/src/views/remote_skymap_downloader.rs
new file mode 100644
index 00000000..e3bfe8bf
--- /dev/null
+++ b/dash-frontend/src/views/remote_skymap_downloader.rs
@@ -0,0 +1,398 @@
+use std::rc::Rc;
+
+use crate::{
+	frontend::{FrontendTask, FrontendTasks},
+	util::{
+		networking::{self, skymap_catalog::SkymapResolution},
+		popup_manager::{MountPopupOnceParams, PopupHolder},
+	},
+	views::{self, ViewTrait, ViewUpdateParams},
+};
+use anyhow::Context;
+use wgui::{
+	assets::AssetPath,
+	color::WguiColorName,
+	components::button::ComponentButton,
+	globals::WguiGlobals,
+	i18n::Translation,
+	layout::{Layout, WidgetID},
+	parser::{Fetchable, ParseDocumentParams, ParserState, TemplateParams},
+	renderer_vk::text::custom_glyph::CustomGlyphData,
+	task::Tasks,
+	widget::{image::WidgetImage, label::WidgetLabel},
+};
+use wlx_common::{async_executor::AsyncExecutor, config_io, dash_interface::ConfigChangeKind};
+
+pub struct Params<'a> {
+	pub globals: &'a WguiGlobals,
+	pub layout: &'a mut Layout,
+	pub executor: &'a AsyncExecutor,
+	pub frontend_tasks: FrontendTasks,
+	pub parent_id: WidgetID,
+	pub entry: networking::skymap_catalog::SkymapCatalogEntry,
+	pub preview_image: CustomGlyphData,
+	pub preview_image_compressed: Rc<Vec<u8>>,
+	pub on_updated_library: Rc<dyn Fn()>,
+}
+
+#[derive(Clone)]
+enum Task {
+	Refresh,
+	ResolutionClicked(SkymapResolution),
+	DownloadFinished,
+	RunDownload(SkymapResolution),
+	RemoveFile(SkymapResolution),
+	SetSkymap(SkymapResolution),
+}
+
+pub struct View {
+	entry: networking::skymap_catalog::SkymapCatalogEntry,
+	frontend_tasks: FrontendTasks,
+	globals: WguiGlobals,
+	tasks: Tasks<Task>,
+	executor: AsyncExecutor,
+
+	id_resolution_buttons: WidgetID,
+
+	#[allow(dead_code)]
+	parser_state: ParserState,
+
+	popup_download: PopupHolder<views::download_file::View>,
+	popup_dialog_box: PopupHolder<views::dialog_box::View>,
+
+	preview_image_compressed: Rc<Vec<u8>>,
+	on_updated_library: Rc<dyn Fn()>,
+}
+
+fn mount_resolution_button(
+	layout: &mut Layout,
+	parser_state: &mut ParserState,
+	doc_params: &ParseDocumentParams,
+	parent_id: WidgetID,
+	res: SkymapResolution,
+	tasks: &Tasks<Task>,
+	already_downloaded: bool,
+) -> anyhow::Result<()> {
+	let mut t = TemplateParams::new();
+	t.insert("text", res.get_display_str());
+	t.insert(
+		"sprite",
+		match already_downloaded {
+			true => "dashboard/check.svg",
+			false => "dashboard/download.svg",
+		},
+	);
+	let data = parser_state.realize_template(doc_params, "ResolutionButton", layout, parent_id, t)?;
+	let button = data.fetch_component_as::<ComponentButton>("button")?;
+
+	if already_downloaded {
+		button.set_color(&mut layout.common(), WguiColorName::Tertiary.into()); // green
+	}
+	tasks.handle_button(&button, Task::ResolutionClicked(res));
+	Ok(())
+}
+
+impl ViewTrait for View {
+	fn update(&mut self, par: &mut ViewUpdateParams) -> anyhow::Result<()> {
+		for task in self.tasks.drain() {
+			match task {
+				Task::ResolutionClicked(resolution) => {
+					self.resolution_clicked(resolution)?;
+				}
+				Task::Refresh => {
+					self.refresh(par.layout)?;
+				}
+				Task::DownloadFinished => {
+					self.download_finished()?;
+				}
+				Task::RunDownload(resolution) => {
+					self.run_download(resolution)?;
+				}
+				Task::RemoveFile(resolution) => {
+					self.remove_file(resolution)?;
+				}
+				Task::SetSkymap(resolution) => {
+					let skymap_file_path = self
+						.entry
+						.get_destination_path(resolution)
+						.context("Skymap not found" /* you shouldn't really see this, like ever. */)?;
+
+					par.general_config.skybox_texture = skymap_file_path
+						.to_str()
+						.context("Skymap filename not valid UTF-8")?
+						.into();
+					*par.config_change_kind = Some(ConfigChangeKind::EnvironmentBlend);
+				}
+			}
+		}
+
+		self.popup_download.update(par)?;
+		self.popup_dialog_box.update(par)?;
+		Ok(())
+	}
+}
+
+fn doc_params(globals: &WguiGlobals) -> ParseDocumentParams<'_> {
+	ParseDocumentParams {
+		globals: globals.clone(),
+		path: AssetPath::BuiltIn("gui/view/remote_skymap_downloader.xml"),
+		extra: Default::default(),
+	}
+}
+
+impl View {
+	pub fn new(par: Params) -> anyhow::Result<Self> {
+		let tasks = Tasks::<Task>::new();
+
+		let parser_state = wgui::parser::parse_from_assets(&doc_params(par.globals), par.layout, par.parent_id)?;
+		let id_resolution_buttons = parser_state.get_widget_id("resolution_buttons")?;
+
+		let str_version = par.globals.i18n().translate("VERSION");
+		let str_creation_date = par.globals.i18n().translate("CREATION_DATE");
+		let str_modification_date = par.globals.i18n().translate("MODIFICATION_DATE");
+
+		let image = parser_state.fetch_widget(&par.layout.state, "image")?.widget;
+		let mut image = image.cast::<WidgetImage>()?;
+		image.set_content(&mut par.layout.alterables, Some(par.preview_image));
+
+		// Set author label
+		parser_state
+			.fetch_widget_as::<WidgetLabel>(&par.layout.state, "label_author")?
+			.set_text_simple(
+				&mut par.globals.get(),
+				Translation::from_raw_text_string(format!("by {}", par.entry.author)),
+			);
+
+		// Set description label
+		parser_state
+			.fetch_widget_as::<WidgetLabel>(&par.layout.state, "label_description")?
+			.set_text_simple(
+				&mut par.globals.get(),
+				Translation::from_raw_text(&par.entry.description),
+			);
+
+		// Set version label
+		parser_state
+			.fetch_widget_as::<WidgetLabel>(&par.layout.state, "label_version")?
+			.set_text_simple(
+				&mut par.globals.get(),
+				Translation::from_raw_text_string(format!("{}: {}", str_version, par.entry.version)),
+			);
+
+		// Set creation date label
+		parser_state
+			.fetch_widget_as::<WidgetLabel>(&par.layout.state, "label_creation_date")?
+			.set_text_simple(
+				&mut par.globals.get(),
+				Translation::from_raw_text_string(format!("{}: {}", str_creation_date, par.entry.created_at)),
+			);
+
+		// Set modification date label
+		parser_state
+			.fetch_widget_as::<WidgetLabel>(&par.layout.state, "label_modification_date")?
+			.set_text_simple(
+				&mut par.globals.get(),
+				Translation::from_raw_text_string(format!("{}: {}", str_modification_date, par.entry.created_at)),
+			);
+
+		tasks.push(Task::Refresh);
+
+		Ok(Self {
+			tasks,
+			globals: par.globals.clone(),
+			executor: par.executor.clone(),
+			entry: par.entry,
+			parser_state,
+			frontend_tasks: par.frontend_tasks,
+			popup_download: Default::default(),
+			popup_dialog_box: Default::default(),
+			id_resolution_buttons,
+			preview_image_compressed: par.preview_image_compressed,
+			on_updated_library: par.on_updated_library,
+		})
+	}
+
+	fn refresh(&mut self, layout: &mut Layout) -> anyhow::Result<()> {
+		layout.remove_children(self.id_resolution_buttons);
+
+		let files = &self.entry.files;
+		let mut mount_res = |res: SkymapResolution| -> anyhow::Result<()> {
+			mount_resolution_button(
+				layout,
+				&mut self.parser_state,
+				&doc_params(&self.globals),
+				self.id_resolution_buttons,
+				res,
+				&self.tasks,
+				self.entry.is_downloaded(res)?,
+			)
+		};
+
+		mount_res(SkymapResolution::Res2k)?;
+		if files.size_4k.is_some() {
+			mount_res(SkymapResolution::Res4k)?;
+		}
+		if files.size_8k.is_some() {
+			mount_res(SkymapResolution::Res8k)?;
+		}
+		Ok(())
+	}
+
+	fn resolution_clicked(&mut self, resolution: SkymapResolution) -> anyhow::Result<()> {
+		let is_downloaded = self.entry.is_downloaded(resolution).unwrap_or(false);
+		if !is_downloaded {
+			self.tasks.push(Task::RunDownload(resolution));
+		} else {
+			self.show_dialog_box_action(resolution)?;
+		}
+		Ok(())
+	}
+
+	fn show_dialog_box_action(&mut self, resolution: SkymapResolution) -> anyhow::Result<()> {
+		const ACTION_REMOVE: &str = "remove";
+		const ACTION_DOWNLOAD_AGAIN: &str = "download_again";
+		const ACTION_APPLY: &str = "apply";
+
+		let tasks = self.tasks.clone();
+
+		views::dialog_box::mount_popup(
+			self.popup_dialog_box.clone(),
+			self.frontend_tasks.clone(),
+			views::dialog_box::Params {
+				globals: self.globals.clone(),
+				message: Translation::from_translation_key("APP_SETTINGS.SKYMAP_ALREADY_DOWNLOADED"),
+				entries: vec![
+					views::dialog_box::ButtonEntry {
+						content: Translation::from_translation_key("REMOVE"),
+						icon: "dashboard/trash.svg",
+						action: ACTION_REMOVE,
+					},
+					views::dialog_box::ButtonEntry {
+						content: Translation::from_translation_key("DOWNLOAD_AGAIN"),
+						icon: "dashboard/download.svg",
+						action: ACTION_DOWNLOAD_AGAIN,
+					},
+					views::dialog_box::ButtonEntry {
+						content: Translation::from_translation_key("APPLY"),
+						icon: "dashboard/check.svg",
+						action: ACTION_APPLY,
+					},
+				],
+				on_action_click: Box::new(move |action| match action {
+					ACTION_REMOVE => {
+						tasks.push(Task::RemoveFile(resolution));
+						tasks.push(Task::Refresh);
+					}
+					ACTION_DOWNLOAD_AGAIN => {
+						tasks.push(Task::RunDownload(resolution));
+						tasks.push(Task::Refresh);
+					}
+					ACTION_APPLY => {
+						tasks.push(Task::SetSkymap(resolution));
+						tasks.push(Task::Refresh);
+					}
+					_ => unreachable!(),
+				}),
+			},
+		);
+
+		Ok(())
+	}
+
+	fn download_finished(&mut self) -> anyhow::Result<()> {
+		self.entry.save_metadata()?;
+		let mut uuids = config_io::get_skymaps_uuids().unwrap_or_default();
+		let uuid_str = self.entry.uuid.to_string();
+		if !uuids.contains(&uuid_str) {
+			uuids.push(uuid_str);
+		}
+		config_io::set_skymaps_uuids(&uuids)?;
+
+		// Save preview image
+		self.entry.files.save_preview_to_file(&self.preview_image_compressed)?;
+
+		(*self.on_updated_library)();
+
+		Ok(())
+	}
+
+	fn run_download(&mut self, resolution: SkymapResolution) -> anyhow::Result<()> {
+		let Some(url) = self.entry.files.get_url_from_res(resolution) else {
+			return Ok(());
+		};
+
+		let Some(target_path) = self.entry.get_destination_path(resolution) else {
+			return Ok(());
+		};
+
+		views::download_file::mount_popup(
+			self.popup_download.clone(),
+			self.frontend_tasks.clone(),
+			self.tasks.make_callback_box(Task::Refresh),
+			views::download_file::Params {
+				globals: self.globals.clone(),
+				executor: self.executor.clone(),
+				target_path,
+				url,
+				on_downloaded: self.tasks.make_callback_box(Task::DownloadFinished),
+			},
+		);
+		Ok(())
+	}
+
+	fn remove_file(&mut self, resolution: SkymapResolution) -> anyhow::Result<()> {
+		self.entry.remove_file(resolution);
+
+		if !self.entry.has_any_downloaded() {
+			// all skymaps of this uuid are removed, clean-up files
+			self.entry.remove_metadata();
+
+			// remove uuid of this entry from downloaded skymaps uuid and save the file again
+			let mut uuids = config_io::get_skymaps_uuids().unwrap_or_default();
+			uuids.retain(|uuid| *uuid != self.entry.uuid.to_string());
+			config_io::set_skymaps_uuids(&uuids)?;
+
+			// remove "_preview.dds" files from the disk too
+			self.entry.files.remove_preview_file();
+		}
+
+		(*self.on_updated_library)();
+
+		Ok(())
+	}
+}
+
+#[allow(clippy::too_many_arguments)]
+pub fn mount_popup(
+	frontend_tasks: FrontendTasks,
+	executor: AsyncExecutor,
+	globals: WguiGlobals,
+	entry: networking::skymap_catalog::SkymapCatalogEntry,
+	preview_image: CustomGlyphData,
+	preview_image_compressed: Rc<Vec<u8>>,
+	on_updated_library: Rc<dyn Fn()>,
+	popup: PopupHolder<View>,
+) {
+	frontend_tasks
+		.clone()
+		.push(FrontendTask::MountPopupOnce(MountPopupOnceParams::new(
+			Translation::from_raw_text(&entry.name),
+			Box::new(move |data| {
+				let view = View::new(Params {
+					globals: &globals,
+					layout: data.layout,
+					executor: &executor,
+					parent_id: data.id_content,
+					entry,
+					preview_image,
+					frontend_tasks: frontend_tasks.clone(),
+					preview_image_compressed,
+					on_updated_library,
+				})?;
+
+				popup.set_view(data.handle, view, None);
+				Ok(popup.get_close_callback(data.layout))
+			}),
+			Default::default(), /* extra */
+		)));
+}
diff --git a/dash-frontend/src/views/remote_skymap_list.rs b/dash-frontend/src/views/remote_skymap_list.rs
new file mode 100644
index 00000000..aa52cd1b
--- /dev/null
+++ b/dash-frontend/src/views/remote_skymap_list.rs
@@ -0,0 +1,292 @@
+use std::rc::Rc;
+
+use uuid::Uuid;
+use wgui::{
+	assets::AssetPath,
+	globals::WguiGlobals,
+	i18n::Translation,
+	layout::{Layout, WidgetID},
+	parser::{Fetchable, ParseDocumentParams},
+	renderer_vk::text::custom_glyph::CustomGlyphData,
+	task::Tasks,
+};
+use wlx_common::async_executor::AsyncExecutor;
+
+use crate::{
+	frontend::{FrontendTask, FrontendTasks},
+	util::{
+		networking::{
+			self,
+			skymap_catalog::{SkymapCatalog, SkymapCatalogEntry, SkymapUuid},
+		},
+		popup_manager::{MountPopupOnceParams, PopupHolder},
+		wgui_simple,
+	},
+	views::{self, ViewTrait, ViewUpdateParams},
+};
+
+pub struct Params<'a> {
+	pub globals: &'a WguiGlobals,
+	pub layout: &'a mut Layout,
+	pub executor: &'a AsyncExecutor,
+	pub parent_id: WidgetID,
+	pub frontend_tasks: FrontendTasks,
+	pub on_updated_library: Rc<dyn Fn()>,
+}
+
+type SetSkymapPreview = (Uuid, Option<(CustomGlyphData, Rc<Vec<u8>>)>);
+
+#[derive(Clone)]
+enum Task {
+	SetSkymapCatalog(Rc<anyhow::Result<networking::skymap_catalog::SkymapCatalog>>),
+	SetSkymapPreview(SetSkymapPreview),
+	ShowRemoteSkymapDownloader(SkymapUuid),
+	RefreshCells,
+}
+
+struct MountedCell {
+	skymap_uuid: SkymapUuid,
+	view: views::skymap_list_cell::View,
+	preview_image_compressed: Option<Rc<Vec<u8>>>,
+}
+
+pub struct View {
+	id_parent: WidgetID,
+	id_loading: WidgetID,
+	globals: WguiGlobals,
+	tasks: Tasks<Task>,
+	mounted_cells: Vec<MountedCell>,
+	executor: AsyncExecutor,
+	frontend_tasks: FrontendTasks,
+	catalog: Option<SkymapCatalog>,
+	popup_remote_skymap_downloader: PopupHolder<views::remote_skymap_downloader::View>,
+	on_updated_library: Rc<dyn Fn()>,
+}
+
+fn get_entry_by_uuid(catalog: &SkymapCatalog, skymap_uuid: Uuid) -> Option<&SkymapCatalogEntry> {
+	let entry = catalog.entries.iter().find(|entry| entry.uuid == skymap_uuid)?;
+
+	Some(entry)
+}
+
+impl ViewTrait for View {
+	fn update(&mut self, par: &mut ViewUpdateParams) -> anyhow::Result<()> {
+		self.popup_remote_skymap_downloader.update(par)?;
+
+		for task in self.tasks.drain() {
+			match task {
+				Task::SetSkymapCatalog(skymap_catalog) => {
+					par.layout.remove_widget(self.id_loading);
+					match &*skymap_catalog {
+						Ok(skymap_catalog) => {
+							self.mount_catalog(par.layout, skymap_catalog)?;
+						}
+						Err(e) => wgui_simple::create_label_error(
+							par.layout,
+							self.id_parent,
+							format!("Failed to fetch skymap catalog: {:?}", e),
+						)?,
+					}
+				}
+				Task::SetSkymapPreview((skymap_uuid, opt_preview_image)) => {
+					if let Some(cell) = &mut self
+						.mounted_cells
+						.iter_mut()
+						.find(|cell| cell.skymap_uuid == skymap_uuid)
+					{
+						if let Some((preview_image, preview_image_compressed)) = opt_preview_image {
+							cell.view.set_image(par.layout, Some(preview_image))?;
+							cell.preview_image_compressed = Some(preview_image_compressed);
+						} else {
+							cell.view.set_image(par.layout, None)?;
+						}
+					}
+				}
+				Task::ShowRemoteSkymapDownloader(skymap_uuid) => {
+					if let Some((preview_image, preview_image_compressed)) = self.get_image_preview(skymap_uuid) {
+						self.show_remote_skymap_downloader(skymap_uuid, preview_image, preview_image_compressed)?;
+					} else {
+						log::error!("preview image not present, ignoring request");
+					}
+				}
+				Task::RefreshCells => {
+					self.refresh_cells(par.layout)?;
+				}
+			}
+		}
+		Ok(())
+	}
+}
+
+impl View {
+	async fn skymap_catalog_request_wrapper(tasks: Tasks<Task>) {
+		let res = networking::skymap_catalog::request_catalog().await;
+		tasks.push(Task::SetSkymapCatalog(Rc::new(res)))
+	}
+
+	pub fn new(par: Params) -> anyhow::Result<Self> {
+		let id_loading = wgui_simple::create_loading(wgui_simple::CreateLoadingParams {
+			layout: par.layout,
+			parent_id: par.parent_id,
+			with_text: true,
+		})?;
+		let tasks = Tasks::<Task>::new();
+		let fut = View::skymap_catalog_request_wrapper(tasks.clone());
+		par.executor.spawn(fut).detach();
+		Ok(Self {
+			id_parent: par.parent_id,
+			id_loading,
+			tasks,
+			globals: par.globals.clone(),
+			mounted_cells: Vec::new(),
+			executor: par.executor.clone(),
+			frontend_tasks: par.frontend_tasks,
+			catalog: None,
+			popup_remote_skymap_downloader: Default::default(),
+			on_updated_library: par.on_updated_library,
+		})
+	}
+
+	async fn request_skymap_preview(globals: WguiGlobals, entry: SkymapCatalogEntry, tasks: Tasks<Task>) {
+		tasks.push(Task::SetSkymapPreview((
+			entry.uuid,
+			networking::image_fetch::fetch_to_glyph_data(&globals, &entry.files.get_url_preview())
+				.await
+				.ok(),
+		)));
+	}
+
+	fn refresh_cells(&mut self, layout: &mut Layout) -> anyhow::Result<()> {
+		let Some(catalog) = &self.catalog else {
+			debug_assert!(false);
+			return Ok(());
+		};
+
+		for cell in &mut self.mounted_cells {
+			if let Some(entry) = get_entry_by_uuid(catalog, cell.skymap_uuid) {
+				cell.view.refresh_resolution_pips(layout, entry)?;
+			}
+		}
+
+		Ok(())
+	}
+
+	fn mount_catalog(
+		&mut self,
+		layout: &mut Layout,
+		catalog: &networking::skymap_catalog::SkymapCatalog,
+	) -> anyhow::Result<()> {
+		let doc_params = &ParseDocumentParams {
+			globals: self.globals.clone(),
+			path: AssetPath::BuiltIn("gui/view/remote_skymap_list.xml"),
+			extra: Default::default(),
+		};
+
+		let parser_state = wgui::parser::parse_from_assets(doc_params, layout, self.id_parent)?;
+
+		let id_list = parser_state.fetch_widget(&layout.state, "list")?.id;
+
+		for entry in &catalog.entries {
+			let task = View::request_skymap_preview(self.globals.clone(), entry.clone(), self.tasks.clone());
+
+			let skymap_uuid = entry.uuid;
+
+			self.mounted_cells.push(MountedCell {
+				preview_image_compressed: None,
+				skymap_uuid: entry.uuid,
+				view: views::skymap_list_cell::View::new(views::skymap_list_cell::Params {
+					id_parent: id_list,
+					layout,
+					entry: Some(entry.clone()),
+					on_click: self
+						.tasks
+						.get_button_click_callback(Task::ShowRemoteSkymapDownloader(skymap_uuid)),
+				})?,
+			});
+
+			self.executor.spawn(task).detach();
+		}
+
+		self.catalog = Some(catalog.clone());
+		Ok(())
+	}
+
+	fn show_remote_skymap_downloader(
+		&mut self,
+		uuid: SkymapUuid,
+		preview_image: CustomGlyphData,
+		preview_image_compressed: Rc<Vec<u8>>,
+	) -> anyhow::Result<()> {
+		let Some(catalog) = &self.catalog else {
+			debug_assert!(false); // impossible
+			return Ok(());
+		};
+
+		let Some(entry) = get_entry_by_uuid(catalog, uuid) else {
+			return Ok(());
+		};
+
+		// call our task before calling underlying on_updated_library callback
+		let on_updated_library = Rc::new({
+			let func = self.on_updated_library.clone();
+			let tasks = self.tasks.clone();
+			move || {
+				tasks.push(Task::RefreshCells);
+				(*func)();
+			}
+		});
+
+		views::remote_skymap_downloader::mount_popup(
+			self.frontend_tasks.clone(),
+			self.executor.clone(),
+			self.globals.clone(),
+			entry.clone(),
+			preview_image,
+			preview_image_compressed,
+			on_updated_library,
+			self.popup_remote_skymap_downloader.clone(),
+		);
+
+		Ok(())
+	}
+
+	fn get_image_preview(
+		&self,
+		skymap_uuid: SkymapUuid,
+	) -> Option<(CustomGlyphData, Rc<Vec<u8>> /* preview_image_compressed */)> {
+		if let Some(cell) = &self.mounted_cells.iter().find(|mc| mc.skymap_uuid == skymap_uuid) {
+			let image = cell.view.get_image()?;
+			let preview_image_compressed = cell.preview_image_compressed.clone()?;
+			return Some((image, preview_image_compressed));
+		}
+		None
+	}
+}
+
+pub fn mount_popup(
+	frontend_tasks: FrontendTasks,
+	executor: AsyncExecutor,
+	globals: WguiGlobals,
+	on_updated_library: Rc<dyn Fn()>,
+	popup: PopupHolder<View>,
+) {
+	frontend_tasks
+		.clone()
+		.push(FrontendTask::MountPopupOnce(MountPopupOnceParams::new(
+			Translation::from_translation_key("APP_SETTINGS.BROWSE_ONLINE_CATALOG"),
+			Box::new(move |data| {
+				let view = View::new(Params {
+					globals: &globals,
+					layout: data.layout,
+					executor: &executor,
+					parent_id: data.id_content,
+					frontend_tasks,
+					on_updated_library,
+				})?;
+
+				popup.set_view(data.handle, view, None);
+				Ok(popup.get_close_callback(data.layout))
+			}),
+			Default::default(), /* extra */
+		)));
+}
diff --git a/dash-frontend/src/views/running_games_list.rs b/dash-frontend/src/views/running_games_list.rs
index 6428f5d1..bc607b20 100644
--- a/dash-frontend/src/views/running_games_list.rs
+++ b/dash-frontend/src/views/running_games_list.rs
@@ -112,10 +112,7 @@ impl View {
 	fn fill_list(&mut self, layout: &mut Layout, games: Vec<steam_utils::RunningGame>) -> anyhow::Result<()> {
 		if games.is_empty() {
 			// hide self
-			layout.tasks.push(LayoutTask::SetWidgetStyle(
-				self.parent_id,
-				StyleSetRequest::Display(Display::None),
-			));
+			layout.tasks.push(LayoutTask::SetWidgetVisible(self.parent_id, false));
 			return Ok(());
 		}
 
diff --git a/dash-frontend/src/views/skymap_list.rs b/dash-frontend/src/views/skymap_list.rs
new file mode 100644
index 00000000..e95f4ddd
--- /dev/null
+++ b/dash-frontend/src/views/skymap_list.rs
@@ -0,0 +1,270 @@
+use anyhow::Context;
+use wgui::{
+	assets::AssetPath,
+	components::button::ComponentButton,
+	globals::WguiGlobals,
+	i18n::Translation,
+	layout::{Layout, WidgetID},
+	parser::{Fetchable, ParseDocumentParams, ParserState},
+	renderer_vk::text::custom_glyph::CustomGlyphData,
+	task::Tasks,
+};
+use wlx_common::{async_executor::AsyncExecutor, config::GeneralConfig, config_io, dash_interface::ConfigChangeKind};
+
+use crate::{
+	frontend::{FrontendTask, FrontendTasks},
+	util::{
+		networking::skymap_catalog::{self, SkymapCatalogEntry, SkymapResolution},
+		popup_manager::{MountPopupOnceParams, PopupHolder},
+	},
+	views::{self, ViewTrait, ViewUpdateParams},
+};
+
+#[derive(Clone)]
+enum Task {
+	DownloadSkymaps,
+	Refresh,
+	ShowSkymapResolutionSelector(SkymapCatalogEntry),
+	SetSkymap(SkymapCatalogEntry, SkymapResolution),
+	SetSkymapBuiltIn,
+}
+
+pub struct Params<'a> {
+	pub globals: WguiGlobals,
+	pub layout: &'a mut Layout,
+	pub parent_id: WidgetID,
+	pub frontend_tasks: &'a FrontendTasks,
+}
+
+struct Cell {
+	#[allow(dead_code)]
+	view: views::skymap_list_cell::View,
+}
+
+pub struct View {
+	#[allow(dead_code)]
+	parser_state: ParserState,
+	tasks: Tasks<Task>,
+	list_parent: WidgetID,
+	frontend_tasks: FrontendTasks,
+	globals: WguiGlobals,
+	popup_remote_skymap_list: PopupHolder<views::remote_skymap_list::View>,
+	popup_dialog_box: PopupHolder<views::dialog_box::View>,
+	cells: Vec<Cell>,
+}
+
+impl ViewTrait for View {
+	fn update(&mut self, par: &mut ViewUpdateParams) -> anyhow::Result<()> {
+		self.popup_remote_skymap_list.update(par)?;
+		self.popup_dialog_box.update(par)?;
+
+		loop {
+			let tasks = self.tasks.drain();
+			if tasks.is_empty() {
+				break;
+			}
+			for task in tasks {
+				match task {
+					Task::DownloadSkymaps => {
+						self.download_skymaps(par.executor)?;
+					}
+					Task::Refresh => {
+						self.refresh(par.layout)?;
+					}
+					Task::ShowSkymapResolutionSelector(entry) => {
+						self.show_skymap_resolution_selector(entry);
+					}
+					Task::SetSkymap(entry, resolution) => {
+						self.set_skymap(entry, resolution, par.general_config, par.config_change_kind)?;
+					}
+					Task::SetSkymapBuiltIn => {
+						par.general_config.skybox_texture = "".into();
+						*par.config_change_kind = Some(ConfigChangeKind::EnvironmentBlend);
+					}
+				}
+			}
+		}
+
+		Ok(())
+	}
+}
+
+impl View {
+	pub fn new(params: Params) -> anyhow::Result<Self> {
+		let doc_params = &ParseDocumentParams {
+			globals: params.globals.clone(),
+			path: AssetPath::BuiltIn("gui/view/skymap_list.xml"),
+			extra: Default::default(),
+		};
+
+		let parser_state = wgui::parser::parse_from_assets(doc_params, params.layout, params.parent_id)?;
+		let list_parent = parser_state.fetch_widget(&params.layout.state, "list_parent")?.id;
+		let tasks = Tasks::new();
+
+		tasks.push(Task::Refresh);
+
+		tasks.handle_button(
+			&parser_state.fetch_component_as::<ComponentButton>("btn_download_skymaps")?,
+			Task::DownloadSkymaps,
+		);
+
+		tasks.handle_button(
+			&parser_state.fetch_component_as::<ComponentButton>("btn_refresh")?,
+			Task::Refresh,
+		);
+
+		Ok(Self {
+			parser_state,
+			tasks,
+			list_parent,
+			frontend_tasks: params.frontend_tasks.clone(),
+			globals: params.globals.clone(),
+			popup_remote_skymap_list: Default::default(),
+			popup_dialog_box: Default::default(),
+			cells: Vec::new(),
+		})
+	}
+
+	fn download_skymaps(&mut self, executor: &AsyncExecutor) -> anyhow::Result<()> {
+		views::remote_skymap_list::mount_popup(
+			self.frontend_tasks.clone(),
+			executor.clone(),
+			self.globals.clone(),
+			self.tasks.make_callback_rc(Task::Refresh), /* on_updated_library */
+			self.popup_remote_skymap_list.clone(),
+		);
+		Ok(())
+	}
+
+	fn set_skymap(
+		&mut self,
+		entry: SkymapCatalogEntry,
+		resolution: SkymapResolution,
+		config: &mut GeneralConfig,
+		change_kind: &mut Option<ConfigChangeKind>,
+	) -> anyhow::Result<()> {
+		let skymap_file_path = entry
+			.get_destination_path(resolution)
+			.context("Skymap not found" /* you shouldn't really see this, like ever. */)?;
+
+		config.skybox_texture = config_io::get_skymaps_root()
+			.join(skymap_file_path)
+			.to_str()
+			.context("Skymap filename not valid UTF-8")?
+			.into();
+		*change_kind = Some(ConfigChangeKind::EnvironmentBlend);
+
+		Ok(())
+	}
+
+	fn show_skymap_resolution_selector(&mut self, entry: SkymapCatalogEntry) {
+		let tasks = self.tasks.clone();
+
+		let mut entries = Vec::<views::dialog_box::ButtonEntry>::new();
+
+		let mut add_entry_resolution = |resolution: SkymapResolution| {
+			if entry.is_downloaded(resolution).unwrap_or(false) {
+				entries.push(views::dialog_box::ButtonEntry {
+					content: Translation::from_raw_text(resolution.get_display_str()),
+					icon: "dashboard/globe.svg",
+					action: resolution.get_display_str_simple(),
+				});
+			}
+		};
+
+		add_entry_resolution(SkymapResolution::Res2k);
+		add_entry_resolution(SkymapResolution::Res4k);
+		add_entry_resolution(SkymapResolution::Res8k);
+
+		if entries.is_empty() {
+			// if the skymap is not downloaded, how did we get there?!
+			debug_assert!(false);
+			return;
+		}
+
+		views::dialog_box::mount_popup(
+			self.popup_dialog_box.clone(),
+			self.frontend_tasks.clone(),
+			views::dialog_box::Params {
+				globals: self.globals.clone(),
+				entries,
+				message: Translation::from_translation_key("APP_SETTINGS.SELECT_VARIANT"),
+				on_action_click: Box::new(move |action| {
+					let resolution = SkymapResolution::from_display_str_simple(action).unwrap(); // safety: never fails.
+					tasks.push(Task::SetSkymap(entry, resolution))
+				}),
+			},
+		);
+	}
+
+	fn refresh(&mut self, layout: &mut Layout) -> anyhow::Result<()> {
+		let entries = match skymap_catalog::get_entries_from_disk() {
+			Ok(entries) => entries,
+			Err(e) => {
+				log::error!("failed to get skymap entries: {}", e);
+				Default::default()
+			}
+		};
+
+		layout.remove_children(self.list_parent);
+		self.cells.clear();
+
+		let skymaps_root = config_io::get_skymaps_root();
+
+		let mut view = views::skymap_list_cell::View::new(views::skymap_list_cell::Params {
+			id_parent: self.list_parent,
+			layout,
+			entry: None,
+			on_click: self.tasks.get_button_click_callback(Task::SetSkymapBuiltIn),
+		})?;
+		// load preview image
+		let data = include_bytes!("../../assets/dashboard/builtin-skybox-preview.jpg");
+		if let Ok(glyph_data) = CustomGlyphData::from_bytes_raster(&self.globals, "builtin-skybox-preview.jpg", data) {
+			view.set_image(layout, Some(glyph_data))?;
+		}
+
+		self.cells.push(Cell { view });
+
+		for entry in &entries {
+			let mut view = views::skymap_list_cell::View::new(views::skymap_list_cell::Params {
+				id_parent: self.list_parent,
+				layout,
+				entry: Some(entry.clone()),
+				on_click: self
+					.tasks
+					.get_button_click_callback(Task::ShowSkymapResolutionSelector(entry.clone())),
+			})?;
+
+			// load preview image
+			if let Ok(data) = std::fs::read(skymaps_root.join(&entry.files.preview))
+				&& let Ok(glyph_data) = CustomGlyphData::from_bytes_raster(&self.globals, &entry.files.preview, &data)
+			{
+				view.set_image(layout, Some(glyph_data))?;
+			}
+
+			self.cells.push(Cell { view });
+		}
+
+		Ok(())
+	}
+}
+
+pub fn mount_popup(frontend_tasks: FrontendTasks, globals: WguiGlobals, popup: PopupHolder<View>) {
+	frontend_tasks
+		.clone()
+		.push(FrontendTask::MountPopupOnce(MountPopupOnceParams::new(
+			Translation::from_translation_key("APP_SETTINGS.BROWSE_SKYMAPS"),
+			Box::new(move |data| {
+				let view = View::new(Params {
+					globals: globals.clone(),
+					layout: data.layout,
+					parent_id: data.id_content,
+					frontend_tasks: &frontend_tasks,
+				})?;
+
+				popup.set_view(data.handle, view, None);
+				Ok(popup.get_close_callback(data.layout))
+			}),
+			Default::default(), /* extra */
+		)));
+}
diff --git a/dash-frontend/src/views/skymap_list_cell.rs b/dash-frontend/src/views/skymap_list_cell.rs
new file mode 100644
index 00000000..06ab7e18
--- /dev/null
+++ b/dash-frontend/src/views/skymap_list_cell.rs
@@ -0,0 +1,159 @@
+use wgui::{
+	assets::AssetPath,
+	components::button::{ButtonClickCallback, ComponentButton},
+	event::EventAlterables,
+	globals::WguiGlobals,
+	i18n::Translation,
+	layout::{Layout, WidgetID},
+	parser::{Fetchable, ParseDocumentParams, ParserState, TemplateParams},
+	renderer_vk::text::custom_glyph::CustomGlyphData,
+	widget::{image::WidgetImage, label::WidgetLabel},
+};
+
+use crate::util::{
+	networking::{
+		self,
+		skymap_catalog::{SkymapCatalogEntry, SkymapResolution},
+	},
+	wgui_simple,
+};
+
+pub struct Params<'a> {
+	pub id_parent: WidgetID,
+	pub layout: &'a mut Layout,
+	pub entry: Option<networking::skymap_catalog::SkymapCatalogEntry>,
+	pub on_click: ButtonClickCallback,
+}
+
+pub struct View {
+	#[allow(dead_code)]
+	parser_state: ParserState,
+	id_loading: WidgetID,
+	id_image_preview: WidgetID,
+	id_resolution_pips: WidgetID,
+	image: Option<CustomGlyphData>,
+}
+
+fn doc_params(globals: &'_ WguiGlobals) -> ParseDocumentParams<'_> {
+	ParseDocumentParams {
+		globals: globals.clone(),
+		path: AssetPath::BuiltIn("gui/view/skymap_list_cell.xml"),
+		extra: Default::default(),
+	}
+}
+
+fn populate_res_pips(
+	layout: &mut Layout,
+	id_parent: WidgetID,
+	parser_state: &mut ParserState,
+	entry: &SkymapCatalogEntry,
+) -> anyhow::Result<()> {
+	let globals = layout.state.globals.clone();
+	layout.remove_children(id_parent);
+
+	let mut populate_res_pip = |res: SkymapResolution| -> anyhow::Result<()> {
+		let mut tpar = TemplateParams::new();
+		let downloaded = entry.is_downloaded(res).unwrap_or(false);
+		tpar.insert("color", if downloaded { "#11aa40" } else { "#444444" });
+		tpar.insert("text", res.get_display_str_simple());
+		parser_state.realize_template(&doc_params(&globals), "ResolutionPip", layout, id_parent, tpar)?;
+
+		Ok(())
+	};
+
+	populate_res_pip(SkymapResolution::Res2k)?;
+	if entry.files.size_4k.is_some() {
+		populate_res_pip(SkymapResolution::Res4k)?;
+	}
+	if entry.files.size_8k.is_some() {
+		populate_res_pip(SkymapResolution::Res8k)?;
+	}
+
+	Ok(())
+}
+
+impl View {
+	pub fn new(par: Params) -> anyhow::Result<Self> {
+		let globals = par.layout.state.globals.clone();
+
+		let mut parser_state = wgui::parser::parse_from_assets(&doc_params(&globals), par.layout, par.id_parent)?;
+
+		let data = parser_state.realize_template(
+			&doc_params(&globals),
+			"Cell",
+			par.layout,
+			par.id_parent,
+			Default::default(),
+		)?;
+
+		let id_image_preview = data.get_widget_id("image_preview")?;
+		let id_resolution_pips = data.get_widget_id("resolution_pips")?;
+
+		data
+			.fetch_component_as::<ComponentButton>("button")?
+			.on_click(par.on_click);
+
+		{
+			let mut label_title = data.fetch_widget_as::<WidgetLabel>(&par.layout.state, "label_title")?;
+			let mut label_author = data.fetch_widget_as::<WidgetLabel>(&par.layout.state, "label_author")?;
+
+			label_title.set_text_simple(
+				&mut globals.get(),
+				Translation::from_raw_text_string(
+					par
+						.entry
+						.as_ref()
+						.map(|e| e.name.clone())
+						.unwrap_or_else(|| "Built-in Sky Shader".into()),
+				),
+			);
+			label_author.set_text_simple(
+				&mut globals.get(),
+				Translation::from_raw_text_string(format!(
+					"by {}",
+					par.entry.as_ref().map(|e| e.author.as_str()).unwrap_or("WayVR Team")
+				)),
+			);
+		}
+
+		let id_loading = wgui_simple::create_loading(wgui_simple::CreateLoadingParams {
+			layout: par.layout,
+			parent_id: id_image_preview,
+			with_text: false,
+		})?;
+
+		// Populate resolution pips
+		if let Some(entry) = par.entry.as_ref() {
+			populate_res_pips(par.layout, id_resolution_pips, &mut parser_state, entry)?;
+		}
+
+		Ok(Self {
+			parser_state,
+			id_loading,
+			id_image_preview,
+			image: None,
+			id_resolution_pips,
+		})
+	}
+
+	pub fn refresh_resolution_pips(&mut self, layout: &mut Layout, entry: &SkymapCatalogEntry) -> anyhow::Result<()> {
+		populate_res_pips(layout, self.id_resolution_pips, &mut self.parser_state, entry)?;
+		Ok(())
+	}
+
+	pub fn set_image(&mut self, layout: &mut Layout, content: Option<CustomGlyphData>) -> anyhow::Result<()> {
+		layout.remove_widget(self.id_loading);
+		let mut alt = EventAlterables::default();
+		{
+			let mut image_preview = layout.state.widgets.cast_as::<WidgetImage>(self.id_image_preview)?;
+			image_preview.set_content(&mut alt, content.clone());
+		}
+		layout.process_alterables(alt)?;
+		self.image = content;
+		Ok(())
+	}
+
+	pub fn get_image(&self) -> Option<CustomGlyphData> {
+		self.image.clone()
+	}
+}
diff --git a/scripts/translator/bun.lock b/scripts/translator/bun.lock
index cbd723ad..aadac13f 100644
--- a/scripts/translator/bun.lock
+++ b/scripts/translator/bun.lock
@@ -4,9 +4,6 @@
   "workspaces": {
     "": {
       "name": "llm_translator",
-      "dependencies": {
-        "ollama": "^0.5.14",
-      },
       "devDependencies": {
         "@types/bun": "latest",
         "@types/node": "^22.13.13",
@@ -27,12 +24,8 @@
 
     "csstype": ["csstype@3.1.3", "", {}, "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="],
 
-    "ollama": ["ollama@0.5.16", "", { "dependencies": { "whatwg-fetch": "^3.6.20" } }, "sha512-OEbxxOIUZtdZgOaTPAULo051F5y+Z1vosxEYOoABPnQKeW7i4O8tJNlxCB+xioyoorVqgjkdj+TA1f1Hy2ug/w=="],
-
     "typescript": ["typescript@5.9.2", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A=="],
 
     "undici-types": ["undici-types@6.21.0", "", {}, "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ=="],
-
-    "whatwg-fetch": ["whatwg-fetch@3.6.20", "", {}, "sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg=="],
   }
 }
diff --git a/scripts/translator/description.txt b/scripts/translator/description.txt
index 9e61907b..d0ffc7d3 100644
--- a/scripts/translator/description.txt
+++ b/scripts/translator/description.txt
@@ -15,6 +15,9 @@ Glossary:
 - Display: A virtual monitor located in WayVR environment. It has a specific resolution and it contains virtual windows.
 - Set: A list of virtual overlays you can interact with
 - Watch: An overlay anchored to your left hand in which you can display a dashboard, see your current date and time or toggle your sets.
+- Skymap: An equirectangular skybox
+- Force: in bindings: button force press value between 0.0 and 1.0
+
 End of glossary.
 
 You will be given the input in the code blocks which needs to be translated to {TARGET_LANG} language. Write only the result in codeblocks, do not explain. Keep any newlines and other important formatting-required identifiers as-is, in the same state.
diff --git a/scripts/translator/main.ts b/scripts/translator/main.ts
index 0164284e..dae44aba 100644
--- a/scripts/translator/main.ts
+++ b/scripts/translator/main.ts
@@ -2,8 +2,8 @@ import { exit } from "process";
 import * as fsp from "fs/promises";
 import path from "path";
 import * as fs from "fs";
-import ollama from 'ollama'
 
+const base_url = process.env["LLAMA_BASE_URL"] as string;
 const model_name = process.env["MODEL"] as string;
 const template_name = process.env["TEMPLATE"] as string;
 let lang_path = process.env["LANG_PATH"] as string;
@@ -24,7 +24,8 @@ if (lang_path === undefined) {
 Try one of these:
 LANG_PATH=../../uidev/assets/lang/ ./run.sh
 LANG_PATH=../../dash-frontend/assets/lang/ ./run.sh
-LANG_PATH=../../wayvr/src/assets/lang/ ./run.sh`);
+LANG_PATH=../../wayvr/src/assets/lang/ ./run.sh`,
+	);
 	exit(-1);
 }
 
@@ -37,24 +38,28 @@ if (lang_path === undefined || !fs.existsSync(lang_path)) {
 const current_path = path.resolve(__dirname);
 const templates_path = path.resolve(__dirname + "/templates");
 
-async function loop_object(obj: any, initial_str: string, callback: (key: string, value: string) => Promise<void>) {
+async function loop_object(
+	obj: any,
+	initial_str: string,
+	callback: (key: string, value: string) => Promise<void>,
+) {
 	for (var key in obj) {
 		let full_key = initial_str + key;
 		if (typeof obj[key] === "object" && obj[key] !== null) {
-			await loop_object(obj[key], full_key + ".", callback)
+			await loop_object(obj[key], full_key + ".", callback);
 		} else if (obj.hasOwnProperty(key)) {
-			await callback(full_key, obj[key])
+			await callback(full_key, obj[key]);
 		}
 	}
 }
 
 function extract_backticks(str: string) {
 	const regex = /`([^`]+)`/g;
-	return str.match(regex)?.map(match => match.slice(1, -1).trim());
+	return str.match(regex)?.map((match) => match.slice(1, -1).trim());
 }
 
 function set_i18n_key(obj: any, key: string, value: string | undefined) {
-	const parts = key.split('.');
+	const parts = key.split(".");
 	let cur_level = obj;
 	for (let i = 0; i < parts.length - 1; i++) {
 		const part = parts[i]!;
@@ -67,7 +72,7 @@ function set_i18n_key(obj: any, key: string, value: string | undefined) {
 }
 
 function key_exists(obj: any, key: string) {
-	const parts = key.split('.');
+	const parts = key.split(".");
 	let level = obj;
 
 	for (let i = 0; i < parts.length; i++) {
@@ -79,7 +84,7 @@ function key_exists(obj: any, key: string) {
 	}
 
 	return true;
-};
+}
 
 interface Example {
 	key: string;
@@ -89,14 +94,24 @@ interface Example {
 
 interface Template {
 	full_name: string; // "Polish"
-	examples: Example[]
+	examples: Example[];
 }
 
-function gen_prompt(description: string, template: Template, key: string, english_translation: string) {
+function gen_prompt(
+	description: string,
+	template: Template,
+	key: string,
+	english_translation: string,
+) {
 	let num = 1;
 	for (const example of template.examples) {
 		description += "\nExample " + num + ":\n\n";
-		description += "Translate key `" + example.key + "` from English to " + template.full_name + ":\n\n";
+		description +=
+			"Translate key `" +
+			example.key +
+			"` from English to " +
+			template.full_name +
+			":\n\n";
 		description += "```\n";
 		description += example.en + "\n";
 		description += "```\n\n";
@@ -107,7 +122,12 @@ function gen_prompt(description: string, template: Template, key: string, englis
 		num += 1;
 	}
 	description += "\nEnd of examples.\n\n";
-	description += "Translate key `" + key + "` from English to " + template.full_name + ":\n\n";
+	description +=
+		"Translate key `" +
+		key +
+		"` from English to " +
+		template.full_name +
+		":\n\n";
 	description += "```\n";
 	description += english_translation + "\n";
 	description += "```\n";
@@ -115,24 +135,39 @@ function gen_prompt(description: string, template: Template, key: string, englis
 }
 
 async function run() {
-	const template = JSON.parse(await fsp.readFile(templates_path + "/" + template_name + ".json", "utf-8")) as Template;
+	const template = JSON.parse(
+		await fsp.readFile(templates_path + "/" + template_name + ".json", "utf-8"),
+	) as Template;
 
-	let description_txt = await fsp.readFile(current_path + "/description.txt", "utf-8");
-	description_txt = description_txt.replaceAll("{TARGET_LANG}", template.full_name);
+	let description_txt = await fsp.readFile(
+		current_path + "/description.txt",
+		"utf-8",
+	);
+	description_txt = description_txt.replaceAll(
+		"{TARGET_LANG}",
+		template.full_name,
+	);
 
-	const orig_english_json = JSON.parse(await fsp.readFile(lang_path + "/en.json") as any);
+	const orig_english_json = JSON.parse(
+		(await fsp.readFile(lang_path + "/en.json")) as any,
+	);
 
 	let orig_translated_json = {};
 	try {
-		orig_translated_json = JSON.parse((await fsp.readFile(lang_path + "/" + template_name + ".json")).toString());
-	}
-	catch (_e) { }
+		orig_translated_json = JSON.parse(
+			(
+				await fsp.readFile(lang_path + "/" + template_name + ".json")
+			).toString(),
+		);
+	} catch (_e) {}
 
 	let llm_translated_json = {};
 	const translated_json_path = lang_path + "/" + template_name + ".json";
 	if (await fsp.exists(translated_json_path)) {
 		console.log("Loading file", translated_json_path);
-		llm_translated_json = JSON.parse((await fsp.readFile(translated_json_path)).toString());
+		llm_translated_json = JSON.parse(
+			(await fsp.readFile(translated_json_path)).toString(),
+		);
 	}
 
 	let total_count = 0;
@@ -144,7 +179,10 @@ async function run() {
 		if (!key_exists(orig_english_json, key)) {
 			console.log("Removing key", key);
 			set_i18n_key(llm_translated_json, key, undefined);
-			fsp.writeFile(translated_json_path, JSON.stringify(llm_translated_json, undefined, 2));
+			fsp.writeFile(
+				translated_json_path,
+				JSON.stringify(llm_translated_json, undefined, "\t"),
+			);
 		}
 	});
 
@@ -159,25 +197,50 @@ async function run() {
 
 		console.log("Translating", key, "...");
 
-		const prompt = gen_prompt(description_txt, template, key, english_translation);
+		const prompt = gen_prompt(
+			description_txt,
+			template,
+			key,
+			english_translation,
+		);
 
-		const response = await ollama.chat({
-			model: model_name,
-			messages: [{ role: "user", content: prompt }],
-			options: {
+		const response = await fetch(base_url + "/v1/chat/completions", {
+			method: "POST",
+			headers: { "Content-Type": "application/json" },
+			body: JSON.stringify({
+				model: model_name,
+				messages: [{ role: "user", content: prompt }],
+				chat_template_kwargs: {
+					enable_thinking: false,
+				},
 				seed: 12345,
-			}
-		})
+			}),
+		});
+		if (!response.ok) {
+			const errorBody = await response.text();
+			throw new Error("API error " + response.status + ": " + errorBody);
+		}
+		const json = (await response.json()) as any;
 
-		const msg = extract_backticks(response.message.content);
+		if (!json.choices || !json.choices[0] || !json.choices[0].message) {
+			console.log("Full response:", JSON.stringify(json, null, "\t"));
+			throw new Error("Unexpected response format: " + JSON.stringify(json));
+		}
+
+		const msg = extract_backticks(json.choices[0].message.content);
 		if (msg === undefined || msg[0] === undefined) {
-			throw new Error("backticks failed. Raw content: " + response.message.content);
+			throw new Error(
+				"backticks failed. Raw content: " + json.choices[0].message.content,
+			);
 		}
 
 		console.log(" >>>", msg);
 
 		set_i18n_key(llm_translated_json, key, msg[0]);
-		fsp.writeFile(translated_json_path, JSON.stringify(llm_translated_json, undefined, 2));
+		fsp.writeFile(
+			translated_json_path,
+			JSON.stringify(llm_translated_json, undefined, "\t"),
+		);
 	});
 
 	console.log("Translation", template_name, "finished");
diff --git a/scripts/translator/package.json b/scripts/translator/package.json
index d01cf03e..15a55bb1 100644
--- a/scripts/translator/package.json
+++ b/scripts/translator/package.json
@@ -10,7 +10,5 @@
 	"peerDependencies": {
 		"typescript": "^5"
 	},
-	"dependencies": {
-		"ollama": "^0.5.14"
-	}
+	"dependencies": {}
 }
diff --git a/scripts/translator/run.sh b/scripts/translator/run.sh
index 0ed60246..91e86bd3 100755
--- a/scripts/translator/run.sh
+++ b/scripts/translator/run.sh
@@ -1,19 +1,29 @@
 #!/bin/bash
 
-# Do not run this script if you don’t have at least 32 GiB of system memory,
-# unless you have enabled the mmap option in the Ollama startup settings.
-# Submitting PRs that lack translated strings is okay if you don’t meet the
+# Do not run this script if you don't have at least 32 GiB of system memory.
+# Submitting PRs that lack translated strings is okay if you don't meet the
 # system requirements to run this script, or if you simply prefer not to; we are
 # regularly updating the missing translation strings anyway.
 #
 # Base language: English (en.json)
+# 
+# This tool expects llama.cpp server being present (llama-server) at port 8080.
 
 set -e
 cd "$(dirname "$0")"
 
 bun install
 
-export MODEL="gemma3:27b"
+# model URL:
+# https://huggingface.co/unsloth/gemma-4-26B-A4B-it-GGUF
+# you can specify your own if you want to.
+if [ -z "${MODEL}" ]; then
+	export MODEL="gemma-4-26B-A4B-it-UD-Q3_K_M"
+fi
+
+if [ -z "${LLAMA_BASE_URL}" ]; then
+	export LLAMA_BASE_URL="http://127.0.0.1:8080"
+fi
 
 TEMPLATE="pl" bun main.ts
 TEMPLATE="de" bun main.ts
diff --git a/uidev/Cargo.toml b/uidev/Cargo.toml
index 3c658de4..6f6c3c1c 100644
--- a/uidev/Cargo.toml
+++ b/uidev/Cargo.toml
@@ -8,14 +8,16 @@ authors = ["galister", "oo8dev"]
 repository = "https://github.com/wlx-team/wayvr"
 
 [dependencies]
-anyhow = { workspace = true }
-glam = { workspace = true }
-log = { workspace = true }
-rust-embed = "8.9.0"
-tracing-subscriber = { version = "0.3.22", features = ["env-filter"] }
-wgui = { path = "../wgui/" }
-winit = "0.30.12"
-vulkano = { workspace = true }
-vulkano-shaders = { workspace = true }
 dash-frontend = { path = "../dash-frontend/" }
+wgui = { path = "../wgui/" }
 wlx-common = { path = "../wlx-common" }
+
+anyhow.workspace = true
+glam.workspace = true
+log.workspace = true
+rust-embed.workspace = true
+tracing-subscriber.workspace = true
+vulkano.workspace = true
+vulkano-shaders.workspace = true
+winit.workspace = true
+ureq = "3.3.0"
diff --git a/uidev/assets/gui/testbed.xml b/uidev/assets/gui/testbed.xml
index b008f7fe..823d94c1 100644
--- a/uidev/assets/gui/testbed.xml
+++ b/uidev/assets/gui/testbed.xml
@@ -92,4 +92,4 @@
       </div>
     </rectangle>
   </elements>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/uidev/assets/gui/various_widgets.xml b/uidev/assets/gui/various_widgets.xml
index 14ae8016..b2eea786 100644
--- a/uidev/assets/gui/various_widgets.xml
+++ b/uidev/assets/gui/various_widgets.xml
@@ -59,7 +59,11 @@
         </div>
       </rectangle>
 
-      <div>
+      <div gap="4" flex_direction="column">
+        <rectangle macro="rect">
+          <label text="Color selector!"/>
+          <ColorSelector />
+        </rectangle>
         <rectangle macro="rect">
           <label text="Context menu test" />
           <Button id="button_context_menu" text="Show context menu" />
@@ -89,6 +93,11 @@
         <CheckBox text="and me too!" />
         <CheckBox text="i'm checked by default" checked="1" />
       </rectangle>
+    
+      <rectangle macro="rect" flex_direction="row" gap="16">
+        <label text="range slider test" weight="bold" />
+        <Slider value="0.5" value2="1.0" min_value="-5.0" max_value="20.0" width="200" height="24"/>
+      </rectangle>
 
       <rectangle macro="rect" flex_direction="row" align_items="start">
         <div flex_direction="column" gap="8">
@@ -121,4 +130,4 @@
       </rectangle>
     </div>
   </elements>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/uidev/assets/gui/video.xml b/uidev/assets/gui/video.xml
new file mode 100644
index 00000000..0f8cf5e9
--- /dev/null
+++ b/uidev/assets/gui/video.xml
@@ -0,0 +1,25 @@
+<layout>
+  <theme>
+    <var key="width" value="426.666" />
+    <var key="height" value="133.333" />
+  </theme>
+  <elements>
+    <rectangle position="absolute" width="10000" height="10000" color="#112233"/>
+    <div flex_direction="row">
+      <div margin="16" gap="8" flex_direction="column" overflow_y="scroll" >
+        <label text="640x200, looping"/>
+        <Video src_builtin="video.ivf" width="~width" height="~height" looping="1"/>
+        <label text="640x200, non-looping "/>
+        <Video src_builtin="video.ivf" width="~width" height="~height" looping="0"/>
+      </div>
+      <div margin="16" gap="8" flex_direction="column" overflow_y="scroll" >
+        <label text="640x200, looping, speed 2x"/>
+        <Video src_builtin="video.ivf" width="~width" height="~height" looping="1" speed="2"/>
+        <label text="640x200, looping, speed 0.5x"/>
+        <Video src_builtin="video.ivf" width="~width" height="~height" looping="1" speed="0.5"/>
+        <label text="640x200, looping, speed 4x"/>
+        <Video src_builtin="video.ivf" width="~width" height="~height" looping="1" speed="4"/>
+      </div>
+    </div>
+  </elements>
+</layout>
diff --git a/uidev/assets/gui/wlx_theme.xml b/uidev/assets/gui/wlx_theme.xml
deleted file mode 100644
index 7f0b20db..00000000
--- a/uidev/assets/gui/wlx_theme.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<layout>
-  <!-- TODO: deprecate this in favor of theme.xml -->
-  <theme>
-    <var key="color_bg" value="#24273a" />
-    <var key="color_bg_active" value="#44475a" />
-    <var key="text_color" value="#dddddd" />
-  </theme>
-</layout>
\ No newline at end of file
diff --git a/uidev/assets/video.ivf b/uidev/assets/video.ivf
new file mode 100644
index 00000000..5f430163
Binary files /dev/null and b/uidev/assets/video.ivf differ
diff --git a/uidev/src/main.rs b/uidev/src/main.rs
index a812d1ce..69e95fa2 100644
--- a/uidev/src/main.rs
+++ b/uidev/src/main.rs
@@ -143,7 +143,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 							&wgui::event::Event::MouseWheel(MouseWheelEvent {
 								delta: Vec2::new(x, y),
 								pos: mouse / scale,
-								device: 0,
+								device: wgui::event::DeviceBitmask(0),
 							}),
 							&mut (),
 							&mut (),
@@ -157,7 +157,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 							&wgui::event::Event::MouseWheel(MouseWheelEvent {
 								delta: Vec2::new(pos.x as f32 / 5.0, pos.y as f32 / 5.0),
 								pos: mouse / scale,
-								device: 0,
+								device: wgui::event::DeviceBitmask(0),
 							}),
 							&mut (),
 							&mut (),
@@ -177,7 +177,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 								&wgui::event::Event::MouseDown(MouseButtonEvent {
 									pos: mouse / scale,
 									index: MouseButtonIndex::Left,
-									device: 0,
+									device: wgui::event::DeviceBitmask(0),
 								}),
 								&mut (),
 								&mut (),
@@ -190,7 +190,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 								&wgui::event::Event::MouseUp(MouseButtonEvent {
 									pos: mouse / scale,
 									index: MouseButtonIndex::Left,
-									device: 0,
+									device: wgui::event::DeviceBitmask(0),
 								}),
 								&mut (),
 								&mut (),
@@ -209,7 +209,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 					.push_event(
 						&wgui::event::Event::MouseMotion(MouseMotionEvent {
 							pos: mouse / scale,
-							device: 0,
+							device: wgui::event::DeviceBitmask(0),
 						}),
 						&mut (),
 						&mut (),
diff --git a/uidev/src/testbed/testbed_any.rs b/uidev/src/testbed/testbed_any.rs
index 04ba5663..ec1e1a2e 100644
--- a/uidev/src/testbed/testbed_any.rs
+++ b/uidev/src/testbed/testbed_any.rs
@@ -10,6 +10,7 @@ use wgui::{
 	font_config::WguiFontConfig,
 	globals::WguiGlobals,
 	layout::{Layout, LayoutParams, LayoutUpdateParams},
+	palette::WguiColorPalette,
 	parser::{ParseDocumentParams, ParserState},
 };
 use wlx_common::locale::WayVRLangProvider;
@@ -30,12 +31,14 @@ impl TestbedAny {
 		};
 
 		let lang_provider = WayVRLangProvider::default();
+		let palette_name = std::env::var("PALETTE").unwrap_or_else(|_| "Default".to_string());
 
 		let globals = WguiGlobals::new(
 			assets,
 			&lang_provider,
 			&WguiFontConfig::default(),
 			PathBuf::new(), // cwd
+			WguiColorPalette::get_builtin(&palette_name),
 		)?;
 
 		let (layout, state) = wgui::parser::new_layout_from_assets(
diff --git a/uidev/src/testbed/testbed_dashboard.rs b/uidev/src/testbed/testbed_dashboard.rs
index c6aaba5a..eb0f197d 100644
--- a/uidev/src/testbed/testbed_dashboard.rs
+++ b/uidev/src/testbed/testbed_dashboard.rs
@@ -13,12 +13,15 @@ impl TestbedDashboard {
 	pub fn new() -> anyhow::Result<Self> {
 		let interface = DashInterfaceEmulated::new();
 		let lang_provider = WayVRLangProvider::default();
+		let palette_name = std::env::var("PALETTE").unwrap_or_else(|_| "Default".to_string());
 
 		let frontend = frontend::Frontend::new(frontend::InitParams {
 			interface: Box::new(interface),
+			show_welcome: false,
 			has_monado: true,
 			lang_provider: &lang_provider,
 			theme: Rc::new(WguiTheme::default()),
+			color_palette: &palette_name,
 		})?;
 		Ok(Self { frontend })
 	}
diff --git a/uidev/src/testbed/testbed_generic.rs b/uidev/src/testbed/testbed_generic.rs
index 6f8425c6..948f17b3 100644
--- a/uidev/src/testbed/testbed_generic.rs
+++ b/uidev/src/testbed/testbed_generic.rs
@@ -13,11 +13,11 @@ use wgui::{
 		checkbox::ComponentCheckbox,
 	},
 	drawing::Color,
-	event::StyleSetRequest,
 	font_config::WguiFontConfig,
 	globals::WguiGlobals,
 	i18n::Translation,
 	layout::{Layout, LayoutParams, LayoutUpdateParams, Widget},
+	palette::WguiColorPalette,
 	parser::{Fetchable, ParseDocumentExtra, ParseDocumentParams, ParserState},
 	taffy::{self, prelude::length},
 	task::Tasks,
@@ -46,7 +46,6 @@ pub struct TestbedGeneric {
 	pub parser_state: ParserState,
 	tasks: Tasks<TestbedTask>,
 
-	globals: WguiGlobals,
 	data: Rc<RefCell<Data>>,
 }
 
@@ -88,12 +87,14 @@ impl TestbedGeneric {
 
 	pub fn new(assets: Box<assets::Asset>) -> anyhow::Result<Self> {
 		let lang_provider = WayVRLangProvider::default();
+		let palette_name = std::env::var("PALETTE").unwrap_or_else(|_| "Default".to_string());
 
 		let globals = WguiGlobals::new(
 			assets,
 			&lang_provider,
 			&WguiFontConfig::default(),
 			PathBuf::new(), // cwd
+			WguiColorPalette::get_builtin(&palette_name),
 		)?;
 
 		let extra = ParseDocumentExtra {
@@ -118,9 +119,9 @@ impl TestbedGeneric {
 				color = color.mult_rgb(mult_f32);
 
 				let mut rect = par.get_widget_as::<WidgetRectangle>().unwrap();
-				rect.params.color = color;
+				rect.params.color = color.into();
 			})),
-			dev_mode: false,
+			..Default::default()
 		};
 
 		let (layout, parser_state) = wgui::parser::new_layout_from_assets(
@@ -135,14 +136,9 @@ impl TestbedGeneric {
 		let div_visibility = parser_state.fetch_widget(&layout.state, "div_visibility")?;
 
 		cb_visible.on_toggle(Box::new(move |common, evt| {
-			common.alterables.set_style(
-				div_visibility.id,
-				StyleSetRequest::Display(if evt.checked {
-					taffy::Display::Flex
-				} else {
-					taffy::Display::None
-				}),
-			);
+			common
+				.alterables
+				.set_widget_visible(div_visibility.id, evt.checked);
 			Ok(())
 		}));
 
@@ -183,7 +179,6 @@ impl TestbedGeneric {
 			layout,
 			parser_state,
 			tasks: Default::default(),
-			globals: globals.clone(),
 			data: Rc::new(RefCell::new(Data {
 				popup_window: WguiWindow::default(),
 				context_menu: context_menu::ContextMenu::default(),
@@ -229,7 +224,6 @@ impl TestbedGeneric {
 		data: &mut Data,
 	) -> anyhow::Result<()> {
 		data.popup_window.open(&mut WguiWindowParams {
-			globals: &self.globals,
 			position: Vec2::new(128.0, 128.0),
 			layout: &mut self.layout,
 			extra: WguiWindowParamsExtra {
diff --git a/wayvr-ipc/Cargo.toml b/wayvr-ipc/Cargo.toml
index bcdead92..76f73626 100644
--- a/wayvr-ipc/Cargo.toml
+++ b/wayvr-ipc/Cargo.toml
@@ -8,18 +8,20 @@ authors = ["galister", "oo8dev"]
 repository = "https://github.com/wlx-team/wayvr"
 
 [dependencies]
-bytes = "1.11.1"
-smallvec = "1.13.2"
+anyhow.workspace = true
+async-channel.workspace = true
+async-io.workspace = true
+bytes.workspace = true
+interprocess.workspace = true
+log.workspace = true
 serde.workspace = true
-anyhow = "1.0.93"
-log = "0.4.22"
+slotmap.workspace = true
+smallvec.workspace = true
 
 # client-only deps
-interprocess = { version = "2.2.2", features = ["tokio"], optional = true }
-tokio = { version = "1.43.1", features = ["macros"], optional = true }
-tokio-util = { version = "0.7.13", optional = true }
 serde_json.workspace = true
+smol = { workspace = true, optional = true }
 
 [features]
 default = ["client"]
-client = ["dep:tokio", "dep:tokio-util", "dep:interprocess"]
+client = ["dep:smol"]
diff --git a/wayvr-ipc/src/client.rs b/wayvr-ipc/src/client.rs
index b1c4c598..a1a94604 100644
--- a/wayvr-ipc/src/client.rs
+++ b/wayvr-ipc/src/client.rs
@@ -1,21 +1,18 @@
 use bytes::BufMut;
-use interprocess::local_socket::{
-	self, GenericNamespaced,
-	tokio::{Stream, prelude::*},
-};
+use interprocess::local_socket::{self, ToNsName};
 use serde::Serialize;
+use slotmap::DenseSlotMap;
+use slotmap::new_key_type;
 use smallvec::SmallVec;
+use smol::io::AsyncReadExt;
+use smol::io::AsyncWriteExt;
+use smol::lock::Mutex;
+use std::os::unix::net::UnixStream as StdUnixStream;
 use std::sync::{Arc, Weak};
-use tokio::{
-	io::{AsyncReadExt, AsyncWriteExt},
-	sync::Mutex,
-};
-use tokio_util::sync::CancellationToken;
 
 use crate::{
-	gen_id,
 	ipc::{self, Serial},
-	packet_client::{self, PacketClient},
+	packet_client::{self, HandsfreeParams, PacketClient},
 	packet_server::{self, PacketServer},
 	util::notifier::Notifier,
 };
@@ -26,28 +23,22 @@ pub struct QueuedPacket {
 	packet: Option<PacketServer>,
 }
 
-gen_id!(
-	QueuedPacketVec,
-	QueuedPacket,
-	QueuedPacketCell,
-	QueuedPacketHandle
-);
+new_key_type! {
+	pub struct QueuedPacketHandle;
+}
 
 #[derive(Debug, Serialize, Clone)]
 pub struct AuthInfo {
 	pub runtime: String,
 }
 
-type SignalFunc = Box<dyn FnMut(&packet_server::PacketServer) -> bool + Send>;
-
 pub struct WayVRClient {
 	receiver: ReceiverMutex,
 	sender: SenderMutex,
-	cancel_token: CancellationToken,
+	cancel_tx: async_channel::Sender<()>,
 	exiting: bool,
-	queued_packets: QueuedPacketVec,
-	pub auth: Option<AuthInfo>, // Some if authenticated
-	pub on_signal: Option<SignalFunc>,
+	queued_packets: DenseSlotMap<QueuedPacketHandle, QueuedPacket>,
+	pub auth: Option<AuthInfo>,
 }
 
 pub async fn send_packet(sender: &SenderMutex, data: &[u8]) -> anyhow::Result<()> {
@@ -67,8 +58,26 @@ pub async fn send_packet(sender: &SenderMutex, data: &[u8]) -> anyhow::Result<()
 pub type WayVRClientMutex = Arc<Mutex<WayVRClient>>;
 pub type WayVRClientWeak = Weak<Mutex<WayVRClient>>;
 
-type ReceiverMutex = Arc<Mutex<local_socket::tokio::RecvHalf>>;
-type SenderMutex = Arc<Mutex<local_socket::tokio::SendHalf>>;
+type ReceiverMutex = Arc<Mutex<smol::net::unix::UnixStream>>;
+type SenderMutex = Arc<Mutex<smol::net::unix::UnixStream>>;
+
+fn interprocess_stream_to_async(
+	stream: local_socket::Stream,
+) -> anyhow::Result<smol::net::unix::UnixStream> {
+	use std::os::unix::io::OwnedFd;
+
+	let uds_stream: interprocess::os::unix::uds_local_socket::Stream = match stream {
+		local_socket::Stream::UdSocket(s) => s,
+		#[allow(unreachable_patterns)]
+		_ => anyhow::bail!("Unsupported socket type"),
+	};
+
+	let owned_fd: OwnedFd = uds_stream.into();
+	let std_stream = StdUnixStream::from(owned_fd);
+
+	smol::net::unix::UnixStream::try_from(std_stream)
+		.map_err(|e| anyhow::anyhow!("Failed to wrap socket for async I/O: {}", e))
+}
 
 async fn client_runner(client: WayVRClientMutex) -> anyhow::Result<()> {
 	loop {
@@ -79,7 +88,7 @@ async fn client_runner(client: WayVRClientMutex) -> anyhow::Result<()> {
 type Payload = SmallVec<[u8; 64]>;
 
 async fn read_payload(
-	conn: &mut local_socket::tokio::RecvHalf,
+	conn: &mut smol::net::unix::UnixStream,
 	size: u32,
 ) -> anyhow::Result<Payload> {
 	let mut payload = Payload::new();
@@ -116,38 +125,33 @@ macro_rules! send_only {
 }
 
 impl WayVRClient {
-	pub fn set_signal_handler(&mut self, on_signal: SignalFunc) {
-		self.on_signal = Some(on_signal);
-	}
-
 	pub async fn new(client_name: &str) -> anyhow::Result<WayVRClientMutex> {
 		let printname = "/tmp/wayvr_ipc.sock";
-		let name = printname.to_ns_name::<GenericNamespaced>()?;
 
-		let stream = match Stream::connect(name).await {
-			Ok(c) => c,
-			Err(e) => {
-				anyhow::bail!("Failed to connect to the WayVR IPC: {}", e)
-			}
-		};
-		let (receiver, sender) = stream.split();
+		let name = printname
+			.to_ns_name::<local_socket::GenericNamespaced>()
+			.map_err(|e| anyhow::anyhow!("Failed to create socket name: {}", e))?;
+		let opts = local_socket::ConnectOptions::new().name(name);
+		let ip_stream = opts
+			.connect_sync()
+			.map_err(|e| anyhow::anyhow!("Failed to connect to the WayVR IPC: {}", e))?;
 
-		let receiver = Arc::new(Mutex::new(receiver));
-		let sender = Arc::new(Mutex::new(sender));
+		let async_stream = interprocess_stream_to_async(ip_stream)?;
+		let receiver = Arc::new(Mutex::new(async_stream.clone()));
+		let sender = Arc::new(Mutex::new(async_stream));
 
-		let cancel_token = CancellationToken::new();
+		let (cancel_tx, cancel_rx) = async_channel::bounded(1);
 
 		let client = Arc::new(Mutex::new(Self {
 			receiver,
 			sender: sender.clone(),
+			cancel_tx,
 			exiting: false,
-			cancel_token: cancel_token.clone(),
-			queued_packets: QueuedPacketVec::new(),
+			queued_packets: Default::default(),
 			auth: None,
-			on_signal: None,
 		}));
 
-		WayVRClient::start_runner(client.clone(), cancel_token);
+		WayVRClient::start_runner(client.clone(), cancel_rx);
 
 		// Send handshake to the server
 		send_packet(
@@ -163,17 +167,31 @@ impl WayVRClient {
 		Ok(client)
 	}
 
-	fn start_runner(client: WayVRClientMutex, cancel_token: CancellationToken) {
-		tokio::spawn(async move {
-			tokio::select! {
-					_ = cancel_token.cancelled() => {
-							log::info!("Exiting IPC runner gracefully");
-					}
-					e = client_runner(client.clone()) => {
-							log::info!("IPC Runner failed: {:?}", e);
+	fn start_runner(client: WayVRClientMutex, cancel_rx: async_channel::Receiver<()>) {
+		smol::spawn(async move {
+			let cancel_fut = async {
+				cancel_rx
+					.recv()
+					.await
+					.map_err(|_| anyhow::anyhow!("cancelled"))
+			};
+
+			let result = smol::future::race(client_runner(client.clone()), cancel_fut).await;
+
+			match result {
+				Ok(()) => {
+					log::info!("IPC Runner completed");
+				}
+				Err(e) => {
+					if e.to_string() == "cancelled" {
+						log::info!("Exiting IPC runner gracefully");
+					} else {
+						log::info!("IPC Runner failed: {:?}", e);
 					}
+				}
 			}
-		});
+		})
+		.detach();
 	}
 
 	async fn tick(client_mtx: WayVRClientMutex) -> anyhow::Result<()> {
@@ -185,7 +203,9 @@ impl WayVRClient {
 		// read packet
 		let packet = {
 			let mut receiver = receiver.lock().await;
-			let packet_size = receiver.read_u32().await?;
+			let mut size_buf = [0u8; 4];
+			receiver.read_exact(&mut size_buf).await?;
+			let packet_size = u32::from_be_bytes(size_buf);
 			log::trace!("packet size {}", packet_size);
 			if packet_size > 128 * 1024 {
 				anyhow::bail!("packet size too large (> 128 KiB)");
@@ -223,22 +243,9 @@ impl WayVRClient {
 				);
 			}
 
-			if let PacketServer::WvrStateChanged(_) = &packet
-				&& let Some(on_signal) = &mut client.on_signal
-				&& (*on_signal)(&packet)
-			{
-				// Signal consumed
-				return Ok(());
-			}
-
 			// queue packet to read if it contains a serial response
 			if let Some(serial) = packet.serial() {
-				for qpacket in &mut client.queued_packets.vec {
-					let Some(qpacket) = qpacket else {
-						continue;
-					};
-
-					let qpacket = &mut qpacket.obj;
+				for (_, qpacket) in &mut client.queued_packets {
 					if qpacket.serial != *serial {
 						continue; //skip
 					}
@@ -276,7 +283,7 @@ impl WayVRClient {
 		// Send packet to the server
 		let queued_packet_handle = {
 			let mut client = client_mtx.lock().await;
-			let handle = client.queued_packets.add(QueuedPacket {
+			let handle = client.queued_packets.insert(QueuedPacket {
 				notifier: notifier.clone(),
 				packet: None, // will be filled after notify
 				serial,
@@ -299,7 +306,7 @@ impl WayVRClient {
 
 			let cell = client
 				.queued_packets
-				.get_mut(&queued_packet_handle)
+				.get_mut(queued_packet_handle)
 				.ok_or(anyhow::anyhow!(
 					"missing packet cell, this shouldn't happen"
 				))?;
@@ -308,7 +315,7 @@ impl WayVRClient {
 				anyhow::bail!("packet is None, this shouldn't happen");
 			};
 
-			client.queued_packets.remove(&queued_packet_handle);
+			client.queued_packets.remove(queued_packet_handle);
 
 			Ok(packet)
 		}
@@ -422,6 +429,19 @@ impl WayVRClient {
 		Ok(())
 	}
 
+	pub async fn fn_wlx_handsfree(
+		client: WayVRClientMutex,
+		params: HandsfreeParams,
+	) -> anyhow::Result<()> {
+		send_only!(client, &PacketClient::WlxHandsfree(params));
+		Ok(())
+	}
+
+	pub async fn fn_wvr_input_capture(client: WayVRClientMutex, grab: bool) -> anyhow::Result<()> {
+		send_only!(client, &PacketClient::WvrInputCapture(grab));
+		Ok(())
+	}
+
 	pub async fn fn_wlx_modify_panel(
 		client: WayVRClientMutex,
 		params: packet_client::WlxModifyPanelParams,
@@ -434,6 +454,6 @@ impl WayVRClient {
 impl Drop for WayVRClient {
 	fn drop(&mut self) {
 		self.exiting = true;
-		self.cancel_token.cancel();
+		let _ = self.cancel_tx.try_send(());
 	}
 }
diff --git a/wayvr-ipc/src/ipc.rs b/wayvr-ipc/src/ipc.rs
index 4a29e4f4..5e598369 100644
--- a/wayvr-ipc/src/ipc.rs
+++ b/wayvr-ipc/src/ipc.rs
@@ -22,7 +22,7 @@ impl SerialGenerator {
 	}
 }
 
-pub const PROTOCOL_VERSION: u32 = 3;
+pub const PROTOCOL_VERSION: u32 = 4;
 pub const CONNECTION_MAGIC: &str = "wayvr_ipc";
 
 pub fn data_encode<T>(data: &T) -> Vec<u8>
diff --git a/wayvr-ipc/src/packet_client.rs b/wayvr-ipc/src/packet_client.rs
index 6f8649bb..16f0fff0 100644
--- a/wayvr-ipc/src/packet_client.rs
+++ b/wayvr-ipc/src/packet_client.rs
@@ -20,6 +20,32 @@ pub enum PositionMode {
 	Static,
 }
 
+#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
+pub enum HandsfreeMode {
+	None,
+	Hmd,
+	HmdPinch,
+	EyeTracking,
+	EyeTrackingPinch,
+}
+
+#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
+pub enum HandsfreeAction {
+	Click,
+	Grab,
+	RightModifier,
+	MiddleModifier,
+}
+
+#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
+pub enum HandsfreeParams {
+	SetMode(HandsfreeMode),
+	Press(HandsfreeAction),
+	Release(HandsfreeAction),
+	Toggle(HandsfreeAction),
+	Scroll(f32),
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct WvrProcessLaunchParams {
 	pub name: String,
@@ -64,9 +90,11 @@ pub enum PacketClient {
 	WvrProcessLaunch(Serial, WvrProcessLaunchParams),
 	WvrProcessList(Serial),
 	WvrProcessTerminate(packet_server::WvrProcessHandle),
+	WvrInputCapture(bool),
 	WlxInputState(Serial),
 	WlxModifyPanel(WlxModifyPanelParams),
 	WlxDeviceHaptics(usize, WlxHapticsParams),
 	WlxShowHide,
 	WlxSwitchSet(Option<usize>),
+	WlxHandsfree(HandsfreeParams),
 }
diff --git a/wayvr-ipc/src/packet_server.rs b/wayvr-ipc/src/packet_server.rs
index 12ed8fe7..bdbfecd5 100644
--- a/wayvr-ipc/src/packet_server.rs
+++ b/wayvr-ipc/src/packet_server.rs
@@ -21,14 +21,12 @@ pub struct Disconnect {
 
 #[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq)]
 pub struct WvrProcessHandle {
-	pub idx: u32,
-	pub generation: u64,
+	pub user: u64,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq)]
 pub struct WvrWindowHandle {
-	pub idx: u32,
-	pub generation: u64,
+	pub user: u64,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
diff --git a/wayvr-ipc/src/util/handle.rs b/wayvr-ipc/src/util/handle.rs
deleted file mode 100644
index e9e51305..00000000
--- a/wayvr-ipc/src/util/handle.rs
+++ /dev/null
@@ -1,171 +0,0 @@
-#[macro_export]
-macro_rules! gen_id {
-	(
-		$container_name:ident,
-		$instance_name:ident,
-		$cell_name:ident,
-		$handle_name:ident) => {
-		//ThingCell
-		pub struct $cell_name {
-			pub obj: $instance_name,
-			pub generation: u64,
-		}
-
-		//ThingVec
-		pub struct $container_name {
-			// Vec<Option<ThingCell>>
-			pub vec: Vec<Option<$cell_name>>,
-
-			cur_generation: u64,
-		}
-
-		//ThingHandle
-		#[derive(Default, Clone, Copy, PartialEq, Hash, Eq)]
-		pub struct $handle_name {
-			idx: u32,
-			generation: u64,
-		}
-
-		#[allow(dead_code)]
-		impl $handle_name {
-			pub fn reset(&mut self) {
-				self.generation = 0;
-			}
-
-			pub fn is_set(&self) -> bool {
-				self.generation > 0
-			}
-
-			pub fn id(&self) -> u32 {
-				self.idx
-			}
-
-			pub fn new(idx: u32, generation: u64) -> Self {
-				Self { idx, generation }
-			}
-		}
-
-		//ThingVec
-		#[allow(dead_code)]
-		impl $container_name {
-			#[allow(clippy::new_without_default)]
-			pub fn new() -> Self {
-				Self {
-					vec: Vec::new(),
-					cur_generation: 0,
-				}
-			}
-
-			pub fn iter(&self, callback: &dyn Fn($handle_name, &$instance_name)) {
-				for (idx, opt_cell) in self.vec.iter().enumerate() {
-					if let Some(cell) = opt_cell {
-						let handle = $container_name::get_handle(&cell, idx);
-						callback(handle, &cell.obj);
-					}
-				}
-			}
-
-			pub fn iter_mut(&mut self, callback: &mut dyn FnMut($handle_name, &mut $instance_name)) {
-				for (idx, opt_cell) in self.vec.iter_mut().enumerate() {
-					if let Some(cell) = opt_cell {
-						let handle = $container_name::get_handle(&cell, idx);
-						callback(handle, &mut cell.obj);
-					}
-				}
-			}
-
-			pub fn get_handle(cell: &$cell_name, idx: usize) -> $handle_name {
-				$handle_name {
-					idx: idx as u32,
-					generation: cell.generation,
-				}
-			}
-
-			fn find_unused_idx(&mut self) -> Option<u32> {
-				for (num, obj) in self.vec.iter().enumerate() {
-					if obj.is_none() {
-						return Some(num as u32);
-					}
-				}
-				None
-			}
-
-			pub fn add(&mut self, obj: $instance_name) -> $handle_name {
-				self.cur_generation += 1;
-				let generation = self.cur_generation;
-
-				let unused_idx = self.find_unused_idx();
-
-				let idx = if let Some(idx) = unused_idx {
-					idx
-				} else {
-					self.vec.len() as u32
-				};
-
-				let handle = $handle_name { idx, generation };
-
-				let cell = $cell_name { obj, generation };
-
-				if let Some(idx) = unused_idx {
-					self.vec[idx as usize] = Some(cell);
-				} else {
-					self.vec.push(Some(cell))
-				}
-
-				handle
-			}
-
-			pub fn remove(&mut self, handle: &$handle_name) {
-				// Out of bounds, ignore
-				if handle.idx as usize >= self.vec.len() {
-					return;
-				}
-
-				// Remove only if the generation matches
-				if let Some(cell) = &self.vec[handle.idx as usize] {
-					if cell.generation == handle.generation {
-						self.vec[handle.idx as usize] = None;
-					}
-				}
-			}
-
-			pub fn get(&self, handle: &$handle_name) -> Option<&$instance_name> {
-				// Out of bounds, ignore
-				if handle.idx as usize >= self.vec.len() {
-					return None;
-				}
-
-				if let Some(cell) = &self.vec[handle.idx as usize] {
-					if cell.generation == handle.generation {
-						return Some(&cell.obj);
-					}
-				}
-
-				None
-			}
-
-			pub fn get_mut(&mut self, handle: &$handle_name) -> Option<&mut $instance_name> {
-				// Out of bounds, ignore
-				if handle.idx as usize >= self.vec.len() {
-					return None;
-				}
-
-				if let Some(cell) = &mut self.vec[handle.idx as usize] {
-					if cell.generation == handle.generation {
-						return Some(&mut cell.obj);
-					}
-				}
-
-				None
-			}
-		}
-	};
-}
-
-/* Example usage:
-gen_id!(ThingVec, ThingInstance, ThingCell, ThingHandle);
-
-struct ThingInstance {}
-
-impl ThingInstance {}
- */
diff --git a/wayvr-ipc/src/util/mod.rs b/wayvr-ipc/src/util/mod.rs
index cf2f06fe..68a42c0b 100644
--- a/wayvr-ipc/src/util/mod.rs
+++ b/wayvr-ipc/src/util/mod.rs
@@ -1,4 +1,2 @@
-pub mod handle;
-
 #[cfg(feature = "client")]
 pub mod notifier;
diff --git a/wayvr-ipc/src/util/notifier.rs b/wayvr-ipc/src/util/notifier.rs
index b985cc5c..38acefc7 100644
--- a/wayvr-ipc/src/util/notifier.rs
+++ b/wayvr-ipc/src/util/notifier.rs
@@ -1,25 +1,29 @@
-use std::sync::Arc;
-
-use tokio::sync::Notify;
+use async_channel::{Receiver, Sender};
 
 // Copyable wrapped Notify struct for easier usage
-#[derive(Default, Clone)]
+#[derive(Clone)]
 pub struct Notifier {
-	notifier: Arc<Notify>,
+	sender: Sender<()>,
+	receiver: Receiver<()>,
 }
 
 impl Notifier {
 	pub fn new() -> Self {
-		Self {
-			notifier: Arc::new(Notify::new()),
-		}
+		let (sender, receiver) = async_channel::bounded(1);
+		Self { sender, receiver }
 	}
 
 	pub fn notify(&self) {
-		self.notifier.notify_waiters();
+		let _ = self.sender.try_send(());
 	}
 
 	pub async fn wait(&self) {
-		self.notifier.notified().await;
+		let _ = self.receiver.recv().await;
+	}
+}
+
+impl Default for Notifier {
+	fn default() -> Self {
+		Self::new()
 	}
 }
diff --git a/wayvr/Cargo.toml b/wayvr/Cargo.toml
index eb7e052a..8f608ce4 100644
--- a/wayvr/Cargo.toml
+++ b/wayvr/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wayvr"
-version = "26.2.1"
+version = "26.7.1"
 edition = "2024"
 license = "GPL-3.0-only"
 authors = ["galister", "oo8dev"]
@@ -27,77 +27,112 @@ wlx-capture = { path = "../wlx-capture" }
 wlx-common = { path = "../wlx-common" }
 
 anyhow.workspace = true
+chrono = { workspace = true, features = ["unstable-locales"] }
 clap.workspace = true
+dbus.workspace = true
 glam = { workspace = true, features = ["mint", "serde"] }
 idmap = { workspace = true, features = ["serde"] }
 idmap-derive.workspace = true
+input = {
+  version = "0.9.1",
+  default-features = false,
+  features = ["libinput_1_19", "udev"]
+}
+interprocess.workspace = true
+libc.workspace = true
 log.workspace = true
+pipewire = { workspace = true, optional = true }
 regex.workspace = true
 rust-embed.workspace = true
 serde = { workspace = true, features = ["rc"] }
 serde_json.workspace = true
+serde_json5.workspace = true
 slotmap.workspace = true
+smallvec.workspace = true
+smol = { workspace = true }
 strum.workspace = true
+tracing-subscriber.workspace = true
+uuid = { workspace = true }
 vulkano.workspace = true
 vulkano-shaders.workspace = true
+wayland-client = { workspace = true }
+wayland-protocols = { workspace = true }
+wayland-protocols-misc = { workspace = true }
+winit = { workspace = true, optional = true }
 xdg.workspace = true
 
 ash = "^0.38.0"  # must match vulkano
-bytes = { version = "1.11.1" }
-chrono = { version = "0.4.42", features = ["unstable-locales"] }
+bytes = { workspace = true }
 chrono-tz = "0.10.4"
-config = "0.15.19"
-dbus = { version = "0.9.9" }
-futures = "0.3.31"
-image_dds = { version = "0.7.2", default-features = false, features = [
-  "ddsfile",
-] }
+config = "0.15.25"
+futures = "0.3.32"
+image_dds = {
+  version = "0.7.2",
+  default-features = false,
+  features = [
+    "ddsfile",
+  ]
+}
 input-linux = "0.7.1"
-interprocess = { version = "2.2.3" }
 json = { version = "0.12.4", optional = true }
-json5 = "1.3.0"
-libc = "0.2.178"
-libmonado = { git = "https://github.com/oo8dev/libmonado-rs.git", rev = "fc39940a64dea2df080a0d2c974c7d651006241f", optional = true }
+json5 = "1.3.1"
+libmonado = {
+  git = "https://github.com/wayvr-org/libmonado-rs.git",
+  rev = "6f66b26930c24a8a2fc57ddcd85704784894c750",
+  optional = true
+}
 log-panics = { version = "2.1.0", features = ["with-backtrace"] }
 mint = "0.5.9"
-openxr = { version = "0.21.0", features = ["linked", "mint"], optional = true }
-ovr_overlay = { git = "https://github.com/galister/ovr_overlay_oyasumi", rev = "e477bd2a9e04293ea68c1e7529ef2cb131f32acc", features = [
-  "ovr_input",
-  "ovr_system",
-], optional = true }
-prost = { version = "0.14.3", optional = true }
+openxr = { version = "0.21.1", features = ["linked", "mint"], optional = true }
+ovr_overlay = {
+  git = "https://github.com/galister/ovr_overlay_oyasumi",
+  rev = "e477bd2a9e04293ea68c1e7529ef2cb131f32acc",
+  features = [
+    "ovr_input",
+    "ovr_system",
+  ],
+  optional = true
+}
+prost = { version = "0.14.4", optional = true }
 pure-rust-locales = "0.8.2"
 rosc = { version = "0.11.4", optional = true }
-serde_json5 = "0.2.1"
-serde_yaml = "0.9.34"
-signal-hook = "0.3.18"
-smallvec = "1.15.1"
-smithay = { version = "0.7.0", default-features = false, features = [
-  "backend_vulkan",
-  "desktop",
-  "wayland_frontend",
-  "xwayland",
-] }
-smol = { workspace = true }
-sysinfo = { version = "0.37" }
-thiserror = "2.0"
-tracing = "0.1.43"
-tracing-subscriber = { version = "0.3.22", features = ["env-filter"] }
-uuid = { version = "1.19.0", features = ["fast-rng", "v4"] }
-wayland-client = { workspace = true }
-winit = { version = "0.30.12", optional = true }
-xcb = { version = "1.6.0", features = [
-  "as-raw-xcb-connection",
-], optional = true }
-xkbcommon = { version = "0.8.0" }  # 0.9.0 breaks keymap import on some distros
-arboard = { version="3.6.1", features = ["wayland-data-control", "wl-clipboard-rs"] }
-super-swipe-type = "0.2.2"
+serde_yaml = "0.9.33"
+signal-hook = "0.4.4"
+smithay = {
+  version = "0.7.0",
+  default-features = false,
+  features = [
+    "backend_vulkan",
+    "desktop",
+    "wayland_frontend",
+    "xwayland",
+  ]
+}
+smithay-clipboard = "0.7.3"
+sysinfo = { version = "0.39.6" }
+thiserror = "2.0.18"
+tracing = "0.1.44"
+whisper-rs = { version = "0.16.0", features = ["vulkan"], optional = true }
+xcb = {
+  version = "1.7.0",
+  features = [
+    "as-raw-xcb-connection",
+  ],
+  optional = true
+}
+xkbcommon = {
+  version = "0.8.0"
+}  # 0.9.0 breaks keymap import on some distros
+
+calloop = { version = "0.14.4", optional = true }
+calloop-wayland-source = { version = "0.4.1", optional = true }
+evdev = "0.13.2"
 
 [build-dependencies]
 regex.workspace = true
 
 [features]
-default = ["openvr", "openxr", "osc", "wayland", "x11"]
+default = ["openvr", "openxr", "osc", "wayland", "whisper", "x11"]
 as-raw-xcb-connection = []
 feat-monado-metrics = []
 openvr = ["dep:json", "dep:ovr_overlay"]
@@ -106,5 +141,11 @@ osc = ["dep:rosc"]
 pipewire = ["wlx-capture/pipewire"]
 uidev = ["dep:winit"]
 wayland = ["pipewire", "wlx-capture/wlr", "xkbcommon/wayland"]
+whisper = [
+  "dep:calloop",
+  "dep:calloop-wayland-source",
+  "dep:pipewire",
+  "dep:whisper-rs"
+]
 x11 = ["dep:xcb", "wlx-capture/xshm", "xkbcommon/x11"]
 xcb = ["dep:xcb"]
diff --git a/wayvr/run b/wayvr/run
new file mode 100755
index 00000000..ea9d3697
--- /dev/null
+++ b/wayvr/run
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+
+
+
+cargo run --profile=plain -- --show --replace
diff --git a/wayvr/src/assets/edit/check.svg b/wayvr/src/assets/edit/check.svg
new file mode 100644
index 00000000..fe35e748
--- /dev/null
+++ b/wayvr/src/assets/edit/check.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="m9.55 18l-5.7-5.7l1.425-1.425L9.55 15.15l9.175-9.175L20.15 7.4z"/></svg>
diff --git a/wayvr/src/assets/edit/resize-corner.svg b/wayvr/src/assets/edit/resize-corner.svg
new file mode 100644
index 00000000..def972c6
--- /dev/null
+++ b/wayvr/src/assets/edit/resize-corner.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M3 21v-2h16V3h2v16q0 .825-.587 1.413T19 21zm12-4q-.825 0-1.412-.587T13 15t.588-1.412T15 13t1.413.588T17 15t-.587 1.413T15 17M5 12v-2h3.6L3 4.4L4.4 3L10 8.6V5h2v7z"/></svg>
diff --git a/wayvr/src/assets/gui/alttab-help.xml b/wayvr/src/assets/gui/alttab-help.xml
new file mode 100644
index 00000000..416afc37
--- /dev/null
+++ b/wayvr/src/assets/gui/alttab-help.xml
@@ -0,0 +1,120 @@
+<layout>
+  <elements>
+    <div interactable="0">
+      <rectangle
+        max_width="800"
+        padding="16"
+        flex_direction="column"
+        gap="8"
+        color="background(opacity-0.8)" border_color="outline" border="2" round="8">
+
+        <div flex_direction="column" padding="8" justify_content="space_evenly">
+          <label wrap="1" color="primary" weight="bold" size="20" padding_left="16" padding_right="16" translation="ALTTAB.RELEASE_TO_FOCUS" />
+
+          <!-- A simple separator -->
+          <rectangle width="100%" height="2" color="outline" margin="16" />
+
+          <div gap="8" flex_direction="row" >
+            <div width="50%" gap="8" flex_direction="column" >
+              <div width="100%">
+                <label translation="ALTTAB.WHILE_AIMING" color="primary" size="24" padding_left="16" padding_right="16" />
+              </div>
+              <div flex_direction="row" width="100%">
+                <div width="90">
+                  <label text="W" color="secondary" size="20" padding_left="16" padding_right="8" />
+                </div>
+                <div flex_direction="row" wrap="1">
+                  <label translation="ALTTAB.CLICK" color="on_background" wrap="1" size="20" padding_left="8" />
+                  <label text="*" color="tertiary" wrap="1" size="20" padding_left="4" padding_right="16" />
+                </div>
+              </div>
+              <div flex_direction="row" width="100%">
+                <div width="90">
+                  <label text="A" color="secondary" size="20" padding_left="16" padding_right="8" />
+                </div>
+                <div>
+                  <label translation="ALTTAB.GRABALL" color="on_background" wrap="1" size="20" padding_left="8" padding_right="16" />
+                </div>
+              </div>
+              <div flex_direction="row" width="100%">
+                <div width="90">
+                  <label text="Q" color="secondary" size="20" padding_left="16" padding_right="8" />
+                </div>
+                <div>
+                  <label translation="ALTTAB.GRAB" color="on_background" wrap="1" size="20" padding_left="8" padding_right="16" />
+                </div>
+              </div>
+              <div flex_direction="row" width="100%">
+                <div width="90">
+                  <label text="D" color="secondary" size="20" padding_left="16" padding_right="8" />
+                </div>
+                <div>
+                  <label translation="ALTTAB.DASH" color="on_background" wrap="1" size="20" padding_left="8" padding_right="16" />
+                </div>
+              </div>
+              <div flex_direction="row" width="100%">
+                <div width="90">
+                  <label text="E" color="secondary" size="20" padding_left="16" padding_right="8" />
+                </div>
+                <div>
+                  <label translation="ALTTAB.EDIT" color="on_background" wrap="1" size="20" padding_left="8" padding_right="16" />
+                </div>
+              </div>
+              <div flex_direction="row" width="100%">
+                <div width="90">
+                  <label text="R" color="secondary" size="20" padding_left="16" padding_right="8" />
+                </div>
+                <div>
+                  <label translation="ALTTAB.RECENTER" color="on_background" wrap="1" size="20" padding_left="8" padding_right="16" />
+                </div>
+              </div>
+              <div flex_direction="row" width="100%">
+                <div width="90">
+                  <label text="1~4" color="secondary" size="20" padding_left="16" padding_right="8" />
+                </div>
+                <div>
+                  <label translation="ALTTAB.SET" color="on_background" wrap="1" size="20" padding_left="8" padding_right="16" />
+                </div>
+              </div>
+            </div>
+            <div width="50%" gap="8" flex_direction="column" >
+              <div width="100%">
+                <label translation="ALTTAB.GENERAL_BINDS" color="primary" size="24" padding_left="16" padding_right="16" />
+              </div>
+              <div flex_direction="row" width="100%">
+                <div width="90">
+                  <label text="Super+Z" color="secondary" size="20" padding_left="16" padding_right="8" />
+                </div>
+                <div>
+                  <label translation="ALTTAB.TOGGLE_CAPTURE" color="on_background" wrap="1" size="20" padding_left="8" padding_right="16" />
+                </div>
+              </div>
+              <div flex_direction="row" width="100%">
+                <div width="90">
+                  <label text="Super+X" color="secondary" size="20" padding_left="16" padding_right="8" />
+                </div>
+                <div>
+                  <label translation="ALTTAB.FOCUS_MODE" color="on_background" wrap="1" size="20" padding_left="8" padding_right="16" />
+                </div>
+              </div>
+              <div flex_direction="row" width="100%">
+                <div width="90">
+                  <label text="Alt+F4" color="secondary" size="20" padding_left="16" padding_right="8" />
+                </div>
+                <div>
+                  <label translation="ALTTAB.CLOSE" color="on_background" wrap="1" size="20" padding_left="8" padding_right="16" />
+                </div>
+              </div>
+              <!-- A simple separator -->
+              <rectangle width="100%" height="2" color="outline" margin="16" padding_right="16" />
+              <div width="100%" flex_direction="row">
+                  <label text="*" color="tertiary" wrap="1" size="20" padding_left="8" />
+                  <label translation="ALTTAB.MOUSE" color="on_background" wrap="1" size="20" padding_left="4" padding_right="16" />
+              </div>
+            </div>
+          </div>
+        </div>
+      </rectangle>
+    </div>
+  </elements>
+</layout>
diff --git a/wayvr/src/assets/gui/anchor.xml b/wayvr/src/assets/gui/anchor.xml
index 931c17ca..d397a264 100644
--- a/wayvr/src/assets/gui/anchor.xml
+++ b/wayvr/src/assets/gui/anchor.xml
@@ -4,8 +4,8 @@
     <div width="192" height="192" padding="8">
       <rectangle
       width="100%" height="100%"
-      margin="4" box_sizing="border_box"
-      border_color="#FFFF00" border="2"
+      margin="6" box_sizing="border_box"
+      border_color="#FFFF00" border="4"
       round="100%" color="#00000000"
       align_items="center"
       justify_content="center">
diff --git a/wayvr/src/assets/gui/decor.xml b/wayvr/src/assets/gui/decor.xml
index be536713..4f4a1732 100644
--- a/wayvr/src/assets/gui/decor.xml
+++ b/wayvr/src/assets/gui/decor.xml
@@ -5,23 +5,24 @@
   <elements>
     <div flex_grow="1" height="48">
       <rectangle
+        id="rect"
         flex_grow="1" height="48"
         padding="8" border="2"
         round="8"
         align_items="center"
         justify_content="space_between"
-        color="~color_bg"
-        border_color="~color_accent"
+        color="background"
+        border_color="outline"
       >
-        <label id="label_title" margin_left="8" color="~color_text" size="22" weight="bold" />
+        <label id="title" text="~title" margin_left="8" color="on_background" size="22" weight="bold" />
         <div gap="4">
-          <Button macro="window_button" _release="::EditToggle"
-            border_color="~color_faded_translucent" color="~color_faded_50" color2="~color_faded_10">
+          <Button macro="window_button" _release="::EditToggle">
             <sprite macro="window_button_icon" src="watch/edit.svg" />
           </Button>
 
           <Button macro="window_button" _release="::DecorCloseWindow"
-            border_color="~color_danger_translucent" color="~color_danger_50" color2="~color_danger_10">
+            color="danger" border_color="danger(rgb-mult-0.5)" 
+            hover_color="danger(rgb-add-0.2)" hover_border_color="danger">
             <sprite macro="window_button_icon" src="edit/close.svg" />
           </Button>
         </div>
diff --git a/wayvr/src/assets/gui/edit.xml b/wayvr/src/assets/gui/edit.xml
index ca50072d..6efc8632 100644
--- a/wayvr/src/assets/gui/edit.xml
+++ b/wayvr/src/assets/gui/edit.xml
@@ -1,42 +1,38 @@
 <layout>
-  <macro name="button_style"
-    margin="2" overflow="hidden" box_sizing="border_box"
-    border_color="~color_accent" border="2" round="8" color="~color_accent_50" color2="~color_accent_10" gradient="vertical"
-    align_items="center" justify_content="center" />
-
   <macro name="button_style"
     margin="2" overflow="hidden" box_sizing="border_box" align_items="center" justify_content="center"
     border="2" round="50%" padding="8" gradient="vertical" tooltip_side="bottom" />
 
   <template name="TopButton">
-    <Button id="${id}" macro="button_style" tooltip="${tooltip}" _press="${press}" _release="${release}" sticky="${sticky}" border_color="~color_accent_translucent" color="~color_accent_50" color2="~color_accent_10">
+    <Button id="${id}" macro="button_style" tooltip="${tooltip}" _press="${press}" _release="${release}" sticky="${sticky}">
       <sprite id="${id}_sprite" width="48" height="48" src="${src}" />
     </Button>
   </template>
 
   <template name="TopButtonDanger">
-    <Button macro="button_style" tooltip="${tooltip}" _release="${release}" border_color="~color_danger_translucent" color="~color_danger_50" color2="~color_danger_10">
+    <Button macro="button_style" tooltip="${tooltip}" _release="${release}" border_color="danger(rgb-mult-0.5)" color="danger" hover_color="danger(rgb-add-0.2)" hover_border_color="danger">
       <sprite width="48" height="48" src="${src}" />
     </Button>
   </template>
 
-  <template name="TopButtonFaded">
-    <Button macro="button_style" tooltip="${tooltip}" _press="${press}" _release="${release}" border_color="~color_faded_translucent" color="~color_faded_50" color2="~color_faded_10">
+  <template name="TopButtonTertiary">
+    <Button macro="button_style" tooltip="${tooltip}" _press="${press}" _release="${release}" color="tertiary" border_color="tertiary(rgb-mult-0.5)" hover_color="tertiary(rgb-add-0.2)" hover_border_color="tertiary">
       <sprite width="48" height="48" src="${src}" />
     </Button>
   </template>
 
   <template name="PosButton">
-    <Button id="${id}" macro="button_style" tooltip="${tooltip}" _press="${press}" _release="${release}" border_color="~color_accent_translucent" color="~color_accent_50" color2="~color_accent_10">
+    <Button id="${id}" macro="button_style" tooltip="${tooltip}" _press="${press}" _release="${release}" >
       <sprite id="${id}_sprite" width="40" height="40" src="${src}" />
     </Button>
   </template>
 
   <elements>
     <div width="100%" height="100%">
-      <rectangle id="shadow" width="100%" height="100%" padding="4" gap="4" align_items="center" justify_content="center" color="#000000c0" flex_direction="row">
+      <rectangle id="shadow" width="100%" height="100%" padding="4" gap="4" align_items="center" justify_content="space_between" color="#000000c0" flex_direction="column">
+        <div />
         <div flex_direction="column">
-          <rectangle padding="16" gap="8" round="32" color="~color_bg" border="2" border_color="~color_accent" justify_content="center">
+          <rectangle padding="16" gap="8" round="32" color="background(opacity-0.9)" border="2" border_color="outline" justify_content="center">
             <div flex_direction="column" gap="8">
               <div flex_direction="row" gap="4">
                 <TopButton sticky="0" id="top_lock" src="edit/lock_open.svg" tooltip="EDIT_MODE.LOCK_INTERACTION" press="::EditModeToggleLock" />
@@ -50,7 +46,7 @@
                 <!-- TopButton sticky="0" id="top_resize" src="edit/resize.svg" tooltip="EDIT_MODE.RESIZE_PRESS_AND_DRAG" / -->
                 <TopButtonDanger src="edit/delete.svg" tooltip="EDIT_MODE.DELETE" release="::EditModeDelete" />
                 <div width="8" height="100%" />
-                <TopButtonFaded src="watch/edit.svg" tooltip="EDIT_MODE.LEAVE" press="::EditToggle" />
+                <TopButtonTertiary src="edit/check.svg" tooltip="EDIT_MODE.LEAVE" press="::EditToggle" />
               </div>
               <div id="tab_none" display="none" height="100">
                 <label align="center" translation="EDIT_MODE.HINT_POINT_WINDOW" />
@@ -126,6 +122,13 @@
             </div>
           </rectangle>
         </div>
+        <div width="100%" justify_content="end" flex_direction="row">
+          <div>
+            <Button id="resize_corner" macro="button_style" tooltip="EDIT_MODE.RESIZE_CORNER" tooltip_side="left" _press="::EditModeResizeStart" _release="::EditModeResizeStop">
+              <sprite width="48" height="48" src="edit/resize-corner.svg" />
+            </Button>
+          </div>
+        </div>
       </rectangle>
     </div>
   </elements>
diff --git a/wayvr/src/assets/gui/grab-help.xml b/wayvr/src/assets/gui/grab-help.xml
index 512ab1bc..dff8ef7b 100644
--- a/wayvr/src/assets/gui/grab-help.xml
+++ b/wayvr/src/assets/gui/grab-help.xml
@@ -6,25 +6,25 @@
         padding="16"
         flex_direction="column"
         gap="8"
-        color="~color_bg" border_color="~color_accent" border="2" round="8">
+        color="background" border_color="outline" border="2" round="8">
 
         <div flex_direction="row" padding="8" justify_content="space_between">
           <div flex_direction="column" align_items="center" gap="8" max_width="160" min_width="160">
-            <sprite src="grab-help/controller-grip-joy.svg" min_width="128" min_height="128" max_width="128" max_height="128" flex_grow="1" />
+            <sprite src="grab-help/controller-grip-joy.svg" min_width="128" min_height="128" max_width="128" max_height="128" flex_grow="1" color="primary" />
             <label wrap="1" size="25" padding_left="16" padding_right="16" translation="GRAB.ADJUST_DISTANCE" align="center" />
           </div>
           <div flex_direction="column" align_items="center" gap="8" max_width="160" min_width="160">
-            <sprite src="grab-help/controller-grip-trigger-joy.svg" min_width="128" min_height="128" max_width="128" max_height="128" flex_grow="1" />
+            <sprite src="grab-help/controller-grip-trigger-joy.svg" min_width="128" min_height="128" max_width="128" max_height="128" flex_grow="1" color="primary" />
             <label wrap="1" size="25" padding_left="16" padding_right="16" translation="GRAB.ADJUST_SIZE" align="center" />
           </div>
           <div flex_direction="column" align_items="center" gap="8" max_width="160" min_width="160">
-            <sprite src="grab-help/controller-grip-b.svg" min_width="128" min_height="128" max_width="128" max_height="128" flex_grow="1" />
+            <sprite src="grab-help/controller-grip-b.svg" min_width="128" min_height="128" max_width="128" max_height="128" flex_grow="1" color="primary" />
             <label wrap="1" size="25" padding_left="16" padding_right="16" translation="GRAB.UNRESTRICTED_MOVEMENT" align="center" />
           </div>
         </div>
 
         <!-- A simple separator -->
-        <rectangle width="100%" height="2" color="~color_accent" />
+        <rectangle width="100%" height="2" color="outline" />
 
         <div align_items="center" padding="8" >
           <label display="none" id="grabbing_watch" wrap="1" size="20" padding_right="16" translation="GRAB.GRABBING_WATCH" />
diff --git a/wayvr/src/assets/gui/keyboard.xml b/wayvr/src/assets/gui/keyboard.xml
index 405823d8..0295eaa6 100644
--- a/wayvr/src/assets/gui/keyboard.xml
+++ b/wayvr/src/assets/gui/keyboard.xml
@@ -1,12 +1,12 @@
 <layout>
   <macro name="keycap_rect"
     margin="2" width="100%" overflow="hidden" box_sizing="border_box"
-    border_color="~color_accent_translucent" border="2" round="6" color="~color_accent_40" color2="~color_accent_10" gradient="vertical"
+    border_color="outline" border="2" round="6" color="background_variant" color2="background" gradient="vertical"
     align_items="center" justify_content="center" />
 
   <macro name="tray_rect"
     margin="2" width="100%" overflow="hidden" box_sizing="border_box"
-    border_color="~color_accent_translucent" border="2" round="6" color="~color_bg" color2="~color_accent_10" gradient="vertical"
+    border_color="outline" border="2" round="6" color="background" color2="background_variant" gradient="vertical"
     align_items="center" justify_content="center" />
 
   <macro name="keycap_div"
@@ -18,8 +18,12 @@
     border_color="~color_accent_translucent" border="2" round="6" color="~color_accent_40" color2="~color_accent_10" gradient="vertical"
     align_items="center" justify_content="center" />
 
+  <theme>
+    <var key="text_size" value="20" />
+  </theme>
+
   <template name="VerticalSeparator">
-    <rectangle width="2" height="100%" color="~color_accent" />
+    <rectangle width="2" height="100%" color="primary" />
   </template>
 
   <!-- The keyboard is build from the xkb keymap. This file is for customizing the keycaps. -->
@@ -29,7 +33,7 @@
   <template name="KeySpecial">
     <div macro="keycap_div">
       <rectangle id="${id}" macro="keycap_rect">
-        <sprite color="~color_text" width="24" height="24" src="keyboard/${text}.svg" />
+        <sprite color="on_background" width="24" height="24" src="keyboard/${text}.svg" />
       </rectangle>
     </div>
   </template>
@@ -39,7 +43,7 @@
   <template name="KeyLetter">
     <div macro="keycap_div">
       <rectangle id="${id}" macro="keycap_rect">
-        <label text="${text}" size="18" />
+        <label text="${text}" size="~text_size" />
       </rectangle>
     </div>
   </template>
@@ -49,8 +53,8 @@
   <template name="KeyLetterAltGr">
     <div macro="keycap_div">
       <rectangle id="${id}" macro="keycap_rect" gap="3">
-        <label text="${text}" size="18" />
-        <label color="~color_text_translucent" text="${text_altgr}" size="18" />
+        <label text="${text}" size="~text_size" />
+        <label color="on_background_variant" text="${text_altgr}" size="~text_size" />
       </rectangle>
     </div>
   </template>
@@ -60,8 +64,8 @@
   <template name="KeySymbol">
     <div macro="keycap_div">
       <rectangle id="${id}" macro="keycap_rect" gap="3">
-        <label color="~color_text_translucent" text="${text_shift}" size="18" />
-        <label text="${text}" size="18" />
+        <label color="on_background_variant" text="${text_shift}" size="~text_size" />
+        <label text="${text}" size="~text_size" />
       </rectangle>
     </div>
   </template>
@@ -72,14 +76,14 @@
     <div macro="keycap_div">
       <rectangle id="${id}" macro="keycap_rect" flex_direction="row" flex_wrap="wrap" padding="4">
         <div width="50%" height="50%" align_items="center" justify_content="center">
-          <label color="~color_text_translucent" text="${text_shift}" size="18" />
+          <label color="on_background_variant" text="${text_shift}" size="~text_size" />
         </div>
         <div width="50%" height="50%" align_items="center" justify_content="center" />
         <div width="50%" height="50%" align_items="center" justify_content="center">
-          <label text="${text}" size="18" />
+          <label text="${text}" size="~text_size" />
         </div>
         <div width="50%" height="50%" align_items="center" justify_content="center">
-          <label color="~color_text_translucent" text="${text_altgr}" size="18" />
+          <label color="on_background_variant" text="${text_altgr}" size="~text_size" />
         </div>
       </rectangle>
     </div>
@@ -102,10 +106,10 @@
     </rectangle>
   </template>
 
-  <macro name="button_style" border="2" border_color="~color_accent_translucent" color="~color_bg" round="6"
-    align_items="center" justify_content="center" padding="6" width="60" height="60" overflow="visible"/>
+  <macro name="button_style" border="2" round="6"
+    align_items="center" justify_content="center" padding="6" width="60" height="60" overflow="visible" />
 
-  <macro name="bg_rect" width="100%" color="~color_bg" round="10" border="2" border_color="~color_accent" />
+  <macro name="bg_rect" width="100%" color="background_contrast" round="10" border="2" border_color="primary" />
 
   <blueprint name="menu_app">
     <context_menu >
@@ -120,7 +124,7 @@
   <!-- An app with a single icon. -->
   <template name="App">
     <Button macro="button_style" id="overlay_${idx}" tooltip_str="${name}" _context_name="${name}" _press_left="::ContextMenuOpen menu_app" _press_right="::OverlayToggle ${name}">  
-      <sprite width="38" height="38" color="~color_text" src_ext="${icon}" />
+      <sprite width="38" height="38" src_ext="${icon}" parent_color="ignore" />
     </Button>
   </template>
 
@@ -135,9 +139,9 @@
   <!-- A screen with a shortened connector name, e.g. "H1" for HDMI-A-1 or "D2" for DP-2 -->
   <template name="Screen">
     <Button macro="button_style" id="overlay_${idx}" tooltip_str="${name}" _context_name="${name}" _press_left="::ContextMenuOpen menu_screen" _press_right="::OverlayToggle ${name}">
-      <sprite width="38" height="38" color="~color_text" src_builtin="edit/screen.svg" />
+      <sprite width="38" height="38" src_builtin="edit/screen.svg" />
       <div position="absolute" margin_top="-7" margin_left="-1">
-        <label text="${display}" size="18" color="~color_faded_20" weight="bold" />
+        <label text="${display}" size="~text_size" weight="bold" parent_color="background" />
       </div>
     </Button>
   </template>
@@ -153,7 +157,7 @@
 
   <template name="Panel">
     <Button macro="button_style" id="overlay_${idx}" tooltip_str="${name}" _context_name="${name}" _press_left="::ContextMenuOpen menu_panel" _press_right="::OverlayToggle ${name}">
-      <sprite width="38" height="38" color="~color_text" src="${icon}" />
+      <sprite width="38" height="38" src="${icon}" />
     </Button>
   </template>
 
@@ -168,9 +172,9 @@
 
   <template name="Mirror">
     <Button macro="button_style" id="overlay_${idx}" tooltip_str="${name}" _context_name="${name}" _press_left="::ContextMenuOpen menu_mirror" _press_right="::OverlayToggle ${name}">
-      <sprite width="38" height="38" color="~color_text" src_builtin="edit/mirror.svg" />
+      <sprite width="38" height="38" src_builtin="edit/mirror.svg" />
       <div position="absolute" margin_top="5" margin_left="13">
-        <label text="${display}" size="20" color="~color_faded_20" weight="bold" />
+        <label text="${display}" size="20" weight="bold" parent_color="background" />
       </div>
     </Button>
   </template>
@@ -197,18 +201,18 @@
 
   <template name="Set">
     <Button macro="button_style" id="set_${idx}" _press="::SetSwitch ${idx}" tooltip="WATCH.SWITCH_TO_SET" tooltip_side="bottom">
-      <sprite width="38" height="38" color="~color_text" src_builtin="watch/set2.svg" />
+      <sprite width="38" height="38" src_builtin="watch/set2.svg" />
       <div position="absolute" margin_top="10" margin_left="-7">
-        <label text="${display}" size="20" color="~color_faded_20" weight="bold" />
+        <label text="${display}" size="20" weight="bold" parent_color="background" />
       </div>
     </Button>
   </template>
 
   <template name="Clock">
     <div flex_direction="column" gap="3" align_items="center">
-      <label text="23:59" _source="clock" _display="time" size="21" weight="bold" />
-      <label text="Tuesday" _source="clock" _display="dow" size="15" />
-      <label text="22/2/2022" _source="clock" _display="date" size="15" />
+      <label text="23:59" _source="clock" _display="time" size="21" weight="bold" color="primary" />
+      <label text="Tuesday" _source="clock" _display="dow" size="15" color="on_background_variant" />
+      <label text="22/2/2022" _source="clock" _display="date" size="15" color="on_background_variant" />
     </div>
   </template>
 
@@ -217,7 +221,7 @@
       <rectangle macro="bg_rect" padding="10" align_items="center" justify_content="space_between">
         <div gap="10">
           <Button macro="button_style" id="btn_dashboard" _press="::DashToggle">
-            <sprite width="38" height="38" color="~color_text" src="watch/wayvr_dashboard_mono.svg"  />
+            <sprite width="38" height="38" src="watch/wayvr_dashboard_mono.svg"  />
           </Button>
           <VerticalSeparator />
           <div id="panels_root" gap="6">
@@ -228,7 +232,7 @@
         </div>
         <div id="tray_root" flex_direction="row" gap="10">
           <Button macro="button_style" _press="::ContextMenuOpen menu_burger">
-            <sprite width="38" height="38" color="~color_text" src_builtin="keyboard/burger.svg" />
+            <sprite width="38" height="38" src_builtin="keyboard/burger.svg" />
           </Button>
 
           <VerticalSeparator />
diff --git a/wayvr/src/assets/gui/screencast.xml b/wayvr/src/assets/gui/screencast.xml
new file mode 100644
index 00000000..58d9c8be
--- /dev/null
+++ b/wayvr/src/assets/gui/screencast.xml
@@ -0,0 +1,18 @@
+<layout>
+  <elements>
+    <rectangle width="1280" height="720" padding="10" align_items="center" justify_content="space_evenly" flex_direction="column" color="background" color2="background_variant" border="2" border_color="primary" gradient="radial">
+      <div width="100%" align_items="center">
+        <label width="100%" id="status" color="secondary" text="" size="36" align="center" />
+      </div>
+      <div width="100%" align_items="center" flex_direction="column" gap="16">
+        <div width="100%" align_items="center">
+          <label width="100%" color="on_background" text="~name" size="48" align="center" />
+        </div>
+        <div width="100%" align_items="center">
+          <label width="100%" color="on_background_variant" text="~description" size="36" align="center" wrap="1" />
+        </div>
+      </div>
+    </rectangle>
+  </elements>
+
+</layout>
diff --git a/wayvr/src/assets/gui/toast.xml b/wayvr/src/assets/gui/toast.xml
index c9169324..27757534 100644
--- a/wayvr/src/assets/gui/toast.xml
+++ b/wayvr/src/assets/gui/toast.xml
@@ -6,22 +6,22 @@
         padding="16"
         flex_direction="column"
         gap="8"
-        color="#000000c0" border_color="~color_accent" border="2" round="8">
+        color="background" border_color="outline" border="2" round="8">
 
         <!-- Toast title -->
         <div flex_direction="row" align_items="center" gap="8">
-          <sprite src="icons/bell.svg" min_width="32" min_height="32" max_width="32" max_height="32" flex_grow="1" />
-          <label wrap="1" id="toast_title" weight="bold" size="25" padding_left="16" padding_right="16" />
+          <sprite src="icons/bell.svg" color="primary" min_width="32" min_height="32" max_width="32" max_height="32" flex_grow="1" />
+          <label wrap="1" id="toast_title" color="primary" weight="bold" size="25" padding_left="16" padding_right="16" />
         </div>
 
         <!-- A simple separator -->
-        <rectangle width="100%" height="2" color="~color_accent" />
+        <rectangle width="100%" height="2" color="outline" />
 
         <div>
           <!-- Toast message -->
-          <label id="toast_body" wrap="1" size="20" padding_left="16" padding_right="16" />
+          <label id="toast_body" color="on_background" wrap="1" size="20" padding_left="16" padding_right="16" />
         </div>
       </rectangle>
     </div>
   </elements>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/wayvr/src/assets/gui/watch.xml b/wayvr/src/assets/gui/watch.xml
index ad8d678d..1fb2f2af 100644
--- a/wayvr/src/assets/gui/watch.xml
+++ b/wayvr/src/assets/gui/watch.xml
@@ -3,25 +3,20 @@
     <var key="clock0_size" value="46" />
     <var key="clock0_date_size" value="16" />
     <var key="clock0_dow_size" value="16" />
-    <var key="clock_alt1_color" value="#8bd5ca" />
-    <var key="clock_alt2_color" value="#b7bdf8" />
     <var key="clock_alt_size" value="24" />
     <var key="clock_alt_tz_size" value="14" />
   </theme>
 
   <macro name="decorative_rect"
-    padding="8" color="~color_bg"
-    border="2" border_color="~color_accent" round="8" />
+    padding="8" color="background"
+    border="2" border_color="outline" round="8" />
 
-  <macro name="button_style"
-    padding="8"
-    border_color="~color_accent_translucent" border="2" round="8" color="~color_accent_40" color2="~color_accent_10" gradient="vertical"
-    align_items="center" justify_content="center" />
+  <macro name="button_style" padding="8" border="2" round="8" align_items="center" justify_content="center" />
 
   <template name="Device">
     <rectangle macro="decorative_rect" padding_top="4" padding_bottom="4" align_items="center" gap="8">
-      <sprite width="32" height="32" src_builtin="${src}" />
-      <label _source="battery" _device="${idx}" size="24" weight="bold" />
+      <sprite width="32" height="32" src_builtin="${src}" color="on_background" />
+      <label _source="battery" _device="${idx}" size="24" weight="bold" _low_color="danger" _normal_color="primary" _charging_color="tertiary" />
     </rectangle>
   </template>
 
@@ -40,36 +35,36 @@
 
   <template name="Screen">
     <Button macro="button_style" id="overlay_${idx}" tooltip_str="${name}" _press="::OverlayToggle ${name}">
-      <sprite width="38" height="38" color="~color_text" src_builtin="edit/screen.svg" />
+      <sprite width="38" height="38" src_builtin="edit/screen.svg" />
       <div position="absolute" margin_top="-7" margin_left="-1">
-        <label text="${display}" size="18" color="~color_faded_20" weight="bold" />
+        <label text="${display}" size="18" weight="bold" parent_color="background" />
       </div>
     </Button>
   </template>
   <template name="Panel">
     <Button macro="button_style" id="overlay_${idx}" tooltip_str="${name}" _press="::OverlayToggle ${name}">
-      <sprite width="38" height="38" color="~color_text" src_builtin="edit/panel.svg" />
+      <sprite width="38" height="38" src_builtin="edit/panel.svg" />
     </Button>
   </template>
   <template name="Mirror">
     <Button macro="button_style" id="overlay_${idx}" tooltip_str="${name}" _press="::OverlayToggle ${name}">
-      <sprite width="38" height="38" color="~color_text" src_builtin="edit/mirror.svg" />
+      <sprite width="38" height="38" src_builtin="edit/mirror.svg" />
       <div position="absolute" margin_top="5" margin_left="13">
-        <label text="${display}" size="20" color="~color_faded_20" weight="bold" />
+        <label text="${display}" size="20" weight="bold" parent_color="background" />
       </div>
     </Button>
   </template>
   <template name="App">
     <Button macro="button_style" id="overlay_${idx}" tooltip_str="${name}" _press="::OverlayToggle ${name}">  
-      <sprite width="38" height="38" color="~color_text" src_ext="${icon}" />
+      <sprite width="38" height="38" src_ext="${icon}" />
     </Button>
   </template>
     
   <template name="Set">
     <Button macro="button_style" id="set_${idx}" _press="::SetToggle ${idx}" tooltip="WATCH.SWITCH_TO_SET" tooltip_side="top">
-      <sprite width="38" height="38" color="~color_text" src_builtin="watch/set2.svg" />
+      <sprite width="38" height="38" src_builtin="watch/set2.svg" />
       <div position="absolute" margin_top="9">
-        <label text="${display}" size="24" color="#00050F" weight="bold" />
+        <label text="${display}" size="24" weight="bold" parent_color="background" />
       </div>
     </Button>
   </template>
@@ -77,28 +72,28 @@
   <template name="Clock">
     <div gap="12" flex_direction="column" padding="4">
       <div flex_direction="column" >
-        <label text="11:22 PM" _source="clock" _display="time" color="~color_text" size="~clock0_size" weight="bold" align="center" />
+        <label text="11:22 PM" _source="clock" _display="time" color="on_background" size="~clock0_size" weight="bold" align="center" />
         <div padding_left="2" gap="16" flex_direction="row" justify_content="center">
-          <label text="Tue" _source="clock" _display="dow_short" color="~color_text" size="~clock0_dow_size" weight="bold" />
-          <label text="22/2/2022" _source="clock" _display="date" color="~color_text" size="~clock0_date_size" weight="bold" />
+          <label text="Tue" _source="clock" _display="dow_short" color="on_background_variant" size="~clock0_dow_size" weight="bold" />
+          <label text="22/2/2022" _source="clock" _display="date" color="on_background_variant" size="~clock0_date_size" weight="bold" />
         </div>
       </div>
       <div flex_direction="row" gap="8" justify_content="space_around">
         <!-- Timezone names here are only placeholders. Set your timezones via ~/.config/wayvr/conf.d -->
         <div flex_direction="column">
-          <label text="Paris" _source="clock" _display="name" _timezone="0" color="~clock_alt1_color" size="~clock_alt_tz_size" weight="bold" align="center" />
-          <label text="23:59" _source="clock" _display="time" _timezone="0" color="~clock_alt1_color" size="~clock_alt_size" weight="bold" align="center" />
+          <label text="Paris" _source="clock" _display="name" _timezone="0" color="secondary" size="~clock_alt_tz_size" weight="bold" align="center" />
+          <label text="23:59" _source="clock" _display="time" _timezone="0" color="secondary" size="~clock_alt_size" weight="bold" align="center" />
         </div>
         <div flex_direction="column">
-          <label text="New York" _source="clock" _display="name" _timezone="1" color="~clock_alt2_color" size="~clock_alt_tz_size" weight="bold" align="center" />
-          <label text="23:59" _source="clock" _display="time" _timezone="1" color="~clock_alt2_color" size="~clock_alt_size" weight="bold" align="center" />
+          <label text="New York" _source="clock" _display="name" _timezone="1" color="tertiary" size="~clock_alt_tz_size" weight="bold" align="center" />
+          <label text="23:59" _source="clock" _display="time" _timezone="1" color="tertiary" size="~clock_alt_size" weight="bold" align="center" />
         </div>
       </div>
     </div>
   </template>
 
   <template name="VerticalSeparator">
-    <rectangle width="2" height="100%" color="~color_accent" />
+    <rectangle width="2" height="100%" color="outline" />
   </template>
 
   <elements>
@@ -131,15 +126,15 @@
                 <sprite src_builtin="watch/keyboard.svg" width="40" height="40" />
               </Button>
               <Button id="btn_edit_mode" macro="button_style" _press="::EditToggle" tooltip="WATCH.EDIT_MODE" tooltip_side="left">
-                <sprite color="~color_text" width="40" height="40" src="watch/edit.svg" />
+                <sprite width="40" height="40" src="watch/edit.svg" />
               </Button>
             </div>
             <div gap="8">
               <Button macro="button_style" _press="::PlayspaceRecenter" tooltip="WATCH.RECENTER" tooltip_side="left">
-                <sprite width="40" height="40" color="~color_text" src="watch/recenter.svg" />
+                <sprite width="40" height="40" src="watch/recenter.svg" />
               </Button>
               <Button macro="button_style" _press="::PlayspaceFixFloor" tooltip="WATCH.FIX_FLOOR" tooltip_side="left">
-                <sprite width="40" height="40" color="~color_text" src="watch/fix-floor.svg" />
+                <sprite width="40" height="40" src="watch/fix-floor.svg" />
               </Button>
             </div>
           </div>
@@ -149,7 +144,7 @@
         <div flex_direction="row" gap="8">
           <div gap="4">
             <Button id="btn_dashboard" macro="button_style" _press="::DashToggle" tooltip="WATCH.DASHBOARD" tooltip_side="top">
-              <sprite color="~color_text" width="40" height="40" src="watch/wayvr_dashboard_mono.svg" />
+              <sprite width="40" height="40" src="watch/wayvr_dashboard_mono.svg" />
             </Button>
           </div>
           <VerticalSeparator />
diff --git a/wayvr/src/assets/gui/whisper.xml b/wayvr/src/assets/gui/whisper.xml
new file mode 100644
index 00000000..b7dfc1e1
--- /dev/null
+++ b/wayvr/src/assets/gui/whisper.xml
@@ -0,0 +1,50 @@
+<layout>
+  <macro name="button_style" border="2" round="6"
+    align_items="center" justify_content="center" padding="6" width="60" height="60" overflow="visible" />
+
+  <macro name="bg_rect" width="100%" color="background" border_color="outline" round="10" border="2" />
+
+  <template name="VerticalSeparator">
+    <rectangle width="2" height="100%" color="outline" />
+  </template>
+
+  <elements>
+    <div flex_direction="column" width="600" >
+      <rectangle macro="bg_rect" padding="10" align_items="center" justify_content="space_between">
+        <div gap="10">
+          <Button macro="button_style" _press="::WhisperTranscribeStart" _release="::WhisperTranscribeStop" tooltip="WHISPER.TRANSCRIBE" tooltip_side="right">
+            <sprite width="38" height="38" src="icons/mic.svg"  />
+          </Button>
+          <VerticalSeparator />
+          <Button macro="button_style" _press="::WhisperPaste" tooltip="WHISPER.PASTE" tooltip_side="right">
+            <sprite width="38" height="38" src_builtin="icons/paste.svg" />
+          </Button>
+          <Button macro="button_style" _press="::WhisperPasteAndGo" tooltip="WHISPER.PASTE_AND_GO" tooltip_side="right">
+            <sprite width="38" height="38" src_builtin="icons/paste-go.svg" />
+          </Button>
+          <VerticalSeparator />
+          <Button macro="button_style" _press="::SendKey Return down" _release="::SendKey Return up" tooltip="WHISPER.ENTER_KEY" tooltip_side="right">
+            <sprite width="38" height="38" src_builtin="keyboard/return.svg" />
+          </Button>
+          <VerticalSeparator />
+          <Button macro="button_style" _press="::WhisperSendOSC" tooltip="WHISPER.SEND_OSC" id="btn_osc_send" tooltip_side="right">
+            <sprite width="38" height="38" src_builtin="icons/chat.svg" />
+          </Button>
+        </div>
+        <div gap="10">
+          <Button macro="button_style" _press="::WhisperUnloadAndClose" tooltip="WHISPER.UNLOAD_AND_CLOSE" tooltip_side="left"
+            hover_color="danger" hover_border_color="danger(rgb-mult-0.5)">
+            <sprite width="38" height="38" src_builtin="edit/close.svg" />
+          </Button>
+        </div>
+      </rectangle>
+      <div width="100%" height="13" interactable="0" />
+      <rectangle macro="bg_rect" flex_direction="column" padding="10">
+        <div>
+          <label id="transcription" wrap="1" size="20" padding_left="16" padding_right="16" translation="WHISPER.INITIAL_TEXT" />
+        </div>
+      </rectangle>
+    </div>
+  </elements>
+
+</layout>
diff --git a/wayvr/src/assets/icons/chat.svg b/wayvr/src/assets/icons/chat.svg
new file mode 100644
index 00000000..600dee10
--- /dev/null
+++ b/wayvr/src/assets/icons/chat.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M2 22V4q0-.825.588-1.412T4 2h16q.825 0 1.413.588T22 4v12q0 .825-.587 1.413T20 18H6zm4-8h8v-2H6zm0-3h12V9H6zm0-3h12V6H6z"/></svg>
diff --git a/wayvr/src/assets/icons/mic.svg b/wayvr/src/assets/icons/mic.svg
new file mode 100644
index 00000000..809dfe32
--- /dev/null
+++ b/wayvr/src/assets/icons/mic.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M12 14q-1.25 0-2.125-.875T9 11V5q0-1.25.875-2.125T12 2t2.125.875T15 5v6q0 1.25-.875 2.125T12 14m-1 7v-3.075q-2.6-.35-4.3-2.325T5 11h2q0 2.075 1.463 3.538T12 16t3.538-1.463T17 11h2q0 2.625-1.7 4.6T13 17.925V21z"/></svg>
diff --git a/wayvr/src/assets/icons/paste-go.svg b/wayvr/src/assets/icons/paste-go.svg
new file mode 100644
index 00000000..c9f49c44
--- /dev/null
+++ b/wayvr/src/assets/icons/paste-go.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="m18 21l-1.4-1.425L18.175 18H12v-2h6.175L16.6 14.4L18 13l4 4zm3-10h-2V5h-2v3H7V5H5v14h5v2H5q-.825 0-1.412-.587T3 19V5q0-.825.588-1.412T5 3h4.175q.275-.875 1.075-1.437T12 1q1 0 1.788.563T14.85 3H19q.825 0 1.413.588T21 5zm-9-6q.425 0 .713-.288T13 4t-.288-.712T12 3t-.712.288T11 4t.288.713T12 5"/></svg>
diff --git a/wayvr/src/assets/icons/paste.svg b/wayvr/src/assets/icons/paste.svg
new file mode 100644
index 00000000..a59ffb4f
--- /dev/null
+++ b/wayvr/src/assets/icons/paste.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M5 21q-.825 0-1.412-.587T3 19V5q0-.825.588-1.412T5 3h4.175q.275-.875 1.075-1.437T12 1q1 0 1.788.563T14.85 3H19q.825 0 1.413.588T21 5v14q0 .825-.587 1.413T19 21zm0-2h14V5h-2v3H7V5H5zm7-14q.425 0 .713-.288T13 4t-.288-.712T12 3t-.712.288T11 4t.288.713T12 5"/></svg>
diff --git a/wayvr/src/assets/lang/de.json b/wayvr/src/assets/lang/de.json
index f4969b8c..48b16772 100644
--- a/wayvr/src/assets/lang/de.json
+++ b/wayvr/src/assets/lang/de.json
@@ -1,118 +1,155 @@
 {
-  "ANCHOR": {
-    "CENTER": "Zentrum"
-  },
-  "BAR": {
-    "ADD_MIRROR": "Neuen Spiegel-Overlay hinzufügen",
-    "EDIT_MODE_TOGGLE": "Bearbeitungsmodus umschalten",
-    "ADD_NEW_SET": "Neues Set hinzufügen",
-    "DELETE_CURRENT_SET": "Aktuelles Set löschen",
-    "TOGGLE_VISIBILITY": "Sichtbarkeit umschalten",
-    "RESET_POSITION": "Position zurücksetzen",
-    "RELOAD_FROM_DISK": "XML-Datei von der Festplatte neu laden",
-    "CLOSE_MIRROR": "Spiegel schließen",
-    "CLOSE_APP": "App schließen",
-    "FORCE_CLOSE_APP": "App zwangsweise schließen",
-    "HANDSFREE": {
-      "TITLE": "Freihändig-Modus",
-      "NONE": "Aus",
-      "HMD": "HMD + Kneifen",
-      "EYE_TRACKING": "Auge + Kneifen",
-      "HMD_ONLY": "Nur HMD",
-      "EYE_ONLY": "Nur Augen"
-    }
-  },
-  "WATCH": {
-    "RECENTER": "Spielbereich neu zentrieren",
-    "FIX_FLOOR": "Bodenhöhe korrigieren",
-    "EDIT_MODE_EXPLANATION": "Overlays können nun einzeln verschoben und angepasst werden.\nOverlays für den aktuellen Satz umschalten:",
-    "DASHBOARD": "Dashboard",
-    "EDIT_MODE": "Bearbeitungsmodus",
-    "ADD_NEW_SET": "Neuen Satz hinzufügen",
-    "SWITCH_TO_SET": "Zum Satz wechseln",
-    "TOGGLE_FOR_CURRENT_SET": "Sichtbarkeit im aktuellen Satz umschalten",
-    "LONG_PRESS_TO_DELETE_SET": "Lange drücken, um Satz zu löschen",
-    "CLEANUP_MIRRORS": "Spiegel entfernen, die\nderzeit nicht sichtbar sind"
-  },
-  "EDIT_MODE": {
-    "ADJUST_CURVATURE": "Krümmung anpassen",
-    "ALPHA_BLEND_MODE": "Alpha-Mischmodus",
-    "BLENDING_ADDITIVE": "Additiv",
-    "CURVATURE": "Krümmung",
-    "DELETE": "Löschen",
-    "HINT_POINT_WINDOW": "Zeigen Sie auf ein Fenster, um seine Parameter zu ändern.\nWenn Sie fertig sind, verlassen Sie den Bearbeitungsmodus mit der Schaltfläche auf der rechten Seite.",
-    "LEAVE": "Bearbeitungsmodus verlassen",
-    "LOCK_INTERACTION": "Interaktion sperren",
-    "DISABLE_GRAB": "Greifen deaktivieren",
-    "MOVE_PRESS_AND_DRAG": "Verschieben (drücken & ziehen)",
-    "OPACITY": "Undurchsichtigkeit",
-    "POSITIONING": "Positionierung",
-    "RESIZE_PRESS_AND_DRAG": "Größe ändern (gedrückt halten & ziehen)",
-    "POS_STATIC": "Statisch: Bleibt an Ort und Stelle und wird niemals neu zentriert.",
-    "POS_ANCHORED": "Verankert: Bewegt sich zusammen mit dem Rest des Sets. Standard.",
-    "POS_FLOATING": "Schwebend: Bleibt an Ort und Stelle, wird beim Anzeigen neu zentriert.",
-    "POS_HMD": "Folge dem Headset.",
-    "POS_HAND_L": "Folge der linken Hand.",
-    "POS_HAND_R": "Folge der rechten Hand.",
-    "INTERPOLATION": "Interpolation",
-    "KEYBOARD": "Tastatur",
-    "STEREO_3D_MODE_A": {},
-    "STEREO_3D_MODE": {
-      "TITLE": "3D Stereo-Modus",
-      "SPLIT_LEFT_RIGHT": "LINKS→RECHTS",
-      "SPLIT_RIGHT_LEFT": "RECHTS→LINKS",
-      "SPLIT_TOP_BOTTOM": "OBEN→UNTEN",
-      "SPLIT_BOTTOM_TOP": "UNTEN→OBEN",
-      "FULL_FRAME": "Voll 3D",
-      "FULL_FRAME_SBS": "Full-SBS",
-      "FULL_FRAME_TAB": "Full-TAB",
-      "FULL_FRAME_BAT": "Full-BAT",
-      "ADJUST_MOUSE": "Maus anpassen"
-    },
-    "STEREO_3D_MODE_": {},
-    "ALIGN_TO_HMD": "An HMD ausrichten",
-    "MOUSE": {
-      "TITLE": "Mauskorrekturen",
-      "WRONG_SCREEN_SELECTION_HELP": "Wenn der Cursor auf einem völlig anderen Bildschirm verschwindet,\nwurden die Bildschirme wahrscheinlich falsch ausgewählt. Siehe Lesezeichen.",
-      "NORMAL": "Normal",
-      "FLIPPED": "Gespiegelt",
-      "FLIP90": "90° gespiegelt",
-      "FLIP180": "180° gespiegelt",
-      "FLIP270": "270° gespiegelt",
-      "ROTATE90": "90° gedreht",
-      "ROTATE180": "180° gedreht",
-      "ROTATE270": "270° gedreht"
-    },
-    "GLOBAL": "Immer sichtbar",
-    "ANGLE_FADE": "Winkelübergang",
-    "ANGLE_FADE_HELP": "Ausblenden, wenn nicht auf das Headset gerichtet",
-    "BLOCK_INPUT": "Blockiere Spieleingabe"
-  },
-  "DISABLED": "Deaktiviert",
-  "DEFAULT": "Standard",
-  "GRAB": {
-    "ADJUST_DISTANCE": "Entfernung anpassen",
-    "ADJUST_SIZE": "Größe anpassen",
-    "UNRESTRICTED_MOVEMENT": "Unbeschränkte Bewegung",
-    "GRABBING_WATCH": "Um die Hände zu vertauschen, bewegen Sie die Uhr vor sich und greifen Sie sie mit der anderen Hand.",
-    "GRABBING_STATIC": "Dieses Overlay ist statisch und bleibt an Ort und Stelle, ignoriert die Neu-Zentrierung.",
-    "GRABBING_ANCHORED": "Festgelegte Overlays bewegen sich alle zusammen. Trennen Sie ein einzelnes Fenster, indem Sie es mit der anderen Hand greifen, während Sie den Anker weiterhin greifen.",
-    "GRABBING_ANCHORED_EDIT": "Diese Overlay-Darstellung bleibt an der Mittelmarkierung verankert.",
-    "GRABBING_FLOATING": "Diese Overlay-Darstellung ist frei schwebend und bleibt an Ort und Stelle, es sei denn, sie wird neu zentriert.",
-    "GRABBING_FOLLOW": "Dieses Overlay wird dem Gerät folgen, an das es angehängt ist."
-  },
-  "TOAST": {
-    "DEFAULT_TITLE": "Benachrichtigung",
-    "ERROR": "Fehler",
-    "CANNOT_REMOVE_SET": "Satz kann nicht entfernt werden!",
-    "NO_SET_SELECTED": "Kein Set ausgewählt.",
-    "LAST_EXISTING_SET": "Dies ist das letzte vorhandene Set.",
-    "EMPTY_SET": "Leeres Set!",
-    "LETS_ADD_OVERLAYS": "Lass uns ein paar Overlays von der Uhr hinzufügen!",
-    "ONE_CONTROLLER_ON_FLOOR": "Lege einen Controller auf den Boden!",
-    "CANNOT_ADD_SET": "Satz kann nicht hinzugefügt werden!",
-    "MAXIMUM_SETS_REACHED": "Maximale Anzahl an Sets erreicht.",
-    "FIXING_FLOOR_IN_X_SECS": "Boden wird in {SECONDS} Sekunde(n) repariert..."
-  },
-  "DONE": "Erledigt"
+	"ANCHOR": {
+		"CENTER": "Zentrum"
+	},
+	"BAR": {
+		"ADD_MIRROR": "Neuen Spiegel-Overlay hinzufügen",
+		"EDIT_MODE_TOGGLE": "Bearbeitungsmodus umschalten",
+		"ADD_NEW_SET": "Neues Set hinzufügen",
+		"DELETE_CURRENT_SET": "Aktuelles Set löschen",
+		"TOGGLE_VISIBILITY": "Sichtbarkeit umschalten",
+		"RESET_POSITION": "Position zurücksetzen",
+		"RELOAD_FROM_DISK": "XML-Datei von der Festplatte neu laden",
+		"CLOSE_MIRROR": "Spiegel schließen",
+		"CLOSE_APP": "App schließen",
+		"FORCE_CLOSE_APP": "App zwangsweise schließen",
+		"HANDSFREE": {
+			"TITLE": "Freihändig-Modus",
+			"NONE": "Aus",
+			"HMD": "HMD + Kneifen",
+			"EYE_TRACKING": "Auge + Kneifen",
+			"EYE_ONLY": "Augenlaser",
+			"HMD_ONLY": "HMD-Laser"
+		}
+	},
+	"WATCH": {
+		"RECENTER": "Spielbereich neu zentrieren",
+		"FIX_FLOOR": "Bodenhöhe korrigieren",
+		"EDIT_MODE_EXPLANATION": "Overlays können nun einzeln verschoben und angepasst werden.\nOverlays für den aktuellen Satz umschalten:",
+		"DASHBOARD": "Dashboard",
+		"EDIT_MODE": "Bearbeitungsmodus",
+		"ADD_NEW_SET": "Neuen Satz hinzufügen",
+		"SWITCH_TO_SET": "Zum Satz wechseln",
+		"TOGGLE_FOR_CURRENT_SET": "Sichtbarkeit im aktuellen Satz umschalten",
+		"LONG_PRESS_TO_DELETE_SET": "Lange drücken, um Satz zu löschen",
+		"CLEANUP_MIRRORS": "Spiegel entfernen, die\nderzeit nicht sichtbar sind"
+	},
+	"EDIT_MODE": {
+		"ADJUST_CURVATURE": "Krümmung anpassen",
+		"ALPHA_BLEND_MODE": "Alpha-Mischmodus",
+		"BLENDING_ADDITIVE": "Additiv",
+		"CURVATURE": "Krümmung",
+		"DELETE": "Löschen",
+		"HINT_POINT_WINDOW": "Zeigen Sie auf ein Fenster, um seine Parameter zu ändern.\nWenn Sie fertig sind, verlassen Sie den Bearbeitungsmodus mit der Schaltfläche auf der rechten Seite.",
+		"LEAVE": "Bearbeitungsmodus verlassen",
+		"LOCK_INTERACTION": "Interaktion sperren",
+		"DISABLE_GRAB": "Greifen deaktivieren",
+		"MOVE_PRESS_AND_DRAG": "Verschieben (drücken & ziehen)",
+		"OPACITY": "Undurchsichtigkeit",
+		"POSITIONING": "Positionierung",
+		"RESIZE_PRESS_AND_DRAG": "Größe ändern (gedrückt halten & ziehen)",
+		"POS_STATIC": "Statisch: Bleibt an Ort und Stelle und wird niemals neu zentriert.",
+		"POS_ANCHORED": "Verankert: Bewegt sich zusammen mit dem Rest des Sets. Standard.",
+		"POS_FLOATING": "Schwebend: Bleibt an Ort und Stelle, wird beim Anzeigen neu zentriert.",
+		"POS_HMD": "Folge dem Headset.",
+		"POS_HAND_L": "Folge der linken Hand.",
+		"POS_HAND_R": "Folge der rechten Hand.",
+		"INTERPOLATION": "Interpolation",
+		"KEYBOARD": "Tastatur",
+		"STEREO_3D_MODE_A": {},
+		"STEREO_3D_MODE": {
+			"TITLE": "3D Stereo-Modus",
+			"SPLIT_LEFT_RIGHT": "LINKS→RECHTS",
+			"SPLIT_RIGHT_LEFT": "RECHTS→LINKS",
+			"SPLIT_TOP_BOTTOM": "OBEN→UNTEN",
+			"SPLIT_BOTTOM_TOP": "UNTEN→OBEN",
+			"FULL_FRAME": "Voll 3D",
+			"FULL_FRAME_SBS": "Full-SBS",
+			"FULL_FRAME_TAB": "Full-TAB",
+			"FULL_FRAME_BAT": "Full-BAT",
+			"ADJUST_MOUSE": "Maus anpassen"
+		},
+		"STEREO_3D_MODE_": {},
+		"ALIGN_TO_HMD": "An HMD ausrichten",
+		"MOUSE": {
+			"TITLE": "Mauskorrekturen",
+			"WRONG_SCREEN_SELECTION_HELP": "Wenn der Cursor auf einem völlig anderen Bildschirm verschwindet,\nwurden die Bildschirme wahrscheinlich falsch ausgewählt. Siehe Lesezeichen.",
+			"NORMAL": "Normal",
+			"FLIPPED": "Gespiegelt",
+			"FLIP90": "90° gespiegelt",
+			"FLIP180": "180° gespiegelt",
+			"FLIP270": "270° gespiegelt",
+			"ROTATE90": "90° gedreht",
+			"ROTATE180": "180° gedreht",
+			"ROTATE270": "270° gedreht"
+		},
+		"GLOBAL": "Immer sichtbar",
+		"ANGLE_FADE": "Winkelübergang",
+		"ANGLE_FADE_HELP": "Ausblenden, wenn nicht auf das Headset gerichtet",
+		"BLOCK_INPUT": "Blockiere Spieleingabe",
+		"RESIZE_CORNER": "Zum Ändern der Größe ziehen"
+	},
+	"DISABLED": "Deaktiviert",
+	"DEFAULT": "Standard",
+	"GRAB": {
+		"ADJUST_DISTANCE": "Entfernung anpassen",
+		"ADJUST_SIZE": "Größe anpassen",
+		"UNRESTRICTED_MOVEMENT": "Unbeschränkte Bewegung",
+		"GRABBING_WATCH": "Um die Hände zu vertauschen, bewegen Sie die Uhr vor sich und greifen Sie sie mit der anderen Hand.",
+		"GRABBING_STATIC": "Dieses Overlay ist statisch und bleibt an Ort und Stelle, ignoriert die Neu-Zentrierung.",
+		"GRABBING_ANCHORED": "Festgelegte Overlays bewegen sich alle zusammen. Trennen Sie ein einzelnes Fenster, indem Sie es mit der anderen Hand greifen, während Sie den Anker weiterhin greifen.",
+		"GRABBING_ANCHORED_EDIT": "Diese Overlay-Darstellung bleibt an der Mittelmarkierung verankert.",
+		"GRABBING_FLOATING": "Diese Overlay-Darstellung ist frei schwebend und bleibt an Ort und Stelle, es sei denn, sie wird neu zentriert.",
+		"GRABBING_FOLLOW": "Dieses Overlay wird dem Gerät folgen, an das es angehängt ist."
+	},
+	"TOAST": {
+		"DEFAULT_TITLE": "Benachrichtigung",
+		"ERROR": "Fehler",
+		"CANNOT_REMOVE_SET": "Satz kann nicht entfernt werden!",
+		"NO_SET_SELECTED": "Kein Set ausgewählt.",
+		"LAST_EXISTING_SET": "Dies ist das letzte vorhandene Set.",
+		"EMPTY_SET": "Leeres Set!",
+		"ONE_CONTROLLER_ON_FLOOR": "Lege einen Controller auf den Boden!",
+		"CANNOT_ADD_SET": "Satz kann nicht hinzugefügt werden!",
+		"MAXIMUM_SETS_REACHED": "Maximale Anzahl an Sets erreicht.",
+		"FIXING_FLOOR_IN_X_SECS": "Boden wird in {SECONDS} Sekunde(n) repariert...",
+		"TITLE_SCREENCAST_FAIL": "Bildschirmübertragungsquelle konnte nicht gestartet werden!",
+		"LETS_ADD_OVERLAYS": "Lass uns einige Overlays aus der Taskleiste hinzufügen!"
+	},
+	"DONE": "Erledigt",
+	"WHISPER": {
+		"TRANSCRIBE": "Zum Transkribieren von Text gedrückt halten",
+		"PASTE": "Transkription in die Zwischenablage kopieren",
+		"PASTE_AND_GO": "Transkription kopieren und Ctrl-V an die fokussierte App senden",
+		"SEND_OSC": "Transkription an OSC-Chatbox senden",
+		"UNLOAD_AND_CLOSE": "Modell entladen und schließen",
+		"MODEL_NOT_DOWNLOADED": "Spracherkennung nicht eingerichtet!",
+		"DOWNLOAD_GUIDANCE": "Richten Sie die Spracherkennung unter Einstellungen -> Features ein!",
+		"INITIAL_TEXT": "Halten Sie die Mikrofontaste gedrückt, um mit der Transkription zu beginnen...",
+		"INIT_ERROR": "Fehler beim Starten der Whisper-Engine",
+		"ENTER_KEY": "Enter-Taste"
+	},
+	"SCREENCAST": {
+		"PENDING": "Bitte warten...",
+		"QUEUED": "Warten auf die Bestätigung des Screen-Cast-Pop-ups eines anderen Overlays.",
+		"WAITING_FOR_USER_DESC": "Überprüfen Sie Ihren Desktop auf ein Pop-up zur Bildschirmübertragung.\nWählen Sie Folgendes aus:",
+		"WAITING_FOR_USER": "Überprüfen Sie Ihren Desktop auf ein Pop-up zur Bildschirmübertragung.",
+		"FAIL": "Bildschirmübertragungsquelle konnte nicht initialisiert werden."
+	},
+	"ALTTAB": {
+		"RELEASE_TO_FOCUS": "Richten Sie den Cursor auf eine App und lassen Sie die Super-Taste los, um diese App zu fokussieren.",
+		"WHILE_AIMING": "Beim Zielen",
+		"CLICK": "VR-Pointer-Klick",
+		"GRABALL": "Gesamtes Set bewegen",
+		"GRAB": "Einzelnes Overlay bewegen",
+		"DASH": "Dashboard umschalten",
+		"EDIT": "Bearbeitungsmodus umschalten",
+		"SET": "Set wechseln",
+		"RECENTER": "Anzeigen/Ausblenden/Zentrieren",
+		"GENERAL_BINDS": "Allgemeine Belegungen",
+		"TOGGLE_CAPTURE": "Kontrolle an Desktop zurückgeben",
+		"FOCUS_MODE": "Fokus-Modus (Super gedrückt halten)",
+		"CLOSE": "Fokussierte App schließen",
+		"MOUSE": "Echte Mausklicks & Scrollen werden auch auf den VR-Zeiger übertragen"
+	}
 }
\ No newline at end of file
diff --git a/wayvr/src/assets/lang/en.json b/wayvr/src/assets/lang/en.json
index b3a3070a..bb9cdfeb 100644
--- a/wayvr/src/assets/lang/en.json
+++ b/wayvr/src/assets/lang/en.json
@@ -11,10 +11,10 @@
 		"EDIT_MODE_TOGGLE": "Toggle edit mode",
 		"FORCE_CLOSE_APP": "Force close app",
 		"HANDSFREE": {
-			"EYE_ONLY": "Eye only",
+			"EYE_ONLY": "Eye laser",
 			"EYE_TRACKING": "Eye + pinch",
 			"HMD": "HMD + pinch",
-			"HMD_ONLY": "HMD only",
+			"HMD_ONLY": "HMD laser",
 			"NONE": "Off",
 			"TITLE": "Handsfree mode"
 		},
@@ -64,6 +64,7 @@
 		"POS_STATIC": "Static: Not part of any set, no recenter.",
 		"POSITIONING": "Positioning",
 		"RESIZE_PRESS_AND_DRAG": "Resize (press & drag)",
+		"RESIZE_CORNER": "Drag to resize",
 		"STEREO_3D_MODE": {
 			"ADJUST_MOUSE": "Adjust mouse",
 			"FULL_FRAME": "Full 3D",
@@ -77,6 +78,22 @@
 			"TITLE": "3D Stereo Mode"
 		}
 	},
+	"ALTTAB": {
+		"RELEASE_TO_FOCUS": "Aim at an app and release Super to focus that app.",
+		"WHILE_AIMING": "While aiming",
+		"CLICK": "VR pointer click",
+		"GRABALL": "Move entire set",
+		"GRAB": "Move individual overlay",
+		"DASH": "Toggle dashboard",
+		"EDIT": "Toggle edit mode",
+		"SET": "Switch set",
+		"RECENTER": "Show/hide/recenter",
+		"GENERAL_BINDS": "General bindings",
+		"TOGGLE_CAPTURE": "Give control back to desktop",
+		"FOCUS_MODE": "Focus mode (hold Super)",
+		"CLOSE": "Close focused app",
+		"MOUSE": "Real mouse clicks & scroll also translate to VR pointer"
+	},
 	"GRAB": {
 		"ADJUST_DISTANCE": "Adjust distance",
 		"ADJUST_SIZE": "Adjust size",
@@ -88,7 +105,15 @@
 		"GRABBING_WATCH": "To swap hands, move the watch in front and grab it with the other hand.",
 		"UNRESTRICTED_MOVEMENT": "Unrestricted movement"
 	},
+	"SCREENCAST": {
+		"PENDING": "Please wait...",
+		"QUEUED": "Waiting for a different overlay's screen cast pop-up to be approved.",
+		"WAITING_FOR_USER_DESC": "Check your dekstop for a screen cast pop-up.\nSelect the following:",
+		"WAITING_FOR_USER": "Check your desktop for a screen cast pop-up.",
+		"FAIL": "Could not initialize screen cast source."
+	},
 	"TOAST": {
+		"TITLE_SCREENCAST_FAIL": "Could not start screen cast source!",
 		"CANNOT_ADD_SET": "Cannot add set!",
 		"CANNOT_REMOVE_SET": "Cannot remove set!",
 		"DEFAULT_TITLE": "Notification",
@@ -96,7 +121,7 @@
 		"ERROR": "Error",
 		"FIXING_FLOOR_IN_X_SECS": "Fixing floor in {SECONDS} second(s)...",
 		"LAST_EXISTING_SET": "This is the last existing set.",
-		"LETS_ADD_OVERLAYS": "Let's add some overlays from the watch!",
+		"LETS_ADD_OVERLAYS": "Let's add some overlays from the taskbar!",
 		"MAXIMUM_SETS_REACHED": "Maximum number of sets reached.",
 		"NO_SET_SELECTED": "No set is selected.",
 		"ONE_CONTROLLER_ON_FLOOR": "Place one controller on the floor!"
@@ -112,5 +137,17 @@
 		"RECENTER": "Recenter playspace",
 		"SWITCH_TO_SET": "Switch to set",
 		"TOGGLE_FOR_CURRENT_SET": "Toggle for current set"
+	},
+	"WHISPER": {
+		"TRANSCRIBE": "Press and hold to transcribe text",
+		"PASTE": "Copy transcription to clipboard",
+		"PASTE_AND_GO": "Copy transcription and send Ctrl-V to focused app",
+		"SEND_OSC": "Send transcription to OSC chatbox",
+		"UNLOAD_AND_CLOSE": "Unload model and close",
+		"MODEL_NOT_DOWNLOADED": "Speech-to-text not set up!",
+		"DOWNLOAD_GUIDANCE": "Set up speech-to-text under settings, features!",
+		"INITIAL_TEXT": "Press and hold the mic button to start transcribing...",
+		"INIT_ERROR": "Error while starting Whisper engine",
+		"ENTER_KEY": "Enter key"
 	}
 }
diff --git a/wayvr/src/assets/lang/es.json b/wayvr/src/assets/lang/es.json
index 8236a64a..98bb314d 100644
--- a/wayvr/src/assets/lang/es.json
+++ b/wayvr/src/assets/lang/es.json
@@ -1,118 +1,155 @@
 {
-  "ANCHOR": {
-    "CENTER": "Centro"
-  },
-  "BAR": {
-    "ADD_MIRROR": "Agregar una nueva superposición de espejo",
-    "EDIT_MODE_TOGGLE": "Activar/desactivar el modo de edición",
-    "ADD_NEW_SET": "Añadir nuevo set",
-    "DELETE_CURRENT_SET": "Eliminar set actual",
-    "TOGGLE_VISIBILITY": "Alternar visibilidad",
-    "RESET_POSITION": "Restablecer posición",
-    "RELOAD_FROM_DISK": "Volver a cargar XML desde el disco",
-    "CLOSE_MIRROR": "Cerrar espejo",
-    "CLOSE_APP": "Cerrar aplicación",
-    "FORCE_CLOSE_APP": "Forzar cierre de la aplicación",
-    "HANDSFREE": {
-      "TITLE": "Modo manos libres",
-      "NONE": "Desactivado",
-      "HMD": "HMD + pellizco",
-      "EYE_TRACKING": "Ojo + pellizco",
-      "HMD_ONLY": "Solo HMD",
-      "EYE_ONLY": "Solo ojos"
-    }
-  },
-  "WATCH": {
-    "RECENTER": "Recentrar el área de juego",
-    "FIX_FLOOR": "Ajustar la altura del piso",
-    "EDIT_MODE_EXPLANATION": "Ahora las superposiciones se pueden mover y ajustar individualmente.\nAlternar superposiciones para el conjunto actual:",
-    "DASHBOARD": "Panel de control",
-    "EDIT_MODE": "Modo de edición",
-    "ADD_NEW_SET": "Añadir un nuevo conjunto",
-    "SWITCH_TO_SET": "Cambiar al conjunto",
-    "TOGGLE_FOR_CURRENT_SET": "Alternar visibilidad en el conjunto actual",
-    "LONG_PRESS_TO_DELETE_SET": "Mantén presionado para eliminar el conjunto",
-    "CLEANUP_MIRRORS": "Eliminar los espejos que\nno son actualmente visibles"
-  },
-  "EDIT_MODE": {
-    "ADJUST_CURVATURE": "Ajustar curvatura",
-    "ALPHA_BLEND_MODE": "Modo de mezcla alfa",
-    "BLENDING_ADDITIVE": "Aditivo",
-    "CURVATURE": "Curvatura",
-    "DELETE": "Eliminar",
-    "HINT_POINT_WINDOW": "Pulsa sobre una ventana para cambiar sus parámetros.\nUna vez terminado, sal del modo de edición usando el botón de la derecha.",
-    "LEAVE": "Salir del modo edición",
-    "LOCK_INTERACTION": "Bloquear interacción",
-    "DISABLE_GRAB": "Desactivar agarre",
-    "MOVE_PRESS_AND_DRAG": "Mover (presionar y arrastrar)",
-    "OPACITY": "Opacidad",
-    "POSITIONING": "Posicionamiento",
-    "RESIZE_PRESS_AND_DRAG": "Redimensionar (presionar y arrastrar)",
-    "POS_STATIC": "Estático: Permanece en su lugar y nunca se recentra.",
-    "POS_ANCHORED": "Anclado: Se mueve junto con el resto del conjunto. Predeterminado.",
-    "POS_FLOATING": "Flotante: Permanece en su lugar, se recentra cuando se muestra.",
-    "POS_HMD": "Seguir el HMD.",
-    "POS_HAND_L": "Seguir la mano izquierda.",
-    "POS_HAND_R": "Seguir la mano derecha.",
-    "INTERPOLATION": "Interpolación",
-    "KEYBOARD": "Teclado",
-    "STEREO_3D_MODE_A": {},
-    "STEREO_3D_MODE": {
-      "TITLE": "Modo Estéreo 3D",
-      "SPLIT_LEFT_RIGHT": "IZQ→DER",
-      "SPLIT_RIGHT_LEFT": "DERECHA→IZQUIERDA",
-      "SPLIT_TOP_BOTTOM": "ARRIBA→ABAJO",
-      "SPLIT_BOTTOM_TOP": "ABAJO→ARRIBA",
-      "FULL_FRAME": "3D completo",
-      "FULL_FRAME_SBS": "Full-SBS",
-      "FULL_FRAME_TAB": "Full-TAB",
-      "FULL_FRAME_BAT": "Full-BAT",
-      "ADJUST_MOUSE": "Ajustar ratón"
-    },
-    "STEREO_3D_MODE_": {},
-    "ALIGN_TO_HMD": "Alinear al HMD",
-    "MOUSE": {
-      "TITLE": "Correcciones del ratón",
-      "WRONG_SCREEN_SELECTION_HELP": "Si el cursor se mueve en una pantalla completamente diferente,\nes probable que las pantallas se hayan seleccionado incorrectamente. Consulta el archivo readme.",
-      "NORMAL": "Normal",
-      "FLIPPED": "Invertido",
-      "FLIP90": "Invertido 90°",
-      "FLIP180": "Invertido 180°",
-      "FLIP270": "Invertido 270°",
-      "ROTATE90": "Rotado 90°",
-      "ROTATE180": "Rotado 180°",
-      "ROTATE270": "Rotado 270°"
-    },
-    "GLOBAL": "Siempre visible",
-    "ANGLE_FADE": "Atenuación angular",
-    "ANGLE_FADE_HELP": "Desvanecer cuando no se mira el HMD",
-    "BLOCK_INPUT": "Bloquear entrada del juego"
-  },
-  "DISABLED": "Deshabilitado",
-  "DEFAULT": "Por defecto",
-  "GRAB": {
-    "ADJUST_DISTANCE": "Ajustar distancia",
-    "ADJUST_SIZE": "Ajustar tamaño",
-    "UNRESTRICTED_MOVEMENT": "Movimiento sin restricciones",
-    "GRABBING_WATCH": "Para intercambiar las manos, mueve el reloj al frente y agrárralo con la otra mano.",
-    "GRABBING_STATIC": "Esta superposición es estática y permanecerá en su lugar, ignorando el recentrado.",
-    "GRABBING_ANCHORED": "Las superposiciones ancladas se mueven todas juntas. Separa una ventana individual agarrándola con la otra mano mientras aún sujetas el ancla.",
-    "GRABBING_ANCHORED_EDIT": "Esta superposición permanecerá anclada al marcador central.",
-    "GRABBING_FLOATING": "Esta superposición es flotante y permanecerá en su lugar a menos que se recentre.",
-    "GRABBING_FOLLOW": "Esta superposición seguirá el dispositivo al que está adjunta."
-  },
-  "TOAST": {
-    "DEFAULT_TITLE": "Notificación",
-    "ERROR": "Error",
-    "CANNOT_REMOVE_SET": "¡No se puede eliminar el conjunto!",
-    "NO_SET_SELECTED": "No se ha seleccionado ningún conjunto.",
-    "LAST_EXISTING_SET": "Este es el último conjunto existente.",
-    "EMPTY_SET": "¡Conjunto vacío!",
-    "LETS_ADD_OVERLAYS": "¡Añadamos algunos overlays desde el reloj!",
-    "ONE_CONTROLLER_ON_FLOOR": "¡Coloca un mando en el suelo!",
-    "CANNOT_ADD_SET": "¡No se puede agregar el conjunto!",
-    "MAXIMUM_SETS_REACHED": "Se ha alcanzado el número máximo de sets.",
-    "FIXING_FLOOR_IN_X_SECS": "Corrigiendo el suelo en {SECONDS} segundo(s)..."
-  },
-  "DONE": "Hecho"
+	"ANCHOR": {
+		"CENTER": "Centro"
+	},
+	"BAR": {
+		"ADD_MIRROR": "Agregar una nueva superposición de espejo",
+		"EDIT_MODE_TOGGLE": "Activar/desactivar el modo de edición",
+		"ADD_NEW_SET": "Añadir nuevo set",
+		"DELETE_CURRENT_SET": "Eliminar set actual",
+		"TOGGLE_VISIBILITY": "Alternar visibilidad",
+		"RESET_POSITION": "Restablecer posición",
+		"RELOAD_FROM_DISK": "Volver a cargar XML desde el disco",
+		"CLOSE_MIRROR": "Cerrar espejo",
+		"CLOSE_APP": "Cerrar aplicación",
+		"FORCE_CLOSE_APP": "Forzar cierre de la aplicación",
+		"HANDSFREE": {
+			"TITLE": "Modo manos libres",
+			"NONE": "Desactivado",
+			"HMD": "HMD + pellizco",
+			"EYE_TRACKING": "Ojo + pellizco",
+			"EYE_ONLY": "Láser ocular",
+			"HMD_ONLY": "Láser del HMD"
+		}
+	},
+	"WATCH": {
+		"RECENTER": "Recentrar el área de juego",
+		"FIX_FLOOR": "Ajustar la altura del piso",
+		"EDIT_MODE_EXPLANATION": "Ahora las superposiciones se pueden mover y ajustar individualmente.\nAlternar superposiciones para el conjunto actual:",
+		"DASHBOARD": "Panel de control",
+		"EDIT_MODE": "Modo de edición",
+		"ADD_NEW_SET": "Añadir un nuevo conjunto",
+		"SWITCH_TO_SET": "Cambiar al conjunto",
+		"TOGGLE_FOR_CURRENT_SET": "Alternar visibilidad en el conjunto actual",
+		"LONG_PRESS_TO_DELETE_SET": "Mantén presionado para eliminar el conjunto",
+		"CLEANUP_MIRRORS": "Eliminar los espejos que\nno son actualmente visibles"
+	},
+	"EDIT_MODE": {
+		"ADJUST_CURVATURE": "Ajustar curvatura",
+		"ALPHA_BLEND_MODE": "Modo de mezcla alfa",
+		"BLENDING_ADDITIVE": "Aditivo",
+		"CURVATURE": "Curvatura",
+		"DELETE": "Eliminar",
+		"HINT_POINT_WINDOW": "Pulsa sobre una ventana para cambiar sus parámetros.\nUna vez terminado, sal del modo de edición usando el botón de la derecha.",
+		"LEAVE": "Salir del modo edición",
+		"LOCK_INTERACTION": "Bloquear interacción",
+		"DISABLE_GRAB": "Desactivar agarre",
+		"MOVE_PRESS_AND_DRAG": "Mover (presionar y arrastrar)",
+		"OPACITY": "Opacidad",
+		"POSITIONING": "Posicionamiento",
+		"RESIZE_PRESS_AND_DRAG": "Redimensionar (presionar y arrastrar)",
+		"POS_STATIC": "Estático: Permanece en su lugar y nunca se recentra.",
+		"POS_ANCHORED": "Anclado: Se mueve junto con el resto del conjunto. Predeterminado.",
+		"POS_FLOATING": "Flotante: Permanece en su lugar, se recentra cuando se muestra.",
+		"POS_HMD": "Seguir el HMD.",
+		"POS_HAND_L": "Seguir la mano izquierda.",
+		"POS_HAND_R": "Seguir la mano derecha.",
+		"INTERPOLATION": "Interpolación",
+		"KEYBOARD": "Teclado",
+		"STEREO_3D_MODE_A": {},
+		"STEREO_3D_MODE": {
+			"TITLE": "Modo Estéreo 3D",
+			"SPLIT_LEFT_RIGHT": "IZQ→DER",
+			"SPLIT_RIGHT_LEFT": "DERECHA→IZQUIERDA",
+			"SPLIT_TOP_BOTTOM": "ARRIBA→ABAJO",
+			"SPLIT_BOTTOM_TOP": "ABAJO→ARRIBA",
+			"FULL_FRAME": "3D completo",
+			"FULL_FRAME_SBS": "Full-SBS",
+			"FULL_FRAME_TAB": "Full-TAB",
+			"FULL_FRAME_BAT": "Full-BAT",
+			"ADJUST_MOUSE": "Ajustar ratón"
+		},
+		"STEREO_3D_MODE_": {},
+		"ALIGN_TO_HMD": "Alinear al HMD",
+		"MOUSE": {
+			"TITLE": "Correcciones del ratón",
+			"WRONG_SCREEN_SELECTION_HELP": "Si el cursor se mueve en una pantalla completamente diferente,\nes probable que las pantallas se hayan seleccionado incorrectamente. Consulta el archivo readme.",
+			"NORMAL": "Normal",
+			"FLIPPED": "Invertido",
+			"FLIP90": "Invertido 90°",
+			"FLIP180": "Invertido 180°",
+			"FLIP270": "Invertido 270°",
+			"ROTATE90": "Rotado 90°",
+			"ROTATE180": "Rotado 180°",
+			"ROTATE270": "Rotado 270°"
+		},
+		"GLOBAL": "Siempre visible",
+		"ANGLE_FADE": "Atenuación angular",
+		"ANGLE_FADE_HELP": "Desvanecer cuando no se mira el HMD",
+		"BLOCK_INPUT": "Bloquear entrada del juego",
+		"RESIZE_CORNER": "Arrastra para cambiar el tamaño"
+	},
+	"DISABLED": "Deshabilitado",
+	"DEFAULT": "Por defecto",
+	"GRAB": {
+		"ADJUST_DISTANCE": "Ajustar distancia",
+		"ADJUST_SIZE": "Ajustar tamaño",
+		"UNRESTRICTED_MOVEMENT": "Movimiento sin restricciones",
+		"GRABBING_WATCH": "Para intercambiar las manos, mueve el reloj al frente y agrárralo con la otra mano.",
+		"GRABBING_STATIC": "Esta superposición es estática y permanecerá en su lugar, ignorando el recentrado.",
+		"GRABBING_ANCHORED": "Las superposiciones ancladas se mueven todas juntas. Separa una ventana individual agarrándola con la otra mano mientras aún sujetas el ancla.",
+		"GRABBING_ANCHORED_EDIT": "Esta superposición permanecerá anclada al marcador central.",
+		"GRABBING_FLOATING": "Esta superposición es flotante y permanecerá en su lugar a menos que se recentre.",
+		"GRABBING_FOLLOW": "Esta superposición seguirá el dispositivo al que está adjunta."
+	},
+	"TOAST": {
+		"DEFAULT_TITLE": "Notificación",
+		"ERROR": "Error",
+		"CANNOT_REMOVE_SET": "¡No se puede eliminar el conjunto!",
+		"NO_SET_SELECTED": "No se ha seleccionado ningún conjunto.",
+		"LAST_EXISTING_SET": "Este es el último conjunto existente.",
+		"EMPTY_SET": "¡Conjunto vacío!",
+		"ONE_CONTROLLER_ON_FLOOR": "¡Coloca un mando en el suelo!",
+		"CANNOT_ADD_SET": "¡No se puede agregar el conjunto!",
+		"MAXIMUM_SETS_REACHED": "Se ha alcanzado el número máximo de sets.",
+		"FIXING_FLOOR_IN_X_SECS": "Corrigiendo el suelo en {SECONDS} segundo(s)...",
+		"TITLE_SCREENCAST_FAIL": "¡No se pudo iniciar la fuente de transmisión de pantalla!",
+		"LETS_ADD_OVERLAYS": "¡Añadamos algunas superposiciones desde la barra de tareas!"
+	},
+	"DONE": "Hecho",
+	"WHISPER": {
+		"TRANSCRIBE": "Mantén presionado para transcribir texto",
+		"PASTE": "Copiar transcripción al portapapeles",
+		"PASTE_AND_GO": "Copiar transcripción y enviar Ctrl-V a la aplicación enfocada",
+		"SEND_OSC": "Enviar transcripción al chatbox de OSC",
+		"UNLOAD_AND_CLOSE": "Descargar modelo y cerrar",
+		"MODEL_NOT_DOWNLOADED": "¡El dictado por voz no está configurado!",
+		"DOWNLOAD_GUIDANCE": "¡Configura la conversión de voz a texto en ajustes, características!",
+		"INITIAL_TEXT": "Mantén presionado el botón del micrófono para comenzar a transcribir...",
+		"INIT_ERROR": "Error al iniciar el motor de Whisper",
+		"ENTER_KEY": "Tecla Enter"
+	},
+	"SCREENCAST": {
+		"PENDING": "Por favor, espere...",
+		"QUEUED": "Esperando a que se apruebe la ventana emergente de la transmisión de pantalla de otra superposición.",
+		"WAITING_FOR_USER_DESC": "Busca la ventana emergente de transmisión de pantalla en tu escritorio.\nSelecciona lo siguiente:",
+		"WAITING_FOR_USER": "Revisa tu escritorio para ver la ventana emergente de transmisión de pantalla.",
+		"FAIL": "No se pudo inicializar la fuente de transmisión de pantalla."
+	},
+	"ALTTAB": {
+		"RELEASE_TO_FOCUS": "Apunta a una aplicación y suelta Super para enfocar esa aplicación.",
+		"WHILE_AIMING": "Mientras se apunta",
+		"CLICK": "Clic del puntero de VR",
+		"GRABALL": "Mover set completo",
+		"GRAB": "Mover superposición individual",
+		"DASH": "Alternar tablero",
+		"EDIT": "Alternar modo de edición",
+		"SET": "Cambiar set",
+		"RECENTER": "Mostrar/ocultar/recentrar",
+		"GENERAL_BINDS": "Asignaciones generales",
+		"TOGGLE_CAPTURE": "Devolver el control al escritorio",
+		"FOCUS_MODE": "Modo de enfoque (mantener Super)",
+		"CLOSE": "Cerrar aplicación enfocada",
+		"MOUSE": "Los clics y el desplazamiento del ratón real también se traducen al puntero de VR"
+	}
 }
\ No newline at end of file
diff --git a/wayvr/src/assets/lang/it.json b/wayvr/src/assets/lang/it.json
index ed3015e8..328ab119 100644
--- a/wayvr/src/assets/lang/it.json
+++ b/wayvr/src/assets/lang/it.json
@@ -1,116 +1,153 @@
 {
-  "ANCHOR": {
-    "CENTER": "Centro"
-  },
-  "BAR": {
-    "ADD_MIRROR": "Aggiungi un nuovo overlay specchio",
-    "EDIT_MODE_TOGGLE": "Attiva/disattiva modalità modifica",
-    "ADD_NEW_SET": "Aggiungi nuovo set",
-    "DELETE_CURRENT_SET": "Elimina set attuale",
-    "TOGGLE_VISIBILITY": "Alterna visibilità",
-    "RESET_POSITION": "Ripristina posizione",
-    "RELOAD_FROM_DISK": "Ricarica XML dal disco",
-    "CLOSE_MIRROR": "Chiudi mirror",
-    "CLOSE_APP": "Chiudi app",
-    "FORCE_CLOSE_APP": "Chiudi forzatamente l'app",
-    "HANDSFREE": {
-      "TITLE": "Modalità a mani libere",
-      "NONE": "Disattivato",
-      "HMD": "HMD + pizzico",
-      "EYE_TRACKING": "Occhio + pizzico",
-      "HMD_ONLY": "Solo HMD",
-      "EYE_ONLY": "Solo occhi"
-    }
-  },
-  "DEFAULT": "Predefinito",
-  "DISABLED": "Disabilitato",
-  "EDIT_MODE": {
-    "ADJUST_CURVATURE": "Regola curvatura",
-    "ALPHA_BLEND_MODE": "Modalità di fusione Alpha",
-    "BLENDING_ADDITIVE": "Blending additivo",
-    "CURVATURE": "Curvatura",
-    "DELETE": "Tenere premuto per rimuovere dal set corrente",
-    "DISABLE_GRAB": "Disabilita l'afferra",
-    "HINT_POINT_WINDOW": "Punta a una finestra per modificarne i parametri.\nUna volta fatto, esci dalla modalità di modifica usando il pulsante a destra.",
-    "INTERPOLATION": "Interpolazione",
-    "ALIGN_TO_HMD": "Allinea all'HMD",
-    "KEYBOARD": "Tastiera",
-    "LEAVE": "Esci dalla modalità di modifica",
-    "LOCK_INTERACTION": "Blocca interazione",
-    "MOVE_PRESS_AND_DRAG": "Muovi (premi e trascina)",
-    "OPACITY": "Opacità",
-    "POS_ANCHORED": "Ancorato: si muove con il marker centrale. Predefinito.",
-    "POS_FLOATING": "Galleggiante: si muove indipendentemente, si recentra quando viene visualizzato.",
-    "POS_HAND_L": "Segui la mano sinistra.",
-    "POS_HAND_R": "Segui la mano destra.",
-    "POS_HMD": "Segui l'HMD.",
-    "POS_STATIC": "Statico: non fa parte di alcun set, senza recentratura.",
-    "POSITIONING": "Posizionamento",
-    "RESIZE_PRESS_AND_DRAG": "Ridimensiona (premi e trascina)",
-    "STEREO_3D_MODE": {
-      "SPLIT_BOTTOM_TOP": "DAL BASSO→IN ALTO",
-      "SPLIT_LEFT_RIGHT": "SINISTRA→DESTRA",
-      "SPLIT_RIGHT_LEFT": "DESTRA→SINISTRA",
-      "SPLIT_TOP_BOTTOM": "TOP→BOTTOM",
-      "TITLE": "Modalità Stereo 3D",
-      "FULL_FRAME": "3D Completo",
-      "FULL_FRAME_SBS": "Full-SBS",
-      "FULL_FRAME_TAB": "Full-TAB",
-      "FULL_FRAME_BAT": "Full-BAT",
-      "ADJUST_MOUSE": "Regola il mouse"
-    },
-    "MOUSE": {
-      "TITLE": "Correzioni del mouse",
-      "WRONG_SCREEN_SELECTION_HELP": "Se il cursore si sposta su uno schermo completamente diverso,\nprobabilmente gli schermi sono stati selezionati in modo errato. Consulta il file readme.",
-      "NORMAL": "Normale",
-      "ROTATE90": "Ruotato di 90°",
-      "ROTATE180": "Ruotato di 180°",
-      "ROTATE270": "Ruotato di 270°",
-      "FLIPPED": "Capovolto",
-      "FLIP90": "Ruotato di 90°",
-      "FLIP180": "Ruotato di 180°",
-      "FLIP270": "Ruotato di 270°"
-    },
-    "GLOBAL": "Sempre visibile",
-    "ANGLE_FADE": "Dissolvenza angolare",
-    "ANGLE_FADE_HELP": "Sfumatura quando non si guarda l'HMD",
-    "BLOCK_INPUT": "Blocca l'input del gioco"
-  },
-  "GRAB": {
-    "ADJUST_DISTANCE": "Regola la distanza",
-    "ADJUST_SIZE": "Regola dimensione",
-    "UNRESTRICTED_MOVEMENT": "Movimento libero",
-    "GRABBING_WATCH": "Per cambiare mano, sposta il watch davanti a te e afferralo con l'altra mano.",
-    "GRABBING_STATIC": "Questo overlay è Statico e rimarrà in posizione, ignorando il recenter.",
-    "GRABBING_ANCHORED": "Gli overlay ancorati si muovono tutti insieme. Separa una singola finestra afferrandola con l'altra mano mentre tieni ancora l'ancora.",
-    "GRABBING_ANCHORED_EDIT": "Questo overlay rimarrà ancorato al marcatore centrale.",
-    "GRABBING_FLOATING": "Questo overlay è mobile e rimarrà in posizione, a meno che non venga recentrato.",
-    "GRABBING_FOLLOW": "Questo overlay seguirà il dispositivo a cui è collegato."
-  },
-  "TOAST": {
-    "DEFAULT_TITLE": "Notifica",
-    "ERROR": "Errore",
-    "CANNOT_ADD_SET": "Impossibile aggiungere il set!",
-    "MAXIMUM_SETS_REACHED": "Numero massimo di set raggiunto.",
-    "CANNOT_REMOVE_SET": "Impossibile rimuovere il set!",
-    "NO_SET_SELECTED": "Nessun set è selezionato.",
-    "LAST_EXISTING_SET": "Questo è l'ultimo set esistente.",
-    "EMPTY_SET": "Set vuoto!",
-    "LETS_ADD_OVERLAYS": "Aggiungiamo degli overlay dal Watch!",
-    "ONE_CONTROLLER_ON_FLOOR": "Posiziona un controller a terra!",
-    "FIXING_FLOOR_IN_X_SECS": "Correzione del pavimento in {SECONDS} secondo/i..."
-  },
-  "WATCH": {
-    "ADD_NEW_SET": "Aggiungi un nuovo set",
-    "CLEANUP_MIRRORS": "Rimuovi gli specchi che\nnon sono attualmente visibili",
-    "DASHBOARD": "Pannello di controllo",
-    "EDIT_MODE": "Modalità modifica",
-    "EDIT_MODE_EXPLANATION": "Gli overlay possono ora essere spostati e regolati individualmente.\nControlla quali overlay sono visibili in questo set:",
-    "FIX_FLOOR": "Fissa il livello del pavimento",
-    "LONG_PRESS_TO_DELETE_SET": "Tenere premuto per eliminare",
-    "RECENTER": "Recentra l'area di gioco",
-    "SWITCH_TO_SET": "Passa a set",
-    "TOGGLE_FOR_CURRENT_SET": "Attiva/disattiva per il set corrente"
-  },
-  "DONE": "Fatto"
+	"ANCHOR": {
+		"CENTER": "Centro"
+	},
+	"BAR": {
+		"ADD_MIRROR": "Aggiungi un nuovo overlay specchio",
+		"EDIT_MODE_TOGGLE": "Attiva/disattiva modalità modifica",
+		"ADD_NEW_SET": "Aggiungi nuovo set",
+		"DELETE_CURRENT_SET": "Elimina set attuale",
+		"TOGGLE_VISIBILITY": "Alterna visibilità",
+		"RESET_POSITION": "Ripristina posizione",
+		"RELOAD_FROM_DISK": "Ricarica XML dal disco",
+		"CLOSE_MIRROR": "Chiudi mirror",
+		"CLOSE_APP": "Chiudi app",
+		"FORCE_CLOSE_APP": "Chiudi forzatamente l'app",
+		"HANDSFREE": {
+			"TITLE": "Modalità a mani libere",
+			"NONE": "Disattivato",
+			"HMD": "HMD + pizzico",
+			"EYE_TRACKING": "Occhio + pizzico",
+			"EYE_ONLY": "Laser oculare",
+			"HMD_ONLY": "Laser HMD"
+		}
+	},
+	"DEFAULT": "Predefinito",
+	"DISABLED": "Disabilitato",
+	"EDIT_MODE": {
+		"ADJUST_CURVATURE": "Regola curvatura",
+		"ALPHA_BLEND_MODE": "Modalità di fusione Alpha",
+		"BLENDING_ADDITIVE": "Blending additivo",
+		"CURVATURE": "Curvatura",
+		"DELETE": "Tenere premuto per rimuovere dal set corrente",
+		"DISABLE_GRAB": "Disabilita l'afferra",
+		"HINT_POINT_WINDOW": "Punta a una finestra per modificarne i parametri.\nUna volta fatto, esci dalla modalità di modifica usando il pulsante a destra.",
+		"INTERPOLATION": "Interpolazione",
+		"ALIGN_TO_HMD": "Allinea all'HMD",
+		"KEYBOARD": "Tastiera",
+		"LEAVE": "Esci dalla modalità di modifica",
+		"LOCK_INTERACTION": "Blocca interazione",
+		"MOVE_PRESS_AND_DRAG": "Muovi (premi e trascina)",
+		"OPACITY": "Opacità",
+		"POS_ANCHORED": "Ancorato: si muove con il marker centrale. Predefinito.",
+		"POS_FLOATING": "Galleggiante: si muove indipendentemente, si recentra quando viene visualizzato.",
+		"POS_HAND_L": "Segui la mano sinistra.",
+		"POS_HAND_R": "Segui la mano destra.",
+		"POS_HMD": "Segui l'HMD.",
+		"POS_STATIC": "Statico: non fa parte di alcun set, senza recentratura.",
+		"POSITIONING": "Posizionamento",
+		"RESIZE_PRESS_AND_DRAG": "Ridimensiona (premi e trascina)",
+		"STEREO_3D_MODE": {
+			"SPLIT_BOTTOM_TOP": "DAL BASSO→IN ALTO",
+			"SPLIT_LEFT_RIGHT": "SINISTRA→DESTRA",
+			"SPLIT_RIGHT_LEFT": "DESTRA→SINISTRA",
+			"SPLIT_TOP_BOTTOM": "TOP→BOTTOM",
+			"TITLE": "Modalità Stereo 3D",
+			"FULL_FRAME": "3D Completo",
+			"FULL_FRAME_SBS": "Full-SBS",
+			"FULL_FRAME_TAB": "Full-TAB",
+			"FULL_FRAME_BAT": "Full-BAT",
+			"ADJUST_MOUSE": "Regola il mouse"
+		},
+		"MOUSE": {
+			"TITLE": "Correzioni del mouse",
+			"WRONG_SCREEN_SELECTION_HELP": "Se il cursore si sposta su uno schermo completamente diverso,\nprobabilmente gli schermi sono stati selezionati in modo errato. Consulta il file readme.",
+			"NORMAL": "Normale",
+			"ROTATE90": "Ruotato di 90°",
+			"ROTATE180": "Ruotato di 180°",
+			"ROTATE270": "Ruotato di 270°",
+			"FLIPPED": "Capovolto",
+			"FLIP90": "Ruotato di 90°",
+			"FLIP180": "Ruotato di 180°",
+			"FLIP270": "Ruotato di 270°"
+		},
+		"GLOBAL": "Sempre visibile",
+		"ANGLE_FADE": "Dissolvenza angolare",
+		"ANGLE_FADE_HELP": "Sfumatura quando non si guarda l'HMD",
+		"BLOCK_INPUT": "Blocca l'input del gioco",
+		"RESIZE_CORNER": "Trascina per ridimensionare"
+	},
+	"GRAB": {
+		"ADJUST_DISTANCE": "Regola la distanza",
+		"ADJUST_SIZE": "Regola dimensione",
+		"UNRESTRICTED_MOVEMENT": "Movimento libero",
+		"GRABBING_WATCH": "Per cambiare mano, sposta il watch davanti a te e afferralo con l'altra mano.",
+		"GRABBING_STATIC": "Questo overlay è Statico e rimarrà in posizione, ignorando il recenter.",
+		"GRABBING_ANCHORED": "Gli overlay ancorati si muovono tutti insieme. Separa una singola finestra afferrandola con l'altra mano mentre tieni ancora l'ancora.",
+		"GRABBING_ANCHORED_EDIT": "Questo overlay rimarrà ancorato al marcatore centrale.",
+		"GRABBING_FLOATING": "Questo overlay è mobile e rimarrà in posizione, a meno che non venga recentrato.",
+		"GRABBING_FOLLOW": "Questo overlay seguirà il dispositivo a cui è collegato."
+	},
+	"TOAST": {
+		"DEFAULT_TITLE": "Notifica",
+		"ERROR": "Errore",
+		"CANNOT_ADD_SET": "Impossibile aggiungere il set!",
+		"MAXIMUM_SETS_REACHED": "Numero massimo di set raggiunto.",
+		"CANNOT_REMOVE_SET": "Impossibile rimuovere il set!",
+		"NO_SET_SELECTED": "Nessun set è selezionato.",
+		"LAST_EXISTING_SET": "Questo è l'ultimo set esistente.",
+		"EMPTY_SET": "Set vuoto!",
+		"ONE_CONTROLLER_ON_FLOOR": "Posiziona un controller a terra!",
+		"FIXING_FLOOR_IN_X_SECS": "Correzione del pavimento in {SECONDS} secondo/i...",
+		"TITLE_SCREENCAST_FAIL": "Impossibile avviare la sorgente dello screen cast!",
+		"LETS_ADD_OVERLAYS": "Aggiungiamo alcuni overlay dalla barra delle applicazioni!"
+	},
+	"WATCH": {
+		"ADD_NEW_SET": "Aggiungi un nuovo set",
+		"CLEANUP_MIRRORS": "Rimuovi gli specchi che\nnon sono attualmente visibili",
+		"DASHBOARD": "Pannello di controllo",
+		"EDIT_MODE": "Modalità modifica",
+		"EDIT_MODE_EXPLANATION": "Gli overlay possono ora essere spostati e regolati individualmente.\nControlla quali overlay sono visibili in questo set:",
+		"FIX_FLOOR": "Fissa il livello del pavimento",
+		"LONG_PRESS_TO_DELETE_SET": "Tenere premuto per eliminare",
+		"RECENTER": "Recentra l'area di gioco",
+		"SWITCH_TO_SET": "Passa a set",
+		"TOGGLE_FOR_CURRENT_SET": "Attiva/disattiva per il set corrente"
+	},
+	"DONE": "Fatto",
+	"WHISPER": {
+		"TRANSCRIBE": "Tieni premuto per trascrivere il testo",
+		"PASTE": "Copia trascrizione negli appunti",
+		"PASTE_AND_GO": "Copia trascrizione e invia Ctrl-V all'app a fuoco",
+		"SEND_OSC": "Invia trascrizione alla chatbox OSC",
+		"UNLOAD_AND_CLOSE": "Scarica modello e chiudi",
+		"MODEL_NOT_DOWNLOADED": "Speech-to-text non configurato!",
+		"DOWNLOAD_GUIDANCE": "Configura il riconoscimento vocale in impostazioni, funzionalità!",
+		"INITIAL_TEXT": "Tieni premuto il tasto del microfono per iniziare la trascrizione...",
+		"INIT_ERROR": "Errore durante l'avvio del motore Whisper",
+		"ENTER_KEY": "Tasto Invio"
+	},
+	"SCREENCAST": {
+		"PENDING": "Attendi prego...",
+		"QUEUED": "In attesa dell'approvazione del pop-up di screen cast di un altro overlay.",
+		"WAITING_FOR_USER_DESC": "Controlla il desktop per un pop-up di condivisione schermo.\nSeleziona quanto segue:",
+		"WAITING_FOR_USER": "Controlla il desktop per un pop-up di condivisione schermo.",
+		"FAIL": "Impossibile inizializzare la sorgente di trasmissione dello schermo."
+	},
+	"ALTTAB": {
+		"RELEASE_TO_FOCUS": "Mira a un'app e rilascia il tasto Super per focalizzare l'app.",
+		"WHILE_AIMING": "Mentre si mira",
+		"CLICK": "Click del puntatore VR",
+		"GRABALL": "Sposta l'intero set",
+		"GRAB": "Sposta overlay singolo",
+		"DASH": "Attiva/disattiva dashboard",
+		"EDIT": "Attiva/disattiva modalità modifica",
+		"SET": "Cambia set",
+		"RECENTER": "Mostra/nascondi/ricentra",
+		"GENERAL_BINDS": "Binding generali",
+		"TOGGLE_CAPTURE": "Restituisci il controllo al desktop",
+		"FOCUS_MODE": "Modalità focus (tieni premuto Super)",
+		"CLOSE": "Chiudi l'app focalizzata",
+		"MOUSE": "I clic e lo scorrimento del mouse reale vengono tradotti anche nel puntatore VR"
+	}
 }
\ No newline at end of file
diff --git a/wayvr/src/assets/lang/ja.json b/wayvr/src/assets/lang/ja.json
index c493120a..1f3886b8 100644
--- a/wayvr/src/assets/lang/ja.json
+++ b/wayvr/src/assets/lang/ja.json
@@ -1,116 +1,153 @@
 {
-  "ANCHOR": {
-    "CENTER": "センター"
-  },
-  "BAR": {
-    "ADD_MIRROR": "新しいミラーを追加",
-    "EDIT_MODE_TOGGLE": "編集モードの切り替え",
-    "ADD_NEW_SET": "新しいセットを追加",
-    "DELETE_CURRENT_SET": "現在のセットを削除",
-    "TOGGLE_VISIBILITY": "表示/非表示の切り替え",
-    "RESET_POSITION": "位置をリセット",
-    "RELOAD_FROM_DISK": "ディスクからXMLを再読み込み",
-    "CLOSE_MIRROR": "ミラーを閉じる",
-    "CLOSE_APP": "アプリを閉じる",
-    "FORCE_CLOSE_APP": "アプリを強制終了",
-    "HANDSFREE": {
-      "TITLE": "ハンズフリーモード",
-      "NONE": "オフ",
-      "HMD": "HMD + ピンチ",
-      "EYE_TRACKING": "視線 + ピンチ",
-      "HMD_ONLY": "HMDのみ",
-      "EYE_ONLY": "目のみ"
-    }
-  },
-  "WATCH": {
-    "RECENTER": "プレイスペースをリセンター",
-    "FIX_FLOOR": "床の高さを修正",
-    "EDIT_MODE_EXPLANATION": "オーバーレイは個別に移動および調整できます。\n現在のセットのオーバーレイを切り替え：",
-    "DASHBOARD": "ダッシュボード",
-    "EDIT_MODE": "編集モード",
-    "ADD_NEW_SET": "新しいセットを追加",
-    "SWITCH_TO_SET": "セットに切り替える",
-    "TOGGLE_FOR_CURRENT_SET": "現在のセットで表示を切り替え",
-    "LONG_PRESS_TO_DELETE_SET": "長押しでセットを削除",
-    "CLEANUP_MIRRORS": "現在表示されていないミラーを削除"
-  },
-  "EDIT_MODE": {
-    "ADJUST_CURVATURE": "曲率の調整",
-    "ALPHA_BLEND_MODE": "アルファブレンド",
-    "BLENDING_ADDITIVE": "加算モード",
-    "CURVATURE": "曲率",
-    "DELETE": "削除",
-    "HINT_POINT_WINDOW": "ウィンドウをタップしてそのパラメータを変更できます。\n右側のボタンで編集モードを終了できます。",
-    "LEAVE": "編集モードを終了する",
-    "LOCK_INTERACTION": "インタラクションを無効化",
-    "DISABLE_GRAB": "グラブを無効化",
-    "MOVE_PRESS_AND_DRAG": "移動（押してドラッグ）",
-    "OPACITY": "不透明度",
-    "POSITIONING": "位置付け",
-    "RESIZE_PRESS_AND_DRAG": "サイズ変更（押してドラッグ）",
-    "POS_STATIC": "固定：置かれた場所に留まり、再センタリングされません。",
-    "POS_ANCHORED": "アンカー：セット内の他のウィンドウと共に移動します。デフォルト。",
-    "POS_FLOATING": "フローティング：置かれた場所に留まるが、表示される時に再センタリングされます。",
-    "POS_HMD": "HMD に追従する。",
-    "POS_HAND_L": "左手に追従する。",
-    "POS_HAND_R": "右手に追従する。",
-    "INTERPOLATION": "スムージング",
-    "KEYBOARD": "キーボード",
-    "STEREO_3D_MODE": {
-      "TITLE": "ステレオ3Dモード",
-      "SPLIT_LEFT_RIGHT": "左→右",
-      "SPLIT_RIGHT_LEFT": "右→左",
-      "SPLIT_TOP_BOTTOM": "上→下",
-      "SPLIT_BOTTOM_TOP": "下→上",
-      "FULL_FRAME": "フル3D",
-      "FULL_FRAME_SBS": "フルSBS",
-      "FULL_FRAME_TAB": "フルTAB",
-      "FULL_FRAME_BAT": "フルBAT",
-      "ADJUST_MOUSE": "マウス調整"
-    },
-    "ALIGN_TO_HMD": "常にHMDの方を向く",
-    "MOUSE": {
-      "TITLE": "マウスの修正",
-      "WRONG_SCREEN_SELECTION_HELP": "カーソルが全く別のスクリーンで動く場合、\nスクリーンが正しく選択されていない可能性があります。\nReadmeをご参照ください。",
-      "NORMAL": "通常",
-      "FLIPPED": "ミラー",
-      "FLIP90": "ミラー 90°",
-      "FLIP180": "ミラー 180°",
-      "FLIP270": "ミラー 270°",
-      "ROTATE90": "回転 90°",
-      "ROTATE180": "回転 180°",
-      "ROTATE270": "回転 270°"
-    },
-    "GLOBAL": "常に表示",
-    "ANGLE_FADE": "角度フェード",
-    "ANGLE_FADE_HELP": "HMDに向いていない時にフェード",
-    "BLOCK_INPUT": "ゲーム入力をブロック"
-  },
-  "DISABLED": "無効",
-  "DEFAULT": "デフォルト",
-  "GRAB": {
-    "ADJUST_DISTANCE": "距離を調整",
-    "ADJUST_SIZE": "サイズ調整",
-    "UNRESTRICTED_MOVEMENT": "配置制限なし",
-    "GRABBING_WATCH": "手を入れ替えるにはウォッチを前に移動させて、もう一方の手で掴んでください。",
-    "GRABBING_STATIC": "このオーバーレイは固定であり、リセンターを無視してその場に留まります。",
-    "GRABBING_ANCHORED": "アンカーされたオーバーレイはすべて一緒に移動します。もう一方の手で掴んでアンカーを掴んだまま、単一のウィンドウを分離できます。",
-    "GRABBING_ANCHORED_EDIT": "このオーバーレイは、センター・マーカーに固定されます。",
-    "GRABBING_FLOATING": "このオーバーレイはフローティングのため、リセンターまではその場所に留まります。",
-    "GRABBING_FOLLOW": "このオーバーレイは、接続されているデバイスに追従します。"
-  },
-  "TOAST": {
-    "DEFAULT_TITLE": "通知",
-    "ERROR": "エラー",
-    "CANNOT_REMOVE_SET": "セットを削除できません！",
-    "NO_SET_SELECTED": "セットが選択されていません。",
-    "LAST_EXISTING_SET": "これが最後の設定です。",
-    "EMPTY_SET": "空のセットです！",
-    "LETS_ADD_OVERLAYS": "ウォッチからオーバーレイを追加しましょう！",
-    "ONE_CONTROLLER_ON_FLOOR": "コントローラーを床に置いてください！",
-    "CANNOT_ADD_SET": "セットを追加できません！",
-    "MAXIMUM_SETS_REACHED": "最大セット数に達しました。",
-    "FIXING_FLOOR_IN_X_SECS": "{SECONDS}秒で床を固定中..."
-  },
-  "DONE": "完了"
+	"ANCHOR": {
+		"CENTER": "センター"
+	},
+	"BAR": {
+		"ADD_MIRROR": "新しいミラーを追加",
+		"EDIT_MODE_TOGGLE": "編集モードの切り替え",
+		"ADD_NEW_SET": "新しいセットを追加",
+		"DELETE_CURRENT_SET": "現在のセットを削除",
+		"TOGGLE_VISIBILITY": "表示/非表示の切り替え",
+		"RESET_POSITION": "位置をリセット",
+		"RELOAD_FROM_DISK": "ディスクからXMLを再読み込み",
+		"CLOSE_MIRROR": "ミラーを閉じる",
+		"CLOSE_APP": "アプリを閉じる",
+		"FORCE_CLOSE_APP": "アプリを強制終了",
+		"HANDSFREE": {
+			"TITLE": "ハンズフリーモード",
+			"NONE": "オフ",
+			"HMD": "HMD + ピンチ",
+			"EYE_TRACKING": "視線 + ピンチ",
+			"EYE_ONLY": "アイルーザー",
+			"HMD_ONLY": "HMDレーザー"
+		}
+	},
+	"WATCH": {
+		"RECENTER": "プレイスペースをリセンター",
+		"FIX_FLOOR": "床の高さを修正",
+		"EDIT_MODE_EXPLANATION": "オーバーレイは個別に移動および調整できます。\n現在のセットのオーバーレイを切り替え：",
+		"DASHBOARD": "ダッシュボード",
+		"EDIT_MODE": "編集モード",
+		"ADD_NEW_SET": "新しいセットを追加",
+		"SWITCH_TO_SET": "セットに切り替える",
+		"TOGGLE_FOR_CURRENT_SET": "現在のセットで表示を切り替え",
+		"LONG_PRESS_TO_DELETE_SET": "長押しでセットを削除",
+		"CLEANUP_MIRRORS": "現在表示されていないミラーを削除"
+	},
+	"EDIT_MODE": {
+		"ADJUST_CURVATURE": "曲率の調整",
+		"ALPHA_BLEND_MODE": "アルファブレンド",
+		"BLENDING_ADDITIVE": "加算モード",
+		"CURVATURE": "曲率",
+		"DELETE": "削除",
+		"HINT_POINT_WINDOW": "ウィンドウをタップしてそのパラメータを変更できます。\n右側のボタンで編集モードを終了できます。",
+		"LEAVE": "編集モードを終了する",
+		"LOCK_INTERACTION": "インタラクションを無効化",
+		"DISABLE_GRAB": "グラブを無効化",
+		"MOVE_PRESS_AND_DRAG": "移動（押してドラッグ）",
+		"OPACITY": "不透明度",
+		"POSITIONING": "位置付け",
+		"RESIZE_PRESS_AND_DRAG": "サイズ変更（押してドラッグ）",
+		"POS_STATIC": "固定：置かれた場所に留まり、再センタリングされません。",
+		"POS_ANCHORED": "アンカー：セット内の他のウィンドウと共に移動します。デフォルト。",
+		"POS_FLOATING": "フローティング：置かれた場所に留まるが、表示される時に再センタリングされます。",
+		"POS_HMD": "HMD に追従する。",
+		"POS_HAND_L": "左手に追従する。",
+		"POS_HAND_R": "右手に追従する。",
+		"INTERPOLATION": "スムージング",
+		"KEYBOARD": "キーボード",
+		"STEREO_3D_MODE": {
+			"TITLE": "ステレオ3Dモード",
+			"SPLIT_LEFT_RIGHT": "左→右",
+			"SPLIT_RIGHT_LEFT": "右→左",
+			"SPLIT_TOP_BOTTOM": "上→下",
+			"SPLIT_BOTTOM_TOP": "下→上",
+			"FULL_FRAME": "フル3D",
+			"FULL_FRAME_SBS": "フルSBS",
+			"FULL_FRAME_TAB": "フルTAB",
+			"FULL_FRAME_BAT": "フルBAT",
+			"ADJUST_MOUSE": "マウス調整"
+		},
+		"ALIGN_TO_HMD": "常にHMDの方を向く",
+		"MOUSE": {
+			"TITLE": "マウスの修正",
+			"WRONG_SCREEN_SELECTION_HELP": "カーソルが全く別のスクリーンで動く場合、\nスクリーンが正しく選択されていない可能性があります。\nReadmeをご参照ください。",
+			"NORMAL": "通常",
+			"FLIPPED": "ミラー",
+			"FLIP90": "ミラー 90°",
+			"FLIP180": "ミラー 180°",
+			"FLIP270": "ミラー 270°",
+			"ROTATE90": "回転 90°",
+			"ROTATE180": "回転 180°",
+			"ROTATE270": "回転 270°"
+		},
+		"GLOBAL": "常に表示",
+		"ANGLE_FADE": "角度フェード",
+		"ANGLE_FADE_HELP": "HMDに向いていない時にフェード",
+		"BLOCK_INPUT": "ゲーム入力をブロック",
+		"RESIZE_CORNER": "ドラッグしてサイズ変更"
+	},
+	"DISABLED": "無効",
+	"DEFAULT": "デフォルト",
+	"GRAB": {
+		"ADJUST_DISTANCE": "距離を調整",
+		"ADJUST_SIZE": "サイズ調整",
+		"UNRESTRICTED_MOVEMENT": "配置制限なし",
+		"GRABBING_WATCH": "手を入れ替えるにはウォッチを前に移動させて、もう一方の手で掴んでください。",
+		"GRABBING_STATIC": "このオーバーレイは固定であり、リセンターを無視してその場に留まります。",
+		"GRABBING_ANCHORED": "アンカーされたオーバーレイはすべて一緒に移動します。もう一方の手で掴んでアンカーを掴んだまま、単一のウィンドウを分離できます。",
+		"GRABBING_ANCHORED_EDIT": "このオーバーレイは、センター・マーカーに固定されます。",
+		"GRABBING_FLOATING": "このオーバーレイはフローティングのため、リセンターまではその場所に留まります。",
+		"GRABBING_FOLLOW": "このオーバーレイは、接続されているデバイスに追従します。"
+	},
+	"TOAST": {
+		"DEFAULT_TITLE": "通知",
+		"ERROR": "エラー",
+		"CANNOT_REMOVE_SET": "セットを削除できません！",
+		"NO_SET_SELECTED": "セットが選択されていません。",
+		"LAST_EXISTING_SET": "これが最後の設定です。",
+		"EMPTY_SET": "空のセットです！",
+		"ONE_CONTROLLER_ON_FLOOR": "コントローラーを床に置いてください！",
+		"CANNOT_ADD_SET": "セットを追加できません！",
+		"MAXIMUM_SETS_REACHED": "最大セット数に達しました。",
+		"FIXING_FLOOR_IN_X_SECS": "{SECONDS}秒で床を固定中...",
+		"TITLE_SCREENCAST_FAIL": "スクリーンキャストのソースを開始できませんでした！",
+		"LETS_ADD_OVERLAYS": "タスクバーからオーバーレイを追加しましょう！"
+	},
+	"DONE": "完了",
+	"WHISPER": {
+		"TRANSCRIBE": "ボタンを長押ししてテキストを文字起こしする",
+		"PASTE": "文字起こしをクリップボードにコピー",
+		"PASTE_AND_GO": "コピーしてフォーカスされているアプリにCtrl-Vを送信",
+		"SEND_OSC": "OSCチャットボックスに送信",
+		"UNLOAD_AND_CLOSE": "モデルをアンロードして閉じる",
+		"MODEL_NOT_DOWNLOADED": "文字起こしが設定されていません！",
+		"DOWNLOAD_GUIDANCE": "機能設定の中に文字起こしを設定してください！",
+		"INITIAL_TEXT": "マイクボタンを押し続けて文字起こしを開始してください...",
+		"INIT_ERROR": "Whisperエンジンの起動中にエラーが発生しました",
+		"ENTER_KEY": "Enterキー"
+	},
+	"SCREENCAST": {
+		"PENDING": "少々お待ちください...",
+		"QUEUED": "別のオーバーレイのスクリーンキャスト許可ポップアップの応答を待っています。",
+		"WAITING_FOR_USER_DESC": "デスクトップのスクリーンキャストのポップアップを確認してください。\n以下を選択してください：",
+		"WAITING_FOR_USER": "デスクトップにスクリーンキャストのポップアップが表示されていないか確認してください。",
+		"FAIL": "スクリーンキャストのソースを初期化できませんでした。"
+	},
+	"ALTTAB": {
+		"RELEASE_TO_FOCUS": "アプリを指してSuperキーを離すと、そのアプリにフォーカスします。",
+		"WHILE_AIMING": "照準合わせ中",
+		"CLICK": "VRポインタークリック",
+		"GRABALL": "セット全体を移動",
+		"GRAB": "個別のオーバーレイを移動",
+		"DASH": "ダッシュボードの切り替え",
+		"EDIT": "編集モードを切り替える",
+		"SET": "セットを切り替える",
+		"RECENTER": "表示/非表示/センター合わせ",
+		"GENERAL_BINDS": "一般バインド",
+		"TOGGLE_CAPTURE": "コントロールをデスクトップに戻す",
+		"FOCUS_MODE": "フォーカスモード (Superキーを長押し)",
+		"CLOSE": "フォーカス中のアプリを閉じる",
+		"MOUSE": "実際のマウスのクリックとスクロールもVRポインターに反映されます"
+	}
 }
\ No newline at end of file
diff --git a/wayvr/src/assets/lang/pl.json b/wayvr/src/assets/lang/pl.json
index 0d3d1fca..f9afd408 100644
--- a/wayvr/src/assets/lang/pl.json
+++ b/wayvr/src/assets/lang/pl.json
@@ -1,116 +1,153 @@
 {
-  "ANCHOR": {
-    "CENTER": "Centrum"
-  },
-  "BAR": {
-    "ADD_MIRROR": "Dodaj nowy widok lustrzany",
-    "EDIT_MODE_TOGGLE": "Przełącz tryb edycji",
-    "ADD_NEW_SET": "Dodaj nowy zestaw",
-    "DELETE_CURRENT_SET": "Usuń aktualny zestaw",
-    "TOGGLE_VISIBILITY": "Przełącz widoczność",
-    "RESET_POSITION": "Zresetuj pozycję",
-    "RELOAD_FROM_DISK": "Przeładuj XML z dysku",
-    "CLOSE_MIRROR": "Zamknij lustro",
-    "CLOSE_APP": "Zamknij aplikację",
-    "FORCE_CLOSE_APP": "Wymuś zamknięcie aplikacji",
-    "HANDSFREE": {
-      "TITLE": "Tryb wolnych rąk",
-      "NONE": "Wyłączone",
-      "HMD": "HMD + uszczypnięcie",
-      "EYE_TRACKING": "Oko + uszczypnięcie",
-      "HMD_ONLY": "Tylko HMD",
-      "EYE_ONLY": "Tylko oczy"
-    }
-  },
-  "WATCH": {
-    "RECENTER": "Wyśrodkuj przestrzeń gry",
-    "FIX_FLOOR": "Napraw wysokość podłogi",
-    "EDIT_MODE_EXPLANATION": "Nakładki można teraz przesuwać i dostosowywać indywidualnie.\nPrzełącz nakładki dla bieżącego zestawu:",
-    "DASHBOARD": "Pulpit",
-    "EDIT_MODE": "Tryb edycji",
-    "ADD_NEW_SET": "Dodaj nowy zestaw",
-    "SWITCH_TO_SET": "Przełącz na zestaw",
-    "TOGGLE_FOR_CURRENT_SET": "Przełącz widoczność w bieżącym zestawie",
-    "LONG_PRESS_TO_DELETE_SET": "Przytrzymaj, aby usunąć zestaw",
-    "CLEANUP_MIRRORS": "Usuń lustra, które\nnie są obecnie widoczne"
-  },
-  "EDIT_MODE": {
-    "ADJUST_CURVATURE": "Dostosuj zakrzywienie",
-    "ALPHA_BLEND_MODE": "Tryb mieszania kolorów",
-    "BLENDING_ADDITIVE": "Addytywne",
-    "CURVATURE": "Zakrzywienie",
-    "DELETE": "Usuń",
-    "HINT_POINT_WINDOW": "Wskaż na okno, aby zmienić jego parametry.\nPo zakończeniu wyjdź z trybu edycji za pomocą przycisku po prawej stronie.",
-    "LEAVE": "Wyjdź z trybu edycji",
-    "LOCK_INTERACTION": "Zablokuj interakcję",
-    "DISABLE_GRAB": "Wyłącz chwytanie",
-    "MOVE_PRESS_AND_DRAG": "Przesuń (naciśnij i przeciągnij)",
-    "OPACITY": "Przezroczystość",
-    "POSITIONING": "Pozycjonowanie",
-    "BLOCK_INPUT": "Blokuj input z gry",
-    "RESIZE_PRESS_AND_DRAG": "Zmień rozmiar (naciśnij i przeciągnij)",
-    "POS_STATIC": "Statyczne: Pozostaje w miejscu i nigdy nie jest ponownie wyśrodkowywane.",
-    "POS_ANCHORED": "Zakotwiczone: Porusza się razem z resztą zestawu. Domyślne.",
-    "POS_FLOATING": "Pływające: Pozostaje w miejscu, ponownie się wyśrodkowuje po pokazaniu.",
-    "POS_HMD": "Podążaj za HMD.",
-    "POS_HAND_L": "Podążaj za lewą dłonią.",
-    "POS_HAND_R": "Podążaj za prawą dłonią.",
-    "INTERPOLATION": "Interpolacja",
-    "KEYBOARD": "Klawiatura",
-    "STEREO_3D_MODE": {
-      "SPLIT_BOTTOM_TOP": "DOŁ→GÓRA",
-      "SPLIT_LEFT_RIGHT": "LEWO→PRAWO",
-      "SPLIT_RIGHT_LEFT": "PRAWO→LEWO",
-      "SPLIT_TOP_BOTTOM": "GÓRA→DÓŁ",
-      "TITLE": "Tryb stereoskopowy 3D",
-      "FULL_FRAME": "Pełny 3D",
-      "FULL_FRAME_SBS": "Full-SBS",
-      "FULL_FRAME_TAB": "Full-TAB",
-      "FULL_FRAME_BAT": "Full-BAT",
-      "ADJUST_MOUSE": "Dostosuj mysz"
-    },
-    "ALIGN_TO_HMD": "Dopasuj do HMD",
-    "MOUSE": {
-      "TITLE": "Naprawa myszy",
-      "WRONG_SCREEN_SELECTION_HELP": "Jeśli kursor porusza się na zupełnie innym ekranie,\nekrany zostały prawdopodobnie nieprawidłowo wybrane. Zobacz dokument README.",
-      "NORMAL": "Normalny",
-      "ROTATE90": "Obrócony o 90°",
-      "ROTATE180": "Obrócony o 180°",
-      "ROTATE270": "Obrócony o 270°",
-      "FLIPPED": "Odwrócony",
-      "FLIP90": "Odwrócony o 90°",
-      "FLIP180": "Odwrócony o 180°",
-      "FLIP270": "Odwrócony o 270°"
-    },
-    "GLOBAL": "Zawsze widoczne",
-    "ANGLE_FADE": "Zanik kątowy",
-    "ANGLE_FADE_HELP": "Wyblaknij, gdy nie patrzysz na HMD"
-  },
-  "DISABLED": "Wyłączone",
-  "DEFAULT": "Domyślny",
-  "GRAB": {
-    "ADJUST_DISTANCE": "Dostosuj odległość",
-    "ADJUST_SIZE": "Dostosuj rozmiar",
-    "UNRESTRICTED_MOVEMENT": "Nieograniczony ruch",
-    "GRABBING_WATCH": "Aby zamienić ręce, przenieś zegarek na przód i chwyć go drugą ręką.",
-    "GRABBING_STATIC": "Ta nakładka jest statyczna i pozostanie na swoim miejscu, ignorując centrowanie.",
-    "GRABBING_ANCHORED": "Przymocowane nakładki poruszają się razem. Aby oddzielić pojedyncze okno, chwyć je drugą ręką, podczas gdy nadal trzymasz kotwicę.",
-    "GRABBING_ANCHORED_EDIT": "Ta nakładka pozostanie zakotwiczona do znacznika centralnego.",
-    "GRABBING_FLOATING": "Ta nakładka jest zawieszony i pozostanie na miejscu, chyba że zostanie wycentrowany.",
-    "GRABBING_FOLLOW": "Ta nakładka będzie śledzić urządzenie, do którego jest dołączona."
-  },
-  "TOAST": {
-    "DEFAULT_TITLE": "Powiadomienie",
-    "ERROR": "Błąd",
-    "CANNOT_REMOVE_SET": "Nie można usunąć zestawu!",
-    "NO_SET_SELECTED": "Nie wybrano żadnego zestawu.",
-    "LAST_EXISTING_SET": "To jest ostatni istniejący zestaw.",
-    "EMPTY_SET": "Pusty zestaw!",
-    "LETS_ADD_OVERLAYS": "Dodajmy kilka nakładek z zegarka!",
-    "ONE_CONTROLLER_ON_FLOOR": "Umieść jeden kontroler na podłodze!",
-    "CANNOT_ADD_SET": "Nie można dodać zestawu!",
-    "MAXIMUM_SETS_REACHED": "Osiągnięto maksymalną liczbę zestawów.",
-    "FIXING_FLOOR_IN_X_SECS": "Naprawianie podłogi za {SECONDS} sekund(y)..."
-  },
-  "DONE": "Gotowe"
+	"ANCHOR": {
+		"CENTER": "Centrum"
+	},
+	"BAR": {
+		"ADD_MIRROR": "Dodaj nowy widok lustrzany",
+		"EDIT_MODE_TOGGLE": "Przełącz tryb edycji",
+		"ADD_NEW_SET": "Dodaj nowy zestaw",
+		"DELETE_CURRENT_SET": "Usuń aktualny zestaw",
+		"TOGGLE_VISIBILITY": "Przełącz widoczność",
+		"RESET_POSITION": "Zresetuj pozycję",
+		"RELOAD_FROM_DISK": "Przeładuj XML z dysku",
+		"CLOSE_MIRROR": "Zamknij lustro",
+		"CLOSE_APP": "Zamknij aplikację",
+		"FORCE_CLOSE_APP": "Wymuś zamknięcie aplikacji",
+		"HANDSFREE": {
+			"TITLE": "Tryb wolnych rąk",
+			"NONE": "Wyłączone",
+			"HMD": "HMD + uszczypnięcie",
+			"EYE_TRACKING": "Oko + uszczypnięcie",
+			"EYE_ONLY": "Laser wzrokowy",
+			"HMD_ONLY": "Laser w HMD"
+		}
+	},
+	"WATCH": {
+		"RECENTER": "Wyśrodkuj przestrzeń gry",
+		"FIX_FLOOR": "Napraw wysokość podłogi",
+		"EDIT_MODE_EXPLANATION": "Nakładki można teraz przesuwać i dostosowywać indywidualnie.\nPrzełącz nakładki dla bieżącego zestawu:",
+		"DASHBOARD": "Pulpit",
+		"EDIT_MODE": "Tryb edycji",
+		"ADD_NEW_SET": "Dodaj nowy zestaw",
+		"SWITCH_TO_SET": "Przełącz na zestaw",
+		"TOGGLE_FOR_CURRENT_SET": "Przełącz widoczność w bieżącym zestawie",
+		"LONG_PRESS_TO_DELETE_SET": "Przytrzymaj, aby usunąć zestaw",
+		"CLEANUP_MIRRORS": "Usuń lustra, które\nnie są obecnie widoczne"
+	},
+	"EDIT_MODE": {
+		"ADJUST_CURVATURE": "Dostosuj zakrzywienie",
+		"ALPHA_BLEND_MODE": "Tryb mieszania kolorów",
+		"BLENDING_ADDITIVE": "Addytywne",
+		"CURVATURE": "Zakrzywienie",
+		"DELETE": "Usuń",
+		"HINT_POINT_WINDOW": "Wskaż na okno, aby zmienić jego parametry.\nPo zakończeniu wyjdź z trybu edycji za pomocą przycisku po prawej stronie.",
+		"LEAVE": "Wyjdź z trybu edycji",
+		"LOCK_INTERACTION": "Zablokuj interakcję",
+		"DISABLE_GRAB": "Wyłącz chwytanie",
+		"MOVE_PRESS_AND_DRAG": "Przesuń (naciśnij i przeciągnij)",
+		"OPACITY": "Przezroczystość",
+		"POSITIONING": "Pozycjonowanie",
+		"BLOCK_INPUT": "Blokuj input z gry",
+		"RESIZE_PRESS_AND_DRAG": "Zmień rozmiar (naciśnij i przeciągnij)",
+		"POS_STATIC": "Statyczne: Pozostaje w miejscu i nigdy nie jest ponownie wyśrodkowywane.",
+		"POS_ANCHORED": "Zakotwiczone: Porusza się razem z resztą zestawu. Domyślne.",
+		"POS_FLOATING": "Pływające: Pozostaje w miejscu, ponownie się wyśrodkowuje po pokazaniu.",
+		"POS_HMD": "Podążaj za HMD.",
+		"POS_HAND_L": "Podążaj za lewą dłonią.",
+		"POS_HAND_R": "Podążaj za prawą dłonią.",
+		"INTERPOLATION": "Interpolacja",
+		"KEYBOARD": "Klawiatura",
+		"STEREO_3D_MODE": {
+			"SPLIT_BOTTOM_TOP": "DOŁ→GÓRA",
+			"SPLIT_LEFT_RIGHT": "LEWO→PRAWO",
+			"SPLIT_RIGHT_LEFT": "PRAWO→LEWO",
+			"SPLIT_TOP_BOTTOM": "GÓRA→DÓŁ",
+			"TITLE": "Tryb stereoskopowy 3D",
+			"FULL_FRAME": "Pełny 3D",
+			"FULL_FRAME_SBS": "Full-SBS",
+			"FULL_FRAME_TAB": "Full-TAB",
+			"FULL_FRAME_BAT": "Full-BAT",
+			"ADJUST_MOUSE": "Dostosuj mysz"
+		},
+		"ALIGN_TO_HMD": "Dopasuj do HMD",
+		"MOUSE": {
+			"TITLE": "Naprawa myszy",
+			"WRONG_SCREEN_SELECTION_HELP": "Jeśli kursor porusza się na zupełnie innym ekranie,\nekrany zostały prawdopodobnie nieprawidłowo wybrane. Zobacz dokument README.",
+			"NORMAL": "Normalny",
+			"ROTATE90": "Obrócony o 90°",
+			"ROTATE180": "Obrócony o 180°",
+			"ROTATE270": "Obrócony o 270°",
+			"FLIPPED": "Odwrócony",
+			"FLIP90": "Odwrócony o 90°",
+			"FLIP180": "Odwrócony o 180°",
+			"FLIP270": "Odwrócony o 270°"
+		},
+		"GLOBAL": "Zawsze widoczne",
+		"ANGLE_FADE": "Zanik kątowy",
+		"ANGLE_FADE_HELP": "Wyblaknij, gdy nie patrzysz na HMD",
+		"RESIZE_CORNER": "Przeciągnij, aby zmienić rozmiar"
+	},
+	"DISABLED": "Wyłączone",
+	"DEFAULT": "Domyślny",
+	"GRAB": {
+		"ADJUST_DISTANCE": "Dostosuj odległość",
+		"ADJUST_SIZE": "Dostosuj rozmiar",
+		"UNRESTRICTED_MOVEMENT": "Nieograniczony ruch",
+		"GRABBING_WATCH": "Aby zamienić ręce, przenieś zegarek na przód i chwyć go drugą ręką.",
+		"GRABBING_STATIC": "Ta nakładka jest statyczna i pozostanie na swoim miejscu, ignorując centrowanie.",
+		"GRABBING_ANCHORED": "Przymocowane nakładki poruszają się razem. Aby oddzielić pojedyncze okno, chwyć je drugą ręką, podczas gdy nadal trzymasz kotwicę.",
+		"GRABBING_ANCHORED_EDIT": "Ta nakładka pozostanie zakotwiczona do znacznika centralnego.",
+		"GRABBING_FLOATING": "Ta nakładka jest zawieszony i pozostanie na miejscu, chyba że zostanie wycentrowany.",
+		"GRABBING_FOLLOW": "Ta nakładka będzie śledzić urządzenie, do którego jest dołączona."
+	},
+	"TOAST": {
+		"DEFAULT_TITLE": "Powiadomienie",
+		"ERROR": "Błąd",
+		"CANNOT_REMOVE_SET": "Nie można usunąć zestawu!",
+		"NO_SET_SELECTED": "Nie wybrano żadnego zestawu.",
+		"LAST_EXISTING_SET": "To jest ostatni istniejący zestaw.",
+		"EMPTY_SET": "Pusty zestaw!",
+		"ONE_CONTROLLER_ON_FLOOR": "Umieść jeden kontroler na podłodze!",
+		"CANNOT_ADD_SET": "Nie można dodać zestawu!",
+		"MAXIMUM_SETS_REACHED": "Osiągnięto maksymalną liczbę zestawów.",
+		"FIXING_FLOOR_IN_X_SECS": "Naprawianie podłogi za {SECONDS} sekund(y)...",
+		"TITLE_SCREENCAST_FAIL": "Nie udało się uruchomić źródła przesyłania obrazu z ekranu!",
+		"LETS_ADD_OVERLAYS": "Dodajmy kilka nakładek z paska zadań!"
+	},
+	"DONE": "Gotowe",
+	"WHISPER": {
+		"TRANSCRIBE": "Naciśnij i przytrzymaj, aby transkrybować tekst",
+		"PASTE": "Kopiuj transkrypcję do schowka",
+		"PASTE_AND_GO": "Kopiuj transkrypcję i wyślij Ctrl-V do aktywnej aplikacji",
+		"SEND_OSC": "Wyślij transkrypcję do okna czatu OSC",
+		"UNLOAD_AND_CLOSE": "Odładuj model i zamknij",
+		"MODEL_NOT_DOWNLOADED": "Zamiana mowy na tekst nie została skonfigurowana!",
+		"DOWNLOAD_GUIDANCE": "Skonfiguruj funkcję zamiany mowy na tekst w ustawieniach, w sekcji funkcje!",
+		"INITIAL_TEXT": "Naciśnij i przytrzymaj przycisk mikrofonu, aby rozpocząć transkrypcję...",
+		"INIT_ERROR": "Błąd podczas uruchamiania silnika Whisper",
+		"ENTER_KEY": "Klawisz Enter"
+	},
+	"SCREENCAST": {
+		"PENDING": "Proszę czekać...",
+		"QUEUED": "Oczekiwanie na zatwierdzenie okna wysyłania obrazu z innego nakładki.",
+		"WAITING_FOR_USER_DESC": "Sprawdź na pulpicie okno wyboru ekranu do transmitowania.\nWybierz następujące:",
+		"WAITING_FOR_USER": "Sprawdź na pulpicie powiadomienie o przesyłaniu ekranu.",
+		"FAIL": "Nie udało się zainicjować źródła przesyłania obrazu z ekranu."
+	},
+	"ALTTAB": {
+		"RELEASE_TO_FOCUS": "Wyceluj w aplikację i puść klawisz Super, aby ją przenieść na pierwszy plan.",
+		"WHILE_AIMING": "Podczas celowania",
+		"CLICK": "Kliknięcie wskaźnikiem VR",
+		"GRABALL": "Przesuń cały zestaw",
+		"GRAB": "Przesuń pojedynczy overlay",
+		"DASH": "Przełącz pulpit sterowania",
+		"EDIT": "Przełącz tryb edycji",
+		"SET": "Zmień zestaw",
+		"RECENTER": "Pokaż/ukryj/wycentruj",
+		"GENERAL_BINDS": "Ogólne przypisania",
+		"TOGGLE_CAPTURE": "Oddaj kontrolę do pulpitu",
+		"FOCUS_MODE": "Tryb skupienia (przytrzymaj klawisz Super)",
+		"CLOSE": "Zamknij aktualną aplikację",
+		"MOUSE": "Kliknięcia i przewijanie fizycznej myszy są również przeniesione na wskaźnik VR"
+	}
 }
\ No newline at end of file
diff --git a/wayvr/src/assets/lang/zh_CN.json b/wayvr/src/assets/lang/zh_CN.json
index eda4e52a..67a8b952 100644
--- a/wayvr/src/assets/lang/zh_CN.json
+++ b/wayvr/src/assets/lang/zh_CN.json
@@ -1,116 +1,153 @@
 {
-  "ANCHOR": {
-    "CENTER": "中心"
-  },
-  "BAR": {
-    "ADD_MIRROR": "添加新的镜像覆盖层",
-    "EDIT_MODE_TOGGLE": "切换编辑模式",
-    "ADD_NEW_SET": "添加新集合",
-    "DELETE_CURRENT_SET": "删除当前集合",
-    "TOGGLE_VISIBILITY": "切换可见性",
-    "RESET_POSITION": "重置位置",
-    "RELOAD_FROM_DISK": "从磁盘重新加载 XML",
-    "CLOSE_MIRROR": "关闭镜像",
-    "CLOSE_APP": "关闭应用",
-    "FORCE_CLOSE_APP": "强制关闭应用",
-    "HANDSFREE": {
-      "TITLE": "免提模式",
-      "NONE": "关闭",
-      "HMD": "HMD + 捏合",
-      "EYE_TRACKING": "眼动 + 捏合",
-      "HMD_ONLY": "仅 HMD",
-      "EYE_ONLY": "仅限眼睛"
-    }
-  },
-  "DEFAULT": "默认",
-  "DISABLED": "已禁用",
-  "EDIT_MODE": {
-    "ADJUST_CURVATURE": "调整曲率",
-    "ALPHA_BLEND_MODE": "Alpha 混合模式",
-    "BLENDING_ADDITIVE": "叠加混合",
-    "CURVATURE": "曲率",
-    "DELETE": "长按以从当前集合中移除",
-    "DISABLE_GRAB": "禁用抓取",
-    "HINT_POINT_WINDOW": "指向窗口以更改其参数。\n完成后，使用右侧按钮退出编辑模式。",
-    "INTERPOLATION": "插值",
-    "ALIGN_TO_HMD": "对齐到头显 (HMD)",
-    "KEYBOARD": "键盘",
-    "LEAVE": "离开编辑模式",
-    "LOCK_INTERACTION": "锁定交互",
-    "MOVE_PRESS_AND_DRAG": "移动 (按住并拖拽)",
-    "OPACITY": "不透明度",
-    "POS_ANCHORED": "锚定：随中心标记移动。默认。",
-    "POS_FLOATING": "悬浮：独立移动，显示时重新居中。",
-    "POS_HAND_L": "跟随左手。",
-    "POS_HAND_R": "跟随右手。",
-    "POS_HMD": "跟随头显 (HMD)。",
-    "POS_STATIC": "静态：不属于任何集合，不重新居中。",
-    "POSITIONING": "定位",
-    "RESIZE_PRESS_AND_DRAG": "调整大小 (按住并拖拽)",
-    "STEREO_3D_MODE": {
-      "SPLIT_BOTTOM_TOP": "下→上",
-      "SPLIT_LEFT_RIGHT": "左→右",
-      "SPLIT_RIGHT_LEFT": "右→左",
-      "SPLIT_TOP_BOTTOM": "上→下",
-      "TITLE": "3D 立体模式",
-      "FULL_FRAME": "完整 3D",
-      "FULL_FRAME_SBS": "完整左右 (Full-SBS)",
-      "FULL_FRAME_TAB": "完整上下 (Full-TAB)",
-      "FULL_FRAME_BAT": "完整下上 (Full-BAT)",
-      "ADJUST_MOUSE": "调整鼠标"
-    },
-    "MOUSE": {
-      "TITLE": "鼠标修复",
-      "WRONG_SCREEN_SELECTION_HELP": "如果光标在完全不同的屏幕上移动，\n可能是屏幕选择错误。请参阅 readme。",
-      "NORMAL": "正常",
-      "ROTATE90": "旋转 90°",
-      "ROTATE180": "旋转 180°",
-      "ROTATE270": "旋转 270°",
-      "FLIPPED": "镜像",
-      "FLIP90": "镜像旋转 90°",
-      "FLIP180": "镜像旋转 180°",
-      "FLIP270": "镜像旋转 270°"
-    },
-    "GLOBAL": "始终可见",
-    "ANGLE_FADE": "角度淡出",
-    "ANGLE_FADE_HELP": "未朝向HMD时淡出",
-    "BLOCK_INPUT": "阻止游戏输入"
-  },
-  "GRAB": {
-    "ADJUST_DISTANCE": "调整距离",
-    "ADJUST_SIZE": "调整大小",
-    "UNRESTRICTED_MOVEMENT": "无限制移动",
-    "GRABBING_WATCH": "若要更换手，请将手表移至前方并用另一只手抓取。",
-    "GRABBING_STATIC": "此覆盖层是静态的，将固定在原位，忽略重新居中。",
-    "GRABBING_ANCHORED": "锚定覆盖层将一起移动。通过用另一只手抓取单个窗口，同时仍抓取锚点来分离它。",
-    "GRABBING_ANCHORED_EDIT": "此覆盖层将保持锚定在中心标记上。",
-    "GRABBING_FLOATING": "此覆盖层是悬浮的，将固定在原位，除非重新居中。",
-    "GRABBING_FOLLOW": "此覆盖层将跟随它所连接的设备。"
-  },
-  "TOAST": {
-    "DEFAULT_TITLE": "通知",
-    "ERROR": "错误",
-    "CANNOT_ADD_SET": "无法添加集合！",
-    "MAXIMUM_SETS_REACHED": "已达到集合数量上限。",
-    "CANNOT_REMOVE_SET": "无法移除集合！",
-    "NO_SET_SELECTED": "未选择集合。",
-    "LAST_EXISTING_SET": "这是最后一个现有的集合。",
-    "EMPTY_SET": "空集合！",
-    "LETS_ADD_OVERLAYS": "让我们从手表添加一些覆盖层吧！",
-    "ONE_CONTROLLER_ON_FLOOR": "请将一个控制器放在地面上！",
-    "FIXING_FLOOR_IN_X_SECS": "{SECONDS}秒内固定地面..."
-  },
-  "WATCH": {
-    "ADD_NEW_SET": "添加新集合",
-    "CLEANUP_MIRRORS": "移除当前不可见的镜像",
-    "DASHBOARD": "控制面板 (Dashboard)",
-    "EDIT_MODE": "编辑模式",
-    "EDIT_MODE_EXPLANATION": "覆盖层现在可以单独移动和调整。\n控制此集合中哪些覆盖层可见：",
-    "FIX_FLOOR": "修复地面水平",
-    "LONG_PRESS_TO_DELETE_SET": "按住以删除",
-    "RECENTER": "重置游玩区中心 (Recenter)",
-    "SWITCH_TO_SET": "切换到集合",
-    "TOGGLE_FOR_CURRENT_SET": "切换当前集合"
-  },
-  "DONE": "完成"
+	"ANCHOR": {
+		"CENTER": "中心"
+	},
+	"BAR": {
+		"ADD_MIRROR": "添加新的镜像覆盖层",
+		"EDIT_MODE_TOGGLE": "切换编辑模式",
+		"ADD_NEW_SET": "添加新集合",
+		"DELETE_CURRENT_SET": "删除当前集合",
+		"TOGGLE_VISIBILITY": "切换可见性",
+		"RESET_POSITION": "重置位置",
+		"RELOAD_FROM_DISK": "从磁盘重新加载 XML",
+		"CLOSE_MIRROR": "关闭镜像",
+		"CLOSE_APP": "关闭应用",
+		"FORCE_CLOSE_APP": "强制关闭应用",
+		"HANDSFREE": {
+			"TITLE": "免提模式",
+			"NONE": "关闭",
+			"HMD": "HMD + 捏合",
+			"EYE_TRACKING": "眼动 + 捏合",
+			"EYE_ONLY": "眼睛激光",
+			"HMD_ONLY": "头显射线"
+		}
+	},
+	"DEFAULT": "默认",
+	"DISABLED": "已禁用",
+	"EDIT_MODE": {
+		"ADJUST_CURVATURE": "调整曲率",
+		"ALPHA_BLEND_MODE": "Alpha 混合模式",
+		"BLENDING_ADDITIVE": "叠加混合",
+		"CURVATURE": "曲率",
+		"DELETE": "长按以从当前集合中移除",
+		"DISABLE_GRAB": "禁用抓取",
+		"HINT_POINT_WINDOW": "指向窗口以更改其参数。\n完成后，使用右侧按钮退出编辑模式。",
+		"INTERPOLATION": "插值",
+		"ALIGN_TO_HMD": "对齐到头显 (HMD)",
+		"KEYBOARD": "键盘",
+		"LEAVE": "离开编辑模式",
+		"LOCK_INTERACTION": "锁定交互",
+		"MOVE_PRESS_AND_DRAG": "移动 (按住并拖拽)",
+		"OPACITY": "不透明度",
+		"POS_ANCHORED": "锚定：随中心标记移动。默认。",
+		"POS_FLOATING": "悬浮：独立移动，显示时重新居中。",
+		"POS_HAND_L": "跟随左手。",
+		"POS_HAND_R": "跟随右手。",
+		"POS_HMD": "跟随头显 (HMD)。",
+		"POS_STATIC": "静态：不属于任何集合，不重新居中。",
+		"POSITIONING": "定位",
+		"RESIZE_PRESS_AND_DRAG": "调整大小 (按住并拖拽)",
+		"STEREO_3D_MODE": {
+			"SPLIT_BOTTOM_TOP": "下→上",
+			"SPLIT_LEFT_RIGHT": "左→右",
+			"SPLIT_RIGHT_LEFT": "右→左",
+			"SPLIT_TOP_BOTTOM": "上→下",
+			"TITLE": "3D 立体模式",
+			"FULL_FRAME": "完整 3D",
+			"FULL_FRAME_SBS": "完整左右 (Full-SBS)",
+			"FULL_FRAME_TAB": "完整上下 (Full-TAB)",
+			"FULL_FRAME_BAT": "完整下上 (Full-BAT)",
+			"ADJUST_MOUSE": "调整鼠标"
+		},
+		"MOUSE": {
+			"TITLE": "鼠标修复",
+			"WRONG_SCREEN_SELECTION_HELP": "如果光标在完全不同的屏幕上移动，\n可能是屏幕选择错误。请参阅 readme。",
+			"NORMAL": "正常",
+			"ROTATE90": "旋转 90°",
+			"ROTATE180": "旋转 180°",
+			"ROTATE270": "旋转 270°",
+			"FLIPPED": "镜像",
+			"FLIP90": "镜像旋转 90°",
+			"FLIP180": "镜像旋转 180°",
+			"FLIP270": "镜像旋转 270°"
+		},
+		"GLOBAL": "始终可见",
+		"ANGLE_FADE": "角度淡出",
+		"ANGLE_FADE_HELP": "未朝向HMD时淡出",
+		"BLOCK_INPUT": "阻止游戏输入",
+		"RESIZE_CORNER": "拖动以调整大小"
+	},
+	"GRAB": {
+		"ADJUST_DISTANCE": "调整距离",
+		"ADJUST_SIZE": "调整大小",
+		"UNRESTRICTED_MOVEMENT": "无限制移动",
+		"GRABBING_WATCH": "若要更换手，请将手表移至前方并用另一只手抓取。",
+		"GRABBING_STATIC": "此覆盖层是静态的，将固定在原位，忽略重新居中。",
+		"GRABBING_ANCHORED": "锚定覆盖层将一起移动。通过用另一只手抓取单个窗口，同时仍抓取锚点来分离它。",
+		"GRABBING_ANCHORED_EDIT": "此覆盖层将保持锚定在中心标记上。",
+		"GRABBING_FLOATING": "此覆盖层是悬浮的，将固定在原位，除非重新居中。",
+		"GRABBING_FOLLOW": "此覆盖层将跟随它所连接的设备。"
+	},
+	"TOAST": {
+		"DEFAULT_TITLE": "通知",
+		"ERROR": "错误",
+		"CANNOT_ADD_SET": "无法添加集合！",
+		"MAXIMUM_SETS_REACHED": "已达到集合数量上限。",
+		"CANNOT_REMOVE_SET": "无法移除集合！",
+		"NO_SET_SELECTED": "未选择集合。",
+		"LAST_EXISTING_SET": "这是最后一个现有的集合。",
+		"EMPTY_SET": "空集合！",
+		"ONE_CONTROLLER_ON_FLOOR": "请将一个控制器放在地面上！",
+		"FIXING_FLOOR_IN_X_SECS": "{SECONDS}秒内固定地面...",
+		"TITLE_SCREENCAST_FAIL": "无法启动屏幕投影源！",
+		"LETS_ADD_OVERLAYS": "让我们从任务栏添加一些覆盖层吧！"
+	},
+	"WATCH": {
+		"ADD_NEW_SET": "添加新集合",
+		"CLEANUP_MIRRORS": "移除当前不可见的镜像",
+		"DASHBOARD": "控制面板 (Dashboard)",
+		"EDIT_MODE": "编辑模式",
+		"EDIT_MODE_EXPLANATION": "覆盖层现在可以单独移动和调整。\n控制此集合中哪些覆盖层可见：",
+		"FIX_FLOOR": "修复地面水平",
+		"LONG_PRESS_TO_DELETE_SET": "按住以删除",
+		"RECENTER": "重置游玩区中心 (Recenter)",
+		"SWITCH_TO_SET": "切换到集合",
+		"TOGGLE_FOR_CURRENT_SET": "切换当前集合"
+	},
+	"DONE": "完成",
+	"WHISPER": {
+		"TRANSCRIBE": "按住以转录文本",
+		"PASTE": "将转录内容复制到剪贴板",
+		"PASTE_AND_GO": "复制转录文本并向当前聚焦的应用发送 Ctrl-V",
+		"SEND_OSC": "将转录文本发送至 OSC 聊天框",
+		"UNLOAD_AND_CLOSE": "卸载模型并关闭",
+		"MODEL_NOT_DOWNLOADED": "语音转文本未设置！",
+		"DOWNLOAD_GUIDANCE": "请在“设置”中的“功能”选项下配置语音转文本！",
+		"INITIAL_TEXT": "按住麦克风按钮开始转录...",
+		"INIT_ERROR": "启动 Whisper 引擎时出错",
+		"ENTER_KEY": "回车键"
+	},
+	"SCREENCAST": {
+		"PENDING": "请稍候...",
+		"QUEUED": "等待另一个覆盖层的屏幕投射确认弹窗。",
+		"WAITING_FOR_USER_DESC": "请检查桌面上的屏幕投射弹出窗口。\n选择以下选项：",
+		"WAITING_FOR_USER": "请检查桌面上的屏幕投射弹出窗口。",
+		"FAIL": "无法初始化屏幕镜像源。"
+	},
+	"ALTTAB": {
+		"RELEASE_TO_FOCUS": "瞄准一个应用程序并松开 Super 键以将焦点切换到该程序。",
+		"WHILE_AIMING": "瞄准时",
+		"CLICK": "VR 指针点击",
+		"GRABALL": "移动整个集",
+		"GRAB": "移动单个覆盖层",
+		"DASH": "切换控制面板",
+		"EDIT": "切换编辑模式",
+		"SET": "切换 Set",
+		"RECENTER": "显示/隐藏/重新中心化",
+		"GENERAL_BINDS": "通用绑定",
+		"TOGGLE_CAPTURE": "将控制权还给桌面",
+		"FOCUS_MODE": "焦点模式 (按住 Super 键)",
+		"CLOSE": "关闭当前焦点应用",
+		"MOUSE": "真实鼠标的点击和滚动也将转换为 VR 指针"
+	}
 }
\ No newline at end of file
diff --git a/wayvr/src/assets/sound/wvr_input_capture_grabbed.mp3 b/wayvr/src/assets/sound/wvr_input_capture_grabbed.mp3
new file mode 100644
index 00000000..a247e12e
Binary files /dev/null and b/wayvr/src/assets/sound/wvr_input_capture_grabbed.mp3 differ
diff --git a/wayvr/src/assets/sound/wvr_input_capture_ungrabbed.mp3 b/wayvr/src/assets/sound/wvr_input_capture_ungrabbed.mp3
new file mode 100644
index 00000000..3f814506
Binary files /dev/null and b/wayvr/src/assets/sound/wvr_input_capture_ungrabbed.mp3 differ
diff --git a/wayvr/src/backend/input.rs b/wayvr/src/backend/input.rs
index 2e2e5385..48626692 100644
--- a/wayvr/src/backend/input.rs
+++ b/wayvr/src/backend/input.rs
@@ -1,13 +1,14 @@
 use std::f32::consts::PI;
 use std::process::{Child, Command};
 use std::sync::Arc;
-use std::time::Instant;
+use std::time::{Duration, Instant};
 
 use glam::{Affine3A, Vec2, Vec3A, Vec3Swizzles};
 
 use idmap_derive::IntegerId;
 use smallvec::{SmallVec, smallvec};
-use strum::AsRefStr;
+use strum::{AsRefStr, EnumIs};
+use wayvr_ipc::packet_client::{HandsfreeAction, HandsfreeParams};
 use wlx_common::common::LeftRight;
 use wlx_common::windowing::{OverlayWindowState, Positioning};
 
@@ -17,10 +18,10 @@ use crate::overlays::keyboard::KEYBOARD_NAME;
 use crate::overlays::watch::WATCH_NAME;
 use crate::state::{AppSession, AppState};
 use crate::subsystem::hid::WheelDelta;
-use crate::subsystem::input::KeyboardFocus;
+use crate::subsystem::input::InputFocus;
 use crate::windowing::backend::OverlayEventData;
 use crate::windowing::manager::OverlayWindowManager;
-use crate::windowing::window::{self, OverlayWindowData, realign};
+use crate::windowing::window::{self, OverlayWindowData, realign, scalar_scale};
 use crate::windowing::{OverlayID, OverlaySelector};
 
 use super::task::TaskType;
@@ -32,6 +33,15 @@ pub struct HoverResult {
     pub consume: bool,
 }
 
+impl HoverResult {
+    pub fn consume() -> Self {
+        HoverResult {
+            consume: true,
+            ..Default::default()
+        }
+    }
+}
+
 pub struct TrackedDevice {
     pub soc: Option<f32>,
     pub charging: bool,
@@ -48,12 +58,24 @@ pub enum TrackedDeviceRole {
     Tracker,
 }
 
+#[derive(Debug, Eq, PartialEq, Clone, Copy, EnumIs)]
+pub enum FocusPickState {
+    None,
+    /// aiming to pick the focus
+    Aiming,
+    /// picking the focus. this will be consumed on valid on_hover
+    Picking,
+}
+
 pub struct InputState {
     pub hmd: Affine3A,
     pub ipd: f32,
     pub pointers: [Pointer; 2],
     pub devices: Vec<TrackedDevice>,
+    pub handsfree_state: PointerState,
+    pub picking_focus: FocusPickState,
     processes: Vec<Child>,
+    disable_lerp_until: Instant,
 }
 
 impl InputState {
@@ -64,9 +86,57 @@ impl InputState {
             pointers: [Pointer::new(0), Pointer::new(1)],
             devices: Vec::new(),
             processes: Vec::new(),
+            handsfree_state: PointerState::default(),
+            picking_focus: FocusPickState::None,
+            disable_lerp_until: Instant::now(),
         }
     }
 
+    pub fn should_disable_lerp(&self) -> bool {
+        self.disable_lerp_until > Instant::now()
+    }
+
+    pub fn stop_picking(&mut self) {
+        if !self.picking_focus.is_none() {
+            self.picking_focus = FocusPickState::None;
+            self.disable_lerp_until = Instant::now() + Duration::from_millis(250);
+        }
+    }
+
+    pub fn apply_handsfree_action(&mut self, params: HandsfreeParams) {
+        fn set_true(v: &mut bool) {
+            *v = true;
+        }
+        fn set_false(v: &mut bool) {
+            *v = false;
+        }
+        fn toggle(v: &mut bool) {
+            *v = !*v;
+        }
+
+        let (action, apply) = match params {
+            HandsfreeParams::SetMode(_) => {
+                return;
+            }
+            HandsfreeParams::Press(action) => (action, set_true as fn(&mut bool)),
+            HandsfreeParams::Release(action) => (action, set_false as fn(&mut bool)),
+            HandsfreeParams::Toggle(action) => (action, toggle as fn(&mut bool)),
+            HandsfreeParams::Scroll(val) => {
+                self.handsfree_state.scroll_y = val;
+                return;
+            }
+        };
+
+        match action {
+            HandsfreeAction::Click => apply(&mut self.handsfree_state.click),
+            HandsfreeAction::RightModifier => apply(&mut self.handsfree_state.click_modifier_right),
+            HandsfreeAction::MiddleModifier => {
+                apply(&mut self.handsfree_state.click_modifier_middle)
+            }
+            HandsfreeAction::Grab => apply(&mut self.handsfree_state.grab),
+        };
+    }
+
     pub fn handle_task(&mut self, task: InputTask) {
         match task {
             InputTask::Haptics { device, haptics } => {
@@ -125,10 +195,8 @@ impl InputState {
                             hand.interaction.mode = PointerMode::Left;
                         }
                     }
-                    PointerMode::Right => {
-                        if !right_click_orientation {
-                            hand.interaction.mode = PointerMode::Left;
-                        }
+                    PointerMode::Right if !right_click_orientation => {
+                        hand.interaction.mode = PointerMode::Left;
                     }
                     _ => {}
                 }
@@ -164,6 +232,9 @@ fn debug_print_hand(hand: &Pointer) {
         if hand.now.grab != hand.before.grab {
             log::debug!("Hand {}: grab {}", hand.idx, hand.now.grab);
         }
+        if hand.now.grab_float != hand.before.grab_float {
+            log::debug!("Hand {}: grab {}", hand.idx, hand.now.grab);
+        }
         if hand.now.alt_click != hand.before.alt_click {
             log::debug!("Hand {}: alt_click {}", hand.idx, hand.now.alt_click);
         }
@@ -264,12 +335,13 @@ impl Pointer {
     }
 }
 
-#[derive(Clone, Copy, Default)]
+#[derive(Debug, Clone, Copy, Default)]
 pub struct PointerState {
     pub scroll_x: f32,
     pub scroll_y: f32,
     pub click: bool,
     pub grab: bool,
+    pub grab_float: bool,
     pub alt_click: bool,
     pub show_hide: bool,
     pub toggle_dashboard: bool,
@@ -343,7 +415,7 @@ fn populate_lines(
 
         // horizontal arm
         lines.push(PointerLine {
-            mode: PointerMode::Left,
+            mode: hit.mode,
             a: raw_hit.global_pos - (hmd.x_axis * HALF_SIZE),
             b: raw_hit.global_pos + (hmd.x_axis * HALF_SIZE),
         });
@@ -363,12 +435,14 @@ fn populate_lines(
     }
 }
 
-fn update_focus(focus: &mut KeyboardFocus, overlay_keyboard_focus: Option<KeyboardFocus>) {
-    if let Some(f) = &overlay_keyboard_focus
-        && *focus != *f
+fn update_focus(app: &mut AppState, overlay_input_focus: Option<InputFocus>) {
+    if let Some(f) = &overlay_input_focus
+        && app.input_state.picking_focus.is_none()
+        && app
+            .hid_provider
+            .set_input_focus(app.wvr_server.as_mut(), *f)
     {
         log::debug!("Setting keyboard focus to {:?}", *f);
-        *focus = *f;
     }
 }
 
@@ -414,6 +488,8 @@ where
     let pending_haptics = pointer.pending_haptics.take();
 
     if !pointer.tracked {
+        pointer.interaction.should_block_input = false;
+        pointer.interaction.should_block_poses = false;
         return (None, pending_haptics); // no hit
     }
 
@@ -489,12 +565,12 @@ where
 
     let hovered_state = hovered.config.active_state.as_mut().unwrap();
 
+    let grab_float = pointer.now.grab_float;
+    let grab_start = pointer.now.grab && !pointer.before.grab;
+
     // grab
-    if pointer.now.grab && !pointer.before.grab && hovered_state.grabbable {
-        update_focus(
-            &mut app.hid_provider.keyboard_focus,
-            hovered.config.keyboard_focus,
-        );
+    if grab_start && hovered_state.grabbable {
+        update_focus(app, hovered.config.input_focus);
         start_grab(
             idx,
             hit.overlay,
@@ -503,6 +579,7 @@ where
             hovered_state,
             app,
             edit_mode,
+            grab_float,
         );
         log::debug!("Hand {}: grabbed {}", hit.pointer, hovered.config.name);
         return (
@@ -521,10 +598,7 @@ where
     let pointer = &mut app.input_state.pointers[hit.pointer];
     if pointer.now.click && !pointer.before.click {
         pointer.interaction.clicked_id = Some(hit.overlay);
-        update_focus(
-            &mut app.hid_provider.keyboard_focus,
-            hovered.config.keyboard_focus,
-        );
+        update_focus(app, hovered.config.input_focus);
         hovered.config.backend.on_pointer(app, &hit, true);
     } else if !pointer.now.click && pointer.before.click {
         // send release event to overlay that was originally clicked
@@ -585,8 +659,10 @@ fn handle_scroll<O>(hit: &PointerHit, hovered: &mut OverlayWindowData<O>, app: &
     }
 
     let config = &app.session.config;
+    let scroll_factor = 90.0 * app.delta_time;
 
     let scroll_x = pointer.now.scroll_x
+        * scroll_factor
         * config.scroll_speed
         * if config.invert_scroll_direction_x {
             -1.0
@@ -594,6 +670,7 @@ fn handle_scroll<O>(hit: &PointerHit, hovered: &mut OverlayWindowData<O>, app: &
             1.0
         };
     let scroll_y = pointer.now.scroll_y
+        * scroll_factor
         * config.scroll_speed
         * if config.invert_scroll_direction_x {
             -1.0
@@ -644,6 +721,10 @@ where
     O: Default,
 {
     let pointer = &mut app.input_state.pointers[pointer_idx];
+    if !pointer.tracked {
+        return (None, None);
+    }
+
     let ray_origin = pointer.pose;
     let mode = pointer.interaction.mode;
     let edit_mode = overlays.get_edit_mode();
@@ -685,7 +766,9 @@ where
         };
 
         if uv.x < 0.0 || uv.x > 1.0 || uv.y < 0.0 || uv.y > 1.0 {
-            continue;
+            if !overlay.config.resizing {
+                continue;
+            }
         }
 
         let pointer_hit = PointerHit {
@@ -713,15 +796,19 @@ fn start_grab(
     state: &mut OverlayWindowState,
     app: &mut AppState,
     edit_mode: bool,
+    grab_float: bool,
 ) {
     let pointer = &mut app.input_state.pointers[idx];
 
     // Grab anchor if:
     // - grabbed overlay is Anchored
     // - not in editmode
+    // - not using grab_float
     // - grabbing with one hand. (grabbing with the 2nd hand will grab the individual overlay instead)
-    let grab_anchor =
-        !edit_mode && !app.anchor_grabbed && matches!(state.positioning, Positioning::Anchored);
+    let grab_anchor = !edit_mode
+        && !grab_float
+        && !app.anchor_grabbed
+        && matches!(state.positioning, Positioning::Anchored);
 
     let relative_grab_transform = if grab_anchor {
         app.anchor
@@ -739,6 +826,20 @@ fn start_grab(
         grab_anchor,
     });
 
+    app.tasks.enqueue(TaskType::Overlay(OverlayTask::Modify(
+        OverlaySelector::Id(id),
+        Box::new({
+            let pos = state.positioning;
+            let name = name.clone();
+            move |app, o| {
+                let _ = o
+                    .backend
+                    .notify(app, OverlayEventData::OverlayGrabbed { name, pos, editing })
+                    .inspect_err(|e| log::warn!("Error during Notify OverlayGrabbed: {e:?}"));
+            }
+        }),
+    )));
+
     // Show anchor
     app.tasks.enqueue(TaskType::Overlay(OverlayTask::Modify(
         OverlaySelector::Name(ANCHOR_NAME.clone()),
@@ -804,16 +905,25 @@ where
             return;
         };
 
+        let scroll_factor = 90.0 * app.delta_time;
+
         if grab_anchor {
             if pointer.now.click {
                 pointer.interaction.mode = PointerMode::Special;
                 let grab_dist = grab_data.offset.translation.length().clamp(0.5, 5.0) * 0.2 + 0.4;
-                handle_scale(&mut app.anchor, pointer.now.scroll_y * grab_dist);
-                handle_scale(&mut grab_data.offset, pointer.now.scroll_y * grab_dist);
+                handle_scale(
+                    &mut app.anchor,
+                    pointer.now.scroll_y * grab_dist * scroll_factor,
+                );
+                handle_scale(
+                    &mut grab_data.offset,
+                    pointer.now.scroll_y * grab_dist * scroll_factor,
+                );
             } else if app.session.config.allow_sliding && pointer.now.scroll_y.is_finite() {
                 // single grab push/pull
                 let grab_dist = grab_data.offset.translation.length().clamp(0.5, 5.0);
-                grab_data.offset.translation.z -= pointer.now.scroll_y * 0.02 * grab_dist;
+                grab_data.offset.translation.z -=
+                    pointer.now.scroll_y * scroll_factor * 0.02 * grab_dist;
                 grab_data.offset.translation.z = grab_data.offset.translation.z.min(-0.05);
             }
             if pointer.now.click_modifier_right {
@@ -821,7 +931,13 @@ where
             } else {
                 app.anchor.translation =
                     pointer.pose.transform_point3a(grab_data.offset.translation);
-                realign(&mut app.anchor, &app.input_state.hmd);
+                let scale = scalar_scale(&app.anchor);
+                realign(
+                    &mut app.anchor,
+                    &app.input_state.hmd,
+                    scale,
+                    app.session.config.snap_angle_deg,
+                );
             }
         } else {
             // single grab resize
@@ -830,21 +946,31 @@ where
                 let grab_dist = grab_data.offset.translation.length().clamp(0.5, 5.0) * 0.2 + 0.4;
                 handle_scale(
                     &mut overlay_state.transform,
-                    pointer.now.scroll_y * grab_dist,
+                    pointer.now.scroll_y * grab_dist * scroll_factor,
+                );
+                handle_scale(
+                    &mut grab_data.offset,
+                    pointer.now.scroll_y * grab_dist * scroll_factor,
                 );
-                handle_scale(&mut grab_data.offset, pointer.now.scroll_y * grab_dist);
             } else if app.session.config.allow_sliding && pointer.now.scroll_y.is_finite() {
                 // single grab push/pull
                 let grab_dist = grab_data.offset.translation.length().clamp(0.5, 5.0);
-                grab_data.offset.translation.z -= pointer.now.scroll_y * 0.02 * grab_dist;
+                grab_data.offset.translation.z -=
+                    pointer.now.scroll_y * scroll_factor * 0.02 * grab_dist;
                 grab_data.offset.translation.z = grab_data.offset.translation.z.min(-0.05);
             }
             if pointer.now.click_modifier_right {
                 overlay_state.transform = pointer.pose * grab_data.offset;
             } else {
+                let scale = scalar_scale(&overlay_state.transform);
                 overlay_state.transform.translation =
                     pointer.pose.transform_point3a(grab_data.offset.translation);
-                realign(&mut overlay_state.transform, &app.input_state.hmd);
+                realign(
+                    &mut overlay_state.transform,
+                    &app.input_state.hmd,
+                    scale,
+                    app.session.config.snap_angle_deg,
+                );
             }
             overlay.config.pause_movement = true;
             overlay.config.dirty = true;
diff --git a/wayvr/src/backend/mod.rs b/wayvr/src/backend/mod.rs
index b352a879..b1ded4f3 100644
--- a/wayvr/src/backend/mod.rs
+++ b/wayvr/src/backend/mod.rs
@@ -1,4 +1,5 @@
 pub mod input;
+pub mod playspace_common;
 
 #[cfg(feature = "openvr")]
 pub mod openvr;
diff --git a/wayvr/src/backend/openvr/input.rs b/wayvr/src/backend/openvr/input.rs
index 6725149a..952b8e36 100644
--- a/wayvr/src/backend/openvr/input.rs
+++ b/wayvr/src/backend/openvr/input.rs
@@ -4,6 +4,7 @@ use anyhow::bail;
 use ovr_overlay::{
     TrackedDeviceIndex,
     input::{ActionHandle, ActionSetHandle, ActiveActionSet, InputManager, InputValueHandle},
+    overlay::OverlayManager,
     sys::{
         ETrackedControllerRole, ETrackedDeviceClass, ETrackedDeviceProperty,
         ETrackingUniverseOrigin,
@@ -144,6 +145,7 @@ impl OpenVrInputSource {
         &mut self,
         universe: ETrackingUniverseOrigin,
         input: &mut InputManager,
+        overlay: &mut OverlayManager,
         system: &mut SystemManager,
         app: &mut AppState,
     ) {
@@ -189,7 +191,7 @@ impl OpenVrInputSource {
             let hand = &mut self.hands[i];
             let app_hand = &mut app.input_state.pointers[i];
 
-            if let Some(device) = hand.device {
+            if let Some(device) = hand.device.filter(|_| !overlay.is_dashboard_visible()) {
                 app_hand.raw_pose = devices[device.0 as usize]
                     .mDeviceToAbsoluteTracking
                     .to_affine();
@@ -214,63 +216,51 @@ impl OpenVrInputSource {
 
             app_hand.now.click = input
                 .get_digital_action_data(self.click_hnd, hand.input_hnd)
-                .map(|x| x.0.bState)
-                .unwrap_or(false);
+                .is_ok_and(|x| x.0.bState);
 
             app_hand.now.grab = input
                 .get_digital_action_data(self.grab_hnd, hand.input_hnd)
-                .map(|x| x.0.bState)
-                .unwrap_or(false);
+                .is_ok_and(|x| x.0.bState);
 
             app_hand.now.alt_click = input
                 .get_digital_action_data(self.alt_click_hnd, hand.input_hnd)
-                .map(|x| x.0.bState)
-                .unwrap_or(false);
+                .is_ok_and(|x| x.0.bState);
 
             app_hand.now.show_hide = input
                 .get_digital_action_data(self.show_hide_hnd, hand.input_hnd)
-                .map(|x| x.0.bState)
-                .unwrap_or(false);
+                .is_ok_and(|x| x.0.bState);
 
             app_hand.now.toggle_dashboard = input
                 .get_digital_action_data(self.toggle_dashboard_hnd, hand.input_hnd)
-                .map(|x| x.0.bState)
-                .unwrap_or(false);
+                .is_ok_and(|x| x.0.bState);
 
             app_hand.now.space_drag = input
                 .get_digital_action_data(self.space_drag_hnd, hand.input_hnd)
-                .map(|x| x.0.bState)
-                .unwrap_or(false);
+                .is_ok_and(|x| x.0.bState);
 
             app_hand.now.space_rotate = input
                 .get_digital_action_data(self.space_rotate_hnd, hand.input_hnd)
-                .map(|x| x.0.bState)
-                .unwrap_or(false);
+                .is_ok_and(|x| x.0.bState);
 
             app_hand.now.space_reset = input
                 .get_digital_action_data(self.space_reset_hnd, hand.input_hnd)
-                .map(|x| x.0.bState)
-                .unwrap_or(false);
+                .is_ok_and(|x| x.0.bState);
 
             app_hand.now.click_modifier_right = input
                 .get_digital_action_data(self.click_modifier_right_hnd, hand.input_hnd)
-                .map(|x| x.0.bState)
-                .unwrap_or(false);
+                .is_ok_and(|x| x.0.bState);
 
             app_hand.now.click_modifier_middle = input
                 .get_digital_action_data(self.click_modifier_middle_hnd, hand.input_hnd)
-                .map(|x| x.0.bState)
-                .unwrap_or(false);
+                .is_ok_and(|x| x.0.bState);
 
             app_hand.now.move_mouse = input
                 .get_digital_action_data(self.move_mouse_hnd, hand.input_hnd)
-                .map(|x| x.0.bState)
-                .unwrap_or(false);
+                .is_ok_and(|x| x.0.bState);
 
             let scroll = input
                 .get_analog_action_data(self.scroll_hnd, hand.input_hnd)
-                .map(|x| (x.0.x, x.0.y))
-                .unwrap_or((0.0, 0.0));
+                .map_or((0.0, 0.0), |x| (x.0.x, x.0.y));
             app_hand.now.scroll_x = scroll.0;
             app_hand.now.scroll_y = scroll.1;
         }
@@ -330,6 +320,17 @@ fn get_tracked_device(
     index: TrackedDeviceIndex,
     role: TrackedDeviceRole,
 ) -> Option<TrackedDevice> {
+    let provides_battery = system
+        .get_tracked_device_property(
+            index,
+            ETrackedDeviceProperty::Prop_DeviceProvidesBatteryStatus_Bool,
+        )
+        .unwrap_or(false);
+    if !provides_battery {
+        // don't show devices that don't have battery info
+        return None;
+    }
+
     let soc = system
         .get_tracked_device_property(
             index,
@@ -351,8 +352,7 @@ fn get_tracked_device(
             index,
             ETrackedDeviceProperty::Prop_TrackingSystemName_String,
         )
-        .map(|x: String| x.contains("ALVR"))
-        .unwrap_or(false);
+        .is_ok_and(|x: String| x.contains("ALVR"));
 
     if is_alvr {
         // don't show ALVR's fake trackers on battery panel
diff --git a/wayvr/src/backend/openvr/mod.rs b/wayvr/src/backend/openvr/mod.rs
index 83b479d8..bf08d1d9 100644
--- a/wayvr/src/backend/openvr/mod.rs
+++ b/wayvr/src/backend/openvr/mod.rs
@@ -15,7 +15,7 @@ use vulkano::{Handle, VulkanObject, device::physical::PhysicalDevice};
 use wlx_common::overlays::ToastTopic;
 
 use crate::{
-    FRAME_COUNTER, RUNNING,
+    Args, FRAME_COUNTER, RUNNING,
     backend::{
         BackendError, XrBackend,
         input::interact,
@@ -32,7 +32,6 @@ use crate::{
     graphics::{GpuFutures, init_openvr_graphics},
     overlays::toast::Toast,
     state::AppState,
-    subsystem::notifications::NotificationManager,
     windowing::{
         backend::{RenderResources, RenderTarget, ShouldRender},
         manager::OverlayWindowManager,
@@ -58,10 +57,12 @@ pub fn openvr_uninstall() {
 }
 
 #[allow(clippy::too_many_lines, clippy::cognitive_complexity)]
-pub fn openvr_run(show_by_default: bool, headless: bool) -> Result<(), BackendError> {
+pub fn openvr_run(args: &Args) -> Result<(), BackendError> {
     let app_type = EVRApplicationType::VRApplication_Overlay;
     let Ok(context) = ovr_overlay::Context::init(app_type) else {
-        log::warn!("Will not use OpenVR: Context init failed");
+        if !args.wait {
+            log::warn!("Will not use OpenVR: Context init failed");
+        }
         return Err(BackendError::NotSupported);
     };
 
@@ -91,7 +92,10 @@ pub fn openvr_run(show_by_default: bool, headless: bool) -> Result<(), BackendEr
         AppState::from_graphics(gfx, gfx_extras, XrBackend::OpenVR)?
     };
 
-    if show_by_default {
+    app.session.no_autostart = args.no_autostart;
+
+    if args.show {
+        app.session.config.tutorial_graduated = true;
         app.tasks.enqueue_at(
             TaskType::Overlay(OverlayTask::ShowHide),
             Instant::now().add(Duration::from_secs(1)),
@@ -106,12 +110,13 @@ pub fn openvr_run(show_by_default: bool, headless: bool) -> Result<(), BackendEr
         log::info!("IPD: {:.0} mm", app.input_state.ipd);
     }
 
-    let _ = install_manifest(&mut app_mgr);
+    app.late_init();
 
-    let mut overlays = OverlayWindowManager::<OpenVrOverlayData>::new(&mut app, headless)?;
-    let mut notifications = NotificationManager::new();
-    notifications.run_dbus(&mut app.dbus);
-    notifications.run_udp();
+    if args.install {
+        let _ = install_manifest(&mut app_mgr);
+    }
+
+    let mut overlays = OverlayWindowManager::<OpenVrOverlayData>::new(&mut app, args.headless)?;
 
     let mut playspace = playspace::PlayspaceMover::new();
     playspace.playspace_changed(&mut compositor_mgr, &mut chaperone_mgr);
@@ -140,8 +145,12 @@ pub fn openvr_run(show_by_default: bool, headless: bool) -> Result<(), BackendEr
     let mut lines = LinePool::new(app.gfx.clone())?;
     let pointer_lines = [lines.allocate(), lines.allocate()];
     let mut current_lines = Vec::with_capacity(2);
+    let mut last_frame_time = Instant::now();
 
     'main_loop: loop {
+        let now = Instant::now();
+        app.delta_time = (now.duration_since(last_frame_time).as_secs_f32()).clamp(0.001, 0.2); // 5 - 1000 fps
+        last_frame_time = now;
         let _ = overlay_mgr.wait_frame_sync(frame_timeout);
 
         if !RUNNING.load(Ordering::Relaxed) {
@@ -205,13 +214,14 @@ pub fn openvr_run(show_by_default: bool, headless: bool) -> Result<(), BackendEr
             next_device_update = Instant::now() + Duration::from_secs(30);
         }
 
-        app.dbus.tick();
-        notifications.submit_pending(&mut app);
-
+        app.tick();
         app.tasks.retrieve_due(&mut due_tasks);
 
         while let Some(task) = due_tasks.pop_front() {
             match task {
+                TaskType::Global(task) => {
+                    task(&mut app);
+                }
                 TaskType::Input(task) => {
                     app.input_state.handle_task(task);
                 }
@@ -219,7 +229,7 @@ pub fn openvr_run(show_by_default: bool, headless: bool) -> Result<(), BackendEr
                     overlays.handle_task(&mut app, task)?;
                 }
                 TaskType::Playspace(task) => {
-                    playspace.handle_task(&app, &mut chaperone_mgr, task);
+                    playspace.handle_task(&mut app, &mut chaperone_mgr, &mut overlays, task);
                 }
                 TaskType::OpenVR(task) => match task {
                     OpenVrTask::ColorGain(channel, value) => {
@@ -238,7 +248,13 @@ pub fn openvr_run(show_by_default: bool, headless: bool) -> Result<(), BackendEr
         let universe = playspace.get_universe();
 
         app.input_state.pre_update();
-        input_source.update(universe.clone(), &mut input_mgr, &mut system_mgr, &mut app);
+        input_source.update(
+            universe.clone(),
+            &mut input_mgr,
+            &mut overlay_mgr,
+            &mut system_mgr,
+            &mut app,
+        );
         app.input_state.post_update(&app.session);
 
         if app
@@ -263,7 +279,7 @@ pub fn openvr_run(show_by_default: bool, headless: bool) -> Result<(), BackendEr
 
         overlays.values_mut().for_each(|o| o.config.tick(&mut app));
 
-        playspace.update(&mut chaperone_mgr, &mut overlays, &app);
+        playspace.update(&mut chaperone_mgr, &mut overlays, &mut app);
 
         current_lines.clear();
 
diff --git a/wayvr/src/backend/openvr/playspace.rs b/wayvr/src/backend/openvr/playspace.rs
index e73b1ef2..74b8903c 100644
--- a/wayvr/src/backend/openvr/playspace.rs
+++ b/wayvr/src/backend/openvr/playspace.rs
@@ -4,10 +4,11 @@ use ovr_overlay::{
     compositor::CompositorManager,
     sys::{EChaperoneConfigFile, ETrackingUniverseOrigin, HmdMatrix34_t},
 };
+use wgui::log::LogErr;
 
 use crate::{
-    backend::{input::InputState, task::PlayspaceTask},
-    state::AppState,
+    backend::{playspace_common, task::PlayspaceTask},
+    state::{AppState, PlayspaceState, load_playspace_state, save_playspace_state},
     windowing::manager::OverlayWindowManager,
 };
 
@@ -23,32 +24,41 @@ pub(super) struct PlayspaceMover {
     universe: ETrackingUniverseOrigin,
     drag: Option<MoverData<Vec3A>>,
     rotate: Option<MoverData<Quat>>,
+    playspace_state: PlayspaceState,
 }
 
 impl PlayspaceMover {
-    pub const fn new() -> Self {
+    pub fn new() -> Self {
         Self {
             universe: ETrackingUniverseOrigin::TrackingUniverseRawAndUncalibrated,
             drag: None,
             rotate: None,
+            playspace_state: load_playspace_state().unwrap_or_default(),
         }
     }
 
     pub fn handle_task(
         &mut self,
-        app: &AppState,
+        app: &mut AppState,
         chaperone_mgr: &mut ChaperoneSetupManager,
+        overlays: &mut OverlayWindowManager<OpenVrOverlayData>,
         task: PlayspaceTask,
     ) {
         match task {
             PlayspaceTask::FixFloor => {
-                self.fix_floor(chaperone_mgr, &app.input_state);
+                self.fix_floor(chaperone_mgr, app, overlays);
             }
             PlayspaceTask::Reset => {
-                self.reset_offset(chaperone_mgr, &app.input_state);
+                self.reset_offset(chaperone_mgr, overlays, &mut app.anchor);
             }
             PlayspaceTask::Recenter => {
-                self.recenter(chaperone_mgr, &app.input_state);
+                self.recenter(chaperone_mgr, app, overlays);
+            }
+            PlayspaceTask::SaveCenter => {
+                self.save_center(chaperone_mgr);
+            }
+            PlayspaceTask::ResetCenter => {
+                self.playspace_state.openvr_space_center = Affine3A::IDENTITY;
             }
         }
     }
@@ -58,7 +68,7 @@ impl PlayspaceMover {
         &mut self,
         chaperone_mgr: &mut ChaperoneSetupManager,
         overlays: &mut OverlayWindowManager<OpenVrOverlayData>,
-        app: &AppState,
+        app: &mut AppState,
     ) {
         let universe = self.universe.clone();
 
@@ -137,18 +147,11 @@ impl PlayspaceMover {
             }
 
             let overlay_offset = data.pose.inverse().transform_vector3a(relative_pos) * -1.0;
-
-            overlays.values_mut().for_each(|overlay| {
-                let Some(state) = overlay.config.active_state.as_mut() else {
-                    return;
-                };
-                if state.positioning.moves_with_space() {
-                    state.transform.translation += overlay_offset;
-                    overlay.config.dirty = true;
-                }
-            });
-
+            let before_pose = data.pose;
             data.pose.translation += relative_pos;
+            if !app.session.config.space_drag_affects_world {
+                playspace_common::shift_world(overlays, &mut app.anchor, &before_pose, &data.pose);
+            }
             data.hand_pose = new_hand;
 
             if self.universe == ETrackingUniverseOrigin::TrackingUniverseStanding {
@@ -178,31 +181,34 @@ impl PlayspaceMover {
 
         for pointer in &app.input_state.pointers {
             if pointer.now.space_reset && !pointer.before.space_reset {
-                self.reset_offset(chaperone_mgr, &app.input_state);
+                self.reset_offset(chaperone_mgr, overlays, &mut app.anchor);
                 log::info!("Space reset");
                 return;
             }
         }
     }
 
-    pub fn reset_offset(&mut self, chaperone_mgr: &mut ChaperoneSetupManager, input: &InputState) {
-        let mut height = 1.6;
-        if let Some(mat) = get_working_copy(&self.universe, chaperone_mgr) {
-            height = input.hmd.translation.y - mat.translation.y;
-            if self.universe == ETrackingUniverseOrigin::TrackingUniverseStanding {
-                apply_chaperone_transform(mat, chaperone_mgr);
-            }
-        }
-
-        let xform = if self.universe == ETrackingUniverseOrigin::TrackingUniverseSeated {
-            Affine3A::from_translation(Vec3::NEG_Y * height)
-        } else {
-            Affine3A::IDENTITY
+    pub fn reset_offset(
+        &mut self,
+        chaperone_mgr: &mut ChaperoneSetupManager,
+        overlays: &mut OverlayWindowManager<OpenVrOverlayData>,
+        anchor: &mut Affine3A,
+    ) {
+        let Some(before) = get_working_copy(&self.universe, chaperone_mgr) else {
+            log::warn!("Can't reset offset - failed to get zero pose");
+            return;
         };
 
+        let mut xform = self.playspace_state.openvr_space_center;
+        if self.universe == ETrackingUniverseOrigin::TrackingUniverseSeated {
+            xform.translation.y -= 1.7;
+        }
+
         set_working_copy(&self.universe, chaperone_mgr, &xform);
         chaperone_mgr.commit_working_copy(EChaperoneConfigFile::EChaperoneConfigFile_Live);
 
+        playspace_common::shift_world(overlays, anchor, &before, &xform);
+
         if self.drag.is_some() {
             log::info!("Space drag interrupted by manual reset");
             self.drag = None;
@@ -213,7 +219,14 @@ impl PlayspaceMover {
         }
     }
 
-    pub fn fix_floor(&mut self, chaperone_mgr: &mut ChaperoneSetupManager, input: &InputState) {
+    pub fn fix_floor(
+        &mut self,
+        chaperone_mgr: &mut ChaperoneSetupManager,
+        app: &mut AppState,
+        overlays: &mut OverlayWindowManager<OpenVrOverlayData>,
+    ) {
+        let input = &app.input_state;
+        let anchor = &mut app.anchor;
         let y1 = input.pointers[0].pose.translation.y;
         let y2 = input.pointers[1].pose.translation.y;
         let Some(mut mat) = get_working_copy(&self.universe, chaperone_mgr) else {
@@ -221,11 +234,15 @@ impl PlayspaceMover {
             return;
         };
         let offset = y1.min(y2) - 0.03;
+        let before = mat;
         mat.translation.y += offset;
+        self.playspace_state.openvr_space_center.translation.y = mat.translation.y;
 
         set_working_copy(&self.universe, chaperone_mgr, &mat);
         chaperone_mgr.commit_working_copy(EChaperoneConfigFile::EChaperoneConfigFile_Live);
 
+        playspace_common::shift_world(overlays, anchor, &before, &mat);
+
         if self.drag.is_some() {
             log::info!("Space drag interrupted by fix floor");
             self.drag = None;
@@ -236,18 +253,12 @@ impl PlayspaceMover {
         }
     }
 
-    pub fn recenter(&mut self, chaperone_mgr: &mut ChaperoneSetupManager, input: &InputState) {
-        let Some(mut mat) = get_working_copy(&self.universe, chaperone_mgr) else {
-            log::warn!("Can't recenter - failed to get zero pose");
-            return;
-        };
-
-        mat.translation.x += input.hmd.translation.x;
-        mat.translation.z += input.hmd.translation.z;
-
-        set_working_copy(&self.universe, chaperone_mgr, &mat);
-        chaperone_mgr.commit_working_copy(EChaperoneConfigFile::EChaperoneConfigFile_Live);
-
+    pub fn recenter(
+        &mut self,
+        chaperone_mgr: &mut ChaperoneSetupManager,
+        app: &mut AppState,
+        overlays: &mut OverlayWindowManager<OpenVrOverlayData>,
+    ) {
         if self.drag.is_some() {
             log::info!("Space drag interrupted by recenter");
             self.drag = None;
@@ -256,6 +267,52 @@ impl PlayspaceMover {
             log::info!("Space rotate interrupted by recenter");
             self.rotate = None;
         }
+
+        let input = &app.input_state;
+        let anchor = &mut app.anchor;
+
+        let Some(mat) = get_working_copy(&self.universe, chaperone_mgr) else {
+            log::warn!("Can't recenter - failed to get zero pose");
+            return;
+        };
+
+        let before = mat;
+
+        let cur_rot: Quat = Quat::from_affine3(&mat);
+        let cur_pos: Vec3 = Vec3::from(mat.translation);
+
+        let mut stage_offset = Affine3A::from_rotation_translation(cur_rot, cur_pos);
+
+        let horiz_hmd_pos = Vec3::new(input.hmd.translation.x, 0.0, input.hmd.translation.z);
+
+        let fwd = input.hmd.transform_vector3a(Vec3A::NEG_Z);
+        let horiz_len_sq = fwd.x.mul_add(fwd.x, fwd.z * fwd.z);
+
+        let hmd_yaw = if horiz_len_sq > f32::EPSILON {
+            let yaw = (-fwd.x).atan2(-fwd.z);
+            Quat::from_rotation_y(yaw)
+        } else {
+            Quat::IDENTITY
+        };
+
+        let recenter_offset = Affine3A::from_rotation_translation(hmd_yaw, horiz_hmd_pos);
+
+        stage_offset *= recenter_offset;
+
+        let (_, new_rot, new_pos) = stage_offset.to_scale_rotation_translation();
+
+        let new_mat = if horiz_len_sq > f32::EPSILON {
+            Affine3A::from_rotation_translation(new_rot, new_pos)
+        } else {
+            let mut m = mat;
+            m.translation = new_pos.into();
+            m
+        };
+
+        set_working_copy(&self.universe, chaperone_mgr, &new_mat);
+        chaperone_mgr.commit_working_copy(EChaperoneConfigFile::EChaperoneConfigFile_Live);
+
+        playspace_common::shift_world(overlays, anchor, &before, &new_mat);
     }
 
     pub fn playspace_changed(
@@ -286,6 +343,26 @@ impl PlayspaceMover {
     pub fn get_universe(&self) -> ETrackingUniverseOrigin {
         self.universe.clone()
     }
+
+    pub fn save_center(&mut self, chaperone_mgr: &mut ChaperoneSetupManager) {
+        if self.drag.is_some() {
+            log::info!("Space drag interrupted by save center");
+            self.drag = None;
+        }
+        if self.rotate.is_some() {
+            log::info!("Space rotate interrupted by save center");
+            self.rotate = None;
+        }
+
+        let Some(mat) = get_working_copy(&self.universe, chaperone_mgr) else {
+            log::warn!("Can't save center - failed to get zero pose");
+            return;
+        };
+
+        self.playspace_state.openvr_space_center = mat;
+        let _ =
+            save_playspace_state(&self.playspace_state).log_err("Could not save playspace state");
+    }
 }
 
 const fn universe_str(universe: &ETrackingUniverseOrigin) -> &'static str {
diff --git a/wayvr/src/backend/openxr/helpers.rs b/wayvr/src/backend/openxr/helpers.rs
index 936ab5a3..d2c475eb 100644
--- a/wayvr/src/backend/openxr/helpers.rs
+++ b/wayvr/src/backend/openxr/helpers.rs
@@ -15,6 +15,8 @@ macro_rules! next_chain_insert {
 }
 pub(crate) use next_chain_insert;
 
+use crate::state::AppState;
+
 pub(super) fn init_xr() -> Result<(xr::Instance, xr::SystemId), anyhow::Error> {
     let entry = xr::Entry::linked();
 
@@ -39,6 +41,11 @@ pub(super) fn init_xr() -> Result<(xr::Instance, xr::SystemId), anyhow::Error> {
     } else {
         log::warn!("Missing EXT_dpad_binding extension.");
     }
+    if available_extensions.ext_samsung_odyssey_controller {
+        enabled_extensions.ext_samsung_odyssey_controller = true;
+    } else {
+        log::warn!("Missing XR_EXT_samsung_odyssey_controller extension.");
+    }
     if available_extensions.ext_hp_mixed_reality_controller {
         enabled_extensions.ext_hp_mixed_reality_controller = true;
     } else {
@@ -70,9 +77,14 @@ pub(super) fn init_xr() -> Result<(xr::Instance, xr::SystemId), anyhow::Error> {
         log::warn!("Missing XR_KHR_composition_layer_color_scale_bias extension.");
     }
 
-    let xr_mndx_system_buttons = b"XR_MNDX_system_buttons".to_vec();
-    if available_extensions.other.contains(&xr_mndx_system_buttons) {
-        enabled_extensions.other.push(xr_mndx_system_buttons);
+    let xr_extension = b"XR_MNDX_system_buttons".to_vec();
+    if available_extensions.other.contains(&xr_extension) {
+        enabled_extensions.other.push(xr_extension);
+    }
+
+    let xr_extension = b"XR_VALVE_frame_controller_interaction".to_vec();
+    if available_extensions.other.contains(&xr_extension) {
+        enabled_extensions.other.push(xr_extension);
     }
 
     //#[cfg(not(debug_assertions))]
@@ -209,3 +221,25 @@ pub(super) fn posef_to_transform(pose: &xr::Posef) -> Affine3A {
     let translation = Vec3M::from(pose.position).into();
     Affine3A::from_rotation_translation(rotation, translation)
 }
+
+pub(super) fn try_apply_chroma_key(app: &AppState) -> bool {
+    let Some(monado) = app.monado_state.as_ref() else {
+        log::warn!("Could not set Chroma Key: no monado_state");
+        return false;
+    };
+
+    let params = &app.session.config.chroma_key_params;
+
+    if let Err(e) = monado.ipc.set_chroma_key_params(
+        params.hsv_min[0]..params.hsv_max[0],
+        params.hsv_min[1]..params.hsv_max[1],
+        params.hsv_min[2]..params.hsv_max[2],
+        params.curve,
+        params.despill,
+    ) {
+        log::warn!("Could not set Chroma Key: {e:?}");
+        return false;
+    }
+
+    params.curve > 0.001
+}
diff --git a/wayvr/src/backend/openxr/input.rs b/wayvr/src/backend/openxr/input.rs
index f37c4673..d7039497 100644
--- a/wayvr/src/backend/openxr/input.rs
+++ b/wayvr/src/backend/openxr/input.rs
@@ -4,14 +4,19 @@ use std::{
     time::{Duration, Instant},
 };
 
-use glam::{Affine3A, Quat, Vec3, bool};
+use glam::{Affine3A, FloatExt, Quat, Vec3, bool};
 use libmonado::{self as mnd, DeviceLogic};
 use openxr::{self as xr, Quaternionf, Vector2f, Vector3f};
-use serde::{Deserialize, Serialize};
-use wlx_common::{config::HandsfreePointer, config_io};
+use wlx_common::{
+    config::HandsfreePointer,
+    openxr_actions::{OneOrMany, load_xr_input_profiles},
+    openxr_bindings_schema::DEFAULT_BUTTON_THRESHOLDS,
+};
 
 use crate::{
-    backend::input::{Haptics, InputState, Pointer, TrackedDevice, TrackedDeviceRole},
+    backend::input::{
+        Haptics, InputState, Pointer, PointerState, TrackedDevice, TrackedDeviceRole,
+    },
     state::{AppSession, AppState},
 };
 
@@ -113,6 +118,7 @@ pub struct CustomClickAction {
     single: MultiClickHandler<0>,
     double: MultiClickHandler<1>,
     triple: MultiClickHandler<2>,
+    threshold: [f32; 2],
 }
 
 impl CustomClickAction {
@@ -125,18 +131,19 @@ impl CustomClickAction {
             single,
             double,
             triple,
+            threshold: DEFAULT_BUTTON_THRESHOLDS,
         })
     }
-    pub fn state(
-        &mut self,
-        before: bool,
-        state: &XrState,
-        session: &AppSession,
-    ) -> anyhow::Result<bool> {
+
+    pub fn set_threshold(&mut self, threshold: [f32; 2]) {
+        self.threshold = threshold;
+    }
+
+    pub fn state(&mut self, before: bool, state: &XrState) -> anyhow::Result<bool> {
         let threshold = if before {
-            session.config.xr_click_sensitivity_release
+            self.threshold[0]
         } else {
-            session.config.xr_click_sensitivity
+            self.threshold[1]
         };
 
         Ok(self.single.check(&state.session, threshold)?
@@ -169,14 +176,13 @@ impl OpenXrInputSource {
                 .instance()
                 .create_action_set("wayvr", "WayVR Actions", 0)?;
 
-        let left_source = OpenXrHandSource::new(&mut action_set, "left")?;
-        let right_source = OpenXrHandSource::new(&mut action_set, "right")?;
-        let fallback_source = OpenXrHandSource::new(&mut action_set, "handsfree")?;
+        let mut left_source = OpenXrHandSource::new(&mut action_set, "left")?;
+        let mut right_source = OpenXrHandSource::new(&mut action_set, "right")?;
+        let mut fallback_source = OpenXrHandSource::new(&mut action_set, "handsfree")?;
 
-        suggest_bindings(
-            &xr.instance,
-            &[&left_source, &right_source, &fallback_source],
-        );
+        let mut hands: [&mut OpenXrHandSource; 3] =
+            [&mut left_source, &mut right_source, &mut fallback_source];
+        suggest_bindings(&xr.instance, &mut hands);
 
         xr.session.attach_action_sets(&[&action_set])?;
 
@@ -205,7 +211,7 @@ impl OpenXrInputSource {
         );
     }
 
-    pub fn update(&mut self, xr: &XrState, state: &mut AppState) -> anyhow::Result<()> {
+    pub fn update(&mut self, xr: &XrState, app: &mut AppState) -> anyhow::Result<()> {
         xr.session.sync_actions(&[(&self.action_set).into()])?;
 
         let loc = xr.view.locate(&xr.stage, xr.predicted_display_time)?;
@@ -215,7 +221,7 @@ impl OpenXrInputSource {
             .location_flags
             .contains(xr::SpaceLocationFlags::ORIENTATION_VALID)
         {
-            state.input_state.hmd.matrix3 = hmd.matrix3;
+            app.input_state.hmd.matrix3 = hmd.matrix3;
         } else {
             hmd_tracked = false;
         }
@@ -224,25 +230,46 @@ impl OpenXrInputSource {
             .location_flags
             .contains(xr::SpaceLocationFlags::POSITION_VALID)
         {
-            state.input_state.hmd.translation = hmd.translation;
+            app.input_state.hmd.translation = hmd.translation;
         } else {
             hmd_tracked = false;
         }
 
         let mut any_tracked = false;
-        for i in 0..2 {
-            let pointer = &mut state.input_state.pointers[i];
-            self.pointers[i].update(pointer, xr, &state.session)?;
-            any_tracked |= pointer.tracked;
+        let old_handsfree = app.session.config.handsfree_pointer;
+
+        if !app.input_state.picking_focus.is_none() {
+            app.session.config.handsfree_pointer = app.session.config.handsfree_alt_tab.into();
+
+            app.input_state.handsfree_state.scroll_x =
+                app.input_state.handsfree_state.scroll_x.lerp(0.0, 0.7);
+            app.input_state.handsfree_state.scroll_y =
+                app.input_state.handsfree_state.scroll_y.lerp(0.0, 0.7);
+
+            let ptr1 = &mut app.input_state.pointers[1];
+            ptr1.before = ptr1.now;
+            ptr1.now = PointerState::default();
+            ptr1.tracked = false;
+        } else {
+            let should_disable_lerp = app.input_state.should_disable_lerp();
+            for i in 0..2 {
+                let pointer = &mut app.input_state.pointers[i];
+                self.pointers[i].update(pointer, xr, &app.session, !should_disable_lerp)?;
+                any_tracked |= pointer.tracked;
+            }
         }
+
         if !any_tracked {
             self.handsfree_pointer.update_handsfree(
-                &mut state.input_state.pointers[0],
+                &mut app.input_state.pointers[0],
                 xr,
-                &state.session,
+                &app.session,
                 hmd,
                 hmd_tracked,
+                &app.input_state.handsfree_state,
             )?;
+
+            app.session.config.handsfree_pointer = old_handsfree;
         }
 
         Ok(())
@@ -345,6 +372,7 @@ impl OpenXrPointer {
         session: &AppSession,
         hmd: Affine3A,
         hmd_tracked: bool,
+        handsfree_state: &PointerState,
     ) -> anyhow::Result<()> {
         match session.config.handsfree_pointer {
             HandsfreePointer::None => return Ok(()),
@@ -366,7 +394,11 @@ impl OpenXrPointer {
             }
             HandsfreePointer::EyeTracking | HandsfreePointer::EyeTrackingOnly => {
                 // more aggressive smoothing for eye
-                self.pointer_load_pose(pointer, xr, session.config.pointer_lerp_factor * 0.5)?;
+                self.pointer_load_pose(
+                    pointer,
+                    xr,
+                    Some(session.config.pointer_lerp_factor * 0.5),
+                )?;
             }
         }
 
@@ -375,11 +407,22 @@ impl OpenXrPointer {
             session.config.handsfree_pointer,
             HandsfreePointer::HmdOnly | HandsfreePointer::EyeTrackingOnly
         ) {
-            // skip actions
+            // input from wayvrctl
+            pointer.now.click = handsfree_state.click;
+            pointer.now.grab = handsfree_state.grab;
+            pointer.now.grab_float = handsfree_state.grab_float;
+            pointer.now.click_modifier_right = handsfree_state.click_modifier_right;
+            pointer.now.click_modifier_middle = handsfree_state.click_modifier_middle;
+            pointer.now.scroll_y = handsfree_state.scroll_y;
+
+            // skip action loading
             return Ok(());
         }
 
-        self.pointer_load_actions(pointer, xr, session)?;
+        self.pointer_load_actions(pointer, xr)?;
+        pointer.now.click_modifier_right = handsfree_state.click_modifier_right;
+        pointer.now.click_modifier_middle = handsfree_state.click_modifier_middle;
+        pointer.now.scroll_y = handsfree_state.scroll_y;
 
         Ok(())
     }
@@ -389,10 +432,19 @@ impl OpenXrPointer {
         pointer: &mut Pointer,
         xr: &XrState,
         session: &AppSession,
+        do_lerp: bool,
     ) -> anyhow::Result<()> {
         pointer.handsfree = false;
-        self.pointer_load_pose(pointer, xr, session.config.pointer_lerp_factor)?;
-        self.pointer_load_actions(pointer, xr, session)?;
+        self.pointer_load_pose(
+            pointer,
+            xr,
+            if do_lerp {
+                Some(session.config.pointer_lerp_factor)
+            } else {
+                None
+            },
+        )?;
+        self.pointer_load_actions(pointer, xr)?;
 
         Ok(())
     }
@@ -401,7 +453,7 @@ impl OpenXrPointer {
         &mut self,
         pointer: &mut Pointer,
         xr: &XrState,
-        lerp_factor: f32,
+        lerp_factor: Option<f32>,
     ) -> anyhow::Result<()> {
         let location = self.space.locate(&xr.stage, xr.predicted_display_time)?;
         if location
@@ -416,12 +468,17 @@ impl OpenXrPointer {
                     transmute::<Vector3f, Vec3>(location.pose.position),
                 )
             };
-            let lerp_factor = (1.0 / (xr.fps / 100.0) * lerp_factor).clamp(0.1, 1.0);
+
             pointer.raw_pose = Affine3A::from_rotation_translation(new_quat, new_pos);
-            pointer.pose = Affine3A::from_rotation_translation(
-                cur_quat.lerp(new_quat, lerp_factor),
-                cur_pos.lerp(new_pos.into(), lerp_factor).into(),
-            );
+            if let Some(lerp_factor) = lerp_factor {
+                let lerp_factor = (1.0 / (xr.fps / 100.0) * lerp_factor).clamp(0.1, 1.0);
+                pointer.pose = Affine3A::from_rotation_translation(
+                    cur_quat.lerp(new_quat, lerp_factor),
+                    cur_pos.lerp(new_pos.into(), lerp_factor).into(),
+                );
+            } else {
+                pointer.pose = pointer.raw_pose; // no lerp
+            }
             pointer.tracked = true;
         } else {
             pointer.tracked = false;
@@ -429,15 +486,10 @@ impl OpenXrPointer {
         Ok(())
     }
 
-    fn pointer_load_actions(
-        &mut self,
-        pointer: &mut Pointer,
-        xr: &XrState,
-        session: &AppSession,
-    ) -> anyhow::Result<()> {
-        pointer.now.click = self.source.click.state(pointer.before.click, xr, session)?;
+    fn pointer_load_actions(&mut self, pointer: &mut Pointer, xr: &XrState) -> anyhow::Result<()> {
+        pointer.now.click = self.source.click.state(pointer.before.click, xr)?;
 
-        pointer.now.grab = self.source.grab.state(pointer.before.grab, xr, session)?;
+        pointer.now.grab = self.source.grab.state(pointer.before.grab, xr)?;
 
         let scroll = self
             .source
@@ -448,50 +500,44 @@ impl OpenXrPointer {
         pointer.now.scroll_x = scroll.x;
         pointer.now.scroll_y = scroll.y;
 
-        pointer.now.alt_click =
-            self.source
-                .alt_click
-                .state(pointer.before.alt_click, xr, session)?;
+        pointer.now.alt_click = self.source.alt_click.state(pointer.before.alt_click, xr)?;
 
-        pointer.now.show_hide =
-            self.source
-                .show_hide
-                .state(pointer.before.show_hide, xr, session)?;
+        pointer.now.show_hide = self.source.show_hide.state(pointer.before.show_hide, xr)?;
 
-        pointer.now.click_modifier_right =
-            self.source
-                .modifier_right
-                .state(pointer.before.click_modifier_right, xr, session)?;
+        pointer.now.click_modifier_right = self
+            .source
+            .modifier_right
+            .state(pointer.before.click_modifier_right, xr)?;
 
-        pointer.now.toggle_dashboard =
-            self.source
-                .toggle_dashboard
-                .state(pointer.before.toggle_dashboard, xr, session)?;
+        pointer.now.toggle_dashboard = self
+            .source
+            .toggle_dashboard
+            .state(pointer.before.toggle_dashboard, xr)?;
 
-        pointer.now.click_modifier_middle =
-            self.source
-                .modifier_middle
-                .state(pointer.before.click_modifier_middle, xr, session)?;
+        pointer.now.click_modifier_middle = self
+            .source
+            .modifier_middle
+            .state(pointer.before.click_modifier_middle, xr)?;
 
-        pointer.now.move_mouse =
-            self.source
-                .move_mouse
-                .state(pointer.before.move_mouse, xr, session)?;
+        pointer.now.move_mouse = self
+            .source
+            .move_mouse
+            .state(pointer.before.move_mouse, xr)?;
 
-        pointer.now.space_drag =
-            self.source
-                .space_drag
-                .state(pointer.before.space_drag, xr, session)?;
+        pointer.now.space_drag = self
+            .source
+            .space_drag
+            .state(pointer.before.space_drag, xr)?;
 
-        pointer.now.space_rotate =
-            self.source
-                .space_rotate
-                .state(pointer.before.space_rotate, xr, session)?;
+        pointer.now.space_rotate = self
+            .source
+            .space_rotate
+            .state(pointer.before.space_rotate, xr)?;
 
-        pointer.now.space_reset =
-            self.source
-                .space_reset
-                .state(pointer.before.space_reset, xr, session)?;
+        pointer.now.space_reset = self
+            .source
+            .space_reset
+            .state(pointer.before.space_reset, xr)?;
 
         Ok(())
     }
@@ -646,144 +692,106 @@ macro_rules! add_custom_lr {
 }
 
 #[allow(clippy::too_many_lines, clippy::cognitive_complexity)]
-fn suggest_bindings(instance: &xr::Instance, hands: &[&OpenXrHandSource; 3]) {
-    let profiles = load_action_profiles();
+macro_rules! set_threshold_for {
+    ($hands:expr, $profile_action:expr, $field:ident) => {
+        if let Some(ref profile_action) = $profile_action {
+            if let Some(threshold) = profile_action.threshold_left {
+                $hands[0].$field.set_threshold(threshold);
+            }
+            if let Some(threshold) = profile_action.threshold_right {
+                $hands[1].$field.set_threshold(threshold);
+            }
+        }
+    };
+}
+
+fn suggest_bindings(instance: &xr::Instance, hands: &mut [&mut OpenXrHandSource; 3]) {
+    let profiles = load_xr_input_profiles();
 
     for profile in profiles {
-        log::warn!("Loading profile {}", &profile.profile);
+        log::debug!("Loading profile {}", &profile.profile);
 
         let Ok(profile_path) = instance.string_to_path(&profile.profile) else {
             log::warn!("Profile not supported: {}", profile.profile);
             continue;
         };
 
-        let mut bindings: Vec<xr::Binding> = vec![];
-
-        add_custom_lr!(profile.pose, pose, hands, bindings, instance);
-        add_custom_lr!(profile.haptic, haptics, hands, bindings, instance);
-        add_custom_lr!(profile.scroll, scroll, hands, bindings, instance);
-
-        add_custom!(profile.click, click, hands, bindings, instance);
-
-        add_custom!(profile.alt_click, alt_click, hands, bindings, instance);
-
-        add_custom!(profile.grab, grab, hands, bindings, instance);
-
-        add_custom!(profile.show_hide, show_hide, hands, bindings, instance);
-
-        add_custom!(
-            profile.toggle_dashboard,
-            toggle_dashboard,
-            hands,
-            bindings,
-            instance
-        );
-
-        add_custom!(profile.space_drag, space_drag, hands, bindings, instance);
-
-        add_custom!(
-            profile.space_rotate,
-            space_rotate,
-            hands,
-            bindings,
-            instance
-        );
-
-        add_custom!(profile.space_reset, space_reset, hands, bindings, instance);
-
-        add_custom!(
-            profile.click_modifier_right,
-            modifier_right,
-            hands,
-            bindings,
-            instance
-        );
-
-        add_custom!(
-            profile.click_modifier_middle,
-            modifier_middle,
-            hands,
-            bindings,
-            instance
-        );
-
-        add_custom!(profile.move_mouse, move_mouse, hands, bindings, instance);
-
-        if instance
-            .suggest_interaction_profile_bindings(profile_path, &bindings)
-            .is_err()
         {
-            log::error!("Bad bindings for {}", &profile.profile[22..]);
-            log::error!("Verify config: ~/.config/wayvr/openxr_actions.json5");
-        } else {
-            log::debug!(
-                "Bindings for {} bound successfully.",
-                &profile.profile[22..]
+            let mut bindings: Vec<xr::Binding> = vec![];
+
+            add_custom_lr!(profile.pose, pose, hands, bindings, instance);
+            add_custom_lr!(profile.haptic, haptics, hands, bindings, instance);
+            add_custom_lr!(profile.scroll, scroll, hands, bindings, instance);
+
+            add_custom!(profile.click, click, hands, bindings, instance);
+
+            add_custom!(profile.alt_click, alt_click, hands, bindings, instance);
+
+            add_custom!(profile.grab, grab, hands, bindings, instance);
+
+            add_custom!(profile.show_hide, show_hide, hands, bindings, instance);
+
+            add_custom!(
+                profile.toggle_dashboard,
+                toggle_dashboard,
+                hands,
+                bindings,
+                instance
             );
-        }
-    }
-}
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(untagged)]
-enum OneOrMany<T> {
-    One(T),
-    Many(Vec<T>),
-}
+            add_custom!(profile.space_drag, space_drag, hands, bindings, instance);
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
-struct OpenXrActionConfAction {
-    left: Option<OneOrMany<String>>,
-    right: Option<OneOrMany<String>>,
-    handsfree: Option<OneOrMany<String>>,
-    threshold: Option<[f32; 2]>,
-    double_click: Option<bool>,
-    triple_click: Option<bool>,
-}
+            add_custom!(
+                profile.space_rotate,
+                space_rotate,
+                hands,
+                bindings,
+                instance
+            );
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
-struct OpenXrActionConfProfile {
-    profile: String,
-    pose: Option<OpenXrActionConfAction>,
-    click: Option<OpenXrActionConfAction>,
-    grab: Option<OpenXrActionConfAction>,
-    alt_click: Option<OpenXrActionConfAction>,
-    show_hide: Option<OpenXrActionConfAction>,
-    toggle_dashboard: Option<OpenXrActionConfAction>,
-    space_drag: Option<OpenXrActionConfAction>,
-    space_rotate: Option<OpenXrActionConfAction>,
-    space_reset: Option<OpenXrActionConfAction>,
-    click_modifier_right: Option<OpenXrActionConfAction>,
-    click_modifier_middle: Option<OpenXrActionConfAction>,
-    move_mouse: Option<OpenXrActionConfAction>,
-    scroll: Option<OpenXrActionConfAction>,
-    haptic: Option<OpenXrActionConfAction>,
-}
+            add_custom!(profile.space_reset, space_reset, hands, bindings, instance);
 
-const DEFAULT_PROFILES: &str = include_str!("openxr_actions.json5");
+            add_custom!(
+                profile.click_modifier_right,
+                modifier_right,
+                hands,
+                bindings,
+                instance
+            );
 
-fn load_action_profiles() -> Vec<OpenXrActionConfProfile> {
-    let mut profiles: Vec<OpenXrActionConfProfile> =
-        serde_json5::from_str(DEFAULT_PROFILES).unwrap(); // want panic
+            add_custom!(
+                profile.click_modifier_middle,
+                modifier_middle,
+                hands,
+                bindings,
+                instance
+            );
 
-    let Some(conf) = config_io::load("openxr_actions.json5") else {
-        return profiles;
-    };
+            add_custom!(profile.move_mouse, move_mouse, hands, bindings, instance);
 
-    match serde_json5::from_str::<Vec<OpenXrActionConfProfile>>(&conf) {
-        Ok(override_profiles) => {
-            for new in override_profiles {
-                if let Some(i) = profiles.iter().position(|old| old.profile == new.profile) {
-                    profiles[i] = new;
-                } else {
-                    profiles.push(new);
-                }
+            if instance
+                .suggest_interaction_profile_bindings(profile_path, &bindings)
+                .is_err()
+            {
+                log::warn!("Could not apply bindings for {}", &profile.profile[22..]);
+            } else {
+                log::debug!(
+                    "Bindings for {} bound successfully.",
+                    &profile.profile[22..]
+                );
             }
         }
-        Err(e) => {
-            log::error!("Failed to load openxr_actions.json5: {e}");
-        }
-    }
 
-    profiles
+        set_threshold_for!(hands, profile.click, click);
+        set_threshold_for!(hands, profile.alt_click, alt_click);
+        set_threshold_for!(hands, profile.grab, grab);
+        set_threshold_for!(hands, profile.show_hide, show_hide);
+        set_threshold_for!(hands, profile.toggle_dashboard, toggle_dashboard);
+        set_threshold_for!(hands, profile.space_drag, space_drag);
+        set_threshold_for!(hands, profile.space_rotate, space_rotate);
+        set_threshold_for!(hands, profile.space_reset, space_reset);
+        set_threshold_for!(hands, profile.click_modifier_right, modifier_right);
+        set_threshold_for!(hands, profile.click_modifier_middle, modifier_middle);
+        set_threshold_for!(hands, profile.move_mouse, move_mouse);
+    }
 }
diff --git a/wayvr/src/backend/openxr/lines.rs b/wayvr/src/backend/openxr/lines.rs
index 6ff159be..38fd32b6 100644
--- a/wayvr/src/backend/openxr/lines.rs
+++ b/wayvr/src/backend/openxr/lines.rs
@@ -35,13 +35,13 @@ static LINE_AUTO_INCREMENT: AtomicUsize = AtomicUsize::new(1);
 pub(super) const LINE_WIDTH: f32 = 0.002;
 
 // TODO customizable colors
-static COLORS: [[f32; 6]; 5] = {
+static COLORS: [[f32; 4]; 5] = {
     [
-        [1., 1., 1., 1., 0., 0.],
-        [0., 0.375, 0.5, 1., 0., 0.],
-        [0.69, 0.188, 0., 1., 0., 0.],
-        [0.375, 0., 0.5, 1., 0., 0.],
-        [1., 0., 0., 1., 0., 0.],
+        [1., 1., 1., 1.],
+        [0., 0.375, 0.5, 1.],
+        [0.69, 0.188, 0., 1.],
+        [0.375, 0., 0.5, 1.],
+        [1., 0., 0., 1.],
     ]
 };
 
@@ -69,7 +69,7 @@ impl LinePool {
 
         let buf_color = app
             .gfx
-            .empty_buffer(BufferUsage::TRANSFER_DST | BufferUsage::UNIFORM_BUFFER, 6)?;
+            .empty_buffer(BufferUsage::TRANSFER_DST | BufferUsage::UNIFORM_BUFFER, 4)?;
 
         let set0 = self.pipeline.buffer(0, buf_color.clone())?;
 
@@ -173,7 +173,7 @@ impl LinePool {
                     .next()
                     .unwrap();
 
-                line.buf_color.write()?[0..6].copy_from_slice(&COLORS[inner.color]);
+                line.buf_color.write()?[0..4].copy_from_slice(&COLORS[inner.color]);
 
                 let mut cmd_buffer = app
                     .gfx
diff --git a/wayvr/src/backend/openxr/mod.rs b/wayvr/src/backend/openxr/mod.rs
index 8e7938f7..fd37819a 100644
--- a/wayvr/src/backend/openxr/mod.rs
+++ b/wayvr/src/backend/openxr/mod.rs
@@ -13,18 +13,17 @@ use vulkano::{Handle, VulkanObject};
 use wlx_common::overlays::{StereoMode, ToastTopic};
 
 use crate::{
-    FRAME_COUNTER, RUNNING,
+    Args, FRAME_COUNTER, RUNNING,
     backend::{
         BackendError, XrBackend,
         input::interact,
-        openxr::{lines::LinePool, overlay::OpenXrOverlayData},
+        openxr::{helpers::try_apply_chroma_key, lines::LinePool, overlay::OpenXrOverlayData},
         task::{OpenXrTask, OverlayTask, TaskType},
     },
     config::{save_settings, save_state},
     graphics::{GpuFutures, init_openxr_graphics},
     overlays::{toast::Toast, watch::WATCH_NAME},
     state::AppState,
-    subsystem::notifications::NotificationManager,
     windowing::{
         backend::{RenderResources, RenderTarget, ShouldRender},
         manager::OverlayWindowManager,
@@ -53,11 +52,13 @@ struct XrState {
 }
 
 #[allow(clippy::too_many_lines, clippy::cognitive_complexity)]
-pub fn openxr_run(show_by_default: bool, headless: bool) -> Result<(), BackendError> {
+pub fn openxr_run(args: &Args) -> Result<(), BackendError> {
     let (xr_instance, system) = match helpers::init_xr() {
         Ok((xr_instance, system)) => (xr_instance, system),
         Err(e) => {
-            log::warn!("Will not use OpenXR: {e}");
+            if !args.wait {
+                log::warn!("Will not use OpenXR: {e}");
+            }
             return Err(BackendError::NotSupported);
         }
     };
@@ -67,29 +68,28 @@ pub fn openxr_run(show_by_default: bool, headless: bool) -> Result<(), BackendEr
         AppState::from_graphics(gfx, gfx_extras, XrBackend::OpenXR)?
     };
 
+    app.session.no_autostart = args.no_autostart;
+
     let modes = xr_instance.enumerate_environment_blend_modes(system, VIEW_TYPE)?;
 
-    if show_by_default {
+    if args.show {
+        app.session.config.tutorial_graduated = true;
         app.tasks.enqueue_at(
             TaskType::Overlay(OverlayTask::ShowHide),
             Instant::now().add(Duration::from_secs(1)),
         );
     }
 
-    let mut overlays = OverlayWindowManager::<OpenXrOverlayData>::new(&mut app, headless)?;
+    let mut overlays = OverlayWindowManager::<OpenXrOverlayData>::new(&mut app, args.headless)?;
     let mut lines = LinePool::new(&app)?;
     let mut current_lines = Vec::with_capacity(2);
 
-    let mut notifications = NotificationManager::new();
-    notifications.run_dbus(&mut app.dbus);
-    notifications.run_udp();
-
     let mut delete_queue = vec![];
 
-    app.monado_state_init();
+    app.late_init();
 
-    let mut playspace = app.monado_state.as_mut().and_then(|m| {
-        playspace::PlayspaceMover::new(&mut m.ipc)
+    let mut playspace_mover = app.monado_state.as_mut().and_then(|m| {
+        playspace::PlayspaceMover::new()
             .map_err(|e| log::warn!("Will not use Monado playspace mover: {e}"))
             .ok()
     });
@@ -149,8 +149,12 @@ pub fn openxr_run(show_by_default: bool, headless: bool) -> Result<(), BackendEr
 
     let mut main_session_visible = false;
     let mut environment_blend_mode = modes[0];
+    let mut last_frame_time = Instant::now();
 
     'main_loop: loop {
+        let now = Instant::now();
+        app.delta_time = (now.duration_since(last_frame_time).as_secs_f32()).clamp(0.001, 0.2); // 5 - 1000 fps
+        last_frame_time = now;
         let cur_frame = FRAME_COUNTER.fetch_add(1, Ordering::Relaxed);
 
         if !RUNNING.load(Ordering::Relaxed) {
@@ -290,8 +294,8 @@ pub fn openxr_run(show_by_default: bool, headless: bool) -> Result<(), BackendEr
                 .enqueue(TaskType::Overlay(OverlayTask::ToggleDashboard));
         }
 
-        if let Some(ref mut space_mover) = playspace {
-            space_mover.update(&mut overlays, &mut app);
+        if let Some(ref mut playspace_mover) = playspace_mover {
+            playspace_mover.update(&mut overlays, &mut app);
         }
 
         for o in overlays.values_mut() {
@@ -340,9 +344,12 @@ pub fn openxr_run(show_by_default: bool, headless: bool) -> Result<(), BackendEr
         app.hid_provider.inner.commit();
 
         let watch = overlays.mut_by_id(watch_id).unwrap(); // want panic
+        if watch.config.active_state.is_none() {
+            watch.config.activate(&mut app);
+        }
         let watch_state = watch.config.active_state.as_mut().unwrap();
         let watch_transform = watch_state.transform;
-        if watch_state.alpha < 0.05 {
+        if watch_state.alpha < 0.05 || !app.session.config.enable_watch {
             //FIXME: Temporary workaround for Monado bug
             watch_state.transform = Affine3A::from_scale(Vec3 {
                 x: 0.001,
@@ -462,12 +469,13 @@ pub fn openxr_run(show_by_default: bool, headless: bool) -> Result<(), BackendEr
         )?;
         // End layer submit
 
-        app.dbus.tick();
-        notifications.submit_pending(&mut app);
-
+        app.tick();
         app.tasks.retrieve_due(&mut due_tasks);
         while let Some(task) = due_tasks.pop_front() {
             match task {
+                TaskType::Global(task) => {
+                    task(&mut app);
+                }
                 TaskType::Input(task) => {
                     app.input_state.handle_task(task);
                 }
@@ -475,12 +483,12 @@ pub fn openxr_run(show_by_default: bool, headless: bool) -> Result<(), BackendEr
                     overlays.handle_task(&mut app, task)?;
                 }
                 TaskType::Playspace(task) => {
-                    if let Some(playspace) = playspace.as_mut() {
-                        playspace.handle_task(&mut app, task);
+                    if let Some(playspace_mover) = playspace_mover.as_mut() {
+                        playspace_mover.handle_task(&mut app, &mut overlays, task);
                     }
                 }
                 TaskType::OpenXR(task) => {
-                    if matches!(task, OpenXrTask::SettingsChanged) {
+                    if matches!(task, OpenXrTask::EnvironmentChanged) {
                         reconfigure_environment_blend(
                             &app,
                             &xr_state,
@@ -504,7 +512,13 @@ pub fn openxr_run(show_by_default: bool, headless: bool) -> Result<(), BackendEr
 
         //FIXME: Temporary workaround for Monado bug
         let watch = overlays.mut_by_id(watch_id).unwrap(); // want panic
-        watch.config.active_state.as_mut().unwrap().transform = watch_transform;
+
+        if let Some(state) = watch.config.active_state.as_mut() {
+            state.transform = watch_transform;
+        }
+        if !app.session.config.enable_watch {
+            watch.config.deactivate();
+        }
     } // main_loop
 
     if let (Some(blocker), Some(monado)) = (blocker, app.monado_state.as_mut()) {
@@ -529,6 +543,9 @@ pub(super) enum CompositionLayer<'a> {
     Equirect2(xr::CompositionLayerEquirect2KHR<'a, xr::Vulkan>),
 }
 
+// applies chroma key settings.
+// if chroma key or passthrough is enabled, use alpha env blend
+// if alpha blend is not used and skybox is enabled, use skybox
 fn reconfigure_environment_blend(
     app: &AppState,
     xr_state: &XrState,
@@ -537,9 +554,11 @@ fn reconfigure_environment_blend(
     environment_blend_mode: &mut xr::EnvironmentBlendMode,
     main_session_visible: bool,
 ) {
+    let has_chroma_key = try_apply_chroma_key(app);
+
     *environment_blend_mode = {
         if modes.contains(&xr::EnvironmentBlendMode::ALPHA_BLEND)
-            && app.session.config.use_passthrough
+            && (app.session.config.use_passthrough || has_chroma_key)
         {
             xr::EnvironmentBlendMode::ALPHA_BLEND
         } else {
@@ -551,13 +570,17 @@ fn reconfigure_environment_blend(
         && app.session.config.use_skybox
         && !main_session_visible;
 
-    if want_skybox == skybox.is_some() {
-        return;
-    }
-
     if want_skybox {
-        log::debug!("Allocating skybox.");
-        *skybox = create_skybox(xr_state, app);
+        if let Some(curr_skybox) = skybox.as_ref() {
+            if curr_skybox.needs_recreate(app) {
+                *skybox = None;
+                log::debug!("Allocating skybox.");
+                *skybox = create_skybox(xr_state, app);
+            }
+        } else {
+            log::debug!("Allocating skybox.");
+            *skybox = create_skybox(xr_state, app);
+        }
     } else {
         log::debug!("Destroying skybox.");
         *skybox = None;
diff --git a/wayvr/src/backend/openxr/monado_state.rs b/wayvr/src/backend/openxr/monado_state.rs
index 418e5673..ff27fc00 100644
--- a/wayvr/src/backend/openxr/monado_state.rs
+++ b/wayvr/src/backend/openxr/monado_state.rs
@@ -19,6 +19,8 @@ impl MonadoState {
         Ok(res)
     }
 
+    #[allow(clippy::missing_const_for_fn)]
+    #[allow(clippy::unused_self)]
     pub fn update(&mut self) {
         #[cfg(feature = "feat-monado-metrics")]
         if let Some(metrics) = &mut self.metrics {
@@ -30,6 +32,10 @@ impl MonadoState {
         }
     }
 
+    #[allow(clippy::missing_const_for_fn)]
+    #[allow(clippy::unused_self)]
+    #[allow(clippy::unnecessary_wraps)]
+    #[cfg(feature = "feat-monado-metrics")]
     pub fn set_metrics_enabled(&mut self, enabled: bool) -> anyhow::Result<()> {
         #[cfg(feature = "feat-monado-metrics")]
         {
diff --git a/wayvr/src/backend/openxr/overlay.rs b/wayvr/src/backend/openxr/overlay.rs
index b4404e86..8479569c 100644
--- a/wayvr/src/backend/openxr/overlay.rs
+++ b/wayvr/src/backend/openxr/overlay.rs
@@ -87,7 +87,13 @@ impl OverlayWindowData<OpenXrOverlayData> {
             smallvec![(swapchain.get_subimage(0), EyeVisibility::BOTH),]
         };
 
-        let transform = state.transform * self.config.backend.frame_meta().unwrap().transform; // contract
+        let transform = state.transform
+            * self
+                .config
+                .backend
+                .frame_meta()
+                .map(|x| x.transform)
+                .unwrap_or_default(); // contract
 
         let aspect_ratio = swapchain.extent[0] as f32 / swapchain.extent[1] as f32;
         let (scale_x, scale_y) = if aspect_ratio < 1.0 {
diff --git a/wayvr/src/backend/openxr/playspace.rs b/wayvr/src/backend/openxr/playspace.rs
index 3f02d377..e77db07d 100644
--- a/wayvr/src/backend/openxr/playspace.rs
+++ b/wayvr/src/backend/openxr/playspace.rs
@@ -1,9 +1,13 @@
-use glam::{Affine3A, Quat, Vec3A, vec3a};
+use glam::{Affine3A, Quat, Vec3, Vec3A, vec3a};
 use libmonado::{Monado, Pose, ReferenceSpaceType};
+use wgui::log::LogErr;
 
 use crate::{
-    backend::{input::InputState, task::PlayspaceTask},
-    state::AppState,
+    backend::{
+        playspace_common::{self, SpaceGravity, SpaceGravityUpdateParams},
+        task::PlayspaceTask,
+    },
+    state::{AppState, PlayspaceState, load_playspace_state, save_playspace_state},
     windowing::manager::OverlayWindowManager,
 };
 
@@ -16,47 +20,49 @@ struct MoverData<T> {
 }
 
 pub(super) struct PlayspaceMover {
-    last_transform: Affine3A,
     drag: Option<MoverData<Vec3A>>,
     rotate: Option<MoverData<Quat>>,
+    gravity: SpaceGravity,
+    playspace_state: PlayspaceState,
 }
 
 impl PlayspaceMover {
-    pub fn new(monado: &mut Monado) -> anyhow::Result<Self> {
+    pub fn new() -> anyhow::Result<Self> {
         log::info!("Monado: using space offset API");
 
-        let Ok(stage) = monado.get_reference_space_offset(ReferenceSpaceType::Stage) else {
-            anyhow::bail!("Space offsets not supported.");
-        };
-
-        log::debug!("STAGE is at {:?}, {:?}", stage.position, stage.orientation);
-
-        // initial offset
-        let last_transform =
-            Affine3A::from_rotation_translation(stage.orientation.into(), stage.position.into());
-
         Ok(Self {
-            last_transform,
-
             drag: None,
             rotate: None,
+            gravity: SpaceGravity::new(),
+            playspace_state: load_playspace_state().unwrap_or_default(),
         })
     }
 
-    pub fn handle_task(&mut self, app: &mut AppState, task: PlayspaceTask) {
+    pub fn handle_task(
+        &mut self,
+        app: &mut AppState,
+        overlays: &mut OverlayWindowManager<OpenXrOverlayData>,
+        task: PlayspaceTask,
+    ) {
         let Some(monado) = &mut app.monado_state else {
             return; // monado not available
         };
 
         match task {
             PlayspaceTask::FixFloor => {
-                self.fix_floor(&app.input_state, &mut monado.ipc);
+                self.fix_floor(app, overlays);
             }
             PlayspaceTask::Reset => {
-                self.reset_offset(&mut monado.ipc);
+                self.reset_offset(app, overlays);
             }
             PlayspaceTask::Recenter => {
-                self.recenter(&app.input_state, &mut monado.ipc);
+                self.recenter(app, overlays);
+            }
+            PlayspaceTask::SaveCenter => {
+                self.save_center(&mut monado.ipc);
+            }
+            PlayspaceTask::ResetCenter => {
+                self.playspace_state.openxr_space_center = Affine3A::IDENTITY;
             }
         }
     }
@@ -74,7 +80,7 @@ impl PlayspaceMover {
             if pointer.now.space_reset {
                 if !pointer.before.space_reset {
                     log::info!("Space reset");
-                    self.reset_offset(&mut monado.ipc);
+                    self.reset_offset(app, overlays);
                 }
                 return;
             }
@@ -83,15 +89,15 @@ impl PlayspaceMover {
         if let Some(mut data) = self.rotate.take() {
             let pointer = &app.input_state.pointers[data.hand];
             if !pointer.now.space_rotate {
-                self.last_transform = data.pose;
                 log::info!("End space rotate");
                 return;
             }
 
+            let pose_quat = Quat::from_affine3(&data.pose);
             let new_hand =
-                Quat::from_affine3(&(data.pose * app.input_state.pointers[data.hand].raw_pose));
+                pose_quat * Quat::from_affine3(&app.input_state.pointers[data.hand].raw_pose);
 
-            let dq = new_hand * data.hand_pose.conjugate();
+            let dq = pose_quat.conjugate() * (new_hand * data.hand_pose.conjugate()) * pose_quat;
             let mut space_transform = if app.session.config.space_rotate_unlocked {
                 Affine3A::from_quat(dq)
             } else {
@@ -114,11 +120,26 @@ impl PlayspaceMover {
             apply_offset(data.pose, &mut monado.ipc);
             self.rotate = Some(data);
         } else {
+            // start space rotate
             for (i, pointer) in app.input_state.pointers.iter().enumerate() {
                 if pointer.now.space_rotate {
-                    let hand_pose = Quat::from_affine3(&(self.last_transform * pointer.raw_pose));
+                    let Ok(pose) = monado
+                        .ipc
+                        .get_reference_space_offset(ReferenceSpaceType::Stage)
+                        .log_err("Could not get reference space offset.")
+                        .map(|p| {
+                            Affine3A::from_rotation_translation(
+                                p.orientation.into(),
+                                p.position.into(),
+                            )
+                        })
+                    else {
+                        return;
+                    };
+
+                    let hand_pose = Quat::from_affine3(&(pose * pointer.raw_pose));
                     self.rotate = Some(MoverData {
-                        pose: self.last_transform,
+                        pose,
                         hand: i,
                         hand_pose,
                     });
@@ -130,53 +151,63 @@ impl PlayspaceMover {
         }
 
         if let Some(mut data) = self.drag.take() {
-            let pointer = &app.input_state.pointers[data.hand];
-            if !pointer.now.space_drag {
-                self.last_transform = data.pose;
-                log::info!("End space drag");
-                return;
-            }
-
             let new_hand = data
                 .pose
                 .transform_point3a(app.input_state.pointers[data.hand].raw_pose.translation);
-
             let relative_pos = if app.session.config.space_drag_unlocked {
                 new_hand - data.hand_pose
             } else {
                 vec3a(0., new_hand.y - data.hand_pose.y, 0.)
             } * app.session.config.space_drag_multiplier;
+            let pointer = &app.input_state.pointers[data.hand];
+
+            if !pointer.now.space_drag {
+                self.gravity.mark_end_drag(
+                    &app.session.config,
+                    relative_pos,
+                    data.pose.translation,
+                    app.delta_time,
+                );
+
+                log::info!("End space drag");
+                return;
+            }
 
             if relative_pos.length_squared() > 1000.0 {
                 log::warn!("Space drag too fast, ignoring");
                 return;
             }
 
-            let overlay_offset = data.pose.inverse().transform_vector3a(relative_pos) * -1.0;
-
-            overlays.values_mut().for_each(|overlay| {
-                let Some(state) = overlay.config.active_state.as_mut() else {
-                    return;
-                };
-                if state.positioning.moves_with_space() {
-                    state.transform.translation += overlay_offset;
-                }
-                overlay.config.dirty = true;
-            });
-
+            let before_pose = data.pose;
             data.pose.translation += relative_pos;
+            if !app.session.config.space_drag_affects_world {
+                playspace_common::shift_world(overlays, &mut app.anchor, &before_pose, &data.pose);
+            }
             data.hand_pose = new_hand;
 
             apply_offset(data.pose, &mut monado.ipc);
             self.drag = Some(data);
         } else {
+            // start space drag
             for (i, pointer) in app.input_state.pointers.iter().enumerate() {
                 if pointer.now.space_drag {
-                    let hand_pos = self
-                        .last_transform
-                        .transform_point3a(pointer.raw_pose.translation);
+                    let Ok(pose) = monado
+                        .ipc
+                        .get_reference_space_offset(ReferenceSpaceType::Stage)
+                        .log_err("Could not get reference space offset.")
+                        .map(|p| {
+                            Affine3A::from_rotation_translation(
+                                p.orientation.into(),
+                                p.position.into(),
+                            )
+                        })
+                    else {
+                        return;
+                    };
+
+                    let hand_pos = pose.transform_point3a(pointer.raw_pose.translation);
                     self.drag = Some(MoverData {
-                        pose: self.last_transform,
+                        pose,
                         hand: i,
                         hand_pose: hand_pos,
                     });
@@ -185,9 +216,31 @@ impl PlayspaceMover {
                 }
             }
         }
+
+        if let Some(res) = self.gravity.update(SpaceGravityUpdateParams {
+            dt: app.delta_time,
+            dragging: self.drag.is_some(),
+            config: &app.session.config,
+            floor_height: app.session.config.space_gravity_floor_height,
+        }) {
+            let prev_playspace_pos = res.playspace_pos - res.playspace_pos_offset;
+            let before_pose = Affine3A::from_translation(prev_playspace_pos.into());
+            let after_pose = Affine3A::from_translation(res.playspace_pos.into());
+            apply_offset(after_pose, &mut monado.ipc);
+
+            playspace_common::shift_world(overlays, &mut app.anchor, &before_pose, &after_pose);
+        }
     }
 
-    pub fn recenter(&mut self, input: &InputState, monado: &mut Monado) {
+    pub fn recenter(
+        &mut self,
+        app: &mut AppState,
+        overlays: &mut OverlayWindowManager<OpenXrOverlayData>,
+    ) {
+        let Some(monado) = &mut app.monado_state else {
+            return;
+        };
+
         if self.drag.is_some() {
             log::info!("Space drag interrupted by recenter");
             self.drag = None;
@@ -197,22 +250,70 @@ impl PlayspaceMover {
             self.rotate = None;
         }
 
+        let input = &app.input_state;
+        let anchor = &mut app.anchor;
+
         let Ok(mut pose) = monado
+            .ipc
             .get_reference_space_offset(ReferenceSpaceType::Stage)
             .inspect_err(|e| log::warn!("Could not recenter due to libmonado error: {e:?}"))
         else {
             return;
         };
 
-        pose.position.x += input.hmd.translation.x;
-        pose.position.z += input.hmd.translation.z;
+        let before =
+            Affine3A::from_rotation_translation(pose.orientation.into(), pose.position.into());
+
+        let cur_rot: Quat = pose.orientation.into();
+        let cur_pos: Vec3 = pose.position.into();
+
+        let mut stage_offset = Affine3A::from_rotation_translation(cur_rot, cur_pos);
+
+        let horiz_hmd_pos = Vec3::new(input.hmd.translation.x, 0.0, input.hmd.translation.z);
+
+        let fwd = input.hmd.transform_vector3a(Vec3A::NEG_Z);
+        let horiz_len_sq = fwd.x.mul_add(fwd.x, fwd.z * fwd.z);
+
+        let hmd_yaw = if horiz_len_sq > f32::EPSILON {
+            let yaw = (-fwd.x).atan2(-fwd.z);
+            Quat::from_rotation_y(yaw)
+        } else {
+            Quat::IDENTITY
+        };
+
+        let recenter_offset = Affine3A::from_rotation_translation(hmd_yaw, horiz_hmd_pos);
+
+        stage_offset *= recenter_offset;
+
+        let (_, new_rot, new_pos) = stage_offset.to_scale_rotation_translation();
+
+        pose.position = new_pos.into();
+
+        if horiz_len_sq > f32::EPSILON {
+            pose.orientation = new_rot.into();
+        }
 
         let _ = monado
+            .ipc
             .set_reference_space_offset(ReferenceSpaceType::Stage, pose)
             .inspect_err(|e| log::warn!("Could not recenter due to libmonado error: {e:?}"));
+
+        self.gravity.reset();
+
+        let after =
+            Affine3A::from_rotation_translation(pose.orientation.into(), pose.position.into());
+        playspace_common::shift_world(overlays, anchor, &before, &after);
     }
 
-    pub fn reset_offset(&mut self, monado: &mut Monado) {
+    pub fn reset_offset(
+        &mut self,
+        app: &mut AppState,
+        overlays: &mut OverlayWindowManager<OpenXrOverlayData>,
+    ) {
+        let Some(monado) = &mut app.monado_state else {
+            return;
+        };
+
         if self.drag.is_some() {
             log::info!("Space drag interrupted by manual reset");
             self.drag = None;
@@ -222,11 +323,34 @@ impl PlayspaceMover {
             self.rotate = None;
         }
 
-        self.last_transform = Affine3A::IDENTITY;
-        apply_offset(self.last_transform, monado);
+        let Ok(pose) = monado
+            .ipc
+            .get_reference_space_offset(ReferenceSpaceType::Stage)
+            .inspect_err(|e| log::warn!("Could not reset offset due to libmonado error: {e:?}"))
+        else {
+            return;
+        };
+
+        let before =
+            Affine3A::from_rotation_translation(pose.orientation.into(), pose.position.into());
+
+        self.gravity.reset();
+        let offset = self.playspace_state.openxr_space_center;
+        apply_offset(offset, &mut monado.ipc);
+
+        let after = offset;
+        playspace_common::shift_world(overlays, &mut app.anchor, &before, &after);
     }
 
-    pub fn fix_floor(&mut self, input: &InputState, monado: &mut Monado) {
+    pub fn fix_floor(
+        &mut self,
+        app: &mut AppState,
+        overlays: &mut OverlayWindowManager<OpenXrOverlayData>,
+    ) {
+        let Some(monado) = &mut app.monado_state else {
+            return;
+        };
+
         if self.drag.is_some() {
             log::info!("Space drag interrupted by fix floor");
             self.drag = None;
@@ -236,22 +360,62 @@ impl PlayspaceMover {
             self.rotate = None;
         }
 
+        let input = &app.input_state;
+        let anchor = &mut app.anchor;
+
         let Ok(mut pose) = monado
+            .ipc
             .get_reference_space_offset(ReferenceSpaceType::Stage)
             .inspect_err(|e| log::warn!("Could not fix floor due to libmonado error: {e:?}"))
         else {
             return;
         };
 
+        let before =
+            Affine3A::from_rotation_translation(pose.orientation.into(), pose.position.into());
+
         let y1 = input.pointers[0].raw_pose.translation.y;
         let y2 = input.pointers[1].raw_pose.translation.y;
         let delta = y1.min(y2) - 0.05;
 
         pose.position.y += delta;
 
+        self.playspace_state.openxr_space_center.translation.y = pose.position.y;
+
         let _ = monado
+            .ipc
             .set_reference_space_offset(ReferenceSpaceType::Stage, pose)
             .inspect_err(|e| log::warn!("Could not fix floor due to libmonado error: {e:?}"));
+
+        let after =
+            Affine3A::from_rotation_translation(pose.orientation.into(), pose.position.into());
+        playspace_common::shift_world(overlays, anchor, &before, &after);
+    }
+
+    pub fn save_center(&mut self, monado: &mut Monado) {
+        if self.drag.is_some() {
+            log::info!("Space drag interrupted by save center");
+            self.drag = None;
+        }
+        if self.rotate.is_some() {
+            log::info!("Space rotate interrupted by save center");
+            self.rotate = None;
+        }
+
+        let Ok(pose) = monado
+            .get_reference_space_offset(ReferenceSpaceType::Stage)
+            .inspect_err(|e| log::warn!("Could not fix floor due to libmonado error: {e:?}"))
+        else {
+            return;
+        };
+
+        let cur_rot: Quat = pose.orientation.into();
+        let cur_pos: Vec3 = pose.position.into();
+
+        let stage_offset = Affine3A::from_rotation_translation(cur_rot, cur_pos);
+        self.playspace_state.openxr_space_center = stage_offset;
+        let _ =
+            save_playspace_state(&self.playspace_state).log_err("Could not save playspace state");
     }
 }
 
diff --git a/wayvr/src/backend/openxr/skybox.rs b/wayvr/src/backend/openxr/skybox.rs
index 06b2e970..21d2e9d5 100644
--- a/wayvr/src/backend/openxr/skybox.rs
+++ b/wayvr/src/backend/openxr/skybox.rs
@@ -23,12 +23,14 @@ use super::{
     swapchain::{WlxSwapchain, create_swapchain},
 };
 
+#[allow(clippy::struct_field_names)]
 pub(super) struct Skybox {
-    view: Arc<ImageView>,
+    view: Option<Arc<ImageView>>,
     sky: Option<WlxSwapchain>,
     grid: Option<WlxSwapchain>,
     grid_pose: xr::Posef,
     grid_color_scale_bias_khr: Option<Box<xr::sys::CompositionLayerColorScaleBiasKHR>>,
+    current_skybox: Arc<str>,
 }
 
 impl Skybox {
@@ -66,14 +68,18 @@ impl Skybox {
             }
         }
 
-        if maybe_image.is_none() {
-            let p = include_bytes!("../../res/table_mountain_2.dds");
-            maybe_image = Some(command_buffer.upload_image_dds(p.as_slice())?);
-        }
+        let current_skybox = if maybe_image.is_some() {
+            app.session.config.skybox_texture.clone()
+        } else {
+            "".into()
+        };
 
-        command_buffer.build_and_execute_now()?;
-
-        let view = ImageView::new_default(maybe_image.unwrap())?; // safe unwrap
+        let view = if let Some(image) = maybe_image {
+            command_buffer.build_and_execute_now()?;
+            Some(ImageView::new_default(image)?)
+        } else {
+            None
+        };
 
         let grid_color_scale_bias_khr = xr
             .instance
@@ -99,9 +105,14 @@ impl Skybox {
             grid: None,
             grid_pose: translation_rotation_to_posef(Vec3A::ZERO, Quat::from_rotation_x(PI * -0.5)),
             grid_color_scale_bias_khr,
+            current_skybox,
         })
     }
 
+    pub(super) fn needs_recreate(&self, app: &AppState) -> bool {
+        *self.current_skybox != *app.session.config.skybox_texture
+    }
+
     fn prepare_sky<'a>(
         &'a mut self,
         xr: &'a XrState,
@@ -113,7 +124,11 @@ impl Skybox {
         }
         let opts = SwapchainOpts::new().immutable();
 
-        let extent = self.view.extent_u32arr();
+        let extent = self
+            .view
+            .as_ref()
+            .map_or([4096, 4096], ExtentExt::extent_u32arr);
+
         let mut swapchain = create_swapchain(xr, app.gfx.clone(), extent, 1, opts)?;
         let tgt = swapchain
             .acquire_wait_image()?
@@ -121,23 +136,42 @@ impl Skybox {
             .into_iter()
             .next()
             .unwrap();
-        let pipeline = app.gfx.create_pipeline(
-            app.gfx_extras.shaders.get("vert_quad").unwrap(), // want panic
-            app.gfx_extras.shaders.get("frag_srgb").unwrap(), // want panic
-            WPipelineCreateInfo::new(app.gfx.surface_format),
-        )?;
 
-        let set0 = pipeline.uniform_sampler(0, self.view.clone(), app.gfx.texture_filter)?;
-        let set1 = pipeline.uniform_buffer_upload(1, vec![1f32])?;
-        let pass = pipeline.create_pass(
-            tgt.extent_f32(),
-            [0.0, 0.0],
-            app.gfx_extras.quad_verts.clone(),
-            0..4,
-            0..1,
-            vec![set0, set1],
-            &Default::default(),
-        )?;
+        let pass = if let Some(view) = self.view.as_ref() {
+            let pipeline = app.gfx.create_pipeline(
+                app.gfx_extras.shaders.get("vert_quad").unwrap(), // want panic
+                app.gfx_extras.shaders.get("frag_srgb").unwrap(), // want panic
+                WPipelineCreateInfo::new(app.gfx.surface_format),
+            )?;
+
+            let set0 = pipeline.uniform_sampler(0, view.clone(), app.gfx.texture_filter)?;
+            let set1 = pipeline.uniform_buffer_upload(1, vec![1f32])?;
+            pipeline.create_pass(
+                tgt.extent_f32(),
+                [0.0, 0.0],
+                app.gfx_extras.quad_verts.clone(),
+                0..4,
+                0..1,
+                vec![set0, set1],
+                &Default::default(),
+            )?
+        } else {
+            let pipeline = app.gfx.create_pipeline(
+                app.gfx_extras.shaders.get("vert_quad").unwrap(), // want panic
+                app.gfx_extras.shaders.get("frag_sky").unwrap(),  // want panic
+                WPipelineCreateInfo::new(app.gfx.surface_format),
+            )?;
+
+            pipeline.create_pass(
+                tgt.extent_f32(),
+                [0.0, 0.0],
+                app.gfx_extras.quad_verts.clone(),
+                0..4,
+                0..1,
+                vec![],
+                &Default::default(),
+            )?
+        };
 
         let mut cmd_buffer = app
             .gfx
diff --git a/wayvr/src/backend/playspace_common.rs b/wayvr/src/backend/playspace_common.rs
new file mode 100644
index 00000000..a0501cfc
--- /dev/null
+++ b/wayvr/src/backend/playspace_common.rs
@@ -0,0 +1,104 @@
+use glam::{Affine3A, Vec3A};
+use wlx_common::config::GeneralConfig;
+
+use crate::windowing::manager::OverlayWindowManager;
+
+pub struct SpaceGravityUpdateParams<'a> {
+    pub dt: f32,
+    pub dragging: bool,
+    pub config: &'a GeneralConfig,
+    pub floor_height: f32,
+}
+
+pub struct SpaceGravity {
+    velocity: Vec3A,
+    space_pos: Vec3A,
+}
+
+pub fn shift_world<OverlayData>(
+    overlays: &mut OverlayWindowManager<OverlayData>,
+    anchor: &mut Affine3A,
+    before: &Affine3A,
+    after: &Affine3A,
+) {
+    let correction = after.inverse() * before;
+    *anchor = correction * *anchor;
+
+    overlays.values_mut().for_each(|overlay| {
+        let Some(state) = overlay.config.active_state.as_mut() else {
+            return;
+        };
+        state.transform = correction * state.transform;
+        overlay.config.dirty = true;
+    });
+}
+
+pub struct SpaceGravityUpdateResult {
+    pub playspace_pos: Vec3A,
+    pub playspace_pos_offset: Vec3A, // position difference compared to previous update() call
+}
+
+impl SpaceGravity {
+    pub fn new() -> Self {
+        Self {
+            velocity: Vec3A::default(),
+            space_pos: Vec3A::default(),
+        }
+    }
+
+    pub fn mark_end_drag(
+        &mut self,
+        config: &GeneralConfig,
+        hand_pos_diff: Vec3A,
+        space_pos: Vec3A,
+        dt: f32,
+    ) {
+        if config.space_gravity_enabled {
+            self.velocity = hand_pos_diff * config.space_gravity_fling_strength / dt;
+            self.space_pos = space_pos;
+        } else {
+            self.reset();
+        }
+    }
+
+    pub fn reset(&mut self) {
+        self.velocity = Vec3A::default();
+        self.space_pos = Vec3A::default();
+    }
+
+    pub fn update(&mut self, par: SpaceGravityUpdateParams) -> Option<SpaceGravityUpdateResult> {
+        if par.dragging || !par.config.space_gravity_enabled {
+            return None;
+        }
+
+        let prev_pos = self.space_pos;
+
+        self.velocity.y += par.config.space_gravity_gravity * par.dt;
+
+        // terminal velocity
+        self.velocity.y = self.velocity.y.min(200.0);
+
+        self.velocity *= (par.config.space_gravity_damping).powf(par.dt * 10.0);
+
+        self.space_pos += self.velocity * par.dt;
+
+        self.space_pos.y = self.space_pos.y.min(par.floor_height);
+
+        if self.space_pos.y >= par.floor_height
+        /* at floor height or below */
+        {
+            // apply ground friction
+            self.velocity *= 1.0 - par.config.space_gravity_ground_friction * par.dt * 10.0;
+        }
+
+        if self.velocity.length_squared() > 0.00003 {
+            // Space position changed
+            return Some(SpaceGravityUpdateResult {
+                playspace_pos: self.space_pos,
+                playspace_pos_offset: self.space_pos - prev_pos,
+            });
+        }
+
+        None
+    }
+}
diff --git a/wayvr/src/backend/task.rs b/wayvr/src/backend/task.rs
index 002881e5..c2885ed7 100644
--- a/wayvr/src/backend/task.rs
+++ b/wayvr/src/backend/task.rs
@@ -56,13 +56,15 @@ pub enum OpenVrTask {
 
 #[cfg(feature = "openxr")]
 pub enum OpenXrTask {
-    SettingsChanged,
+    EnvironmentChanged,
 }
 
 pub enum PlayspaceTask {
     Recenter,
     Reset,
     FixFloor,
+    SaveCenter,
+    ResetCenter,
 }
 
 #[derive(Debug, Clone)]
@@ -85,12 +87,29 @@ pub struct ModifyPanelTask {
     pub command: ModifyPanelCommand,
 }
 
+#[derive(Clone, Copy)]
 pub enum ToggleMode {
     EnsureOn,
     EnsureOff,
     Toggle,
 }
 
+#[derive(Clone)]
+pub enum SpawnPos {
+    /// Always spawn at the designated pos
+    Fixed,
+    /// Automatically spread out for user experience
+    Spread,
+    /// Spawn relative to a different overlay
+    Parent(OverlaySelector),
+}
+
+pub enum GlobalChange {
+    Settings,
+    Keyboard,
+    ColorPalette,
+}
+
 pub type ModifyOverlayTask = dyn FnOnce(&mut AppState, &mut OverlayWindowConfig) + Send;
 pub type CreateOverlayTask = dyn FnOnce(&mut AppState) -> Option<OverlayWindowConfig> + Send;
 pub enum OverlayTask {
@@ -99,21 +118,24 @@ pub enum OverlayTask {
     SwitchSet(Option<usize>),
     ToggleOverlay(OverlaySelector, ToggleMode),
     ResetOverlay(OverlaySelector),
+    ResizeOverlay(OverlaySelector, [u32; 2]),
     DeleteActiveSet,
     ToggleEditMode,
     ToggleDashboard,
     ShowHide,
     CleanupMirrors,
-    SettingsChanged,
-    KeyboardChanged,
+    GlobalChange(GlobalChange),
     Modify(OverlaySelector, Box<ModifyOverlayTask>),
-    Create(OverlaySelector, Box<CreateOverlayTask>),
+    Spawn(OverlaySelector, SpawnPos, Box<CreateOverlayTask>),
     ModifyPanel(ModifyPanelTask),
     Drop(OverlaySelector),
 }
 
+pub type GlobalTask = dyn FnOnce(&mut AppState) + Send;
+
 #[allow(dead_code)]
 pub enum TaskType {
+    Global(Box<GlobalTask>),
     Input(InputTask),
     Overlay(OverlayTask),
     Playspace(PlayspaceTask),
diff --git a/wayvr/src/backend/wayvr/client.rs b/wayvr/src/backend/wayvr/client.rs
index 662eee26..d8118bb0 100644
--- a/wayvr/src/backend/wayvr/client.rs
+++ b/wayvr/src/backend/wayvr/client.rs
@@ -1,14 +1,26 @@
-use std::{io::Read, os::unix::net::UnixStream, path::PathBuf, sync::Arc};
+use std::{
+    io::Read,
+    os::unix::net::UnixStream,
+    path::PathBuf,
+    process::{Child, Command},
+    sync::Arc,
+};
 
 use anyhow::Context;
+use glam::{DVec2, Vec2};
+use slotmap::DenseSlotMap;
 use smithay::{
-    backend::input::Keycode,
-    input::{keyboard::KeyboardHandle, pointer::PointerHandle},
-    reexports::wayland_server,
-    utils::SerialCounter,
+    backend::input::{Axis, AxisSource, ButtonState, Keycode},
+    input::{
+        keyboard::KeyboardHandle,
+        pointer::{AxisFrame, ButtonEvent, MotionEvent, PointerHandle, RelativeMotionEvent},
+    },
+    reexports::wayland_server::{self, protocol::wl_surface::WlSurface},
+    utils::{Logical, Point, SerialCounter},
 };
 use smithay::input::Seat;
 use smithay::wayland::selection::data_device::set_data_device_selection;
+use wgui::log::LogErr;
 use xkbcommon::xkb;
 
 use crate::backend::wayvr::{ExternalProcessRequest, WayVRTask};
@@ -32,14 +44,29 @@ pub struct WayVRCompositor {
     pub serial_counter: SerialCounter,
     pub wayland_env: super::WaylandEnv,
 
+    xwayland_satellite: Option<Child>,
+
     display: wayland_server::Display<comp::Application>,
     listener: wayland_server::ListeningSocket,
 
-    toplevel_surf_count: u32, // for logging purposes
+    toplevel_surf_count: u32,     // for logging purposes
+    scroll_accumulator: [f32; 2], // turn smooth scroll into discrete scroll
 
     pub clients: Vec<WayVRClient>,
 }
 
+impl Drop for WayVRCompositor {
+    fn drop(&mut self) {
+        if let Some(mut child) = self.xwayland_satellite.take() {
+            unsafe {
+                libc::kill(child.id() as i32, libc::SIGKILL);
+            }
+            // reap the pid
+            let _ = child.wait();
+        }
+    }
+}
+
 fn get_wayvr_env_from_pid(pid: i32) -> anyhow::Result<ProcessWayVREnv> {
     let path = format!("/proc/{pid}/environ");
     let mut env_data = String::new();
@@ -75,17 +102,28 @@ impl WayVRCompositor {
     ) -> anyhow::Result<Self> {
         let (wayland_env, listener) = create_wayland_listener()?;
 
+        let xwayland_satellite = Command::new(bundled_executable("xwayland-satellite"))
+            .arg(wayland_env.display_num_string())
+            .env("WAYLAND_DISPLAY", wayland_env.wayland_display_num_string())
+            .spawn()
+            .log_warn(
+                "Could not start xwayland-satellite. Xwayland apps will not work in native mode",
+            )
+            .ok();
+
         Ok(Self {
             state,
             display,
             seat_keyboard,
             seat_pointer,
             listener,
+            xwayland_satellite,
             wayland_env,
             serial_counter: SerialCounter::new(),
             clients: Vec::new(),
             toplevel_surf_count: 0,
             seat,
+            scroll_accumulator: [0.0, 0.0],
         })
     }
 
@@ -114,7 +152,7 @@ impl WayVRCompositor {
     fn accept_connection(
         &mut self,
         stream: UnixStream,
-        processes: &mut process::ProcessVec,
+        processes: &mut DenseSlotMap<process::ProcessHandle, process::Process>,
     ) -> anyhow::Result<()> {
         let client = self
             .display
@@ -122,13 +160,13 @@ impl WayVRCompositor {
             .insert_client(stream, Arc::new(comp::ClientState::default()))
             .unwrap();
 
-        let creds = client.get_credentials(&self.display.handle())?;
+        let credentials = client.get_credentials(&self.display.handle())?;
 
-        let process_env = get_wayvr_env_from_pid(creds.pid)?;
+        let process_env = get_wayvr_env_from_pid(credentials.pid)?;
 
         // Find suitable auth key from the process list
-        for p in processes.vec.iter().flatten() {
-            if let process::Process::Managed(process) = &p.obj
+        for (_, process) in processes {
+            if let process::Process::Managed(process) = &process
                 && let Some(auth_key) = &process_env.display_auth
             {
                 // Find process with matching auth key
@@ -136,7 +174,7 @@ impl WayVRCompositor {
                     // Add client
                     self.add_client(WayVRClient {
                         client,
-                        pid: creds.pid as u32,
+                        pid: credentials.pid as u32,
                     });
                     return Ok(());
                 }
@@ -147,7 +185,7 @@ impl WayVRCompositor {
         // Treat external processes exclusively (spawned by the user or external program)
         log::warn!(
             "External process ID {} connected to this Wayland server",
-            creds.pid
+            credentials.pid
         );
 
         self.state
@@ -155,13 +193,16 @@ impl WayVRCompositor {
             .send(WayVRTask::NewExternalProcess(ExternalProcessRequest {
                 env: process_env,
                 client,
-                pid: creds.pid as u32,
+                pid: credentials.pid as u32,
             }));
 
         Ok(())
     }
 
-    fn accept_connections(&mut self, processes: &mut process::ProcessVec) -> anyhow::Result<()> {
+    fn accept_connections(
+        &mut self,
+        processes: &mut DenseSlotMap<process::ProcessHandle, process::Process>,
+    ) -> anyhow::Result<()> {
         if let Some(stream) = self.listener.accept()?
             && let Err(e) = self.accept_connection(stream, processes)
         {
@@ -171,7 +212,10 @@ impl WayVRCompositor {
         Ok(())
     }
 
-    pub fn tick_wayland(&mut self, processes: &mut process::ProcessVec) -> anyhow::Result<()> {
+    pub fn tick_wayland(
+        &mut self,
+        processes: &mut DenseSlotMap<process::ProcessHandle, process::Process>,
+    ) -> anyhow::Result<()> {
         if let Err(e) = self.accept_connections(processes) {
             log::error!("accept_connections failed: {e}");
         }
@@ -200,11 +244,26 @@ impl WayVRCompositor {
             Keycode::new(virtual_key),
             state,
             self.serial_counter.next_serial(),
-            0,
+            super::time::get_millis() as u32,
             |_, _, _| smithay::input::keyboard::FilterResult::Forward,
         );
     }
 
+    pub fn release_all_keys(&mut self) {
+        let pressed = self.seat_keyboard.pressed_keys();
+
+        for keycode in pressed {
+            self.seat_keyboard.input::<(), _>(
+                &mut self.state,
+                keycode,
+                smithay::backend::input::KeyState::Released,
+                self.serial_counter.next_serial(),
+                super::time::get_millis() as u32,
+                |_, _, _| smithay::input::keyboard::FilterResult::Forward,
+            );
+        }
+    }
+
     pub fn set_clipboard_text(&mut self, text: String) {
         set_data_device_selection::<Application>(
             &self.state.display_handle,
@@ -222,6 +281,146 @@ impl WayVRCompositor {
             )
             .context("Failed to set keymap")
     }
+
+    pub fn send_mouse_move(
+        &mut self,
+        focus: Option<(WlSurface, Vec2)>,
+        global_pos: DVec2,
+        delta: DVec2,
+        delta_unaccel: DVec2,
+    ) {
+        let location: Point<f64, Logical> = (global_pos.x as f64, global_pos.y as f64).into();
+        let delta: Point<f64, Logical> = (delta.x, delta.y).into();
+        let delta_unaccel: Point<f64, Logical> = (delta_unaccel.x, delta_unaccel.y).into();
+
+        let focus = focus.map(|(surface, origin)| {
+            let focus_location: Point<f64, Logical> = (origin.x as f64, origin.y as f64).into();
+
+            (surface, focus_location)
+        });
+
+        self.seat_pointer.motion(
+            &mut self.state,
+            focus.clone(),
+            &MotionEvent {
+                location,
+                serial: self.serial_counter.next_serial(),
+                time: super::time::get_millis() as u32,
+            },
+        );
+        self.seat_pointer.relative_motion(
+            &mut self.state,
+            focus,
+            &RelativeMotionEvent {
+                delta,
+                delta_unaccel,
+                utime: super::time::get_millis(),
+            },
+        );
+
+        self.seat_pointer.frame(&mut self.state);
+    }
+
+    pub fn send_pointer_button(&mut self, index: super::MouseIndex, pressed: bool) {
+        let state = if pressed {
+            ButtonState::Pressed
+        } else {
+            ButtonState::Released
+        };
+
+        let serial = self.serial_counter.next_serial();
+        let time = super::time::get_millis() as u32;
+        let button = match index {
+            super::MouseIndex::Left => 0x110,
+            super::MouseIndex::Center => 0x112,
+            super::MouseIndex::Right => 0x111,
+        };
+
+        self.seat_pointer.button(
+            &mut self.state,
+            &ButtonEvent {
+                serial,
+                time,
+                button,
+                state,
+            },
+        );
+
+        self.seat_pointer.frame(&mut self.state);
+    }
+
+    pub fn send_pointer_axis_wheel_raw(&mut self, delta: super::WheelDelta) {
+        let time = super::time::get_millis() as u32;
+
+        let v120_x = delta.x as i32;
+        let v120_y = delta.y as i32;
+
+        if v120_x == 0 && v120_y == 0 {
+            return;
+        }
+
+        // 15 logical axis units for one wheel detent of 120 v120 units
+        const AXIS_VALUE_PER_DETENT: f64 = 15.0;
+
+        let mut frame = AxisFrame::new(time).source(AxisSource::Wheel);
+
+        if v120_x != 0 {
+            frame = frame
+                .value(
+                    Axis::Horizontal,
+                    f64::from(v120_x) / 120.0 * AXIS_VALUE_PER_DETENT,
+                )
+                .v120(Axis::Horizontal, v120_x);
+        }
+
+        if v120_y != 0 {
+            frame = frame
+                .value(
+                    Axis::Vertical,
+                    f64::from(v120_y) / 120.0 * AXIS_VALUE_PER_DETENT,
+                )
+                .v120(Axis::Vertical, v120_y);
+        }
+
+        self.seat_pointer.axis(&mut self.state, frame);
+        self.seat_pointer.frame(&mut self.state);
+    }
+
+    pub fn send_pointer_axis_wheel_accumulated(&mut self, delta: super::WheelDelta) {
+        let time = super::time::get_millis() as u32;
+
+        let multiplier = 32.0;
+        let delta_x = (delta.x * multiplier) as i32;
+        let delta_y = (-delta.y * multiplier) as i32;
+
+        if delta_x == 0 && delta_y == 0 {
+            return;
+        }
+
+        let steps_x = accumulate_discrete_scroll(&mut self.scroll_accumulator[0], delta_x);
+        let steps_y = accumulate_discrete_scroll(&mut self.scroll_accumulator[1], delta_y);
+
+        let mut frame = AxisFrame::new(time).source(AxisSource::Wheel);
+
+        if delta_x != 0 {
+            frame = frame.value(Axis::Horizontal, delta_x as f64 / 8.0);
+
+            if steps_x != 0 {
+                frame = frame.v120(Axis::Horizontal, steps_x * 120);
+            }
+        }
+
+        if delta_y != 0 {
+            frame = frame.value(Axis::Vertical, delta_y as f64 / 8.0);
+
+            if steps_y != 0 {
+                frame = frame.v120(Axis::Vertical, steps_y * 120);
+            }
+        }
+
+        self.seat_pointer.axis(&mut self.state, frame);
+        self.seat_pointer.frame(&mut self.state);
+    }
 }
 
 const STARTING_WAYLAND_ADDR_IDX: u32 = 20;
@@ -241,7 +440,7 @@ fn create_wayland_listener() -> anyhow::Result<(super::WaylandEnv, wayland_serve
     };
 
     let listener = loop {
-        let display_str = env.display_num_string();
+        let display_str = env.wayland_display_num_string();
         log::debug!("Trying to open socket \"{display_str}\"");
         match wayland_server::ListeningSocket::bind(display_str.as_str()) {
             Ok(listener) => {
@@ -268,3 +467,25 @@ fn create_wayland_listener() -> anyhow::Result<(super::WaylandEnv, wayland_serve
 
     Ok((env, listener))
 }
+
+fn accumulate_discrete_scroll(acc: &mut f32, delta_v120: i32) -> i32 {
+    const WHEEL_DETENT_V120: f32 = 120.0;
+    *acc += delta_v120 as f32;
+    let steps = (*acc / WHEEL_DETENT_V120).trunc() as i32;
+    if steps != 0 {
+        *acc -= steps as f32 * WHEEL_DETENT_V120;
+        if acc.abs() < 0.001 {
+            *acc = 0.0;
+        }
+    }
+
+    steps
+}
+
+/// Runs executable from APPDIR, falling back to PATH
+fn bundled_executable(name: impl AsRef<std::path::Path>) -> PathBuf {
+    match std::env::var_os("APPDIR") {
+        Some(appdir) => PathBuf::from(appdir).join("usr").join("bin").join(name),
+        None => PathBuf::from(name.as_ref()),
+    }
+}
diff --git a/wayvr/src/backend/wayvr/comp.rs b/wayvr/src/backend/wayvr/comp.rs
index 1a80a1ec..2ee26305 100644
--- a/wayvr/src/backend/wayvr/comp.rs
+++ b/wayvr/src/backend/wayvr/comp.rs
@@ -1,84 +1,111 @@
 use anyhow::Context;
 use smithay::backend::allocator::dmabuf::Dmabuf;
 use smithay::backend::renderer::{BufferType, buffer_type};
-use smithay::desktop::{PopupKind, PopupManager};
+use smithay::desktop::{
+    PopupKeyboardGrab, PopupKind, PopupManager, PopupPointerGrab, PopupUngrabStrategy,
+    find_popup_root_surface, get_popup_toplevel_coords,
+};
+use smithay::input::pointer::{CursorImageStatus, Focus};
 use smithay::input::{Seat, SeatHandler, SeatState};
+use smithay::output::Output;
 use smithay::reexports::rustix::fs::{OFlags, fcntl_setfl};
 use smithay::reexports::wayland_protocols::xdg::decoration::zv1::server::zxdg_toplevel_decoration_v1;
 use smithay::reexports::wayland_protocols::xdg::shell::server::xdg_toplevel;
 use smithay::reexports::wayland_protocols_misc::server_decoration::server::org_kde_kwin_server_decoration;
 use smithay::reexports::wayland_server::Resource;
-use smithay::reexports::wayland_server::protocol::{wl_buffer, wl_output, wl_seat};
+use smithay::reexports::wayland_server::backend::ObjectId;
+use smithay::reexports::wayland_server::protocol::{wl_buffer, wl_callback, wl_output, wl_seat};
 use smithay::reexports::wayland_server::{self, DisplayHandle};
+use smithay::utils::{Logical, Rectangle, Serial, Size};
 use smithay::wayland::buffer::BufferHandler;
+use smithay::wayland::compositor::{self, BufferAssignment, SurfaceAttributes, send_surface_state};
 use smithay::wayland::dmabuf::{
     DmabufFeedback, DmabufGlobal, DmabufHandler, DmabufState, ImportNotifier, get_dmabuf,
 };
 use smithay::wayland::fractional_scale::with_fractional_scale;
 use smithay::wayland::output::OutputHandler;
+use smithay::wayland::relative_pointer::RelativePointerManagerState;
+use smithay::wayland::selection::data_device::{
+    ClientDndGrabHandler, DataDeviceHandler, DataDeviceState, ServerDndGrabHandler,
+    set_data_device_focus, set_data_device_selection,
+};
+use smithay::wayland::selection::{self, SelectionHandler};
 use smithay::wayland::selection::{
     ext_data_control as selection_ext,
     primary_selection::{PrimarySelectionHandler, PrimarySelectionState, set_primary_focus},
     wlr_data_control as selection_wlr,
 };
 use smithay::wayland::shell::kde::decoration::{KdeDecorationHandler, KdeDecorationState};
-use smithay::wayland::shell::xdg::decoration::XdgDecorationHandler;
+use smithay::wayland::shell::xdg::decoration::{XdgDecorationHandler, XdgDecorationState};
+use smithay::wayland::shell::xdg::{
+    PopupSurface, PositionerState, ToplevelSurface, XdgShellHandler, XdgShellState,
+};
 use smithay::wayland::shm::{ShmHandler, ShmState, with_buffer_contents};
 use smithay::wayland::single_pixel_buffer::get_single_pixel_buffer;
+use smithay::wayland::viewporter::ViewporterState;
 use smithay::{
     delegate_compositor, delegate_data_control, delegate_data_device, delegate_dmabuf,
     delegate_ext_data_control, delegate_kde_decoration, delegate_output,
-    delegate_primary_selection, delegate_seat, delegate_shm, delegate_single_pixel_buffer,
-    delegate_xdg_decoration, delegate_xdg_shell,
+    delegate_primary_selection, delegate_relative_pointer, delegate_seat, delegate_shm,
+    delegate_single_pixel_buffer, delegate_viewporter, delegate_xdg_decoration, delegate_xdg_shell,
 };
-use std::collections::HashSet;
+use std::collections::{HashMap, HashSet};
 use std::fs::File;
 use std::io::Write;
 use std::os::fd::OwnedFd;
 use std::sync::{Arc, Mutex};
-
-use smithay::utils::Serial;
-use smithay::wayland::compositor::{self, BufferAssignment, SurfaceAttributes, send_surface_state};
-
-use smithay::wayland::selection::data_device::{
-    ClientDndGrabHandler, DataDeviceHandler, DataDeviceState, ServerDndGrabHandler,
-    set_data_device_focus,
-};
-use smithay::wayland::selection::{self, SelectionHandler};
-use smithay::wayland::shell::xdg::{
-    PopupSurface, PositionerState, ToplevelSurface, XdgShellHandler, XdgShellState,
-};
 use wayland_server::Client;
 use wayland_server::backend::{ClientData, ClientId, DisconnectReason};
 use wayland_server::protocol::wl_surface::WlSurface;
 
 use crate::backend::wayvr::image_importer::ImageImporter;
-use crate::backend::wayvr::{SurfaceBufWithImage, time};
+use crate::backend::wayvr::{SurfaceBufWithImage, WAYVR_SCREEN_RES, time};
+use crate::graphics::ExtentExt;
 use crate::ipc::event_queue::SyncEventQueue;
 
 use super::WayVRTask;
 
 pub struct Application {
+    pub output: Output,
     pub image_importer: ImageImporter,
     pub dmabuf_state: (DmabufState, DmabufGlobal, Option<DmabufFeedback>),
     pub compositor: compositor::CompositorState,
     pub xdg_shell: XdgShellState,
+    pub seat: Seat<Application>,
     pub seat_state: SeatState<Application>,
     pub shm: ShmState,
     pub data_device: DataDeviceState,
     pub primary_selection_state: PrimarySelectionState,
     pub ext_data_control_state: selection_ext::DataControlState,
     pub wlr_data_control_state: selection_wlr::DataControlState,
+    #[allow(dead_code)]
+    pub xdg_decoration_state: XdgDecorationState,
     pub kde_decoration_state: KdeDecorationState,
+    #[allow(dead_code)]
+    pub relative_pointer_state: RelativePointerManagerState,
     pub wayvr_tasks: SyncEventQueue<WayVRTask>,
-    pub redraw_requests: HashSet<wayland_server::backend::ObjectId>,
     pub popup_manager: PopupManager,
+    #[allow(dead_code)]
+    pub viewporter: ViewporterState,
     pub display_handle: DisplayHandle,
+    pub redraw_requests: HashSet<ObjectId>,
+    pub pending_frame_callbacks: HashMap<ObjectId, Vec<wl_callback::WlCallback>>,
+    pub cursor_image: CursorImageStatus,
 }
 
 impl Application {
     pub fn cleanup(&mut self) {
         self.image_importer.cleanup();
+        self.output.cleanup();
+    }
+
+    pub fn set_clipboard_text(&mut self, content: &str) {
+        let mime_types = vec![
+            "text/plain;charset=utf-8".to_string(),
+            "text/plain".to_string(),
+        ];
+        let user_data = Arc::from(content.as_bytes());
+        set_data_device_selection(&self.display_handle, &self.seat, mime_types, user_data);
     }
 
     fn popups_commit(&mut self, surface: &WlSurface) {
@@ -108,6 +135,82 @@ impl Application {
             }
         }
     }
+
+    fn send_initial_surface_state(&self, surface: &WlSurface) {
+        self.output.enter(surface);
+
+        smithay::wayland::compositor::with_states(surface, |states| {
+            send_surface_state(surface, states, 1, smithay::utils::Transform::Normal);
+
+            with_fractional_scale(states, |fractional| {
+                fractional.set_preferred_scale(1.0);
+            });
+        });
+    }
+
+    pub fn send_frame_callbacks_for_surface_id(&mut self, surface_id: &ObjectId) {
+        let Some(callbacks) = self.pending_frame_callbacks.remove(surface_id) else {
+            return;
+        };
+
+        let t = time::get_millis() as u32;
+        for cb in callbacks {
+            cb.done(t);
+        }
+    }
+
+    pub fn has_pending_frame_callbacks(
+        &self,
+        surface_id: &wayland_server::backend::ObjectId,
+    ) -> bool {
+        self.pending_frame_callbacks
+            .get(surface_id)
+            .is_some_and(|v| !v.is_empty())
+    }
+
+    pub fn take_redraw_request(&mut self, surface_id: &ObjectId) -> bool {
+        self.redraw_requests.remove(surface_id)
+    }
+
+    pub fn output_logical_size(&self) -> Size<i32, Logical> {
+        self.output
+            .current_mode()
+            .map(|mode| Size::new(mode.size.w, mode.size.h))
+            .unwrap_or_else(|| Size::new(WAYVR_SCREEN_RES[0], WAYVR_SCREEN_RES[1]))
+    }
+
+    fn surface_logical_size(surface: &WlSurface) -> Option<Size<i32, Logical>> {
+        smithay::wayland::compositor::with_states(surface, |states| {
+            SurfaceBufWithImage::get_from_surface(states).map(|buf| {
+                let extent = buf.image.extent_u32arr();
+                let scale = buf.scale.max(1) as u32;
+
+                Size::new((extent[0] / scale) as i32, (extent[1] / scale) as i32)
+            })
+        })
+    }
+
+    fn constrain_popup(&self, popup: &PopupSurface) {
+        let popup_kind = PopupKind::Xdg(popup.clone());
+
+        let Ok(root_surface) = find_popup_root_surface(&popup_kind) else {
+            log::warn!(
+                "constrain_popup: could not find popup root surface {:?}",
+                popup.wl_surface().id()
+            );
+            return;
+        };
+
+        let root_size =
+            Self::surface_logical_size(&root_surface).unwrap_or_else(|| self.output_logical_size());
+
+        let mut target = Rectangle::from_size(root_size);
+        target.loc -= get_popup_toplevel_coords(&popup_kind);
+
+        popup.with_pending_state(|state| {
+            state.geometry = state.positioner.get_unconstrained_geometry(target);
+        });
+    }
 }
 
 impl compositor::CompositorHandler for Application {
@@ -135,12 +238,9 @@ impl compositor::CompositorHandler for Application {
                     match buffer_type(&buffer) {
                         Some(BufferType::Dma) => {
                             let dmabuf = get_dmabuf(&buffer).unwrap(); // always Ok due to buffer_type
-                            if let Ok(image) = self
-                                .image_importer
-                                .get_or_import_dmabuf(dmabuf.clone())
-                                .inspect_err(|e| {
-                                    log::warn!("wayland_server failed to import DMA-buf: {e:?}");
-                                })
+
+                            if let Ok(image) =
+                                self.image_importer.get_or_import_dmabuf(dmabuf.clone())
                             {
                                 let sbwi = SurfaceBufWithImage {
                                     image,
@@ -150,7 +250,14 @@ impl compositor::CompositorHandler for Application {
                                     scale: attrs.buffer_scale,
                                     dmabuf: true,
                                 };
-                                sbwi.apply_to_surface(states);
+
+                                if let Some(old_buffer) =
+                                    sbwi.apply_to_surface(states, Some(buffer.clone()))
+                                {
+                                    old_buffer.release();
+                                }
+                            } else {
+                                buffer.release();
                             }
                         }
                         Some(BufferType::Shm) => {
@@ -170,9 +277,10 @@ impl compositor::CompositorHandler for Application {
                                         scale: attrs.buffer_scale,
                                         dmabuf: false,
                                     };
-                                    sbwi.apply_to_surface(states);
+                                    sbwi.apply_to_surface(states, None);
                                 }
                             });
+                            buffer.release();
                         }
                         Some(BufferType::SinglePixel) => {
                             let spb = get_single_pixel_buffer(&buffer).unwrap(); // always Ok
@@ -190,21 +298,23 @@ impl compositor::CompositorHandler for Application {
                                     scale: attrs.buffer_scale,
                                     dmabuf: false,
                                 };
-                                sbwi.apply_to_surface(states);
+                                sbwi.apply_to_surface(states, None);
                             }
+                            buffer.release();
                         }
                         Some(other) => log::warn!("Unsupported wl_buffer format: {other:?}"),
                         None => { /* don't draw anything */ }
                     }
-                    buffer.release();
                 }
                 Some(BufferAssignment::Removed) | None => {}
             }
 
-            let t = time::get_millis() as u32;
             let callbacks = std::mem::take(&mut attrs.frame_callbacks);
-            for cb in callbacks {
-                cb.done(t);
+            if !callbacks.is_empty() {
+                self.pending_frame_callbacks
+                    .entry(surface.id())
+                    .or_default()
+                    .extend(callbacks);
             }
         });
 
@@ -228,11 +338,8 @@ impl SeatHandler for Application {
         set_primary_focus(dh, seat, client);
     }
 
-    fn cursor_image(
-        &mut self,
-        _seat: &Seat<Self>,
-        _image: smithay::input::pointer::CursorImageStatus,
-    ) {
+    fn cursor_image(&mut self, _seat: &Seat<Self>, image: CursorImageStatus) {
+        self.cursor_image = image;
     }
 }
 
@@ -313,17 +420,17 @@ impl XdgShellHandler for Application {
     }
 
     fn new_toplevel(&mut self, surface: ToplevelSurface) {
-        if let Some(client) = surface.wl_surface().client() {
+        let wl_surface = surface.wl_surface();
+        self.send_initial_surface_state(wl_surface);
+        if let Some(client) = wl_surface.client() {
             self.wayvr_tasks
                 .send(WayVRTask::NewToplevel(client.id(), surface.clone()));
         }
-        surface.with_pending_state(|state| {
-            state.states.set(xdg_toplevel::State::Activated);
-        });
-        surface.send_configure();
     }
 
     fn toplevel_destroyed(&mut self, surface: ToplevelSurface) {
+        self.output.leave(surface.wl_surface());
+
         if let Some(client) = surface.wl_surface().client() {
             self.wayvr_tasks
                 .send(WayVRTask::DropToplevel(client.id(), surface.clone()));
@@ -331,6 +438,8 @@ impl XdgShellHandler for Application {
     }
 
     fn new_popup(&mut self, surface: PopupSurface, _positioner: PositionerState) {
+        self.constrain_popup(&surface);
+
         let _ = self
             .popup_manager
             .track_popup(PopupKind::Xdg(surface))
@@ -342,49 +451,130 @@ impl XdgShellHandler for Application {
         self.popup_manager.cleanup();
     }
 
-    fn grab(&mut self, _surface: PopupSurface, _seat: wl_seat::WlSeat, _serial: Serial) {
-        // Handle popup grab here
+    fn grab(&mut self, surface: PopupSurface, seat: wl_seat::WlSeat, serial: Serial) {
+        log::info!(
+            "xdg_popup.grab: surface={:?} serial={:?}",
+            surface.wl_surface().id(),
+            serial
+        );
+
+        let popup = PopupKind::Xdg(surface.clone());
+
+        let Ok(root_surface) = find_popup_root_surface(&popup) else {
+            log::warn!("xdg_popup.grab: could not find popup root surface");
+            return;
+        };
+
+        let Some(seat) = Seat::<Application>::from_resource(&seat) else {
+            log::warn!("xdg_popup.grab: unknown seat");
+            return;
+        };
+
+        let root_focus = root_surface;
+
+        let Ok(mut grab) = self
+            .popup_manager
+            .grab_popup::<Application>(root_focus, popup, &seat, serial)
+        else {
+            log::debug!("xdg_popup.grab denied");
+            return;
+        };
+
+        if let Some(keyboard) = seat.get_keyboard() {
+            if keyboard.is_grabbed()
+                && !(keyboard.has_grab(serial)
+                    || keyboard.has_grab(grab.previous_serial().unwrap_or(serial)))
+            {
+                grab.ungrab(PopupUngrabStrategy::All);
+                return;
+            }
+
+            keyboard.set_focus(self, grab.current_grab(), serial);
+            keyboard.set_grab(self, PopupKeyboardGrab::new(&grab), serial);
+        }
+
+        if let Some(pointer) = seat.get_pointer() {
+            if pointer.is_grabbed()
+                && !(pointer.has_grab(serial)
+                    || pointer.has_grab(grab.previous_serial().unwrap_or_else(|| grab.serial())))
+            {
+                grab.ungrab(PopupUngrabStrategy::All);
+                return;
+            }
+
+            pointer.set_grab(self, PopupPointerGrab::new(&grab), serial, Focus::Keep);
+        }
     }
 
     fn reposition_request(
         &mut self,
-        _surface: PopupSurface,
-        _positioner: PositionerState,
-        _token: u32,
+        surface: PopupSurface,
+        positioner: PositionerState,
+        token: u32,
     ) {
-        // Handle popup reposition here
+        surface.with_pending_state(|state| {
+            state.geometry = positioner.get_geometry();
+            state.positioner = positioner;
+        });
+
+        self.constrain_popup(&surface);
+        surface.send_repositioned(token);
     }
 
-    // If the app wants to be fullscreen, make it think that it's fullscreen.
+    // If the app requests fullscreen, make it fill the virtual output
     fn fullscreen_request(
         &mut self,
         surface: ToplevelSurface,
         _output: Option<wl_output::WlOutput>,
     ) {
+        let size = self.output_logical_size();
+
         surface.with_pending_state(|state| {
+            state.bounds = Some(size);
+            state.size = Some(size);
             state.states.set(xdg_toplevel::State::Fullscreen);
         });
+
         surface.send_configure();
     }
-    fn unfullscreen_request(&mut self, surface: ToplevelSurface) {
-        surface.with_pending_state(|state| {
-            state.states.unset(xdg_toplevel::State::Fullscreen);
-        });
-        surface.send_configure();
-    }
-    // If the app wants to be maximized, make it think that it's maximized.
+
+    // If the app requests maximize, make it fill the virtual output
     fn maximize_request(&mut self, surface: ToplevelSurface) {
+        let size = self.output_logical_size();
+
         surface.with_pending_state(|state| {
+            state.bounds = Some(size);
+            state.size = Some(size);
             state.states.set(xdg_toplevel::State::Maximized);
         });
+
         surface.send_configure();
     }
-    fn unmaximize_request(&mut self, surface: ToplevelSurface) {
+
+    fn unfullscreen_request(&mut self, surface: ToplevelSurface) {
+        let bounds = self.output_logical_size();
+
         surface.with_pending_state(|state| {
+            state.bounds = Some(bounds);
+            state.size = None;
+            state.states.unset(xdg_toplevel::State::Fullscreen);
+        });
+
+        surface.send_configure();
+    }
+
+    fn unmaximize_request(&mut self, surface: ToplevelSurface) {
+        let bounds = self.output_logical_size();
+
+        surface.with_pending_state(|state| {
+            state.bounds = Some(bounds);
+            state.size = None;
             state.states.unset(xdg_toplevel::State::Maximized);
         });
+
         surface.send_configure();
     }
+
     // If the app requests minimize, hide its window
     fn minimize_request(&mut self, surface: ToplevelSurface) {
         if let Some(client) = surface.wl_surface().client() {
@@ -392,6 +582,13 @@ impl XdgShellHandler for Application {
                 .send(WayVRTask::MinimizeRequest(client.id(), surface.clone()));
         }
     }
+
+    fn title_changed(&mut self, surface: ToplevelSurface) {
+        if let Some(client) = surface.wl_surface().client() {
+            self.wayvr_tasks
+                .send(WayVRTask::TitleChange(client.id(), surface.clone()));
+        }
+    }
 }
 
 impl ShmHandler for Application {
@@ -438,24 +635,30 @@ impl selection_ext::DataControlHandler for Application {
         &self.ext_data_control_state
     }
 }
-
 impl XdgDecorationHandler for Application {
     fn new_decoration(&mut self, toplevel: ToplevelSurface) {
         toplevel.with_pending_state(|state| {
             state.decoration_mode = Some(zxdg_toplevel_decoration_v1::Mode::ServerSide);
         });
+        toplevel.send_configure();
     }
 
     fn request_mode(
         &mut self,
-        _toplevel: ToplevelSurface,
+        toplevel: ToplevelSurface,
         _mode: zxdg_toplevel_decoration_v1::Mode,
     ) {
-        // no switching away from SSD
+        toplevel.with_pending_state(|state| {
+            state.decoration_mode = Some(zxdg_toplevel_decoration_v1::Mode::ServerSide);
+        });
+        toplevel.send_configure();
     }
 
-    fn unset_mode(&mut self, _toplevel: ToplevelSurface) {
-        // no switching away from SSD
+    fn unset_mode(&mut self, toplevel: ToplevelSurface) {
+        toplevel.with_pending_state(|state| {
+            state.decoration_mode = Some(zxdg_toplevel_decoration_v1::Mode::ServerSide);
+        });
+        toplevel.send_configure();
     }
 }
 
@@ -477,6 +680,7 @@ impl KdeDecorationHandler for Application {
 delegate_dmabuf!(Application);
 delegate_xdg_shell!(Application);
 delegate_compositor!(Application);
+delegate_viewporter!(Application);
 delegate_shm!(Application);
 delegate_seat!(Application);
 delegate_data_device!(Application);
@@ -487,6 +691,7 @@ delegate_ext_data_control!(Application);
 delegate_xdg_decoration!(Application);
 delegate_kde_decoration!(Application);
 delegate_single_pixel_buffer!(Application);
+delegate_relative_pointer!(Application);
 
 const fn wl_transform_to_frame_transform(
     transform: wl_output::Transform,
diff --git a/wayvr/src/backend/wayvr/handle.rs b/wayvr/src/backend/wayvr/handle.rs
deleted file mode 100644
index b419dc3c..00000000
--- a/wayvr/src/backend/wayvr/handle.rs
+++ /dev/null
@@ -1,177 +0,0 @@
-#[macro_export]
-macro_rules! gen_id {
-    (
-		$container_name:ident,
-		$instance_name:ident,
-		$cell_name:ident,
-		$handle_name:ident) => {
-        //ThingCell
-        #[derive(Debug)]
-        pub struct $cell_name {
-            pub obj: $instance_name,
-            pub generation: u64,
-        }
-
-        //ThingVec
-        #[derive(Debug)]
-        pub struct $container_name {
-            // Vec<Option<ThingCell>>
-            pub vec: Vec<Option<$cell_name>>,
-
-            cur_generation: u64,
-        }
-
-        //ThingHandle
-        #[derive(Default, Debug, Clone, Copy, PartialEq, Hash, Eq)]
-        pub struct $handle_name {
-            idx: u32,
-            generation: u64,
-        }
-
-        #[allow(dead_code)]
-        impl $handle_name {
-            pub const fn reset(&mut self) {
-                self.generation = 0;
-            }
-
-            pub const fn is_set(&self) -> bool {
-                self.generation > 0
-            }
-
-            pub const fn id(&self) -> u32 {
-                self.idx
-            }
-
-            pub const fn new(idx: u32, generation: u64) -> Self {
-                Self { idx, generation }
-            }
-        }
-
-        //ThingVec
-        impl $container_name {
-            pub const fn new() -> Self {
-                Self {
-                    vec: Vec::new(),
-                    cur_generation: 0,
-                }
-            }
-
-            pub fn iter(&self) -> impl Iterator<Item = ($handle_name, &$instance_name)> {
-                self.vec.iter().enumerate().filter_map(|(idx, opt_cell)| {
-                    opt_cell.as_ref().map(|cell| {
-                        let handle = $container_name::get_handle(&cell, idx);
-                        (handle, &cell.obj)
-                    })
-                })
-            }
-
-            #[allow(dead_code)]
-            pub fn iter_mut(
-                &mut self,
-            ) -> impl Iterator<Item = ($handle_name, &mut $instance_name)> {
-                self.vec
-                    .iter_mut()
-                    .enumerate()
-                    .filter_map(|(idx, opt_cell)| {
-                        opt_cell.as_mut().map(|cell| {
-                            let handle = $container_name::get_handle(&cell, idx);
-                            (handle, &mut cell.obj)
-                        })
-                    })
-            }
-
-            pub const fn get_handle(cell: &$cell_name, idx: usize) -> $handle_name {
-                $handle_name {
-                    idx: idx as u32,
-                    generation: cell.generation,
-                }
-            }
-
-            fn find_unused_idx(&mut self) -> Option<u32> {
-                for (num, obj) in self.vec.iter().enumerate() {
-                    if obj.is_none() {
-                        return Some(num as u32);
-                    }
-                }
-                None
-            }
-
-            pub fn add(&mut self, obj: $instance_name) -> $handle_name {
-                self.cur_generation += 1;
-                let generation = self.cur_generation;
-
-                let unused_idx = self.find_unused_idx();
-
-                let idx = if let Some(idx) = unused_idx {
-                    idx
-                } else {
-                    self.vec.len() as u32
-                };
-
-                let handle = $handle_name { idx, generation };
-
-                let cell = $cell_name { obj, generation };
-
-                if let Some(idx) = unused_idx {
-                    self.vec[idx as usize] = Some(cell);
-                } else {
-                    self.vec.push(Some(cell))
-                }
-
-                handle
-            }
-
-            pub fn remove(&mut self, handle: &$handle_name) {
-                // Out of bounds, ignore
-                if handle.idx as usize >= self.vec.len() {
-                    return;
-                }
-
-                // Remove only if the generation matches
-                if let Some(cell) = &self.vec[handle.idx as usize] {
-                    if cell.generation == handle.generation {
-                        self.vec[handle.idx as usize] = None;
-                    }
-                }
-            }
-
-            pub fn get(&self, handle: &$handle_name) -> Option<&$instance_name> {
-                // Out of bounds, ignore
-                if handle.idx as usize >= self.vec.len() {
-                    return None;
-                }
-
-                if let Some(cell) = &self.vec[handle.idx as usize] {
-                    if cell.generation == handle.generation {
-                        return Some(&cell.obj);
-                    }
-                }
-
-                None
-            }
-
-            pub fn get_mut(&mut self, handle: &$handle_name) -> Option<&mut $instance_name> {
-                // Out of bounds, ignore
-                if handle.idx as usize >= self.vec.len() {
-                    return None;
-                }
-
-                if let Some(cell) = &mut self.vec[handle.idx as usize] {
-                    if cell.generation == handle.generation {
-                        return Some(&mut cell.obj);
-                    }
-                }
-
-                None
-            }
-        }
-    };
-}
-
-/* Example usage:
-gen_id!(ThingVec, ThingInstance, ThingCell, ThingHandle);
-
-struct ThingInstance {}
-
-impl ThingInstance {}
- */
diff --git a/wayvr/src/backend/wayvr/hit_test.rs b/wayvr/src/backend/wayvr/hit_test.rs
new file mode 100644
index 00000000..eb4089be
--- /dev/null
+++ b/wayvr/src/backend/wayvr/hit_test.rs
@@ -0,0 +1,406 @@
+use glam::{Affine2, Vec2};
+use smithay::{
+    desktop::PopupManager,
+    reexports::wayland_server::{Resource, backend::ObjectId, protocol::wl_surface::WlSurface},
+    utils::{Logical, Point},
+    wayland::{
+        compositor::{
+            SUBSURFACE_ROLE, SubsurfaceCachedState, SurfaceAttributes, TraversalAction,
+            with_states, with_surface_tree_upward,
+        },
+        shell::xdg::XdgPopupSurfaceData,
+    },
+};
+use std::{ops::RangeInclusive, rc::Rc, sync::Arc};
+use vulkano::image::view::ImageView;
+
+use crate::graphics::ExtentExt;
+
+use crate::backend::input::PointerHit;
+
+use super::SurfaceBufWithImage;
+
+pub const BORDER_SIZE: u32 = 5;
+pub const BAR_SIZE: u32 = 48;
+
+#[derive(Clone)]
+pub struct PopupRoot {
+    pub surface: WlSurface,
+    pub surface_origin: Vec2,
+}
+
+#[derive(Clone)]
+pub struct RenderedSurface {
+    pub surface: WlSurface,
+    pub surface_id: ObjectId,
+    pub image: Arc<ImageView>,
+    pub pos: Vec2,
+    pub size: Vec2,
+}
+
+#[derive(Clone)]
+pub enum WvrHitTarget {
+    Panel(PointerHit),
+    Toplevel {
+        pos: Vec2,
+    },
+    Surface {
+        surface: WlSurface,
+        global_pos: Vec2,
+        origin: Vec2,
+    },
+    Popup {
+        surface: WlSurface,
+        global_pos: Vec2,
+        origin: Vec2,
+    },
+}
+
+pub struct WvrHitContext {
+    pub surfaces: Rc<[RenderedSurface]>,
+    pub popup_roots: Rc<[PopupRoot]>,
+    pub mouse_transform: Affine2,
+    pub uv_range: RangeInclusive<f32>,
+    pub inner_extent: [u32; 2],
+    pub panel_height: u32,
+}
+
+impl WvrHitContext {
+    pub fn popup_hit_at_client_pos(&self, pos: Vec2) -> Option<(WlSurface, Vec2)> {
+        self.popup_roots.iter().find_map(|popup| {
+            surface_tree_input_hit_test(&popup.surface, popup.surface_origin, pos, true)
+        })
+    }
+
+    pub fn is_inside_client_area(&self, transformed: Vec2) -> bool {
+        self.uv_range.contains(&transformed.x) && self.uv_range.contains(&transformed.y)
+    }
+
+    pub fn transformed_uv_from_hit(&self, hit: &PointerHit) -> Vec2 {
+        self.mouse_transform.transform_point2(hit.uv)
+    }
+
+    pub fn client_pos_from_transformed_uv(&self, transformed: Vec2) -> Vec2 {
+        Vec2::new(
+            transformed.x * self.inner_extent[0] as f32,
+            transformed.y * self.inner_extent[1] as f32,
+        )
+    }
+
+    pub fn unclamped_client_pos_from_hit(&self, hit: &PointerHit) -> Vec2 {
+        let transformed = self.transformed_uv_from_hit(hit);
+        self.client_pos_from_transformed_uv(transformed)
+    }
+
+    pub fn panel_hit_from_hit(&self, hit: &PointerHit) -> Option<PointerHit> {
+        if self.panel_height == 0 {
+            return None;
+        }
+        let mut hit2 = *hit;
+        let total_height = self.inner_extent[1] + self.panel_height;
+        hit2.uv.y *= total_height as f32 / self.panel_height as f32;
+        Some(hit2)
+    }
+
+    pub fn hit_target_at(&self, client_pos: Vec2) -> Option<WvrHitTarget> {
+        let transformed = self.mouse_transform.inverse().transform_point2(Vec2::new(
+            client_pos.x / self.inner_extent[0] as f32,
+            client_pos.y / self.inner_extent[1] as f32,
+        ));
+        if let Some((surface, surface_origin)) = self.popup_hit_at_client_pos(client_pos) {
+            return Some(WvrHitTarget::Popup {
+                surface,
+                global_pos: client_pos,
+                origin: surface_origin,
+            });
+        }
+
+        if !self.is_inside_client_area(transformed) {
+            return None;
+        }
+
+        let hit_surface = self
+            .surfaces
+            .iter()
+            .rev()
+            .find(|s| surface_accepts_input(s, client_pos));
+
+        if let Some(surface) = hit_surface {
+            return Some(WvrHitTarget::Surface {
+                surface: surface.surface.clone(),
+                global_pos: client_pos,
+                origin: surface.pos,
+            });
+        }
+
+        Some(WvrHitTarget::Toplevel { pos: client_pos })
+    }
+
+    pub fn hit_target(&self, hit: &PointerHit) -> Option<WvrHitTarget> {
+        let transformed = self.transformed_uv_from_hit(hit);
+        let client_pos = self.client_pos_from_transformed_uv(transformed);
+
+        // popups are checked before the panel/client bounds.
+        if let Some((surface, surface_origin)) = self.popup_hit_at_client_pos(client_pos) {
+            return Some(WvrHitTarget::Popup {
+                surface,
+                global_pos: client_pos,
+                origin: surface_origin,
+            });
+        }
+
+        if !self.is_inside_client_area(transformed) {
+            return self.panel_hit_from_hit(hit).map(WvrHitTarget::Panel);
+        }
+
+        let hit_surface = self
+            .surfaces
+            .iter()
+            .rev()
+            .find(|s| surface_accepts_input(s, client_pos));
+
+        if let Some(surface) = hit_surface {
+            return Some(WvrHitTarget::Surface {
+                surface: surface.surface.clone(),
+                global_pos: client_pos,
+                origin: surface.pos,
+            });
+        }
+
+        let clamped = transformed.clamp(Vec2::ZERO, Vec2::ONE);
+        let pos = self.client_pos_from_transformed_uv(clamped);
+
+        Some(WvrHitTarget::Toplevel { pos })
+    }
+}
+
+fn surface_location(states: &smithay::wayland::compositor::SurfaceData) -> Point<i32, Logical> {
+    if states.role == Some(SUBSURFACE_ROLE) {
+        let mut guard = states.cached_state.get::<SubsurfaceCachedState>();
+        guard.current().location
+    } else {
+        (0, 0).into()
+    }
+}
+
+pub fn collect_rendered_surface_tree_at(
+    root: &WlSurface,
+    initial_pos: Point<i32, Logical>,
+    include_root: bool,
+) -> Vec<RenderedSurface> {
+    let mut out = Vec::new();
+    let root_id = root.id();
+
+    with_surface_tree_upward(
+        root,
+        initial_pos,
+        |_, states, parent_pos| {
+            let pos = *parent_pos + surface_location(states);
+
+            // do not skip even if this surface has no buffer; children may still have buffers
+            TraversalAction::DoChildren(pos)
+        },
+        |surface, states, parent_pos| {
+            if !include_root && surface.id() == root_id {
+                return;
+            }
+
+            let pos = *parent_pos + surface_location(states);
+
+            if let Some(surf) = SurfaceBufWithImage::get_from_surface(states) {
+                let extent = surf.image.extent_f32();
+                let scale = surf.scale.max(1) as f32;
+
+                out.push(RenderedSurface {
+                    surface: surface.clone(),
+                    surface_id: surface.id(),
+                    image: surf.image,
+                    pos: Vec2::new(pos.x as f32, pos.y as f32),
+                    size: Vec2::new(extent[0] / scale, extent[1] / scale),
+                });
+            }
+        },
+        |_, _, _| true,
+    );
+
+    out
+}
+
+pub fn collect_rendered_surface_tree(root: &WlSurface) -> Rc<[RenderedSurface]> {
+    collect_rendered_surface_tree_at(root, Point::<i32, Logical>::from((0, 0)), false).into()
+}
+
+fn surface_accepts_input(surface: &RenderedSurface, global_pos: Vec2) -> bool {
+    let local = global_pos - surface.pos;
+
+    if local.x < 0.0 || local.y < 0.0 || local.x >= surface.size.x || local.y >= surface.size.y {
+        return false;
+    }
+
+    with_states(&surface.surface, |states| {
+        let mut guard = states.cached_state.get::<SurfaceAttributes>();
+        let attrs = guard.current();
+
+        match attrs.input_region.as_ref() {
+            None => true,
+            Some(region) => {
+                let point =
+                    Point::<i32, Logical>::from((local.x.floor() as i32, local.y.floor() as i32));
+                region.contains(point)
+            }
+        }
+    })
+}
+
+fn surface_accepts_input_states(
+    states: &smithay::wayland::compositor::SurfaceData,
+    local: Vec2,
+) -> bool {
+    if local.x < 0.0 || local.y < 0.0 {
+        return false;
+    }
+
+    let mut guard = states.cached_state.get::<SurfaceAttributes>();
+    let attrs = guard.current();
+
+    let point = Point::<i32, Logical>::from((local.x.floor() as i32, local.y.floor() as i32));
+
+    // explicit input region wins, even if no render buffer
+    if let Some(region) = attrs.input_region.as_ref() {
+        return region.contains(point);
+    }
+
+    // fallback for normal rendered surfaces
+    if let Some(surf) = SurfaceBufWithImage::get_from_surface(states) {
+        let extent = surf.image.extent_f32();
+        let scale = surf.scale.max(1) as f32;
+
+        return local.x < extent[0] / scale && local.y < extent[1] / scale;
+    }
+
+    false
+}
+
+pub fn surface_tree_input_hit_test(
+    root: &WlSurface,
+    root_origin: Vec2,
+    global_pos: Vec2,
+    include_root: bool,
+) -> Option<(WlSurface, Vec2)> {
+    let mut hit = None;
+    let root_id = root.id();
+
+    with_surface_tree_upward(
+        root,
+        Point::<i32, Logical>::from((root_origin.x as i32, root_origin.y as i32)),
+        |_, states, parent_pos| {
+            let pos = *parent_pos + surface_location(states);
+            TraversalAction::DoChildren(pos)
+        },
+        |surface, states, parent_pos| {
+            if !include_root && surface.id() == root_id {
+                return;
+            }
+
+            let pos = *parent_pos + surface_location(states);
+            let surface_origin = Vec2::new(pos.x as f32, pos.y as f32);
+            let local = global_pos - surface_origin;
+
+            if surface_accepts_input_states(states, local) {
+                // with_surface_tree_upward visits bottom-to-top, so later hits win
+                hit = Some((surface.clone(), surface_origin));
+            }
+        },
+        |_, _, _| true,
+    );
+
+    hit
+}
+
+pub fn rendered_surfaces_dirty(old: &[RenderedSurface], new: &[RenderedSurface]) -> bool {
+    if old.len() != new.len() {
+        return true;
+    }
+
+    old.iter().zip(new).any(|(a, b)| {
+        a.surface_id != b.surface_id
+            || a.pos != b.pos
+            || a.size != b.size
+            || *a.image.image() != *b.image.image()
+    })
+}
+
+pub fn compute_transforms(inner_extent: [u32; 2]) -> (Affine2, RangeInclusive<f32>) {
+    let ix = inner_extent[0].max(1) as f32;
+    let iy = inner_extent[1].max(1) as f32;
+
+    let extent_x = ix + BORDER_SIZE as f32 * 2.0;
+    let extent_y = iy + BORDER_SIZE as f32 * 2.0 + BAR_SIZE as f32;
+
+    let scale_x = (extent_x + BORDER_SIZE as f32 * 2.0) / extent_x;
+    let scale_y = (extent_y + BORDER_SIZE as f32 * 2.0 + BAR_SIZE as f32) / extent_y;
+
+    let translation_x = -(BORDER_SIZE as f32) / ix;
+    let translation_y = -((BORDER_SIZE + BAR_SIZE) as f32) / iy;
+
+    let mouse_transform = Affine2::from_scale_angle_translation(
+        Vec2::new(scale_x, scale_y),
+        0.0,
+        Vec2::new(translation_x, translation_y),
+    );
+    let uv_range = translation_x..=(1.0 - translation_x);
+
+    (mouse_transform, uv_range)
+}
+
+pub fn build_hit_context(
+    toplevel: &WlSurface,
+    _popup_manager: &PopupManager,
+    inner_extent: [u32; 2],
+) -> Option<WvrHitContext> {
+    let (mouse_transform, uv_range) = compute_transforms(inner_extent);
+    let panel_height = BORDER_SIZE * 2 + BAR_SIZE;
+
+    let surfaces = collect_rendered_surface_tree(toplevel);
+
+    let mut popup_roots = Vec::new();
+    let mut popups = Vec::new();
+
+    for (popup, point) in PopupManager::popups_for_surface(toplevel) {
+        let configured = with_states(popup.wl_surface(), |states| {
+            states
+                .data_map
+                .get::<XdgPopupSurfaceData>()
+                .unwrap()
+                .lock()
+                .unwrap()
+                .configured
+        });
+
+        if !configured {
+            continue;
+        }
+
+        let popup_origin = point - popup.geometry().loc;
+
+        popup_roots.push(PopupRoot {
+            surface: popup.wl_surface().clone(),
+            surface_origin: Vec2::new(popup_origin.x as f32, popup_origin.y as f32),
+        });
+
+        popups.extend(collect_rendered_surface_tree_at(
+            popup.wl_surface(),
+            popup_origin,
+            true,
+        ));
+    }
+
+    Some(WvrHitContext {
+        surfaces,
+        popup_roots: popup_roots.into(),
+        mouse_transform,
+        uv_range,
+        inner_extent,
+        panel_height,
+    })
+}
diff --git a/wayvr/src/backend/wayvr/image_importer.rs b/wayvr/src/backend/wayvr/image_importer.rs
index 2a29a003..3bc26558 100644
--- a/wayvr/src/backend/wayvr/image_importer.rs
+++ b/wayvr/src/backend/wayvr/image_importer.rs
@@ -63,16 +63,49 @@ impl ImageImporter {
         let format = fourcc_to_vk(fourcc)
             .with_context(|| format!("Could not convert {fourcc} to vkFormat"))?;
 
-        let data = unsafe { std::slice::from_raw_parts(data, size) };
-        let image = cmd_buf.upload_image(bd.width as _, bd.height as _, format, data)?;
+        let bytes_per_pixel = match format {
+            Format::R8G8B8A8_UNORM
+            | Format::B8G8R8A8_UNORM
+            | Format::R8G8B8A8_SRGB
+            | Format::B8G8R8A8_SRGB => 4,
+            other => anyhow::bail!("unsupported SHM format for packed upload: {other:?}"),
+        };
 
-        cmd_buf.build_and_execute_now()?; //TODO: async
+        let row_bytes = bd.width as usize * bytes_per_pixel;
+        let stride = bd.stride as usize;
+        let height = bd.height as usize;
 
-        let image_view = ImageView::new_default(image)?;
-        Ok(image_view)
+        if stride < row_bytes {
+            anyhow::bail!("invalid wl_shm stride: {stride} < {row_bytes}");
+        }
+
+        let required = stride * height;
+        if size < required {
+            anyhow::bail!("wl_shm buffer too small: {size} < {required}");
+        }
+
+        let src = unsafe { std::slice::from_raw_parts(data, required) };
+        let mut packed = vec![0u8; row_bytes * height];
+
+        for y in 0..height {
+            let src_row = &src[y * stride..y * stride + row_bytes];
+            let dst_row = &mut packed[y * row_bytes..(y + 1) * row_bytes];
+            dst_row.copy_from_slice(src_row);
+        }
+
+        let image = cmd_buf.upload_image(bd.width as _, bd.height as _, format, &packed)?;
+        cmd_buf.build_and_execute_now()?;
+
+        Ok(ImageView::new_default(image)?)
     }
 
     pub fn get_or_import_dmabuf(&mut self, dmabuf: Dmabuf) -> anyhow::Result<Arc<ImageView>> {
+        let key = dmabuf.weak();
+
+        if let Some(view) = self.dmabufs.get(&key) {
+            return Ok(view.clone());
+        }
+
         let mut frame = DmabufFrame {
             format: FrameFormat {
                 width: dmabuf.width(),
@@ -100,7 +133,7 @@ impl ImageImporter {
 
         let image = self.gfx.dmabuf_texture(frame)?;
         let image_view = ImageView::new_default(image)?;
-        self.dmabufs.insert(dmabuf.weak(), image_view.clone());
+        self.dmabufs.insert(key, image_view.clone());
 
         Ok(image_view)
     }
diff --git a/wayvr/src/backend/wayvr/input_capture.rs b/wayvr/src/backend/wayvr/input_capture.rs
new file mode 100644
index 00000000..fcf77f34
--- /dev/null
+++ b/wayvr/src/backend/wayvr/input_capture.rs
@@ -0,0 +1,896 @@
+use evdev::{AttributeSetRef, Device as EvdevDevice, KeyCode, RelativeAxisCode};
+use input::{
+    AccelProfile, Device as LibinputDevice, DeviceCapability, Libinput, LibinputInterface,
+    event::{
+        Event, EventTrait,
+        device::DeviceEvent,
+        keyboard::{KeyState, KeyboardEvent, KeyboardEventTrait},
+        pointer::{Axis, ButtonState, PointerEvent, PointerScrollEvent},
+    },
+};
+use std::{
+    cell::RefCell,
+    collections::{HashMap, HashSet},
+    fs::OpenOptions,
+    io,
+    os::{
+        fd::{AsRawFd, OwnedFd, RawFd},
+        unix::fs::OpenOptionsExt,
+    },
+    path::{Path, PathBuf},
+    rc::Rc,
+    sync::mpsc::{self, Receiver, Sender, SyncSender, TryRecvError},
+    thread::{self, JoinHandle},
+    time::{Duration, Instant},
+};
+
+const IGNORE_PREFIX: &str = "WayVR";
+const WATCHDOG_TIMEOUT: Duration = Duration::from_millis(5000);
+const POLL_TIMEOUT_MS: i32 = 20;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub enum KeyCombo {
+    SwitchApp,
+    CloseApp,
+    /// Always consumed by InputCapture internally
+    GrabRelease,
+}
+
+#[derive(Debug, Clone)]
+pub enum CapturedEvent {
+    Key {
+        code: u16,
+        pressed: bool,
+    },
+    PointerButton {
+        button: u32,
+        pressed: bool,
+    },
+    PointerMotion {
+        dx: f64,
+        dy: f64,
+        dx_raw: f64,
+        dy_raw: f64,
+    },
+    PointerAxis {
+        horizontal_v120: i32,
+        vertical_v120: i32,
+    },
+    Grabbed,
+    Ungrabbed,
+    KeyCombo {
+        combo: KeyCombo,
+        pressed: bool,
+    },
+}
+
+#[derive(Debug, Clone, Copy)]
+struct PointerAccelConfig {
+    accel: bool,
+    speed: f32,
+}
+
+impl Default for PointerAccelConfig {
+    fn default() -> Self {
+        Self {
+            accel: true,
+            speed: 0.0,
+        }
+    }
+}
+
+pub struct InputCapture {
+    command_tx: SyncSender<Command>,
+    event_rx: Receiver<CapturedEvent>,
+    worker: Option<JoinHandle<()>>,
+}
+
+impl InputCapture {
+    pub fn new() -> io::Result<Self> {
+        let (command_tx, command_rx) = mpsc::sync_channel(8);
+        let (event_tx, event_rx) = mpsc::channel();
+        let (init_tx, init_rx) = mpsc::sync_channel(1);
+
+        let worker = thread::Builder::new()
+            .name("wayvr-input-capture".into())
+            .spawn(move || worker_main(command_rx, event_tx, init_tx))?;
+
+        match init_rx.recv() {
+            Ok(Ok(())) => Ok(Self {
+                command_tx,
+                event_rx,
+                worker: Some(worker),
+            }),
+            Ok(Err(error)) => {
+                let _ = worker.join();
+                Err(error)
+            }
+            Err(error) => {
+                let _ = worker.join();
+                Err(io::Error::new(
+                    io::ErrorKind::BrokenPipe,
+                    format!("input worker exited during initialization: {error}"),
+                ))
+            }
+        }
+    }
+
+    /// Returns every currently queued event without blocking.
+    pub fn drain_events(&self) -> Vec<CapturedEvent> {
+        let _ = self.command_tx.try_send(Command::ResetWatchdog);
+        self.event_rx.try_iter().collect()
+    }
+
+    /// Set acceleration profile for current and future mice
+    pub fn set_pointer_accel(&self, accel: bool, speed: f32) -> anyhow::Result<()> {
+        if !speed.is_finite() || !(-1.0..=1.0).contains(&speed) {
+            anyhow::bail!("pointer acceleration speed must be within -1.0..=1.0");
+        }
+
+        self.command_tx
+            .try_send(Command::SetPointerAccel { accel, speed })
+            .map_err(|error| anyhow::anyhow!("worker thread unreachable: {error}"))?;
+
+        Ok(())
+    }
+}
+
+impl Drop for InputCapture {
+    fn drop(&mut self) {
+        let _ = self.command_tx.send(Command::Shutdown);
+        if let Some(worker) = self.worker.take() {
+            let _ = worker.join();
+        }
+    }
+}
+
+enum Command {
+    ResetWatchdog,
+    #[allow(dead_code)]
+    SetGrabbed(bool), // might need later?
+    SetPointerAccel {
+        accel: bool,
+        speed: f32,
+    },
+    Shutdown,
+}
+
+struct RestrictedDevice {
+    path: PathBuf,
+    device: EvdevDevice,
+}
+
+#[derive(Default)]
+struct RestrictedState {
+    desired_grabbed: bool,
+    devices: HashMap<RawFd, RestrictedDevice>,
+}
+
+impl RestrictedState {
+    fn set_grabbed(&mut self, grabbed: bool) -> io::Result<()> {
+        if grabbed {
+            let fds = self.devices.keys().copied().collect::<Vec<_>>();
+            let mut grabbed_now = Vec::new();
+
+            for fd in fds {
+                let newly_grabbed = {
+                    let Some(entry) = self.devices.get_mut(&fd) else {
+                        continue;
+                    };
+                    if entry.device.is_grabbed() {
+                        Ok(false)
+                    } else {
+                        entry
+                            .device
+                            .grab()
+                            .map(|()| true)
+                            .map_err(|error| with_device_context("grab", &entry.path, error))
+                    }
+                };
+
+                match newly_grabbed {
+                    Ok(true) => grabbed_now.push(fd),
+                    Ok(false) => {}
+                    Err(error) => {
+                        for previous_fd in grabbed_now {
+                            if let Some(previous) = self.devices.get_mut(&previous_fd) {
+                                let _ = previous.device.ungrab();
+                            }
+                        }
+                        self.desired_grabbed = false;
+                        return Err(error);
+                    }
+                }
+            }
+
+            self.desired_grabbed = true;
+            return Ok(());
+        }
+
+        // devices opened during a later resume shall not be grabbed
+        self.desired_grabbed = false;
+        let mut first_error = None;
+
+        for entry in self.devices.values_mut() {
+            if !entry.device.is_grabbed() {
+                continue;
+            }
+
+            if let Err(error) = entry.device.ungrab()
+                && first_error.is_none()
+            {
+                first_error = Some(with_device_context("ungrab", &entry.path, error));
+            }
+        }
+
+        match first_error {
+            Some(error) => Err(error),
+            None => Ok(()),
+        }
+    }
+}
+
+#[derive(Clone)]
+struct RestrictedInterface {
+    state: Rc<RefCell<RestrictedState>>,
+}
+
+impl LibinputInterface for RestrictedInterface {
+    fn open_restricted(&mut self, path: &Path, flags: i32) -> Result<OwnedFd, i32> {
+        let access = flags & libc::O_ACCMODE;
+        let file = OpenOptions::new()
+            .custom_flags(flags)
+            .read(access == libc::O_RDONLY || access == libc::O_RDWR)
+            .write(access == libc::O_WRONLY || access == libc::O_RDWR)
+            .open(path)
+            .map_err(io_errno)?;
+
+        // duplicate fd used for capability inspection and EVIOCGRAB
+        let control_file = file.try_clone().map_err(io_errno)?;
+        let control_fd: OwnedFd = control_file.into();
+        let mut device = EvdevDevice::from_fd(control_fd).map_err(io_errno)?;
+
+        if !should_capture_device(&device) {
+            return Err(libc::ENODEV);
+        }
+
+        let raw_fd = file.as_raw_fd();
+        let mut state = self.state.borrow_mut();
+
+        if state.desired_grabbed {
+            device.grab().map_err(io_errno)?;
+        }
+
+        state.devices.insert(
+            raw_fd,
+            RestrictedDevice {
+                path: path.to_owned(),
+                device,
+            },
+        );
+
+        Ok(file.into())
+    }
+
+    fn close_restricted(&mut self, fd: OwnedFd) {
+        self.state.borrow_mut().devices.remove(&fd.as_raw_fd());
+        drop(fd);
+    }
+}
+
+#[derive(Default)]
+struct RuntimeDeviceState {
+    pressed_keys: HashSet<u16>,
+    active_combos: HashSet<KeyCombo>,
+    horizontal_v120_remainder: f64,
+    vertical_v120_remainder: f64,
+    aiming: bool,
+}
+
+enum ProcessResult {
+    Continue,
+    ForceUngrab,
+    ReceiverGone,
+}
+
+fn worker_main(
+    command_rx: Receiver<Command>,
+    event_tx: Sender<CapturedEvent>,
+    init_tx: SyncSender<io::Result<()>>,
+) {
+    let restricted_state = Rc::new(RefCell::new(RestrictedState::default()));
+    let interface = RestrictedInterface {
+        state: restricted_state.clone(),
+    };
+
+    let mut libinput = Libinput::new_with_udev(interface);
+    if libinput.udev_assign_seat("seat0").is_err() {
+        let _ = init_tx.send(Err(io::Error::new(
+            io::ErrorKind::Other,
+            format!("failed to assign libinput seat"),
+        )));
+        return;
+    }
+
+    if init_tx.send(Ok(())).is_err() {
+        return;
+    }
+
+    let mut grabbed = false;
+    let mut pending_grab = false;
+    let mut watchdog = Instant::now() + WATCHDOG_TIMEOUT;
+    let mut emergency_ungrab = false;
+    let mut pointer_accel = PointerAccelConfig::default();
+    let mut runtime_devices = HashMap::<LibinputDevice, RuntimeDeviceState>::new();
+    let mut pointer_devices = HashSet::<LibinputDevice>::new();
+
+    'worker: loop {
+        loop {
+            match command_rx.try_recv() {
+                Ok(Command::SetGrabbed(requested)) => {
+                    pending_grab = false;
+
+                    let _ = if requested {
+                        match restricted_state.borrow_mut().set_grabbed(true) {
+                            Ok(()) => {
+                                grabbed = true;
+                                Ok(())
+                            }
+                            Err(error) => {
+                                grabbed = false;
+                                Err(error)
+                            }
+                        }
+                    } else {
+                        let ungrab_result = restricted_state.borrow_mut().set_grabbed(false);
+                        grabbed = false;
+
+                        match ungrab_result {
+                            Ok(()) => Ok(()),
+                            Err(error) => {
+                                log::warn!(
+                                    "Could not cleanly ungrab every input device: {error}. Reopening libinput devices."
+                                );
+                                force_reopen_ungrabbed(
+                                    &mut libinput,
+                                    &restricted_state,
+                                    &mut runtime_devices,
+                                    &mut pointer_devices,
+                                    pointer_accel,
+                                    &event_tx,
+                                )
+                            }
+                        }
+                    };
+
+                    watchdog = Instant::now() + WATCHDOG_TIMEOUT;
+                    clear_transient_state(&mut runtime_devices);
+                    drain_pending_libinput_events(
+                        &mut libinput,
+                        &mut runtime_devices,
+                        &mut pointer_devices,
+                        pointer_accel,
+                        &event_tx,
+                    );
+                }
+                Ok(Command::SetPointerAccel { accel, speed }) => {
+                    pointer_accel = PointerAccelConfig { accel, speed };
+                    for mut device in pointer_devices.iter().cloned() {
+                        apply_pointer_accel(&mut device, pointer_accel);
+                    }
+                }
+                Ok(Command::ResetWatchdog) => {
+                    watchdog = Instant::now() + WATCHDOG_TIMEOUT;
+                }
+                Ok(Command::Shutdown) => break 'worker,
+                Err(TryRecvError::Empty) => break,
+                Err(TryRecvError::Disconnected) => break 'worker,
+            }
+        }
+
+        if grabbed && Instant::now() >= watchdog {
+            log::warn!("Watchdog timed out, ungrabbing all input devices.");
+            emergency_ungrab = true;
+        }
+
+        if emergency_ungrab {
+            force_emergency_ungrab(
+                &mut libinput,
+                &restricted_state,
+                &mut runtime_devices,
+                &mut pointer_devices,
+                pointer_accel,
+                &event_tx,
+            );
+            grabbed = false;
+            pending_grab = false;
+            emergency_ungrab = false;
+
+            if event_tx.send(CapturedEvent::Ungrabbed).is_err() {
+                break 'worker;
+            }
+            continue;
+        }
+
+        let mut poll_fd = libc::pollfd {
+            fd: libinput.as_raw_fd(),
+            events: libc::POLLIN,
+            revents: 0,
+        };
+
+        // SAFETY: poll_fd is valid for the duration of this call
+        let poll_result = unsafe { libc::poll(&mut poll_fd, 1, POLL_TIMEOUT_MS) };
+
+        if poll_result < 0 {
+            let error = io::Error::last_os_error();
+            if error.kind() != io::ErrorKind::Interrupted {
+                log::warn!("libinput poll failed: {error}");
+                thread::sleep(Duration::from_millis(20));
+            }
+            continue;
+        }
+
+        if poll_result == 0 {
+            continue;
+        }
+
+        if poll_fd.revents & (libc::POLLERR | libc::POLLHUP | libc::POLLNVAL) != 0 {
+            log::error!("libinput poll fd became invalid; input worker is exiting");
+            break 'worker;
+        }
+
+        if poll_fd.revents & libc::POLLIN == 0 {
+            continue;
+        }
+
+        if let Err(error) = libinput.dispatch() {
+            if error.kind() != io::ErrorKind::WouldBlock {
+                log::warn!("libinput dispatch failed: {error}");
+            }
+            continue;
+        }
+
+        for event in &mut libinput {
+            match process_libinput_event(
+                event,
+                grabbed,
+                true,
+                &mut pending_grab,
+                &event_tx,
+                &mut runtime_devices,
+                &mut pointer_devices,
+                pointer_accel,
+            ) {
+                ProcessResult::Continue => {}
+                ProcessResult::ForceUngrab => {
+                    emergency_ungrab = true;
+                    break;
+                }
+                ProcessResult::ReceiverGone => break 'worker,
+            }
+        }
+
+        if !grabbed && pending_grab && all_keyboard_keys_released(&runtime_devices) {
+            pending_grab = false;
+
+            match restricted_state.borrow_mut().set_grabbed(true) {
+                Ok(()) => {
+                    grabbed = true;
+                    watchdog = Instant::now() + WATCHDOG_TIMEOUT;
+
+                    // should not be needed but sanity
+                    clear_transient_state(&mut runtime_devices);
+
+                    if event_tx.send(CapturedEvent::Grabbed).is_err() {
+                        break 'worker;
+                    }
+                }
+                Err(error) => {
+                    log::warn!("Could not grab input devices after Super+Tab: {error}");
+                }
+            }
+        }
+
+        if emergency_ungrab {
+            force_emergency_ungrab(
+                &mut libinput,
+                &restricted_state,
+                &mut runtime_devices,
+                &mut pointer_devices,
+                pointer_accel,
+                &event_tx,
+            );
+            grabbed = false;
+            emergency_ungrab = false;
+
+            if event_tx.send(CapturedEvent::Ungrabbed).is_err() {
+                break 'worker;
+            }
+        }
+    }
+}
+
+fn process_libinput_event(
+    event: Event,
+    grabbed: bool,
+    allow_deferred_grab: bool,
+    pending_grab: &mut bool,
+    event_tx: &Sender<CapturedEvent>,
+    runtime_devices: &mut HashMap<LibinputDevice, RuntimeDeviceState>,
+    pointer_devices: &mut HashSet<LibinputDevice>,
+    pointer_accel: PointerAccelConfig,
+) -> ProcessResult {
+    match event {
+        Event::Device(event) => {
+            handle_device_event(event, runtime_devices, pointer_devices, pointer_accel);
+        }
+        Event::Keyboard(KeyboardEvent::Key(event)) => {
+            let code_u32 = event.key();
+            let Ok(code) = u16::try_from(code_u32) else {
+                log::warn!("Ignoring out-of-range Linux key code {code_u32}");
+                return ProcessResult::Continue;
+            };
+
+            let pressed = event.key_state() == KeyState::Pressed;
+            let device = event.device();
+            let state = runtime_devices.entry(device).or_default();
+
+            if pressed {
+                state.pressed_keys.insert(code);
+            } else {
+                state.pressed_keys.remove(&code);
+            }
+
+            if !grabbed {
+                // while ungrabbed, arm an automatic grab that triggers after release
+                if allow_deferred_grab
+                    && key_combo_is_pressed(KeyCombo::GrabRelease, &state.pressed_keys)
+                {
+                    *pending_grab = true;
+                }
+
+                return ProcessResult::Continue;
+            } else if pressed && key_combo_is_pressed(KeyCombo::GrabRelease, &state.pressed_keys) {
+                log::info!("Ungrabbing all input devices");
+                return ProcessResult::ForceUngrab;
+            }
+
+            // while grabbed, these combos get emitted as normal
+            for combo in [KeyCombo::SwitchApp, KeyCombo::CloseApp] {
+                let mut combo_pressed = key_combo_is_pressed(combo, &state.pressed_keys);
+                let was_pressed = state.active_combos.contains(&combo);
+
+                if matches!(combo, KeyCombo::SwitchApp)
+                    && was_pressed
+                    && mod_super(&state.pressed_keys)
+                {
+                    // keep SwitchApp active until Super is released
+                    combo_pressed = true;
+                }
+
+                if combo_pressed == was_pressed {
+                    continue;
+                }
+
+                if combo_pressed {
+                    state.active_combos.insert(combo);
+                } else {
+                    state.active_combos.remove(&combo);
+                }
+
+                if event_tx
+                    .send(CapturedEvent::KeyCombo {
+                        combo,
+                        pressed: combo_pressed,
+                    })
+                    .is_err()
+                {
+                    return ProcessResult::ReceiverGone;
+                }
+            }
+
+            if event_tx.send(CapturedEvent::Key { code, pressed }).is_err() {
+                return ProcessResult::ReceiverGone;
+            }
+        }
+        Event::Pointer(PointerEvent::Motion(event)) if grabbed => {
+            let dx = event.dx();
+            let dy = event.dy();
+            let dx_raw = event.dx_unaccelerated();
+            let dy_raw = event.dy_unaccelerated();
+            if (dx != 0.0 || dy != 0.0)
+                && event_tx
+                    .send(CapturedEvent::PointerMotion {
+                        dx,
+                        dy,
+                        dx_raw,
+                        dy_raw,
+                    })
+                    .is_err()
+            {
+                return ProcessResult::ReceiverGone;
+            }
+        }
+        Event::Pointer(PointerEvent::Button(event)) if grabbed => {
+            let pressed = event.button_state() == ButtonState::Pressed;
+            if event_tx
+                .send(CapturedEvent::PointerButton {
+                    button: event.button(),
+                    pressed,
+                })
+                .is_err()
+            {
+                return ProcessResult::ReceiverGone;
+            }
+        }
+        Event::Pointer(PointerEvent::ScrollWheel(event)) if grabbed => {
+            let horizontal = if event.has_axis(Axis::Horizontal) {
+                event.scroll_value_v120(Axis::Horizontal)
+            } else {
+                0.0
+            };
+            let vertical = if event.has_axis(Axis::Vertical) {
+                event.scroll_value_v120(Axis::Vertical)
+            } else {
+                0.0
+            };
+
+            let state = runtime_devices.entry(event.device()).or_default();
+            let horizontal_v120 = accumulate_v120(&mut state.horizontal_v120_remainder, horizontal);
+            let vertical_v120 = accumulate_v120(&mut state.vertical_v120_remainder, vertical);
+
+            // libinput already provides correct values unlike REL_WHEEL
+            if (horizontal_v120 != 0 || vertical_v120 != 0)
+                && event_tx
+                    .send(CapturedEvent::PointerAxis {
+                        horizontal_v120,
+                        vertical_v120,
+                    })
+                    .is_err()
+            {
+                return ProcessResult::ReceiverGone;
+            }
+        }
+        _ => {
+            // intentionally ignore absolute pointer, finger-scroll,
+            // continuous-scroll, touch, tablet and gesture events
+        }
+    }
+
+    ProcessResult::Continue
+}
+
+fn handle_device_event(
+    event: DeviceEvent,
+    runtime_devices: &mut HashMap<LibinputDevice, RuntimeDeviceState>,
+    pointer_devices: &mut HashSet<LibinputDevice>,
+    pointer_accel: PointerAccelConfig,
+) {
+    match event {
+        DeviceEvent::Added(event) => {
+            let mut device = event.device();
+            runtime_devices.entry(device.clone()).or_default();
+
+            if device.has_capability(DeviceCapability::Pointer) {
+                apply_pointer_accel(&mut device, pointer_accel);
+                pointer_devices.insert(device);
+            }
+        }
+        DeviceEvent::Removed(event) => {
+            let device = event.device();
+            runtime_devices.remove(&device);
+            pointer_devices.remove(&device);
+        }
+        _ => {}
+    }
+}
+
+fn apply_pointer_accel(device: &mut LibinputDevice, config: PointerAccelConfig) {
+    if !device.config_accel_is_available() {
+        return;
+    }
+
+    let profile = if config.accel {
+        AccelProfile::Adaptive
+    } else {
+        AccelProfile::Flat
+    };
+    if device.config_accel_profiles().contains(&profile) {
+        let _ = device.config_accel_set_profile(profile);
+    }
+    let _ = device.config_accel_set_speed(config.speed as _);
+}
+
+fn drain_pending_libinput_events(
+    libinput: &mut Libinput,
+    runtime_devices: &mut HashMap<LibinputDevice, RuntimeDeviceState>,
+    pointer_devices: &mut HashSet<LibinputDevice>,
+    pointer_accel: PointerAccelConfig,
+    event_tx: &Sender<CapturedEvent>,
+) {
+    let _ = libinput.dispatch();
+
+    let mut ignored = false;
+    for event in libinput {
+        let _ = process_libinput_event(
+            event,
+            false,
+            false,
+            &mut ignored,
+            event_tx,
+            runtime_devices,
+            pointer_devices,
+            pointer_accel,
+        );
+    }
+}
+
+fn force_reopen_ungrabbed(
+    libinput: &mut Libinput,
+    restricted_state: &Rc<RefCell<RestrictedState>>,
+    runtime_devices: &mut HashMap<LibinputDevice, RuntimeDeviceState>,
+    pointer_devices: &mut HashSet<LibinputDevice>,
+    pointer_accel: PointerAccelConfig,
+    event_tx: &Sender<CapturedEvent>,
+) -> io::Result<()> {
+    restricted_state.borrow_mut().desired_grabbed = false;
+
+    // closing the libinput-owned descriptors forcibly releases EVIOCGRAB
+    libinput.suspend();
+    restricted_state.borrow_mut().devices.clear();
+    runtime_devices.clear();
+    pointer_devices.clear();
+
+    libinput
+        .resume()
+        .map_err(|()| io::Error::new(io::ErrorKind::Other, "failed to resume libinput context"))?;
+
+    drain_pending_libinput_events(
+        libinput,
+        runtime_devices,
+        pointer_devices,
+        pointer_accel,
+        event_tx,
+    );
+    Ok(())
+}
+
+fn force_emergency_ungrab(
+    libinput: &mut Libinput,
+    restricted_state: &Rc<RefCell<RestrictedState>>,
+    runtime_devices: &mut HashMap<LibinputDevice, RuntimeDeviceState>,
+    pointer_devices: &mut HashSet<LibinputDevice>,
+    pointer_accel: PointerAccelConfig,
+    event_tx: &Sender<CapturedEvent>,
+) {
+    if let Err(error) = force_reopen_ungrabbed(
+        libinput,
+        restricted_state,
+        runtime_devices,
+        pointer_devices,
+        pointer_accel,
+        event_tx,
+    ) {
+        // ungrab has succeded, just not the resume
+        log::error!("Could not resume libinput after emergency ungrab: {error}");
+    }
+}
+
+fn clear_transient_state(runtime_devices: &mut HashMap<LibinputDevice, RuntimeDeviceState>) {
+    for state in runtime_devices.values_mut() {
+        state.pressed_keys.clear();
+        state.active_combos.clear();
+        state.horizontal_v120_remainder = 0.0;
+        state.vertical_v120_remainder = 0.0;
+        state.aiming = false;
+    }
+}
+
+fn accumulate_v120(remainder: &mut f64, value: f64) -> i32 {
+    if !value.is_finite() {
+        return 0;
+    }
+
+    let total = *remainder + value;
+    let integer = total.trunc();
+    let clamped = integer.clamp(i32::MIN as f64, i32::MAX as f64);
+    let result = clamped as i32;
+
+    *remainder = if integer == clamped {
+        total - integer
+    } else {
+        0.0
+    };
+
+    result
+}
+
+fn should_capture_device(device: &EvdevDevice) -> bool {
+    if device
+        .name()
+        .is_some_and(|name| name.starts_with(IGNORE_PREFIX))
+    {
+        return false;
+    }
+
+    let Some(keys) = device.supported_keys() else {
+        return false;
+    };
+
+    looks_like_keyboard(keys) || looks_like_mouse(device, keys)
+}
+
+fn looks_like_keyboard(keys: &AttributeSetRef<KeyCode>) -> bool {
+    let full_keyboard = (keys.contains(KeyCode::KEY_A) || keys.contains(KeyCode::KEY_Z))
+        && [KeyCode::KEY_ESC, KeyCode::KEY_ENTER, KeyCode::KEY_SPACE]
+            .into_iter()
+            .filter(|key| keys.contains(*key))
+            .count()
+            >= 2;
+
+    let numeric_keypad = keys.contains(KeyCode::KEY_KP0)
+        && keys.contains(KeyCode::KEY_KP1)
+        && keys.contains(KeyCode::KEY_KPENTER);
+
+    full_keyboard || numeric_keypad
+}
+
+fn looks_like_mouse(device: &EvdevDevice, keys: &AttributeSetRef<KeyCode>) -> bool {
+    let Some(relative_axes) = device.supported_relative_axes() else {
+        return false;
+    };
+
+    relative_axes.contains(RelativeAxisCode::REL_X)
+        && relative_axes.contains(RelativeAxisCode::REL_Y)
+        && mouse_buttons()
+            .into_iter()
+            .any(|button| keys.contains(button))
+}
+
+fn mouse_buttons() -> [KeyCode; 8] {
+    [
+        KeyCode::BTN_LEFT,
+        KeyCode::BTN_RIGHT,
+        KeyCode::BTN_MIDDLE,
+        KeyCode::BTN_SIDE,
+        KeyCode::BTN_EXTRA,
+        KeyCode::BTN_FORWARD,
+        KeyCode::BTN_BACK,
+        KeyCode::BTN_TASK,
+    ]
+}
+
+fn mod_alt(pressed: &HashSet<u16>) -> bool {
+    pressed.contains(&KeyCode::KEY_LEFTALT.0) || pressed.contains(&KeyCode::KEY_RIGHTALT.0)
+}
+
+fn mod_super(pressed: &HashSet<u16>) -> bool {
+    pressed.contains(&KeyCode::KEY_LEFTMETA.0) || pressed.contains(&KeyCode::KEY_RIGHTMETA.0)
+}
+
+fn key_combo_is_pressed(combo: KeyCombo, pressed: &HashSet<u16>) -> bool {
+    match combo {
+        KeyCombo::CloseApp => mod_alt(pressed) && pressed.contains(&KeyCode::KEY_F4.0),
+        KeyCombo::GrabRelease => mod_super(pressed) && pressed.contains(&KeyCode::KEY_Z.0),
+        KeyCombo::SwitchApp => mod_super(pressed) && pressed.contains(&KeyCode::KEY_X.0),
+    }
+}
+
+fn io_errno(error: io::Error) -> i32 {
+    error.raw_os_error().unwrap_or(libc::EIO)
+}
+
+fn with_device_context(action: &str, path: &Path, error: io::Error) -> io::Error {
+    io::Error::new(
+        error.kind(),
+        format!("failed to {action} {}: {error}", path.display()),
+    )
+}
+
+fn all_keyboard_keys_released(
+    runtime_devices: &HashMap<LibinputDevice, RuntimeDeviceState>,
+) -> bool {
+    runtime_devices
+        .values()
+        .all(|state| state.pressed_keys.is_empty())
+}
diff --git a/wayvr/src/backend/wayvr/mod.rs b/wayvr/src/backend/wayvr/mod.rs
index 119248bf..2a27f6cc 100644
--- a/wayvr/src/backend/wayvr/mod.rs
+++ b/wayvr/src/backend/wayvr/mod.rs
@@ -1,36 +1,47 @@
 pub mod client;
 mod comp;
-mod handle;
+pub mod hit_test;
 mod image_importer;
+mod input_capture;
 pub mod process;
 mod time;
 pub mod window;
+
 use anyhow::Context;
 use comp::Application;
-use process::ProcessVec;
-use slotmap::SecondaryMap;
+use glam::{DVec2, Vec2};
+use slotmap::{DenseSlotMap, SecondaryMap};
 use smallvec::SmallVec;
 use smithay::{
     desktop::PopupManager,
-    input::{SeatState, keyboard::XkbConfig},
+    input::{SeatState, keyboard::XkbConfig, pointer::CursorImageStatus},
     output::{Mode, Output},
     reexports::{
         wayland_protocols_misc::server_decoration::server::org_kde_kwin_server_decoration_manager as kde_decoration,
-        wayland_server::{self, backend::ClientId},
+        wayland_server::{
+            self,
+            backend::ClientId,
+            protocol::{wl_buffer, wl_surface::WlSurface},
+        },
     },
     utils::{Logical, Size},
     wayland::{
         compositor::{self, SurfaceData, with_states},
         dmabuf::{DmabufFeedbackBuilder, DmabufState},
+        relative_pointer::RelativePointerManagerState,
         selection::{
             data_device::DataDeviceState, ext_data_control as selection_ext,
             primary_selection::PrimarySelectionState, wlr_data_control as selection_wlr,
         },
         shell::{
             kde::decoration::KdeDecorationState,
-            xdg::{SurfaceCachedState, ToplevelSurface, XdgShellState, XdgToplevelSurfaceData},
+            xdg::{
+                SurfaceCachedState, ToplevelSurface, XdgShellState, XdgToplevelSurfaceData,
+                decoration::XdgDecorationState,
+            },
         },
         shm::ShmState,
+        viewporter::ViewporterState,
     },
 };
 use std::{
@@ -41,39 +52,58 @@ use std::{
     time::{Duration, Instant},
 };
 use vulkano::image::view::ImageView;
-use wayvr_ipc::{packet_client::PositionMode, packet_server};
-use wgui::gfx::WGfx;
+use wayland_protocols::xdg::shell::server::xdg_toplevel;
+use wayvr_ipc::packet_client::PositionMode;
+use wgui::{gfx::WGfx, log::LogErr};
 use wlx_capture::frame::Transform;
-use wlx_common::desktop_finder::DesktopFinder;
+use wlx_common::{
+    audio::{AudioSystem, SamplePlayer},
+    config::{GeneralConfig, InputCaptureMethod},
+    desktop_finder::DesktopFinder,
+};
 use xkbcommon::xkb;
 
 use crate::{
     backend::{
-        task::{OverlayTask, TaskContainer, TaskType, ToggleMode},
+        input::InputState,
+        task::{OverlayTask, SpawnPos, TaskContainer, TaskType, ToggleMode},
         wayvr::{
             image_importer::ImageImporter,
+            input_capture::InputCapture,
             process::{KillSignal, Process},
-            window::Window,
         },
     },
-    graphics::WGfxExtras,
-    ipc::{event_queue::SyncEventQueue, ipc_server, signal::WayVRSignal},
-    overlays::wayvr::create_wl_window_overlay,
+    graphics::{ExtentExt, WGfxExtras},
+    ipc::{event_queue::SyncEventQueue, ipc_server},
+    overlays::{
+        anchor::ALTTAB_HELP_NAME,
+        wayvr::{WvrCommand, create_wl_window_overlay},
+    },
     state::AppState,
-    subsystem::hid::{MODS_TO_KEYS, WheelDelta},
-    windowing::{OverlayID, OverlaySelector},
+    subsystem::{
+        dbus::DbusConnector,
+        hid::{self, MODS_TO_KEYS, WheelDelta},
+        input::HidWrapper,
+    },
+    windowing::{OverlayID, OverlaySelector, backend::OverlayEventData},
 };
 
+pub use hit_test::{WvrHitTarget, build_hit_context};
+
 #[derive(Debug, Clone)]
 pub struct WaylandEnv {
     pub display_num: u32,
 }
 
 impl WaylandEnv {
-    pub fn display_num_string(&self) -> String {
+    pub fn wayland_display_num_string(&self) -> String {
         // e.g. "wayland-20"
         format!("wayland-{}", self.display_num)
     }
+    pub fn display_num_string(&self) -> String {
+        // e.g. ":20"
+        format!(":{}", self.display_num)
+    }
 }
 
 #[derive(Clone)]
@@ -95,6 +125,8 @@ pub enum WayVRTask {
     NewToplevel(ClientId, ToplevelSurface),
     DropToplevel(ClientId, ToplevelSurface),
     MinimizeRequest(ClientId, ToplevelSurface),
+    TitleChange(ClientId, ToplevelSurface),
+    VisibilityChange(window::WindowHandle, bool),
     NewExternalProcess(ExternalProcessRequest),
     ProcessTerminationRequest(process::ProcessHandle, KillSignal),
     CloseWindowRequest(window::WindowHandle),
@@ -103,35 +135,43 @@ pub enum WayVRTask {
 pub struct WvrServerState {
     pub manager: client::WayVRCompositor,
     pub wm: window::WindowManager,
-    pub processes: process::ProcessVec,
+    pub processes: DenseSlotMap<process::ProcessHandle, process::Process>,
     pub tasks: SyncEventQueue<WayVRTask>,
     ticks: u64,
     cur_modifiers: u8,
-    signals: SyncEventQueue<WayVRSignal>,
     mouse_freeze: Instant,
     window_to_overlay: HashMap<window::WindowHandle, OverlayID>,
     overlay_to_window: SecondaryMap<OverlayID, window::WindowHandle>,
+    process_overlays: HashMap<process::ProcessHandle, Vec<OverlayID>>,
+    input_capture: Option<InputCapture>,
+    input_capture_init_attempted: bool,
+    has_input_focus: bool,
+    grab_toast_sent: bool,
 }
 
+#[derive(Clone, Copy, PartialEq)]
 pub enum MouseIndex {
     Left,
     Center,
     Right,
 }
 
+pub enum PointerFocusTarget {
+    Surface { surface: WlSurface, origin: Vec2 },
+    Toplevel,
+    None,
+}
+
 pub enum TickTask {
     NewExternalProcess(ExternalProcessRequest), // Call WayVRCompositor::add_client after receiving this message
 }
 
 const KEY_REPEAT_DELAY: i32 = 200;
 const KEY_REPEAT_RATE: i32 = 50;
+const WAYVR_SCREEN_RES: [i32; 2] = [2560, 1440];
 
 impl WvrServerState {
-    pub fn new(
-        gfx: Arc<WGfx>,
-        gfx_extras: &WGfxExtras,
-        signals: SyncEventQueue<WayVRSignal>,
-    ) -> anyhow::Result<Self> {
+    pub fn new(gfx: Arc<WGfx>, gfx_extras: &WGfxExtras) -> anyhow::Result<Self> {
         const fn filter_allow_any(_: &wayland_server::Client) -> bool {
             true
         }
@@ -157,8 +197,11 @@ impl WvrServerState {
             filter_allow_any,
         );
 
+        let xdg_decoration_state = XdgDecorationState::new::<Application>(&dh);
         let kde_decoration_state =
             KdeDecorationState::new::<Application>(&dh, kde_decoration::Mode::Server);
+        let relative_pointer_state = RelativePointerManagerState::new::<Application>(&dh);
+        let viewporter = ViewporterState::new::<Application>(&dh);
 
         let dummy_milli_hz = 60000; /* refresh rate in millihertz */
 
@@ -174,7 +217,7 @@ impl WvrServerState {
 
         let mode = Mode {
             refresh: dummy_milli_hz,
-            size: (2560, 1440).into(), //logical size in pixels
+            size: (WAYVR_SCREEN_RES[0], WAYVR_SCREEN_RES[1]).into(), //logical size in pixels
         };
 
         let _global = output.create_global::<Application>(&dh);
@@ -223,34 +266,45 @@ impl WvrServerState {
         let dma_importer = ImageImporter::new(gfx);
 
         let state = Application {
+            output,
             image_importer: dma_importer,
             display_handle: dh,
             compositor,
             xdg_shell,
+            seat,
             seat_state,
             shm,
             data_device,
             primary_selection_state,
             wlr_data_control_state,
             ext_data_control_state,
+            xdg_decoration_state,
             kde_decoration_state,
+            relative_pointer_state,
             wayvr_tasks: tasks.clone(),
-            redraw_requests: HashSet::new(),
             dmabuf_state,
             popup_manager: PopupManager::default(),
+            viewporter,
+            redraw_requests: HashSet::new(),
+            pending_frame_callbacks: HashMap::new(),
+            cursor_image: CursorImageStatus::default_named(),
         };
 
         Ok(Self {
-            manager: client::WayVRCompositor::new(state, display, seat_keyboard, seat_pointer, seat)?,
-            processes: ProcessVec::new(),
+            manager: client::WayVRCompositor::new(state, display, seat_keyboard, seat_pointer)?,
+            processes: Default::default(),
             wm: window::WindowManager::new(),
             ticks: 0,
             tasks,
             cur_modifiers: 0,
-            signals,
             mouse_freeze: Instant::now(),
             window_to_overlay: HashMap::new(),
             overlay_to_window: SecondaryMap::new(),
+            process_overlays: HashMap::new(),
+            input_capture: None,
+            input_capture_init_attempted: false,
+            has_input_focus: false,
+            grab_toast_sent: false,
         })
     }
 
@@ -267,6 +321,7 @@ impl WvrServerState {
             input_state: &app.input_state,
             tasks: &mut tasks,
             signals: &app.wayvr_signals,
+            hid_wrapper: &mut app.hid_provider,
         });
 
         // Tick all child processes
@@ -279,16 +334,10 @@ impl WvrServerState {
         }
 
         for p_handle in &to_remove {
-            wvr_server.processes.remove(p_handle);
+            wvr_server.processes.remove(*p_handle);
             wvr_server.process_removed(&mut app.tasks, *p_handle);
         }
 
-        if !to_remove.is_empty() {
-            app.wayvr_signals.send(WayVRSignal::BroadcastStateChanged(
-                packet_server::WvrStateChanged::ProcessRemoved,
-            ));
-        }
-
         while let Some(task) = wvr_server.tasks.read() {
             match task {
                 WayVRTask::NewExternalProcess(req) => {
@@ -313,28 +362,35 @@ impl WvrServerState {
                             continue;
                         };
 
+                        let output_bounds = wvr_server.manager.state.output_logical_size();
+
                         let (min_size, max_size) = with_states(toplevel.wl_surface(), |state| {
                             let mut guard = state.cached_state.get::<SurfaceCachedState>();
-                            let (mut min_size, mut max_size) =
-                                { (guard.current().min_size, guard.current().max_size) };
+                            let current = guard.current();
+
+                            let mut min_size = current.min_size;
+                            let mut max_size = current.max_size;
 
                             if min_size.is_empty() {
                                 min_size = Size::new(1, 1);
                             }
 
                             if max_size.is_empty() {
-                                max_size = Size::new(4096, 4096);
+                                max_size = output_bounds;
+                            } else {
+                                max_size = max_size.clamp(Size::new(1, 1), output_bounds);
                             }
 
                             (min_size, max_size)
                         });
 
                         // Size, icon & fallback title comes from process
-                        let (size, pos, fallback_title, icon, is_cage) =
-                            match wvr_server.processes.get(&process_handle) {
+                        let (fallback_size, pos, fallback_title, icon, is_cage) =
+                            match wvr_server.processes.get(process_handle) {
                                 Some(Process::Managed(p)) => {
                                     let size: Size<i32, Logical> =
                                         Size::new(p.resolution[0] as _, p.resolution[1] as _);
+
                                     (
                                         size.clamp(min_size, max_size),
                                         p.pos_mode,
@@ -352,16 +408,33 @@ impl WvrServerState {
                                 ),
                             };
 
+                        let window_handle = wvr_server.wm.create_window(
+                            toplevel.clone(),
+                            process_handle,
+                            output_bounds,
+                            min_size,
+                            max_size,
+                            fallback_size.w as _,
+                            fallback_size.h as _,
+                        );
+
+                        toplevel.with_pending_state(|state| {
+                            state.bounds = Some(output_bounds);
+                            // suggest an initial size but let the app request a different one
+                            state.size = Some(fallback_size);
+                            state.states.set(xdg_toplevel::State::Activated);
+                        });
+                        toplevel.send_configure();
+
                         let mut title: Arc<str> = fallback_title
                             .unwrap_or_else(|| format!("P{}", client.pid))
                             .into();
 
-                        let window_handle = wvr_server.wm.create_window(
-                            toplevel.clone(),
-                            process_handle,
-                            size.w as _,
-                            size.h as _,
-                        );
+                        let spawn_pos = wvr_server
+                            .last_process_overlay(process_handle)
+                            .map_or(SpawnPos::Spread, |oid| {
+                                SpawnPos::Parent(OverlaySelector::Id(oid))
+                            });
 
                         let mut icon = icon;
 
@@ -405,15 +478,16 @@ impl WvrServerState {
                             None => DesktopFinder::create_icon(&title)?.into(),
                         };
 
-                        app.tasks.enqueue(TaskType::Overlay(OverlayTask::Create(
+                        app.tasks.enqueue(TaskType::Overlay(OverlayTask::Spawn(
                             OverlaySelector::Nothing,
+                            spawn_pos,
                             Box::new(move |app: &mut AppState| {
                                 create_wl_window_overlay(
                                     title,
                                     app,
                                     window_handle,
                                     icon,
-                                    [size.w as _, size.h as _],
+                                    [fallback_size.w as _, fallback_size.h as _],
                                     pos,
                                 )
                                 .context("Could not create WvrWindow overlay")
@@ -421,10 +495,6 @@ impl WvrServerState {
                                 .ok()
                             }),
                         )));
-
-                        app.wayvr_signals.send(WayVRSignal::BroadcastStateChanged(
-                            packet_server::WvrStateChanged::WindowCreated,
-                        ));
                     }
                 }
                 WayVRTask::DropToplevel(client_id, toplevel) => {
@@ -439,16 +509,49 @@ impl WvrServerState {
                             continue;
                         };
 
+                        let process_handle = wvr_server
+                            .wm
+                            .windows
+                            .get(window_handle)
+                            .map(|window| window.process);
+
                         if let Some(oid) = wvr_server.window_to_overlay.remove(&window_handle) {
                             app.tasks.enqueue(TaskType::Overlay(OverlayTask::Drop(
                                 OverlaySelector::Id(oid),
                             )));
                             wvr_server.overlay_to_window.remove(oid);
+
+                            if let Some(process_handle) = process_handle.as_ref() {
+                                let mut empty = false;
+                                if let Some(overlays) =
+                                    wvr_server.process_overlays.get_mut(process_handle)
+                                {
+                                    overlays.retain(|other| *other != oid);
+                                    empty = overlays.is_empty();
+                                }
+
+                                if empty {
+                                    wvr_server.process_overlays.remove(process_handle);
+                                }
+                            }
                         }
 
                         wvr_server.wm.remove_window(window_handle);
                     }
                 }
+                WayVRTask::VisibilityChange(window_handle, visible) => {
+                    if let Some(oid) = wvr_server.window_to_overlay.get(&window_handle) {
+                        app.tasks
+                            .enqueue(TaskType::Overlay(OverlayTask::ToggleOverlay(
+                                OverlaySelector::Id(*oid),
+                                if visible {
+                                    ToggleMode::EnsureOn
+                                } else {
+                                    ToggleMode::EnsureOff
+                                },
+                            )));
+                    }
+                }
                 WayVRTask::MinimizeRequest(client_id, toplevel) => {
                     for client in &wvr_server.manager.clients {
                         if client.client.id() != client_id {
@@ -470,8 +573,31 @@ impl WvrServerState {
                         }
                     }
                 }
+                WayVRTask::TitleChange(client_id, toplevel) => {
+                    for client in &wvr_server.manager.clients {
+                        if client.client.id() != client_id {
+                            continue;
+                        }
+                        let Some(window_handle) = wvr_server.wm.find_window_handle(&toplevel)
+                        else {
+                            log::warn!("MinimizeRequest: Couldn't find matching window handle");
+                            continue;
+                        };
+                        if let Some(oid) = wvr_server.window_to_overlay.get(&window_handle) {
+                            app.tasks.enqueue(TaskType::Overlay(OverlayTask::Modify(
+                                OverlaySelector::Id(*oid),
+                                Box::new(|app, owc| {
+                                    let _ = owc.backend.notify(
+                                        app,
+                                        OverlayEventData::WvrCommand(WvrCommand::ReloadTitle),
+                                    );
+                                }),
+                            )));
+                        }
+                    }
+                }
                 WayVRTask::ProcessTerminationRequest(process_handle, signal) => {
-                    if let Some(process) = wvr_server.processes.get_mut(&process_handle) {
+                    if let Some(process) = wvr_server.processes.get_mut(process_handle) {
                         process.kill(signal);
                     }
 
@@ -495,7 +621,7 @@ impl WvrServerState {
                     }
                 }
                 WayVRTask::CloseWindowRequest(window_handle) => {
-                    if let Some(w) = wvr_server.wm.windows.get(&window_handle) {
+                    if let Some(w) = wvr_server.wm.windows.get(window_handle) {
                         log::info!("Sending window close to {window_handle:?}");
                         w.toplevel.send_close();
                     } else {
@@ -514,11 +640,28 @@ impl WvrServerState {
             wvr_server.manager.cleanup_handles();
         }
 
+        wvr_server.process_input_capture(
+            &mut app.input_state,
+            &mut app.tasks,
+            &mut app.hid_provider,
+            &mut app.audio_sample_player,
+            &mut app.audio_system,
+            &app.session.config,
+        );
+
         wvr_server.ticks += 1;
 
         Ok(tasks)
     }
 
+    pub fn config_changed(&mut self, config: &GeneralConfig) {
+        if let Some(cap) = self.input_capture.as_mut() {
+            let _ = cap
+                .set_pointer_accel(config.wvr_mouse_acceleration, config.wvr_mouse_speed)
+                .log_err("Could not set mouse accel/speed");
+        }
+    }
+
     pub fn terminate_process(
         &mut self,
         process_handle: process::ProcessHandle,
@@ -536,6 +679,19 @@ impl WvrServerState {
     pub fn overlay_added(&mut self, oid: OverlayID, window: window::WindowHandle) {
         self.overlay_to_window.insert(oid, window);
         self.window_to_overlay.insert(window, oid);
+
+        if let Some(process_handle) = self.wm.windows.get(window).map(|window| window.process) {
+            let overlays = self.process_overlays.entry(process_handle).or_default();
+            overlays.retain(|other| *other != oid);
+            overlays.push(oid);
+        }
+    }
+
+    fn last_process_overlay(&self, process_handle: process::ProcessHandle) -> Option<OverlayID> {
+        self.process_overlays
+            .get(&process_handle)
+            .and_then(|overlays| overlays.last())
+            .copied()
     }
 
     pub fn process_removed(&mut self, tasks: &mut TaskContainer, process: process::ProcessHandle) {
@@ -559,50 +715,465 @@ impl WvrServerState {
         }
 
         for hnd in &to_remove {
-            self.wm.windows.remove(hnd);
+            self.wm.windows.remove(*hnd);
         }
+
+        self.process_overlays.remove(&process);
     }
 
     pub fn get_overlay_id(&self, window: window::WindowHandle) -> Option<OverlayID> {
         self.window_to_overlay.get(&window).copied()
     }
 
-    pub fn send_mouse_move(&mut self, handle: window::WindowHandle, x: u32, y: u32) {
-        if self.mouse_freeze > Instant::now() {
-            return;
+    pub fn hit_target_to_focus(
+        &self,
+        target: WvrHitTarget,
+        hover_window: window::WindowHandle,
+        _default_pos: Vec2,
+    ) -> PointerFocusTarget {
+        match target {
+            WvrHitTarget::Panel(_) => PointerFocusTarget::None,
+            WvrHitTarget::Toplevel { .. } => self
+                .wm
+                .windows
+                .get(hover_window)
+                .map(|w| {
+                    let surface = w.toplevel.wl_surface().clone();
+                    PointerFocusTarget::Surface {
+                        surface,
+                        origin: glam::Vec2::ZERO,
+                    }
+                })
+                .unwrap_or(PointerFocusTarget::Toplevel),
+            WvrHitTarget::Surface {
+                surface, origin, ..
+            } => PointerFocusTarget::Surface { surface, origin },
+            WvrHitTarget::Popup {
+                surface, origin, ..
+            } => PointerFocusTarget::Surface { surface, origin },
         }
-        if let Some(window) = self.wm.windows.get_mut(&handle) {
-            window.send_mouse_move(&mut self.manager, x, y);
-        } else {
-            return;
+    }
+
+    pub fn pointer_is_grabbed(&self) -> bool {
+        self.manager.seat_pointer.is_grabbed()
+    }
+
+    pub fn process_input_capture(
+        &mut self,
+        input_state: &mut InputState,
+        tasks: &mut TaskContainer,
+        hid_wrapper: &mut HidWrapper,
+        audio_sample_player: &mut SamplePlayer,
+        audio_system: &mut AudioSystem,
+        config: &GeneralConfig,
+    ) {
+        let input_capture = match (self.input_capture.as_mut(), config.wvr_input_capture) {
+            (Some(cap), InputCaptureMethod::Evdev) => cap,
+            (Some(_), InputCaptureMethod::None) => {
+                self.input_capture.take();
+                return;
+            }
+            (None, InputCaptureMethod::Evdev) if !self.input_capture_init_attempted => {
+                self.input_capture = InputCapture::new()
+                    .log_err("Could not initialize evdev input capture")
+                    .ok();
+                self.input_capture_init_attempted = true;
+                if let Some(cap) = self.input_capture.as_mut() {
+                    cap
+                } else {
+                    let _ = DbusConnector::notify_send(
+                        "Could not initialize keyboard/mouse capture!",
+                        "Check that your user is in the input group.",
+                        1,
+                        5000,
+                        0,
+                        true,
+                    );
+                    return;
+                }
+            }
+            (None, InputCaptureMethod::Evdev) => {
+                return;
+            }
+            (None, InputCaptureMethod::None) => {
+                self.input_capture_init_attempted = false;
+                return;
+            }
+        };
+
+        let mut mouse_delta = DVec2::ZERO;
+        let mut mouse_delta_raw = DVec2::ZERO;
+
+        for ev in input_capture.drain_events() {
+            match ev {
+                input_capture::CapturedEvent::Key { code, pressed } => {
+                    let vk = (code as u32) + 8;
+                    if input_state.picking_focus.is_aiming() {
+                        if (hid::VirtualKey::Q as u32) == vk {
+                            input_state.handsfree_state.grab = pressed;
+                            input_state.handsfree_state.grab_float = pressed;
+                        } else if (hid::VirtualKey::A as u32) == vk {
+                            input_state.handsfree_state.grab = pressed;
+                        } else if (hid::VirtualKey::W as u32) == vk {
+                            input_state.handsfree_state.click = pressed;
+                        } else if (hid::VirtualKey::E as u32) == vk && pressed {
+                            tasks.enqueue(TaskType::Overlay(OverlayTask::ToggleEditMode));
+                        } else if (hid::VirtualKey::D as u32) == vk && pressed {
+                            tasks.enqueue(TaskType::Overlay(OverlayTask::ToggleDashboard));
+                        } else if (hid::VirtualKey::R as u32) == vk && pressed {
+                            tasks.enqueue(TaskType::Overlay(OverlayTask::ShowHide));
+                        } else if (hid::VirtualKey::N1 as u32) == vk && pressed {
+                            tasks.enqueue(TaskType::Overlay(OverlayTask::ToggleSet(0)))
+                        } else if (hid::VirtualKey::N2 as u32) == vk && pressed {
+                            tasks.enqueue(TaskType::Overlay(OverlayTask::ToggleSet(1)))
+                        } else if (hid::VirtualKey::N3 as u32) == vk && pressed {
+                            tasks.enqueue(TaskType::Overlay(OverlayTask::ToggleSet(2)))
+                        } else if (hid::VirtualKey::N4 as u32) == vk && pressed {
+                            tasks.enqueue(TaskType::Overlay(OverlayTask::ToggleSet(3)))
+                        } else if (hid::VirtualKey::N5 as u32) == vk && pressed {
+                            tasks.enqueue(TaskType::Overlay(OverlayTask::ToggleSet(4)))
+                        } else if (hid::VirtualKey::N6 as u32) == vk && pressed {
+                            tasks.enqueue(TaskType::Overlay(OverlayTask::ToggleSet(5)))
+                        }
+                    } else if self.has_input_focus {
+                        self.manager.send_key(vk, pressed);
+                    } else if let Some(vk) = hid::VirtualKey::from_repr(vk as u16) {
+                        hid_wrapper.inner.send_key(vk, pressed);
+                    }
+                }
+                input_capture::CapturedEvent::PointerButton { button, pressed } => {
+                    let Some(mouse_index) = Self::button_to_mouse_index(button) else {
+                        continue;
+                    };
+                    if input_state.picking_focus.is_aiming() {
+                        match mouse_index {
+                            MouseIndex::Left => input_state.handsfree_state.click = pressed,
+                            MouseIndex::Right => {
+                                input_state.handsfree_state.click = pressed;
+                                input_state.handsfree_state.click_modifier_right = pressed;
+                            }
+                            MouseIndex::Center if pressed => {
+                                tasks.enqueue(TaskType::Overlay(OverlayTask::ToggleEditMode));
+                            }
+                            _ => {}
+                        }
+                    } else if self.has_input_focus {
+                        self.manager.send_pointer_button(mouse_index, pressed);
+                    } else {
+                        hid_wrapper.inner.send_button(button as u16, pressed);
+                    }
+                }
+                input_capture::CapturedEvent::PointerMotion {
+                    dx,
+                    dy,
+                    dx_raw,
+                    dy_raw,
+                } => {
+                    mouse_delta += DVec2 { x: dx, y: dy };
+                    mouse_delta_raw += DVec2 {
+                        x: dx_raw,
+                        y: dy_raw,
+                    };
+                }
+                input_capture::CapturedEvent::PointerAxis {
+                    horizontal_v120,
+                    vertical_v120,
+                } => {
+                    let mut delta = WheelDelta {
+                        x: horizontal_v120 as f32,
+                        y: vertical_v120 as f32,
+                    };
+                    if input_state.picking_focus.is_aiming() {
+                        input_state.handsfree_state.scroll_y = (vertical_v120 as f32) * -0.12;
+                    } else if self.has_input_focus {
+                        self.manager.send_pointer_axis_wheel_raw(delta);
+                    } else {
+                        delta.y *= -1.0;
+                        hid_wrapper.inner.wheel(delta);
+                    }
+                }
+                input_capture::CapturedEvent::Grabbed => {
+                    audio_sample_player.play_sample(audio_system, "input_grab");
+                    if !self.grab_toast_sent {
+                        self.grab_toast_sent = true;
+                        //TODO: toast
+                        let _ = DbusConnector::notify_send(
+                            "WayVR has your keyboard and mouse!",
+                            "Super+Z to release",
+                            1,
+                            5000,
+                            0,
+                            true,
+                        );
+                    }
+                }
+                input_capture::CapturedEvent::Ungrabbed => {
+                    hid_wrapper.inner.send_key(hid::VirtualKey::LSuper, false);
+                    hid_wrapper.inner.send_key(hid::VirtualKey::RSuper, false);
+                    self.manager.release_all_keys();
+                    self.has_input_focus = false;
+                    self.wm.keyboard_focus = None;
+                    audio_sample_player.play_sample(audio_system, "input_ungrab");
+                }
+                input_capture::CapturedEvent::KeyCombo { combo, pressed } => match combo {
+                    input_capture::KeyCombo::CloseApp if pressed => {
+                        if let Some(hover) = self.wm.mouse.as_mut() {
+                            let window_handle = hover.hover_window;
+                            self.close_window(window_handle);
+                        }
+                    }
+                    input_capture::KeyCombo::SwitchApp => {
+                        if pressed {
+                            input_state.picking_focus = super::input::FocusPickState::Aiming;
+                            tasks.enqueue(TaskType::Overlay(OverlayTask::Modify(
+                                OverlaySelector::Name(ALTTAB_HELP_NAME.clone()),
+                                Box::new(move |app, o| {
+                                    o.activate(app);
+                                }),
+                            )));
+                        } else {
+                            input_state.picking_focus = super::input::FocusPickState::Picking;
+
+                            tasks.enqueue(TaskType::Overlay(OverlayTask::Modify(
+                                OverlaySelector::Name(ALTTAB_HELP_NAME.clone()),
+                                Box::new(move |_app, o| {
+                                    o.deactivate();
+                                }),
+                            )));
+                            tasks.enqueue_at(
+                                TaskType::Global(Box::new(|app| {
+                                    app.input_state.stop_picking();
+
+                                    let _ = std::mem::take(&mut app.input_state.handsfree_state);
+                                })),
+                                Instant::now() + Duration::from_millis(50),
+                            );
+                        }
+                    }
+                    _ => {}
+                },
+            }
         }
-        self.mouse_freeze = Instant::now() + Duration::from_millis(1); // prevent other pointer from moving the mouse on the same frame
+
+        if mouse_delta.length_squared() > 1e-6 {
+            if self.has_input_focus {
+                'mouse_update: {
+                    let Some(ref hover) = self.wm.mouse else {
+                        break 'mouse_update;
+                    };
+
+                    let Some(window) = self.wm.windows.get(hover.hover_window) else {
+                        break 'mouse_update;
+                    };
+                    let toplevel = window.toplevel.wl_surface().clone();
+                    let inner_extent = with_states(&toplevel, |states| {
+                        SurfaceBufWithImage::get_from_surface(states)
+                            .map(|s| s.image.extent_u32arr())
+                            .unwrap_or([1, 1])
+                    });
+                    let Some(hit_ctx) = build_hit_context(
+                        &toplevel,
+                        &self.manager.state.popup_manager,
+                        inner_extent,
+                    ) else {
+                        break 'mouse_update;
+                    };
+
+                    let new_x = (hover.pos.x + mouse_delta.x).clamp(0., inner_extent[0] as f64);
+                    let new_y = (hover.pos.y + mouse_delta.y).clamp(0., inner_extent[1] as f64);
+                    let new_pos = DVec2::new(new_x, new_y);
+                    let new_pos_f32 = Vec2::new(new_x as f32, new_y as f32);
+
+                    let target = hit_ctx.hit_target_at(new_pos_f32);
+                    let focus_target = self.hit_target_to_focus(
+                        target.unwrap_or(WvrHitTarget::Toplevel { pos: new_pos_f32 }),
+                        hover.hover_window,
+                        new_pos_f32,
+                    );
+                    self.send_mouse_move_relative(
+                        focus_target,
+                        new_pos,
+                        mouse_delta,
+                        mouse_delta_raw,
+                        hover.hover_window,
+                    );
+                }
+            } else {
+                // no has_input_focus → send back to desktop
+                hid_wrapper.inner.mouse_move_rel(mouse_delta);
+            }
+        }
+    }
+
+    fn button_to_mouse_index(button: u32) -> Option<MouseIndex> {
+        match button {
+            272 => Some(MouseIndex::Left),
+            273 => Some(MouseIndex::Right),
+            274 => Some(MouseIndex::Center),
+            _ => None,
+        }
+    }
+
+    /// Use HidWrapper::set_input_focus instead!!!
+    pub fn set_input_focus(&mut self, has_focus: bool) {
+        self.has_input_focus = has_focus;
+        if !has_focus {
+            self.wm.mouse = None;
+        }
+    }
+
+    pub fn get_focused_window(&self) -> Option<window::WindowHandle> {
+        if !self.has_input_focus {
+            return None;
+        }
+        self.wm.keyboard_focus.clone()
+    }
+
+    fn get_mouse_focus(
+        &mut self,
+        target: PointerFocusTarget,
+        hover_window: window::WindowHandle,
+        pressed: bool,
+    ) -> (Option<(WlSurface, Vec2)>, Option<WlSurface>) {
+        match target {
+            PointerFocusTarget::Surface { surface, origin } => (Some((surface, origin)), None),
+            PointerFocusTarget::Toplevel => {
+                let surface = self
+                    .wm
+                    .windows
+                    .get(hover_window)
+                    .map(|x| x.toplevel.wl_surface().clone());
+
+                (
+                    surface.clone().map(|surface| (surface, Vec2::ZERO)),
+                    pressed.then_some(surface).flatten(),
+                )
+            }
+            PointerFocusTarget::None => {
+                let surface = self
+                    .wm
+                    .windows
+                    .get(hover_window)
+                    .map(|x| x.toplevel.wl_surface().clone());
+                (None, pressed.then_some(surface).flatten())
+            }
+        }
+    }
+
+    fn get_mouse_relative(&self, global_pos: DVec2, hover_window: window::WindowHandle) -> DVec2 {
+        let Some(ref mouse) = self.wm.mouse else {
+            return DVec2::ZERO;
+        };
+        if hover_window != mouse.hover_window {
+            // don't twitch if we just switched windows
+            return DVec2::ZERO;
+        }
+        global_pos - mouse.pos
+    }
+
+    fn send_mouse_move_relative(
+        &mut self,
+        target: PointerFocusTarget,
+        global_pos: DVec2,
+        delta: DVec2,
+        delta_unaccel: DVec2,
+        hover_window: window::WindowHandle,
+    ) {
+        let (focus, _) = self.get_mouse_focus(target, hover_window, false);
+
+        self.manager
+            .send_mouse_move(focus, global_pos, delta, delta_unaccel);
+        self.mouse_freeze = Instant::now() + Duration::from_millis(1);
         self.wm.mouse = Some(window::MouseState {
-            hover_window: handle,
-            x,
-            y,
+            hover_window,
+            pos: global_pos,
         });
     }
 
-    pub fn send_mouse_down(
+    pub fn send_mouse_move(
         &mut self,
-        click_freeze: i32,
-        handle: window::WindowHandle,
-        index: MouseIndex,
+        target: PointerFocusTarget,
+        global_pos: Vec2,
+        hover_window: window::WindowHandle,
+        picking_focus: bool,
     ) {
-        self.mouse_freeze = Instant::now() + Duration::from_millis(click_freeze as _);
-
-        if let Some(window) = self.wm.windows.get_mut(&handle) {
-            window.send_mouse_down(&mut self.manager, index);
+        if self.mouse_freeze > Instant::now() {
+            return;
         }
+
+        let global_pos = DVec2::from(global_pos);
+
+        let (focus, focus_keyboard) = self.get_mouse_focus(target, hover_window, picking_focus);
+        if focus_keyboard.is_some() {
+            self.manager.seat_keyboard.set_focus(
+                &mut self.manager.state,
+                focus_keyboard,
+                self.manager.serial_counter.next_serial(),
+            );
+
+            self.wm.keyboard_focus = Some(hover_window);
+        }
+
+        let linear_delta = self.get_mouse_relative(global_pos, hover_window);
+        self.manager
+            .send_mouse_move(focus, global_pos, linear_delta, linear_delta);
+        self.mouse_freeze = Instant::now() + Duration::from_millis(1);
+        self.wm.mouse = Some(window::MouseState {
+            hover_window,
+            pos: global_pos,
+        });
     }
 
-    pub fn send_mouse_up(&mut self, index: MouseIndex) {
-        Window::send_mouse_up(&mut self.manager, index);
+    pub fn send_mouse_button(
+        &mut self,
+        target: PointerFocusTarget,
+        global_pos: Vec2,
+        hover_window: window::WindowHandle,
+        index: MouseIndex,
+        pressed: bool,
+        click_freeze: i32,
+    ) {
+        if pressed {
+            self.mouse_freeze = Instant::now() + Duration::from_millis(click_freeze.max(0) as u64);
+        }
+
+        let (focus, focus_keyboard) = self.get_mouse_focus(target, hover_window, pressed);
+
+        if focus_keyboard.is_some() {
+            self.manager.seat_keyboard.set_focus(
+                &mut self.manager.state,
+                focus_keyboard,
+                self.manager.serial_counter.next_serial(),
+            );
+
+            self.wm.keyboard_focus = Some(hover_window);
+        }
+
+        let global_pos = DVec2::from(global_pos);
+        let linear_delta = self.get_mouse_relative(global_pos, hover_window);
+
+        self.manager
+            .send_mouse_move(focus, global_pos, linear_delta, linear_delta);
+        self.wm.mouse = Some(window::MouseState {
+            hover_window,
+            pos: global_pos,
+        });
+        self.manager.send_pointer_button(index, pressed);
     }
 
-    pub fn send_mouse_scroll(&mut self, delta: WheelDelta) {
-        Window::send_mouse_scroll(&mut self.manager, delta);
+    pub fn send_mouse_scroll(
+        &mut self,
+        hover_window: window::WindowHandle,
+        global_pos: Vec2,
+        delta: WheelDelta,
+    ) {
+        let global_pos = DVec2::from(global_pos);
+        self.wm.mouse = Some(window::MouseState {
+            hover_window,
+            pos: global_pos,
+        });
+
+        self.manager.send_pointer_axis_wheel_accumulated(delta);
     }
 
     pub fn send_key(&mut self, virtual_key: u32, down: bool) {
@@ -629,9 +1200,13 @@ impl WvrServerState {
         self.cur_modifiers = modifiers;
     }
 
+    pub fn set_clipboard(&mut self, content: &str) {
+        self.manager.state.set_clipboard_text(content);
+    }
+
     pub fn add_external_process(&mut self, pid: u32) -> process::ProcessHandle {
         self.processes
-            .add(process::Process::External(process::ExternalProcess { pid }))
+            .insert(process::Process::External(process::ExternalProcess { pid }))
     }
 
     #[allow(clippy::too_many_arguments)]
@@ -653,8 +1228,8 @@ impl WvrServerState {
             exec_path.ends_with("flatpak") && args.first().is_some_and(|a| *a == "run");
 
         let mut cmd = std::process::Command::new(exec_path);
-        self.configure_env(&mut cmd, auth_key.as_str(), is_flatpak);
-        cmd.args(args);
+        self.configure_env(&mut cmd, auth_key.as_str(), is_flatpak, args);
+
         if let Some(working_dir) = working_dir {
             cmd.current_dir(working_dir);
         }
@@ -667,7 +1242,7 @@ impl WvrServerState {
 
         let handle = self
             .processes
-            .add(process::Process::Managed(process::WayVRProcess {
+            .insert(process::Process::Managed(process::WayVRProcess {
                 auth_key,
                 child,
                 exec_path: String::from(exec_path),
@@ -684,26 +1259,62 @@ impl WvrServerState {
                 pos_mode,
             }));
 
-        self.signals.send(WayVRSignal::BroadcastStateChanged(
-            packet_server::WvrStateChanged::ProcessCreated,
-        ));
-
         Ok(handle)
     }
 
-    fn configure_env(&self, cmd: &mut std::process::Command, auth_key: &str, is_flatpak: bool) {
-        cmd.env_remove("DISPLAY"); // Goodbye X11
-        cmd.env(
-            "WAYLAND_DISPLAY",
-            self.manager.wayland_env.display_num_string(),
-        );
+    fn configure_env(
+        &self,
+        cmd: &mut std::process::Command,
+        auth_key: &str,
+        is_flatpak: bool,
+        args: &[&str],
+    ) {
+        let wayland_display = self.manager.wayland_env.wayland_display_num_string();
+        let x11_display = self.manager.wayland_env.display_num_string();
+
+        // these go to env for flatpak as well
+        cmd.env("WAYLAND_DISPLAY", wayland_display);
+        cmd.env("DISPLAY", x11_display);
 
         if is_flatpak {
-            // doesn't seem to work all that well
+            // need to inject --env after "run" because --env is a
+            // "flatpak run" arg, not a global "flatpak" arg
+            let mut iter = args.iter();
+
+            if let Some(first) = iter.next() {
+                // add "run"
+                cmd.arg(first);
+            } else {
+                // idk so let's just bail
+                return;
+            }
+
+            // add args for "flatpak run"
             cmd.arg(format!("--env=WAYVR_DISPLAY_AUTH={auth_key}"));
-        } else {
-            cmd.env("WAYVR_DISPLAY_AUTH", auth_key);
+            cmd.arg("--env=GDK_BACKEND=wayland,x11");
+            cmd.arg("--env=QT_QPA_PLATFORM=wayland;xcb");
+            cmd.arg("--env=SDL_VIDEODRIVER=wayland");
+            cmd.arg("--env=CLUTTER_BACKEND=wayland");
+            cmd.arg("--env=MOZ_ENABLE_WAYLAND=1");
+            cmd.arg("--env=ELECTRON_OZONE_PLATFORM_HINT=wayland");
+
+            // flatpak app id / remaining args
+            for arg in iter {
+                cmd.arg(arg);
+            }
+
+            return;
         }
+
+        cmd.env("WAYVR_DISPLAY_AUTH", auth_key);
+        cmd.env("GDK_BACKEND", "wayland,x11");
+        cmd.env("QT_QPA_PLATFORM", "wayland;xcb");
+        cmd.env("SDL_VIDEODRIVER", "wayland");
+        cmd.env("CLUTTER_BACKEND", "wayland");
+        cmd.env("MOZ_ENABLE_WAYLAND", "1");
+        cmd.env("ELECTRON_OZONE_PLATFORM_HINT", "wayland");
+
+        cmd.args(args);
     }
 }
 
@@ -714,6 +1325,7 @@ fn generate_auth_key() -> String {
 
 struct SurfaceBufWithImageContainer {
     inner: RefCell<SurfaceBufWithImage>,
+    retained_dmabuf_buffer: RefCell<Option<wl_buffer::WlBuffer>>,
 }
 
 #[derive(Clone)]
@@ -726,15 +1338,22 @@ pub struct SurfaceBufWithImage {
 }
 
 impl SurfaceBufWithImage {
-    fn apply_to_surface(self, surface_data: &SurfaceData) {
+    fn apply_to_surface(
+        self,
+        surface_data: &SurfaceData,
+        retained_buffer: Option<wl_buffer::WlBuffer>,
+    ) -> Option<wl_buffer::WlBuffer> {
         if let Some(container) = surface_data.data_map.get::<SurfaceBufWithImageContainer>() {
             container.inner.replace(self);
+            container.retained_dmabuf_buffer.replace(retained_buffer)
         } else {
             surface_data
                 .data_map
                 .insert_if_missing(|| SurfaceBufWithImageContainer {
                     inner: RefCell::new(self),
+                    retained_dmabuf_buffer: RefCell::new(retained_buffer),
                 });
+            None
         }
     }
 
diff --git a/wayvr/src/backend/wayvr/process.rs b/wayvr/src/backend/wayvr/process.rs
index 811fc026..3841a679 100644
--- a/wayvr/src/backend/wayvr/process.rs
+++ b/wayvr/src/backend/wayvr/process.rs
@@ -1,9 +1,8 @@
 use std::{collections::HashMap, io::Read, sync::Arc};
 
+use slotmap::{DenseSlotMap, new_key_type};
 use wayvr_ipc::{packet_client, packet_server};
 
-use crate::gen_id;
-
 #[derive(Debug)]
 #[allow(dead_code)]
 pub struct WayVRProcess {
@@ -176,24 +175,26 @@ impl ExternalProcess {
     }
 }
 
-gen_id!(ProcessVec, Process, ProcessCell, ProcessHandle);
+new_key_type! {
+    pub struct ProcessHandle;
+}
 
-pub fn find_by_pid(processes: &ProcessVec, pid: u32) -> Option<ProcessHandle> {
+pub fn find_by_pid(
+    processes: &DenseSlotMap<ProcessHandle, Process>,
+    pid: u32,
+) -> Option<ProcessHandle> {
     log::debug!("Finding process with PID {pid}");
 
-    for (idx, cell) in processes.vec.iter().enumerate() {
-        let Some(cell) = cell else {
-            continue;
-        };
-        match &cell.obj {
+    for (handle, process) in processes {
+        match &process {
             Process::Managed(wayvr_process) => {
                 if wayvr_process.child.id() == pid {
-                    return Some(ProcessVec::get_handle(cell, idx));
+                    return Some(handle);
                 }
             }
             Process::External(external_process) => {
                 if external_process.pid == pid {
-                    return Some(ProcessVec::get_handle(cell, idx));
+                    return Some(handle);
                 }
             }
         }
@@ -202,14 +203,11 @@ pub fn find_by_pid(processes: &ProcessVec, pid: u32) -> Option<ProcessHandle> {
     log::debug!("Finding by PID failed, trying WAYVR_DISPLAY_AUTH...");
 
     if let Ok(Some(value)) = get_process_env_value(pid as i32, "WAYVR_DISPLAY_AUTH") {
-        for (idx, cell) in processes.vec.iter().enumerate() {
-            let Some(cell) = cell else {
-                continue;
-            };
-            if let Process::Managed(wayvr_process) = &cell.obj
+        for (handle, process) in processes {
+            if let Process::Managed(wayvr_process) = &process
                 && wayvr_process.auth_key == value
             {
-                return Some(ProcessVec::get_handle(cell, idx));
+                return Some(handle);
             }
         }
     }
@@ -219,17 +217,13 @@ pub fn find_by_pid(processes: &ProcessVec, pid: u32) -> Option<ProcessHandle> {
 }
 
 impl ProcessHandle {
-    pub const fn from_packet(handle: packet_server::WvrProcessHandle) -> Self {
-        Self {
-            generation: handle.generation,
-            idx: handle.idx,
-        }
+    pub fn from_packet(handle: packet_server::WvrProcessHandle) -> Self {
+        Self::from(slotmap::KeyData::from_ffi(handle.user))
     }
 
-    pub const fn as_packet(&self) -> packet_server::WvrProcessHandle {
+    pub fn as_packet(&self) -> packet_server::WvrProcessHandle {
         packet_server::WvrProcessHandle {
-            idx: self.idx,
-            generation: self.generation,
+            user: self.0.as_ffi(),
         }
     }
 }
diff --git a/wayvr/src/backend/wayvr/window.rs b/wayvr/src/backend/wayvr/window.rs
index de454370..9a65c3fb 100644
--- a/wayvr/src/backend/wayvr/window.rs
+++ b/wayvr/src/backend/wayvr/window.rs
@@ -1,179 +1,137 @@
 use std::rc::Rc;
 
-use smithay::backend::input::{AxisRelativeDirection, AxisSource};
-use smithay::{
-    input,
-    utils::{Logical, Point},
-    wayland::shell::xdg::ToplevelSurface,
-};
+use glam::DVec2;
+use slotmap::{DenseSlotMap, new_key_type};
+use smithay::utils::{Logical, Size};
+use smithay::wayland::shell::xdg::ToplevelSurface;
 use wayvr_ipc::packet_server;
 
-use crate::{
-    backend::wayvr::{client::WayVRCompositor, process},
-    gen_id,
-    subsystem::hid::WheelDelta,
-};
+use crate::backend::wayvr::process;
 
 #[derive(Debug)]
 pub struct Window {
+    pub min_size: Size<i32, Logical>,
+    pub max_size: Size<i32, Logical>,
+    pub bounds: Size<i32, Logical>,
     pub size_x: u32,
     pub size_y: u32,
     pub visible: bool,
     pub toplevel: Rc<ToplevelSurface>,
     pub process: process::ProcessHandle,
+
+    pub pending_configure_size: Option<Size<i32, Logical>>,
 }
 
 impl Window {
-    const fn new(toplevel: Rc<ToplevelSurface>, process: process::ProcessHandle) -> Self {
+    fn new(
+        toplevel: Rc<ToplevelSurface>,
+        process: process::ProcessHandle,
+        bounds: Size<i32, Logical>,
+        min_size: Size<i32, Logical>,
+        max_size: Size<i32, Logical>,
+    ) -> Self {
         Self {
+            bounds,
+            min_size,
+            max_size: max_size.clamp(Size::new(160, 160), bounds),
             size_x: 0,
             size_y: 0,
             visible: true,
             toplevel,
             process,
+            pending_configure_size: None,
         }
     }
 
-    pub fn set_size(&mut self, size_x: u32, size_y: u32) {
+    pub fn resizable(&self) -> bool {
+        self.min_size != self.max_size
+    }
+
+    pub fn clamp_configure_size(
+        &self,
+        size: Size<i32, Logical>,
+        bounds: Size<i32, Logical>,
+    ) -> Size<i32, Logical> {
+        let min_size = Size::new(
+            self.min_size.w.max(1).min(bounds.w),
+            self.min_size.h.max(1).min(bounds.h),
+        );
+
+        let max_size = Size::new(
+            self.max_size.w.max(min_size.w).min(bounds.w),
+            self.max_size.h.max(min_size.h).min(bounds.h),
+        );
+
+        Size::new(size.w.max(1), size.h.max(1)).clamp(min_size, max_size)
+    }
+
+    fn send_size_configure(&mut self, size: Size<i32, Logical>, bounds: Size<i32, Logical>) {
+        let clamped_size = self.clamp_configure_size(size, bounds);
+
+        if self.pending_configure_size == Some(clamped_size) {
+            return;
+        }
+
         self.toplevel.with_pending_state(|state| {
-            //state.bounds = Some((size_x as i32, size_y as i32).into());
-            state.size = Some((size_x as i32, size_y as i32).into());
+            state.bounds = Some(bounds);
+            state.size = Some(clamped_size);
         });
+
         self.toplevel.send_configure();
 
+        self.bounds = bounds;
+        self.pending_configure_size = Some(clamped_size);
+    }
+
+    pub fn checked_configure_size(&mut self, size: Size<i32, Logical>) {
+        self.send_size_configure(size, self.bounds);
+    }
+
+    pub fn request_size(&mut self, size: Size<i32, Logical>, bounds: Size<i32, Logical>) {
+        self.send_size_configure(size, bounds);
+    }
+
+    pub fn remember_committed_size(&mut self, size: Size<i32, Logical>) -> bool {
+        let size_x = size.w.max(1) as u32;
+        let size_y = size.h.max(1) as u32;
+
+        let changed = self.size_x != size_x || self.size_y != size_y;
+
         self.size_x = size_x;
         self.size_y = size_y;
-    }
 
-    pub(super) fn send_mouse_move(&self, manager: &mut WayVRCompositor, x: u32, y: u32) {
-        let surf = self.toplevel.wl_surface().clone();
-        let point = Point::<f64, Logical>::from((f64::from(x as i32), f64::from(y as i32)));
+        self.pending_configure_size = None;
 
-        manager.seat_pointer.motion(
-            &mut manager.state,
-            Some((surf, Point::from((0.0, 0.0)))),
-            &input::pointer::MotionEvent {
-                serial: manager.serial_counter.next_serial(),
-                time: 0,
-                location: point,
-            },
-        );
-
-        manager.seat_pointer.frame(&mut manager.state);
-    }
-
-    const fn get_mouse_index_number(index: super::MouseIndex) -> u32 {
-        match index {
-            super::MouseIndex::Left => 0x110,   /* BTN_LEFT */
-            super::MouseIndex::Center => 0x112, /* BTN_MIDDLE */
-            super::MouseIndex::Right => 0x111,  /* BTN_RIGHT */
-        }
-    }
-
-    pub(super) fn send_mouse_down(
-        &mut self,
-        manager: &mut WayVRCompositor,
-        index: super::MouseIndex,
-    ) {
-        let surf = self.toplevel.wl_surface().clone();
-
-        // Change keyboard focus to pressed window
-        manager.seat_keyboard.set_focus(
-            &mut manager.state,
-            Some(surf),
-            manager.serial_counter.next_serial(),
-        );
-
-        manager.seat_pointer.button(
-            &mut manager.state,
-            &input::pointer::ButtonEvent {
-                button: Self::get_mouse_index_number(index),
-                serial: manager.serial_counter.next_serial(),
-                time: 0,
-                state: smithay::backend::input::ButtonState::Pressed,
-            },
-        );
-
-        manager.seat_pointer.frame(&mut manager.state);
-    }
-
-    pub(super) fn send_mouse_up(manager: &mut WayVRCompositor, index: super::MouseIndex) {
-        manager.seat_pointer.button(
-            &mut manager.state,
-            &input::pointer::ButtonEvent {
-                button: Self::get_mouse_index_number(index),
-                serial: manager.serial_counter.next_serial(),
-                time: 0,
-                state: smithay::backend::input::ButtonState::Released,
-            },
-        );
-
-        manager.seat_pointer.frame(&mut manager.state);
-    }
-
-    pub(super) fn send_mouse_scroll(manager: &mut WayVRCompositor, delta: WheelDelta) {
-        // workaround: it seems that with one event most applications work fine, but cage doesn't
-        manager.seat_pointer.axis(
-            &mut manager.state,
-            input::pointer::AxisFrame {
-                source: Some(AxisSource::Continuous),
-                relative_direction: (
-                    AxisRelativeDirection::Identical,
-                    AxisRelativeDirection::Identical,
-                ),
-                time: 0,
-                axis: (f64::from(delta.x), 0.0),
-                v120: Some(((delta.x * 64.0) as i32, 0)),
-                stop: (false, false),
-            },
-        );
-
-        manager.seat_pointer.axis(
-            &mut manager.state,
-            input::pointer::AxisFrame {
-                source: Some(AxisSource::Continuous),
-                relative_direction: (
-                    AxisRelativeDirection::Identical,
-                    AxisRelativeDirection::Identical,
-                ),
-                time: 0,
-                axis: (0.0, f64::from(-delta.y)),
-                v120: Some((0, (delta.y * -64.0) as i32)),
-                stop: (false, false),
-            },
-        );
-        manager.seat_pointer.frame(&mut manager.state);
+        changed
     }
 }
 
 #[derive(Debug)]
 pub struct MouseState {
     pub hover_window: WindowHandle,
-    pub x: u32,
-    pub y: u32,
+    pub pos: DVec2,
 }
 
 #[derive(Debug)]
 pub struct WindowManager {
-    pub windows: WindowVec,
+    pub windows: DenseSlotMap<WindowHandle, Window>,
     pub mouse: Option<MouseState>,
+    pub keyboard_focus: Option<WindowHandle>,
 }
 
 impl WindowManager {
-    pub const fn new() -> Self {
+    pub fn new() -> Self {
         Self {
-            windows: WindowVec::new(),
+            windows: Default::default(),
             mouse: None,
+            keyboard_focus: None,
         }
     }
 
     pub fn find_window_handle(&self, toplevel: &ToplevelSurface) -> Option<WindowHandle> {
-        for (idx, cell) in self.windows.vec.iter().enumerate() {
-            if let Some(cell) = cell {
-                let window = &cell.obj;
-                if *window.toplevel == *toplevel {
-                    return Some(WindowVec::get_handle(cell, idx));
-                }
+        for (handle, window) in &self.windows {
+            if *window.toplevel == *toplevel {
+                return Some(handle);
             }
         }
         None
@@ -183,33 +141,34 @@ impl WindowManager {
         &mut self,
         toplevel: Rc<ToplevelSurface>,
         process: process::ProcessHandle,
+        bounds: Size<i32, Logical>,
+        min_size: Size<i32, Logical>,
+        max_size: Size<i32, Logical>,
         size_x: u32,
         size_y: u32,
     ) -> WindowHandle {
-        let mut window = Window::new(toplevel, process);
-        window.set_size(size_x, size_y);
-        self.windows.add(window)
+        let mut window = Window::new(toplevel, process, bounds, min_size, max_size);
+        window.remember_committed_size(Size::new(size_x as i32, size_y as i32));
+        self.windows.insert(window)
     }
 
     pub fn remove_window(&mut self, window_handle: WindowHandle) {
-        self.windows.remove(&window_handle);
+        self.windows.remove(window_handle);
     }
 }
 
-gen_id!(WindowVec, Window, WindowCell, WindowHandle);
+new_key_type! {
+    pub struct WindowHandle;
+}
 
 impl WindowHandle {
-    pub const fn from_packet(handle: packet_server::WvrWindowHandle) -> Self {
-        Self {
-            generation: handle.generation,
-            idx: handle.idx,
-        }
+    pub fn from_packet(handle: packet_server::WvrWindowHandle) -> Self {
+        Self::from(slotmap::KeyData::from_ffi(handle.user))
     }
 
-    pub const fn as_packet(&self) -> packet_server::WvrWindowHandle {
+    pub fn as_packet(&self) -> packet_server::WvrWindowHandle {
         packet_server::WvrWindowHandle {
-            idx: self.idx,
-            generation: self.generation,
+            user: self.0.as_ffi(),
         }
     }
 }
diff --git a/wayvr/src/config.rs b/wayvr/src/config.rs
index ab19a337..30fbf276 100644
--- a/wayvr/src/config.rs
+++ b/wayvr/src/config.rs
@@ -1,12 +1,16 @@
 use config::{Config, File};
 use log::error;
 use serde::{Deserialize, Serialize};
-use std::path::PathBuf;
+use std::{
+    path::{Path, PathBuf},
+    sync::Arc,
+};
 use wayvr_ipc::packet_client::WvrProcessLaunchParams;
 use wlx_common::{
     astr_containers::AStrMap,
     config::{
-        AltModifier, CaptureMethod, GeneralConfig, HandsfreePointer, SerializedWindowSet,
+        AltModifier, CaptureMethod, ChromaKeyParams, GeneralConfig, HandsfreeAltTab,
+        HandsfreePointer, InputCaptureMethod, InputEmulationMethod, PinnedApp, SerializedWindowSet,
         SerializedWindowStates,
     },
     config_io,
@@ -45,6 +49,32 @@ where
     panic!("No usable config found.");
 }
 
+const SUPPORTED_EXTESIONS: [&str; 4] = ["yaml", "yml", "json", "json5"];
+
+fn is_supported_config_file(path: &Path) -> bool {
+    if path.is_dir() {
+        return false;
+    }
+    match path.extension().and_then(|e| e.to_str()) {
+        Some(ext) => {
+            for sup in SUPPORTED_EXTESIONS {
+                if sup.eq_ignore_ascii_case(ext) {
+                    return true;
+                }
+            }
+
+            log::error!(
+                "Unsupported file extension: \".{}\" in {}. Ignoring file.",
+                ext,
+                path.to_string_lossy()
+            );
+            debug_assert!(false);
+            false
+        }
+        _ => false,
+    }
+}
+
 pub fn load_config_with_conf_d<ConfigData>(
     root_config_filename: &str,
     ctype: config_io::ConfigRoot,
@@ -68,7 +98,8 @@ where
     if let Ok(paths_unsorted) = std::fs::read_dir(path_conf_d) {
         let mut paths: Vec<_> = paths_unsorted
             .filter_map(|r| match r {
-                Ok(entry) => Some(entry),
+                Ok(entry) if is_supported_config_file(&entry.path()) => Some(entry),
+                Ok(_other) => None,
                 Err(e) => {
                     error!("Failed to read conf.d directory: {e}");
                     None
@@ -115,10 +146,9 @@ pub struct AutoSettings {
     pub keyboard_sound_enabled: bool,
     pub upright_screen_fix: bool,
     pub double_cursor_fix: bool,
+    pub enable_watch: bool,
     pub sets_on_watch: bool,
     pub hide_grab_help: bool,
-    pub xr_click_sensitivity: f32,
-    pub xr_click_sensitivity_release: f32,
     pub allow_sliding: bool,
     pub focus_follows_mouse_mode: bool,
     pub left_handed_mouse: bool,
@@ -126,12 +156,22 @@ pub struct AutoSettings {
     pub block_game_input_ignore_watch: bool,
     pub block_poses_on_kbd_interaction: bool,
     pub space_drag_multiplier: f32,
+    pub watch_view_angle_min: f32,
+    pub watch_view_angle_max: f32,
     pub use_skybox: bool,
+    pub skybox_texture: Arc<str>,
     pub grid_opacity: f32,
     pub use_passthrough: bool,
     pub screen_render_down: bool,
     pub pointer_lerp_factor: f32,
     pub space_drag_unlocked: bool,
+    pub space_drag_affects_world: bool,
+    pub space_gravity_damping: f32,
+    pub space_gravity_enabled: bool,
+    pub space_gravity_fling_strength: f32,
+    pub space_gravity_gravity: f32,
+    pub space_gravity_ground_friction: f32,
+    pub space_gravity_floor_height: f32,
     pub space_rotate_unlocked: bool,
     pub clock_12h: bool,
     pub hide_username: bool,
@@ -142,8 +182,20 @@ pub struct AutoSettings {
     pub keyboard_middle_click_mode: AltModifier,
     pub keyboard_swipe_to_type_enabled: bool,
     pub autostart_apps: Vec<WvrProcessLaunchParams>,
+    pub pinned_apps: Vec<PinnedApp>,
     pub handsfree_pointer: HandsfreePointer,
+    pub handsfree_alt_tab: HandsfreeAltTab,
     pub language: Option<Language>,
+    pub chroma_key_params: ChromaKeyParams,
+    pub input_emulation_method: InputEmulationMethod,
+    pub tutorial_graduated: bool,
+    pub whisper_model: Arc<str>,
+    pub default_overlay_scale: f32,
+    pub color_palette: Arc<str>,
+    pub snap_angle_deg: f32,
+    pub wvr_mouse_acceleration: bool,
+    pub wvr_mouse_speed: f32,
+    pub wvr_input_capture: InputCaptureMethod,
 }
 
 fn get_settings_path() -> PathBuf {
@@ -167,10 +219,9 @@ pub fn save_settings(config: &GeneralConfig) -> anyhow::Result<()> {
         keyboard_sound_enabled: config.keyboard_sound_enabled,
         upright_screen_fix: config.upright_screen_fix,
         double_cursor_fix: config.double_cursor_fix,
+        enable_watch: config.enable_watch,
         sets_on_watch: config.sets_on_watch,
         hide_grab_help: config.hide_grab_help,
-        xr_click_sensitivity: config.xr_click_sensitivity,
-        xr_click_sensitivity_release: config.xr_click_sensitivity_release,
         allow_sliding: config.allow_sliding,
         focus_follows_mouse_mode: config.focus_follows_mouse_mode,
         left_handed_mouse: config.left_handed_mouse,
@@ -178,12 +229,22 @@ pub fn save_settings(config: &GeneralConfig) -> anyhow::Result<()> {
         block_game_input_ignore_watch: config.block_game_input_ignore_watch,
         block_poses_on_kbd_interaction: config.block_poses_on_kbd_interaction,
         space_drag_multiplier: config.space_drag_multiplier,
+        watch_view_angle_min: config.watch_view_angle_min,
+        watch_view_angle_max: config.watch_view_angle_max,
         use_skybox: config.use_skybox,
+        skybox_texture: config.skybox_texture.clone(),
         grid_opacity: config.grid_opacity,
         use_passthrough: config.use_passthrough,
         screen_render_down: config.screen_render_down,
         pointer_lerp_factor: config.pointer_lerp_factor,
         space_drag_unlocked: config.space_drag_unlocked,
+        space_drag_affects_world: config.space_drag_affects_world,
+        space_gravity_damping: config.space_gravity_damping,
+        space_gravity_enabled: config.space_gravity_enabled,
+        space_gravity_fling_strength: config.space_gravity_fling_strength,
+        space_gravity_gravity: config.space_gravity_gravity,
+        space_gravity_ground_friction: config.space_gravity_ground_friction,
+        space_gravity_floor_height: config.space_gravity_floor_height,
         space_rotate_unlocked: config.space_rotate_unlocked,
         clock_12h: config.clock_12h,
         hide_username: config.hide_username,
@@ -194,8 +255,20 @@ pub fn save_settings(config: &GeneralConfig) -> anyhow::Result<()> {
         keyboard_middle_click_mode: config.keyboard_middle_click_mode,
         keyboard_swipe_to_type_enabled: config.keyboard_swipe_to_type_enabled,
         autostart_apps: config.autostart_apps.clone(),
+        pinned_apps: config.pinned_apps.clone(),
         handsfree_pointer: config.handsfree_pointer,
+        handsfree_alt_tab: config.handsfree_alt_tab,
         language: config.language,
+        chroma_key_params: config.chroma_key_params.clone(),
+        input_emulation_method: config.input_emulation_method,
+        tutorial_graduated: config.tutorial_graduated,
+        whisper_model: config.whisper_model.clone(),
+        default_overlay_scale: config.default_overlay_scale,
+        color_palette: config.color_palette.clone(),
+        snap_angle_deg: config.snap_angle_deg,
+        wvr_mouse_acceleration: config.wvr_mouse_acceleration,
+        wvr_mouse_speed: config.wvr_mouse_speed,
+        wvr_input_capture: config.wvr_input_capture,
     };
 
     let json = serde_json::to_string_pretty(&conf).unwrap(); // want panic
diff --git a/wayvr/src/graphics/mod.rs b/wayvr/src/graphics/mod.rs
index 52ffa913..ea220a4c 100644
--- a/wayvr/src/graphics/mod.rs
+++ b/wayvr/src/graphics/mod.rs
@@ -21,7 +21,9 @@ use wgui::gfx::WGfx;
 use vulkano::instance::InstanceCreateFlags;
 use wlx_capture::DrmFormat;
 
-use crate::shaders::{frag_color, frag_grid, frag_screen, frag_srgb, vert_quad};
+use crate::shaders::{
+    frag_color, frag_grid, frag_screen, frag_simple, frag_sky, frag_srgb, vert_quad,
+};
 
 #[cfg(feature = "openxr")]
 use {ash::vk, std::os::raw::c_void};
@@ -74,12 +76,18 @@ impl WGfxExtras {
         let shader = frag_srgb::load(gfx.device.clone())?;
         shaders.insert("frag_srgb", shader);
 
+        let shader = frag_sky::load(gfx.device.clone())?;
+        shaders.insert("frag_sky", shader);
+
         let shader = frag_grid::load(gfx.device.clone())?;
         shaders.insert("frag_grid", shader);
 
         let shader = frag_screen::load(gfx.device.clone())?;
         shaders.insert("frag_screen", shader);
 
+        let shader = frag_simple::load(gfx.device.clone())?;
+        shaders.insert("frag_simple", shader);
+
         let drm_formats = get_drm_formats(gfx.device.clone()).into();
 
         let vertices = [
@@ -111,7 +119,7 @@ impl WGfxExtras {
                     | MemoryTypeFilter::HOST_SEQUENTIAL_WRITE,
                 ..Default::default()
             },
-            vertices.into_iter(),
+            vertices,
         )?;
 
         let mut cmd_xfer = gfx.create_xfer_command_buffer(CommandBufferUsage::OneTimeSubmit)?;
diff --git a/wayvr/src/gui/panel/button.rs b/wayvr/src/gui/panel/button.rs
index 01d6ce8c..840a0c82 100644
--- a/wayvr/src/gui/panel/button.rs
+++ b/wayvr/src/gui/panel/button.rs
@@ -1,6 +1,5 @@
 use std::{
     cell::RefCell,
-    collections::HashMap,
     process::{Child, Command, Stdio},
     rc::Rc,
     str::FromStr,
@@ -17,7 +16,7 @@ use wgui::{
     },
     layout::Layout,
     log::LogErr,
-    parser::{self, AttribPair, CustomAttribsInfoOwned, Fetchable, ParserState},
+    parser::{self, AttribPair, CustomAttribsInfoOwned, Fetchable, ParserState, TemplateParams},
     taffy,
     widget::EventResult,
     windowing::context_menu::{Blueprint, ContextMenu, OpenParams},
@@ -27,7 +26,7 @@ use wlx_common::{config::HandsfreePointer, overlays::ToastTopic};
 use crate::{
     RESTART, RUNNING,
     backend::{
-        task::{OverlayTask, PlayspaceTask, TaskType, ToggleMode},
+        task::{OverlayTask, PlayspaceTask, SpawnPos, TaskType, ToggleMode},
         wayvr::process::KillSignal,
     },
     gui::panel::{log_cmd_invalid_arg, log_cmd_missing_arg},
@@ -219,12 +218,12 @@ pub(super) fn setup_custom_button<S: 'static>(
                     };
 
                     // pass attribs with key `_context_{name}` to the context_menu template
-                    let mut template_params = HashMap::new();
+                    let mut template_params = TemplateParams::new();
                     for AttribPair { attrib, value } in &attribs.pairs {
                         const PREFIX: &str = "_context_";
                         #[allow(clippy::manual_strip)]
                         if attrib.starts_with(PREFIX) {
-                            template_params.insert(attrib[PREFIX.len()..].into(), value.clone());
+                            template_params.insert_rc(attrib[PREFIX.len()..].into(), value.clone());
                         }
                     }
 
@@ -442,8 +441,9 @@ pub(super) fn setup_custom_button<S: 'static>(
                                 app.tasks.enqueue(TaskType::Overlay(OverlayTask::Drop(
                                     OverlaySelector::Name(name.clone()),
                                 )));
-                                app.tasks.enqueue(TaskType::Overlay(OverlayTask::Create(
+                                app.tasks.enqueue(TaskType::Overlay(OverlayTask::Spawn(
                                     OverlaySelector::Name(owc.name.clone()),
+                                    SpawnPos::Spread,
                                     Box::new(move |app| {
                                         if let Some(mut owc) = create_custom(app, name) {
                                             owc.show_on_spawn = true;
@@ -535,13 +535,13 @@ pub(super) fn setup_custom_button<S: 'static>(
                     }
 
                     let name = crate::overlays::screen::mirror::new_mirror_name();
-                    app.tasks.enqueue(TaskType::Overlay(OverlayTask::Create(
+                    app.tasks.enqueue(TaskType::Overlay(OverlayTask::Spawn(
                         OverlaySelector::Name(name.clone()),
+                        SpawnPos::Spread,
                         Box::new(move |app| {
-                            Some(crate::overlays::screen::mirror::new_mirror(
-                                name,
-                                &app.session,
-                            ))
+                            crate::overlays::screen::mirror::new_mirror(name, app)
+                                .log_err("Could not create mirror")
+                                .ok()
                         }),
                     )));
                     Ok(EventResult::Consumed)
diff --git a/wayvr/src/gui/panel/device_list.rs b/wayvr/src/gui/panel/device_list.rs
index c2eb073c..2a5349f8 100644
--- a/wayvr/src/gui/panel/device_list.rs
+++ b/wayvr/src/gui/panel/device_list.rs
@@ -1,9 +1,7 @@
-use std::collections::HashMap;
-
 use slotmap::Key;
 use wgui::{
     layout::Layout,
-    parser::{Fetchable, ParseDocumentParams, ParserState},
+    parser::{Fetchable, ParseDocumentParams, ParserState, TemplateParams},
 };
 
 use crate::{
@@ -40,7 +38,7 @@ impl DeviceList {
                 layout.remove_children(devices_root);
 
                 for (i, device) in app.input_state.devices.iter().enumerate() {
-                    let mut params = HashMap::new();
+                    let mut params = TemplateParams::new();
 
                     if matches!(device.role, TrackedDeviceRole::None) {
                         continue;
@@ -48,7 +46,7 @@ impl DeviceList {
 
                     let template = device.role.as_ref();
 
-                    params.insert("idx".into(), i.to_string().into());
+                    params.insert_rc("idx", i.to_string().into());
                     parser_state.instantiate_template(
                         doc_params,
                         template,
diff --git a/wayvr/src/gui/panel/label.rs b/wayvr/src/gui/panel/label.rs
index 6ed8afdb..24b8f4ab 100644
--- a/wayvr/src/gui/panel/label.rs
+++ b/wayvr/src/gui/panel/label.rs
@@ -3,12 +3,14 @@ use std::rc::Rc;
 use chrono::DateTime;
 use chrono::Local;
 use chrono_tz::Tz;
+use wgui::color::WguiColor;
+use wgui::globals::WguiGlobals;
 use wgui::{
     drawing,
     event::{self, EventCallback},
     i18n::Translation,
     layout::Layout,
-    parser::{CustomAttribsInfoOwned, ParserState, parse_color_hex},
+    parser::{CustomAttribsInfoOwned, ParserState},
     widget::{EventResult, label::WidgetLabel},
 };
 
@@ -17,6 +19,24 @@ use crate::{
     state::AppState,
 };
 
+fn parse_color(
+    attribs: &CustomAttribsInfoOwned,
+    key: &str,
+    globals: &WguiGlobals,
+    default: drawing::Color,
+) -> WguiColor {
+    let Some(value) = attribs.get_value(key) else {
+        return default.into();
+    };
+    if let Some(color) = drawing::Color::from_hex(value) {
+        return color.into();
+    }
+    if let Some(color) = globals.get().palette.find(value) {
+        return color;
+    }
+    default.into()
+}
+
 #[allow(clippy::too_many_lines)]
 pub(super) fn setup_custom_label<S: 'static>(
     layout: &mut Layout,
@@ -44,18 +64,19 @@ pub(super) fn setup_custom_label<S: 'static>(
             };
 
             let state = BatteryLabelState {
-                low_color: attribs
-                    .get_value("_low_color")
-                    .and_then(parse_color_hex)
-                    .unwrap_or(BAT_LOW),
-                normal_color: attribs
-                    .get_value("_normal_color")
-                    .and_then(parse_color_hex)
-                    .unwrap_or(BAT_NORMAL),
-                charging_color: attribs
-                    .get_value("_charging_color")
-                    .and_then(parse_color_hex)
-                    .unwrap_or(BAT_CHARGING),
+                low_color: parse_color(attribs, "_low_color", &layout.state.globals, BAT_LOW),
+                normal_color: parse_color(
+                    attribs,
+                    "_normal_color",
+                    &layout.state.globals,
+                    BAT_NORMAL,
+                ),
+                charging_color: parse_color(
+                    attribs,
+                    "_charging_color",
+                    &layout.state.globals,
+                    BAT_CHARGING,
+                ),
                 low_threshold: attribs
                     .get_value("_low_threshold")
                     .and_then(|s| s.parse().ok())
@@ -182,9 +203,9 @@ const BAT_LOW_THRESHOLD: u32 = 30;
 
 struct BatteryLabelState {
     device: usize,
-    low_color: drawing::Color,
-    normal_color: drawing::Color,
-    charging_color: drawing::Color,
+    low_color: WguiColor,
+    normal_color: WguiColor,
+    charging_color: WguiColor,
     low_threshold: u32,
 }
 
diff --git a/wayvr/src/gui/panel/mod.rs b/wayvr/src/gui/panel/mod.rs
index 85b89615..bcd8ffff 100644
--- a/wayvr/src/gui/panel/mod.rs
+++ b/wayvr/src/gui/panel/mod.rs
@@ -1,38 +1,4 @@
-use std::{cell::RefCell, rc::Rc};
-
-use anyhow::Context;
-use button::setup_custom_button;
-use glam::{Affine2, Vec2, vec2};
-use idmap::IdMap;
-use label::setup_custom_label;
-use wgui::{
-    assets::AssetPath,
-    components::{
-        button::ComponentButton, checkbox::ComponentCheckbox, radio_group::ComponentRadioGroup,
-        slider::ComponentSlider,
-    },
-    event::{
-        CallbackDataCommon, Event as WguiEvent, EventAlterables, EventCallback, EventListenerID,
-        EventListenerKind, InternalStateChangeEvent, MouseButtonEvent, MouseButtonIndex,
-        MouseLeaveEvent, MouseMotionEvent, MouseWheelEvent,
-    },
-    gfx::cmd::WGfxClearMode,
-    i18n::Translation,
-    layout::{Layout, LayoutParams, LayoutUpdateParams, WidgetID},
-    parser::{
-        self, CustomAttribsInfoOwned, Fetchable, ParseDocumentExtra, ParserState, parse_color_hex,
-    },
-    renderer_vk::{context::Context as WguiContext, text::custom_glyph::CustomGlyphData},
-    taffy,
-    widget::{
-        EventResult, image::WidgetImage, label::WidgetLabel, rectangle::WidgetRectangle,
-        sprite::WidgetSprite,
-    },
-    windowing::context_menu::{self, ContextMenu},
-};
-use wlx_common::overlays::{BackendAttrib, BackendAttribValue};
-use wlx_common::timestep::Timestep;
-
+use super::timer::GuiTimer;
 use crate::{
     app_misc,
     backend::input::{Haptics, HoverResult, PointerHit, PointerMode},
@@ -43,8 +9,37 @@ use crate::{
         FrameMeta, OverlayBackend, OverlayEventData, RenderResources, ShouldRender, ui_transform,
     },
 };
-
-use super::timer::GuiTimer;
+use anyhow::Context;
+use button::setup_custom_button;
+use glam::{Affine2, Vec2, vec2};
+use idmap::IdMap;
+use label::setup_custom_label;
+use std::{cell::RefCell, collections::HashMap, rc::Rc};
+use wgui::{
+    assets::AssetPath,
+    components::{
+        button::ComponentButton, checkbox::ComponentCheckbox, radio_group::ComponentRadioGroup,
+        slider::ComponentSlider,
+    },
+    drawing,
+    event::{
+        DeviceBitmask, Event as WguiEvent, EventCallback, EventListenerID, EventListenerKind,
+        InternalStateChangeEvent, MouseButtonEvent, MouseButtonIndex, MouseLeaveEvent,
+        MouseMotionEvent, MouseWheelEvent,
+    },
+    gfx::cmd::WGfxClearMode,
+    i18n::Translation,
+    layout::{Layout, LayoutParams, LayoutTask, LayoutUpdateParams, WidgetID},
+    parser::{self, CustomAttribsInfoOwned, Fetchable, ParseDocumentExtra, ParserState},
+    renderer_vk::{context::Context as WguiContext, text::custom_glyph::CustomGlyphData},
+    widget::{
+        EventResult, image::WidgetImage, label::WidgetLabel, rectangle::WidgetRectangle,
+        sprite::WidgetSprite,
+    },
+    windowing::context_menu::{self, ContextMenu},
+};
+use wlx_common::overlays::{BackendAttrib, BackendAttribValue};
+use wlx_common::timestep::Timestep;
 
 pub mod button;
 pub mod device_list;
@@ -99,6 +94,7 @@ pub struct NewGuiPanelParams<S> {
     pub resize_to_parent: bool,
     pub external_xml: bool,
     pub gui_scale: f32,
+    pub extra_vars: HashMap<Rc<str>, Rc<str>>,
 }
 
 impl<S> Default for NewGuiPanelParams<S> {
@@ -109,6 +105,7 @@ impl<S> Default for NewGuiPanelParams<S> {
             resize_to_parent: false,
             external_xml: false,
             gui_scale: 1.0,
+            extra_vars: HashMap::default(),
         }
     }
 }
@@ -138,6 +135,7 @@ impl<S: 'static> GuiPanel<S> {
             },
             extra: wgui::parser::ParseDocumentExtra {
                 on_custom_attribs: Some(on_custom_attrib_inner.clone()),
+                extra_vars: params.extra_vars,
                 ..Default::default()
             },
         };
@@ -208,7 +206,10 @@ impl<S: 'static> GuiPanel<S> {
                 setup_custom_label::<S>(&mut self.layout, &self.parser_state, elem, app);
             } else if let Ok(button) = self
                 .parser_state
-                .fetch_component_from_widget_id_as::<ComponentButton>(elem.widget_id)
+                .fetch_component_from_widget_id_as::<ComponentButton>(
+                    &self.layout.state,
+                    elem.widget_id,
+                )
             {
                 setup_custom_button::<S>(
                     &mut self.layout,
@@ -359,6 +360,9 @@ impl<S: 'static> OverlayBackend for GuiPanel<S> {
     }
 
     fn notify(&mut self, app: &mut AppState, data: OverlayEventData) -> anyhow::Result<()> {
+        if let OverlayEventData::ColorPaletteRefresh = data {
+            self.layout.tasks.push(LayoutTask::RefreshPalette);
+        }
         let Some(on_notify) = self.on_notify.take() else {
             return Ok(());
         };
@@ -371,7 +375,7 @@ impl<S: 'static> OverlayBackend for GuiPanel<S> {
         let e = WguiEvent::MouseWheel(MouseWheelEvent {
             delta: vec2(delta.x, delta.y) / 8.0,
             pos: hit.uv * self.layout.content_size,
-            device: hit.pointer,
+            device: DeviceBitmask::from_index(hit.pointer),
         });
         self.push_event(app, &e);
     }
@@ -379,7 +383,7 @@ impl<S: 'static> OverlayBackend for GuiPanel<S> {
     fn on_hover(&mut self, app: &mut AppState, hit: &PointerHit) -> HoverResult {
         let e = &WguiEvent::MouseMotion(MouseMotionEvent {
             pos: hit.uv * self.layout.content_size,
-            device: hit.pointer,
+            device: DeviceBitmask::from_index(hit.pointer),
         });
 
         self.has_focus[hit.pointer] = true;
@@ -400,7 +404,9 @@ impl<S: 'static> OverlayBackend for GuiPanel<S> {
     }
 
     fn on_left(&mut self, app: &mut AppState, pointer: usize) {
-        let e = WguiEvent::MouseLeave(MouseLeaveEvent { device: pointer });
+        let e = WguiEvent::MouseLeave(MouseLeaveEvent {
+            device: DeviceBitmask::from_index(pointer),
+        });
         self.has_focus[pointer] = false;
         self.push_event(app, &e);
     }
@@ -417,13 +423,13 @@ impl<S: 'static> OverlayBackend for GuiPanel<S> {
             WguiEvent::MouseDown(MouseButtonEvent {
                 pos: hit.uv * self.layout.content_size,
                 index,
-                device: hit.pointer,
+                device: DeviceBitmask::from_index(hit.pointer),
             })
         } else {
             WguiEvent::MouseUp(MouseButtonEvent {
                 pos: hit.uv * self.layout.content_size,
                 index,
-                device: hit.pointer,
+                device: DeviceBitmask::from_index(hit.pointer),
             })
         };
         self.push_event(app, &e);
@@ -432,11 +438,11 @@ impl<S: 'static> OverlayBackend for GuiPanel<S> {
         if !pressed && !self.has_focus[hit.pointer] {
             let e = WguiEvent::MouseMotion(MouseMotionEvent {
                 pos: vec2(-1., -1.),
-                device: hit.pointer,
+                device: DeviceBitmask::from_index(hit.pointer),
             });
             self.push_event(app, &e);
             let e = WguiEvent::MouseLeave(MouseLeaveEvent {
-                device: hit.pointer,
+                device: DeviceBitmask::from_index(hit.pointer),
             });
             self.push_event(app, &e);
         }
@@ -493,17 +499,13 @@ pub fn apply_custom_command<T>(
     element: &str,
     command: &ModifyPanelCommand,
 ) -> anyhow::Result<()> {
-    let mut alterables = EventAlterables::default();
-    let mut com = CallbackDataCommon {
-        alterables: &mut alterables,
-        state: &panel.layout.state,
-    };
+    let mut com = panel.layout.common();
 
     match command {
         ModifyPanelCommand::SetText(text) => {
             if let Ok(mut label) = panel
                 .parser_state
-                .fetch_widget_as::<WidgetLabel>(&panel.layout.state, element)
+                .fetch_widget_as::<WidgetLabel>(com.state, element)
             {
                 label.set_text(&mut com, Translation::from_raw_text(text));
             } else if let Ok(button) = panel
@@ -516,10 +518,7 @@ pub fn apply_custom_command<T>(
             }
         }
         ModifyPanelCommand::SetImage(path) => {
-            if let Ok(pair) = panel
-                .parser_state
-                .fetch_widget(&panel.layout.state, element)
-            {
+            if let Ok(pair) = panel.parser_state.fetch_widget(com.state, element) {
                 let data = CustomGlyphData::from_assets(
                     &app.wgui_globals,
                     wgui::assets::AssetPath::File(path),
@@ -527,9 +526,9 @@ pub fn apply_custom_command<T>(
                 .context("Could not load content from supplied path.")?;
 
                 if let Some(mut sprite) = pair.widget.get_as::<WidgetSprite>() {
-                    sprite.set_content(&mut com, Some(data));
+                    sprite.set_content(com.alterables, Some(data));
                 } else if let Some(mut image) = pair.widget.get_as::<WidgetImage>() {
-                    image.set_content(&mut com, Some(data));
+                    image.set_content(com.alterables, Some(data));
                 } else {
                     anyhow::bail!("No <sprite> or <image> with such id.");
                 }
@@ -538,19 +537,16 @@ pub fn apply_custom_command<T>(
             }
         }
         ModifyPanelCommand::SetColor(color) => {
-            let color = parse_color_hex(color)
+            let color = drawing::Color::from_hex(color)
                 .context("Invalid color format, must be a html hex color!")?;
 
-            if let Ok(pair) = panel
-                .parser_state
-                .fetch_widget(&panel.layout.state, element)
-            {
+            if let Ok(pair) = panel.parser_state.fetch_widget(com.state, element) {
                 if let Some(mut rect) = pair.widget.get_as::<WidgetRectangle>() {
-                    rect.set_color(&mut com, color);
+                    rect.set_color(&mut com, color.into());
                 } else if let Some(mut label) = pair.widget.get_as::<WidgetLabel>() {
-                    label.set_color(&mut com, color, true);
+                    label.set_color(&mut com, color.into(), true);
                 } else if let Some(mut sprite) = pair.widget.get_as::<WidgetSprite>() {
-                    sprite.set_color(&mut com, color);
+                    sprite.set_color(&mut com, color.into());
                 } else {
                     anyhow::bail!("No <rectangle> or <label> or <sprite> with such id.");
                 }
@@ -563,15 +559,7 @@ pub fn apply_custom_command<T>(
                 .parser_state
                 .get_widget_id(element)
                 .context("No widget with such id.")?;
-
-            let display = if *visible {
-                taffy::Display::Flex
-            } else {
-                taffy::Display::None
-            };
-
-            com.alterables
-                .set_style(wid, wgui::event::StyleSetRequest::Display(display));
+            com.alterables.set_widget_visible(wid, *visible);
             com.alterables.mark_redraw();
         }
         ModifyPanelCommand::SetValue(value_str) => {
@@ -592,7 +580,7 @@ pub fn apply_custom_command<T>(
                 .fetch_component_as::<ComponentSlider>(element)
             {
                 let value_f32 = value_str.parse::<f32>().context("Not a valid number")?;
-                slider.set_value(&mut com, value_f32);
+                slider.set_value_primary(&mut com, value_f32);
             } else if let Ok(radio) = panel
                 .parser_state
                 .fetch_component_as::<ComponentRadioGroup>(element)
@@ -610,6 +598,5 @@ pub fn apply_custom_command<T>(
         }
     }
 
-    panel.layout.process_alterables(alterables)?;
     Ok(())
 }
diff --git a/wayvr/src/gui/panel/overlay_list.rs b/wayvr/src/gui/panel/overlay_list.rs
index 64dc4e8c..3601fe54 100644
--- a/wayvr/src/gui/panel/overlay_list.rs
+++ b/wayvr/src/gui/panel/overlay_list.rs
@@ -1,15 +1,12 @@
-use std::{collections::HashMap, rc::Rc};
-
+use crate::windowing::{OverlayID, backend::OverlayEventData, window::OverlayCategory};
 use slotmap::{Key, SecondaryMap};
+use std::rc::Rc;
 use wgui::{
     components::button::ComponentButton,
-    event::{CallbackDataCommon, EventAlterables},
     layout::Layout,
-    parser::{Fetchable, ParseDocumentParams, ParserState},
+    parser::{Fetchable, ParseDocumentParams, ParserState, TemplateParams},
 };
 
-use crate::windowing::{OverlayID, backend::OverlayEventData, window::OverlayCategory};
-
 #[derive(Default)]
 /// Helper for managing a list of overlays
 /// Populates `id="panels_root"` with `<Screen>`, `<Mirror>`, `<Panel>` templates
@@ -25,7 +22,6 @@ impl OverlayList {
         layout: &mut Layout,
         parser_state: &mut ParserState,
         event_data: &OverlayEventData,
-        alterables: &mut EventAlterables,
         doc_params: &ParseDocumentParams,
     ) -> anyhow::Result<bool> {
         let mut elements_changed = false;
@@ -41,12 +37,12 @@ impl OverlayList {
                 self.overlay_buttons.clear();
 
                 for (i, meta) in metas.iter().enumerate() {
-                    let mut params = HashMap::new();
+                    let mut params = TemplateParams::new();
 
                     let (template, root) = match meta.category {
                         OverlayCategory::Screen => {
-                            params.insert(
-                                "display".into(),
+                            params.insert_rc(
+                                "display",
                                 format!(
                                     "{}{}",
                                     (*meta.name).chars().next().unwrap_or_default(),
@@ -57,30 +53,29 @@ impl OverlayList {
                             ("Screen", panels_root)
                         }
                         OverlayCategory::Mirror => {
-                            params.insert(
-                                "display".into(),
+                            params.insert_rc(
+                                "display",
                                 (*meta.name).chars().last().unwrap().to_string().into(),
                             );
                             ("Mirror", panels_root)
                         }
-                        OverlayCategory::Panel => {
+                        OverlayCategory::Panel | OverlayCategory::BuiltInPanel => {
                             let icon: Rc<str> = if let Some(icon) = meta.icon.as_ref() {
                                 icon.to_string().into()
                             } else {
                                 "edit/panel.svg".into()
                             };
 
-                            params.insert("icon".into(), icon);
+                            params.insert_rc("icon", icon);
                             ("Panel", panels_root)
                         }
                         OverlayCategory::WayVR => {
                             params.insert(
-                                "icon".into(),
+                                "icon",
                                 meta.icon
                                     .as_ref()
                                     .expect("WayVR overlay without Icon attribute!")
-                                    .as_ref()
-                                    .into(),
+                                    .as_ref(),
                             );
                             ("App", apps_root)
                         }
@@ -98,11 +93,7 @@ impl OverlayList {
                             };
 
                             if meta.visible {
-                                let mut com = CallbackDataCommon {
-                                    alterables,
-                                    state: &layout.state,
-                                };
-                                overlay_button.set_sticky_state(&mut com, true);
+                                overlay_button.set_sticky_state(&mut layout.common(), true);
                             }
                             self.overlay_buttons.insert(meta.id, overlay_button);
                             continue;
@@ -114,38 +105,30 @@ impl OverlayList {
                         continue;
                     }
 
-                    params.insert("idx".into(), i.to_string().into());
-                    params.insert("name".into(), meta.name.as_ref().into());
+                    params.insert_rc("idx", i.to_string().into());
+                    params.insert("name", meta.name.as_ref());
                     parser_state
                         .instantiate_template(doc_params, template, layout, root, params)?;
                     let overlay_button = parser_state
                         .fetch_component_as::<ComponentButton>(&format!("overlay_{i}"))?;
                     if meta.visible {
-                        let mut com = CallbackDataCommon {
-                            alterables,
-                            state: &layout.state,
-                        };
-                        overlay_button.set_sticky_state(&mut com, true);
+                        overlay_button.set_sticky_state(&mut layout.common(), true);
                     }
                     self.overlay_buttons.insert(meta.id, overlay_button);
                 }
                 elements_changed = true;
             }
             OverlayEventData::VisibleOverlaysChanged(overlays) => {
-                let mut com = CallbackDataCommon {
-                    alterables,
-                    state: &layout.state,
-                };
                 let mut overlay_buttons = self.overlay_buttons.clone();
 
                 for visible in overlays.as_ref() {
                     if let Some(btn) = overlay_buttons.remove(*visible) {
-                        btn.set_sticky_state(&mut com, true);
+                        btn.set_sticky_state(&mut layout.common(), true);
                     }
                 }
 
                 for btn in overlay_buttons.values() {
-                    btn.set_sticky_state(&mut com, false);
+                    btn.set_sticky_state(&mut layout.common(), false);
                 }
             }
             _ => {}
diff --git a/wayvr/src/gui/panel/set_list.rs b/wayvr/src/gui/panel/set_list.rs
index 30767c7a..f59f380e 100644
--- a/wayvr/src/gui/panel/set_list.rs
+++ b/wayvr/src/gui/panel/set_list.rs
@@ -1,10 +1,9 @@
-use std::{collections::HashMap, rc::Rc};
+use std::rc::Rc;
 
 use wgui::{
     components::button::ComponentButton,
-    event::{CallbackDataCommon, EventAlterables},
     layout::Layout,
-    parser::{Fetchable, ParseDocumentParams, ParserState},
+    parser::{Fetchable, ParseDocumentParams, ParserState, TemplateParams},
 };
 
 use crate::windowing::backend::OverlayEventData;
@@ -23,25 +22,20 @@ impl SetList {
         layout: &mut Layout,
         parser_state: &mut ParserState,
         event_data: &OverlayEventData,
-        alterables: &mut EventAlterables,
         doc_params: &ParseDocumentParams,
     ) -> anyhow::Result<bool> {
         let mut elements_changed = false;
         match event_data {
             OverlayEventData::ActiveSetChanged(current_set) => {
-                let mut com = CallbackDataCommon {
-                    alterables,
-                    state: &layout.state,
-                };
                 if let Some(old_set) = self.current_set.take()
                     && let Some(old_set) = self.set_buttons.get_mut(old_set)
                 {
-                    old_set.set_sticky_state(&mut com, false);
+                    old_set.set_sticky_state(&mut layout.common(), false);
                 }
                 if let Some(new_set) = current_set
                     && let Some(new_set) = self.set_buttons.get_mut(*new_set)
                 {
-                    new_set.set_sticky_state(&mut com, true);
+                    new_set.set_sticky_state(&mut layout.common(), true);
                 }
                 self.current_set = *current_set;
             }
@@ -51,19 +45,15 @@ impl SetList {
                 self.set_buttons.clear();
 
                 for i in 0..*num_sets {
-                    let mut params = HashMap::new();
-                    params.insert("idx".into(), i.to_string().into());
-                    params.insert("display".into(), (i + 1).to_string().into());
+                    let mut params = TemplateParams::new();
+                    params.insert_rc("idx", i.to_string().into());
+                    params.insert_rc("display", (i + 1).to_string().into());
                     parser_state
                         .instantiate_template(doc_params, "Set", layout, sets_root, params)?;
                     let set_button =
                         parser_state.fetch_component_as::<ComponentButton>(&format!("set_{i}"))?;
                     if self.current_set == Some(i) {
-                        let mut com = CallbackDataCommon {
-                            alterables,
-                            state: &layout.state,
-                        };
-                        set_button.set_sticky_state(&mut com, true);
+                        set_button.set_sticky_state(&mut layout.common(), true);
                     }
                     self.set_buttons.push(set_button);
                 }
diff --git a/wayvr/src/ipc/event_queue.rs b/wayvr/src/ipc/event_queue.rs
index c150c4c4..13c9adb4 100644
--- a/wayvr/src/ipc/event_queue.rs
+++ b/wayvr/src/ipc/event_queue.rs
@@ -1,5 +1,3 @@
-#![allow(dead_code)]
-
 use std::{cell::RefCell, collections::VecDeque, rc::Rc};
 
 #[derive(Debug)]
diff --git a/wayvr/src/ipc/events.rs b/wayvr/src/ipc/events.rs
index ac0c6591..0edae993 100644
--- a/wayvr/src/ipc/events.rs
+++ b/wayvr/src/ipc/events.rs
@@ -1,6 +1,6 @@
-use wayvr_ipc::packet_server;
-
-use crate::backend::wayvr::{self, WvrServerState};
+use crate::backend::wayvr::{self, WayVRTask, WvrServerState};
+use wayvr_ipc::packet_client::{HandsfreeMode, HandsfreeParams};
+use wlx_common::config::HandsfreePointer;
 
 use crate::{
     backend::{
@@ -39,9 +39,12 @@ where
 {
     while let Some(signal) = app.wayvr_signals.read() {
         match signal {
-            WayVRSignal::BroadcastStateChanged(packet) => {
-                app.ipc_server
-                    .broadcast(packet_server::PacketServer::WvrStateChanged(packet));
+            WayVRSignal::WindowVisibilityChanged(window_handle, visible) => {
+                if let Some(server) = &mut app.wvr_server {
+                    server
+                        .tasks
+                        .send(WayVRTask::VisibilityChange(window_handle, visible));
+                }
             }
             WayVRSignal::DeviceHaptics(device, haptics) => {
                 app.tasks
@@ -58,6 +61,19 @@ where
                 app.tasks
                     .enqueue(TaskType::Overlay(OverlayTask::ModifyPanel(custom_task)));
             }
+            WayVRSignal::Handsfree(params) => match params {
+                HandsfreeParams::SetMode(mode) => {
+                    let mode = match mode {
+                        HandsfreeMode::None => HandsfreePointer::None,
+                        HandsfreeMode::Hmd => HandsfreePointer::HmdOnly,
+                        HandsfreeMode::HmdPinch => HandsfreePointer::Hmd,
+                        HandsfreeMode::EyeTracking => HandsfreePointer::EyeTrackingOnly,
+                        HandsfreeMode::EyeTrackingPinch => HandsfreePointer::EyeTracking,
+                    };
+                    app.session.config.handsfree_pointer = mode;
+                }
+                _ => app.input_state.apply_handsfree_action(params),
+            },
         }
     }
 
diff --git a/wayvr/src/ipc/ipc_server.rs b/wayvr/src/ipc/ipc_server.rs
index 4490ac21..0bf51095 100644
--- a/wayvr/src/ipc/ipc_server.rs
+++ b/wayvr/src/ipc/ipc_server.rs
@@ -1,5 +1,6 @@
 use crate::backend::wayvr::{self, WvrServerState};
 
+use crate::subsystem::input::{HidWrapper, InputFocus};
 use crate::{
     backend::input::InputState,
     ipc::{event_queue::SyncEventQueue, signal::WayVRSignal},
@@ -9,6 +10,7 @@ use glam::Vec3A;
 use interprocess::local_socket::{self, ToNsName, traits::Listener};
 use smallvec::SmallVec;
 use std::io::{Read, Write};
+use wayvr_ipc::packet_client::HandsfreeParams;
 use wayvr_ipc::{
     ipc::{self},
     packet_client::{self, PacketClient},
@@ -42,35 +44,40 @@ pub fn send_packet(conn: &mut local_socket::Stream, data: &[u8]) -> anyhow::Resu
     Ok(())
 }
 
-fn read_check(expected_size: u32, res: std::io::Result<usize>) -> bool {
+fn read_check(expected_size: u32, res: std::io::Result<usize>) -> anyhow::Result<bool> {
     match res {
         Ok(count) => {
             if count == 0 {
-                return false;
+                anyhow::bail!("End of stream");
             }
             if count as u32 == expected_size {
-                true // read succeeded
+                Ok(true) // read succeeded
             } else {
                 log::error!("count {count} is not {expected_size}");
-                false
+                Ok(false)
             }
         }
-        Err(_e) => {
-            //log::error!("failed to get packet size: {}", e);
-            false
-        }
+        Err(e) => match e.kind() {
+            std::io::ErrorKind::WouldBlock => {
+                // no incoming data (this socket is non-blocking), try again later
+                Ok(false)
+            }
+            _ => {
+                anyhow::bail!("Connection error: {e:?}");
+            }
+        },
     }
 }
 
 type Payload = SmallVec<[u8; 64]>;
 
-fn read_payload(conn: &mut local_socket::Stream, size: u32) -> Option<Payload> {
+fn read_payload(conn: &mut local_socket::Stream, size: u32) -> anyhow::Result<Option<Payload>> {
     let mut payload = Payload::new();
     payload.resize(size as usize, 0);
-    if read_check(size, conn.read(&mut payload)) {
-        Some(payload)
+    if read_check(size, conn.read(&mut payload))? {
+        Ok(Some(payload))
     } else {
-        None
+        Ok(None)
     }
 }
 
@@ -80,6 +87,7 @@ pub struct TickParams<'a> {
     pub tasks: &'a mut Vec<wayvr::TickTask>,
     pub signals: &'a SyncEventQueue<WayVRSignal>,
     pub input_state: &'a InputState,
+    pub hid_wrapper: &'a mut HidWrapper,
 }
 
 pub fn gen_args_vec(input: &str) -> Vec<&str> {
@@ -215,13 +223,12 @@ impl Connection {
         handle: packet_server::WvrWindowHandle,
         visible: bool,
     ) {
-        if let Some(window) = params
-            .wvr_server
-            .wm
-            .windows
-            .get_mut(&wayvr::window::WindowHandle::from_packet(handle))
-        {
+        let window_handle = wayvr::window::WindowHandle::from_packet(handle);
+        if let Some(window) = params.wvr_server.wm.windows.get_mut(window_handle) {
             window.visible = visible;
+            params
+                .signals
+                .send(WayVRSignal::WindowVisibilityChanged(window_handle, visible))
         }
     }
 
@@ -264,19 +271,8 @@ impl Connection {
         let list: Vec<packet_server::WvrProcess> = params
             .wvr_server
             .processes
-            .vec
             .iter()
-            .enumerate()
-            .filter_map(|(idx, opt_cell)| {
-                let Some(cell) = opt_cell else {
-                    return None;
-                };
-                let process = &cell.obj;
-                Some(process.to_packet(wayvr::process::ProcessHandle::new(
-                    idx as u32,
-                    cell.generation,
-                )))
-            })
+            .map(|(handle, process)| process.to_packet(handle))
             .collect();
 
         send_packet(
@@ -298,7 +294,7 @@ impl Connection {
         use crate::backend::wayvr::process::KillSignal;
 
         let native_handle = &wayvr::process::ProcessHandle::from_packet(process_handle);
-        let process = params.wvr_server.processes.get_mut(native_handle);
+        let process = params.wvr_server.processes.get_mut(*native_handle);
 
         let Some(process) = process else {
             return;
@@ -317,7 +313,7 @@ impl Connection {
         let process = params
             .wvr_server
             .processes
-            .get(native_handle)
+            .get(*native_handle)
             .map(|process| process.to_packet(*native_handle));
 
         send_packet(
@@ -328,6 +324,17 @@ impl Connection {
         Ok(())
     }
 
+    fn handle_wvr_input_capture(params: &mut TickParams, grab: bool) {
+        let val = if grab {
+            InputFocus::WayVR
+        } else {
+            InputFocus::PhysicalScreen
+        };
+        params
+            .hid_wrapper
+            .set_input_focus(Some(params.wvr_server), val);
+    }
+
     fn handle_wlx_device_haptics(
         params: &mut TickParams,
         device: usize,
@@ -351,6 +358,10 @@ impl Connection {
         params.signals.send(WayVRSignal::SwitchSet(set));
     }
 
+    fn handle_wlx_handsfree(params: &mut TickParams, payload: HandsfreeParams) {
+        params.signals.send(WayVRSignal::Handsfree(payload));
+    }
+
     fn handle_wlx_panel(
         params: &mut TickParams,
         custom_params: packet_client::WlxModifyPanelParams,
@@ -416,6 +427,9 @@ impl Connection {
             PacketClient::WvrProcessTerminate(process_handle) => {
                 Self::handle_wvr_process_terminate(params, process_handle);
             }
+            PacketClient::WvrInputCapture(grab) => {
+                Self::handle_wvr_input_capture(params, grab);
+            }
             PacketClient::WlxDeviceHaptics(device, haptics_params) => {
                 Self::handle_wlx_device_haptics(params, device, haptics_params);
             }
@@ -428,41 +442,41 @@ impl Connection {
             PacketClient::WlxModifyPanel(custom_params) => {
                 Self::handle_wlx_panel(params, custom_params);
             }
+            PacketClient::WlxHandsfree(payload) => {
+                Self::handle_wlx_handsfree(params, payload);
+            }
         }
 
         Ok(())
     }
 
-    fn process_check_payload(&mut self, params: &mut TickParams, payload: Payload) -> bool {
-        log::debug!("payload size {}", payload.len());
-
+    fn process_check_payload(
+        &mut self,
+        params: &mut TickParams,
+        payload: Payload,
+    ) -> anyhow::Result<()> {
         if let Err(e) = self.process_payload(params, payload) {
-            log::error!("Invalid payload from the client, closing connection: {e}");
             // send also error message directly to the client before disconnecting
             self.kill(format!("{e}").as_str());
-            false
-        } else {
-            true
+            anyhow::bail!("Invalid payload from the client, closing connection: {e}");
         }
+        Ok(())
     }
 
-    fn read_packet(&mut self, params: &mut TickParams) -> bool {
+    fn read_packet(&mut self, params: &mut TickParams) -> anyhow::Result<bool> {
         if let Some(payload_size) = self.next_packet {
-            let Some(payload) = read_payload(&mut self.conn, payload_size) else {
-                // still failed to read payload, try in next tick
-                return false;
+            let Some(payload) = read_payload(&mut self.conn, payload_size)? else {
+                // still failed to read payload, try in the next tick
+                return Ok(false);
             };
 
-            if !self.process_check_payload(params, payload) {
-                return false;
-            }
-
+            self.process_check_payload(params, payload)?;
             self.next_packet = None;
         }
 
         let mut buf_packet_header: [u8; 4] = [0; 4];
-        if !read_check(4, self.conn.read(&mut buf_packet_header)) {
-            return false;
+        if !read_check(4, self.conn.read(&mut buf_packet_header))? {
+            return Ok(false);
         }
 
         let payload_size = u32::from_be_bytes(buf_packet_header[0..4].try_into().unwrap()); // 0-3 bytes (u32 size)
@@ -475,30 +489,43 @@ impl Connection {
                 "Client sent a packet header with the size over {size_limit} bytes, closing connection."
             );
             self.kill("Too big packet received (over 128 KiB)");
-            return false;
+            return Ok(false);
         }
 
-        let Some(payload) = read_payload(&mut self.conn, payload_size) else {
+        let Some(payload) = read_payload(&mut self.conn, payload_size)? else {
             // failed to read payload, try in next tick
             self.next_packet = Some(payload_size);
-            return false;
+            return Ok(false);
         };
 
-        if !self.process_check_payload(params, payload) {
-            return false;
-        }
+        self.process_check_payload(params, payload)?;
 
-        true
+        Ok(true)
     }
 
     fn tick(&mut self, params: &mut TickParams) {
-        while self.read_packet(params) {}
+        loop {
+            match self.read_packet(params) {
+                Ok(loop_further) => {
+                    if !loop_further {
+                        break;
+                    }
+                }
+                Err(e) => {
+                    log::debug!("Disconnecting client: {e:?}");
+                    self.alive = false;
+                    break;
+                }
+            }
+        }
     }
 }
 
 impl Drop for Connection {
     fn drop(&mut self) {
-        log::info!("Connection closed");
+        if let Some(auth) = &self.auth {
+            log::info!("IPC: Client \"{}\" disconnected.", auth.client_name);
+        }
     }
 }
 
@@ -548,12 +575,4 @@ impl WayVRServer {
         self.accept_connections();
         self.tick_connections(params);
     }
-
-    pub fn broadcast(&mut self, packet: packet_server::PacketServer) {
-        for connection in &mut self.connections {
-            if let Err(e) = send_packet(&mut connection.conn, &ipc::data_encode(&packet)) {
-                log::error!("failed to broadcast packet: {e:?}");
-            }
-        }
-    }
 }
diff --git a/wayvr/src/ipc/signal.rs b/wayvr/src/ipc/signal.rs
index 87111ee3..89f82f79 100644
--- a/wayvr/src/ipc/signal.rs
+++ b/wayvr/src/ipc/signal.rs
@@ -1,8 +1,11 @@
+use crate::backend::wayvr::window;
+
 #[derive(Clone)]
 pub enum WayVRSignal {
-    BroadcastStateChanged(wayvr_ipc::packet_server::WvrStateChanged),
     DeviceHaptics(usize, crate::backend::input::Haptics),
     SwitchSet(Option<usize>),
+    Handsfree(wayvr_ipc::packet_client::HandsfreeParams),
     ShowHide,
     CustomTask(crate::backend::task::ModifyPanelTask),
+    WindowVisibilityChanged(window::WindowHandle, bool),
 }
diff --git a/wayvr/src/main.rs b/wayvr/src/main.rs
index 8c692ca9..7bf577d1 100644
--- a/wayvr/src/main.rs
+++ b/wayvr/src/main.rs
@@ -34,6 +34,7 @@ use std::{
     path::PathBuf,
     process::Command,
     sync::atomic::{AtomicBool, AtomicUsize, Ordering},
+    time::{Duration, Instant},
 };
 
 use clap::Parser;
@@ -64,14 +65,22 @@ struct Args {
     #[arg(long)]
     openxr: bool,
 
-    /// Show the working set of overlay on startup
+    /// Show the working set of overlay on startup. Also skips tutorial.
     #[arg(long)]
     show: bool,
 
-    /// Uninstall OpenVR manifest and exit
+    /// Wait for a runtime to be available instead of exiting
+    #[arg(long)]
+    wait: bool,
+
+    /// Uninstall SteamVR manifest and exit
     #[arg(long)]
     uninstall: bool,
 
+    /// Install SteamVR manifest (not recommended; WayVR may have issues when auto-started by SteamVR!)
+    #[arg(long)]
+    install: bool,
+
     /// Replace running WayVR instance
     #[arg(long)]
     replace: bool,
@@ -84,6 +93,10 @@ struct Args {
     #[arg(long)]
     headless: bool,
 
+    /// Do not auto-start registered apps
+    #[arg(long)]
+    no_autostart: bool,
+
     /// Path to write logs to
     #[arg(short, long, value_name = "FILE_PATH")]
     log_to: Option<String>,
@@ -106,9 +119,14 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     logging_init(&mut args);
 
     log::info!(
-        "Welcome to {} version {}!",
+        "Welcome to {} version {}!{}",
         env!("CARGO_PKG_NAME"),
         env!("WLX_BUILD"),
+        if std::env::var("APPDIR").is_ok() {
+            " (AppImage)"
+        } else {
+            ""
+        }
     );
     log::info!("It is {}.", chrono::Local::now().format("%c"));
 
@@ -146,39 +164,54 @@ fn auto_run(args: Args, used_backend: &mut Option<XrBackend>) {
     let mut tried_xr = false;
     let mut tried_vr = false;
 
-    #[cfg(feature = "openxr")]
-    if !args_get_openvr(&args) {
-        use crate::backend::{BackendError, openxr::openxr_run};
-        tried_xr = true;
-        match openxr_run(args.show, args.headless) {
-            Ok(()) => {
-                used_backend.replace(XrBackend::OpenXR);
-                return;
-            }
-            Err(BackendError::NotSupported) => (),
-            Err(e) => {
-                used_backend.replace(XrBackend::OpenXR);
-                log::error!("{e:?}");
-                return;
+    loop {
+        #[cfg(feature = "openxr")]
+        if !args_get_openvr(&args) {
+            use crate::backend::{BackendError, openxr::openxr_run};
+            tried_xr = true;
+            match openxr_run(&args) {
+                Ok(()) => {
+                    used_backend.replace(XrBackend::OpenXR);
+                    return;
+                }
+                Err(BackendError::NotSupported) => (),
+                Err(e) => {
+                    used_backend.replace(XrBackend::OpenXR);
+                    log::error!("{e:?}");
+                    return;
+                }
             }
         }
-    }
 
-    #[cfg(feature = "openvr")]
-    if !args_get_openxr(&args) {
-        use crate::backend::{BackendError, openvr::openvr_run};
-        tried_vr = true;
-        match openvr_run(args.show, args.headless) {
-            Ok(()) => {
-                used_backend.replace(XrBackend::OpenVR);
-                return;
+        #[cfg(feature = "openvr")]
+        if !args_get_openxr(&args) {
+            use crate::backend::{BackendError, openvr::openvr_run};
+            tried_vr = true;
+            match openvr_run(&args) {
+                Ok(()) => {
+                    used_backend.replace(XrBackend::OpenVR);
+                    return;
+                }
+                Err(BackendError::NotSupported) => (),
+                Err(e) => {
+                    used_backend.replace(XrBackend::OpenVR);
+                    log::error!("{e:?}");
+                    return;
+                }
             }
-            Err(BackendError::NotSupported) => (),
-            Err(e) => {
-                used_backend.replace(XrBackend::OpenVR);
-                log::error!("{e:?}");
-                return;
+        }
+
+        if args.wait {
+            // wait 5s unless we get signaled
+            let deadline = Instant::now() + Duration::from_secs(5);
+            while Instant::now() < deadline {
+                if !RUNNING.load(Ordering::Relaxed) {
+                    return;
+                }
+                std::thread::sleep(Duration::from_millis(100));
             }
+        } else {
+            break;
         }
     }
 
diff --git a/wayvr/src/overlays/anchor.rs b/wayvr/src/overlays/anchor.rs
index 529c1680..b96fdbcd 100644
--- a/wayvr/src/overlays/anchor.rs
+++ b/wayvr/src/overlays/anchor.rs
@@ -1,8 +1,7 @@
-use glam::{Affine3A, Quat, Vec3};
+use glam::{Affine3A, Quat, Vec3, vec3};
 use std::sync::{Arc, LazyLock};
-use wgui::event::{EventAlterables, StyleSetRequest};
+use wgui::event::EventAlterables;
 use wgui::parser::Fetchable;
-use wgui::taffy;
 use wlx_common::windowing::{OverlayWindowState, Positioning};
 
 use crate::gui::panel::GuiPanel;
@@ -10,7 +9,7 @@ use crate::overlays::watch::WATCH_NAME;
 use crate::state::AppState;
 use crate::windowing::backend::OverlayEventData;
 use crate::windowing::window::OverlayWindowConfig;
-use crate::windowing::{Z_ORDER_ANCHOR, Z_ORDER_HELP};
+use crate::windowing::{PIXELS_TO_METERS, Z_ORDER_ANCHOR, Z_ORDER_HELP};
 
 pub static ANCHOR_NAME: LazyLock<Arc<str>> = LazyLock::new(|| Arc::from("anchor"));
 
@@ -84,13 +83,7 @@ pub fn create_grab_help(app: &mut AppState) -> anyhow::Result<OverlayWindowConfi
         };
 
         for id in &all {
-            let display = if *id == show_id {
-                taffy::Display::Flex
-            } else {
-                taffy::Display::None
-            };
-
-            alterables.set_style(*id, StyleSetRequest::Display(display));
+            alterables.set_widget_visible(*id, *id == show_id);
         }
 
         panel.layout.process_alterables(alterables)?;
@@ -115,3 +108,29 @@ pub fn create_grab_help(app: &mut AppState) -> anyhow::Result<OverlayWindowConfi
         ..OverlayWindowConfig::from_backend(Box::new(panel))
     })
 }
+
+pub static ALTTAB_HELP_NAME: LazyLock<Arc<str>> = LazyLock::new(|| Arc::from("alttab-help"));
+
+pub fn create_alltab_help(app: &mut AppState) -> anyhow::Result<OverlayWindowConfig> {
+    let mut panel =
+        GuiPanel::new_from_template(app, "gui/alttab-help.xml", (), Default::default())?;
+    panel.update_layout(app)?;
+
+    Ok(OverlayWindowConfig {
+        name: ALTTAB_HELP_NAME.clone(),
+        z_order: Z_ORDER_HELP,
+        default_state: OverlayWindowState {
+            interactable: false,
+            grabbable: false,
+            transform: Affine3A::from_scale_rotation_translation(
+                Vec3::ONE * panel.layout.content_size.x * PIXELS_TO_METERS,
+                Quat::IDENTITY,
+                vec3(0., -0.2, -0.51), // 1 cm behind toast
+            ),
+            positioning: Positioning::FollowHead { lerp: 0.1 },
+            ..OverlayWindowState::default()
+        },
+        global: true,
+        ..OverlayWindowConfig::from_backend(Box::new(panel))
+    })
+}
diff --git a/wayvr/src/overlays/dashboard.rs b/wayvr/src/overlays/dashboard.rs
index 4d0b7958..fe972925 100644
--- a/wayvr/src/overlays/dashboard.rs
+++ b/wayvr/src/overlays/dashboard.rs
@@ -1,22 +1,26 @@
-use std::sync::atomic::Ordering;
+use std::{
+    ops::Add,
+    sync::{Arc, atomic::Ordering},
+    time::{Duration, Instant},
+};
 
 use dash_frontend::frontend::{self, FrontendTask, FrontendUpdateParams};
-use glam::{Affine2, Affine3A, Vec2, vec2, vec3};
+use glam::{Affine2, Affine3A, Quat, Vec2, vec2, vec3};
 use wayvr_ipc::{
     packet_client::WvrProcessLaunchParams,
     packet_server::{WvrProcess, WvrProcessHandle, WvrWindow, WvrWindowHandle},
 };
 use wgui::{
     event::{
-        Event as WguiEvent, MouseButtonEvent, MouseButtonIndex, MouseLeaveEvent, MouseMotionEvent,
-        MouseWheelEvent,
+        DeviceBitmask, Event as WguiEvent, MouseButtonEvent, MouseButtonIndex, MouseLeaveEvent,
+        MouseMotionEvent, MouseWheelEvent,
     },
     gfx::cmd::WGfxClearMode,
     renderer_vk::context::Context as WguiContext,
     widget::EventResult,
 };
 use wlx_common::{
-    dash_interface::{self, DashInterface, RecenterMode},
+    dash_interface::{self, ConfigChangeKind, DashInterface, DashPlayspaceTask},
     locale::WayVRLangProvider,
     overlays::{BackendAttrib, BackendAttribValue},
 };
@@ -33,7 +37,7 @@ use crate::{
     backend::{
         XrBackend,
         input::{Haptics, HoverResult, PointerHit, PointerMode},
-        task::{OverlayTask, PlayspaceTask, TaskType, ToggleMode},
+        task::{GlobalChange, OverlayTask, PlayspaceTask, TaskType, ToggleMode},
         wayvr::{
             process::{KillSignal, ProcessHandle},
             window::WindowHandle,
@@ -49,7 +53,7 @@ use crate::{
             FrameMeta, OverlayBackend, OverlayEventData, RenderResources, ShouldRender,
             ui_transform,
         },
-        window::{OverlayCategory, OverlayWindowConfig},
+        window::{OverlayCategory, OverlayWindowConfig, realign},
     },
 };
 
@@ -65,6 +69,7 @@ pub struct DashFrontend {
     timestep: Timestep,
     has_focus: [bool; 2],
     context: WguiContext,
+    tutorial: bool,
 }
 
 const GUI_SCALE: f32 = 2.0;
@@ -73,15 +78,23 @@ impl DashFrontend {
     fn new(app: &mut AppState) -> anyhow::Result<Self> {
         let mut interface = DashInterfaceLive::new();
 
-        for p in app.session.config.autostart_apps.clone() {
-            let _ = interface.process_launch(app, false, p);
+        if app.session.no_autostart {
+            log::info!("Not starting apps due to --no-autostart");
+        } else {
+            for p in app.session.config.autostart_apps.clone() {
+                let _ = interface.process_launch(app, false, p);
+            }
         }
 
+        let tutorial = !app.session.config.tutorial_graduated;
+
         let frontend = frontend::Frontend::new(frontend::InitParams {
             interface: Box::new(interface),
             lang_provider: &WayVRLangProvider::from_config(&app.session.config),
+            show_welcome: tutorial,
             has_monado: matches!(app.xr_backend, XrBackend::OpenXR),
             theme: app.wgui_theme.clone(),
+            color_palette: &*app.session.config.color_palette,
         })?;
 
         frontend
@@ -96,6 +109,7 @@ impl DashFrontend {
             timestep: Timestep::new(60.0),
             has_focus: [false, false],
             context,
+            tutorial,
         })
     }
 
@@ -193,7 +207,26 @@ impl OverlayBackend for DashFrontend {
         })
     }
 
-    fn notify(&mut self, _app: &mut AppState, _data: OverlayEventData) -> anyhow::Result<()> {
+    fn notify(&mut self, app: &mut AppState, data: OverlayEventData) -> anyhow::Result<()> {
+        if !self.tutorial {
+            return Ok(());
+        }
+
+        // if we're grabbed, stop following the hmd
+        if let OverlayEventData::OverlayGrabbed { name, .. } = data {
+            if &*name == DASH_NAME {
+                self.tutorial = false;
+                app.tasks.enqueue(TaskType::Overlay(OverlayTask::Modify(
+                    OverlaySelector::Name(name),
+                    Box::new(|_app, owc| {
+                        if let Some(active_state) = owc.active_state.as_mut() {
+                            active_state.positioning = Positioning::Floating;
+                        }
+                    }),
+                )));
+            }
+        }
+
         Ok(())
     }
 
@@ -201,7 +234,7 @@ impl OverlayBackend for DashFrontend {
         let e = WguiEvent::MouseWheel(MouseWheelEvent {
             delta: vec2(delta.x, delta.y) / 8.0,
             pos: hit.uv * self.inner.layout.content_size,
-            device: hit.pointer,
+            device: DeviceBitmask::from_index(hit.pointer),
         });
         self.push_event(&e);
     }
@@ -209,7 +242,7 @@ impl OverlayBackend for DashFrontend {
     fn on_hover(&mut self, _app: &mut AppState, hit: &PointerHit) -> HoverResult {
         let e = &WguiEvent::MouseMotion(MouseMotionEvent {
             pos: hit.uv * self.inner.layout.content_size,
-            device: hit.pointer,
+            device: DeviceBitmask::from_index(hit.pointer),
         });
 
         self.has_focus[hit.pointer] = true;
@@ -231,7 +264,9 @@ impl OverlayBackend for DashFrontend {
     }
 
     fn on_left(&mut self, _app: &mut AppState, pointer: usize) {
-        let e = WguiEvent::MouseLeave(MouseLeaveEvent { device: pointer });
+        let e = WguiEvent::MouseLeave(MouseLeaveEvent {
+            device: DeviceBitmask::from_index(pointer),
+        });
         self.has_focus[pointer] = false;
         self.push_event(&e);
     }
@@ -248,13 +283,13 @@ impl OverlayBackend for DashFrontend {
             WguiEvent::MouseDown(MouseButtonEvent {
                 pos: hit.uv * self.inner.layout.content_size,
                 index,
-                device: hit.pointer,
+                device: DeviceBitmask::from_index(hit.pointer),
             })
         } else {
             WguiEvent::MouseUp(MouseButtonEvent {
                 pos: hit.uv * self.inner.layout.content_size,
                 index,
-                device: hit.pointer,
+                device: DeviceBitmask::from_index(hit.pointer),
             })
         };
         self.push_event(&e);
@@ -263,11 +298,11 @@ impl OverlayBackend for DashFrontend {
         if !pressed && !self.has_focus[hit.pointer] {
             let e = WguiEvent::MouseMotion(MouseMotionEvent {
                 pos: vec2(-1., -1.),
-                device: hit.pointer,
+                device: DeviceBitmask::from_index(hit.pointer),
             });
             self.push_event(&e);
             let e = WguiEvent::MouseLeave(MouseLeaveEvent {
-                device: hit.pointer,
+                device: DeviceBitmask::from_index(hit.pointer),
             });
             self.push_event(&e);
         }
@@ -284,7 +319,56 @@ impl OverlayBackend for DashFrontend {
     }
 }
 
+fn tutorial_spawn_effect(app: &mut AppState) -> anyhow::Result<()> {
+    let dash_name: Arc<str> = DASH_NAME.into();
+
+    app.tasks.enqueue_at(
+        TaskType::Overlay(OverlayTask::Modify(
+            OverlaySelector::Name(dash_name.clone()),
+            Box::new(|app, owc| {
+                let hmd = &app.input_state.hmd;
+                let pos = hmd.translation + hmd.z_axis * -2.0;
+                let mut transform = Affine3A::from_rotation_translation(Quat::IDENTITY, pos.into());
+                realign(&mut transform, hmd, 1.0, app.session.config.snap_angle_deg);
+
+                owc.active_state = Some(OverlayWindowState {
+                    saved_transform: Some(Affine3A::from_translation(vec3(0., -0.1, -0.9))),
+                    transform,
+                    grabbable: true,
+                    interactable: true,
+                    positioning: Positioning::FollowHead { lerp: 0.01 },
+                    curvature: Some(0.15),
+                    alpha: 0.1,
+                    ..Default::default()
+                });
+            }),
+        )),
+        Instant::now().add(Duration::from_millis(500)),
+    );
+
+    // hacky fade in over time
+    for i in 0..46 {
+        app.tasks.enqueue_at(
+            TaskType::Overlay(OverlayTask::Modify(
+                OverlaySelector::Name(dash_name.clone()),
+                Box::new(|_app, owc| {
+                    if let Some(active_state) = owc.active_state.as_mut() {
+                        active_state.alpha = (active_state.alpha + 0.025).min(1.0);
+                    }
+                }),
+            )),
+            Instant::now().add(Duration::from_millis(500 + 40 * i)),
+        );
+    }
+
+    Ok(())
+}
+
 pub fn create_dash_frontend(app: &mut AppState) -> anyhow::Result<OverlayWindowConfig> {
+    if !app.session.config.tutorial_graduated {
+        tutorial_spawn_effect(app)?;
+    }
+
     Ok(OverlayWindowConfig {
         name: DASH_NAME.into(),
         default_state: OverlayWindowState {
@@ -343,7 +427,7 @@ impl DashInterface<AppState> for DashInterfaceLive {
         let handle = ProcessHandle::from_packet(handle);
         wvr_server
             .processes
-            .get(&handle)
+            .get(handle)
             .map(|x| x.to_packet(handle))
     }
 
@@ -420,11 +504,17 @@ impl DashInterface<AppState> for DashInterfaceLive {
         Ok(())
     }
 
-    fn recenter_playspace(&mut self, app: &mut AppState, mode: RecenterMode) -> anyhow::Result<()> {
+    fn playspace_task(
+        &mut self,
+        app: &mut AppState,
+        mode: DashPlayspaceTask,
+    ) -> anyhow::Result<()> {
         let task = match mode {
-            RecenterMode::FixFloor => PlayspaceTask::FixFloor,
-            RecenterMode::Recenter => PlayspaceTask::Recenter,
-            RecenterMode::Reset => PlayspaceTask::Reset,
+            DashPlayspaceTask::FixFloor => PlayspaceTask::FixFloor,
+            DashPlayspaceTask::Recenter => PlayspaceTask::Recenter,
+            DashPlayspaceTask::Reset => PlayspaceTask::Reset,
+            DashPlayspaceTask::SaveCenter => PlayspaceTask::SaveCenter,
+            DashPlayspaceTask::ResetCenter => PlayspaceTask::ResetCenter,
         };
         app.tasks.enqueue(TaskType::Playspace(task));
         Ok(())
@@ -444,16 +534,37 @@ impl DashInterface<AppState> for DashInterfaceLive {
         &mut data.session.config
     }
 
-    fn config_changed(&mut self, data: &mut AppState) {
+    fn config_changed(&mut self, data: &mut AppState, kind: ConfigChangeKind) {
         data.session.config_dirty = true;
-        #[cfg(feature = "openxr")]
-        {
-            use crate::backend::task::OpenXrTask;
-            data.tasks
-                .enqueue(TaskType::OpenXR(OpenXrTask::SettingsChanged));
+
+        match kind {
+            ConfigChangeKind::WguiColorPaletteChange => {
+                data.tasks
+                    .enqueue(TaskType::Overlay(OverlayTask::GlobalChange(
+                        GlobalChange::ColorPalette,
+                    )));
+            }
+            ConfigChangeKind::OverlayConfig => {
+                data.tasks
+                    .enqueue(TaskType::Overlay(OverlayTask::GlobalChange(
+                        GlobalChange::Settings,
+                    )));
+            }
+            ConfigChangeKind::EnvironmentBlend => {
+                #[cfg(feature = "openxr")]
+                {
+                    use crate::backend::task::OpenXrTask;
+                    data.tasks
+                        .enqueue(TaskType::OpenXR(OpenXrTask::EnvironmentChanged));
+                }
+            }
+            ConfigChangeKind::WvrServerConfig => {
+                if let Some(wvr_server) = data.wvr_server.as_mut() {
+                    wvr_server.config_changed(&data.session.config);
+                }
+            }
+            _ => {}
         }
-        data.tasks
-            .enqueue(TaskType::Overlay(OverlayTask::SettingsChanged));
     }
 
     fn restart(&mut self, _data: &mut AppState) {
@@ -466,6 +577,20 @@ impl DashInterface<AppState> for DashInterfaceLive {
             .enqueue(TaskType::Overlay(OverlayTask::ToggleDashboard));
     }
 
+    fn get_feats(&mut self, data: &mut AppState) -> dash_interface::InterfaceFeats {
+        dash_interface::InterfaceFeats {
+            openxr: matches!(data.xr_backend, XrBackend::OpenXR),
+            #[cfg(feature = "openxr")]
+            monado: data.monado_state.is_some(),
+            #[cfg(not(feature = "openxr"))]
+            monado: false,
+            #[cfg(feature = "whisper")]
+            whisper: true,
+            #[cfg(not(feature = "whisper"))]
+            whisper: false,
+        }
+    }
+
     #[cfg(feature = "openxr")]
     fn monado_client_list(
         &mut self,
diff --git a/wayvr/src/overlays/edit/lock.rs b/wayvr/src/overlays/edit/lock.rs
index 3edfd528..dabdaa6a 100644
--- a/wayvr/src/overlays/edit/lock.rs
+++ b/wayvr/src/overlays/edit/lock.rs
@@ -1,12 +1,13 @@
 use std::rc::Rc;
 
 use anyhow::Context;
-use glam::FloatExt;
 use wgui::{
     animation::{Animation, AnimationEasing},
+    color::{WguiColor, WguiColorName},
     components::button::ComponentButton,
     event::CallbackDataCommon,
     layout::WidgetID,
+    palette::WguiColorPalette,
     parser::Fetchable,
     widget::rectangle::WidgetRectangle,
 };
@@ -16,7 +17,7 @@ use crate::{backend::task::ModifyOverlayTask, overlays::edit::EditModeWrapPanel}
 #[derive(Default)]
 pub(super) struct InteractLockHandler {
     id: WidgetID,
-    color: wgui::drawing::Color,
+    color: WguiColor,
     interactable: bool,
     button: Option<Rc<ComponentButton>>,
 }
@@ -53,10 +54,25 @@ impl InteractLockHandler {
             button.set_sticky_state(common, !interactable);
         }
 
+        let globals = common.globals();
+        let palette = &globals.palette;
+
         if interactable {
-            set_anim_color(&mut rect, 0.0, self.color, common.state.theme.danger_color);
+            set_anim_color(
+                palette,
+                &mut rect,
+                0.0,
+                self.color,
+                WguiColorName::Danger.into(),
+            );
         } else {
-            set_anim_color(&mut rect, 0.2, self.color, common.state.theme.danger_color);
+            set_anim_color(
+                palette,
+                &mut rect,
+                0.2,
+                self.color,
+                WguiColorName::Danger.into(),
+            );
         }
     }
 
@@ -80,10 +96,11 @@ impl InteractLockHandler {
                 Box::new(move |common, data| {
                     let rect = data.obj.get_as_mut::<WidgetRectangle>().unwrap();
                     set_anim_color(
+                        &common.globals().palette,
                         rect,
                         0.2 - (data.pos * 0.2),
                         rect_color,
-                        common.state.theme.danger_color,
+                        WguiColorName::Danger.into(),
                     );
                     common.alterables.mark_redraw();
                 }),
@@ -96,10 +113,11 @@ impl InteractLockHandler {
                 Box::new(move |common, data| {
                     let rect = data.obj.get_as_mut::<WidgetRectangle>().unwrap();
                     set_anim_color(
+                        &common.globals().palette,
                         rect,
                         data.pos * 0.2,
                         rect_color,
-                        common.state.theme.danger_color,
+                        WguiColorName::Danger.into(),
                     );
                     common.alterables.mark_redraw();
                 }),
@@ -117,13 +135,12 @@ impl InteractLockHandler {
 }
 
 fn set_anim_color(
+    palette: &WguiColorPalette,
     rect: &mut WidgetRectangle,
     pos: f32,
-    rect_color: wgui::drawing::Color,
-    target_color: wgui::drawing::Color,
+    rect_color: WguiColor,
+    target_color: WguiColor,
 ) {
     // rect to target_color
-    rect.params.color.r = rect_color.r.lerp(target_color.r, pos);
-    rect.params.color.g = rect_color.g.lerp(target_color.g, pos);
-    rect.params.color.b = rect_color.b.lerp(target_color.b, pos);
+    rect.params.color = rect_color.lerp(palette, &target_color, pos);
 }
diff --git a/wayvr/src/overlays/edit/mod.rs b/wayvr/src/overlays/edit/mod.rs
index 04f4fd94..7600fc95 100644
--- a/wayvr/src/overlays/edit/mod.rs
+++ b/wayvr/src/overlays/edit/mod.rs
@@ -6,13 +6,14 @@ use std::{
     time::{Duration, Instant},
 };
 
-use glam::vec2;
+use glam::{Vec2, vec2};
 use slotmap::Key;
 use wgui::{
     components::{button::ComponentButton, checkbox::ComponentCheckbox, slider::ComponentSlider},
-    event::{CallbackDataCommon, EventAlterables, EventCallback},
+    event::{CallbackDataCommon, EventCallback, StyleSetRequest},
     i18n::Translation,
     parser::Fetchable,
+    taffy::Display,
     widget::EventResult,
 };
 use wlx_common::overlays::{BackendAttrib, BackendAttribValue, MouseTransform, StereoMode};
@@ -51,6 +52,20 @@ mod sprite_tab;
 mod stereo;
 pub mod tab;
 
+enum ResizeState {
+    None,
+    Start {
+        overlay_id: OverlayID,
+    },
+    Active {
+        overlay_id: OverlayID,
+        pointer: usize,
+        start_uv: Vec2,
+        last_uv: Vec2,
+        last_extent: [u32; 2],
+    },
+}
+
 struct EditModeState {
     tasks: Rc<RefCell<TaskContainer>>,
     id: Rc<RefCell<OverlayID>>,
@@ -59,6 +74,23 @@ struct EditModeState {
     pos: SpriteTabHandler<PosTabState>,
     stereo: SpriteTabHandler<StereoMode>,
     mouse: SpriteTabHandler<MouseTransform>,
+    resize: ResizeState,
+}
+
+impl EditModeState {
+    fn resize_end(&mut self, app: &mut AppState) {
+        match std::mem::replace(&mut self.resize, ResizeState::None) {
+            ResizeState::Active { overlay_id, .. } => {
+                app.tasks.enqueue(TaskType::Overlay(OverlayTask::Modify(
+                    OverlaySelector::Id(overlay_id),
+                    Box::new(|_app, owc| {
+                        owc.resizing = false;
+                    }),
+                )));
+            }
+            _ => {}
+        }
+    }
 }
 
 type EditModeWrapPanel = GuiPanel<EditModeState>;
@@ -94,6 +126,7 @@ impl EditWrapperManager {
         owc.backend = Box::new(EditModeBackendWrapper {
             inner: ManuallyDrop::new(inner),
             panel: ManuallyDrop::new(panel),
+            extent: [0, 0],
             last_render: Instant::now(),
             can_render_inner: false,
         });
@@ -135,6 +168,7 @@ pub struct EditModeBackendWrapper {
     panel: ManuallyDrop<EditModeWrapPanel>,
     inner: ManuallyDrop<Box<dyn OverlayBackend>>,
 
+    extent: [u32; 2],
     last_render: Instant,
     can_render_inner: bool,
 }
@@ -205,14 +239,19 @@ impl OverlayBackend for EditModeBackendWrapper {
             self.inner.render(app, rdr)?;
         }
 
-        self.panel.render(app, rdr)?;
-        // `GuiPanel` is not stereo-aware, so just render the same pass twice
-        if rdr.cmd_bufs.len() > 1 {
-            rdr.cmd_bufs.reverse();
+        // during resize, just fade the color
+        if matches!(self.panel.state.resize, ResizeState::None) {
             self.panel.render(app, rdr)?;
-            rdr.cmd_bufs.reverse();
+            // `GuiPanel` is not stereo-aware, so just render the same pass twice
+            if rdr.cmd_bufs.len() > 1 {
+                rdr.cmd_bufs.reverse();
+                self.panel.render(app, rdr)?;
+                rdr.cmd_bufs.reverse();
+            }
         }
 
+        self.extent = rdr.extent;
+
         Ok(())
     }
     fn frame_meta(&mut self) -> Option<crate::windowing::backend::FrameMeta> {
@@ -225,9 +264,43 @@ impl OverlayBackend for EditModeBackendWrapper {
     ) -> HoverResult {
         // pass through hover events to force pipewire to capture frames for us
         let _ = self.inner.on_hover(app, hit);
-        self.panel.on_hover(app, hit)
+        let res = self.panel.on_hover(app, hit);
+
+        match &mut self.panel.state.resize {
+            ResizeState::Active {
+                overlay_id,
+                pointer,
+                start_uv,
+                last_uv,
+                last_extent,
+            } if *pointer == hit.pointer => {
+                fn lerp_u32(a: [u32; 2], b: [u32; 2], t: f32) -> [u32; 2] {
+                    [
+                        (a[0] as f32 + (b[0] as f32 - a[0] as f32) * t).round() as u32,
+                        (a[1] as f32 + (b[1] as f32 - a[1] as f32) * t).round() as u32,
+                    ]
+                }
+
+                // freshest extent we can get is from last frame, so use uv from that frame
+                let want_extent = resize_centered_from_uv(*start_uv, *last_uv, self.extent);
+
+                app.tasks
+                    .enqueue(TaskType::Overlay(OverlayTask::ResizeOverlay(
+                        OverlaySelector::Id(*overlay_id),
+                        lerp_u32(*last_extent, want_extent, 0.33),
+                    )));
+
+                *last_uv = hit.uv;
+                *last_extent = self.extent;
+            }
+            _ => {}
+        }
+
+        res
     }
     fn on_left(&mut self, app: &mut crate::state::AppState, pointer: usize) {
+        self.panel.state.resize_end(app);
+
         self.inner.on_left(app, pointer);
         self.panel.on_left(app, pointer);
     }
@@ -238,6 +311,27 @@ impl OverlayBackend for EditModeBackendWrapper {
         pressed: bool,
     ) {
         self.panel.on_pointer(app, hit, pressed);
+
+        match &mut self.panel.state.resize {
+            ResizeState::Start { overlay_id } => {
+                app.tasks.enqueue(TaskType::Overlay(OverlayTask::Modify(
+                    OverlaySelector::Id(*overlay_id),
+                    Box::new(|_app, owc| {
+                        owc.resizing = true;
+                    }),
+                )));
+
+                let last_uv = hit.uv;
+                self.panel.state.resize = ResizeState::Active {
+                    overlay_id: *overlay_id,
+                    pointer: hit.pointer,
+                    start_uv: last_uv,
+                    last_uv: last_uv,
+                    last_extent: self.extent,
+                };
+            }
+            _ => {}
+        }
     }
     fn on_scroll(
         &mut self,
@@ -248,7 +342,8 @@ impl OverlayBackend for EditModeBackendWrapper {
         self.panel.on_scroll(app, hit, delta);
     }
     fn notify(&mut self, app: &mut AppState, event_data: OverlayEventData) -> anyhow::Result<()> {
-        self.panel.notify(app, event_data)
+        self.panel.notify(app, event_data.clone())?;
+        self.inner.notify(app, event_data)
     }
     fn get_interaction_transform(&mut self) -> Option<glam::Affine2> {
         self.inner.get_interaction_transform()
@@ -271,13 +366,14 @@ fn make_edit_panel(app: &mut AppState) -> anyhow::Result<EditModeWrapPanel> {
         pos: SpriteTabHandler::default(),
         stereo: SpriteTabHandler::default(),
         mouse: SpriteTabHandler::default(),
+        resize: ResizeState::None,
     };
 
     let anim_mult = app.wgui_theme.animation_mult;
 
     let on_custom_attrib: OnCustomAttribFunc = Box::new(move |layout, parser, attribs, _app| {
-        let Ok(button) =
-            parser.fetch_component_from_widget_id_as::<ComponentButton>(attribs.widget_id)
+        let Ok(button) = parser
+            .fetch_component_from_widget_id_as::<ComponentButton>(&layout.state, attribs.widget_id)
         else {
             return;
         };
@@ -407,6 +503,22 @@ fn make_edit_panel(app: &mut AppState) -> anyhow::Result<EditModeWrapPanel> {
                         )));
                         Ok(EventResult::Consumed)
                     }),
+                    "::EditModeResizeStart" => Box::new(move |_common, data, app, state| {
+                        if !test_button(data) || !test_duration(&button, app) {
+                            return Ok(EventResult::Pass);
+                        }
+                        state.resize = ResizeState::Start {
+                            overlay_id: state.id.borrow().clone(),
+                        };
+                        Ok(EventResult::Consumed)
+                    }),
+                    "::EditModeResizeStop" => Box::new(move |_common, data, app, state| {
+                        if !test_button(data) || !test_duration(&button, app) {
+                            return Ok(EventResult::Pass);
+                        }
+                        state.resize_end(app);
+                        Ok(EventResult::Consumed)
+                    }),
                     _ => return,
                 };
 
@@ -466,98 +578,82 @@ fn reset_panel(
     *panel.state.id.borrow_mut() = id;
     let state = owc.active_state.as_mut().unwrap();
 
-    let mut alterables = EventAlterables::default();
-    let mut common = CallbackDataCommon {
-        alterables: &mut alterables,
-        state: &panel.layout.state,
-    };
+    let mut com = panel.layout.common();
 
     let c = panel
         .parser_state
         .fetch_component_as::<ComponentButton>("top_grab")?;
-    c.set_sticky_state(&mut common, !state.grabbable);
+    c.set_sticky_state(&mut com, !state.grabbable);
 
     let c = panel
         .parser_state
         .fetch_component_as::<ComponentSlider>("lerp_slider")?;
-    c.set_value(&mut common, state.positioning.get_lerp().unwrap_or(1.0));
+    c.set_value_primary(&mut com, state.positioning.get_lerp().unwrap_or(1.0));
 
     let c = panel
         .parser_state
         .fetch_component_as::<ComponentSlider>("alpha_slider")?;
-    c.set_value(&mut common, state.alpha);
+    c.set_value_primary(&mut com, state.alpha);
 
     let c = panel
         .parser_state
         .fetch_component_as::<ComponentSlider>("curve_slider")?;
-    c.set_value(&mut common, state.curvature.unwrap_or(0.0));
+    c.set_value_primary(&mut com, state.curvature.unwrap_or(0.0));
 
     let c = panel
         .parser_state
         .fetch_component_as::<ComponentCheckbox>("additive_box")?;
-    c.set_checked(&mut common, state.additive);
+    c.set_checked(&mut com, state.additive);
 
     let c = panel
         .parser_state
         .fetch_component_as::<ComponentCheckbox>("align_box")?;
-    c.set_checked(&mut common, state.positioning.get_align().unwrap_or(false));
+    c.set_checked(&mut com, state.positioning.get_align().unwrap_or(false));
 
     let c = panel
         .parser_state
         .fetch_component_as::<ComponentCheckbox>("global_box")?;
-    c.set_checked(&mut common, owc.global);
+    c.set_checked(&mut com, owc.global);
 
     let c = panel
         .parser_state
         .fetch_component_as::<ComponentCheckbox>("angle_fade_box")?;
-    c.set_checked(&mut common, state.angle_fade);
+    c.set_checked(&mut com, state.angle_fade);
 
     let c = panel
         .parser_state
         .fetch_component_as::<ComponentCheckbox>("block_input_box")?;
-    c.set_checked(&mut common, state.block_input);
+    c.set_checked(&mut com, state.block_input);
 
-    panel
-        .state
-        .pos
-        .reset(&mut common, &state.positioning.into());
-    panel.state.lock.reset(&mut common, state.interactable);
-    panel.state.tabs.reset(&mut common);
+    panel.state.pos.reset(&mut com, &state.positioning.into());
+    panel.state.lock.reset(&mut com, state.interactable);
+    panel.state.tabs.reset(&mut com);
 
     if let Some(stereo) = attrib_value!(
         owc.backend.get_attrib(BackendAttrib::Stereo),
         BackendAttribValue::Stereo
     ) {
-        panel
-            .state
-            .tabs
-            .set_tab_visible(&mut common, "stereo", true);
-        panel.state.stereo.reset(&mut common, &stereo);
+        panel.state.tabs.set_tab_visible(&mut com, "stereo", true);
+        panel.state.stereo.reset(&mut com, &stereo);
 
         // Set the checkbox label based on stereo mode
         let translation = get_stereo_full_frame_translation(stereo);
         let c = panel
             .parser_state
             .fetch_component_as::<ComponentCheckbox>("stereo_full_frame_box")?;
-        c.set_text(&mut common, Translation::from_translation_key(translation));
+        c.set_text(&mut com, Translation::from_translation_key(translation));
     } else {
-        panel
-            .state
-            .tabs
-            .set_tab_visible(&mut common, "stereo", false);
+        panel.state.tabs.set_tab_visible(&mut com, "stereo", false);
     }
 
     if let Some(mouse) = attrib_value!(
         owc.backend.get_attrib(BackendAttrib::MouseTransform),
         BackendAttribValue::MouseTransform
     ) {
-        panel.state.tabs.set_tab_visible(&mut common, "mouse", true);
-        panel.state.mouse.reset(&mut common, &mouse);
+        panel.state.tabs.set_tab_visible(&mut com, "mouse", true);
+        panel.state.mouse.reset(&mut com, &mouse);
     } else {
-        panel
-            .state
-            .tabs
-            .set_tab_visible(&mut common, "mouse", false);
+        panel.state.tabs.set_tab_visible(&mut com, "mouse", false);
     }
 
     if let Some(full_frame) = attrib_value!(
@@ -567,7 +663,7 @@ fn reset_panel(
         let c = panel
             .parser_state
             .fetch_component_as::<ComponentCheckbox>("stereo_full_frame_box")?;
-        c.set_checked(&mut common, full_frame);
+        c.set_checked(&mut com, full_frame);
     }
 
     if let Some(adjust_mouse) = attrib_value!(
@@ -577,10 +673,29 @@ fn reset_panel(
         let c = panel
             .parser_state
             .fetch_component_as::<ComponentCheckbox>("stereo_adjust_mouse_box")?;
-        c.set_checked(&mut common, adjust_mouse);
+        c.set_checked(&mut com, adjust_mouse);
     }
 
-    panel.layout.process_alterables(alterables)?;
+    let resizable = attrib_value!(
+        owc.backend.get_attrib(BackendAttrib::Resizable),
+        BackendAttribValue::Resizable
+    )
+    .unwrap_or(false);
+    let c = panel
+        .parser_state
+        .fetch_component_as::<ComponentButton>("resize_corner")?;
+    let common = CallbackDataCommon {
+        state: &panel.layout.state,
+        alterables: &mut panel.layout.alterables,
+    };
+    common.alterables.set_style(
+        c.get_rect(),
+        StyleSetRequest::Display(if resizable {
+            Display::Block
+        } else {
+            Display::None
+        }),
+    );
 
     Ok(())
 }
@@ -674,7 +789,6 @@ fn set_up_slider(
             OverlaySelector::Id(*overlay_id.borrow()),
             Box::new(move |app, owc| callback(app, owc, e_value)),
         )));
-        Ok(())
     }));
 
     Ok(())
@@ -703,3 +817,25 @@ fn set_up_checkbox(
 
     Ok(())
 }
+
+pub fn resize_centered_from_uv(grab_uv: Vec2, cur_uv: Vec2, cur_extent: [u32; 2]) -> [u32; 2] {
+    const MIN_SIZE: Vec2 = Vec2::new(160.0, 160.0);
+    const CENTER_DEADZONE: f32 = 0.1;
+
+    let cur_extent_v = Vec2::new(cur_extent[0] as f32, cur_extent[1] as f32);
+    let grab_from_center = grab_uv - Vec2::splat(0.5);
+    let cur_from_center = (cur_uv - Vec2::splat(0.5)) * cur_extent_v;
+
+    let mut out = cur_extent_v;
+    if grab_from_center.x.abs() > CENTER_DEADZONE {
+        out.x = (cur_from_center.x / grab_from_center.x).abs();
+    }
+
+    if grab_from_center.y.abs() > CENTER_DEADZONE {
+        out.y = (cur_from_center.y / grab_from_center.y).abs();
+    }
+
+    out = out.max(MIN_SIZE);
+
+    [out.x.round() as u32, out.y.round() as u32]
+}
diff --git a/wayvr/src/overlays/edit/pos.rs b/wayvr/src/overlays/edit/pos.rs
index 71ca932c..d98b0d36 100644
--- a/wayvr/src/overlays/edit/pos.rs
+++ b/wayvr/src/overlays/edit/pos.rs
@@ -1,4 +1,4 @@
-use wgui::{event::StyleSetRequest, parser::Fetchable, taffy};
+use wgui::parser::Fetchable;
 use wlx_common::{common::LeftRight, windowing::Positioning};
 
 use crate::{
@@ -47,26 +47,12 @@ pub fn new_pos_tab_handler(
             })
         }),
         Some(Box::new(move |common, state| {
-            let interpolation_disp = if state.has_lerp {
-                taffy::Display::Flex
-            } else {
-                taffy::Display::None
-            };
-
-            common.alterables.set_style(
-                interpolation_id,
-                StyleSetRequest::Display(interpolation_disp),
-            );
-
-            let align_to_hmd_disp = if state.has_align {
-                taffy::Display::Flex
-            } else {
-                taffy::Display::None
-            };
-
             common
                 .alterables
-                .set_style(align_to_hmd_id, StyleSetRequest::Display(align_to_hmd_disp));
+                .set_widget_visible(interpolation_id, state.has_lerp);
+            common
+                .alterables
+                .set_widget_visible(align_to_hmd_id, state.has_align);
         })),
     )
 }
diff --git a/wayvr/src/overlays/edit/sprite_tab.rs b/wayvr/src/overlays/edit/sprite_tab.rs
index 4468ec3e..afc97136 100644
--- a/wayvr/src/overlays/edit/sprite_tab.rs
+++ b/wayvr/src/overlays/edit/sprite_tab.rs
@@ -105,7 +105,7 @@ where
             .widgets
             .get_as::<WidgetSprite>(self.top_sprite_id)
         {
-            sprite.set_content(common, Some(new.sprite.clone()));
+            sprite.set_content(common.alterables, Some(new.sprite.clone()));
         }
     }
 
diff --git a/wayvr/src/overlays/edit/tab.rs b/wayvr/src/overlays/edit/tab.rs
index 67fe4ce3..31688c55 100644
--- a/wayvr/src/overlays/edit/tab.rs
+++ b/wayvr/src/overlays/edit/tab.rs
@@ -72,15 +72,9 @@ impl ButtonPaneTabSwitcher {
             return;
         };
 
-        let display = if visible {
-            taffy::Display::Flex
-        } else {
-            taffy::Display::None
-        };
-
         common
             .alterables
-            .set_style(data.get_rect(), StyleSetRequest::Display(display));
+            .set_widget_visible(data.get_rect(), visible);
     }
 
     pub fn reset(&mut self, common: &mut CallbackDataCommon) {
diff --git a/wayvr/src/overlays/keyboard/builder.rs b/wayvr/src/overlays/keyboard/builder.rs
index c1b957f5..407a3a17 100644
--- a/wayvr/src/overlays/keyboard/builder.rs
+++ b/wayvr/src/overlays/keyboard/builder.rs
@@ -1,34 +1,40 @@
-use std::{collections::HashMap, rc::Rc, time::Duration};
+use std::{rc::Rc, time::Duration};
+
 use crate::{
     app_misc,
     gui::{
         panel::{GuiPanel, NewGuiPanelParams, apply_custom_command},
         timer::GuiTimer,
     },
-    overlays::keyboard::alt_modifier_to_key,
+    overlays::keyboard::{ChildWidget, alt_modifier_to_key},
     state::AppState,
     subsystem::hid::XkbKeymap,
     windowing::backend::OverlayEventData,
 };
 use anyhow::{bail, Context};
 use glam::{FloatExt, Mat4, Vec2, vec2, vec3};
-use slotmap::Key;
+use smallvec::{SmallVec, smallvec};
 use wgui::{
     animation::{Animation, AnimationEasing},
     assets::AssetPath,
-    drawing::{self, Color},
-    event::{self, CallbackMetadata, EventAlterables, EventListenerKind},
-    layout::LayoutUpdateParams,
+    color::{WguiColor, WguiColorName},
+    event::{self, CallbackMetadata, EventListenerKind},
+    layout::{LayoutUpdateParams, WidgetID},
     log::LogErr,
-    parser::{Fetchable, ParseDocumentParams},
+    palette::WguiColorPalette,
+    parser::{Fetchable, ParseDocumentParams, TemplateParams},
     renderer_vk::util,
     taffy::{self, prelude::length},
-    widget::{EventResult, div::WidgetDiv, rectangle::WidgetRectangle},
+    widget::{
+        EventResult, div::WidgetDiv, label::WidgetLabel, rectangle::WidgetRectangle,
+        sprite::WidgetSprite,
+    },
+};
+
+use super::{
+    KeyButtonData, KeyState, KeyboardState, handle_press, handle_release,
+    layout::{self, KeyCapType},
 };
-use wgui::event::StyleSetRequest;
-use wgui::layout::LayoutTask;
-use wgui::taffy::Display;
-use super::{KeyButtonData, KeyState, KeyboardState, handle_press, handle_release, layout::{self, KeyCapType}, handle_mouse_motion, init_swipe_type_manager};
 
 const PIXELS_PER_UNIT: f32 = 60.;
 
@@ -193,10 +199,7 @@ pub(super) fn create_keyboard_panel(
 
     let doc_params = new_doc_params(&mut panel);
 
-    let (accent_color, anim_mult) = {
-        let theme = &app.wgui_theme;
-        (theme.accent_color, theme.animation_mult)
-    };
+    let anim_mult = app.wgui_theme.animation_mult;
 
     let root = panel
         .parser_state
@@ -248,34 +251,34 @@ pub(super) fn create_keyboard_panel(
             };
 
             // todo: make this easier to maintain somehow
-            let mut params: HashMap<Rc<str>, Rc<str>> = HashMap::new();
-            params.insert(Rc::from("id"), my_id.clone());
-            params.insert(Rc::from("width"), Rc::from(key_width.to_string()));
-            params.insert(Rc::from("height"), Rc::from(key_height.to_string()));
+            let mut params = TemplateParams::new();
+            params.insert_rc("id", my_id.clone());
+            params.insert_rc("width", key_width.to_string().into());
+            params.insert_rc("height", key_height.to_string().into());
 
-            let mut label = key.label.clone().into_iter();
+            let mut label = key.label.into_iter();
             label
                 .next()
-                .and_then(|s| params.insert("text".into(), s.into()));
+                .and_then(|s| params.insert_rc("text", s.into()));
 
             match key.cap_type {
                 KeyCapType::LetterAltGr => {
                     label
                         .next()
-                        .and_then(|s| params.insert("text_altgr".into(), s.into()));
+                        .and_then(|s| params.insert_rc("text_altgr", s.into()));
                 }
                 KeyCapType::Symbol => {
                     label
                         .next()
-                        .and_then(|s| params.insert("text_shift".into(), s.into()));
+                        .and_then(|s| params.insert_rc("text_shift", s.into()));
                 }
                 KeyCapType::SymbolAltGr => {
                     label
                         .next()
-                        .and_then(|s| params.insert("text_shift".into(), s.into()));
+                        .and_then(|s| params.insert_rc("text_shift", s.into()));
                     label
                         .next()
-                        .and_then(|s| params.insert("text_altgr".into(), s.into()));
+                        .and_then(|s| params.insert_rc("text_altgr", s.into()));
                 }
                 _ => {}
             }
@@ -290,6 +293,8 @@ pub(super) fn create_keyboard_panel(
             )?;
 
             if let Ok(widget_id) = panel.parser_state.get_widget_id(&my_id) {
+                let (labels, sprites) = find_children(&panel, widget_id);
+
                 let key_state = {
                     let rect = panel
                         .layout
@@ -306,6 +311,8 @@ pub(super) fn create_keyboard_panel(
                         cur_border_color: rect.params.border_color.into(),
                         border: rect.params.border,
                         drawn_state: false.into(),
+                        labels,
+                        sprites,
                     })
                 };
 
@@ -321,16 +328,7 @@ pub(super) fn create_keyboard_panel(
                         let k = key_state.clone();
                         move |common, data, _app, _state| {
                             common.alterables.trigger_haptics();
-                            on_enter_anim(
-                                k.clone(),
-                                common,
-                                data,
-                                accent_color,
-                                anim_mult,
-                                width_mul,
-                            );
-
-
+                            on_enter_anim(k.clone(), common, data, anim_mult, width_mul);
                             Ok(EventResult::Pass)
                         }
                     }),
@@ -342,15 +340,7 @@ pub(super) fn create_keyboard_panel(
                         let k = key_state.clone();
                         move |common, data, _app, _state| {
                             common.alterables.trigger_haptics();
-                            on_leave_anim(
-                                k.clone(),
-                                common,
-                                data,
-                                accent_color,
-                                anim_mult,
-                                width_mul,
-                            );
-
+                            on_leave_anim(k.clone(), common, data, anim_mult, width_mul);
                             Ok(EventResult::Pass)
                         }
                     }),
@@ -434,13 +424,10 @@ pub(super) fn create_keyboard_panel(
     panel.on_notify = Some(Box::new({
         let name = "kbd";
         move |panel, app, event_data| {
-            let mut alterables = EventAlterables::default();
-
             let mut elems_changed = panel.state.overlay_list.on_notify(
                 &mut panel.layout,
                 &mut panel.parser_state,
                 &event_data,
-                &mut alterables,
                 &doc_params,
             )?;
 
@@ -448,7 +435,6 @@ pub(super) fn create_keyboard_panel(
                 &mut panel.layout,
                 &mut panel.parser_state,
                 &event_data,
-                &mut alterables,
                 &doc_params,
             )?;
 
@@ -523,7 +509,6 @@ pub(super) fn create_keyboard_panel(
                 panel.process_custom_elems(app);
             }
 
-            panel.layout.process_alterables(alterables)?;
             Ok(())
         }
     }));
@@ -543,6 +528,35 @@ pub(super) fn create_keyboard_panel(
     Ok(panel)
 }
 
+fn find_children<S>(
+    panel: &GuiPanel<S>,
+    widget_id: WidgetID,
+) -> (SmallVec<[ChildWidget; 3]>, SmallVec<[ChildWidget; 1]>) {
+    let mut labels = smallvec![];
+    let mut sprites = smallvec![];
+
+    let mut children = vec![];
+    panel
+        .layout
+        .collect_children_ids_recursive(widget_id, &mut children);
+
+    for child in children {
+        if let Some(widget) = panel.layout.state.widgets.get_as::<WidgetSprite>(child) {
+            sprites.push(ChildWidget {
+                id: child,
+                base_color: widget.get_color(),
+            });
+        } else if let Some(widget) = panel.layout.state.widgets.get_as::<WidgetLabel>(child) {
+            labels.push(ChildWidget {
+                id: child,
+                base_color: widget.get_color(),
+            });
+        }
+    }
+
+    (labels, sprites)
+}
+
 const BUTTON_HOVER_SCALE: f32 = 0.1;
 
 fn get_anim_transform(pos: f32, widget_size: Vec2, width_mult: f32) -> Mat4 {
@@ -555,29 +569,22 @@ fn get_anim_transform(pos: f32, widget_size: Vec2, width_mult: f32) -> Mat4 {
     util::centered_matrix(widget_size, &Mat4::from_scale(scale))
 }
 
+const HOVER_COLOR: WguiColor = WguiColorName::Tertiary.to_wgui_color();
+const HOVER_BORDER_COLOR: WguiColor = WguiColorName::Tertiary.to_wgui_color().mult_rgb(0.5);
+const HOVER_TEXT_COLOR: WguiColor = WguiColorName::OnTertiary.to_wgui_color();
+const PRESS_BORDER_COLOR: WguiColor = WguiColorName::Highlight.to_wgui_color();
+
 fn set_anim_color(
+    palette: &WguiColorPalette,
     key_state: &KeyState,
     rect: &mut WidgetRectangle,
     pos: f32,
-    accent_color: drawing::Color,
 ) {
-    // fade to accent color
-    rect.params.color.r = key_state.color.r.lerp(accent_color.r, pos);
-    rect.params.color.g = key_state.color.g.lerp(accent_color.g, pos);
-    rect.params.color.b = key_state.color.b.lerp(accent_color.b, pos);
+    rect.params.color = key_state.color.lerp(palette, &HOVER_COLOR, pos);
+    rect.params.color2 = key_state.color2.lerp(palette, &HOVER_COLOR, pos);
 
-    // fade to accent color
-    rect.params.color2.r = key_state.color2.r.lerp(accent_color.r, pos);
-    rect.params.color2.g = key_state.color2.g.lerp(accent_color.g, pos);
-    rect.params.color2.b = key_state.color2.b.lerp(accent_color.b, pos);
-
-    // fade to white
     let cur_border_color = key_state.cur_border_color.get();
-    rect.params.border_color.r = cur_border_color.r.lerp(1.0, pos);
-    rect.params.border_color.g = cur_border_color.g.lerp(1.0, pos);
-    rect.params.border_color.b = cur_border_color.b.lerp(1.0, pos);
-    rect.params.border_color.a = cur_border_color.a.lerp(1.0, pos);
-
+    rect.params.border_color = cur_border_color.lerp(palette, &HOVER_BORDER_COLOR, pos);
     rect.params.border = key_state.border.lerp(key_state.border * 1.5, pos);
 }
 
@@ -585,7 +592,6 @@ fn on_enter_anim(
     key_state: Rc<KeyState>,
     common: &mut event::CallbackDataCommon,
     data: &event::CallbackData,
-    accent_color: drawing::Color,
     anim_mult: f32,
     width_mult: f32,
 ) {
@@ -595,7 +601,34 @@ fn on_enter_anim(
         AnimationEasing::OutBack,
         Box::new(move |common, data| {
             let rect = data.obj.get_as_mut::<WidgetRectangle>().unwrap();
-            set_anim_color(&key_state, rect, data.pos, accent_color);
+            set_anim_color(&common.globals().palette, &key_state, rect, data.pos);
+
+            for child in key_state.labels.iter() {
+                let mut widget = common
+                    .state
+                    .widgets
+                    .get_as::<WidgetLabel>(child.id)
+                    .unwrap();
+                let color =
+                    child
+                        .base_color
+                        .lerp(&common.globals().palette, &HOVER_TEXT_COLOR, data.pos);
+                widget.set_color(common, color, true);
+            }
+
+            for child in key_state.sprites.iter() {
+                let mut widget = common
+                    .state
+                    .widgets
+                    .get_as::<WidgetSprite>(child.id)
+                    .unwrap();
+                let color =
+                    child
+                        .base_color
+                        .lerp(&common.globals().palette, &HOVER_TEXT_COLOR, data.pos);
+                widget.set_color(common, color);
+            }
+
             data.data.transform =
                 get_anim_transform(data.pos, data.widget_boundary.size, width_mult);
             common.alterables.mark_redraw();
@@ -607,7 +640,6 @@ fn on_leave_anim(
     key_state: Rc<KeyState>,
     common: &mut event::CallbackDataCommon,
     data: &event::CallbackData,
-    accent_color: drawing::Color,
     anim_mult: f32,
     width_mult: f32,
 ) {
@@ -617,7 +649,36 @@ fn on_leave_anim(
         AnimationEasing::OutQuad,
         Box::new(move |common, data| {
             let rect = data.obj.get_as_mut::<WidgetRectangle>().unwrap();
-            set_anim_color(&key_state, rect, 1.0 - data.pos, accent_color);
+            set_anim_color(&common.globals().palette, &key_state, rect, 1.0 - data.pos);
+
+            for child in key_state.labels.iter() {
+                let color = child.base_color.lerp(
+                    &common.globals().palette,
+                    &HOVER_TEXT_COLOR,
+                    1.0 - data.pos,
+                );
+                let mut widget = common
+                    .state
+                    .widgets
+                    .get_as::<WidgetLabel>(child.id)
+                    .unwrap();
+                widget.set_color(common, color, true);
+            }
+
+            for child in key_state.sprites.iter() {
+                let color = child.base_color.lerp(
+                    &common.globals().palette,
+                    &HOVER_TEXT_COLOR,
+                    1.0 - data.pos,
+                );
+                let mut widget = common
+                    .state
+                    .widgets
+                    .get_as::<WidgetSprite>(child.id)
+                    .unwrap();
+                widget.set_color(common, color);
+            }
+
             data.data.transform =
                 get_anim_transform(1.0 - data.pos, data.widget_boundary.size, width_mult);
             common.alterables.mark_redraw();
@@ -634,9 +695,7 @@ fn on_press_anim(
         return;
     }
     let rect = data.obj.get_as_mut::<WidgetRectangle>().unwrap();
-    key_state
-        .cur_border_color
-        .set(Color::new(1.0, 1.0, 1.0, 1.0));
+    key_state.cur_border_color.set(PRESS_BORDER_COLOR);
     rect.params.border_color = key_state.cur_border_color.get();
     common.alterables.mark_redraw();
     key_state.drawn_state.set(true);
diff --git a/wayvr/src/overlays/keyboard/layout.rs b/wayvr/src/overlays/keyboard/layout.rs
index 84c489a8..958aadb1 100644
--- a/wayvr/src/overlays/keyboard/layout.rs
+++ b/wayvr/src/overlays/keyboard/layout.rs
@@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     config::{ConfigType, load_known_yaml},
     subsystem::hid::{
-        KEYS_TO_MODS, KeyType, META, NUM_LOCK, SHIFT, VirtualKey, XkbKeymap, get_key_type,
+        ALTGR, KEYS_TO_MODS, KeyType, NUM_LOCK, SHIFT, VirtualKey, XkbKeymap, get_key_type,
     },
 };
 
@@ -82,7 +82,7 @@ impl Layout {
                             label.push(label1);
                             if has_altgr {
                                 cap_type = KeyCapType::LetterAltGr;
-                                label.push(keymap.label_for_key(vk, META));
+                                label.push(keymap.label_for_key(vk, ALTGR));
                             } else {
                                 cap_type = KeyCapType::Letter;
                             }
@@ -90,7 +90,7 @@ impl Layout {
                             label.push(label0);
                             label.push(label1);
                             if has_altgr {
-                                label.push(keymap.label_for_key(vk, META));
+                                label.push(keymap.label_for_key(vk, ALTGR));
                                 cap_type = KeyCapType::SymbolAltGr;
                             } else {
                                 cap_type = KeyCapType::Symbol;
diff --git a/wayvr/src/overlays/keyboard/mod.rs b/wayvr/src/overlays/keyboard/mod.rs
index ded5cd33..1be073ea 100644
--- a/wayvr/src/overlays/keyboard/mod.rs
+++ b/wayvr/src/overlays/keyboard/mod.rs
@@ -9,7 +9,7 @@ use crate::{
     KEYMAP_CHANGE,
     backend::{
         input::{HoverResult, PointerHit},
-        task::{OverlayTask, TaskType},
+        task::{GlobalChange, OverlayTask, TaskType},
     },
     gui::panel::{GuiPanel, overlay_list::OverlayList, set_list::SetList},
     overlays::keyboard::builder::create_keyboard_panel,
@@ -17,7 +17,7 @@ use crate::{
     subsystem::{
         dbus::DbusConnector,
         hid::{
-            ALT, CTRL, KeyModifier, META, SHIFT, SUPER, VirtualKey, WheelDelta, XkbKeymap,
+            ALT, ALTGR, CTRL, KeyModifier, SHIFT, SUPER, VirtualKey, WheelDelta, XkbKeymap,
             get_keymap_wl, get_keymap_x11,
         },
     },
@@ -30,9 +30,12 @@ use anyhow::Context;
 use glam::{Affine3A, Quat, Vec3, vec3, Vec2};
 use regex::Regex;
 use slotmap::{SlotMap, new_key_type, Key};
+use slotmap::{SlotMap, new_key_type};
+use smallvec::SmallVec;
 use wgui::{
-    drawing,
+    color::WguiColor,
     event::{InternalStateChangeEvent, MouseButtonEvent, MouseButtonIndex},
+    layout::WidgetID,
 };
 use wgui::event::StyleSetRequest;
 use wgui::layout::{LayoutTask};
@@ -52,7 +55,7 @@ mod layout;
 mod swipe_type;
 
 pub const KEYBOARD_NAME: &str = "kbd";
-const AUTO_RELEASE_MODS: [KeyModifier; 5] = [SHIFT, CTRL, ALT, SUPER, META];
+const AUTO_RELEASE_MODS: [KeyModifier; 5] = [SHIFT, CTRL, ALT, SUPER, ALTGR];
 const SYSTEM_LAYOUT_ALIASES: [&str; 5] = ["mozc", "pinyin", "hangul", "sayura", "unikey"];
 
 pub fn create_keyboard(app: &mut AppState, wayland: bool) -> anyhow::Result<OverlayWindowConfig> {
@@ -156,7 +159,7 @@ const fn alt_modifier_to_key(m: AltModifier) -> KeyModifier {
         AltModifier::Ctrl => CTRL,
         AltModifier::Alt => ALT,
         AltModifier::Super => SUPER,
-        AltModifier::Meta => META,
+        AltModifier::AltGr => ALTGR,
         _ => 0,
     }
 }
@@ -225,7 +228,9 @@ impl KeyboardBackend {
             self.internal_switch_keymap(new_key, app);
         }
         app.tasks
-            .enqueue(TaskType::Overlay(OverlayTask::KeyboardChanged));
+            .enqueue(TaskType::Overlay(OverlayTask::GlobalChange(
+                GlobalChange::Keyboard,
+            )));
         Ok(true)
     }
 
@@ -421,14 +426,21 @@ fn play_key_click(app: &mut AppState) {
         .play_sample(&mut app.audio_system, "key_click");
 }
 
+struct ChildWidget {
+    id: WidgetID,
+    base_color: WguiColor,
+}
+
 struct KeyState {
     button_state: KeyButtonData,
-    color: drawing::Color,
-    color2: drawing::Color,
-    base_border_color: drawing::Color,
-    cur_border_color: Cell<drawing::Color>,
+    color: WguiColor,
+    color2: WguiColor,
+    base_border_color: WguiColor,
+    cur_border_color: Cell<WguiColor>,
     border: f32,
     drawn_state: Cell<bool>,
+    labels: SmallVec<[ChildWidget; 3]>,
+    sprites: SmallVec<[ChildWidget; 1]>,
 }
 
 #[derive(Debug)]
diff --git a/wayvr/src/overlays/mod.rs b/wayvr/src/overlays/mod.rs
index e499de1c..b8d8a9e4 100644
--- a/wayvr/src/overlays/mod.rs
+++ b/wayvr/src/overlays/mod.rs
@@ -7,3 +7,5 @@ pub mod screen;
 pub mod toast;
 pub mod watch;
 pub mod wayvr;
+#[cfg(feature = "whisper")]
+pub mod whisper;
diff --git a/wayvr/src/overlays/screen/backend.rs b/wayvr/src/overlays/screen/backend.rs
index 92b6ba3f..323bd930 100644
--- a/wayvr/src/overlays/screen/backend.rs
+++ b/wayvr/src/overlays/screen/backend.rs
@@ -3,17 +3,20 @@ use std::{
     time::Instant,
 };
 
-use glam::{Affine2, Vec2, vec2};
+use glam::{Affine2, DVec2, Vec2, vec2};
 use wlx_capture::{WlxCapture, frame::Transform};
 
 use crate::{
     backend::{
         XrBackend,
-        input::{HoverResult, PointerHit, PointerMode},
+        input::{self, HoverResult, PointerHit, PointerMode},
     },
     overlays::screen::capture::MyFirstDmaExporter,
     state::AppState,
-    subsystem::hid::{MOUSE_LEFT, MOUSE_MIDDLE, MOUSE_RIGHT, WheelDelta},
+    subsystem::{
+        hid::{MOUSE_LEFT, MOUSE_MIDDLE, MOUSE_RIGHT, WheelDelta},
+        input::InputFocus,
+    },
     windowing::backend::{
         FrameMeta, OverlayBackend, OverlayEventData, RenderResources, ShouldRender, ui_transform,
     },
@@ -59,7 +62,6 @@ pub struct ScreenBackend {
     stereo_adjust_mouse: bool,
     pub(super) logical_pos: Vec2,
     pub(super) logical_size: Vec2,
-    pub(super) mouse_transform_original: Transform,
     mouse_transform_override: MouseTransform,
     just_resumed: bool,
 }
@@ -89,13 +91,12 @@ impl ScreenBackend {
             stereo_adjust_mouse: false,
             logical_pos: Vec2::ZERO,
             logical_size: Vec2::ZERO,
-            mouse_transform_original: Transform::Undefined,
             mouse_transform_override: MouseTransform::Default,
             just_resumed: false,
         }
     }
 
-    pub(super) fn apply_mouse_transform_with_override(&mut self, override_transform: Transform) {
+    pub(super) fn apply_mouse_transform_with_override(&mut self, transform: Transform) {
         let mut size = self.logical_size;
         let pos = self.logical_pos;
 
@@ -109,11 +110,6 @@ impl ScreenBackend {
             }
         }
 
-        let transform = match override_transform {
-            Transform::Undefined => self.mouse_transform_original,
-            other => other,
-        };
-
         self.mouse_transform = match transform {
             Transform::Normal | Transform::Undefined => {
                 Affine2::from_cols(vec2(size.x, 0.), vec2(0., size.y), pos)
@@ -238,16 +234,20 @@ impl OverlayBackend for ScreenBackend {
             }
 
             if let Some(pipeline) = self.pipeline.as_mut() {
-                if self.meta.is_some_and(|old| old.extent != meta.extent) {
-                    pipeline.set_extent(
+                if self.meta.is_some_and(|old| old.extent != meta.extent)
+                    || frame.format.transform != pipeline.transform()
+                {
+                    pipeline.set_layout(
                         app,
                         [meta.extent[0] as _, meta.extent[1] as _],
                         [0., 0.],
+                        frame.format.transform,
                     )?;
                     self.interaction_transform = Some(ui_transform(meta.extent));
                 }
             } else {
-                let pipeline = ScreenPipeline::new(&meta, app, stereo, [0., 0.])?;
+                let pipeline =
+                    ScreenPipeline::new(&meta, app, stereo, [0., 0.], frame.format.transform)?;
                 self.pipeline = Some(pipeline);
                 self.interaction_transform = Some(ui_transform(meta.extent));
             }
@@ -301,18 +301,25 @@ impl OverlayBackend for ScreenBackend {
     fn on_hover(&mut self, app: &mut AppState, hit: &PointerHit) -> HoverResult {
         #[cfg(debug_assertions)]
         log::trace!("Hover: {:?}", hit.uv);
+
+        let pick_now = app.input_state.picking_focus.is_picking();
+        if pick_now {
+            app.input_state.stop_picking();
+            app.hid_provider
+                .set_input_focus(app.wvr_server.as_mut(), InputFocus::PhysicalScreen);
+        }
+
         if can_move()
             && (!app.session.config.focus_follows_mouse_mode
                 || app.input_state.pointers[hit.pointer].now.move_mouse)
         {
             let pos = self.mouse_transform.transform_point2(hit.uv);
-            app.hid_provider.inner.mouse_move(pos);
+            app.hid_provider
+                .inner
+                .mouse_move(DVec2::new(pos.x as _, pos.y as _));
             set_next_move(app.session.config.mouse_move_interval_ms as _);
         }
-        HoverResult {
-            consume: true,
-            ..HoverResult::default()
-        }
+        HoverResult::consume()
     }
     fn on_pointer(&mut self, app: &mut AppState, hit: &PointerHit, pressed: bool) {
         let mut btn = match hit.mode {
@@ -340,10 +347,15 @@ impl OverlayBackend for ScreenBackend {
             return;
         }
         let pos = self.mouse_transform.transform_point2(hit.uv);
-        app.hid_provider.inner.mouse_move(pos);
+        app.hid_provider
+            .inner
+            .mouse_move(DVec2::new(pos.x as _, pos.y as _));
     }
 
-    fn on_scroll(&mut self, app: &mut AppState, _hit: &PointerHit, delta: WheelDelta) {
+    fn on_scroll(&mut self, app: &mut AppState, _hit: &PointerHit, mut delta: WheelDelta) {
+        // convert to v120 value; maximum deflect scrolls at half speed
+        delta.x *= 60.0;
+        delta.y *= 60.0;
         app.hid_provider.inner.wheel(delta);
     }
 
diff --git a/wayvr/src/overlays/screen/capture.rs b/wayvr/src/overlays/screen/capture.rs
index a37e4b42..e670b32f 100644
--- a/wayvr/src/overlays/screen/capture.rs
+++ b/wayvr/src/overlays/screen/capture.rs
@@ -1,10 +1,9 @@
 use std::{
-    f32::consts::PI,
     os::fd::AsRawFd,
     sync::{Arc, OnceLock},
 };
 
-use glam::{Affine3A, Vec3};
+use glam::Affine3A;
 use smallvec::{SmallVec, smallvec};
 use vulkano::{
     buffer::{BufferUsage, Subbuffer},
@@ -55,7 +54,9 @@ pub struct ScreenPipeline {
     pipeline: Arc<WGfxPipeline<Vert2Uv>>,
     extentf: [f32; 2],
     offsetf: [f32; 2],
+    transform: wlx_frame::Transform,
     stereo: StereoMode,
+    stereo_adjust_mouse: bool,
 }
 
 impl ScreenPipeline {
@@ -64,6 +65,7 @@ impl ScreenPipeline {
         app: &mut AppState,
         stereo: StereoMode,
         offsetf: [f32; 2],
+        transform: wlx_frame::Transform,
     ) -> anyhow::Result<Self> {
         let extentf = [meta.extent[0] as f32, meta.extent[1] as f32];
 
@@ -81,7 +83,9 @@ impl ScreenPipeline {
             pipeline,
             extentf,
             offsetf,
+            transform,
             stereo,
+            stereo_adjust_mouse: false,
         };
         me.ensure_stereo(stereo);
         Ok(me)
@@ -96,6 +100,14 @@ impl ScreenPipeline {
         self.pass.clear(); // ensure_depth will repopulate
     }
 
+    pub fn set_stereo_adjust_mouse(&mut self, adjust: bool) {
+        self.stereo_adjust_mouse = adjust;
+    }
+
+    pub const fn transform(&self) -> wlx_frame::Transform {
+        self.transform
+    }
+
     fn ensure_depth(&mut self, app: &mut AppState, depth: usize) -> anyhow::Result<()> {
         while self.pass.len() < depth {
             self.pass.push(Self::create_pass(
@@ -111,20 +123,22 @@ impl ScreenPipeline {
         }
 
         for (eye, current) in self.pass.iter_mut().enumerate() {
-            let verts = stereo_mode_to_verts(self.stereo, eye);
+            let verts = stereo_mode_to_verts(self.stereo, eye, self.transform);
             current.buf_vert.write()?.copy_from_slice(&verts);
         }
         Ok(())
     }
 
-    pub fn set_extent(
+    pub fn set_layout(
         &mut self,
         app: &mut AppState,
         extentf: [f32; 2],
         offsetf: [f32; 2],
+        transform: wlx_frame::Transform,
     ) -> anyhow::Result<()> {
         self.extentf = extentf;
         self.offsetf = offsetf;
+        self.transform = transform;
         self.pass.clear();
 
         self.mouse = Self::create_mouse_pass(app, self.pipeline.clone(), extentf, offsetf)?;
@@ -207,6 +221,19 @@ impl ScreenPipeline {
         mouse: Option<&MouseMeta>,
         app: &mut AppState,
         rdr: &mut RenderResources,
+    ) -> anyhow::Result<()> {
+        self.render_screen(image, app, rdr)?;
+        if let Some(mouse) = mouse {
+            self.render_mouse(mouse, rdr)?;
+        }
+        Ok(())
+    }
+
+    pub fn render_screen(
+        &mut self,
+        image: Arc<ImageView>,
+        app: &mut AppState,
+        rdr: &mut RenderResources,
     ) -> anyhow::Result<()> {
         self.ensure_depth(app, rdr.cmd_bufs.len())?;
 
@@ -218,36 +245,72 @@ impl ScreenPipeline {
                 .update_sampler(0, image.clone(), app.gfx.texture_filter)?;
 
             cmd_buf.run_ref(&current.pass)?;
+        }
 
-            if let Some(mouse) = mouse.as_ref() {
-                let size = CURSOR_SIZE * self.extentf[1];
-                let half_size = size * 0.5;
+        Ok(())
+    }
 
-                upload_quad_vertices(
-                    &mut self.mouse.buf_vert,
-                    self.extentf[0],
-                    self.extentf[1],
-                    mouse.x.mul_add(self.extentf[0], -half_size),
-                    mouse.y.mul_add(self.extentf[1], -half_size),
-                    size,
-                    size,
-                )?;
+    pub fn render_mouse(
+        &mut self,
+        mouse: &MouseMeta,
+        rdr: &mut RenderResources,
+    ) -> anyhow::Result<()> {
+        for cmd_buf in rdr.cmd_bufs.iter_mut() {
+            let size = CURSOR_SIZE * self.extentf[1];
+            let half_size = size * 0.5;
 
-                cmd_buf.run_ref(&self.mouse.pass)?;
-            }
+            let (x_scale, y_scale) = if self.stereo_adjust_mouse {
+                match self.stereo {
+                    StereoMode::LeftRight | StereoMode::RightLeft => (2.0, 1.0),
+                    StereoMode::TopBottom | StereoMode::BottomTop => (1.0, 2.0),
+                    _ => (1.0, 1.0),
+                }
+            } else {
+                (1.0, 1.0)
+            };
+
+            upload_quad_vertices(
+                &mut self.mouse.buf_vert,
+                self.extentf[0],
+                self.extentf[1],
+                mouse.x.mul_add(self.extentf[0] * x_scale, -half_size),
+                mouse.y.mul_add(self.extentf[1] * y_scale, -half_size),
+                size,
+                size,
+            )?;
+
+            cmd_buf.run_ref(&self.mouse.pass)?;
         }
 
         Ok(())
     }
 }
 
-fn stereo_mode_to_verts(stereo: StereoMode, array_index: usize) -> [Vert2Uv; 4] {
+fn transform_uv(uv: [f32; 2], transform: wlx_frame::Transform) -> [f32; 2] {
+    let [u, v] = uv;
+    match transform {
+        wlx_frame::Transform::Normal | wlx_frame::Transform::Undefined => [u, v],
+        wlx_frame::Transform::Rotated90 => [v, 1.0 - u],
+        wlx_frame::Transform::Rotated180 => [1.0 - u, 1.0 - v],
+        wlx_frame::Transform::Rotated270 => [1.0 - v, u],
+        wlx_frame::Transform::Flipped => [1.0 - u, v],
+        wlx_frame::Transform::Flipped90 => [v, u],
+        wlx_frame::Transform::Flipped180 => [u, 1.0 - v],
+        wlx_frame::Transform::Flipped270 => [1.0 - v, 1.0 - u],
+    }
+}
+
+fn stereo_mode_to_verts(
+    stereo: StereoMode,
+    array_index: usize,
+    transform: wlx_frame::Transform,
+) -> [Vert2Uv; 4] {
     let eye = match stereo {
         StereoMode::RightLeft | StereoMode::BottomTop => (1 - array_index) as f32,
         _ => array_index as f32,
     };
 
-    match stereo {
+    let mut verts = match stereo {
         StereoMode::None => [
             Vert2Uv {
                 in_pos: [0., 0.],
@@ -302,7 +365,13 @@ fn stereo_mode_to_verts(stereo: StereoMode, array_index: usize) -> [Vert2Uv; 4]
                 in_uv: [1., 0.5 + eye * 0.5],
             },
         ],
+    };
+
+    for vert in &mut verts {
+        vert.in_uv = transform_uv(vert.in_uv, transform);
     }
+
+    verts
 }
 
 static DMA_ALLOCATOR: OnceLock<Arc<dyn MemoryAllocator>> = OnceLock::new();
@@ -460,7 +529,7 @@ impl WlxCaptureOut {
         FrameMeta {
             clear: WGfxClearMode::DontCare,
             extent: extent_from_format(self.format, config),
-            transform: affine_from_format(&self.format),
+            transform: Affine3A::IDENTITY,
             format: self.image.format(),
             stereo,
         }
@@ -585,13 +654,14 @@ pub(super) fn receive_callback(me: &WlxCaptureIn, frame: WlxFrame) -> Option<Wlx
                 mouse: frame.mouse,
             })
         }
-        WlxFrame::Implicit => {
+        WlxFrame::Implicit(transform) => {
             log::trace!("{}: New Implicit frame", me.name);
 
-            let Some((image, format)) = me.dma_exporter.as_ref().unwrap().get_current() else {
+            let Some((image, mut format)) = me.dma_exporter.as_ref().unwrap().get_current() else {
                 log::error!("{}: Implicit frame is missing!", me.name);
                 return None;
             };
+            format.transform = transform;
 
             Some(WlxCaptureOut {
                 image,
@@ -676,6 +746,14 @@ const fn receive_callback_dummy(_: &DummyDrmExporter, frame: WlxFrame) -> Option
 }
 
 fn extent_from_format(fmt: FrameFormat, config: &GeneralConfig) -> [u32; 2] {
+    let (width, height) = match fmt.transform {
+        wlx_frame::Transform::Rotated90
+        | wlx_frame::Transform::Rotated270
+        | wlx_frame::Transform::Flipped90
+        | wlx_frame::Transform::Flipped270 => (fmt.height, fmt.width),
+        _ => (fmt.width, fmt.height),
+    };
+
     // screens above a certain resolution will have severe aliasing
     let height_limit = if config.screen_render_down {
         u32::from(config.screen_max_height.min(2560))
@@ -683,36 +761,11 @@ fn extent_from_format(fmt: FrameFormat, config: &GeneralConfig) -> [u32; 2] {
         2560
     };
 
-    let h = fmt.height.min(height_limit);
-    let w = (fmt.width as f32 / fmt.height as f32 * h as f32) as u32;
+    let h = height.min(height_limit);
+    let w = (width as f32 / height as f32 * h as f32) as u32;
     [w, h]
 }
 
-fn affine_from_format(format: &FrameFormat) -> Affine3A {
-    const FLIP_X: Vec3 = Vec3 {
-        x: -1.0,
-        y: 1.0,
-        z: 1.0,
-    };
-
-    match format.transform {
-        wlx_frame::Transform::Rotated90 => Affine3A::from_rotation_z(-PI / 2.0),
-        wlx_frame::Transform::Rotated180 => Affine3A::from_rotation_z(PI),
-        wlx_frame::Transform::Rotated270 => Affine3A::from_rotation_z(PI / 2.0),
-        wlx_frame::Transform::Flipped => Affine3A::from_scale(FLIP_X),
-        wlx_frame::Transform::Flipped90 => {
-            Affine3A::from_scale(FLIP_X) * Affine3A::from_rotation_z(-PI / 2.0)
-        }
-        wlx_frame::Transform::Flipped180 => {
-            Affine3A::from_scale(FLIP_X) * Affine3A::from_rotation_z(PI)
-        }
-        wlx_frame::Transform::Flipped270 => {
-            Affine3A::from_scale(FLIP_X) * Affine3A::from_rotation_z(PI / 2.0)
-        }
-        _ => Affine3A::IDENTITY,
-    }
-}
-
 macro_rules! new_wlx_capture {
     ($capture_queue:expr, $capture:expr) => {
         if $capture_queue.is_none() {
diff --git a/wayvr/src/overlays/screen/mirror.rs b/wayvr/src/overlays/screen/mirror.rs
index 0feabf8a..3e7801b1 100644
--- a/wayvr/src/overlays/screen/mirror.rs
+++ b/wayvr/src/overlays/screen/mirror.rs
@@ -1,191 +1,75 @@
-use std::{
-    sync::{
-        Arc,
-        atomic::{AtomicUsize, Ordering},
-    },
-    task::{Context, Poll},
+use std::sync::{
+    Arc,
+    atomic::{AtomicUsize, Ordering},
 };
 
-use futures::{Future, FutureExt};
-use glam::{Affine2, Affine3A, Quat, Vec3, vec3};
-use wlx_capture::{
-    WlxCapture,
-    pipewire::{PipewireCapture, PipewireSelectScreenResult, pipewire_select_screen},
-};
+use glam::{Affine2, Affine3A, Quat, Vec2, Vec3, vec3};
+use wlx_capture::{WlxCapture, pipewire::ScreenCastParams};
 use wlx_common::{
     overlays::{BackendAttrib, BackendAttribValue},
     windowing::OverlayWindowState,
 };
 
 use crate::{
-    backend::{
-        input::{HoverResult, PointerHit},
-        task::{OverlayTask, TaskType, ToggleMode},
-    },
+    backend::input::{HoverResult, PointerHit},
     overlays::screen::{
         backend::CaptureType,
-        capture::{MainThreadWlxCapture, new_wlx_capture},
+        capture::{WlxCaptureIn, WlxCaptureOut},
+        pw::ScreenCastBackend,
     },
-    state::{AppSession, AppState},
+    state::AppState,
     subsystem::hid::WheelDelta,
     windowing::{
-        OverlaySelector,
-        backend::{
-            FrameMeta, OverlayBackend, OverlayEventData, RenderResources, ShouldRender,
-            ui_transform,
-        },
+        backend::{FrameMeta, OverlayBackend, OverlayEventData, RenderResources, ShouldRender},
         window::{OverlayCategory, OverlayWindowConfig},
     },
 };
 
 use super::backend::ScreenBackend;
-type PinnedSelectorFuture = core::pin::Pin<
-    Box<dyn Future<Output = Result<PipewireSelectScreenResult, wlx_capture::pipewire::AshpdError>>>,
->;
-
 static MIRROR_COUNTER: AtomicUsize = AtomicUsize::new(1);
 
-pub struct MirrorBackend {
-    name: Arc<str>,
-    renderer: Option<ScreenBackend>,
-    selector: Option<PinnedSelectorFuture>,
-    last_extent: [u32; 2],
-    interaction_transform: Option<Affine2>,
-}
-impl MirrorBackend {
-    pub fn new(name: Arc<str>) -> Self {
-        let selector = Box::pin(pipewire_select_screen(None, false, false, false, false));
-        Self {
-            name,
-            renderer: None,
-            selector: Some(selector),
-            last_extent: [0; 2],
-            interaction_transform: None,
-        }
-    }
-}
+pub struct MirrorBackend(ScreenBackend);
 
 impl OverlayBackend for MirrorBackend {
     fn init(&mut self, _app: &mut AppState) -> anyhow::Result<()> {
         Ok(())
     }
     fn should_render(&mut self, app: &mut AppState) -> anyhow::Result<ShouldRender> {
-        if let Some(mut selector) = self.selector.take() {
-            let maybe_pw_result = match selector
-                .poll_unpin(&mut Context::from_waker(futures::task::noop_waker_ref()))
-            {
-                Poll::Ready(result) => result,
-                Poll::Pending => {
-                    self.selector = Some(selector);
-                    return Ok(ShouldRender::Unable);
-                }
-            };
-
-            match maybe_pw_result {
-                Ok(pw_result) => {
-                    log::debug!(
-                        "{}: PipeWire result streams: {:?}",
-                        self.name,
-                        &pw_result.streams
-                    );
-                    let node_id = pw_result.streams.first().unwrap().node_id; // streams guaranteed to have at least one element
-                    log::info!("{}: PipeWire node selected: {}", self.name, node_id);
-                    let capture = new_wlx_capture!(
-                        app.gfx_extras.queue_capture,
-                        PipewireCapture::new(self.name.clone(), node_id)
-                    );
-                    self.renderer = Some(ScreenBackend::new_raw(
-                        self.name.clone(),
-                        app.xr_backend,
-                        CaptureType::PipeWire,
-                        capture,
-                    ));
-                    app.tasks
-                        .enqueue(TaskType::Overlay(OverlayTask::ToggleOverlay(
-                            OverlaySelector::Name(self.name.clone()),
-                            ToggleMode::EnsureOn,
-                        )));
-                }
-                Err(e) => {
-                    log::warn!("Failed to create mirror due to PipeWire error: {e:?}");
-                    self.renderer = None;
-                    // drop self
-                    app.tasks
-                        .enqueue(TaskType::Overlay(OverlayTask::Drop(OverlaySelector::Name(
-                            self.name.clone(),
-                        ))));
-                }
-            }
-        }
-        self.renderer
-            .as_mut()
-            .map_or(Ok(ShouldRender::Unable), |r| r.should_render(app))
+        self.0.should_render(app)
     }
     fn render(&mut self, app: &mut AppState, rdr: &mut RenderResources) -> anyhow::Result<()> {
-        let Some(renderer) = self.renderer.as_mut() else {
-            anyhow::bail!("render failed after should_render passed");
-        };
-
-        renderer.render(app, rdr)?;
-        if let Some(meta) = renderer.frame_meta() {
-            let extent = meta.extent;
-            if self.last_extent != extent {
-                self.last_extent = extent;
-                self.interaction_transform = Some(ui_transform(extent));
-            }
-        }
-
+        self.0.render(app, rdr)?;
         Ok(())
     }
     fn pause(&mut self, app: &mut AppState) -> anyhow::Result<()> {
-        if let Some(renderer) = self.renderer.as_mut() {
-            renderer.pause(app)?;
-        }
-        Ok(())
+        self.0.pause(app)
     }
     fn resume(&mut self, app: &mut AppState) -> anyhow::Result<()> {
-        if let Some(renderer) = self.renderer.as_mut() {
-            renderer.resume(app)?;
-        }
-        Ok(())
+        self.0.resume(app)
     }
 
     fn frame_meta(&mut self) -> Option<FrameMeta> {
-        self.renderer.as_mut().and_then(ScreenBackend::frame_meta)
+        self.0.frame_meta()
     }
 
     fn notify(&mut self, app: &mut AppState, event_data: OverlayEventData) -> anyhow::Result<()> {
-        let Some(renderer) = self.renderer.as_mut() else {
-            return Ok(());
-        };
-        renderer.notify(app, event_data)
+        self.0.notify(app, event_data)
     }
 
     fn on_hover(&mut self, _: &mut AppState, _: &PointerHit) -> HoverResult {
-        HoverResult {
-            consume: true,
-            ..HoverResult::default()
-        }
+        HoverResult::consume()
     }
     fn on_left(&mut self, _: &mut AppState, _: usize) {}
     fn on_pointer(&mut self, _: &mut AppState, _: &PointerHit, _: bool) {}
     fn on_scroll(&mut self, _: &mut AppState, _: &PointerHit, _delta: WheelDelta) {}
     fn get_interaction_transform(&mut self) -> Option<Affine2> {
-        self.interaction_transform
+        self.0.get_interaction_transform()
     }
     fn get_attrib(&self, attrib: BackendAttrib) -> Option<BackendAttribValue> {
-        if let Some(renderer) = self.renderer.as_ref() {
-            renderer.get_attrib(attrib)
-        } else {
-            None
-        }
+        self.0.get_attrib(attrib)
     }
     fn set_attrib(&mut self, app: &mut AppState, value: BackendAttribValue) -> bool {
-        if let Some(renderer) = self.renderer.as_mut() {
-            renderer.set_attrib(app, value)
-        } else {
-            false
-        }
+        self.0.set_attrib(app, value)
     }
 }
 
@@ -193,8 +77,41 @@ pub fn new_mirror_name() -> Arc<str> {
     format!("M-{}", MIRROR_COUNTER.fetch_add(1, Ordering::Relaxed)).into()
 }
 
-pub fn new_mirror(name: Arc<str>, session: &AppSession) -> OverlayWindowConfig {
-    OverlayWindowConfig {
+pub fn new_mirror(name: Arc<str>, app: &mut AppState) -> anyhow::Result<OverlayWindowConfig> {
+    fn finalize_fn(
+        name: Arc<str>,
+        _: Vec2,
+        _: Vec2,
+        capture: Box<dyn WlxCapture<WlxCaptureIn, WlxCaptureOut>>,
+        app: &mut AppState,
+    ) -> Box<dyn OverlayBackend> {
+        let renderer =
+            ScreenBackend::new_raw(name.clone(), app.xr_backend, CaptureType::PipeWire, capture);
+
+        let backend = MirrorBackend(renderer);
+
+        Box::new(backend)
+    }
+
+    let params = ScreenCastParams {
+        token: None,
+        embed_mouse: true,
+        screens_only: false,
+        persist: false,
+        allow_multiple: false,
+    };
+
+    let backend = ScreenCastBackend::new_raw(
+        name.clone(),
+        "".into(),
+        Vec2::ZERO,
+        Vec2::ZERO,
+        params,
+        app,
+        finalize_fn,
+    )?;
+
+    Ok(OverlayWindowConfig {
         name: name.clone(),
         category: OverlayCategory::Mirror,
         show_on_spawn: true,
@@ -203,12 +120,12 @@ pub fn new_mirror(name: Arc<str>, session: &AppSession) -> OverlayWindowConfig {
             grabbable: true,
             curvature: Some(0.15),
             transform: Affine3A::from_scale_rotation_translation(
-                Vec3::ONE * session.config.desktop_view_scale,
+                Vec3::ONE * app.session.config.default_overlay_scale,
                 Quat::IDENTITY,
                 vec3(0.0, 0.2, -0.35),
             ),
             ..OverlayWindowState::default()
         },
-        ..OverlayWindowConfig::from_backend(Box::new(MirrorBackend::new(name)))
-    }
+        ..OverlayWindowConfig::from_backend(Box::new(backend))
+    })
 }
diff --git a/wayvr/src/overlays/screen/mod.rs b/wayvr/src/overlays/screen/mod.rs
index 653e5997..acb05ec7 100644
--- a/wayvr/src/overlays/screen/mod.rs
+++ b/wayvr/src/overlays/screen/mod.rs
@@ -6,7 +6,7 @@ use wlx_common::windowing::{OverlayWindowState, Positioning};
 
 use crate::{
     state::{AppSession, AppState, ScreenMeta},
-    subsystem::input::KeyboardFocus,
+    subsystem::input::InputFocus,
     windowing::{
         backend::OverlayBackend,
         window::{OverlayCategory, OverlayWindowConfig},
@@ -50,13 +50,13 @@ fn create_screen_from_backend(
             interactable: true,
             curvature: Some(0.15),
             transform: Affine3A::from_scale_rotation_translation(
-                Vec3::ONE * 1.5 * session.config.desktop_view_scale,
+                Vec3::ONE * 1.5 * session.config.default_overlay_scale,
                 Quat::from_rotation_z(angle),
                 vec3(0.0, 0.0, -0.5),
             ),
             ..OverlayWindowState::default()
         },
-        keyboard_focus: Some(KeyboardFocus::PhysicalScreen),
+        input_focus: Some(InputFocus::PhysicalScreen),
         ..OverlayWindowConfig::from_backend(backend)
     }
 }
@@ -72,7 +72,7 @@ pub fn create_screens(app: &mut AppState) -> anyhow::Result<(ScreenCreateData, b
     {
         if let Some(mut wl) = wlx_capture::wayland::WlxClient::new() {
             log::info!("Wayland detected.");
-            return Ok((wl::create_screens_wayland(&mut wl, app), true));
+            return Ok((wl::create_screens_wayland(&mut wl, app)?, true));
         }
         log::info!("Wayland not detected, assuming X11.");
     }
diff --git a/wayvr/src/overlays/screen/pw.rs b/wayvr/src/overlays/screen/pw.rs
index 1ab14e57..782953d8 100644
--- a/wayvr/src/overlays/screen/pw.rs
+++ b/wayvr/src/overlays/screen/pw.rs
@@ -1,147 +1,426 @@
-use std::{error::Error, path::PathBuf, task, time::Instant};
+use std::{
+    any::Any,
+    collections::HashMap,
+    rc::Rc,
+    sync::Arc,
+    time::{Duration, Instant},
+};
 
-use serde::{Deserialize, Serialize};
+use glam::Vec2;
+use wgui::{
+    event::CallbackDataCommon, i18n::Translation, log::LogErr, parser::Fetchable,
+    widget::label::WidgetLabel,
+};
 use wlx_capture::{
     WlxCapture,
-    pipewire::{PipewireCapture, PipewireSelectScreenResult},
+    pipewire::{ScreenCastParams, ScreenCastRequestId, ScreenCastResult, capture::PipewireCapture},
     wayland::WlxOutput,
 };
-use wlx_common::{
-    config::{PwTokenMap, def_pw_tokens},
-    config_io,
-};
+use wlx_common::{astr_containers::AStrMapExt, overlays::ToastTopic};
 
-use crate::{state::AppState, subsystem::dbus::DbusConnector};
+use crate::{
+    backend::task::{OverlayTask, TaskType},
+    gui::panel::{GuiPanel, NewGuiPanelParams},
+    overlays::{
+        screen::{
+            backend::CaptureType,
+            capture::{WlxCaptureIn, WlxCaptureOut},
+        },
+        toast::Toast,
+    },
+    state::{AppState, save_pw_token_config},
+    subsystem::dbus::DbusConnector,
+    windowing::{
+        OverlaySelector,
+        backend::{DummyBackend, OverlayBackend},
+    },
+};
 
 use super::{
     backend::ScreenBackend,
     capture::{MainThreadWlxCapture, new_wlx_capture},
 };
 
-#[cfg(feature = "wayland")]
-impl ScreenBackend {
-    pub fn new_pw(
+pub(super) type ScreenCastFinalizeFn = fn(
+    Arc<str>,
+    Vec2,
+    Vec2,
+    Box<dyn WlxCapture<WlxCaptureIn, WlxCaptureOut>>,
+    &mut AppState,
+) -> Box<dyn OverlayBackend>;
+
+pub struct ScreenCastPanelState {
+    name: Arc<str>,
+    description: Arc<str>,
+    logical_pos: Vec2,
+    logical_size: Vec2,
+    params: Option<ScreenCastParams>,
+    finalize_fn: ScreenCastFinalizeFn,
+}
+
+pub struct ScreenCastBackend {
+    panel: GuiPanel<ScreenCastPanelState>,
+}
+
+impl ScreenCastBackend {
+    #[cfg(feature = "wayland")]
+    pub fn new_wl(
         output: &WlxOutput,
-        token: Option<&str>,
+        token: Option<Rc<str>>,
         app: &mut AppState,
-    ) -> anyhow::Result<(Self, Option<String> /* pipewire restore token */)> {
-        use crate::overlays::screen::backend::CaptureType;
+    ) -> anyhow::Result<Self> {
+        use glam::vec2;
 
-        let name = output.name.clone();
-        let embed_mouse = !app.session.config.double_cursor_fix;
+        fn finalize_fn(
+            name: Arc<str>,
+            logical_pos: Vec2,
+            logical_size: Vec2,
+            capture: Box<dyn WlxCapture<WlxCaptureIn, WlxCaptureOut>>,
+            app: &mut AppState,
+        ) -> Box<dyn OverlayBackend> {
+            use wlx_capture::frame::Transform;
 
-        let select_screen_result = select_pw_screen(
-            &format!(
-                "Now select: {} {} {} @ {},{}",
-                &output.name,
-                &output.make,
-                &output.model,
-                &output.logical_pos.0,
-                &output.logical_pos.1
-            ),
+            let mut backend =
+                ScreenBackend::new_raw(name, app.xr_backend, CaptureType::PipeWire, capture);
+
+            backend.logical_pos = logical_pos;
+            backend.logical_size = logical_size;
+            backend.apply_mouse_transform_with_override(Transform::Undefined);
+
+            Box::new(backend)
+        }
+
+        let params = ScreenCastParams {
             token,
-            embed_mouse,
-            true,
-            true,
-            false,
-        )?;
+            embed_mouse: true,
+            screens_only: true,
+            persist: true,
+            allow_multiple: false,
+        };
 
-        log::debug!(
-            "{}: PipeWire result streams: {:?}",
-            output.name,
-            &select_screen_result.streams
-        );
+        Self::new_raw(
+            output.name.clone(),
+            format!(
+                "{} {} @ {},{}",
+                output.make, output.model, output.logical_pos.0, output.logical_pos.1
+            )
+            .into(),
+            vec2(output.logical_pos.0 as f32, output.logical_pos.1 as f32),
+            vec2(output.logical_size.0 as f32, output.logical_size.1 as f32),
+            params,
+            app,
+            finalize_fn,
+        )
+    }
 
-        let node_id = select_screen_result.streams.first().unwrap().node_id; // streams guaranteed to have at least one element
+    pub(super) fn new_raw(
+        name: Arc<str>,
+        description: Arc<str>,
+        logical_pos: Vec2,
+        logical_size: Vec2,
+        params: ScreenCastParams,
+        app: &mut AppState,
+        finalize_fn: ScreenCastFinalizeFn,
+    ) -> anyhow::Result<Self> {
+        if app.screencast_manager.is_none() {
+            anyhow::bail!("xdg-desktop-portal screencasts not supported");
+        };
 
-        let capture = new_wlx_capture!(
-            app.gfx_extras.queue_capture,
-            PipewireCapture::new(name, node_id)
-        );
-        Ok((
-            Self::new_raw(
-                output.name.clone(),
-                app.xr_backend,
-                CaptureType::PipeWire,
-                capture,
-            ),
-            select_screen_result.restore_token,
-        ))
+        let panel_params = NewGuiPanelParams {
+            extra_vars: HashMap::from([
+                ("name".into(), name.as_ref().into()),
+                ("description".into(), description.as_ref().into()),
+            ]),
+            ..Default::default()
+        };
+
+        let state = ScreenCastPanelState {
+            name: name.clone(),
+            description: description.clone(),
+            logical_pos,
+            logical_size,
+            params: Some(params),
+            finalize_fn,
+        };
+
+        let mut panel =
+            GuiPanel::new_from_template(app, "gui/screencast.xml", state, panel_params)?;
+
+        panel.update_layout(app)?;
+
+        Ok(Self { panel })
     }
 }
 
-#[allow(clippy::fn_params_excessive_bools)]
-pub(super) fn select_pw_screen(
-    instructions: &str,
-    token: Option<&str>,
-    embed_mouse: bool,
-    screens_only: bool,
-    persist: bool,
-    multiple: bool,
-) -> Result<PipewireSelectScreenResult, wlx_capture::pipewire::AshpdError> {
-    use std::time::Duration;
-    use wlx_capture::pipewire::pipewire_select_screen;
+impl OverlayBackend for ScreenCastBackend {
+    fn init(&mut self, app: &mut AppState) -> anyhow::Result<()> {
+        if let Some(params) = self.panel.state.params.take()
+            && let Some(screencast_manager) = app.screencast_manager.as_mut()
+        {
+            let request_id = screencast_manager.request(params.clone())?;
+            check(
+                self.panel.state.name.clone(),
+                self.panel.state.description.clone(),
+                self.panel.state.logical_pos,
+                self.panel.state.logical_size,
+                0,
+                None,
+                None,
+                request_id.clone(),
+                self.panel.state.finalize_fn,
+                app,
+            );
+        }
 
-    let future = async move {
-        let print_at = Instant::now() + Duration::from_millis(250);
-        let mut notify = None;
+        self.panel.init(app)
+    }
+    fn pause(&mut self, app: &mut AppState) -> anyhow::Result<()> {
+        self.panel.pause(app)
+    }
+    fn resume(&mut self, app: &mut AppState) -> anyhow::Result<()> {
+        self.panel.resume(app)
+    }
+    fn should_render(
+        &mut self,
+        app: &mut AppState,
+    ) -> anyhow::Result<crate::windowing::backend::ShouldRender> {
+        self.panel.should_render(app)
+    }
+    fn render(
+        &mut self,
+        app: &mut AppState,
+        rdr: &mut crate::windowing::backend::RenderResources,
+    ) -> anyhow::Result<()> {
+        self.panel.render(app, rdr)
+    }
+    fn frame_meta(&mut self) -> Option<crate::windowing::backend::FrameMeta> {
+        self.panel.frame_meta()
+    }
+    fn notify(
+        &mut self,
+        app: &mut AppState,
+        event_data: crate::windowing::backend::OverlayEventData,
+    ) -> anyhow::Result<()> {
+        self.panel.notify(app, event_data)
+    }
+    fn on_hover(
+        &mut self,
+        app: &mut AppState,
+        hit: &crate::backend::input::PointerHit,
+    ) -> crate::backend::input::HoverResult {
+        self.panel.on_hover(app, hit)
+    }
+    fn on_left(&mut self, app: &mut AppState, pointer: usize) {
+        self.panel.on_left(app, pointer);
+    }
+    fn on_pointer(
+        &mut self,
+        app: &mut AppState,
+        hit: &crate::backend::input::PointerHit,
+        pressed: bool,
+    ) {
+        self.panel.on_pointer(app, hit, pressed);
+    }
+    fn on_scroll(
+        &mut self,
+        app: &mut AppState,
+        hit: &crate::backend::input::PointerHit,
+        delta: crate::subsystem::hid::WheelDelta,
+    ) {
+        self.panel.on_scroll(app, hit, delta);
+    }
+    fn get_interaction_transform(&mut self) -> Option<glam::Affine2> {
+        self.panel.get_interaction_transform()
+    }
+    fn get_attrib(
+        &self,
+        _attrib: wlx_common::overlays::BackendAttrib,
+    ) -> Option<wlx_common::overlays::BackendAttribValue> {
+        None
+    }
+    fn set_attrib(
+        &mut self,
+        _app: &mut AppState,
+        _value: wlx_common::overlays::BackendAttribValue,
+    ) -> bool {
+        false
+    }
+}
 
-        let f = pipewire_select_screen(token, embed_mouse, screens_only, persist, multiple);
-        futures::pin_mut!(f);
+fn check(
+    name: Arc<str>,
+    description: Arc<str>,
+    logical_pos: Vec2,
+    logical_size: Vec2,
+    user_wait: u32,
+    mut notify_id: Option<u32>,
+    last_result: Option<ScreenCastResult>,
+    request_id: ScreenCastRequestId,
+    finalize_fn: ScreenCastFinalizeFn,
+    app: &mut AppState,
+) {
+    const POLL_INTERVAL: Duration = Duration::from_millis(100);
 
-        loop {
-            match futures::poll!(&mut f) {
-                task::Poll::Ready(result) => return result,
-                task::Poll::Pending => {
-                    if Instant::now() >= print_at {
-                        log::info!("{instructions}");
-                        if let Ok(id) =
-                            DbusConnector::notify_send(instructions, "", 1, 30000, 0, true)
-                        {
-                            notify = Some(id);
-                        }
-                        break;
-                    }
-                    futures::future::lazy(|_| {
-                        std::thread::sleep(Duration::from_millis(10));
-                    })
-                    .await;
+    if let Some(screencast_manager) = app.screencast_manager.as_mut() {
+        let new_result = screencast_manager.check(&request_id);
+        match new_result {
+            ScreenCastResult::Ok(ref pw_result) => {
+                log::debug!(
+                    "{}: PipeWire result streams: {:?}",
+                    name,
+                    &pw_result.streams
+                );
+                let node_id = pw_result.streams.first().unwrap().node_id; // streams guaranteed to have at least one element
+                log::info!("{}: PipeWire node selected: {}", name, node_id);
+
+                if let Some(id) = notify_id.take() {
+                    let _ = DbusConnector::notify_close(id);
                 }
+
+                let pw_tokens_copy = app.session.pw_tokens.clone();
+                if let Some(restore_token) = pw_result.restore_token.as_ref()
+                    && app
+                        .session
+                        .pw_tokens
+                        .arc_set(name.clone(), restore_token.clone())
+                {
+                    log::info!("Adding Pipewire token for {name}");
+                }
+                if pw_tokens_copy != app.session.pw_tokens {
+                    // Token list changed, re-create token config file
+                    if let Err(err) = save_pw_token_config(app.session.pw_tokens.clone()) {
+                        log::error!("Failed to save Pipewire token config: {err}");
+                    }
+                }
+                app.tasks.enqueue(TaskType::Overlay(OverlayTask::Modify(
+                    OverlaySelector::Name(name.clone()),
+                    Box::new(move |app, owc| {
+                        let capture = new_wlx_capture!(
+                            app.gfx_extras.queue_capture,
+                            PipewireCapture::new(name.clone(), node_id)
+                        );
+
+                        owc.backend = finalize_fn(name, logical_pos, logical_size, capture, app);
+
+                        let _ = owc
+                            .backend
+                            .init(app)
+                            .log_err("Failed to init ScreenBackend");
+                    }),
+                )));
+            }
+            // TODO: display status to user
+            ScreenCastResult::Queued
+            | ScreenCastResult::Pending
+            | ScreenCastResult::WaitingForUser => {
+                let user_wait_add = if matches!(new_result, ScreenCastResult::WaitingForUser) {
+                    if user_wait == 2 {
+                        notify_id = DbusConnector::notify_send(
+                            "Select screen cast for:",
+                            format!("{name} {description}").as_str(),
+                            1,
+                            30000,
+                            0,
+                            true,
+                        )
+                        .ok();
+                    }
+                    1
+                } else {
+                    0
+                };
+
+                if last_result.is_none_or(|last_result| last_result != new_result) {
+                    update_status_hack(&name, &description, &new_result, app);
+                }
+
+                app.tasks.enqueue_at(
+                    TaskType::Overlay(OverlayTask::Modify(
+                        OverlaySelector::Name(name.clone()),
+                        Box::new({
+                            move |app, _owc| {
+                                check(
+                                    name.clone(),
+                                    description.clone(),
+                                    logical_pos,
+                                    logical_size,
+                                    user_wait + user_wait_add,
+                                    notify_id,
+                                    Some(new_result),
+                                    request_id.clone(),
+                                    finalize_fn,
+                                    app,
+                                );
+                            }
+                        }),
+                    )),
+                    Instant::now() + POLL_INTERVAL,
+                );
+            }
+            ScreenCastResult::Failed(ref e) => {
+                if let Some(id) = notify_id.take() {
+                    let _ = DbusConnector::notify_close(id);
+                }
+
+                update_status_hack(&name, &description, &new_result, app);
+
+                log::warn!("Failed to create mirror due to PipeWire error: {e:?}");
+                Toast::new(
+                    ToastTopic::Error,
+                    "TOAST.TITLE_SCREENCAST_FAIL".into(),
+                    format!("{e}"),
+                )
+                .submit(app);
             }
         }
+    }
+}
 
-        let result = f.await;
-        if let Some(id) = notify {
-            //safe unwrap; checked above
-            let _ = DbusConnector::notify_close(id);
+fn update_status_hack(
+    name: &Arc<str>,
+    description: &Arc<str>,
+    result: &ScreenCastResult,
+    app: &mut AppState,
+) {
+    let message = match result {
+        ScreenCastResult::Queued => "SCREENCAST.QUEUED",
+        ScreenCastResult::WaitingForUser => {
+            if description.is_empty() {
+                "SCREENCAST.WAITING_FOR_USER"
+            } else {
+                "SCREENCAST.WAITING_FOR_USER_DESC"
+            }
         }
-        result
+        ScreenCastResult::Failed(_) => "SCREENCAST.FAIL",
+        _ => "SCREENCAST.PENDING", // Ok is technically never visible
     };
 
-    futures::executor::block_on(future)
-}
-
-#[derive(Deserialize, Serialize, Default)]
-pub struct TokenConf {
-    #[serde(default = "def_pw_tokens")]
-    pub pw_tokens: PwTokenMap,
-}
-
-fn get_pw_token_path() -> PathBuf {
-    let mut path = config_io::ConfigRoot::Generic.get_conf_d_path();
-    path.push("pw_tokens.yaml");
-    path
-}
-
-pub fn save_pw_token_config(tokens: PwTokenMap) -> Result<(), Box<dyn Error>> {
-    let conf = TokenConf { pw_tokens: tokens };
-    let yaml = serde_yaml::to_string(&conf)?;
-    std::fs::write(get_pw_token_path(), yaml)?;
-    Ok(())
-}
-
-pub fn load_pw_token_config() -> Result<PwTokenMap, Box<dyn Error>> {
-    let yaml = std::fs::read_to_string(get_pw_token_path())?;
-    let conf: TokenConf = serde_yaml::from_str(yaml.as_str())?;
-    Ok(conf.pw_tokens)
+    app.tasks.enqueue(TaskType::Overlay(OverlayTask::Modify(
+        OverlaySelector::Name(name.clone()),
+        Box::new({
+            move |_app, owc| {
+                let backend =
+                    std::mem::replace(&mut owc.backend, Box::new(DummyBackend {})) as Box<dyn Any>;
+                let mut backend = backend
+                    .downcast::<ScreenCastBackend>()
+                    .expect("Wrong type to unwrap");
+                {
+                    let Ok(mut label) = backend
+                        .panel
+                        .parser_state
+                        .fetch_widget_as::<WidgetLabel>(&backend.panel.layout.state, "status")
+                        .log_err("element with id=\"status\" not found in screencast.xml!")
+                    else {
+                        return;
+                    };
+                    let mut common = CallbackDataCommon {
+                        state: &backend.panel.layout.state,
+                        alterables: &mut backend.panel.layout.alterables,
+                    };
+                    label.set_text(&mut common, Translation::from_translation_key(message));
+                }
+                let _ = std::mem::replace(&mut owc.backend, backend);
+            }
+        }),
+    )));
 }
diff --git a/wayvr/src/overlays/screen/wl.rs b/wayvr/src/overlays/screen/wl.rs
index 899fc4be..ba1692a6 100644
--- a/wayvr/src/overlays/screen/wl.rs
+++ b/wayvr/src/overlays/screen/wl.rs
@@ -1,25 +1,23 @@
-use glam::vec2;
+use glam::{DVec2, vec2};
+use wgui::log::LogErr;
 use wlx_capture::{
     WlxCapture,
     frame::Transform,
     wayland::{WlxClient, WlxOutput},
     wlr_screencopy::WlrScreencopyCapture,
 };
-use wlx_common::{
-    astr_containers::AStrMapExt,
-    config::{CaptureMethod, PwTokenMap},
-};
+use wlx_common::{astr_containers::AStrMapExt, config::CaptureMethod};
 
 use crate::{
-    overlays::screen::{backend::CaptureType, create_screen_from_backend},
+    overlays::screen::{backend::CaptureType, create_screen_from_backend, pw::ScreenCastBackend},
     state::{AppState, ScreenMeta},
+    windowing::backend::OverlayBackend,
 };
 
 use super::{
     ScreenCreateData,
     backend::ScreenBackend,
     capture::{MainThreadWlxCapture, new_wlx_capture},
-    pw::{load_pw_token_config, save_pw_token_config},
 };
 
 impl ScreenBackend {
@@ -38,67 +36,50 @@ impl ScreenBackend {
     }
 }
 
-#[allow(clippy::useless_let_if_seq)]
 pub fn create_screen_renderer_wl(
     output: &WlxOutput,
     has_wlr_screencopy: bool,
-    pw_token_store: &mut PwTokenMap,
     app: &mut AppState,
-) -> Option<ScreenBackend> {
-    let mut capture: Option<ScreenBackend> = None;
-
+) -> anyhow::Result<Box<dyn OverlayBackend>> {
     if matches!(
         app.session.config.capture_method,
         CaptureMethod::ScreenCopyCpu | CaptureMethod::ScreenCopyGpu | CaptureMethod::Auto
     ) && has_wlr_screencopy
     {
-        log::info!("{}: Using ScreenCopy capture", &output.name);
-        capture = ScreenBackend::new_wlr_screencopy(output, app);
-    }
-
-    if capture.is_none() {
-        log::info!("{}: Using Pipewire capture", &output.name);
-
-        let display_name = &*output.name;
-
-        // Find existing token by display
-        let token = pw_token_store
-            .arc_get(display_name)
-            .map(std::string::String::as_str);
-
-        if let Some(t) = token {
-            log::info!("Found existing Pipewire token for display {display_name}: {t}");
-        }
-
-        match ScreenBackend::new_pw(output, token, app) {
-            Ok((renderer, restore_token)) => {
-                capture = Some(renderer);
-
-                if let Some(token) = restore_token
-                    && pw_token_store.arc_set(display_name.into(), token.clone())
-                {
-                    log::info!("Adding Pipewire token {token}");
-                }
-            }
-            Err(e) => {
-                log::warn!(
-                    "{}: Failed to create Pipewire capture: {:?}",
-                    &output.name,
-                    e
-                );
-            }
+        if let Some(mut backend) = ScreenBackend::new_wlr_screencopy(output, app) {
+            log::info!("{}: Using ScreenCopy capture", &output.name);
+            backend.logical_pos = vec2(output.logical_pos.0 as f32, output.logical_pos.1 as f32);
+            backend.logical_size = vec2(output.logical_size.0 as f32, output.logical_size.1 as f32);
+            backend.apply_mouse_transform_with_override(Transform::Undefined);
+            return Ok(Box::new(backend));
         }
     }
-    capture
+
+    log::info!("{}: Using Pipewire capture", &output.name);
+    let display_name = &*output.name;
+
+    // Find existing token by display
+    let token = app
+        .session
+        .pw_tokens
+        .arc_get(display_name)
+        .map(|x| x.to_string().into());
+
+    if token.is_some() {
+        log::info!("Found existing Pipewire token for display {display_name}");
+    }
+
+    Ok(Box::new(
+        ScreenCastBackend::new_wl(output, token, app)
+            .log_err("Failed to create screen with screen cast backend")?,
+    ))
 }
 
-pub fn create_screens_wayland(wl: &mut WlxClient, app: &mut AppState) -> ScreenCreateData {
+pub fn create_screens_wayland(
+    wl: &mut WlxClient,
+    app: &mut AppState,
+) -> anyhow::Result<ScreenCreateData> {
     let mut screens = vec![];
-
-    // Load existing Pipewire tokens from file
-    let mut pw_tokens: PwTokenMap = load_pw_token_config().unwrap_or_default();
-
-    let pw_tokens_copy = pw_tokens.clone();
     let has_wlr_screencopy = wl.maybe_wlr_screencopy_mgr.is_some();
 
     for (id, output) in &wl.outputs {
@@ -114,35 +95,20 @@ pub fn create_screens_wayland(wl: &mut WlxClient, app: &mut AppState) -> ScreenC
             output.logical_pos,
         );
 
-        if let Some(mut backend) =
-            create_screen_renderer_wl(output, has_wlr_screencopy, &mut pw_tokens, app)
-        {
-            backend.logical_pos = vec2(output.logical_pos.0 as f32, output.logical_pos.1 as f32);
-            backend.logical_size = vec2(output.logical_size.0 as f32, output.logical_size.1 as f32);
-            backend.mouse_transform_original = output.transform;
-            backend.apply_mouse_transform_with_override(Transform::Undefined);
+        let backend = create_screen_renderer_wl(output, has_wlr_screencopy, app)?;
+        let window_config = create_screen_from_backend(
+            output.name.clone(),
+            output.transform,
+            &app.session,
+            backend,
+        );
 
-            let window_config = create_screen_from_backend(
-                output.name.clone(),
-                output.transform,
-                &app.session,
-                Box::new(backend),
-            );
+        let meta = ScreenMeta {
+            name: wl.outputs[id].name.clone(),
+            native_handle: *id,
+        };
 
-            let meta = ScreenMeta {
-                name: wl.outputs[id].name.clone(),
-                native_handle: *id,
-            };
-
-            screens.push((meta, window_config));
-        }
-    }
-
-    if pw_tokens_copy != pw_tokens {
-        // Token list changed, re-create token config file
-        if let Err(err) = save_pw_token_config(pw_tokens) {
-            log::error!("Failed to save Pipewire token config: {err}");
-        }
+        screens.push((meta, window_config));
     }
 
     let extent = wl.get_desktop_extent();
@@ -150,10 +116,10 @@ pub fn create_screens_wayland(wl: &mut WlxClient, app: &mut AppState) -> ScreenC
 
     app.hid_provider
         .inner
-        .set_desktop_extent(vec2(extent.0 as f32, extent.1 as f32));
+        .set_desktop_extent(DVec2::new(extent.0 as _, extent.1 as _));
     app.hid_provider
         .inner
-        .set_desktop_origin(vec2(origin.0 as f32, origin.1 as f32));
+        .set_desktop_origin(DVec2::new(origin.0 as _, origin.1 as _));
 
-    ScreenCreateData { screens }
+    Ok(ScreenCreateData { screens })
 }
diff --git a/wayvr/src/overlays/screen/x11.rs b/wayvr/src/overlays/screen/x11.rs
index f1f40687..783f518e 100644
--- a/wayvr/src/overlays/screen/x11.rs
+++ b/wayvr/src/overlays/screen/x11.rs
@@ -1,12 +1,14 @@
 use std::sync::Arc;
 
-use glam::vec2;
+use glam::{DVec2, vec2};
 use wlx_capture::{
     WlxCapture,
     frame::Transform,
     xshm::{XshmCapture, XshmScreen},
 };
 
+#[cfg(feature = "pipewire")]
+use crate::state::save_pw_token_config;
 use crate::{
     overlays::screen::{backend::CaptureType, create_screen_from_backend},
     state::{AppState, ScreenMeta},
@@ -19,7 +21,9 @@ use super::{
 };
 
 #[cfg(feature = "pipewire")]
-use wlx_capture::pipewire::PipewireStream;
+use wlx_capture::pipewire::{
+    PipewireStream, ScreenCastParams, capture::PipewireCapture, screen_cast_select_blocking,
+};
 
 impl ScreenBackend {
     pub fn new_xshm(screen: Arc<XshmScreen>, app: &AppState) -> Self {
@@ -38,43 +42,41 @@ impl ScreenBackend {
 
 #[cfg(feature = "pipewire")]
 pub fn create_screens_x11pw(app: &mut AppState) -> anyhow::Result<ScreenCreateData> {
-    use glam::vec2;
-    use wlx_capture::{pipewire::PipewireCapture, xshm::xshm_get_monitors};
-    use wlx_common::{astr_containers::AStrMapExt, config::PwTokenMap};
+    use wlx_capture::xshm::xshm_get_monitors;
+    use wlx_common::astr_containers::AStrMapExt;
 
-    use crate::{
-        overlays::screen::{
-            create_screen_from_backend,
-            pw::{load_pw_token_config, save_pw_token_config, select_pw_screen},
-        },
-        state::ScreenMeta,
-    };
+    use crate::{overlays::screen::create_screen_from_backend, state::ScreenMeta};
 
     use super::ScreenCreateData;
 
-    // Load existing Pipewire tokens from file
-    let mut pw_tokens: PwTokenMap = load_pw_token_config().unwrap_or_default();
-    let pw_tokens_copy = pw_tokens.clone();
-    let token = pw_tokens.arc_get("x11").map(std::string::String::as_str);
-    let embed_mouse = !app.session.config.double_cursor_fix;
+    let pw_tokens_copy = app.session.pw_tokens.clone();
 
-    let select_screen_result = select_pw_screen(
-        "Select ALL screens on the screencast pop-up!",
-        token,
-        embed_mouse,
-        true,
-        true,
-        true,
-    )?;
+    let params = ScreenCastParams {
+        token: app
+            .session
+            .pw_tokens
+            .arc_get("x11")
+            .map(|x| x.to_string().into()),
+        embed_mouse: !app.session.config.double_cursor_fix,
+        allow_multiple: true,
+        persist: true,
+        screens_only: true,
+    };
+
+    // this one still blocks
+    let select_screen_result = screen_cast_select_blocking(params)?;
 
     if let Some(restore_token) = select_screen_result.restore_token
-        && pw_tokens.arc_set("x11".into(), restore_token.clone())
+        && app
+            .session
+            .pw_tokens
+            .arc_set("x11".into(), restore_token.clone())
     {
         log::info!("Adding Pipewire token {restore_token}");
     }
-    if pw_tokens_copy != pw_tokens {
+    if pw_tokens_copy != app.session.pw_tokens {
         // Token list changed, re-create token config file
-        if let Err(err) = save_pw_token_config(pw_tokens) {
+        if let Err(err) = save_pw_token_config(app.session.pw_tokens.clone()) {
             log::error!("Failed to save Pipewire token config: {err}");
         }
     }
@@ -88,7 +90,7 @@ pub fn create_screens_x11pw(app: &mut AppState) -> anyhow::Result<ScreenCreateDa
     log::info!("Got {} monitors", monitors.len());
     log::info!("Got {} streams", select_screen_result.streams.len());
 
-    let mut extent = vec2(0., 0.);
+    let mut extent = DVec2::ZERO;
     let screens = select_screen_result
         .streams
         .into_iter()
@@ -96,8 +98,8 @@ pub fn create_screens_x11pw(app: &mut AppState) -> anyhow::Result<ScreenCreateDa
         .map(|(i, s)| {
             let m = best_match(&s, monitors.iter().map(AsRef::as_ref)).unwrap();
             log::info!("Stream {i} is {}", m.name);
-            extent.x = extent.x.max((m.monitor.x() + m.monitor.width()) as f32);
-            extent.y = extent.y.max((m.monitor.y() + m.monitor.height()) as f32);
+            extent.x = extent.x.max((m.monitor.x() + m.monitor.width()) as _);
+            extent.y = extent.y.max((m.monitor.y() + m.monitor.height()) as _);
 
             let mut backend = ScreenBackend::new_raw(
                 m.name.clone(),
@@ -130,7 +132,7 @@ pub fn create_screens_x11pw(app: &mut AppState) -> anyhow::Result<ScreenCreateDa
         .collect();
 
     app.hid_provider.inner.set_desktop_extent(extent);
-    app.hid_provider.inner.set_desktop_origin(vec2(0.0, 0.0));
+    app.hid_provider.inner.set_desktop_origin(DVec2::ZERO);
 
     Ok(ScreenCreateData { screens })
 }
@@ -166,7 +168,7 @@ fn best_match<'a>(
 pub fn create_screens_xshm(app: &mut AppState) -> anyhow::Result<ScreenCreateData> {
     use wlx_capture::xshm::xshm_get_monitors;
 
-    let mut extent = vec2(0., 0.);
+    let mut extent = DVec2::ZERO;
 
     let monitors = match xshm_get_monitors() {
         Ok(m) => m,
@@ -178,8 +180,8 @@ pub fn create_screens_xshm(app: &mut AppState) -> anyhow::Result<ScreenCreateDat
     let screens = monitors
         .into_iter()
         .map(|s| {
-            extent.x = extent.x.max((s.monitor.x() + s.monitor.width()) as f32);
-            extent.y = extent.y.max((s.monitor.y() + s.monitor.height()) as f32);
+            extent.x = extent.x.max((s.monitor.x() + s.monitor.width()) as _);
+            extent.y = extent.y.max((s.monitor.y() + s.monitor.height()) as _);
 
             let size = (s.monitor.width(), s.monitor.height());
             let pos = (s.monitor.x(), s.monitor.y());
@@ -213,7 +215,7 @@ pub fn create_screens_xshm(app: &mut AppState) -> anyhow::Result<ScreenCreateDat
         .collect();
 
     app.hid_provider.inner.set_desktop_extent(extent);
-    app.hid_provider.inner.set_desktop_origin(vec2(0.0, 0.0));
+    app.hid_provider.inner.set_desktop_origin(DVec2::ZERO);
 
     Ok(ScreenCreateData { screens })
 }
diff --git a/wayvr/src/overlays/toast.rs b/wayvr/src/overlays/toast.rs
index 76ac4567..887e7af7 100644
--- a/wayvr/src/overlays/toast.rs
+++ b/wayvr/src/overlays/toast.rs
@@ -14,13 +14,12 @@ use wlx_common::{
 };
 
 use crate::{
-    backend::task::{OverlayTask, TaskType},
+    backend::task::{OverlayTask, SpawnPos, TaskType},
     gui::panel::{GuiPanel, NewGuiPanelParams, OnCustomIdFunc},
     state::AppState,
-    windowing::{OverlaySelector, Z_ORDER_TOAST, window::OverlayWindowConfig},
+    windowing::{OverlaySelector, PIXELS_TO_METERS, Z_ORDER_TOAST, window::OverlayWindowConfig},
 };
 
-const PIXELS_TO_METERS: f32 = 1. / 2000.;
 static TOAST_NAME: LazyLock<Arc<str>> = LazyLock::new(|| "toast".into());
 
 pub struct Toast {
@@ -88,8 +87,9 @@ impl Toast {
         // multiple toasts are submitted for the same
         // frame, only the first one gets created
         app.tasks.enqueue_at(
-            TaskType::Overlay(OverlayTask::Create(
+            TaskType::Overlay(OverlayTask::Spawn(
                 selector.clone(),
+                SpawnPos::Fixed,
                 Box::new(move |app| {
                     let maybe_toast = new_toast(self, app);
                     app.tasks.enqueue_at(
diff --git a/wayvr/src/overlays/watch.rs b/wayvr/src/overlays/watch.rs
index f4f19582..33c19ad5 100644
--- a/wayvr/src/overlays/watch.rs
+++ b/wayvr/src/overlays/watch.rs
@@ -4,9 +4,7 @@ use glam::{Affine3A, Quat, Vec3, vec3};
 use wgui::{
     assets::AssetPath,
     components::button::ComponentButton,
-    event::{CallbackDataCommon, EventAlterables, StyleSetRequest},
     parser::{Fetchable, ParseDocumentParams},
-    taffy,
 };
 use wlx_common::{
     common::LeftRight,
@@ -48,9 +46,7 @@ pub fn create_watch(app: &mut AppState) -> anyhow::Result<OverlayWindowConfig> {
     let mut panel =
         GuiPanel::new_from_template(app, watch_xml, state, NewGuiPanelParams::default())?;
 
-    let mut alterables = EventAlterables::default();
-    sets_or_overlays(&panel, app, &mut alterables);
-    panel.layout.process_alterables(alterables)?;
+    sets_or_overlays(&mut panel, app);
 
     let doc_params = ParseDocumentParams {
         globals: panel.layout.state.globals.clone(),
@@ -61,13 +57,10 @@ pub fn create_watch(app: &mut AppState) -> anyhow::Result<OverlayWindowConfig> {
     panel.on_notify = Some(Box::new({
         let name = WATCH_NAME;
         move |panel, app, event_data| {
-            let mut alterables = EventAlterables::default();
-
             let mut elems_changed = panel.state.overlay_list.on_notify(
                 &mut panel.layout,
                 &mut panel.parser_state,
                 &event_data,
-                &mut alterables,
                 &doc_params,
             )?;
 
@@ -75,7 +68,6 @@ pub fn create_watch(app: &mut AppState) -> anyhow::Result<OverlayWindowConfig> {
                 &mut panel.layout,
                 &mut panel.parser_state,
                 &event_data,
-                &mut alterables,
                 &doc_params,
             )?;
 
@@ -93,16 +85,12 @@ pub fn create_watch(app: &mut AppState) -> anyhow::Result<OverlayWindowConfig> {
                         .parser_state
                         .fetch_component_as::<ComponentButton>("btn_edit_mode")
                     {
-                        let mut com = CallbackDataCommon {
-                            alterables: &mut alterables,
-                            state: &panel.layout.state,
-                        };
-                        btn_edit_mode.set_sticky_state(&mut com, edit_mode);
+                        btn_edit_mode.set_sticky_state(&mut panel.layout.common(), edit_mode);
                     }
                 }
                 OverlayEventData::SettingsChanged => {
                     panel.layout.mark_redraw();
-                    sets_or_overlays(panel, app, &mut alterables);
+                    sets_or_overlays(panel, app);
 
                     if app.session.config.clock_12h != panel.state.clock_12h {
                         panel.state.clock_12h = app.session.config.clock_12h;
@@ -135,7 +123,6 @@ pub fn create_watch(app: &mut AppState) -> anyhow::Result<OverlayWindowConfig> {
                 panel.process_custom_elems(app);
             }
 
-            panel.layout.process_alterables(alterables)?;
             Ok(())
         }
     }));
@@ -167,21 +154,17 @@ pub fn create_watch(app: &mut AppState) -> anyhow::Result<OverlayWindowConfig> {
             angle_fade: true,
             ..OverlayWindowState::default()
         },
-        show_on_spawn: true,
+        show_on_spawn: app.session.config.enable_watch,
         global: true,
         ..OverlayWindowConfig::from_backend(Box::new(panel))
     })
 }
 
-fn sets_or_overlays(
-    panel: &GuiPanel<WatchState>,
-    app: &mut AppState,
-    alterables: &mut EventAlterables,
-) {
-    let display = if app.session.config.sets_on_watch {
-        [taffy::Display::None, taffy::Display::Flex]
+fn sets_or_overlays(panel: &mut GuiPanel<WatchState>, app: &mut AppState) {
+    let visible = if app.session.config.sets_on_watch {
+        [false, true]
     } else {
-        [taffy::Display::Flex, taffy::Display::None]
+        [true, false]
     };
 
     let widget = [
@@ -196,6 +179,9 @@ fn sets_or_overlays(
     ];
 
     for i in 0..2 {
-        alterables.set_style(widget[i], StyleSetRequest::Display(display[i]));
+        panel
+            .layout
+            .alterables
+            .set_widget_visible(widget[i], visible[i]);
     }
 }
diff --git a/wayvr/src/overlays/wayvr.rs b/wayvr/src/overlays/wayvr.rs
index 2b0b0274..69bd52e1 100644
--- a/wayvr/src/overlays/wayvr.rs
+++ b/wayvr/src/overlays/wayvr.rs
@@ -1,25 +1,34 @@
-use glam::{Affine2, Affine3A, Quat, Vec2, Vec3, vec2, vec3};
+use std::{mem, ops::RangeInclusive, rc::Rc, sync::Arc};
+
+use glam::{Affine2, Affine3A, Quat, Vec3, vec2, vec3};
+use slotmap::Key;
 use smithay::{
     desktop::PopupManager,
-    wayland::{compositor::with_states, shell::xdg::XdgPopupSurfaceData},
+    input::pointer::CursorImageStatus,
+    reexports::wayland_server::Resource,
+    utils::{Logical, Size},
+    wayland::{
+        compositor::with_states,
+        shell::xdg::{XdgPopupSurfaceData, XdgToplevelSurfaceData},
+    },
 };
-use std::{ops::RangeInclusive, sync::Arc};
 use vulkano::{
     buffer::BufferUsage, image::view::ImageView, pipeline::graphics::color_blend::AttachmentBlend,
 };
 use wayvr_ipc::packet_client::PositionMode;
 use wgui::{
+    color::{WguiColor, WguiColorName},
     components::button::ComponentButton,
-    event::EventCallback,
+    event::{CallbackDataCommon, EventCallback},
     gfx::{
         cmd::WGfxClearMode,
         pipeline::{WGfxPipeline, WPipelineCreateInfo},
     },
     i18n::Translation,
     parser::Fetchable,
-    widget::{EventResult, label::WidgetLabel},
+    widget::{EventResult, label::WidgetLabel, rectangle::WidgetRectangle},
 };
-use wlx_capture::frame::MouseMeta;
+use wlx_capture::frame::{MouseMeta, Transform};
 use wlx_common::{
     overlays::{BackendAttrib, BackendAttribValue, StereoMode},
     windowing::{OverlayWindowState, Positioning},
@@ -29,7 +38,17 @@ use crate::{
     backend::{
         XrBackend,
         input::{self, HoverResult},
-        wayvr::{self, SurfaceBufWithImage, process::KillSignal, window::WindowHandle},
+        task::{OverlayTask, TaskType},
+        wayvr::{
+            self, PointerFocusTarget, SurfaceBufWithImage, WvrServerState,
+            hit_test::{
+                PopupRoot, RenderedSurface, WvrHitContext, WvrHitTarget,
+                collect_rendered_surface_tree, collect_rendered_surface_tree_at,
+                rendered_surfaces_dirty,
+            },
+            process::KillSignal,
+            window::WindowHandle,
+        },
     },
     graphics::{ExtentExt, Vert2Uv, upload_quad_vertices},
     gui::panel::{
@@ -38,8 +57,9 @@ use crate::{
     },
     overlays::screen::capture::ScreenPipeline,
     state::{self, AppState},
-    subsystem::{hid::WheelDelta, input::KeyboardFocus},
+    subsystem::{hid::WheelDelta, input::InputFocus},
     windowing::{
+        OverlayID, OverlaySelector,
         backend::{
             FrameMeta, OverlayBackend, OverlayEventData, RenderResources, ShouldRender,
             ui_transform,
@@ -48,7 +68,9 @@ use crate::{
     },
 };
 
+#[derive(Clone)]
 pub enum WvrCommand {
+    ReloadTitle,
     CloseWindow,
     KillProcess(KillSignal),
 }
@@ -64,8 +86,7 @@ pub fn create_wl_window_overlay(
     size: [u32; 2],
     pos_mode: PositionMode,
 ) -> anyhow::Result<OverlayWindowConfig> {
-    let scale = size[0].max(size[1]) as f32 / 1920.0;
-    let curve_scale = size[0] as f32 / 1920.0;
+    let (scale, curve_scale) = overlay_scale_from_extent(size);
 
     let z_dist = if matches!(pos_mode, PositionMode::Anchor) {
         0.0
@@ -73,6 +94,13 @@ pub fn create_wl_window_overlay(
         -0.95
     };
 
+    let resizable = app
+        .wvr_server
+        .as_mut()
+        .and_then(|wvr| wvr.wm.windows.get(window))
+        .map(|w| w.resizable())
+        .unwrap_or(false);
+
     Ok(OverlayWindowConfig {
         name: name.clone(),
         default_state: OverlayWindowState {
@@ -85,17 +113,22 @@ pub fn create_wl_window_overlay(
             },
             curvature: Some(0.15 * curve_scale),
             transform: Affine3A::from_scale_rotation_translation(
-                Vec3::ONE * scale,
+                Vec3::ONE * app.session.config.default_overlay_scale * scale,
                 Quat::IDENTITY,
                 vec3(0.0, 0.0, z_dist),
             ),
             ..OverlayWindowState::default()
         },
-        keyboard_focus: Some(KeyboardFocus::WayVR),
+        input_focus: Some(InputFocus::WayVR),
         category: OverlayCategory::WayVR,
         show_on_spawn: true,
         ..OverlayWindowConfig::from_backend(Box::new(WvrWindowBackend::new(
-            name, app, window, icon,
+            name,
+            app,
+            window,
+            icon,
+            (scale, curve_scale),
+            resizable,
         )?))
     })
 }
@@ -104,10 +137,13 @@ pub struct WvrWindowBackend {
     name: Arc<str>,
     icon: Arc<str>,
     pipeline: Option<ScreenPipeline>,
-    popups_pipeline: Arc<WGfxPipeline<Vert2Uv>>,
+    subsurface_pipeline: Arc<WGfxPipeline<Vert2Uv>>,
+    popup_outside_button: Option<wayvr::MouseIndex>,
     interaction_transform: Option<Affine2>,
     window: WindowHandle,
-    popups: Vec<(Arc<ImageView>, Vec2)>,
+    popups: Rc<[RenderedSurface]>,
+    surfaces: Rc<[RenderedSurface]>,
+    hit_context: Option<WvrHitContext>,
     just_resumed: bool,
     meta: Option<FrameMeta>,
     mouse: Option<MouseMeta>,
@@ -120,6 +156,11 @@ pub struct WvrWindowBackend {
     mouse_transform: Affine2,
     uv_range: RangeInclusive<f32>,
     panel_hovered: bool,
+    scrolling: bool,
+    overlay_id: OverlayID,
+    scale: (f32, f32),
+    resizable: bool,
+    had_focus: bool,
 }
 
 impl WvrWindowBackend {
@@ -128,18 +169,21 @@ impl WvrWindowBackend {
         app: &mut AppState,
         window: wayvr::window::WindowHandle,
         icon: Arc<str>,
+        scale: (f32, f32),
+        resizable: bool,
     ) -> anyhow::Result<Self> {
-        let popups_pipeline = app.gfx.create_pipeline(
+        let subsurface_pipeline = app.gfx.create_pipeline(
             app.gfx_extras.shaders.get("vert_quad").unwrap(), // want panic
-            app.gfx_extras.shaders.get("frag_screen").unwrap(), // want panic
-            WPipelineCreateInfo::new(app.gfx.surface_format).use_blend(AttachmentBlend::default()),
+            app.gfx_extras.shaders.get("frag_simple").unwrap(), // want panic
+            WPipelineCreateInfo::new(app.gfx.surface_format).use_blend(AttachmentBlend::alpha()),
         )?;
 
         let on_custom_attrib: OnCustomAttribFunc =
             Box::new(move |layout, parser, attribs, _app| {
-                let Ok(button) =
-                    parser.fetch_component_from_widget_id_as::<ComponentButton>(attribs.widget_id)
-                else {
+                let Ok(button) = parser.fetch_component_from_widget_id_as::<ComponentButton>(
+                    &layout.state,
+                    attribs.widget_id,
+                ) else {
                     return;
                 };
 
@@ -183,20 +227,11 @@ impl WvrWindowBackend {
             NewGuiPanelParams {
                 resize_to_parent: true,
                 on_custom_attrib: Some(on_custom_attrib),
+                extra_vars: [("title".into(), name.as_ref().into())].into(),
                 ..Default::default()
             },
         )?;
 
-        {
-            let mut title = panel
-                .parser_state
-                .fetch_widget_as::<WidgetLabel>(&panel.layout.state, "label_title")?;
-            title.set_text_simple(
-                &mut app.wgui_globals.get(),
-                Translation::from_raw_text(&name),
-            );
-        }
-
         panel.update_layout(app)?;
 
         Ok(Self {
@@ -204,8 +239,11 @@ impl WvrWindowBackend {
             icon,
             pipeline: None,
             window,
-            popups: vec![],
-            popups_pipeline,
+            popups: Default::default(),
+            surfaces: Default::default(),
+            hit_context: None,
+            subsurface_pipeline,
+            popup_outside_button: None,
             interaction_transform: None,
             just_resumed: false,
             meta: None,
@@ -223,32 +261,81 @@ impl WvrWindowBackend {
             mouse_transform: Affine2::ZERO,
             uv_range: 0.0..=1.0,
             panel_hovered: false,
+            scrolling: false,
+            overlay_id: OverlayID::null(),
+            scale,
+            resizable,
+            had_focus: false,
         })
     }
 
     fn apply_extent(&mut self, app: &mut AppState, meta: &FrameMeta) -> anyhow::Result<()> {
+        let (old_scale, old_curve_scale) = self.scale;
+        let (new_scale, curve_scale) = overlay_scale_from_extent(meta.extent);
+        self.scale = (new_scale, curve_scale);
+
+        if new_scale.abs() > f32::EPSILON {
+            let scale_delta = new_scale / old_scale;
+            let curve_scale_delta = curve_scale / old_curve_scale;
+
+            if (scale_delta - 1.0).abs() > f32::EPSILON
+                || (curve_scale_delta - 1.0).abs() > f32::EPSILON
+            {
+                self.resizable = app
+                    .wvr_server
+                    .as_mut()
+                    .and_then(|wvr| wvr.wm.windows.get(self.window))
+                    .map(|w| w.resizable())
+                    .unwrap_or(false);
+
+                app.tasks.enqueue(TaskType::Overlay(OverlayTask::Modify(
+                    OverlaySelector::Id(self.overlay_id),
+                    Box::new(move |_app, owc| {
+                        if let Some(state) = owc.active_state.as_mut() {
+                            if let Some(curvature) = state.curvature.as_mut() {
+                                *curvature = (curve_scale_delta * *curvature).clamp(0.0, 0.5);
+                            }
+
+                            if let Some(saved) = state.saved_transform.as_mut() {
+                                saved.matrix3 = saved.matrix3.mul_scalar(scale_delta);
+                            }
+
+                            state.transform.matrix3 =
+                                state.transform.matrix3.mul_scalar(scale_delta);
+                        }
+                    }),
+                )));
+            }
+        }
+
         self.interaction_transform = Some(ui_transform(meta.extent));
 
         let mut scale = vec2(
-            ((meta.extent[0] + BORDER_SIZE * 2) as f32) / (meta.extent[0] as f32),
-            ((meta.extent[1] + BORDER_SIZE * 2 + BAR_SIZE) as f32) / (meta.extent[1] as f32),
+            ((meta.extent[0] + BORDER_SIZE * 2) as f32) / meta.extent[0] as f32,
+            ((meta.extent[1] + BORDER_SIZE * 2 + BAR_SIZE) as f32) / meta.extent[1] as f32,
+        );
+
+        let mut translation = vec2(
+            -(BORDER_SIZE as f32) / meta.extent[0] as f32,
+            -((BORDER_SIZE + BAR_SIZE) as f32) / meta.extent[1] as f32,
         );
 
         if self.stereo_adjust_mouse
             && let Some(stereo) = self.stereo
         {
             match stereo {
-                StereoMode::LeftRight | StereoMode::RightLeft => scale.x *= 0.5,
-                StereoMode::TopBottom | StereoMode::BottomTop => scale.y *= 0.5,
+                StereoMode::LeftRight | StereoMode::RightLeft => {
+                    scale.x *= 0.5;
+                    translation.x *= 0.5;
+                }
+                StereoMode::TopBottom | StereoMode::BottomTop => {
+                    scale.y *= 0.5;
+                    translation.y *= 0.5;
+                }
                 _ => {}
             }
         }
 
-        let translation = vec2(
-            -(BORDER_SIZE as f32) / (meta.extent[0] as f32),
-            -((BORDER_SIZE + BAR_SIZE) as f32) / (meta.extent[1] as f32),
-        );
-
         self.mouse_transform = Affine2::from_scale_angle_translation(scale, 0.0, translation);
         self.uv_range = translation[0]..=(1.0 - translation[0]);
 
@@ -260,6 +347,154 @@ impl WvrWindowBackend {
 
         Ok(())
     }
+
+    fn update_title(&mut self, new_title: Rc<str>) {
+        let mut common = CallbackDataCommon {
+            state: &self.panel.layout.state,
+            alterables: &mut self.panel.layout.alterables,
+        };
+
+        if let Ok(mut title) = self
+            .panel
+            .parser_state
+            .fetch_widget_as::<WidgetLabel>(&self.panel.layout.state, "title")
+        {
+            title.set_text(&mut common, Translation::from_raw_text_rc(new_title));
+        }
+    }
+
+    fn update_decor(&mut self, wvr_server: &mut WvrServerState) {
+        let now_focused = wvr_server
+            .get_focused_window()
+            .is_some_and(|w| w == self.window);
+
+        if now_focused == self.had_focus {
+            return;
+        }
+
+        self.had_focus = now_focused;
+
+        let mut common = CallbackDataCommon {
+            state: &self.panel.layout.state,
+            alterables: &mut self.panel.layout.alterables,
+        };
+
+        const COLORS: [(WguiColor, WguiColor); 2] = [
+            (
+                WguiColorName::Outline.to_wgui_color(),
+                WguiColorName::OnBackground.to_wgui_color(),
+            ),
+            (
+                WguiColorName::Tertiary.to_wgui_color(),
+                WguiColorName::Tertiary.to_wgui_color(),
+            ),
+        ];
+
+        let (rect_col, label_col) = COLORS[now_focused as usize];
+
+        if let Ok(mut rect) = self
+            .panel
+            .parser_state
+            .fetch_widget_as::<WidgetRectangle>(&self.panel.layout.state, "rect")
+        {
+            rect.set_border_color(&mut common, rect_col);
+        }
+
+        if let Ok(mut title) = self
+            .panel
+            .parser_state
+            .fetch_widget_as::<WidgetLabel>(&self.panel.layout.state, "title")
+        {
+            title.set_color(&mut common, label_col, true);
+        }
+    }
+
+    fn mouse_index_from_mode(mode: input::PointerMode) -> Option<wayvr::MouseIndex> {
+        match mode {
+            input::PointerMode::Left => Some(wayvr::MouseIndex::Left),
+            input::PointerMode::Middle => Some(wayvr::MouseIndex::Center),
+            input::PointerMode::Right => Some(wayvr::MouseIndex::Right),
+            _ => None,
+        }
+    }
+
+    fn render_subsurface(
+        &self,
+        app: &mut AppState,
+        rdr: &mut RenderResources,
+        s: &RenderedSurface,
+    ) -> anyhow::Result<()> {
+        let meta = self.meta.as_ref().unwrap();
+        let extentf = [meta.extent[0] as f32, meta.extent[1] as f32];
+
+        let mut buf_vert = app
+            .gfx
+            .empty_buffer(BufferUsage::TRANSFER_DST | BufferUsage::VERTEX_BUFFER, 4)?;
+
+        upload_quad_vertices(
+            &mut buf_vert,
+            extentf[0],
+            extentf[1],
+            s.pos.x,
+            s.pos.y,
+            s.size.x,
+            s.size.y,
+        )?;
+
+        let set0 =
+            self.subsurface_pipeline
+                .uniform_sampler(0, s.image.clone(), app.gfx.texture_filter)?;
+
+        let pass = self.subsurface_pipeline.create_pass(
+            extentf,
+            [BORDER_SIZE as _, (BAR_SIZE + BORDER_SIZE) as _],
+            buf_vert,
+            0..4,
+            0..1,
+            vec![set0],
+            &Default::default(),
+        )?;
+
+        for buf in &mut rdr.cmd_bufs {
+            buf.run_ref(&pass)?;
+        }
+
+        Ok(())
+    }
+
+    fn sync_committed_toplevel_size(
+        &mut self,
+        app: &mut AppState,
+        inner_extent: [u32; 2],
+    ) -> anyhow::Result<()> {
+        let Some(wvr_server) = app.wvr_server.as_mut() else {
+            return Ok(());
+        };
+
+        let bounds = wvr_server.manager.state.output_logical_size();
+
+        let committed = Size::new(inner_extent[0].max(1) as i32, inner_extent[1].max(1) as i32);
+
+        let Some(window) = wvr_server.wm.windows.get_mut(self.window) else {
+            return Ok(());
+        };
+
+        let clamped = window.clamp_configure_size(committed, bounds);
+
+        if committed == clamped {
+            window.remember_committed_size(committed);
+        } else if window.pending_configure_size.is_none() {
+            log::warn!("Client committed invalid size {committed:?}; requesting {clamped:?}");
+            window.request_size(clamped, bounds);
+        } else {
+            log::trace!(
+                "Client committed invalid size {committed:?}, but configure {:?} is already pending",
+                window.pending_configure_size,
+            );
+        }
+
+        Ok(())
+    }
 }
 
 impl OverlayBackend for WvrWindowBackend {
@@ -278,12 +513,10 @@ impl OverlayBackend for WvrWindowBackend {
 
     #[allow(clippy::too_many_lines)]
     fn should_render(&mut self, app: &mut AppState) -> anyhow::Result<ShouldRender> {
-        let should_render_panel = self.panel.should_render(app)?;
-
         let Some(toplevel) = app
             .wvr_server
             .as_ref()
-            .and_then(|sv| sv.wm.windows.get(&self.window))
+            .and_then(|sv| sv.wm.windows.get(self.window))
             .map(|win| win.toplevel.clone())
         else {
             log::debug!(
@@ -293,119 +526,175 @@ impl OverlayBackend for WvrWindowBackend {
             return Ok(ShouldRender::Unable);
         };
 
-        let popups = PopupManager::popups_for_surface(toplevel.wl_surface())
-            .filter_map(|(popup, point)| {
-                with_states(popup.wl_surface(), |states| {
-                    if !states
-                        .data_map
-                        .get::<XdgPopupSurfaceData>()
-                        .unwrap()
-                        .lock()
-                        .unwrap()
-                        .configured
-                    {
-                        // not yet configured
-                        return None;
-                    }
+        let surface_id = toplevel.wl_surface().id();
+        let surfaces = collect_rendered_surface_tree(toplevel.wl_surface());
 
-                    if let Some(surf) = SurfaceBufWithImage::get_from_surface(states) {
-                        Some((surf.image, vec2(point.x as _, point.y as _)))
-                    } else {
-                        None
-                    }
-                })
-            })
-            .collect::<Vec<_>>();
+        let mut popup_roots = Vec::new();
+        let mut popups = Vec::new();
 
-        with_states(toplevel.wl_surface(), |states| {
-            if let Some(surf) = SurfaceBufWithImage::get_from_surface(states) {
-                let mut meta = FrameMeta {
-                    extent: surf.image.extent_u32arr(),
-                    format: surf.image.format(),
-                    clear: WGfxClearMode::Clear([0.0, 0.0, 0.0, 0.0]),
-                    stereo: self.stereo.unwrap_or(StereoMode::None),
-                    ..Default::default()
-                };
-
-                if let Some(stereo) = self.stereo {
-                    // Apply stereo full frame logic
-                    if self.stereo_full_frame {
-                        match stereo {
-                            StereoMode::LeftRight | StereoMode::RightLeft => {
-                                meta.extent[0] /= 2;
-                            }
-                            StereoMode::TopBottom | StereoMode::BottomTop => {
-                                meta.extent[1] /= 2;
-                            }
-                            _ => {}
-                        }
-                    }
-                }
-
-                let inner_extent = meta.extent;
-                meta.extent[0] += BORDER_SIZE * 2;
-                meta.extent[1] += BORDER_SIZE * 2 + BAR_SIZE;
-
-                if let Some(pipeline) = self.pipeline.as_mut() {
-                    if self.inner_extent != inner_extent {
-                        pipeline.set_extent(
-                            app,
-                            [inner_extent[0] as _, inner_extent[1] as _],
-                            [BORDER_SIZE as _, (BAR_SIZE + BORDER_SIZE) as _],
-                        )?;
-                        self.apply_extent(app, &meta)?;
-                        self.inner_extent = inner_extent;
-                    }
-                } else {
-                    let pipeline = ScreenPipeline::new(
-                        &meta,
-                        app,
-                        self.stereo.unwrap_or(StereoMode::None),
-                        [BORDER_SIZE as _, (BAR_SIZE + BORDER_SIZE) as _],
-                    )?;
-                    self.apply_extent(app, &meta)?;
-                    self.pipeline = Some(pipeline);
-                }
-
-                let mouse = app
-                    .wvr_server
-                    .as_ref()
+        for (popup, point) in PopupManager::popups_for_surface(toplevel.wl_surface()) {
+            let configured = with_states(popup.wl_surface(), |states| {
+                states
+                    .data_map
+                    .get::<XdgPopupSurfaceData>()
                     .unwrap()
-                    .wm
-                    .mouse
-                    .as_ref()
-                    .filter(|m| m.hover_window == self.window)
-                    .map(|m| MouseMeta {
-                        x: (m.x as f32) / (inner_extent[0] as f32),
-                        y: (m.y as f32) / (inner_extent[1] as f32),
-                    });
+                    .lock()
+                    .unwrap()
+                    .configured
+            });
 
-                let dirty = self.mouse != mouse || self.popups != popups;
-                self.mouse = mouse;
-                self.popups = popups;
-                self.meta = Some(meta);
-                if self
-                    .cur_image
-                    .as_ref()
-                    .is_none_or(|i| *i.image() != *surf.image.image())
-                {
-                    log::trace!(
-                        "{}: new {} image",
-                        self.name,
-                        if surf.dmabuf { "DMA-buf" } else { "SHM" }
-                    );
-                    self.cur_image = Some(surf.image);
-                    Ok(ShouldRender::Should)
-                } else if dirty {
-                    Ok(ShouldRender::Should)
-                } else {
-                    Ok(should_render_panel)
-                }
-            } else {
-                log::trace!("{}: no buffer for wl_surface", self.name);
-                Ok(ShouldRender::Unable)
+            if !configured {
+                continue;
             }
-        })
+
+            let popup_origin = point - popup.geometry().loc;
+
+            popup_roots.push(PopupRoot {
+                surface: popup.wl_surface().clone(),
+                surface_origin: vec2(popup_origin.x as f32, popup_origin.y as f32),
+            });
+
+            popups.extend(collect_rendered_surface_tree_at(
+                popup.wl_surface(),
+                popup_origin,
+                true,
+            ));
+        }
+
+        let mut tree_dirty = false;
+
+        if let Some(wvr_server) = app.wvr_server.as_mut() {
+            self.update_decor(wvr_server);
+
+            let state = &mut wvr_server.manager.state;
+            tree_dirty |= state.take_redraw_request(&surface_id);
+            tree_dirty |= state.has_pending_frame_callbacks(&surface_id);
+            for surface in surfaces.iter() {
+                tree_dirty |= state.take_redraw_request(&surface.surface_id);
+                tree_dirty |= state.has_pending_frame_callbacks(&surface.surface_id);
+            }
+            for popup in popups.iter() {
+                tree_dirty |= state.take_redraw_request(&popup.surface_id);
+                tree_dirty |= state.has_pending_frame_callbacks(&popup.surface_id);
+            }
+        }
+
+        let should_render_panel = self.panel.should_render(app)?;
+        let force_render = tree_dirty || mem::take(&mut self.just_resumed);
+
+        let hit_surfaces = surfaces.clone();
+        self.surfaces = surfaces;
+
+        let Some(surf) = with_states(toplevel.wl_surface(), SurfaceBufWithImage::get_from_surface)
+        else {
+            log::trace!("{}: no buffer for wl_surface", self.name);
+            return Ok(ShouldRender::Unable);
+        };
+
+        let mut meta = FrameMeta {
+            extent: surf.image.extent_u32arr(),
+            format: surf.image.format(),
+            clear: WGfxClearMode::Clear([0.0, 0.0, 0.0, 0.0]),
+            stereo: self.stereo.unwrap_or(StereoMode::None),
+            ..Default::default()
+        };
+
+        if let Some(stereo) = self.stereo {
+            // Apply stereo full frame logic
+            if self.stereo_full_frame {
+                match stereo {
+                    StereoMode::LeftRight | StereoMode::RightLeft => {
+                        meta.extent[0] /= 2;
+                    }
+                    StereoMode::TopBottom | StereoMode::BottomTop => {
+                        meta.extent[1] /= 2;
+                    }
+                    _ => {}
+                }
+            }
+        }
+
+        let inner_extent = meta.extent;
+        self.sync_committed_toplevel_size(app, inner_extent)?;
+
+        let hit_context = WvrHitContext {
+            surfaces: hit_surfaces,
+            popup_roots: popup_roots.into(),
+            mouse_transform: self.mouse_transform,
+            uv_range: self.uv_range.clone(),
+            inner_extent,
+            panel_height: BORDER_SIZE * 2 + BAR_SIZE,
+        };
+        self.hit_context = Some(hit_context);
+
+        meta.extent[0] += BORDER_SIZE * 2;
+        meta.extent[1] += BORDER_SIZE * 2 + BAR_SIZE;
+
+        if let Some(pipeline) = self.pipeline.as_mut() {
+            if self.inner_extent != inner_extent {
+                pipeline.set_layout(
+                    app,
+                    [inner_extent[0] as _, inner_extent[1] as _],
+                    [BORDER_SIZE as _, (BAR_SIZE + BORDER_SIZE) as _],
+                    Transform::Normal,
+                )?;
+                self.apply_extent(app, &meta)?;
+                self.inner_extent = inner_extent;
+            }
+        } else {
+            let pipeline = ScreenPipeline::new(
+                &meta,
+                app,
+                self.stereo.unwrap_or(StereoMode::None),
+                [BORDER_SIZE as _, (BAR_SIZE + BORDER_SIZE) as _],
+                Transform::Normal,
+            )?;
+            self.apply_extent(app, &meta)?;
+            self.pipeline = Some(pipeline);
+        }
+
+        let mouse = app
+            .wvr_server
+            .as_ref()
+            .unwrap()
+            .wm
+            .mouse
+            .as_ref()
+            .filter(|m| m.hover_window == self.window)
+            .map(|m| MouseMeta {
+                x: (m.pos.x as f32) / (inner_extent[0] as f32),
+                y: (m.pos.y as f32) / (inner_extent[1] as f32),
+            });
+
+        let dirty = self.mouse != mouse || rendered_surfaces_dirty(&self.popups, &popups);
+        if !self.scrolling {
+            self.mouse = mouse;
+        }
+        self.popups = popups.into();
+        self.meta = Some(meta);
+
+        if force_render {
+            self.cur_image = Some(surf.image);
+            return Ok(ShouldRender::Should);
+        }
+
+        if self
+            .cur_image
+            .as_ref()
+            .is_none_or(|i| *i.image() != *surf.image.image())
+        {
+            log::trace!(
+                "{}: new {} image",
+                self.name,
+                if surf.dmabuf { "DMA-buf" } else { "SHM" }
+            );
+            self.cur_image = Some(surf.image);
+            Ok(ShouldRender::Should)
+        } else if dirty {
+            Ok(ShouldRender::Should)
+        } else {
+            Ok(should_render_panel)
+        }
     }
 
     fn render(
@@ -422,47 +711,46 @@ impl OverlayBackend for WvrWindowBackend {
         }
 
         let image = self.cur_image.as_ref().unwrap().clone();
+        let mut callback_surfaces = Vec::with_capacity(self.surfaces.len() + self.popups.len());
 
         self.pipeline
             .as_mut()
             .unwrap()
-            .render(image, self.mouse.as_ref(), app, rdr)?;
+            .render_screen(image, app, rdr)?;
 
-        for (popup_img, point) in &self.popups {
-            let meta = self.meta.as_ref().unwrap();
-            let extentf = [meta.extent[0] as f32, meta.extent[1] as f32];
-            let popup_extentf = popup_img.extent_f32();
-            let mut buf_vert = app
-                .gfx
-                .empty_buffer(BufferUsage::TRANSFER_DST | BufferUsage::VERTEX_BUFFER, 4)?;
+        for surface in self.surfaces.iter() {
+            self.render_subsurface(app, rdr, surface)?;
+            callback_surfaces.push(&surface.surface_id);
+        }
 
-            upload_quad_vertices(
-                &mut buf_vert,
-                extentf[0],
-                extentf[1],
-                point.x,
-                point.y,
-                popup_extentf[0],
-                popup_extentf[1],
-            )?;
+        for popup in self.popups.iter() {
+            self.render_subsurface(app, rdr, popup)?;
+            callback_surfaces.push(&popup.surface_id);
+        }
 
-            let set0 = self.popups_pipeline.uniform_sampler(
-                0,
-                popup_img.clone(),
-                app.gfx.texture_filter,
-            )?;
-            let pass = self.popups_pipeline.create_pass(
-                extentf,
-                [BORDER_SIZE as _, (BAR_SIZE + BORDER_SIZE) as _],
-                buf_vert,
-                0..4,
-                0..1,
-                vec![set0],
-                &Default::default(),
-            )?;
+        // frame callbacks for toplevel + subsurf + popup
+        if let Some(wvr_server) = app.wvr_server.as_mut() {
+            let state = &mut wvr_server.manager.state;
 
-            for buf in &mut rdr.cmd_bufs {
-                buf.run_ref(&pass)?;
+            match state.cursor_image {
+                CursorImageStatus::Hidden => {}
+                CursorImageStatus::Named(_) | CursorImageStatus::Surface(_) => {
+                    // FIXME: properly render surface?
+                    if let Some(mouse) = self.mouse.as_ref() {
+                        self.pipeline.as_mut().unwrap().render_mouse(mouse, rdr)?;
+                    }
+                }
+            }
+
+            if let Some(window) = wvr_server.wm.windows.get(self.window) {
+                let surface_id = window.toplevel.wl_surface().id();
+                state.send_frame_callbacks_for_surface_id(&surface_id);
+            }
+            for surface in self.surfaces.iter() {
+                state.send_frame_callbacks_for_surface_id(&surface.surface_id);
+            }
+            for popup in self.popups.iter() {
+                state.send_frame_callbacks_for_surface_id(&popup.surface_id);
             }
         }
 
@@ -480,19 +768,47 @@ impl OverlayBackend for WvrWindowBackend {
     ) -> anyhow::Result<()> {
         match event_data {
             OverlayEventData::IdAssigned(oid) => {
+                self.overlay_id = oid;
                 let wvr_server = app.wvr_server.as_mut().unwrap(); //never None
                 wvr_server.overlay_added(oid, self.window);
             }
+            OverlayEventData::WvrCommand(WvrCommand::ReloadTitle) => {
+                let wvr_server = app.wvr_server.as_mut().unwrap(); //never None
+                if let Some(window) = wvr_server.wm.windows.get(self.window) {
+                    let title = with_states(window.toplevel.wl_surface(), |states| {
+                        states
+                            .data_map
+                            .get::<XdgToplevelSurfaceData>()
+                            .unwrap()
+                            .lock()
+                            .unwrap()
+                            .title
+                            .clone()
+                    });
+                    if let Some(title) = title {
+                        self.update_title(title.into());
+                    }
+                }
+            }
             OverlayEventData::WvrCommand(WvrCommand::CloseWindow) => {
                 app.wvr_server.as_mut().unwrap().close_window(self.window);
             }
             OverlayEventData::WvrCommand(WvrCommand::KillProcess(signal)) => {
                 let wvr_server = app.wvr_server.as_mut().unwrap();
-                let Some(p) = wvr_server.wm.windows.get(&self.window) else {
+                let Some(p) = wvr_server.wm.windows.get(self.window) else {
                     return Ok(());
                 };
                 wvr_server.terminate_process(p.process, signal);
             }
+            OverlayEventData::ResizeRequest(new_size) => {
+                let wvr_server = app.wvr_server.as_mut().unwrap();
+                let Some(win) = wvr_server.wm.windows.get_mut(self.window) else {
+                    log::warn!("Could not process resize request: window not found");
+                    return Ok(());
+                };
+                let size: Size<i32, Logical> = Size::new(new_size[0] as i32, new_size[1] as i32);
+                win.checked_configure_size(size);
+            }
             _ => {}
         }
 
@@ -500,33 +816,76 @@ impl OverlayBackend for WvrWindowBackend {
     }
 
     fn on_hover(&mut self, app: &mut state::AppState, hit: &input::PointerHit) -> HoverResult {
-        let transformed = self.mouse_transform.transform_point2(hit.uv);
-
-        if !self.uv_range.contains(&transformed.x) || !self.uv_range.contains(&transformed.y) {
-            let Some(meta) = self.meta.as_ref() else {
-                return HoverResult::default();
-            };
-
-            let mut hit2 = *hit;
-            hit2.uv.y *= meta.extent[1] as f32 / (meta.extent[1] - self.inner_extent[1]) as f32;
-            self.panel_hovered = true;
-            return self.panel.on_hover(app, &hit2);
-        } else if self.panel_hovered {
-            self.panel.on_left(app, hit.pointer);
-            self.panel_hovered = false;
+        if std::mem::take(&mut self.scrolling) {
+            // we scrolled on previous frame so don't send mouse move events in case the user wants to scroll on this frame as well
+            return HoverResult::consume();
         }
 
-        let clamped = transformed.clamp(Vec2::ZERO, Vec2::ONE);
+        let Some(ref ctx) = self.hit_context else {
+            return HoverResult::default();
+        };
 
-        let x = (clamped.x * (self.inner_extent[0] as f32)) as u32;
-        let y = (clamped.y * (self.inner_extent[1] as f32)) as u32;
+        match ctx.hit_target(hit) {
+            Some(WvrHitTarget::Panel(hit2)) => {
+                self.panel_hovered = true;
+                self.panel.on_hover(app, &hit2)
+            }
+            Some(WvrHitTarget::Popup {
+                surface,
+                global_pos,
+                origin,
+            })
+            | Some(WvrHitTarget::Surface {
+                surface,
+                global_pos,
+                origin,
+            }) => {
+                if self.panel_hovered {
+                    self.panel.on_left(app, hit.pointer);
+                    self.panel_hovered = false;
+                }
 
-        let wvr_server = app.wvr_server.as_mut().unwrap(); //never None
-        wvr_server.send_mouse_move(self.window, x, y);
+                let pick_now = app.input_state.picking_focus.is_picking();
+                if pick_now {
+                    app.input_state.stop_picking();
+                    app.hid_provider
+                        .set_input_focus(app.wvr_server.as_mut(), InputFocus::WayVR);
+                }
 
-        HoverResult {
-            haptics: None, // haptics are handled via task
-            consume: true,
+                let wvr_server = app.wvr_server.as_mut().unwrap();
+                wvr_server.send_mouse_move(
+                    PointerFocusTarget::Surface { surface, origin },
+                    global_pos,
+                    self.window,
+                    pick_now,
+                );
+
+                HoverResult::consume()
+            }
+            Some(WvrHitTarget::Toplevel { pos }) => {
+                if self.panel_hovered {
+                    self.panel.on_left(app, hit.pointer);
+                    self.panel_hovered = false;
+                }
+
+                let pick_now = app.input_state.picking_focus.is_picking();
+                if pick_now {
+                    app.input_state.stop_picking();
+                    app.hid_provider
+                        .set_input_focus(app.wvr_server.as_mut(), InputFocus::WayVR);
+                }
+
+                let wvr_server = app.wvr_server.as_mut().unwrap();
+                wvr_server.send_mouse_move(
+                    PointerFocusTarget::Toplevel,
+                    pos,
+                    self.window,
+                    pick_now,
+                );
+
+                HoverResult::consume()
+            }
+            None => HoverResult::default(), // pass
         }
     }
 
@@ -538,46 +897,130 @@ impl OverlayBackend for WvrWindowBackend {
     }
 
     fn on_pointer(&mut self, app: &mut state::AppState, hit: &input::PointerHit, pressed: bool) {
-        let transformed = self.mouse_transform.transform_point2(hit.uv);
+        let Some(index) = Self::mouse_index_from_mode(hit.mode) else {
+            return;
+        };
 
-        if !self.uv_range.contains(&transformed.x) || !self.uv_range.contains(&transformed.y) {
-            let Some(meta) = self.meta.as_ref() else {
-                return;
-            };
+        let Some(ref ctx) = self.hit_context else {
+            return;
+        };
 
-            let mut hit2 = *hit;
-            hit2.uv.y *= meta.extent[1] as f32 / (meta.extent[1] - self.inner_extent[1]) as f32;
-            self.panel_hovered = true;
-            return self.panel.on_pointer(app, &hit2, pressed);
+        let target = ctx.hit_target(hit);
+        let outside_pos = ctx.unclamped_client_pos_from_hit(hit);
+        let click_freeze = app.session.config.click_freeze_time_ms;
+
+        // if the press was consumed to dismiss a popup, consume the matching release too.
+        if !pressed && self.popup_outside_button == Some(index) {
+            self.popup_outside_button = None;
+
+            app.wvr_server.as_mut().unwrap().send_mouse_button(
+                PointerFocusTarget::None,
+                outside_pos,
+                self.window,
+                index,
+                false,
+                click_freeze,
+            );
+            return;
         }
 
-        if let Some(index) = match hit.mode {
-            input::PointerMode::Left => Some(wayvr::MouseIndex::Left),
-            input::PointerMode::Middle => Some(wayvr::MouseIndex::Center),
-            input::PointerMode::Right => Some(wayvr::MouseIndex::Right),
-            _ => {
-                // Unknown pointer event, ignore
-                None
-            }
-        } {
-            let click_freeze = app.session.config.click_freeze_time_ms;
-            let wvr_server = app.wvr_server.as_mut().unwrap(); //never None
+        let popup_grab_active = !self.popups.is_empty()
+            && app
+                .wvr_server
+                .as_ref()
+                .is_some_and(|server| server.pointer_is_grabbed());
+
+        let outside_grabbed_popup =
+            popup_grab_active && !matches!(&target, Some(WvrHitTarget::Popup { .. }));
+
+        if outside_grabbed_popup {
             if pressed {
-                wvr_server.send_mouse_down(click_freeze, self.window, index);
-            } else {
-                wvr_server.send_mouse_up(index);
+                self.popup_outside_button = Some(index);
             }
+
+            let click_freeze = app.session.config.click_freeze_time_ms;
+            app.wvr_server.as_mut().unwrap().send_mouse_button(
+                PointerFocusTarget::None,
+                outside_pos,
+                self.window,
+                index,
+                pressed,
+                click_freeze,
+            );
+            return;
+        }
+
+        match target {
+            Some(WvrHitTarget::Panel(hit2)) => {
+                self.panel_hovered = true;
+                self.panel.on_pointer(app, &hit2, pressed);
+            }
+
+            Some(WvrHitTarget::Popup {
+                surface,
+                global_pos,
+                origin,
+            })
+            | Some(WvrHitTarget::Surface {
+                surface,
+                global_pos,
+                origin,
+            }) => {
+                let wvr_server = app.wvr_server.as_mut().unwrap();
+
+                wvr_server.send_mouse_button(
+                    PointerFocusTarget::Surface { surface, origin },
+                    global_pos,
+                    self.window,
+                    index,
+                    pressed,
+                    click_freeze,
+                );
+            }
+
+            Some(WvrHitTarget::Toplevel { pos }) => {
+                let click_freeze = app.session.config.click_freeze_time_ms;
+                let wvr_server = app.wvr_server.as_mut().unwrap();
+
+                wvr_server.send_mouse_button(
+                    PointerFocusTarget::Toplevel,
+                    pos,
+                    self.window,
+                    index,
+                    pressed,
+                    click_freeze,
+                );
+            }
+
+            None => {}
         }
     }
 
-    fn on_scroll(
-        &mut self,
-        app: &mut state::AppState,
-        _hit: &input::PointerHit,
-        delta: WheelDelta,
-    ) {
-        let wvr_server = app.wvr_server.as_mut().unwrap(); //never None
-        wvr_server.send_mouse_scroll(delta);
+    fn on_scroll(&mut self, app: &mut state::AppState, hit: &input::PointerHit, delta: WheelDelta) {
+        let Some(ref ctx) = self.hit_context else {
+            return;
+        };
+
+        let target = ctx.hit_target(hit);
+        self.scrolling = true;
+
+        match target {
+            Some(WvrHitTarget::Panel(hit2)) => {
+                self.panel.on_scroll(app, &hit2, delta);
+                let _ = hit2;
+            }
+
+            Some(WvrHitTarget::Popup { global_pos, .. })
+            | Some(WvrHitTarget::Surface { global_pos, .. }) => {
+                let wvr_server = app.wvr_server.as_mut().unwrap();
+                wvr_server.send_mouse_scroll(self.window, global_pos, delta);
+            }
+            Some(WvrHitTarget::Toplevel { pos }) => {
+                let wvr_server = app.wvr_server.as_mut().unwrap();
+                wvr_server.send_mouse_scroll(self.window, pos, delta);
+            }
+            None => {}
+        }
     }
 
     fn get_interaction_transform(&mut self) -> Option<Affine2> {
@@ -594,6 +1037,8 @@ impl OverlayBackend for WvrWindowBackend {
             BackendAttrib::StereoAdjustMouse => Some(BackendAttribValue::StereoAdjustMouse(
                 self.stereo_adjust_mouse,
             )),
+            BackendAttrib::Resizable => Some(BackendAttribValue::Resizable(self.resizable)),
+
             _ => None,
         }
     }
@@ -603,6 +1048,9 @@ impl OverlayBackend for WvrWindowBackend {
                 if let Some(stereo) = self.stereo.as_mut() {
                     log::debug!("{}: stereo: {stereo:?} → {new:?}", self.name);
                     *stereo = new;
+                    if let Some(meta) = self.meta.clone() {
+                        let _ = self.apply_extent(app, &meta);
+                    }
                     if let Some(pipeline) = self.pipeline.as_mut() {
                         pipeline.ensure_stereo(new);
                     }
@@ -621,9 +1069,21 @@ impl OverlayBackend for WvrWindowBackend {
                     let _ = self.apply_extent(app, &meta);
                     self.meta = Some(meta);
                 }
+                if let Some(pipeline) = self.pipeline.as_mut() {
+                    pipeline.set_stereo_adjust_mouse(new);
+                }
                 true
             }
             _ => false,
         }
     }
 }
+
+fn overlay_scale_from_extent(size: [u32; 2]) -> (f32, f32) {
+    const RELATIVE_SIZE: f32 = 1440.0; // sqrt(1920 * 1080)
+
+    let w = size[0].max(1) as f32;
+    let h = size[1].max(1) as f32;
+
+    ((w * h).sqrt() / RELATIVE_SIZE, w / 1920.0)
+}
diff --git a/wayvr/src/overlays/whisper.rs b/wayvr/src/overlays/whisper.rs
new file mode 100644
index 00000000..70f8a575
--- /dev/null
+++ b/wayvr/src/overlays/whisper.rs
@@ -0,0 +1,337 @@
+use std::{rc::Rc, time::Duration};
+
+use glam::Affine3A;
+use wgui::{
+    components::button::ComponentButton,
+    event::EventCallback,
+    i18n::Translation,
+    log::LogErr,
+    parser::Fetchable,
+    widget::{EventResult, label::WidgetLabel},
+};
+use wlx_common::{
+    data_dir,
+    overlays::{BackendAttrib, BackendAttribValue, ToastTopic},
+    windowing::{OverlayWindowState, Positioning},
+};
+
+use crate::{
+    backend::task::{OverlayTask, TaskType, ToggleMode},
+    gui::{
+        panel::{
+            GuiPanel, NewGuiPanelParams, OnCustomAttribFunc,
+            button::{BUTTON_EVENT_SUFFIX, BUTTON_EVENTS},
+        },
+        timer::GuiTimer,
+    },
+    overlays::toast::Toast,
+    state::AppState,
+    subsystem::{
+        clipboard::{self, ClipboardProvider},
+        hid::VirtualKey,
+        input::InputFocus,
+        whisper_stt::WhisperStt,
+    },
+    windowing::{
+        OverlaySelector,
+        window::{OverlayCategory, OverlayWindowConfig},
+    },
+};
+
+const WHISPER_NAME: &str = "whisper";
+
+struct WhisperState {
+    clipboard_provider: Option<Box<dyn ClipboardProvider>>,
+    last_transcription: Option<Rc<str>>,
+}
+
+impl WhisperState {
+    fn set_clipboard_text(&mut self, app: &mut AppState) -> bool {
+        let Some(text) = self.last_transcription.as_ref() else {
+            return false;
+        };
+
+        match app.hid_provider.get_input_focus() {
+            InputFocus::WayVR => {
+                if let Some(wvr) = app.wvr_server.as_mut() {
+                    wvr.set_clipboard(text);
+                    return true;
+                }
+            }
+            InputFocus::PhysicalScreen => {
+                if let Some(clip) = self.clipboard_provider.as_mut() {
+                    clip.set_clipboard_utf8(text);
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+}
+
+pub fn create_whisper(
+    app: &mut AppState,
+    headless: bool,
+    wayland: bool,
+) -> anyhow::Result<OverlayWindowConfig> {
+    let clipboard_provider: Option<Box<dyn ClipboardProvider>> = match (headless, wayland) {
+        #[cfg(feature = "wayland")]
+        (false, true) => clipboard::wl::Provider::new()
+            .log_err("Could not create Wayland clipboard provider")
+            .ok()
+            .map(|p| Box::new(p) as Box<dyn ClipboardProvider>),
+        #[cfg(feature = "x11")]
+        (false, false) => clipboard::x11::Provider::new()
+            .log_err("Could not create X11 clipboard provider")
+            .ok()
+            .map(|p| Box::new(p) as Box<dyn ClipboardProvider>),
+        _ => None,
+    };
+
+    let state = WhisperState {
+        clipboard_provider,
+        last_transcription: None,
+    };
+    let xml = "gui/whisper.xml";
+
+    let on_custom_attrib: OnCustomAttribFunc = Box::new(move |layout, parser, attribs, _app| {
+        let Ok(button) = parser
+            .fetch_component_from_widget_id_as::<ComponentButton>(&layout.state, attribs.widget_id)
+        else {
+            return;
+        };
+
+        for (name, kind, test_button, test_duration) in &BUTTON_EVENTS {
+            for suffix in BUTTON_EVENT_SUFFIX {
+                let name = &format!("{name}{suffix}");
+                let Some(action) = attribs.get_value(name) else {
+                    break;
+                };
+
+                let mut args = action.split_whitespace();
+                let Some(command) = args.next() else {
+                    continue;
+                };
+
+                let button = button.clone();
+
+                let callback: EventCallback<AppState, WhisperState> = match command {
+                    "::WhisperTranscribeStart" => Box::new(move |_common, data, app, _state| {
+                        if !test_button(data) || !test_duration(&button, app) {
+                            return Ok(EventResult::Pass);
+                        }
+
+                        let whisper = match app.whisper_sst.as_mut() {
+                            Some(x) => x,
+                            None => {
+                                let model_path = data_dir::get_path("whisper")
+                                    .join(app.session.config.whisper_model.as_ref());
+                                if model_path.is_file() {
+                                    app.whisper_sst = match WhisperStt::new(model_path)
+                                        .log_err("Error while starting Whisper engine")
+                                    {
+                                        Ok(x) => Some(x),
+                                        Err(e) => {
+                                            Toast::new(
+                                                ToastTopic::System,
+                                                "WHISPER.INIT_ERROR".into(),
+                                                e.to_string(),
+                                            )
+                                            .with_timeout(5.)
+                                            .with_sound(true)
+                                            .submit(app);
+                                            return Ok(EventResult::Consumed);
+                                        }
+                                    }
+                                } else {
+                                    Toast::new(
+                                        ToastTopic::System,
+                                        "WHISPER.MODEL_NOT_DOWNLOADED".into(),
+                                        "WHISPER.DOWNLOAD_GUIDANCE".into(),
+                                    )
+                                    .with_timeout(5.)
+                                    .with_sound(true)
+                                    .submit(app);
+                                    return Ok(EventResult::Consumed);
+                                }
+
+                                app.whisper_sst.as_mut().unwrap()
+                            }
+                        };
+
+                        let _ = whisper
+                            .ptt_start()
+                            .log_err("Could not start Whisper transcription");
+
+                        Ok(EventResult::Consumed)
+                    }),
+                    "::WhisperTranscribeStop" => Box::new(move |_common, data, app, _state| {
+                        if !test_button(data) || !test_duration(&button, app) {
+                            return Ok(EventResult::Pass);
+                        }
+
+                        if let Some(whisper) = app.whisper_sst.as_mut() {
+                            let _ = whisper
+                                .ptt_end()
+                                .log_err("Could not stop Whisper transcription");
+                        }
+                        Ok(EventResult::Consumed)
+                    }),
+                    "::WhisperPaste" => Box::new(move |_common, data, app, state| {
+                        if !test_button(data) || !test_duration(&button, app) {
+                            return Ok(EventResult::Pass);
+                        }
+
+                        state.set_clipboard_text(app);
+
+                        Ok(EventResult::Consumed)
+                    }),
+                    "::WhisperPasteAndGo" => Box::new(move |_common, data, app, state| {
+                        if !test_button(data) || !test_duration(&button, app) {
+                            return Ok(EventResult::Pass);
+                        }
+
+                        if state.set_clipboard_text(app) {
+                            // send ctrl-v
+                            app.hid_provider.send_key_routed(
+                                app.wvr_server.as_mut(),
+                                VirtualKey::RCtrl,
+                                true,
+                            );
+                            app.hid_provider.send_key_routed(
+                                app.wvr_server.as_mut(),
+                                VirtualKey::V,
+                                true,
+                            );
+                            app.hid_provider.send_key_routed(
+                                app.wvr_server.as_mut(),
+                                VirtualKey::V,
+                                false,
+                            );
+                            app.hid_provider.send_key_routed(
+                                app.wvr_server.as_mut(),
+                                VirtualKey::RCtrl,
+                                false,
+                            );
+                        }
+
+                        Ok(EventResult::Consumed)
+                    }),
+                    #[cfg(feature = "osc")]
+                    "::WhisperSendOSC" => Box::new(move |_common, data, app, state| {
+                        if !test_button(data) || !test_duration(&button, app) {
+                            return Ok(EventResult::Pass);
+                        }
+
+                        if let Some(text) = state.last_transcription.as_ref()
+                            && let Some(osc) = app.osc_sender.as_mut()
+                        {
+                            use rosc::OscType;
+
+                            let _ = osc
+                                .send_message(
+                                    "/chatbox/input".into(),
+                                    vec![OscType::String(text.to_string()), OscType::Bool(true)],
+                                )
+                                .log_err("Could not send OSC message");
+                        }
+
+                        Ok(EventResult::Consumed)
+                    }),
+                    "::WhisperUnloadAndClose" => Box::new(move |_common, data, app, _state| {
+                        if !test_button(data) || !test_duration(&button, app) {
+                            return Ok(EventResult::Pass);
+                        }
+
+                        app.whisper_sst = None;
+                        app.tasks
+                            .enqueue(TaskType::Overlay(OverlayTask::ToggleOverlay(
+                                OverlaySelector::Name(WHISPER_NAME.into()),
+                                ToggleMode::EnsureOff,
+                            )));
+
+                        Ok(EventResult::Consumed)
+                    }),
+                    _ => return,
+                };
+
+                let id = layout.add_event_listener(attribs.widget_id, *kind, callback);
+                log::debug!("Registered {action} on {:?} as {id:?}", attribs.widget_id);
+            }
+        }
+    });
+
+    let params = NewGuiPanelParams {
+        on_custom_attrib: Some(on_custom_attrib),
+        ..Default::default()
+    };
+
+    let mut panel = GuiPanel::new_from_template(app, xml, state, params)?;
+    panel.extra_attribs.insert(
+        BackendAttrib::Icon,
+        BackendAttribValue::Icon("icons/mic.svg".into()),
+    );
+
+    #[cfg(not(feature = "osc"))]
+    {
+        use wgui::event::{CallbackDataCommon, StyleSetRequest};
+        let osc_button = panel
+            .parser_state
+            .fetch_component_as::<ComponentButton>("btn_osc_send")?;
+        let common = CallbackDataCommon {
+            state: &panel.layout.state,
+            alterables: &mut panel.layout.alterables,
+        };
+        common.alterables.set_style(
+            osc_button.get_rect(),
+            StyleSetRequest::Display(wgui::taffy::Display::None),
+        );
+    }
+
+    let label = panel.parser_state.get_widget_id("transcription")?;
+
+    panel
+        .timers
+        .push(GuiTimer::new(Duration::from_millis(100), 0));
+
+    let on_label_tick: EventCallback<AppState, WhisperState> =
+        Box::new(move |common, data, app, state| {
+            if let Some(whisper_stt) = app.whisper_sst.as_mut() {
+                if let Some(text) = whisper_stt.take_transcription() {
+                    let text: Rc<str> = text.into();
+                    state.last_transcription = Some(text.clone());
+                    let label = data.obj.get_as_mut::<WidgetLabel>().unwrap();
+                    label.set_text(common, Translation::from_raw_text_rc(text));
+                }
+            }
+            Ok(EventResult::Pass)
+        });
+
+    panel.layout.add_event_listener(
+        label,
+        wgui::event::EventListenerKind::InternalStateChange,
+        on_label_tick,
+    );
+
+    panel.update_layout(app)?;
+
+    let transform = Affine3A::from_cols_array_2d(&[
+        [0.49993715, -0.00020921684, -0.008030709],
+        [-0.0021463279, 0.47818363, -0.14607349],
+        [0.007741399, 0.1460891, 0.478121],
+        [-0.021562248, -0.40786624, -0.3346647],
+    ]);
+
+    Ok(OverlayWindowConfig {
+        name: WHISPER_NAME.into(),
+        default_state: OverlayWindowState {
+            interactable: true,
+            grabbable: true,
+            transform,
+            positioning: Positioning::Anchored,
+            ..OverlayWindowState::default()
+        },
+        category: OverlayCategory::BuiltInPanel,
+        ..OverlayWindowConfig::from_backend(Box::new(panel))
+    })
+}
diff --git a/wayvr/src/res/config.yaml b/wayvr/src/res/config.yaml
index 55747a09..9ea53c09 100644
--- a/wayvr/src/res/config.yaml
+++ b/wayvr/src/res/config.yaml
@@ -85,6 +85,9 @@
 # The settings are here for reference only.
 # Probably don't include them in your config file.
 
+## The watch will be enabled
+#enable_watch: true
+
 ## The bottom of the watch will list sets instead of overlays.
 #sets_on_watch: false
 
@@ -117,6 +120,21 @@
 ## can rotate in any axis. Imagine horizon mode².
 #space_rotate_unlocked: false
 
+## Space gravity: downward acceleration speed
+#space_gravity_gravity: 2.0
+
+## Space gravity: velocity damping (0.98 = gentle slowdown, 0.5 = heavy drag)
+#space_gravity_damping: 0.98
+
+## Space gravity: multiplier for "throwing" yourself via space drag momentum
+#space_gravity_fling_strength: 1.0
+
+## Space gravity: floor height (Y position where gravity stops)
+#space_gravity_floor_height: 0.0
+
+## Space gravity: ground friction when touching the floor
+#space_gravity_ground_friction: 1.0
+
 ## Monado/WiVRn only. Use passthrough camera if the headset supports it.
 ## If disabled, the skybox will be shown.
 #use_passthrough: true
@@ -176,11 +194,6 @@
 #invert_scroll_direction_x: false
 #invert_scroll_direction_y: false
 
-## Press and release thresholds for grip & trigger
-## when using OpenXR (WiVRn, Monado)
-#xr_click_sensitivity: 0.7
-#xr_click_sensitivity_release: 0.5
-
 ## How many seconds to buttons need to be held
 ## before it's considered a long press
 #long_press_duration: 1.0
diff --git a/wayvr/src/res/keyboard.yaml b/wayvr/src/res/keyboard.yaml
index 2e3ab78d..14e6de25 100644
--- a/wayvr/src/res/keyboard.yaml
+++ b/wayvr/src/res/keyboard.yaml
@@ -26,9 +26,9 @@ key_sizes:
     - [1.25, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2.75,    1.5,    1, 1.5,       1, 1, 1, 1]
     - [1.25, 1.25, 1.25, 6.25, 1.25, 1.25, 1.25, 1.25, 0.5, 1, 1, 1, 0.5,    2,    1, 1]
 
-# The main (blue) layout of the keyboard.
+# The layout of the keyboard.
 # Accepted are:
-# - virtual keys. For a full list, look at enum VirtualKey in https://github.com/galister/wlx-overlay-s/blob/main/src/hid.rs
+# - virtual keys. For a full list, see https://github.com/wayvr-org/wayvr/blob/786660a4d54b73714399c9433a68c8cc35eb55f4/wayvr/src/subsystem/hid/mod.rs#L79
 # - exec_commands (defined below)
 # - macros (defined below)
 # - ~ (null) will leave an empty space with the corresponding size from key_sizes
@@ -38,12 +38,13 @@ main_layout:
     - ["Tab", "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "Oem4", "Oem6", "Oem5", ~, "Delete", "End", "Next", ~, "KP_7", "KP_8", "KP_9", "KP_Add"]
     - ["XF86Favorites", "A", "S", "D", "F", "G", "H", "J", "K", "L", "Oem1", "Oem7", "Return", ~, "KP_4", "KP_5", "KP_6", ~]
     - ["LShift", "Oem102", "Z", "X", "C", "V", "B", "N", "M", "Comma", "Period", "Oem2", "RShift", ~, "Up", ~, "KP_1", "KP_2", "KP_3", "KP_Enter"]
-    - ["LCtrl", "LSuper", "LAlt", "Space", "Meta", "RSuper", "Menu", "RCtrl", ~, "Left", "Down", "Right", ~, "KP_0", "KP_Decimal", ~]
+    - ["LCtrl", "LSuper", "LAlt", "Space", "AltGr", "RSuper", "Menu", "RCtrl", ~, "Left", "Down", "Right", ~, "KP_0", "KP_Decimal", "MAP"]
 
 # Shell commands to be used in a layout.
 # Value is an array of string arguments.
 exec_commands:
     STT: [ "whisper_stt", "--lang", "en" ]
+    MAP: [ "killall", "-USR1", "wayvr"] # reloads keymap
 
 # Series of keypresses to be used in a layout.
 # Format: keyName [DOWN|UP]
diff --git a/wayvr/src/shaders/color.frag b/wayvr/src/shaders/color.frag
index ec0e86f7..dd29af60 100644
--- a/wayvr/src/shaders/color.frag
+++ b/wayvr/src/shaders/color.frag
@@ -1,24 +1,13 @@
 #version 310 es
 precision highp float;
 
-layout (location = 0) in vec2 in_uv;
 layout (location = 0) out vec4 out_color;
 
 layout (set = 0, binding = 0) uniform ColorBlock {
     uniform vec4 in_color;
-    uniform vec2 corner_radius;
 };
 
 void main()
 {
-    out_color.r = corner_radius.r;
     out_color = in_color;
-
-    vec2 uv_circ = ((1. - corner_radius) - (abs(in_uv + vec2(-0.5)) * 2.))/corner_radius;
-    float dist = length(uv_circ);
-
-    out_color.a = mix(out_color.a, 0.,
-            float(dist > 1.)
-            * float(uv_circ.x < 0.)
-            * float(uv_circ.y < 0.));
 }
diff --git a/wayvr/src/shaders/grid.frag b/wayvr/src/shaders/grid.frag
index 467aec41..d9016ae1 100644
--- a/wayvr/src/shaders/grid.frag
+++ b/wayvr/src/shaders/grid.frag
@@ -1,18 +1,37 @@
 #version 310 es
 precision highp float;
 
-layout (location = 0) in vec2 in_uv;
-layout (location = 0) out vec4 out_color;
+layout(location = 0) in vec2 in_uv;
+layout(location = 0) out vec4 out_color;
 
-void main()
-{
-    float fade = max(1.0 - 2.0 * length(in_uv.xy + vec2(-0.5, -0.5)), 0.0);
-    float grid;
+const float circle_smoothness = 0.0025;
+const float circle_thickness = 0.01;
+const float circle_opacity = 0.3;
+const float circle_size = 0.1;
 
-    if (fract(in_uv.x / 0.0005) < 0.01 || fract(in_uv.y / 0.0005) < 0.01) {
-        grid = 1.0;
-    } else {
-        grid = 0.0;
-    }
-    out_color = vec4(1.0, 1.0, 1.0, grid * fade);
+float calc_grid(vec2 coord, float m) {
+  vec2 grid = fract(coord * m);
+  return (step(m, grid.x) * step(m, grid.y));
+}
+
+float calc_circle(float dist, float size) {
+  float c1 = size;
+  float c2 = size - circle_thickness;
+
+  return smoothstep(c1, c1 - circle_smoothness, dist) *
+         smoothstep(c2 - circle_smoothness, c2, dist);
+}
+
+void main() {
+  float dist = length(in_uv.xy + vec2(-0.5, -0.5));
+  float fade = max(1.0 - 2.0 * dist, 0.0);
+
+  float mask = 1.0 - calc_grid(in_uv.xy * 1000.0, 0.02);
+
+  mask = max(mask, (calc_circle(dist, circle_size) +
+                    calc_circle(dist, circle_size * 2.0) +
+                    calc_circle(dist, circle_size * 3.0)) *
+                       circle_opacity);
+
+  out_color = vec4(1.0, 1.0, 1.0, mask * fade);
 }
diff --git a/wayvr/src/shaders/mod.rs b/wayvr/src/shaders/mod.rs
index 86e9f5c4..d0aae31c 100644
--- a/wayvr/src/shaders/mod.rs
+++ b/wayvr/src/shaders/mod.rs
@@ -26,9 +26,23 @@ pub mod frag_screen {
     }
 }
 
+pub mod frag_simple {
+    vulkano_shaders::shader! {
+        ty: "fragment",
+        path: "src/shaders/simple.frag",
+    }
+}
+
 pub mod frag_srgb {
     vulkano_shaders::shader! {
         ty: "fragment",
         path: "src/shaders/srgb.frag",
     }
 }
+
+pub mod frag_sky {
+    vulkano_shaders::shader! {
+        ty: "fragment",
+        path: "src/shaders/sky.frag",
+    }
+}
diff --git a/wayvr/src/shaders/simple.frag b/wayvr/src/shaders/simple.frag
new file mode 100644
index 00000000..388593df
--- /dev/null
+++ b/wayvr/src/shaders/simple.frag
@@ -0,0 +1,19 @@
+#version 310 es
+precision highp float;
+
+layout (location = 0) in vec2 in_uv;
+layout (location = 0) out vec4 out_color;
+
+layout (set = 0, binding = 0) uniform sampler2D in_texture;
+
+void main()
+{
+    out_color = texture(in_texture, in_uv);
+    
+    bvec4 cutoff = lessThan(out_color, vec4(0.04045));
+    vec4 higher = pow((out_color + vec4(0.055))/vec4(1.055), vec4(2.4));
+    vec4 lower = out_color/vec4(12.92);
+
+    out_color = mix(higher, lower, cutoff);
+}
+
diff --git a/wayvr/src/shaders/sky.frag b/wayvr/src/shaders/sky.frag
new file mode 100644
index 00000000..d26f8110
--- /dev/null
+++ b/wayvr/src/shaders/sky.frag
@@ -0,0 +1,368 @@
+#version 450
+
+layout(location = 0) in vec2 vUV;
+layout(location = 0) out vec4 outColor;
+
+float gauss(float x, float sigma)
+{
+    float t = x / sigma;
+    return exp(-t * t);
+}
+
+float smoothBand(float x, float lo, float hi, float featherLo, float featherHi)
+{
+    float a = smoothstep(lo - featherLo, lo + featherLo, x);
+    float b = 1.0 - smoothstep(hi - featherHi, hi + featherHi, x);
+    return a * b;
+}
+
+float thinLine(float x, float halfWidth)
+{
+    float d  = abs(x);
+    float aa = max(fwidth(x) * 1.5, 1e-5);
+
+    float core = 1.0 - smoothstep(0.0, halfWidth + aa, d);
+    float edge = 1.0 - smoothstep(halfWidth, halfWidth + aa, d);
+
+    return core * edge;
+}
+
+float hash11(float p)
+{
+    return fract(sin(p * 127.1 + 311.7) * 43758.5453123);
+}
+
+float hash12(vec2 p)
+{
+    return fract(sin(dot(p, vec2(127.1, 311.7))) * 43758.5453123);
+}
+
+float noise1Periodic(float x, float period)
+{
+    float i0 = floor(x);
+    float i1 = i0 + 1.0;
+    float f  = fract(x);
+    float u  = f * f * (3.0 - 2.0 * f);
+
+    float a = hash11(mod(i0, period));
+    float b = hash11(mod(i1, period));
+    return mix(a, b, u);
+}
+
+float fbm1Periodic(float x, float period)
+{
+    float sum  = 0.0;
+    float amp  = 0.5;
+    float norm = 0.0;
+
+    for (int i = 0; i < 5; ++i)
+    {
+        sum  += amp * noise1Periodic(x, period);
+        norm += amp;
+        x *= 2.0;
+        period *= 2.0;
+        amp *= 0.5;
+    }
+
+    return sum / norm;
+}
+
+float noise2TileX(vec2 p, float periodX)
+{
+    vec2 i = floor(p);
+    vec2 f = fract(p);
+    vec2 u = f * f * (3.0 - 2.0 * f);
+
+    float x0 = mod(i.x, periodX);
+    float x1 = mod(i.x + 1.0, periodX);
+    float y0 = i.y;
+    float y1 = i.y + 1.0;
+
+    float a = hash12(vec2(x0, y0));
+    float b = hash12(vec2(x1, y0));
+    float c = hash12(vec2(x0, y1));
+    float d = hash12(vec2(x1, y1));
+
+    return mix(mix(a, b, u.x), mix(c, d, u.x), u.y);
+}
+
+float fbm2TileX(vec2 p, float periodX)
+{
+    float sum  = 0.0;
+    float amp  = 0.5;
+    float norm = 0.0;
+
+    for (int i = 0; i < 4; ++i)
+    {
+        sum  += amp * noise2TileX(p, periodX);
+        norm += amp;
+        p *= 2.0;
+        periodX *= 2.0;
+        amp *= 0.5;
+    }
+
+    return sum / norm;
+}
+
+vec3 tonemapACESApprox(vec3 x)
+{
+    const float a = 2.51;
+    const float b = 0.03;
+    const float c = 2.43;
+    const float d = 0.59;
+    const float e = 0.14;
+    return clamp((x * (a * x + b)) / (x * (c * x + d) + e), 0.0, 1.0);
+}
+
+float independentPath(
+    float u,
+    float baseLat,
+    float warpAmp0, float warpFreq0, float warpPhase0,
+    float warpAmp1, float warpFreq1, float warpPhase1,
+    float amp0,     float freq0,     float phase0,
+    float amp1,     float freq1,     float phase1,
+    float amp2,     float freq2,     float phase2,
+    out float uw)
+{
+    uw = fract(u
+        + warpAmp0 * (fbm1Periodic(u * warpFreq0 + warpPhase0, warpFreq0) - 0.5)
+        + warpAmp1 * (fbm1Periodic(u * warpFreq1 + warpPhase1, warpFreq1) - 0.5));
+
+    return baseLat
+        + amp0 * (fbm1Periodic(uw * freq0 + phase0, freq0) - 0.5)
+        + amp1 * (fbm1Periodic(uw * freq1 + phase1, freq1) - 0.5)
+        + amp2 * (fbm1Periodic(uw * freq2 + phase2, freq2) - 0.5);
+}
+
+float independentPositive(
+    float u,
+    float baseValue,
+    float amp0, float freq0, float phase0,
+    float amp1, float freq1, float phase1)
+{
+    return baseValue
+        + amp0 * fbm1Periodic(u * freq0 + phase0, freq0)
+        + amp1 * fbm1Periodic(u * freq1 + phase1, freq1);
+}
+
+void main()
+{
+    float u = fract(vUV.x);
+    float v = 0.5 - vUV.y;
+
+    // background gradient
+    float skyT = smoothstep(-0.50, 0.50, v);
+    vec3 col = mix(vec3(0.00008, 0.00012, 0.00045),
+                   vec3(0.0220, 0.0470, 0.0980),
+                   skyT);
+
+    col += gauss(v - 0.24, 0.30) * vec3(0.0045, 0.0100, 0.0220) * 0.28;
+
+    // seamless flow field around 360 degrees
+    float flowA = fbm1Periodic(u *  7.0 + 1.3,  7.0);
+    float flowB = fbm1Periodic(u * 13.0 + 5.1, 13.0);
+
+    float uu = fract(u
+                   + 0.045 * (flowA - 0.5)
+                   + 0.020 * (flowB - 0.5));
+
+    float sA = fbm1Periodic(uu *  5.0 +  2.7,  5.0);
+    float sB = fbm1Periodic(uu * 11.0 + 11.4, 11.0);
+    float sC = fbm1Periodic(uu * 23.0 +  4.2, 23.0);
+    float sD = fbm1Periodic(uu *  9.0 + 17.2,  9.0);
+    float sE = fbm1Periodic(uu * 19.0 +  8.3, 19.0);
+
+    float center    = -0.012
+                    + 0.100 * (sA - 0.5)
+                    + 0.045 * (sB - 0.5)
+                    + 0.018 * (sC - 0.5);
+
+    float thickness = 0.072 + 0.040 * sD;
+    float skew      = 0.014 * (sE - 0.5);
+
+    float mainLo = center - 0.035 - skew;
+    float mainHi = center + thickness + 0.15 * skew;
+
+    float veilU;
+    float veilCenter = independentPath(
+        u, 0.050,
+         0.028,  7.0,  1.1,
+        -0.015, 13.0,  5.4,
+         0.050,  3.0,  2.3,
+         0.030, 11.0,  8.1,
+         0.010, 29.0,  5.7,
+        veilU);
+
+    float veilThickness = independentPositive(
+        veilU, 0.011,
+        0.010,  9.0, 14.2,
+        0.006, 21.0,  3.6);
+
+    float veilLo = veilCenter - 0.004;
+    float veilHi = veilCenter + veilThickness;
+
+    float auroraU;
+    float auroraCenter = independentPath(
+        u, 0.182,
+         0.033,  5.0,  3.9,
+         0.020, 17.0,  7.7,
+         0.060,  4.0,  1.6,
+         0.040,  9.0, 12.4,
+         0.014, 27.0,  6.9,
+        auroraU);
+
+    float auroraThickness = independentPositive(
+        auroraU, 0.034,
+        0.014,  7.0,  4.1,
+        0.008, 19.0, 15.2);
+
+    float auroraLo = auroraCenter - 0.004;
+    float auroraHi = auroraCenter + auroraThickness;
+
+    float mistU;
+    float mistCenter = independentPath(
+        u, 0.255,
+         0.020,  6.0,  2.8,
+        -0.012, 15.0,  9.1,
+         0.030,  4.0,  1.9,
+         0.020, 10.0, 13.2,
+         0.008, 26.0,  7.4,
+        mistU);
+
+    float electric0U;
+    float electric0Center = independentPath(
+        u, 0.004,
+         0.052, 9.0,  2.4,
+        -0.018, 1.0, 11.6,
+         0.098, 3.0,  4.1,
+         0.068, 1.0,  9.7,
+         0.054, 2.0, 15.3,
+        electric0U);
+
+    float electric1U;
+    float electric1Center = independentPath(
+        u, 0.002,
+         0.046, 7.0,  8.3,
+         0.020, 7.0,  3.1,
+         0.080, 4.0,  6.6,
+         0.071, 2.0, 12.2,
+         0.064, 1.0,  5.8,
+        electric1U);
+
+    float electric2U;
+    float electric2Center = independentPath(
+        u, 0.006,
+         0.044, 3.0, 13.7,
+        -0.017, 4.0,  6.4,
+         0.061, 5.0, 10.9,
+         0.082, 6.0,  4.2,
+         0.075, 5.0, 14.8,
+        electric2U);
+
+    float mainTex    = fbm2TileX(vec2(uu * 20.0 +  7.0, (v - center)       *  8.0 + 13.0), 20.0);
+    float fineTex    = fbm2TileX(vec2(uu * 36.0 + 17.0, (v - center)       * 14.0 + 29.0), 36.0);
+
+    float veilTex    = fbm2TileX(vec2(veilU   * 14.0 +  5.0, (v - veilCenter)   *  9.0 + 41.0), 14.0);
+    float auroraTex  = fbm2TileX(vec2(auroraU * 16.0 + 21.0, (v - auroraCenter) * 11.0 + 57.0), 16.0);
+    float auroraFine = fbm2TileX(vec2(auroraU * 28.0 +  3.0, (v - auroraCenter) * 18.0 + 71.0), 28.0);
+
+    float bodyMod    = 0.82 + 0.28 * mainTex   + 0.18 * fineTex;
+    float veilMod    = 0.80 + 0.30 * veilTex;
+    float auroraMod  = 0.78 + 0.24 * auroraTex + 0.16 * auroraFine;
+
+    // nasks
+    float aura         = gauss(v - center, 0.14);
+
+    float mainBody     = smoothBand(v, mainLo, mainHi, 0.018, 0.024);
+    float mainMid      = gauss(v - mix(mainLo, mainHi, 0.42), 0.55 * thickness);
+    float mainHiEdge   = gauss(v - mainHi, 0.017);
+
+    float veilBody     = smoothBand(v, veilLo, veilHi, 0.014, 0.020);
+    float veilMid      = gauss(v - mix(veilLo, veilHi, 0.52), 0.60 * veilThickness);
+    float veilLoEdge   = gauss(v - veilLo, 0.012);
+    float veilHiEdge   = gauss(v - veilHi, 0.018);
+
+    float auroraBody   = smoothBand(v, auroraLo, auroraHi, 0.016, 0.022);
+    float auroraMid    = gauss(v - mix(auroraLo, auroraHi, 0.52), 0.62 * auroraThickness);
+    float auroraLoEdge = gauss(v - auroraLo, 0.013);
+    float auroraHiEdge = gauss(v - auroraHi, 0.020);
+
+    float mist         = gauss(v - mistCenter, 0.085);
+
+    float veilLat   = v - veilCenter;
+    float auroraLat = v - auroraCenter;
+
+    float veilColorNoise =
+          0.60 * fbm2TileX(vec2(veilU   *  6.0 + 2.0, veilLat   *  72.0 + 11.0),  6.0)
+        + 0.40 * fbm2TileX(vec2(veilU   * 14.0 + 7.0, veilLat   * 128.0 + 31.0), 14.0);
+
+    float auroraColorU = fract(
+        auroraU
+        + 0.035 * (fbm1Periodic(auroraU *  9.0 + 2.7,  9.0) - 0.5)
+        + 0.018 * (fbm1Periodic(auroraU * 21.0 + 6.1, 21.0) - 0.5)
+    );
+
+    vec3 auroraColorNoise = clamp(vec3(
+        fbm1Periodic(auroraColorU *  5.0 +  1.3,  5.0),  // R
+        fbm1Periodic(auroraColorU *  9.0 +  7.8,  9.0),  // G
+        fbm1Periodic(auroraColorU * 17.0 + 12.4, 17.0)   // B
+    ), 0.0, 1.0);
+
+    veilColorNoise   = clamp(veilColorNoise,   0.0, 1.0);
+    auroraColorNoise = clamp(auroraColorNoise, 0.0, 1.0);
+
+    vec3 veilBaseColor = 0.2 * mix(vec3(0.070, 0.160, 0.460),
+                               vec3(0.140, 0.620, 0.760),
+                               0.55 * veilColorNoise);
+
+    vec3 veilPeakColor = 0.5 * mix(vec3(0.110, 0.240, 0.620),
+                               vec3(0.180, 0.900, 0.950),
+                               0.65 * veilColorNoise);
+
+    vec3 auroraBaseColor = 0.2 * vec3(0.100, 0.640, 0.720) * auroraColorNoise * auroraColorNoise;
+    vec3 auroraPeakColor = 0.5 * vec3(0.180, 0.980, 1.050) * auroraColorNoise * auroraColorNoise;
+
+    float electric0     = thinLine(v - electric0Center, 0.0001);
+    float electric1     = thinLine(v - electric1Center, 0.00015);
+    float electric2     = thinLine(v - electric2Center, 0.0002);
+
+    float electric0Glow = gauss(v - electric0Center, 0.0040);
+    float electric1Glow = gauss(v - electric1Center, 0.0048);
+    float electric2Glow = gauss(v - electric2Center, 0.0052);
+
+    float e0Energy = 0.82 + 0.28 * fbm1Periodic(electric0U * 41.0 +  6.2, 41.0);
+    float e1Energy = 0.80 + 0.25 * fbm1Periodic(electric1U * 47.0 + 10.4, 47.0);
+    float e2Energy = 0.80 + 0.25 * fbm1Periodic(electric2U * 39.0 + 14.9, 39.0);
+                          
+    // compose
+    col += aura * (0.85 + 0.25 * mainTex) * vec3(0.014, 0.032, 0.080) * 0.95;
+
+    col += mainBody   * bodyMod * vec3(0.070, 0.160, 0.420) * 0.5;
+    col += mainMid    * bodyMod * vec3(0.120, 0.280, 0.740) * 0.4;
+    col += mainHiEdge * bodyMod * vec3(0.105, 0.240, 0.620) * 0.1;
+
+    col += veilBody   * veilMod * veilBaseColor * 1.05;
+    col += veilMid    * veilMod * veilPeakColor * 0.90;
+    col += veilLoEdge * veilMod * mix(veilBaseColor, veilPeakColor, 0.55) * 0.80;
+    col += veilHiEdge * veilMod * vec3(0.100, 0.220, 0.580) * 0.20;
+
+    col += auroraBody   * auroraMod * auroraBaseColor * 0.95;
+    col += auroraMid    * auroraMod * auroraPeakColor * 0.78;
+    col += auroraLoEdge * auroraMod * mix(auroraBaseColor, auroraPeakColor, 0.45) * 0.55;
+    col += auroraHiEdge * auroraMod * vec3(0.080, 0.180, 0.480) * 0.18;
+
+    col += mist * (0.52 + 0.28 * auroraTex) * vec3(0.035, 0.082, 0.220) * 0.20;
+
+    col += electric0Glow * vec3(0.70, 1.10, 1.90) * 0.55;
+    col += electric1Glow * mix(veilBaseColor,   veilPeakColor,   0.60) * 1.20;
+    col += electric2Glow * mix(auroraBaseColor, auroraPeakColor, 0.65) * 1.35;
+
+    col += electric0 * e0Energy * vec3(10.0, 10.3, 10.8);
+    col += electric1 * e1Energy * vec3( 6.2,  6.8,  7.4);
+    col += electric2 * e2Energy * vec3( 5.8,  6.5,  7.2);
+
+    //TODO: skipped if rendering to a HDR swapchain
+    col = tonemapACESApprox(col);
+
+    outColor = vec4(col, 1.0);
+}
diff --git a/wayvr/src/state.rs b/wayvr/src/state.rs
index 9e8d7da2..e42ad4a9 100644
--- a/wayvr/src/state.rs
+++ b/wayvr/src/state.rs
@@ -1,16 +1,21 @@
 use glam::Affine3A;
 use idmap::IdMap;
+use serde::{Deserialize, Serialize};
 use smallvec::{SmallVec, smallvec};
+use std::path::PathBuf;
 use std::rc::Rc;
 use std::sync::Arc;
 use wgui::log::LogErr;
 use wgui::theme::WguiTheme;
 use wgui::{
-    drawing, font_config::WguiFontConfig, gfx::WGfx, globals::WguiGlobals, parser::parse_color_hex,
+    font_config::WguiFontConfig, gfx::WGfx, globals::WguiGlobals,
     renderer_vk::context::SharedContext as WSharedContext,
 };
-use wlx_common::async_executor::AsyncExecutor;
+#[cfg(feature = "pipewire")]
+use wlx_capture::pipewire::ScreenCastManager;
+use wlx_common::config::PwTokenMap;
 use wlx_common::locale::WayVRLangProvider;
+use wlx_common::palette::load_palette;
 use wlx_common::{
     audio,
     config::GeneralConfig,
@@ -23,9 +28,12 @@ use wlx_common::{
 use crate::backend;
 use crate::backend::wayvr::WvrServerState;
 
+use crate::subsystem::notifications::NotificationManager;
 #[cfg(feature = "osc")]
 use crate::subsystem::osc::OscSender;
 
+#[cfg(feature = "whisper")]
+use crate::subsystem::whisper_stt::WhisperStt;
 use crate::{
     backend::{XrBackend, input::InputState, task::TaskContainer},
     config::load_general_config,
@@ -38,7 +46,6 @@ use crate::{
 pub struct AppState {
     pub session: AppSession,
     pub tasks: TaskContainer,
-    pub executor: AsyncExecutor,
 
     pub gfx: Arc<WGfx>,
     pub gfx_extras: WGfxExtras,
@@ -47,6 +54,8 @@ pub struct AppState {
     pub audio_system: audio::AudioSystem,
     pub audio_sample_player: audio::SamplePlayer,
 
+    pub notifications: NotificationManager,
+
     pub wgui_shared: WSharedContext,
 
     pub input_state: InputState,
@@ -71,8 +80,16 @@ pub struct AppState {
 
     pub wvr_server: Option<WvrServerState>,
 
+    #[cfg(feature = "whisper")]
+    pub whisper_sst: Option<WhisperStt>,
+
     #[cfg(feature = "openxr")]
     pub monado_state: Option<backend::openxr::monado_state::MonadoState>,
+
+    #[cfg(feature = "pipewire")]
+    pub screencast_manager: Option<ScreenCastManager>,
+
+    pub delta_time: f32,
 }
 
 #[allow(unused_mut)]
@@ -88,11 +105,17 @@ impl AppState {
         let session = AppSession::load();
         let wvr_signals = SyncEventQueue::new();
 
-        let wvr_server = WvrServerState::new(gfx.clone(), &gfx_extras, wvr_signals.clone())
-            .log_err("Could not initialize WayVR Server")
-            .ok();
+        let wvr_server = {
+            let mut maybe_wvr = WvrServerState::new(gfx.clone(), &gfx_extras)
+                .log_err("Could not initialize WayVR Server")
+                .ok();
+            if let Some(wvr) = maybe_wvr.as_mut() {
+                wvr.config_changed(&session.config);
+            }
+            maybe_wvr
+        };
 
-        let mut hid_provider = HidWrapper::new();
+        let (hid_provider, mut hid_error) = HidWrapper::new(session.config.input_emulation_method);
 
         #[cfg(feature = "osc")]
         let osc_sender = crate::subsystem::osc::OscSender::new(session.config.osc_out_port).ok();
@@ -125,26 +148,27 @@ impl AppState {
             ))?,
         )?;
 
+        audio_sample_player.register_sample(
+            "input_grab",
+            audio::AudioSample::from_mp3(&audio::AudioSample::bytes_from_config_or_default(
+                "sound/wvr_input_capture_grabbed.mp3",
+                include_bytes!("assets/sound/wvr_input_capture_grabbed.mp3"),
+            ))?,
+        )?;
+
+        audio_sample_player.register_sample(
+            "input_ungrab",
+            audio::AudioSample::from_mp3(&audio::AudioSample::bytes_from_config_or_default(
+                "sound/wvr_input_capture_ungrabbed.mp3",
+                include_bytes!("assets/sound/wvr_input_capture_ungrabbed.mp3"),
+            ))?,
+        )?;
+
         let mut assets = Box::new(gui::asset::GuiAsset {});
         audio_sample_player.register_wgui_samples(assets.as_mut())?;
 
         let mut theme = WguiTheme::default();
 
-        {
-            #[allow(clippy::ref_option)]
-            fn apply_color(default: &mut drawing::Color, value: &Option<String>) {
-                if let Some(parsed) = value.as_ref().and_then(|c| parse_color_hex(c)) {
-                    *default = parsed;
-                }
-            }
-
-            apply_color(&mut theme.text_color, &session.config.color_text);
-            apply_color(&mut theme.accent_color, &session.config.color_accent);
-            apply_color(&mut theme.danger_color, &session.config.color_danger);
-            apply_color(&mut theme.faded_color, &session.config.color_faded);
-            apply_color(&mut theme.bg_color, &session.config.color_background);
-        }
-
         theme.animation_mult = 1. / session.config.ui_animation_speed;
         theme.rounding_mult = session.config.ui_round_multiplier;
 
@@ -157,12 +181,16 @@ impl AppState {
 
         let lang_provider = WayVRLangProvider::from_config(&session.config);
 
-        let executor = Rc::new(smol::LocalExecutor::new());
+        #[cfg(feature = "pipewire")]
+        let screencast_manager = ScreenCastManager::new()
+            .log_err(
+                // would only fail if session D-bus is unreachable
+                "Could not initialize ScreenCastManager. PipeWire screen capture will not work. Check your D-bus setup.",
+            )
+            .ok();
 
-        Ok(Self {
-            session,
+        let mut app_state = Self {
             tasks,
-            executor,
             gfx,
             gfx_extras,
             hid_provider,
@@ -178,6 +206,7 @@ impl AppState {
                 &lang_provider,
                 &WguiFontConfig::default(),
                 get_config_file_path(&theme_path),
+                load_palette(&*session.config.color_palette),
             )?,
             wgui_theme: Rc::new(theme),
             dbus,
@@ -185,30 +214,65 @@ impl AppState {
             ipc_server,
             wayvr_signals: wvr_signals,
             desktop_finder,
+            notifications: NotificationManager::new(),
 
             #[cfg(feature = "osc")]
             osc_sender,
 
             wvr_server,
+            #[cfg(feature = "whisper")]
+            whisper_sst: None,
 
             #[cfg(feature = "openxr")]
             monado_state: None,
-        })
+
+            #[cfg(feature = "pipewire")]
+            screencast_manager,
+
+            delta_time: 1.0 / 120.0,
+            session,
+        };
+
+        if let Some(error_toast) = hid_error {
+            error_toast.submit(&mut app_state);
+        }
+        Ok(app_state)
     }
 
-    #[cfg(feature = "openxr")]
-    pub fn monado_state_init(&mut self) {
-        use crate::backend::openxr::monado_state::MonadoState;
+    pub fn late_init(&mut self) {
+        self.notifications.run_dbus(&mut self.dbus);
+        self.notifications.run_udp();
 
-        log::debug!("Connecting to Monado IPC");
-        self.monado_state = None; // stop connection first
+        #[cfg(feature = "openxr")]
+        if matches!(self.xr_backend, XrBackend::OpenXR) {
+            use crate::backend::openxr::monado_state::MonadoState;
 
-        match MonadoState::new() {
-            Ok(m) => {
-                self.monado_state = Some(m);
+            log::debug!("Connecting to Monado IPC");
+            self.monado_state = None; // stop connection first
+
+            match MonadoState::new() {
+                Ok(m) => {
+                    self.monado_state = Some(m);
+                }
+                Err(e) => {
+                    log::error!("Will not use libmonado: {e:?}");
+                }
             }
-            Err(e) => {
-                log::error!("Will not use libmonado: {e:?}");
+        }
+    }
+
+    pub fn tick(&mut self) {
+        self.dbus.tick();
+
+        for toast in self.notifications.drain_pending(&self.session) {
+            toast.submit(self);
+        }
+
+        #[cfg(feature = "whisper")]
+        {
+            if self.whisper_sst.as_ref().is_some_and(|x| x.should_unload()) {
+                log::info!("Unloading Whisper model due to timeout");
+                self.whisper_sst = None;
             }
         }
     }
@@ -218,6 +282,11 @@ pub struct AppSession {
     pub config: GeneralConfig,
     pub config_dirty: bool,
 
+    #[cfg(feature = "pipewire")]
+    pub pw_tokens: PwTokenMap,
+
+    pub no_autostart: bool,
+
     pub toast_topics: IdMap<ToastTopic, ToastDisplayMethod>,
 }
 
@@ -237,10 +306,18 @@ impl AppSession {
             toast_topics.insert(*k, *v);
         });
 
+        #[cfg(feature = "pipewire")]
+        let pw_tokens = load_pw_token_config()
+            .log_err("Could not load PipeWire tokens")
+            .unwrap_or_default();
+
         Self {
             config,
             toast_topics,
+            no_autostart: false,
             config_dirty: false,
+            #[cfg(feature = "pipewire")]
+            pw_tokens,
         }
     }
 }
@@ -250,3 +327,50 @@ pub struct ScreenMeta {
     #[allow(dead_code)]
     pub native_handle: u32,
 }
+
+#[cfg(feature = "pipewire")]
+#[derive(Deserialize, Serialize, Default)]
+struct TokenConf {
+    pub pw_tokens: PwTokenMap,
+}
+
+#[cfg(feature = "pipewire")]
+fn get_pw_token_path() -> PathBuf {
+    let mut path = config_io::ConfigRoot::Generic.get_conf_d_path();
+    path.push("pw_tokens.yaml");
+    path
+}
+
+#[cfg(feature = "pipewire")]
+pub fn save_pw_token_config(tokens: PwTokenMap) -> anyhow::Result<()> {
+    let conf = TokenConf { pw_tokens: tokens };
+    let yaml = serde_yaml::to_string(&conf)?;
+    std::fs::write(get_pw_token_path(), yaml)?;
+    Ok(())
+}
+
+#[cfg(feature = "pipewire")]
+pub fn load_pw_token_config() -> anyhow::Result<PwTokenMap> {
+    let yaml = std::fs::read_to_string(get_pw_token_path())?;
+    let conf: TokenConf = serde_yaml::from_str(yaml.as_str())?;
+    Ok(conf.pw_tokens)
+}
+
+#[derive(Default, Debug, Clone, Serialize, Deserialize)]
+#[allow(dead_code)]
+pub struct PlayspaceState {
+    pub openvr_space_center: Affine3A,
+    pub openxr_space_center: Affine3A,
+}
+
+pub fn load_playspace_state() -> anyhow::Result<PlayspaceState> {
+    let json = std::fs::read_to_string(config_io::get_config_file_path("playspace.json5"))?;
+    let state: PlayspaceState = serde_json5::from_str(json.as_str())?;
+    Ok(state)
+}
+
+pub fn save_playspace_state(state: &PlayspaceState) -> anyhow::Result<()> {
+    let json = serde_json5::to_string(state)?;
+    std::fs::write(config_io::get_config_file_path("playspace.json5"), json)?;
+    Ok(())
+}
diff --git a/wayvr/src/subsystem/clipboard/mod.rs b/wayvr/src/subsystem/clipboard/mod.rs
new file mode 100644
index 00000000..a19b9e22
--- /dev/null
+++ b/wayvr/src/subsystem/clipboard/mod.rs
@@ -0,0 +1,8 @@
+#[cfg(feature = "wayland")]
+pub mod wl;
+#[cfg(feature = "x11")]
+pub mod x11;
+
+pub trait ClipboardProvider {
+    fn set_clipboard_utf8(&mut self, content: &str);
+}
diff --git a/wayvr/src/subsystem/clipboard/wl.rs b/wayvr/src/subsystem/clipboard/wl.rs
new file mode 100644
index 00000000..0c04a3bd
--- /dev/null
+++ b/wayvr/src/subsystem/clipboard/wl.rs
@@ -0,0 +1,349 @@
+use std::{
+    fs::File,
+    io::Write,
+    sync::mpsc::{self, SyncSender},
+    thread::{self, JoinHandle},
+};
+
+use anyhow::Context;
+use calloop::{
+    EventLoop,
+    channel::{Channel, Event as ChannelEvent, Sender, channel},
+};
+use calloop_wayland_source::WaylandSource;
+use wayland_client::{
+    Connection, Dispatch, QueueHandle,
+    globals::{GlobalListContents, registry_queue_init},
+    protocol::{
+        wl_registry,
+        wl_seat::{self, WlSeat},
+    },
+};
+use wayland_protocols::ext::data_control::v1::client::{
+    ext_data_control_device_v1::{self, ExtDataControlDeviceV1},
+    ext_data_control_manager_v1::{self, ExtDataControlManagerV1},
+    ext_data_control_offer_v1::{self, ExtDataControlOfferV1},
+    ext_data_control_source_v1::{self, ExtDataControlSourceV1},
+};
+
+use crate::subsystem::clipboard::ClipboardProvider;
+
+const TEXT_MIME_TYPES: &[&str] = &[
+    "text/plain;charset=utf-8",
+    "text/plain;charset=UTF-8",
+    "text/plain",
+    "UTF8_STRING",
+    "TEXT",
+    "STRING",
+];
+
+pub struct Provider {
+    tx: Sender<Command>,
+    _thread: JoinHandle<()>,
+}
+
+enum Command {
+    SetText(String),
+    Shutdown,
+}
+
+struct ActiveSource {
+    source: ExtDataControlSourceV1,
+    bytes: Vec<u8>,
+}
+
+struct State {
+    conn: Connection,
+    qh: QueueHandle<State>,
+    manager: ExtDataControlManagerV1,
+    device: ExtDataControlDeviceV1,
+    active_sources: Vec<ActiveSource>,
+    ignored_offers: Vec<ExtDataControlOfferV1>,
+    stop: bool,
+}
+
+impl Provider {
+    pub fn new() -> anyhow::Result<Self> {
+        let (tx, rx) = channel::<Command>();
+        let (ready_tx, ready_rx) = mpsc::sync_channel::<Result<(), String>>(1);
+
+        let thread = thread::Builder::new()
+            .name("wayland-clipboard-ext-data-control".to_owned())
+            .spawn(move || run_worker(rx, ready_tx))
+            .context("failed to spawn Wayland clipboard worker thread")?;
+
+        match ready_rx
+            .recv()
+            .context("Wayland clipboard worker exited before reporting readiness")?
+        {
+            Ok(()) => Ok(Self {
+                tx,
+                _thread: thread,
+            }),
+            Err(err) => anyhow::bail!("{}", err),
+        }
+    }
+}
+
+impl ClipboardProvider for Provider {
+    fn set_clipboard_utf8(&mut self, content: &str) {
+        let _ = self.tx.send(Command::SetText(content.to_owned()));
+    }
+}
+
+impl Drop for Provider {
+    fn drop(&mut self) {
+        let _ = self.tx.send(Command::Shutdown);
+    }
+}
+
+fn run_worker(rx: Channel<Command>, ready: SyncSender<Result<(), String>>) {
+    macro_rules! init_or_report {
+        ($expr:expr, $context:literal) => {
+            match $expr {
+                Ok(value) => value,
+                Err(err) => {
+                    let _ = ready.send(Err(format!("{}: {}", $context, err)));
+                    return;
+                }
+            }
+        };
+    }
+
+    let conn = init_or_report!(
+        Connection::connect_to_env(),
+        "connect to Wayland compositor"
+    );
+
+    let (globals, event_queue) =
+        init_or_report!(registry_queue_init::<State>(&conn), "read Wayland globals");
+
+    let qh = event_queue.handle();
+
+    let mut event_loop =
+        init_or_report!(EventLoop::<State>::try_new(), "create calloop event loop");
+
+    init_or_report!(
+        WaylandSource::new(conn.clone(), event_queue).insert(event_loop.handle()),
+        "attach Wayland queue to event loop"
+    );
+
+    let manager: ExtDataControlManagerV1 = init_or_report!(
+        globals.bind(&qh, 1..=1, ()),
+        "bind ext_data_control_manager_v1"
+    );
+
+    let seat: WlSeat = init_or_report!(globals.bind(&qh, 1..=9, ()), "bind wl_seat");
+
+    let device = manager.get_data_device(&seat, &qh, ());
+
+    let mut state = State {
+        conn,
+        qh,
+        manager,
+        device,
+        active_sources: Vec::new(),
+        ignored_offers: Vec::new(),
+        stop: false,
+    };
+
+    init_or_report!(
+        event_loop
+            .handle()
+            .insert_source(rx, |event, _metadata, state| match event {
+                ChannelEvent::Msg(Command::SetText(text)) => {
+                    state.set_clipboard_text(text);
+                }
+                ChannelEvent::Msg(Command::Shutdown) | ChannelEvent::Closed => {
+                    state.stop = true;
+                }
+            }),
+        "attach clipboard command channel to event loop"
+    );
+
+    if let Err(err) = state.conn.flush() {
+        let _ = ready.send(Err(format!("flush initial Wayland requests: {err}")));
+        return;
+    }
+
+    let _ = ready.send(Ok(()));
+
+    while !state.stop {
+        if let Err(err) = event_loop.dispatch(None, &mut state) {
+            eprintln!("Wayland clipboard event loop failed: {err}");
+            break;
+        }
+
+        if let Err(err) = state.conn.flush() {
+            eprintln!("Wayland clipboard flush failed: {err}");
+            break;
+        }
+    }
+}
+
+impl State {
+    fn set_clipboard_text(&mut self, content: String) {
+        let source = self.manager.create_data_source(&self.qh, ());
+
+        for mime_type in TEXT_MIME_TYPES {
+            source.offer((*mime_type).to_owned());
+        }
+
+        self.device.set_selection(Some(&source));
+
+        let previous_sources = std::mem::take(&mut self.active_sources);
+
+        self.active_sources.push(ActiveSource {
+            source,
+            bytes: content.into_bytes(),
+        });
+
+        for old in previous_sources {
+            old.source.destroy();
+        }
+
+        let _ = self.conn.flush();
+    }
+}
+
+impl Dispatch<wl_registry::WlRegistry, GlobalListContents> for State {
+    fn event(
+        _state: &mut Self,
+        _registry: &wl_registry::WlRegistry,
+        _event: wl_registry::Event,
+        _data: &GlobalListContents,
+        _conn: &Connection,
+        _qh: &QueueHandle<Self>,
+    ) {
+    }
+}
+
+impl Dispatch<WlSeat, ()> for State {
+    fn event(
+        _state: &mut Self,
+        _seat: &WlSeat,
+        _event: wl_seat::Event,
+        _data: &(),
+        _conn: &Connection,
+        _qh: &QueueHandle<Self>,
+    ) {
+    }
+}
+
+impl Dispatch<ExtDataControlManagerV1, ()> for State {
+    fn event(
+        _state: &mut Self,
+        _manager: &ExtDataControlManagerV1,
+        _event: ext_data_control_manager_v1::Event,
+        _data: &(),
+        _conn: &Connection,
+        _qh: &QueueHandle<Self>,
+    ) {
+    }
+}
+
+impl Dispatch<ExtDataControlDeviceV1, ()> for State {
+    fn event(
+        state: &mut Self,
+        device: &ExtDataControlDeviceV1,
+        event: ext_data_control_device_v1::Event,
+        _data: &(),
+        _conn: &Connection,
+        _qh: &QueueHandle<Self>,
+    ) {
+        match event {
+            ext_data_control_device_v1::Event::DataOffer { id } => {
+                state.ignored_offers.push(id);
+            }
+            ext_data_control_device_v1::Event::Selection { id }
+            | ext_data_control_device_v1::Event::PrimarySelection { id } => {
+                if let Some(offer) = id {
+                    if let Some(pos) = state
+                        .ignored_offers
+                        .iter()
+                        .position(|stored| *stored == offer)
+                    {
+                        state.ignored_offers.swap_remove(pos);
+                    }
+
+                    offer.destroy();
+                }
+            }
+            ext_data_control_device_v1::Event::Finished => {
+                device.destroy();
+                state.stop = true;
+            }
+            _ => {}
+        }
+    }
+
+    fn event_created_child(
+        opcode: u16,
+        qh: &QueueHandle<Self>,
+    ) -> std::sync::Arc<dyn wayland_client::backend::ObjectData> {
+        if opcode == ext_data_control_device_v1::EVT_DATA_OFFER_OPCODE {
+            qh.make_data::<ExtDataControlOfferV1, _>(())
+        } else {
+            unreachable!("unknown ext_data_control_device_v1 child event opcode: {opcode}")
+        }
+    }
+}
+
+impl Dispatch<ExtDataControlOfferV1, ()> for State {
+    fn event(
+        _state: &mut Self,
+        _offer: &ExtDataControlOfferV1,
+        _event: ext_data_control_offer_v1::Event,
+        _data: &(),
+        _conn: &Connection,
+        _qh: &QueueHandle<Self>,
+    ) {
+    }
+}
+
+impl Dispatch<ExtDataControlSourceV1, ()> for State {
+    fn event(
+        state: &mut Self,
+        source: &ExtDataControlSourceV1,
+        event: ext_data_control_source_v1::Event,
+        _data: &(),
+        _conn: &Connection,
+        _qh: &QueueHandle<Self>,
+    ) {
+        match event {
+            ext_data_control_source_v1::Event::Send { mime_type, fd } => {
+                if !TEXT_MIME_TYPES.contains(&mime_type.as_str()) {
+                    return;
+                }
+
+                let Some(active) = state
+                    .active_sources
+                    .iter()
+                    .find(|active| active.source == *source)
+                else {
+                    return;
+                };
+
+                let mut file = File::from(fd);
+
+                if let Err(err) = file.write_all(&active.bytes) {
+                    eprintln!("failed to write clipboard data to Wayland fd: {err}");
+                    return;
+                }
+
+                let _ = file.flush();
+            }
+            ext_data_control_source_v1::Event::Cancelled => {
+                if let Some(pos) = state
+                    .active_sources
+                    .iter()
+                    .position(|active| active.source == *source)
+                {
+                    let active = state.active_sources.swap_remove(pos);
+                    active.source.destroy();
+                }
+            }
+            _ => {}
+        }
+    }
+}
diff --git a/wayvr/src/subsystem/clipboard/x11.rs b/wayvr/src/subsystem/clipboard/x11.rs
new file mode 100644
index 00000000..3464609f
--- /dev/null
+++ b/wayvr/src/subsystem/clipboard/x11.rs
@@ -0,0 +1,329 @@
+use std::{
+    error::Error,
+    sync::{
+        atomic::Ordering,
+        mpsc::{self, Receiver, RecvTimeoutError, Sender},
+    },
+    thread::{self, JoinHandle},
+    time::Duration,
+};
+
+use xcb::{Xid, x};
+
+use crate::{RUNNING, subsystem::clipboard::ClipboardProvider};
+
+pub struct Provider {
+    tx: Sender<Command>,
+    worker: Option<JoinHandle<()>>,
+}
+
+impl Provider {
+    pub fn new() -> Result<Self, Box<dyn Error + Send + Sync + 'static>> {
+        let (conn, screen_num) = xcb::Connection::connect(None)?;
+        let runtime = ClipboardRuntime::new(conn, screen_num)?;
+
+        let (tx, rx) = mpsc::channel();
+
+        let worker = thread::spawn(move || {
+            runtime.run(rx);
+        });
+
+        Ok(Self {
+            tx,
+            worker: Some(worker),
+        })
+    }
+}
+
+impl ClipboardProvider for Provider {
+    fn set_clipboard_utf8(&mut self, content: &str) {
+        let (ack_tx, ack_rx) = mpsc::channel();
+
+        if self
+            .tx
+            .send(Command::Set(content.as_bytes().to_vec(), ack_tx))
+            .is_ok()
+        {
+            // make sure the X server has received the ownership request before returning
+            let _ = ack_rx.recv();
+        }
+    }
+}
+
+impl Drop for Provider {
+    fn drop(&mut self) {
+        let _ = self.tx.send(Command::Shutdown);
+
+        if let Some(worker) = self.worker.take() {
+            let _ = worker.join();
+        }
+    }
+}
+
+enum Command {
+    Set(Vec<u8>, Sender<()>),
+    Shutdown,
+}
+
+#[derive(Clone, Copy)]
+struct Atoms {
+    clipboard: x::Atom,
+    utf8_string: x::Atom,
+    targets: x::Atom,
+    text: x::Atom,
+    text_plain: x::Atom,
+    text_plain_utf8: x::Atom,
+}
+
+struct ClipboardRuntime {
+    conn: xcb::Connection,
+    window: x::Window,
+    atoms: Atoms,
+    content: Vec<u8>,
+    owns_clipboard: bool,
+}
+
+impl ClipboardRuntime {
+    fn new(
+        conn: xcb::Connection,
+        screen_num: i32,
+    ) -> Result<Self, Box<dyn Error + Send + Sync + 'static>> {
+        let atoms = Atoms {
+            clipboard: intern_atom(&conn, b"CLIPBOARD")?,
+            utf8_string: intern_atom(&conn, b"UTF8_STRING")?,
+            targets: intern_atom(&conn, b"TARGETS")?,
+            text: intern_atom(&conn, b"TEXT")?,
+            text_plain: intern_atom(&conn, b"text/plain")?,
+            text_plain_utf8: intern_atom(&conn, b"text/plain;charset=utf-8")?,
+        };
+
+        let setup = conn.get_setup();
+        let screen = setup.roots().nth(screen_num as usize).ok_or_else(|| {
+            std::io::Error::new(std::io::ErrorKind::NotFound, "X11 screen not found")
+        })?;
+
+        let window: x::Window = conn.generate_id();
+
+        conn.send_and_check_request(&x::CreateWindow {
+            depth: x::COPY_FROM_PARENT as u8,
+            wid: window,
+            parent: screen.root(),
+            x: 0,
+            y: 0,
+            width: 1,
+            height: 1,
+            border_width: 0,
+            class: x::WindowClass::InputOutput,
+            visual: screen.root_visual(),
+            value_list: &[],
+        })?;
+
+        conn.flush()?;
+
+        Ok(Self {
+            conn,
+            window,
+            atoms,
+            content: Vec::new(),
+            owns_clipboard: false,
+        })
+    }
+
+    fn run(mut self, rx: Receiver<Command>) {
+        while RUNNING.load(Ordering::Relaxed) {
+            self.drain_x_events();
+
+            match rx.recv_timeout(Duration::from_millis(10)) {
+                Ok(command) => {
+                    if !self.handle_command(command) {
+                        break;
+                    }
+
+                    while let Ok(command) = rx.try_recv() {
+                        if !self.handle_command(command) {
+                            return;
+                        }
+                    }
+                }
+                Err(RecvTimeoutError::Timeout) => {}
+                Err(RecvTimeoutError::Disconnected) => break,
+            }
+        }
+    }
+
+    fn handle_command(&mut self, command: Command) -> bool {
+        match command {
+            Command::Set(content, ack) => {
+                self.content = content;
+                self.become_clipboard_owner();
+                let _ = ack.send(());
+                true
+            }
+            Command::Shutdown => {
+                self.release_clipboard_if_owned();
+                false
+            }
+        }
+    }
+
+    fn become_clipboard_owner(&mut self) {
+        self.conn.send_request(&x::SetSelectionOwner {
+            owner: self.window,
+            selection: self.atoms.clipboard,
+            time: x::CURRENT_TIME,
+        });
+
+        self.owns_clipboard = true;
+        let _ = self.conn.flush();
+    }
+
+    fn release_clipboard_if_owned(&mut self) {
+        if !self.owns_clipboard {
+            return;
+        }
+
+        self.conn.send_request(&x::SetSelectionOwner {
+            owner: x::Window::none(),
+            selection: self.atoms.clipboard,
+            time: x::CURRENT_TIME,
+        });
+
+        self.owns_clipboard = false;
+        let _ = self.conn.flush();
+    }
+
+    fn drain_x_events(&mut self) {
+        loop {
+            match self.conn.poll_for_event() {
+                Ok(Some(event)) => self.handle_x_event(event),
+                Ok(None) => break,
+                Err(xcb::Error::Protocol(_)) => continue,
+                Err(xcb::Error::Connection(_)) => break,
+            }
+        }
+    }
+
+    fn handle_x_event(&mut self, event: xcb::Event) {
+        match event {
+            xcb::Event::X(x::Event::SelectionRequest(req)) => {
+                self.handle_selection_request(&req);
+            }
+            xcb::Event::X(x::Event::SelectionClear(ev)) => {
+                if ev.selection() == self.atoms.clipboard {
+                    self.owns_clipboard = false;
+                }
+            }
+            _ => {}
+        }
+    }
+
+    fn handle_selection_request(&self, req: &x::SelectionRequestEvent) {
+        if !self.owns_clipboard || req.selection() != self.atoms.clipboard {
+            self.send_selection_notify(req, x::Atom::none());
+            return;
+        }
+
+        let property = if req.property().is_none() {
+            // compatibility with old clients that use XCB_NONE for property
+            req.target()
+        } else {
+            req.property()
+        };
+
+        let ok = if req.target() == self.atoms.targets {
+            self.write_targets(req.requestor(), property)
+        } else if let Some(type_atom) = self.type_for_text_target(req.target()) {
+            self.write_text(req.requestor(), property, type_atom)
+        } else {
+            false
+        };
+
+        self.send_selection_notify(req, if ok { property } else { x::Atom::none() });
+    }
+
+    fn supported_targets(&self) -> Vec<x::Atom> {
+        let mut targets = vec![
+            self.atoms.targets,
+            self.atoms.utf8_string,
+            self.atoms.text_plain_utf8,
+            self.atoms.text_plain,
+        ];
+
+        // STRING/TEXT are not UTF-8 targets. Only advertise them when the
+        // content is representable as plain ASCII.
+        if self.content.is_ascii() {
+            targets.push(self.atoms.text);
+            targets.push(x::ATOM_STRING);
+        }
+
+        targets
+    }
+
+    fn type_for_text_target(&self, target: x::Atom) -> Option<x::Atom> {
+        if target == self.atoms.utf8_string
+            || target == self.atoms.text_plain_utf8
+            || target == self.atoms.text_plain
+        {
+            Some(target)
+        } else if self.content.is_ascii() && (target == self.atoms.text || target == x::ATOM_STRING)
+        {
+            Some(target)
+        } else {
+            None
+        }
+    }
+
+    fn write_targets(&self, requestor: x::Window, property: x::Atom) -> bool {
+        let targets = self.supported_targets();
+
+        self.conn
+            .send_and_check_request(&x::ChangeProperty {
+                mode: x::PropMode::Replace,
+                window: requestor,
+                property,
+                r#type: x::ATOM_ATOM,
+                data: targets.as_slice(),
+            })
+            .is_ok()
+    }
+
+    fn write_text(&self, requestor: x::Window, property: x::Atom, type_atom: x::Atom) -> bool {
+        self.conn
+            .send_and_check_request(&x::ChangeProperty {
+                mode: x::PropMode::Replace,
+                window: requestor,
+                property,
+                r#type: type_atom,
+                data: self.content.as_slice(),
+            })
+            .is_ok()
+    }
+
+    fn send_selection_notify(&self, req: &x::SelectionRequestEvent, property: x::Atom) {
+        let event = x::SelectionNotifyEvent::new(
+            req.time(),
+            req.requestor(),
+            req.selection(),
+            req.target(),
+            property,
+        );
+
+        let _ = self.conn.send_and_check_request(&x::SendEvent {
+            propagate: false,
+            destination: x::SendEventDest::Window(req.requestor()),
+            event_mask: x::EventMask::NO_EVENT,
+            event: &event,
+        });
+
+        let _ = self.conn.flush();
+    }
+}
+
+fn intern_atom(conn: &xcb::Connection, name: &[u8]) -> xcb::Result<x::Atom> {
+    let cookie = conn.send_request(&x::InternAtom {
+        only_if_exists: false,
+        name,
+    });
+
+    Ok(conn.wait_for_reply(cookie)?.atom())
+}
diff --git a/wayvr/src/subsystem/dbus/mod.rs b/wayvr/src/subsystem/dbus/mod.rs
index 171498b5..7bb5d506 100644
--- a/wayvr/src/subsystem/dbus/mod.rs
+++ b/wayvr/src/subsystem/dbus/mod.rs
@@ -45,7 +45,7 @@ impl DbusConnector {
         let proxy = connection.with_proxy(
             "org.freedesktop.DBus",
             "/org/freedesktop/DBus",
-            Duration::from_millis(5000),
+            Duration::from_secs(5),
         );
         let result: Result<(), dbus::Error> = proxy.method_call(
             "org.freedesktop.DBus.Monitoring",
diff --git a/wayvr/src/subsystem/hid/mod.rs b/wayvr/src/subsystem/hid/mod.rs
index cba95ac6..0b737ac0 100644
--- a/wayvr/src/subsystem/hid/mod.rs
+++ b/wayvr/src/subsystem/hid/mod.rs
@@ -1,65 +1,25 @@
-use glam::Vec2;
+use glam::DVec2;
 use idmap::{IdMap, idmap};
 use idmap_derive::IntegerId;
-use input_linux::{
-    AbsoluteAxis, AbsoluteInfo, AbsoluteInfoSetup, EventKind, InputId, Key, RelativeAxis,
-    UInputHandle,
-};
 use libc::{input_event, timeval};
 use serde::Deserialize;
-use std::mem::transmute;
 use std::sync::LazyLock;
-use std::{fs::File, sync::atomic::AtomicBool};
-use strum::{EnumIter, EnumString, IntoEnumIterator};
+use strum::{EnumIter, EnumString, FromRepr};
 use xkbcommon::xkb;
 
 #[cfg(feature = "wayland")]
 pub mod wayland;
 
+pub mod provider;
 #[cfg(feature = "x11")]
 mod x11;
 
-pub static USE_UINPUT: AtomicBool = AtomicBool::new(true);
-
-pub(super) fn initialize() -> Box<dyn HidProvider> {
-    if !USE_UINPUT.load(std::sync::atomic::Ordering::Relaxed) {
-        log::info!("Uinput disabled by user.");
-        return Box::new(DummyProvider {});
-    }
-
-    if let Some(uinput) = UInputProvider::try_new() {
-        log::info!("Initialized uinput.");
-        return Box::new(uinput);
-    }
-    log::error!("Could not create uinput provider. Keyboard/Mouse input will not work!");
-    log::error!("Check if the uinput kernel module is loaded: lsmod | grep uinput");
-    log::error!(
-        " - If not loaded, follow your distro's instructions to load the uinput kernel module."
-    );
-    log::error!("Check if you're in input group, run: id -nG");
-    if let Ok(user) = std::env::var("USER") {
-        log::error!(" - To add yourself to the input group, run: sudo usermod -aG input {user}");
-        log::error!(" - After adding yourself to the input group, you will need to reboot.");
-    }
-    Box::new(DummyProvider {})
-}
-
+#[derive(Debug)]
 pub struct WheelDelta {
     pub x: f32,
     pub y: f32,
 }
 
-pub trait HidProvider: Sync + Send {
-    fn mouse_move(&mut self, pos: Vec2);
-    fn send_button(&mut self, button: u16, down: bool);
-    fn wheel(&mut self, delta: WheelDelta);
-    fn set_modifiers(&mut self, mods: u8);
-    fn send_key(&self, key: VirtualKey, down: bool);
-    fn set_desktop_extent(&mut self, extent: Vec2);
-    fn set_desktop_origin(&mut self, origin: Vec2);
-    fn commit(&mut self);
-}
-
 struct MouseButtonAction {
     button: u16,
     down: bool,
@@ -67,245 +27,23 @@ struct MouseButtonAction {
 
 #[derive(Default)]
 struct MouseAction {
-    last_requested_pos: Option<Vec2>,
-    pos: Option<Vec2>,
+    last_requested_pos: Option<DVec2>,
+    pos: Option<DVec2>,
     button: Option<MouseButtonAction>,
     scroll: Option<WheelDelta>,
 }
 
-pub struct UInputProvider {
-    keyboard_handle: UInputHandle<File>,
-    mouse_handle: UInputHandle<File>,
-    desktop_extent: Vec2,
-    desktop_origin: Vec2,
-    cur_modifiers: u8,
-    current_action: MouseAction,
-}
-
-pub struct DummyProvider;
-
 pub const MOUSE_LEFT: u16 = 0x110;
 pub const MOUSE_RIGHT: u16 = 0x111;
 pub const MOUSE_MIDDLE: u16 = 0x112;
 
-const MOUSE_EXTENT: f32 = 32768.;
+const MOUSE_EXTENT: f64 = 32768.;
 
 const EV_SYN: u16 = 0x0;
 const EV_KEY: u16 = 0x1;
 const EV_REL: u16 = 0x2;
 const EV_ABS: u16 = 0x3;
 
-impl UInputProvider {
-    fn try_new() -> Option<Self> {
-        let keyboard_file = File::create("/dev/uinput").ok()?;
-        let keyboard_handle = UInputHandle::new(keyboard_file);
-
-        let mouse_file = File::create("/dev/uinput").ok()?;
-        let mouse_handle = UInputHandle::new(mouse_file);
-
-        let kbd_id = InputId {
-            bustype: 0x03,
-            vendor: 0x4711,
-            product: 0x0829,
-            version: 5,
-        };
-        let mouse_id = InputId {
-            bustype: 0x03,
-            vendor: 0x4711,
-            product: 0x0830,
-            version: 5,
-        };
-        let kbd_name = b"WayVR Keyboard\0";
-        let mouse_name = b"WayVR Mouse\0";
-
-        let abs_info = vec![
-            AbsoluteInfoSetup {
-                axis: input_linux::AbsoluteAxis::X,
-                info: AbsoluteInfo {
-                    value: 0,
-                    minimum: 0,
-                    maximum: MOUSE_EXTENT as _,
-                    fuzz: 0,
-                    flat: 0,
-                    resolution: 10,
-                },
-            },
-            AbsoluteInfoSetup {
-                axis: input_linux::AbsoluteAxis::Y,
-                info: AbsoluteInfo {
-                    value: 0,
-                    minimum: 0,
-                    maximum: MOUSE_EXTENT as _,
-                    fuzz: 0,
-                    flat: 0,
-                    resolution: 10,
-                },
-            },
-        ];
-
-        keyboard_handle.set_evbit(EventKind::Key).ok()?;
-        for key in VirtualKey::iter() {
-            let mapped_key: Key = unsafe { std::mem::transmute((key as u16) - 8) };
-            keyboard_handle.set_keybit(mapped_key).ok()?;
-        }
-
-        keyboard_handle.create(&kbd_id, kbd_name, 0, &[]).ok()?;
-
-        mouse_handle.set_evbit(EventKind::Absolute).ok()?;
-        mouse_handle.set_evbit(EventKind::Relative).ok()?;
-        mouse_handle.set_absbit(AbsoluteAxis::X).ok()?;
-        mouse_handle.set_absbit(AbsoluteAxis::Y).ok()?;
-        mouse_handle.set_relbit(RelativeAxis::WheelHiRes).ok()?;
-        mouse_handle
-            .set_relbit(RelativeAxis::HorizontalWheelHiRes)
-            .ok()?;
-        mouse_handle.set_evbit(EventKind::Key).ok()?;
-
-        for btn in MOUSE_LEFT..=MOUSE_MIDDLE {
-            let mouse_btn: Key = unsafe { transmute(btn) };
-            mouse_handle.set_keybit(mouse_btn).ok()?;
-        }
-        mouse_handle
-            .create(&mouse_id, mouse_name, 0, &abs_info)
-            .ok()?;
-
-        Some(Self {
-            keyboard_handle,
-            mouse_handle,
-            desktop_extent: Vec2::ZERO,
-            desktop_origin: Vec2::ZERO,
-            current_action: MouseAction::default(),
-            cur_modifiers: 0,
-        })
-    }
-    fn send_button_internal(&self, button: u16, down: bool) {
-        let time = get_time();
-        let events = [
-            new_event(time, EV_KEY, button, down.into()),
-            new_event(time, EV_SYN, 0, 0),
-        ];
-        if let Err(res) = self.mouse_handle.write(&events) {
-            log::error!("send_button: {res}");
-        }
-    }
-    fn mouse_move_internal(&mut self, pos: Vec2) {
-        #[cfg(debug_assertions)]
-        log::trace!("Mouse move: {pos:?}");
-
-        let pos = (pos - self.desktop_origin) * (MOUSE_EXTENT / self.desktop_extent);
-
-        let time = get_time();
-        let events = [
-            new_event(time, EV_ABS, AbsoluteAxis::X as _, pos.x as i32),
-            new_event(time, EV_ABS, AbsoluteAxis::Y as _, pos.y as i32),
-            new_event(time, EV_SYN, 0, 0),
-        ];
-        if let Err(res) = self.mouse_handle.write(&events) {
-            log::error!("{res}");
-        }
-    }
-
-    fn wheel_internal(&self, delta: WheelDelta) {
-        let multiplier = 64.0; /* cherry-picked value, overall scrolling speed can be altered via `scroll_speed` in the config */
-        let delta_x = (delta.x * multiplier) as i32;
-        let delta_y = (delta.y * multiplier) as i32;
-
-        let time = get_time();
-        let events = [
-            new_event(time, EV_REL, RelativeAxis::WheelHiRes as _, delta_y),
-            new_event(
-                time,
-                EV_REL,
-                RelativeAxis::HorizontalWheelHiRes as _,
-                delta_x,
-            ),
-            new_event(time, EV_SYN, 0, 0),
-        ];
-        if let Err(res) = self.mouse_handle.write(&events) {
-            log::error!("wheel: {res}");
-        }
-    }
-}
-
-impl HidProvider for UInputProvider {
-    fn set_modifiers(&mut self, modifiers: u8) {
-        let changed = self.cur_modifiers ^ modifiers;
-        for i in 0..8 {
-            let m = 1 << i;
-            if changed & m != 0
-                && let Some(vk) = MODS_TO_KEYS.get(m).into_iter().flatten().next()
-            {
-                self.send_key(*vk, modifiers & m != 0);
-            }
-        }
-        self.cur_modifiers = modifiers;
-    }
-    fn send_key(&self, key: VirtualKey, down: bool) {
-        #[cfg(debug_assertions)]
-        log::trace!("send_key: {key:?} {down}");
-
-        let time = get_time();
-        let events = [
-            new_event(time, EV_KEY, (key as u16) - 8, down.into()),
-            new_event(time, EV_SYN, 0, 0),
-        ];
-        if let Err(res) = self.keyboard_handle.write(&events) {
-            log::error!("send_key: {res}");
-        }
-    }
-
-    fn set_desktop_extent(&mut self, extent: Vec2) {
-        self.desktop_extent = extent;
-    }
-    fn set_desktop_origin(&mut self, origin: Vec2) {
-        self.desktop_origin = origin;
-    }
-    fn mouse_move(&mut self, pos: Vec2) {
-        if self.current_action.pos.is_none() && self.current_action.scroll.is_none() {
-            self.current_action.pos = Some(pos);
-        }
-        self.current_action.last_requested_pos = Some(pos);
-    }
-    fn send_button(&mut self, button: u16, down: bool) {
-        if self.current_action.button.is_none() {
-            self.current_action.button = Some(MouseButtonAction { button, down });
-            self.current_action.pos = self.current_action.last_requested_pos;
-        }
-    }
-
-    fn wheel(&mut self, delta: WheelDelta) {
-        if self.current_action.scroll.is_none() {
-            self.current_action.scroll = Some(delta);
-            // Pass mouse motion events only if not scrolling
-            // (allows scrolling on all Chromium-based applications)
-            self.current_action.pos = None;
-        }
-    }
-
-    fn commit(&mut self) {
-        if let Some(pos) = self.current_action.pos.take() {
-            self.mouse_move_internal(pos);
-        }
-        if let Some(button) = self.current_action.button.take() {
-            self.send_button_internal(button.button, button.down);
-        }
-        if let Some(scroll) = self.current_action.scroll.take() {
-            self.wheel_internal(scroll);
-        }
-    }
-}
-
-impl HidProvider for DummyProvider {
-    fn mouse_move(&mut self, _pos: Vec2) {}
-    fn send_button(&mut self, _button: u16, _down: bool) {}
-    fn wheel(&mut self, _delta: WheelDelta) {}
-    fn set_modifiers(&mut self, _modifiers: u8) {}
-    fn send_key(&self, _key: VirtualKey, _down: bool) {}
-    fn set_desktop_extent(&mut self, _extent: Vec2) {}
-    fn set_desktop_origin(&mut self, _origin: Vec2) {}
-    fn commit(&mut self) {}
-}
-
 #[inline]
 fn get_time() -> timeval {
     let mut time = timeval {
@@ -333,12 +71,13 @@ pub const CTRL: KeyModifier = 0x04;
 pub const ALT: KeyModifier = 0x08;
 pub const NUM_LOCK: KeyModifier = 0x10;
 pub const SUPER: KeyModifier = 0x40;
-pub const META: KeyModifier = 0x80;
+pub const ALTGR: KeyModifier = 0x80;
 
 #[allow(non_camel_case_types)]
 #[repr(u16)]
-#[derive(Debug, Deserialize, PartialEq, Eq, Clone, Copy, IntegerId, EnumString, EnumIter)]
-#[derive(Hash)]
+#[derive(
+    Debug, Deserialize, PartialEq, Eq, Clone, Copy, IntegerId, EnumString, EnumIter, FromRepr,
+)]
 pub enum VirtualKey {
     Escape = 9,
     N1, // number row
@@ -436,7 +175,8 @@ pub enum VirtualKey {
     RCtrl,
     KP_Divide,
     Print,
-    Meta, // Right Alt aka AltGr
+    #[strum(serialize = "AltGr", serialize = "Meta")]
+    AltGr,
     Home = 110,
     Up,
     Prior,
@@ -505,7 +245,7 @@ pub static KEYS_TO_MODS: LazyLock<IdMap<VirtualKey, KeyModifier>> = LazyLock::ne
         VirtualKey::NumLock => NUM_LOCK,
         VirtualKey::LSuper => SUPER,
         VirtualKey::RSuper => SUPER,
-        VirtualKey::Meta => META,
+        VirtualKey::AltGr => ALTGR,
     }
 });
 
@@ -517,7 +257,7 @@ pub static MODS_TO_KEYS: LazyLock<IdMap<KeyModifier, Vec<VirtualKey>>> = LazyLoc
         ALT => vec![VirtualKey::LAlt],
         NUM_LOCK => vec![VirtualKey::NumLock],
         SUPER => vec![VirtualKey::LSuper, VirtualKey::RSuper],
-        META => vec![VirtualKey::Meta],
+        ALTGR => vec![VirtualKey::AltGr],
     }
 });
 
@@ -616,7 +356,7 @@ impl XkbKeymap {
         let state0 = xkb::State::new(&self.inner);
         let mut state1 = xkb::State::new(&self.inner);
         state1.update_key(
-            xkb::Keycode::from(VirtualKey::Meta as u32),
+            xkb::Keycode::from(VirtualKey::AltGr as u32),
             xkb::KeyDirection::Down,
         );
 
diff --git a/wayvr/src/subsystem/hid/provider/dummy.rs b/wayvr/src/subsystem/hid/provider/dummy.rs
new file mode 100644
index 00000000..9c0fbc3c
--- /dev/null
+++ b/wayvr/src/subsystem/hid/provider/dummy.rs
@@ -0,0 +1,25 @@
+use crate::overlays::toast::Toast;
+use crate::subsystem::hid::provider::HidProvider;
+use crate::subsystem::hid::{VirtualKey, WheelDelta, XkbKeymap};
+use glam::DVec2;
+
+pub struct DummyProvider;
+
+impl HidProvider for DummyProvider {
+    fn mouse_move(&mut self, _pos: DVec2) {}
+    fn mouse_move_rel(&mut self, _pos: DVec2) {}
+    fn send_button(&mut self, _button: u16, _down: bool) {}
+    fn wheel(&mut self, _delta: WheelDelta) {}
+    fn set_desktop_extent(&mut self, _extent: DVec2) {}
+    fn set_desktop_origin(&mut self, _origin: DVec2) {}
+    fn set_modifiers(&mut self, _modifiers: u8) {}
+    fn send_key(&mut self, _key: VirtualKey, _down: bool) {}
+
+    fn set_keymap(&mut self, _keymap: &XkbKeymap) {}
+
+    fn commit(&mut self) {}
+}
+
+pub fn initialize_dummy() -> anyhow::Result<Box<dyn HidProvider>, Toast> {
+    Ok(Box::new(DummyProvider {}))
+}
diff --git a/wayvr/src/subsystem/hid/provider/mod.rs b/wayvr/src/subsystem/hid/provider/mod.rs
new file mode 100644
index 00000000..1905fe0d
--- /dev/null
+++ b/wayvr/src/subsystem/hid/provider/mod.rs
@@ -0,0 +1,24 @@
+use crate::subsystem::hid::{VirtualKey, WheelDelta, XkbKeymap};
+use glam::DVec2;
+
+pub mod dummy;
+pub mod uinput;
+pub mod wl_virtual;
+
+pub trait HidProvider: Sync + Send {
+    // Pointer Functions
+    fn mouse_move(&mut self, pos: DVec2);
+    fn mouse_move_rel(&mut self, rel_pos: DVec2);
+    fn send_button(&mut self, button: u16, down: bool);
+    fn wheel(&mut self, delta: WheelDelta);
+    fn set_desktop_extent(&mut self, extent: DVec2);
+    fn set_desktop_origin(&mut self, origin: DVec2);
+
+    // Keyboard Functions
+    fn set_modifiers(&mut self, mods: u8);
+    fn send_key(&mut self, key: VirtualKey, down: bool);
+    fn set_keymap(&mut self, keymap: &XkbKeymap);
+
+    // Common Functions
+    fn commit(&mut self);
+}
diff --git a/wayvr/src/subsystem/hid/provider/uinput.rs b/wayvr/src/subsystem/hid/provider/uinput.rs
new file mode 100644
index 00000000..0b4de4bb
--- /dev/null
+++ b/wayvr/src/subsystem/hid/provider/uinput.rs
@@ -0,0 +1,279 @@
+use crate::overlays::toast::Toast;
+use crate::subsystem::hid::provider::HidProvider;
+use crate::subsystem::hid::{
+    EV_ABS, EV_KEY, EV_REL, EV_SYN, MODS_TO_KEYS, MOUSE_EXTENT, MOUSE_LEFT, MOUSE_MIDDLE,
+    MouseAction, MouseButtonAction, VirtualKey, WheelDelta, XkbKeymap, get_time, new_event,
+};
+use glam::DVec2;
+use input_linux::{
+    AbsoluteAxis, AbsoluteInfo, AbsoluteInfoSetup, EventKind, InputId, Key, RelativeAxis,
+    UInputHandle,
+};
+use std::fs::File;
+use std::mem::transmute;
+use std::sync::atomic::AtomicBool;
+use strum::IntoEnumIterator;
+use wlx_common::overlays::ToastTopic;
+
+pub struct UInputProvider {
+    keyboard_handle: UInputHandle<File>,
+    mouse_handle: UInputHandle<File>,
+    desktop_extent: DVec2,
+    desktop_origin: DVec2,
+    cur_modifiers: u8,
+    current_action: MouseAction,
+}
+
+impl UInputProvider {
+    pub fn try_new() -> Option<Self> {
+        let keyboard_file = File::create("/dev/uinput").ok()?;
+        let keyboard_handle = UInputHandle::new(keyboard_file);
+
+        let mouse_file = File::create("/dev/uinput").ok()?;
+        let mouse_handle = UInputHandle::new(mouse_file);
+
+        let kbd_id = InputId {
+            bustype: 0x03,
+            vendor: 0x4711,
+            product: 0x0829,
+            version: 5,
+        };
+        let mouse_id = InputId {
+            bustype: 0x03,
+            vendor: 0x4711,
+            product: 0x0830,
+            version: 5,
+        };
+        let kbd_name = b"WayVR Keyboard\0";
+        let mouse_name = b"WayVR Mouse\0";
+
+        let abs_info = vec![
+            AbsoluteInfoSetup {
+                axis: input_linux::AbsoluteAxis::X,
+                info: AbsoluteInfo {
+                    value: 0,
+                    minimum: 0,
+                    maximum: MOUSE_EXTENT as _,
+                    fuzz: 0,
+                    flat: 0,
+                    resolution: 10,
+                },
+            },
+            AbsoluteInfoSetup {
+                axis: input_linux::AbsoluteAxis::Y,
+                info: AbsoluteInfo {
+                    value: 0,
+                    minimum: 0,
+                    maximum: MOUSE_EXTENT as _,
+                    fuzz: 0,
+                    flat: 0,
+                    resolution: 10,
+                },
+            },
+        ];
+
+        keyboard_handle.set_evbit(EventKind::Key).ok()?;
+        for key in VirtualKey::iter() {
+            let mapped_key: Key = unsafe { std::mem::transmute((key as u16) - 8) };
+            keyboard_handle.set_keybit(mapped_key).ok()?;
+        }
+
+        keyboard_handle.create(&kbd_id, kbd_name, 0, &[]).ok()?;
+
+        mouse_handle.set_evbit(EventKind::Absolute).ok()?;
+        mouse_handle.set_evbit(EventKind::Relative).ok()?;
+        mouse_handle.set_absbit(AbsoluteAxis::X).ok()?;
+        mouse_handle.set_absbit(AbsoluteAxis::Y).ok()?;
+        mouse_handle.set_relbit(RelativeAxis::WheelHiRes).ok()?;
+        mouse_handle
+            .set_relbit(RelativeAxis::HorizontalWheelHiRes)
+            .ok()?;
+        mouse_handle.set_evbit(EventKind::Key).ok()?;
+
+        for btn in MOUSE_LEFT..=MOUSE_MIDDLE {
+            let mouse_btn: Key = unsafe { transmute(btn) };
+            mouse_handle.set_keybit(mouse_btn).ok()?;
+        }
+        mouse_handle
+            .create(&mouse_id, mouse_name, 0, &abs_info)
+            .ok()?;
+
+        Some(Self {
+            keyboard_handle,
+            mouse_handle,
+            desktop_extent: DVec2::ZERO,
+            desktop_origin: DVec2::ZERO,
+            current_action: MouseAction::default(),
+            cur_modifiers: 0,
+        })
+    }
+    fn send_button_internal(&self, button: u16, down: bool) {
+        let time = get_time();
+        let events = [
+            new_event(time, EV_KEY, button, down.into()),
+            new_event(time, EV_SYN, 0, 0),
+        ];
+        if let Err(res) = self.mouse_handle.write(&events) {
+            log::error!("send_button: {res}");
+        }
+    }
+    fn mouse_move_internal(&mut self, pos: DVec2) {
+        #[cfg(debug_assertions)]
+        log::trace!("Mouse move: {pos:?}");
+
+        let pos = (pos - self.desktop_origin) * (MOUSE_EXTENT / self.desktop_extent);
+
+        let time = get_time();
+        let events = [
+            new_event(time, EV_ABS, AbsoluteAxis::X as _, pos.x as i32),
+            new_event(time, EV_ABS, AbsoluteAxis::Y as _, pos.y as i32),
+            new_event(time, EV_SYN, 0, 0),
+        ];
+        if let Err(res) = self.mouse_handle.write(&events) {
+            log::error!("{res}");
+        }
+    }
+
+    fn wheel_internal(&self, delta: WheelDelta) {
+        let time = get_time();
+        let events = [
+            new_event(time, EV_REL, RelativeAxis::WheelHiRes as _, delta.y as _),
+            new_event(
+                time,
+                EV_REL,
+                RelativeAxis::HorizontalWheelHiRes as _,
+                delta.x as _,
+            ),
+            new_event(time, EV_SYN, 0, 0),
+        ];
+        if let Err(res) = self.mouse_handle.write(&events) {
+            log::error!("wheel: {res}");
+        }
+    }
+}
+
+impl HidProvider for UInputProvider {
+    fn mouse_move(&mut self, pos: DVec2) {
+        if self.current_action.pos.is_none() && self.current_action.scroll.is_none() {
+            self.current_action.pos = Some(pos);
+        }
+        self.current_action.last_requested_pos = Some(pos);
+    }
+    fn mouse_move_rel(&mut self, rel_pos: DVec2) {
+        let last_pos = self.current_action.last_requested_pos.unwrap_or_default();
+        let new_pos = (last_pos + rel_pos).clamp(
+            self.desktop_origin,
+            self.desktop_origin + self.desktop_extent,
+        );
+
+        self.current_action.pos = Some(new_pos);
+        self.current_action.last_requested_pos = Some(new_pos);
+    }
+    fn send_button(&mut self, button: u16, down: bool) {
+        if self.current_action.button.is_none() {
+            self.current_action.button = Some(MouseButtonAction { button, down });
+            self.current_action.pos = self.current_action.last_requested_pos;
+        }
+    }
+    fn wheel(&mut self, delta: WheelDelta) {
+        if self.current_action.scroll.is_none() {
+            self.current_action.scroll = Some(delta);
+            // Pass mouse motion events only if not scrolling
+            // (allows scrolling on all Chromium-based applications)
+            self.current_action.pos = None;
+        }
+    }
+    fn set_desktop_extent(&mut self, extent: DVec2) {
+        self.desktop_extent = extent;
+    }
+    fn set_desktop_origin(&mut self, origin: DVec2) {
+        self.desktop_origin = origin;
+    }
+    fn set_modifiers(&mut self, modifiers: u8) {
+        let changed = self.cur_modifiers ^ modifiers;
+        for i in 0..8 {
+            let m = 1 << i;
+            if changed & m != 0
+                && let Some(vk) = MODS_TO_KEYS.get(m).into_iter().flatten().next()
+            {
+                self.send_key(*vk, modifiers & m != 0);
+            }
+        }
+        self.cur_modifiers = modifiers;
+    }
+
+    fn send_key(&mut self, key: VirtualKey, down: bool) {
+        #[cfg(debug_assertions)]
+        log::trace!("send_key: {key:?} {down}");
+
+        let time = get_time();
+        let events = [
+            new_event(time, EV_KEY, (key as u16) - 8, down.into()),
+            new_event(time, EV_SYN, 0, 0),
+        ];
+        if let Err(res) = self.keyboard_handle.write(&events) {
+            log::error!("send_key: {res}");
+        }
+    }
+
+    fn set_keymap(&mut self, _keymap: &XkbKeymap) {}
+
+    fn commit(&mut self) {
+        if let Some(pos) = self.current_action.pos.take() {
+            self.mouse_move_internal(pos);
+        }
+        if let Some(button) = self.current_action.button.take() {
+            self.send_button_internal(button.button, button.down);
+        }
+        if let Some(scroll) = self.current_action.scroll.take() {
+            self.wheel_internal(scroll);
+        }
+    }
+}
+
+pub static USE_UINPUT: AtomicBool = AtomicBool::new(true);
+
+pub fn initialize_uinput() -> Result<Box<dyn HidProvider>, Toast> {
+    const CHECK_UINPUT_MESSAGE: &str =
+        "Could not create uinput provider. Keyboard/Mouse input will not work!
+
+Check if the uinput kernel module is loaded: lsmod | grep uinput
+ - If not loaded, follow your distro's instructions to load the uinput kernel module.
+
+Check if you're in input group, run: id -nG";
+
+    if !USE_UINPUT.load(std::sync::atomic::Ordering::Relaxed) {
+        const UINPUT_DISABLED: &str = "Uinput disabled by user.";
+        log::info!("{UINPUT_DISABLED}");
+        return Err(Toast::new(
+            ToastTopic::System,
+            String::with_capacity(0),
+            String::from(UINPUT_DISABLED),
+        )
+        .with_timeout(5.0));
+    }
+
+    if let Some(uinput) = UInputProvider::try_new() {
+        log::info!("Initialized uinput.");
+        return Ok(Box::new(uinput));
+    }
+    let mut full_uinput_error = String::from(CHECK_UINPUT_MESSAGE);
+    if let Ok(user) = std::env::var("USER") {
+        let check_group_message = format!(
+            " - To add yourself to the input group, run: sudo usermod -aG input {user}
+ - After adding yourself to the input group, you will need to reboot."
+        );
+        full_uinput_error.push_str(&check_group_message);
+    }
+    for error_line in full_uinput_error.lines() {
+        if !error_line.is_empty() {
+            log::error!("{error_line}");
+        }
+    }
+    Err(Toast::new(
+        ToastTopic::Error,
+        String::with_capacity(0),
+        full_uinput_error,
+    )
+    .with_timeout(30.0))
+}
diff --git a/wayvr/src/subsystem/hid/provider/wl_virtual.rs b/wayvr/src/subsystem/hid/provider/wl_virtual.rs
new file mode 100644
index 00000000..e9a8aa9d
--- /dev/null
+++ b/wayvr/src/subsystem/hid/provider/wl_virtual.rs
@@ -0,0 +1,302 @@
+use std::io::Write;
+use std::os::fd::AsFd;
+use std::time::{SystemTime, UNIX_EPOCH};
+use anyhow::Context as _;
+use glam::{Vec2, DVec2};
+use input_linux::sys::{*};
+use smithay::reexports::rustix::fs::{memfd_create, MemfdFlags};
+use smithay::reexports::wayland_protocols_wlr::virtual_pointer::v1::client::zwlr_virtual_pointer_manager_v1::ZwlrVirtualPointerManagerV1;
+use smithay::reexports::wayland_protocols_wlr::virtual_pointer::v1::client::zwlr_virtual_pointer_v1::ZwlrVirtualPointerV1;
+use smithay::reexports::wayland_server::protocol::wl_keyboard::KeymapFormat;
+use wayland_client::{delegate_noop, Dispatch, Proxy, QueueHandle};
+use wayland_client::globals::{registry_queue_init, GlobalListContents};
+use wayland_client::protocol::wl_pointer::{Axis, AxisSource, ButtonState};
+use wayland_client::protocol::wl_registry::WlRegistry;
+use wayland_client::protocol::wl_seat::{WlSeat};
+use wayland_protocols_misc::zwp_virtual_keyboard_v1::client::zwp_virtual_keyboard_manager_v1::ZwpVirtualKeyboardManagerV1;
+use wayland_protocols_misc::zwp_virtual_keyboard_v1::client::zwp_virtual_keyboard_v1::ZwpVirtualKeyboardV1;
+use xkbcommon::xkb::{KEYMAP_FORMAT_TEXT_V1};
+use wlx_common::overlays::ToastTopic;
+use crate::overlays::toast::Toast;
+use crate::subsystem::hid::provider::HidProvider;
+use crate::subsystem::hid::{VirtualKey, WheelDelta, *};
+
+const LOCKED: u8 = CAPS_LOCK | NUM_LOCK;
+
+pub struct WlVirtualProvider {
+    _connection: wayland_client::Connection,
+    queue: wayland_client::EventQueue<KbState>,
+    state: KbState,
+
+    virtual_pointer: ZwlrVirtualPointerV1,
+    desktop_extent: DVec2,
+    desktop_origin: DVec2,
+    keymap_file: Option<std::fs::File>,
+
+    virtual_keyboard: ZwpVirtualKeyboardV1,
+    keyboard_mods_state: u8,
+
+    last_pointer_position: DVec2,
+    wheel_accum: Vec2,
+}
+
+struct KbState;
+
+impl HidProvider for WlVirtualProvider {
+    fn mouse_move(&mut self, pos: DVec2) {
+        #[cfg(debug_assertions)]
+        log::trace!("Pointer move: {pos:?}");
+
+        self.virtual_pointer.motion_absolute(
+            Self::now_ms(),
+            (pos.x - self.desktop_origin.x) as u32,
+            (pos.y - self.desktop_origin.y) as u32,
+            self.desktop_extent.x as u32,
+            self.desktop_extent.y as u32,
+        );
+        self.virtual_pointer.motion(Self::now_ms(), 0.0, 0.0);
+        self.virtual_pointer.frame();
+        self.last_pointer_position = pos;
+    }
+
+    fn mouse_move_rel(&mut self, rel_pos: DVec2) {
+        let pos = (self.last_pointer_position + rel_pos).clamp(
+            self.desktop_origin,
+            self.desktop_origin + self.desktop_extent,
+        );
+        self.mouse_move(pos);
+    }
+
+    fn send_button(&mut self, button: u16, down: bool) {
+        #[cfg(debug_assertions)]
+        log::trace!("Pointer button: {button}, down: {down}");
+
+        self.virtual_pointer.button(
+            Self::now_ms(),
+            match button {
+                i if i == MOUSE_LEFT => BTN_LEFT as u32,
+                i if i == MOUSE_RIGHT => BTN_RIGHT as u32,
+                i if i == MOUSE_MIDDLE => BTN_MIDDLE as u32,
+                _ => panic!("Invalid mouse button: {button}"),
+            },
+            match down {
+                true => ButtonState::Pressed,
+                false => ButtonState::Released,
+            },
+        );
+        self.virtual_pointer.frame();
+    }
+
+    fn wheel(&mut self, mut delta: WheelDelta) {
+        #[cfg(debug_assertions)]
+        log::trace!("Scroll Axis: {delta:?}");
+
+        // no clue; a value of 10 seems to equal a v120 value of 120
+        delta.x /= 12.0;
+        delta.y /= 12.0;
+
+        self.virtual_pointer.axis_source(AxisSource::Wheel);
+
+        if delta.y != 0.0 {
+            self.virtual_pointer.axis_discrete(
+                Self::now_ms(),
+                Axis::VerticalScroll,
+                -delta.y as _,
+                accumulate_discrete_scroll(&mut self.wheel_accum.y, -delta.y),
+            );
+        }
+        if delta.x != 0.0 {
+            self.virtual_pointer.axis_discrete(
+                Self::now_ms(),
+                Axis::HorizontalScroll,
+                delta.x as _,
+                accumulate_discrete_scroll(&mut self.wheel_accum.x, delta.x),
+            );
+        }
+
+        self.virtual_pointer.motion(Self::now_ms(), 0.0, 0.0);
+        self.virtual_pointer.frame();
+    }
+
+    fn set_desktop_extent(&mut self, extent: DVec2) {
+        self.desktop_extent = extent;
+    }
+
+    fn set_desktop_origin(&mut self, origin: DVec2) {
+        self.desktop_origin = origin;
+    }
+
+    fn set_modifiers(&mut self, mods: u8) {
+        let changed = (self.keyboard_mods_state ^ mods) & !LOCKED;
+        for bit in [SHIFT, CTRL, ALT, SUPER] {
+            if changed & bit != 0 {
+                let down = mods & bit != 0;
+                if let Some(kc) = MODS_TO_KEYS.get(bit) {
+                    self.virtual_keyboard
+                        .key(Self::now_ms(), kc[0] as u32 - 8, down as u32);
+                }
+            }
+        }
+
+        let depressed = (mods & !LOCKED) as u32;
+        let locked = (mods & LOCKED) as u32;
+        self.virtual_keyboard.modifiers(depressed, 0, locked, 0);
+
+        self.keyboard_mods_state = mods;
+        self._connection.flush().unwrap();
+    }
+
+    fn send_key(&mut self, key: VirtualKey, down: bool) {
+        #[cfg(debug_assertions)]
+        log::trace!("Keyboard key: {key:?} ({}), down: {down}", key as u16);
+
+        self.virtual_keyboard.key(
+            Self::now_ms(),
+            key as u32 - 8,
+            match down {
+                true => 1,
+                false => 0,
+            },
+        );
+
+        // sending a mod key → also have to update mod state
+        if let Some(m) = KEYS_TO_MODS.get(key) {
+            match (down, m & LOCKED != 0) {
+                (true, true) => self.keyboard_mods_state ^= m,
+                (true, false) => self.keyboard_mods_state |= m,
+                (false, false) => self.keyboard_mods_state &= !m,
+                (false, true) => {}
+            }
+
+            let depressed = (self.keyboard_mods_state & !LOCKED) as u32;
+            let locked = (self.keyboard_mods_state & LOCKED) as u32;
+            self.virtual_keyboard.modifiers(depressed, 0, locked, 0);
+        }
+
+        self._connection.flush().unwrap();
+    }
+
+    fn set_keymap(&mut self, keymap: &XkbKeymap) {
+        #[cfg(debug_assertions)]
+        log::trace!(
+            "Keyboard keymap: {:?}",
+            keymap.inner.layouts().next().unwrap_or("Unknown")
+        );
+
+        let mut bytes = keymap
+            .inner
+            .get_as_string(KEYMAP_FORMAT_TEXT_V1)
+            .into_bytes();
+        bytes.push(0);
+        let fd = memfd_create("virtual-keyboard-keymap", MemfdFlags::CLOEXEC)
+            .expect("Failed to create memfd");
+
+        let mut file = std::fs::File::from(fd);
+        file.write_all(&bytes).expect("failed to write the keymap");
+
+        self.virtual_keyboard
+            .keymap(KeymapFormat::XkbV1 as u32, file.as_fd(), bytes.len() as u32);
+        self.queue.roundtrip(&mut self.state).unwrap();
+        self.keymap_file.replace(file);
+    }
+
+    fn commit(&mut self) {
+        self.queue.roundtrip(&mut self.state).unwrap();
+    }
+}
+
+impl WlVirtualProvider {
+    pub fn try_new() -> anyhow::Result<Self> {
+        let state = KbState;
+
+        let connection = wayland_client::Connection::connect_to_env()?;
+        let (globals, queue) = registry_queue_init::<KbState>(&connection)?;
+        let qh = queue.handle();
+        let seat: WlSeat = globals
+            .bind(&qh, 4..=9, ())
+            .context("compositor doesn't expose a compatible wl_seat (version 4..=9)")?;
+
+        let pointer_manager: ZwlrVirtualPointerManagerV1 = globals
+            .bind(&qh, 1..=1, ())
+            .context("compositor doesn't support zwlr_virtual_pointer_v1")?;
+
+        let virtual_pointer = pointer_manager.create_virtual_pointer(Some(&seat), &qh, ());
+
+        let keyboard_manager: ZwpVirtualKeyboardManagerV1 = globals
+            .bind(&qh, 1..=1, ())
+            .context("compositor doesn't support zwp_virtual_keyboard_v1")?;
+
+        let virtual_keyboard = keyboard_manager.create_virtual_keyboard(&seat, &qh, ());
+
+        let keymap =
+            get_keymap_wl().unwrap_or_else(|_| XkbKeymap::from_layout_variant("us", "").unwrap());
+
+        let mut result = Self {
+            keymap_file: None,
+            _connection: connection,
+            queue,
+            state,
+            virtual_pointer,
+            virtual_keyboard,
+            desktop_extent: DVec2::ZERO,
+            desktop_origin: DVec2::ZERO,
+            keyboard_mods_state: 0,
+            last_pointer_position: DVec2::ZERO,
+            wheel_accum: Vec2::ZERO,
+        };
+
+        result.set_keymap(&keymap);
+
+        Ok(result)
+    }
+
+    fn now_ms() -> u32 {
+        SystemTime::now()
+            .duration_since(UNIX_EPOCH)
+            .unwrap()
+            .as_millis() as u32
+    }
+}
+
+impl Dispatch<WlRegistry, GlobalListContents> for KbState {
+    fn event(
+        _state: &mut Self,
+        _proxy: &WlRegistry,
+        _event: <WlRegistry as Proxy>::Event,
+        _data: &GlobalListContents,
+        _conn: &wayland_client::Connection,
+        _qhandle: &QueueHandle<Self>,
+    ) {
+    }
+}
+
+delegate_noop!(KbState: ignore WlSeat);
+delegate_noop!(KbState: ignore ZwlrVirtualPointerV1);
+delegate_noop!(KbState: ignore ZwlrVirtualPointerManagerV1);
+delegate_noop!(KbState: ignore ZwpVirtualKeyboardV1);
+delegate_noop!(KbState: ignore ZwpVirtualKeyboardManagerV1);
+
+pub fn initialize_wl_virtual() -> anyhow::Result<Box<dyn HidProvider>, Toast> {
+    let provider = WlVirtualProvider::try_new().map_err(|e| {
+        Toast::new(
+            ToastTopic::System,
+            String::with_capacity(0),
+            format!("Could not initialize wl_virtual: {e}"),
+        )
+    })?;
+    Ok(Box::new(provider))
+}
+
+fn accumulate_discrete_scroll(acc: &mut f32, delta: f32) -> i32 {
+    const WHEEL_DETENT: f32 = 10.0;
+    *acc += delta;
+    let steps = (*acc / WHEEL_DETENT).trunc() as i32;
+    if steps != 0 {
+        *acc -= steps as f32 * WHEEL_DETENT;
+        if acc.abs() < 0.001 {
+            *acc = 0.0;
+        }
+    }
+
+    steps
+}
diff --git a/wayvr/src/subsystem/hid/wayland.rs b/wayvr/src/subsystem/hid/wayland.rs
index 13ef1893..a8293ab2 100644
--- a/wayvr/src/subsystem/hid/wayland.rs
+++ b/wayvr/src/subsystem/hid/wayland.rs
@@ -1,5 +1,5 @@
 use anyhow::Context;
-use wlx_capture::wayland::wayland_client::{
+use wayland_client::{
     Connection, Dispatch, Proxy, QueueHandle,
     globals::{GlobalListContents, registry_queue_init},
     protocol::{
diff --git a/wayvr/src/subsystem/input.rs b/wayvr/src/subsystem/input.rs
index c51f4876..dbacc8e6 100644
--- a/wayvr/src/subsystem/input.rs
+++ b/wayvr/src/subsystem/input.rs
@@ -1,37 +1,76 @@
-use super::hid::{self, HidProvider, VirtualKey};
+use wlx_common::config::InputEmulationMethod;
 
-use crate::{backend::wayvr::WvrServerState, subsystem::hid::XkbKeymap};
+use super::hid::{self, VirtualKey};
+
+use crate::subsystem::hid::provider::HidProvider;
+use crate::subsystem::hid::provider::dummy::DummyProvider;
+use crate::{backend::wayvr::WvrServerState, overlays::toast::Toast, subsystem::hid::XkbKeymap};
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
-pub enum KeyboardFocus {
+pub enum InputFocus {
     PhysicalScreen,
     WayVR, // (wayland window id data is handled internally),
 }
 
 pub struct HidWrapper {
-    pub keyboard_focus: KeyboardFocus,
+    input_focus: InputFocus,
     pub inner: Box<dyn HidProvider>,
     pub keymap: Option<XkbKeymap>,
 }
 
 impl HidWrapper {
-    pub fn new() -> Self {
-        Self {
-            keyboard_focus: KeyboardFocus::PhysicalScreen,
-            inner: hid::initialize(),
-            keymap: None,
+    pub fn new(method: InputEmulationMethod) -> (Self, Option<Toast>) {
+        let maybe_provider = match method {
+            InputEmulationMethod::Uinput => hid::provider::uinput::initialize_uinput(),
+            InputEmulationMethod::WlVirtual => hid::provider::wl_virtual::initialize_wl_virtual(),
+            InputEmulationMethod::None => hid::provider::dummy::initialize_dummy(),
+        };
+
+        let (provider, toast) = maybe_provider
+            .map(|provider| (provider, None))
+            .unwrap_or_else(|toast| (Box::new(DummyProvider {}), Some(toast)));
+
+        (
+            Self {
+                input_focus: InputFocus::PhysicalScreen,
+                inner: provider,
+                keymap: None,
+            },
+            toast,
+        )
+    }
+
+    pub fn set_input_focus(
+        &mut self,
+        wvr_server: Option<&mut WvrServerState>,
+        value: InputFocus,
+    ) -> bool {
+        if self.input_focus != value {
+            self.input_focus = value;
+
+            if let Some(wvr_server) = wvr_server {
+                wvr_server.set_input_focus(matches!(value, InputFocus::WayVR));
+            }
+
+            true
+        } else {
+            false
         }
     }
 
+    pub fn get_input_focus(&self) -> InputFocus {
+        self.input_focus
+    }
+
     pub fn send_key_routed(
-        &self,
+        &mut self,
         wvr_server: Option<&mut WvrServerState>,
         key: VirtualKey,
         down: bool,
     ) {
-        match self.keyboard_focus {
-            KeyboardFocus::PhysicalScreen => self.inner.send_key(key, down),
-            KeyboardFocus::WayVR => {
+        match self.input_focus {
+            InputFocus::PhysicalScreen => self.inner.send_key(key, down),
+            InputFocus::WayVR => {
                 if let Some(wvr_server) = wvr_server {
                     wvr_server.send_key(key as u32, down);
                 }
@@ -46,6 +85,7 @@ impl HidWrapper {
                 .inspect_err(|e| log::error!("Could not set WayVR keymap: {e:?}"));
         } else {
             self.keymap = Some(keymap.clone());
+            self.inner.set_keymap(&keymap);
         }
 
         log::info!(
@@ -55,9 +95,9 @@ impl HidWrapper {
     }
 
     pub fn set_modifiers_routed(&mut self, wvr_server: Option<&mut WvrServerState>, mods: u8) {
-        match self.keyboard_focus {
-            KeyboardFocus::PhysicalScreen => self.inner.set_modifiers(mods),
-            KeyboardFocus::WayVR => {
+        match self.input_focus {
+            InputFocus::PhysicalScreen => self.inner.set_modifiers(mods),
+            InputFocus::WayVR => {
                 if let Some(wvr_server) = wvr_server {
                     wvr_server.set_modifiers(mods);
                 }
diff --git a/wayvr/src/subsystem/mod.rs b/wayvr/src/subsystem/mod.rs
index 04d997b9..5909c060 100644
--- a/wayvr/src/subsystem/mod.rs
+++ b/wayvr/src/subsystem/mod.rs
@@ -3,6 +3,12 @@ pub mod hid;
 pub mod input;
 pub mod notifications;
 
+#[cfg(feature = "whisper")]
+pub mod clipboard;
+
+#[cfg(feature = "whisper")]
+pub mod whisper_stt;
+
 #[cfg(feature = "osc")]
 pub mod osc;
 
diff --git a/wayvr/src/subsystem/monado_metrics/metrics_fd.rs b/wayvr/src/subsystem/monado_metrics/metrics_fd.rs
index 983a39c9..4e349ca1 100644
--- a/wayvr/src/subsystem/monado_metrics/metrics_fd.rs
+++ b/wayvr/src/subsystem/monado_metrics/metrics_fd.rs
@@ -8,6 +8,7 @@ use crate::subsystem::monado_metrics::proto;
 
 pub struct MonadoMetricsFd {
     stream_reader: UnixStream,
+    #[allow(dead_code)]
     stream_writer: UnixStream,
 
     records: VecDeque<proto::Record>,
diff --git a/wayvr/src/subsystem/notifications.rs b/wayvr/src/subsystem/notifications.rs
index 149444fe..4bdd61d1 100644
--- a/wayvr/src/subsystem/notifications.rs
+++ b/wayvr/src/subsystem/notifications.rs
@@ -11,7 +11,7 @@ use std::{
 };
 use wlx_common::overlays::ToastTopic;
 
-use crate::{overlays::toast::Toast, state::AppState, subsystem::dbus::DbusConnector};
+use crate::{overlays::toast::Toast, state::AppSession, subsystem::dbus::DbusConnector};
 
 pub struct NotificationManager {
     rx_toast: mpsc::Receiver<Toast>,
@@ -29,14 +29,14 @@ impl NotificationManager {
         }
     }
 
-    pub fn submit_pending(&self, app: &mut AppState) {
-        if app.session.config.notifications_enabled {
-            self.rx_toast.try_iter().for_each(|toast| {
-                toast.submit(app);
-            });
+    pub fn drain_pending(&self, session: &AppSession) -> Vec<Toast> {
+        if session.config.notifications_enabled {
+            self.rx_toast.try_iter().collect()
         } else {
             // consume without submitting
-            self.rx_toast.try_iter().last();
+            for _ in self.rx_toast.try_iter() {}
+
+            Vec::new()
         }
     }
 
diff --git a/wayvr/src/subsystem/whisper_stt.rs b/wayvr/src/subsystem/whisper_stt.rs
new file mode 100644
index 00000000..654de566
--- /dev/null
+++ b/wayvr/src/subsystem/whisper_stt.rs
@@ -0,0 +1,603 @@
+use std::{
+    fmt,
+    path::{Path, PathBuf},
+    sync::{Arc, mpsc},
+    thread::{self, JoinHandle},
+    time::{Duration, Instant},
+};
+
+use whisper_rs::{FullParams, SamplingStrategy, WhisperContext, WhisperContextParameters};
+use wlx_common::audio::rodio::{
+    Source,
+    microphone::{MicrophoneBuilder, available_inputs},
+};
+
+const WHISPER_SAMPLE_RATE: usize = 16_000;
+const MAX_DURATION: Duration = Duration::from_secs(30);
+const UNLOAD_AFTER: Duration = Duration::from_mins(5);
+
+#[derive(Clone, Debug)]
+pub struct WhisperSttConfig {
+    pub model_path: PathBuf,
+    pub language: Option<String>,
+
+    pub initial_prompt: Option<String>,
+    pub n_threads: i32,
+
+    /// lower values reduce release-time lag but cost more CPU/GPU
+    pub partial_decode_interval_ms: u64,
+
+    /// ignore extremely short accidental taps
+    pub min_audio_ms: u64,
+
+    /// force a specific recording device; see `rodio::microphone::available_inputs()`
+    pub rodio_input_device_name: Option<String>,
+
+    pub use_gpu: bool,
+    pub gpu_device: i32,
+    pub flash_attn: bool,
+}
+
+impl WhisperSttConfig {
+    pub fn new(model_path: impl AsRef<Path>) -> Self {
+        let n_threads = std::thread::available_parallelism()
+            .map(|n| n.get().min(4) as i32)
+            .unwrap_or(4);
+
+        Self {
+            model_path: model_path.as_ref().to_path_buf(),
+            language: None,
+            initial_prompt: None,
+            n_threads,
+            partial_decode_interval_ms: 700,
+            min_audio_ms: 250,
+            rodio_input_device_name: None,
+            use_gpu: true,
+            gpu_device: 0,
+            flash_attn: false,
+        }
+    }
+}
+
+#[derive(Debug)]
+pub enum WhisperSttError {
+    ModelLoad(String),
+    Whisper(String),
+    Rodio(String),
+    CaptureInit(String),
+    ThreadSpawn(String),
+    CaptureThreadPanicked,
+    AlreadyRecording,
+    NotRecording,
+}
+
+impl fmt::Display for WhisperSttError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Self::ModelLoad(e) => write!(f, "failed to load whisper model: {e}"),
+            Self::Whisper(e) => write!(f, "whisper error: {e}"),
+            Self::Rodio(e) => write!(f, "rodio error: {e}"),
+            Self::CaptureInit(e) => write!(f, "failed to initialize capture: {e}"),
+            Self::ThreadSpawn(e) => write!(f, "failed to spawn thread: {e}"),
+            Self::CaptureThreadPanicked => write!(f, "capture thread panicked"),
+            Self::AlreadyRecording => write!(f, "PTT is already active"),
+            Self::NotRecording => write!(f, "PTT is not active"),
+        }
+    }
+}
+
+impl std::error::Error for WhisperSttError {}
+
+struct StopCapture;
+
+struct CaptureSession {
+    stop_tx: mpsc::Sender<StopCapture>,
+    capture_thread: Option<JoinHandle<()>>,
+    recognizer_thread: Option<JoinHandle<()>>,
+    deadline: Instant,
+}
+
+pub struct WhisperStt {
+    config: WhisperSttConfig,
+    ctx: Arc<WhisperContext>,
+
+    active: Option<CaptureSession>,
+    finished_recognizers: Vec<JoinHandle<()>>,
+
+    completed_rx: mpsc::Receiver<Result<String, String>>,
+    completed_tx: mpsc::Sender<Result<String, String>>,
+
+    last_error: Option<String>,
+    unload_at: Instant,
+}
+
+impl WhisperStt {
+    pub fn new(model_path: impl AsRef<Path>) -> Result<Self, WhisperSttError> {
+        Self::init(WhisperSttConfig::new(model_path))
+    }
+
+    pub fn init(config: WhisperSttConfig) -> Result<Self, WhisperSttError> {
+        let mut ctx_params = WhisperContextParameters::default();
+        ctx_params.use_gpu = config.use_gpu;
+        ctx_params.gpu_device = config.gpu_device;
+        ctx_params.flash_attn = config.flash_attn;
+
+        let ctx = WhisperContext::new_with_params(&config.model_path, ctx_params)
+            .map_err(|e| WhisperSttError::ModelLoad(e.to_string()))?;
+
+        let (completed_tx, completed_rx) = mpsc::channel();
+
+        Ok(Self {
+            config,
+            ctx: Arc::new(ctx),
+            active: None,
+            finished_recognizers: Vec::new(),
+            completed_rx,
+            completed_tx,
+            last_error: None,
+            unload_at: Instant::now() + UNLOAD_AFTER,
+        })
+    }
+
+    /// starts a fresh capture stream and a transcription worker
+    pub fn ptt_start(&mut self) -> Result<(), WhisperSttError> {
+        self.unload_at = Instant::now() + UNLOAD_AFTER;
+        self.reap_finished_recognizers();
+
+        if self.active.is_some() {
+            return Err(WhisperSttError::AlreadyRecording);
+        }
+
+        let (audio_tx, audio_rx) = mpsc::channel::<Vec<f32>>();
+        let (ready_tx, ready_rx) = mpsc::channel::<Result<(), String>>();
+        let (stop_tx, stop_rx) = mpsc::channel::<StopCapture>();
+
+        let recognizer_thread = spawn_recognizer_thread(
+            Arc::clone(&self.ctx),
+            self.config.clone(),
+            audio_rx,
+            self.completed_tx.clone(),
+        )?;
+
+        let input_device_name = self.config.rodio_input_device_name.clone();
+
+        let capture_thread = thread::Builder::new()
+            .name("whisper-stt-rodio-capture".to_string())
+            .spawn(move || {
+                rodio_capture_thread(audio_tx, stop_rx, input_device_name, ready_tx);
+            })
+            .map_err(|e| WhisperSttError::ThreadSpawn(e.to_string()))?;
+
+        match ready_rx.recv() {
+            Ok(Ok(())) => {
+                self.active = Some(CaptureSession {
+                    stop_tx,
+                    capture_thread: Some(capture_thread),
+                    recognizer_thread: Some(recognizer_thread),
+                    deadline: Instant::now() + MAX_DURATION,
+                });
+
+                Ok(())
+            }
+            Ok(Err(e)) => {
+                let _ = stop_tx.send(StopCapture);
+                let _ = capture_thread.join();
+                let _ = recognizer_thread.join();
+
+                Err(WhisperSttError::CaptureInit(e))
+            }
+            Err(e) => {
+                let _ = stop_tx.send(StopCapture);
+                let _ = capture_thread.join();
+                let _ = recognizer_thread.join();
+
+                Err(WhisperSttError::CaptureInit(e.to_string()))
+            }
+        }
+    }
+
+    fn stop_active_capture(&mut self) -> Result<(), WhisperSttError> {
+        let Some(mut session) = self.active.take() else {
+            return Err(WhisperSttError::NotRecording);
+        };
+
+        let _ = session.stop_tx.send(StopCapture);
+
+        let capture_result = if let Some(capture_thread) = session.capture_thread.take() {
+            capture_thread
+                .join()
+                .map_err(|_| WhisperSttError::CaptureThreadPanicked)
+        } else {
+            Ok(())
+        };
+
+        if let Some(recognizer_thread) = session.recognizer_thread.take() {
+            self.finished_recognizers.push(recognizer_thread);
+        }
+
+        capture_result
+    }
+
+    fn drain_completed_transcriptions(&mut self) -> Option<String> {
+        let mut latest = None;
+
+        while let Ok(result) = self.completed_rx.try_recv() {
+            match result {
+                Ok(text) => {
+                    let text = normalize_transcript(text);
+                    if !text.is_empty() {
+                        latest = Some(text);
+                    }
+                }
+                Err(e) => {
+                    self.last_error = Some(e);
+                }
+            }
+        }
+
+        latest
+    }
+
+    /// stops the pw stream & finalizes recognition asynchronously
+    /// poll `take_transcription()` from your main loop to receive transcription
+    pub fn ptt_end(&mut self) -> Result<(), WhisperSttError> {
+        self.unload_at = Instant::now() + UNLOAD_AFTER;
+        self.stop_active_capture()
+    }
+
+    pub fn take_transcription(&mut self) -> Option<String> {
+        self.reap_finished_recognizers();
+
+        let latest = self.drain_completed_transcriptions();
+
+        if latest.is_some() {
+            self.unload_at = Instant::now() + UNLOAD_AFTER;
+            return latest;
+        }
+
+        // been recording for too long, force send a stop signal
+        if self
+            .active
+            .as_ref()
+            .is_some_and(|session| Instant::now() >= session.deadline)
+        {
+            if let Err(e) = self.stop_active_capture() {
+                self.last_error = Some(e.to_string());
+            }
+        }
+
+        None
+    }
+
+    pub fn should_unload(&self) -> bool {
+        self.unload_at < Instant::now()
+    }
+
+    fn reap_finished_recognizers(&mut self) {
+        let mut i = 0;
+
+        while i < self.finished_recognizers.len() {
+            if self.finished_recognizers[i].is_finished() {
+                let handle = self.finished_recognizers.swap_remove(i);
+                let _ = handle.join();
+            } else {
+                i += 1;
+            }
+        }
+    }
+}
+
+impl Drop for WhisperStt {
+    fn drop(&mut self) {
+        if self.active.is_some() {
+            let _ = self.ptt_end();
+        }
+
+        for handle in self.finished_recognizers.drain(..) {
+            let _ = handle.join();
+        }
+    }
+}
+
+fn spawn_recognizer_thread(
+    ctx: Arc<WhisperContext>,
+    config: WhisperSttConfig,
+    audio_rx: mpsc::Receiver<Vec<f32>>,
+    completed_tx: mpsc::Sender<Result<String, String>>,
+) -> Result<JoinHandle<()>, WhisperSttError> {
+    thread::Builder::new()
+        .name("whisper-stt-recognizer".to_string())
+        .spawn(move || {
+            recognizer_thread(ctx, config, audio_rx, completed_tx);
+        })
+        .map_err(|e| WhisperSttError::ThreadSpawn(e.to_string()))
+}
+
+fn recognizer_thread(
+    ctx: Arc<WhisperContext>,
+    config: WhisperSttConfig,
+    audio_rx: mpsc::Receiver<Vec<f32>>,
+    completed_tx: mpsc::Sender<Result<String, String>>,
+) {
+    let partial_stride_samples =
+        ms_to_samples(config.partial_decode_interval_ms).max(WHISPER_SAMPLE_RATE / 4);
+    let min_samples = ms_to_samples(config.min_audio_ms);
+
+    let mut audio = Vec::<f32>::new();
+    let mut last_decoded_len = 0usize;
+    let mut latest_partial = String::new();
+
+    while let Ok(chunk) = audio_rx.recv() {
+        if chunk.is_empty() {
+            continue;
+        }
+
+        audio.extend_from_slice(&chunk);
+
+        let enough_new_audio =
+            audio.len().saturating_sub(last_decoded_len) >= partial_stride_samples;
+
+        if audio.len() >= min_samples && enough_new_audio {
+            match transcribe_audio(&ctx, &config, &audio) {
+                Ok(text) => {
+                    latest_partial = text;
+                    last_decoded_len = audio.len();
+                }
+                Err(_) => {
+                    // do not fail the session on a speculative decode
+                    // the final decode after PTT end gets reported
+                }
+            }
+        }
+    }
+
+    if audio.len() < min_samples {
+        let _ = completed_tx.send(Ok(String::new()));
+        return;
+    }
+
+    match transcribe_audio(&ctx, &config, &audio) {
+        Ok(text) => {
+            let _ = completed_tx.send(Ok(text));
+        }
+        Err(e) if !latest_partial.trim().is_empty() => {
+            // Prefer a recent partial over losing the utterance completely.
+            let _ = completed_tx.send(Ok(latest_partial));
+            let _ = completed_tx.send(Err(e.to_string()));
+        }
+        Err(e) => {
+            let _ = completed_tx.send(Err(e.to_string()));
+        }
+    }
+}
+
+fn transcribe_audio(
+    ctx: &WhisperContext,
+    config: &WhisperSttConfig,
+    audio: &[f32],
+) -> Result<String, WhisperSttError> {
+    let mut params = FullParams::new(SamplingStrategy::Greedy { best_of: 1 });
+
+    params.set_n_threads(config.n_threads);
+    params.set_language(config.language.as_deref());
+    params.set_no_timestamps(true);
+    params.set_print_special(false);
+    params.set_print_progress(false);
+    params.set_print_realtime(false);
+    params.set_print_timestamps(false);
+
+    if let Some(prompt) = config.initial_prompt.as_deref() {
+        params.set_initial_prompt(prompt);
+    }
+
+    let mut state = ctx
+        .create_state()
+        .map_err(|e| WhisperSttError::Whisper(e.to_string()))?;
+
+    state
+        .full(params, audio)
+        .map_err(|e| WhisperSttError::Whisper(e.to_string()))?;
+
+    let text = state
+        .as_iter()
+        .map(|segment| segment.to_string())
+        .collect::<Vec<_>>()
+        .join("");
+
+    Ok(normalize_transcript(text))
+}
+
+fn rodio_capture_thread(
+    audio_tx: mpsc::Sender<Vec<f32>>,
+    stop_rx: mpsc::Receiver<StopCapture>,
+    input_device_name: Option<String>,
+    ready_tx: mpsc::Sender<Result<(), String>>,
+) {
+    let mut ready_tx = Some(ready_tx);
+
+    let result = run_rodio_capture(audio_tx, stop_rx, input_device_name, &mut ready_tx);
+
+    if let Err(e) = result {
+        if let Some(ready_tx) = ready_tx.take() {
+            let _ = ready_tx.send(Err(e.to_string()));
+        }
+    }
+}
+
+fn run_rodio_capture(
+    audio_tx: mpsc::Sender<Vec<f32>>,
+    stop_rx: mpsc::Receiver<StopCapture>,
+    input_device_name: Option<String>,
+    ready_tx: &mut Option<mpsc::Sender<Result<(), String>>>,
+) -> Result<(), WhisperSttError> {
+    let builder = MicrophoneBuilder::new();
+
+    let builder = if let Some(input_device_name) = input_device_name {
+        let inputs = available_inputs().map_err(|e| WhisperSttError::Rodio(e.to_string()))?;
+        let input_device_name_lower = input_device_name.to_lowercase();
+
+        let input = inputs
+            .into_iter()
+            .find(|input| {
+                input
+                    .to_string()
+                    .to_lowercase()
+                    .contains(&input_device_name_lower)
+            })
+            .ok_or_else(|| {
+                WhisperSttError::Rodio(format!(
+                    "no rodio input device matched {input_device_name:?}"
+                ))
+            })?;
+
+        builder
+            .device(input)
+            .map_err(|e| WhisperSttError::Rodio(e.to_string()))?
+    } else {
+        builder
+            .default_device()
+            .map_err(|e| WhisperSttError::Rodio(e.to_string()))?
+    };
+
+    let builder = builder
+        .default_config()
+        .map_err(|e| WhisperSttError::Rodio(e.to_string()))?
+        .prefer_channel_counts([
+            1.try_into().expect("not zero"),
+            2.try_into().expect("not zero"),
+        ])
+        .prefer_sample_rates([
+            16_000.try_into().expect("not zero"),
+            32_000.try_into().expect("not zero"),
+            48_000.try_into().expect("not zero"),
+        ])
+        .prefer_buffer_sizes(512..);
+
+    let mut mic = builder
+        .open_stream()
+        .map_err(|e| WhisperSttError::Rodio(e.to_string()))?;
+
+    let channels = mic.channels().get() as usize;
+    let input_rate = mic.sample_rate().get() as usize;
+
+    if let Some(ready_tx) = ready_tx.take() {
+        let _ = ready_tx.send(Ok(()));
+    }
+
+    let mut resampler = StreamingResampler::default();
+    let mut interleaved = Vec::new();
+
+    // ~20 ms of input frames; whisper still receives 16 kHz mono chunks
+    let chunk_input_samples = ((input_rate / 50).max(1)) * channels.max(1);
+
+    'capture: loop {
+        if stop_rx.try_recv().is_ok() {
+            break;
+        }
+
+        interleaved.clear();
+
+        while interleaved.len() < chunk_input_samples {
+            if stop_rx.try_recv().is_ok() {
+                break 'capture;
+            }
+
+            let Some(sample) = mic.next() else {
+                return Err(WhisperSttError::Rodio(
+                    "microphone stream ended unexpectedly".to_string(),
+                ));
+            };
+
+            // Rodio's default sample type is f32. This cast also keeps the code
+            // compiling if the crate is built with rodio's `64bit` feature.
+            interleaved.push(sample as f32);
+        }
+
+        let resampled = resampler.push_interleaved_mono_16k(&interleaved, channels, input_rate);
+
+        if !resampled.is_empty() && audio_tx.send(resampled).is_err() {
+            break;
+        }
+    }
+
+    Ok(())
+}
+
+#[derive(Default)]
+struct StreamingResampler {
+    pending: Vec<f32>,
+    position: f64,
+    input_rate: usize,
+}
+
+impl StreamingResampler {
+    fn push_interleaved_mono_16k(
+        &mut self,
+        samples: &[f32],
+        channels: usize,
+        input_rate: usize,
+    ) -> Vec<f32> {
+        if channels == 0 || input_rate == 0 {
+            return Vec::new();
+        }
+
+        if self.input_rate != input_rate {
+            self.pending.clear();
+            self.position = 0.0;
+            self.input_rate = input_rate;
+        }
+
+        let frames = samples.len() / channels;
+        if frames == 0 {
+            return Vec::new();
+        }
+
+        let mut mono = Vec::with_capacity(frames);
+
+        for frame in 0..frames {
+            let frame_start = frame * channels;
+            let mut sum = 0.0f32;
+
+            for ch in 0..channels {
+                sum += samples[frame_start + ch];
+            }
+
+            mono.push(sum / channels as f32);
+        }
+
+        self.pending.extend_from_slice(&mono);
+
+        let step = input_rate as f64 / WHISPER_SAMPLE_RATE as f64;
+        let mut out = Vec::with_capacity(
+            ((self.pending.len() as f64 - self.position) / step).max(0.0) as usize,
+        );
+
+        while self.position + 1.0 < self.pending.len() as f64 {
+            let i = self.position.floor() as usize;
+            let frac = (self.position - i as f64) as f32;
+
+            let a = self.pending[i];
+            let b = self.pending[i + 1];
+
+            out.push(a + (b - a) * frac);
+
+            self.position += step;
+        }
+
+        let drop_count = self.position.floor() as usize;
+        if drop_count > 0 {
+            self.pending.drain(..drop_count);
+            self.position -= drop_count as f64;
+        }
+
+        out
+    }
+}
+
+fn ms_to_samples(ms: u64) -> usize {
+    ((ms as usize) * WHISPER_SAMPLE_RATE) / 1000
+}
+
+fn normalize_transcript(text: String) -> String {
+    text.split_whitespace().collect::<Vec<_>>().join(" ")
+}
diff --git a/wayvr/src/windowing/backend.rs b/wayvr/src/windowing/backend.rs
index a953f61c..0ca522ba 100644
--- a/wayvr/src/windowing/backend.rs
+++ b/wayvr/src/windowing/backend.rs
@@ -108,6 +108,7 @@ pub struct OverlayMeta {
 }
 
 #[allow(clippy::enum_variant_names)]
+#[derive(Clone)]
 pub enum OverlayEventData {
     /// Notifies a newly added overlay of its ID, even before the overlay is shown.
     IdAssigned(OverlayID),
@@ -128,6 +129,8 @@ pub enum OverlayEventData {
         command: ModifyPanelCommand,
     },
     WvrCommand(WvrCommand),
+    ResizeRequest([u32; 2]),
+    ColorPaletteRefresh,
 }
 
 pub trait OverlayBackend: Any {
diff --git a/wayvr/src/windowing/manager.rs b/wayvr/src/windowing/manager.rs
index 5d8a168c..596409bb 100644
--- a/wayvr/src/windowing/manager.rs
+++ b/wayvr/src/windowing/manager.rs
@@ -16,10 +16,10 @@ use wlx_common::{
 
 use crate::{
     FRAME_COUNTER,
-    backend::task::{OverlayTask, ToggleMode},
+    backend::task::{CreateOverlayTask, GlobalChange, OverlayTask, SpawnPos, ToggleMode},
     config::save_state,
     overlays::{
-        anchor::{create_anchor, create_grab_help},
+        anchor::{create_alltab_help, create_anchor, create_grab_help},
         custom::create_custom,
         dashboard::{DASH_NAME, create_dash_frontend},
         edit::EditWrapperManager,
@@ -34,7 +34,10 @@ use crate::{
         backend::{OverlayEventData, OverlayMeta},
         set::OverlayWindowSet,
         snap_upright,
-        window::{OverlayCategory, OverlayWindowData},
+        window::{
+            OverlayCategory, OverlayWindowData, save_transform, scalar_scale,
+            spawn_transform_from_parent,
+        },
     },
 };
 
@@ -136,6 +139,16 @@ where
         let grab_help = OverlayWindowData::from_config(create_grab_help(app)?);
         me.add(grab_help, app);
 
+        let alttab_help = OverlayWindowData::from_config(create_alltab_help(app)?);
+        me.add(alttab_help, app);
+
+        #[cfg(feature = "whisper")]
+        {
+            use crate::overlays::whisper::create_whisper;
+            let whisper = OverlayWindowData::from_config(create_whisper(app, headless, wayland)?);
+            me.add(whisper, app);
+        }
+
         let custom_panels = app.session.config.custom_panels.clone();
         for name in custom_panels {
             let Some(panel) = create_custom(app, name) else {
@@ -183,6 +196,18 @@ where
                     }
                 }
             }
+            OverlayTask::ResizeOverlay(sel, size) => {
+                let Some(id) = self.id_by_selector(&sel) else {
+                    log::warn!("Overlay not found for task: {sel:?}");
+                    return Ok(());
+                };
+
+                let o = &mut self.overlays[id];
+
+                o.config
+                    .backend
+                    .notify(app, OverlayEventData::ResizeRequest(size))?;
+            }
             OverlayTask::ToggleOverlay(sel, mode) => {
                 let Some(id) = self.id_by_selector(&sel) else {
                     log::warn!("Overlay not found for task: {sel:?}");
@@ -220,8 +245,6 @@ where
                     o.config.activate(app);
                 }
                 self.visible_overlays_changed(app)?;
-
-                return Ok(());
             }
             OverlayTask::ToggleEditMode => {
                 self.set_edit_mode(!self.edit_mode, app)?;
@@ -287,7 +310,17 @@ where
                 self.restore_set = 0;
                 self.sets_changed(app);
             }
-            OverlayTask::SettingsChanged => {
+            OverlayTask::GlobalChange(GlobalChange::Settings) => {
+                if let Some(watch) = self.mut_by_id(self.watch_id)
+                    && app.session.config.enable_watch != watch.config.active_state.is_some()
+                {
+                    if watch.config.active_state.is_some() {
+                        watch.config.deactivate();
+                    } else {
+                        watch.config.activate(app);
+                    }
+                }
+
                 for o in self.overlays.values_mut() {
                     let _ = o
                         .config
@@ -296,10 +329,24 @@ where
                         .log_err("Could not notify SettingsChanged");
                 }
             }
-            OverlayTask::KeyboardChanged => {
+            OverlayTask::GlobalChange(GlobalChange::Keyboard) => {
                 self.overlays_changed(app)?;
                 self.sets_changed(app);
             }
+            OverlayTask::GlobalChange(GlobalChange::ColorPalette) => {
+                {
+                    let mut globals = app.wgui_globals.get();
+                    globals.palette =
+                        wlx_common::palette::load_palette(&app.session.config.color_palette);
+                }
+
+                for o in self.overlays.values_mut() {
+                    let _ = o
+                        .config
+                        .backend
+                        .notify(app, OverlayEventData::ColorPaletteRefresh);
+                }
+            }
             OverlayTask::CleanupMirrors => {
                 let mut ids_to_remove = vec![];
                 for (oid, o) in &self.overlays {
@@ -328,24 +375,8 @@ where
                     log::warn!("Overlay not found for task: {sel:?}");
                 }
             }
-            OverlayTask::Create(sel, f) => {
-                let None = self.mut_by_selector(&sel) else {
-                    log::debug!("Could not create {sel:?}: exists");
-                    return Ok(());
-                };
-
-                let Some(overlay_config) = f(app) else {
-                    log::debug!("Could not create {sel:?}: empty config");
-                    return Ok(());
-                };
-
-                self.add(
-                    OverlayWindowData {
-                        birthframe: FRAME_COUNTER.load(Ordering::Relaxed),
-                        ..OverlayWindowData::from_config(overlay_config)
-                    },
-                    app,
-                );
+            OverlayTask::Spawn(sel, spawn_pos, f) => {
+                self.spawn_overlay(app, sel, spawn_pos, f)?;
             }
             OverlayTask::Drop(sel) => {
                 if let Some(o) = self.mut_by_selector(&sel)
@@ -385,6 +416,35 @@ where
         }
         Ok(())
     }
+
+    fn spawn_overlay(
+        &mut self,
+        app: &mut AppState,
+        sel: OverlaySelector,
+        spawn_pos: SpawnPos,
+        f: Box<CreateOverlayTask>,
+    ) -> anyhow::Result<()> {
+        let None = self.mut_by_selector(&sel) else {
+            log::debug!("Could not spawn {sel:?}: exists");
+            return Ok(());
+        };
+
+        let Some(overlay_config) = f(app) else {
+            log::debug!("Could not spawn {sel:?}: empty config");
+            return Ok(());
+        };
+
+        self.add_with_spawn_pos(
+            OverlayWindowData {
+                birthframe: FRAME_COUNTER.load(Ordering::Relaxed),
+                ..OverlayWindowData::from_config(overlay_config)
+            },
+            app,
+            spawn_pos,
+        );
+
+        Ok(())
+    }
 }
 
 const SAVED_ATTRIBS: [BackendAttrib; 3] = [
@@ -439,18 +499,28 @@ impl<T> OverlayWindowManager<T> {
             app.session.config.sets.push(serialized);
         }
 
-        // global overlays; watch, toast
-        for oid in &[self.watch_id] {
-            let Some(o) = self.get_by_id(*oid) else {
-                break;
-            };
-            let Some(state) = o.config.active_state.clone() else {
-                break;
-            };
+        // global overlays
+        for o in self.overlays.values() {
+            if o.config.global {
+                if let Some(state) = &o.config.active_state {
+                    app.session
+                        .config
+                        .global_set
+                        .insert(o.config.name.clone(), state.clone());
+                }
+            }
+        }
+        for (name, state) in &self.global_set.hidden_overlays {
             app.session
                 .config
                 .global_set
-                .insert(o.config.name.clone(), state.clone());
+                .insert(name.clone(), state.clone());
+        }
+        for (name, state) in &self.global_set.inactive_overlays {
+            app.session
+                .config
+                .global_set
+                .insert(name.clone(), state.clone());
         }
 
         // BackendAttrib
@@ -575,6 +645,19 @@ impl<T> OverlayWindowManager<T> {
     pub fn set_edit_mode(&mut self, enabled: bool, app: &mut AppState) -> anyhow::Result<()> {
         let changed = enabled != self.edit_mode;
         self.edit_mode = enabled;
+
+        if changed && let Some(watch) = self.mut_by_id(self.watch_id) {
+            watch
+                .config
+                .active_state
+                .iter_mut()
+                .for_each(|f| f.grabbable = enabled);
+            watch
+                .config
+                .backend
+                .notify(app, OverlayEventData::EditModeChanged(enabled))?;
+        }
+
         if !enabled {
             for o in self.overlays.values_mut() {
                 self.wrappers.unwrap_edit_mode(&mut o.config, app)?;
@@ -587,17 +670,6 @@ impl<T> OverlayWindowManager<T> {
                 }
             }
         }
-        if changed && let Some(watch) = self.mut_by_id(self.watch_id) {
-            watch
-                .config
-                .active_state
-                .iter_mut()
-                .for_each(|f| f.grabbable = enabled);
-            watch
-                .config
-                .backend
-                .notify(app, OverlayEventData::EditModeChanged(enabled))?;
-        }
         Ok(())
     }
 
@@ -705,7 +777,16 @@ impl<T> OverlayWindowManager<T> {
             .map(|(k, _)| k)
     }
 
-    pub fn add(&mut self, mut overlay: OverlayWindowData<T>, app: &mut AppState) -> OverlayID {
+    pub fn add(&mut self, overlay: OverlayWindowData<T>, app: &mut AppState) -> OverlayID {
+        self.add_with_spawn_pos(overlay, app, SpawnPos::Fixed)
+    }
+
+    fn add_with_spawn_pos(
+        &mut self,
+        mut overlay: OverlayWindowData<T>,
+        app: &mut AppState,
+        spawn_pos: SpawnPos,
+    ) -> OverlayID {
         while self.lookup(&overlay.config.name).is_some() {
             log::error!(
                 "An overlay with name {} already exists. Deduplicating, but things may break!",
@@ -749,6 +830,7 @@ impl<T> OverlayWindowManager<T> {
         if !shown && show_on_spawn {
             log::debug!("activating {name} due to show_on_spawn");
             self.overlays[oid].config.activate(app);
+            self.apply_spawn_pos(app, oid, spawn_pos);
         }
         if !internal && let Err(e) = self.overlays_changed(app) {
             log::error!("Error while adding overlay: {e:?}");
@@ -759,6 +841,72 @@ impl<T> OverlayWindowManager<T> {
         oid
     }
 
+    fn apply_spawn_pos(&mut self, app: &mut AppState, oid: OverlayID, spawn_pos: SpawnPos) {
+        match spawn_pos {
+            SpawnPos::Fixed => {}
+            SpawnPos::Spread => {
+                let Some(parent_id) = self.spread_parent_for(oid) else {
+                    return;
+                };
+                let parent = OverlaySelector::Id(parent_id);
+                let _ = self.offset_spawn_from_parent(app, oid, &parent);
+            }
+            SpawnPos::Parent(parent) => {
+                let _ = self.offset_spawn_from_parent(app, oid, &parent);
+            }
+        }
+    }
+
+    // TODO: this just uses the last spawned overlay as parent, can probably do better?
+    fn spread_parent_for(&self, oid: OverlayID) -> Option<OverlayID> {
+        self.overlays
+            .iter()
+            .filter(|(id, overlay)| {
+                *id != oid
+                    && overlay.config.active_state.is_some()
+                    && matches!(
+                        overlay.config.category,
+                        OverlayCategory::Panel | OverlayCategory::WayVR | OverlayCategory::Screen
+                    )
+            })
+            .max_by_key(|(_, overlay)| overlay.birthframe)
+            .map(|(id, _)| id)
+    }
+
+    fn offset_spawn_from_parent(
+        &mut self,
+        app: &mut AppState,
+        oid: OverlayID,
+        parent: &OverlaySelector,
+    ) -> Option<()> {
+        let parent_id = self.id_by_selector(parent)?;
+
+        if parent_id == oid {
+            return None;
+        }
+
+        let parent_transform = self
+            .overlays
+            .get(parent_id)?
+            .config
+            .active_state
+            .as_ref()?
+            .transform;
+
+        let overlay = self.overlays.get_mut(oid)?;
+        let state = overlay.config.active_state.as_mut()?;
+
+        let child_scale = scalar_scale(&overlay.config.default_state.transform);
+        let spawn_transform =
+            spawn_transform_from_parent(&parent_transform, &app.input_state.hmd, child_scale);
+
+        state.transform = spawn_transform;
+        save_transform(state, app);
+        overlay.config.dirty = true;
+
+        Some(())
+    }
+
     pub fn switch_or_toggle_set(&mut self, app: &mut AppState, set: usize) {
         let new_set = if self.current_set.iter().any(|cur| *cur == set) {
             None
diff --git a/wayvr/src/windowing/mod.rs b/wayvr/src/windowing/mod.rs
index 2e820cfd..358d9dac 100644
--- a/wayvr/src/windowing/mod.rs
+++ b/wayvr/src/windowing/mod.rs
@@ -2,6 +2,8 @@ use glam::{Affine3A, Vec3A};
 use slotmap::new_key_type;
 use std::sync::Arc;
 
+use crate::windowing::window::scalar_scale;
+
 pub mod backend;
 pub mod manager;
 pub mod set;
@@ -18,6 +20,8 @@ pub enum OverlaySelector {
     Nothing,
 }
 
+pub const PIXELS_TO_METERS: f32 = 1. / 2000.;
+
 pub const Z_ORDER_TOAST: u32 = 71;
 pub const Z_ORDER_HELP: u32 = 70;
 pub const Z_ORDER_LINES: u32 = 69;
@@ -28,7 +32,7 @@ pub const Z_ORDER_DASHBOARD: u32 = Z_ORDER_DEFAULT;
 
 pub fn snap_upright(transform: Affine3A, up_dir: Vec3A) -> Affine3A {
     if transform.x_axis.dot(up_dir).abs() < 0.2 {
-        let scale = transform.x_axis.length();
+        let scale = scalar_scale(&transform);
         let col_z = transform.z_axis.normalize();
         let col_y = up_dir;
         let col_x = col_y.cross(col_z);
diff --git a/wayvr/src/windowing/window.rs b/wayvr/src/windowing/window.rs
index 9b48ac7f..9b674010 100644
--- a/wayvr/src/windowing/window.rs
+++ b/wayvr/src/windowing/window.rs
@@ -1,11 +1,11 @@
-use glam::{Affine3A, Mat3A, Quat, Vec3, Vec3A};
+use glam::{Affine3A, EulerRot, Mat3A, Quat, Vec3, Vec3A};
 use idmap_derive::IntegerId;
 use std::{f32::consts::PI, sync::Arc};
 use wlx_common::windowing::{OverlayWindowState, Positioning};
 
 use crate::{
     state::AppState,
-    subsystem::input::KeyboardFocus,
+    subsystem::input::InputFocus,
     windowing::{
         backend::{FrameMeta, OverlayBackend, RenderResources, ShouldRender},
         snap_upright,
@@ -57,7 +57,10 @@ pub enum OverlayCategory {
     Internal,
     Keyboard,
     Dashboard,
+    /// User-provided custom panels
     Panel,
+    /// Same as Panel but does not support Modify and Reload
+    BuiltInPanel,
     Screen,
     Mirror,
     WayVR,
@@ -73,7 +76,7 @@ pub struct OverlayWindowConfig {
     /// Order to draw overlays in. Overlays with higher numbers will be drawn over ones with lower numbers.
     pub z_order: u32,
     /// If set, hovering this overlay will cause the HID provider to switch focus.
-    pub keyboard_focus: Option<KeyboardFocus>,
+    pub input_focus: Option<InputFocus>,
     /// Category of the overlay, used by toolbox on the watch.
     pub category: OverlayCategory,
     /// Should the overlay be displayed on the next frame?
@@ -84,6 +87,8 @@ pub struct OverlayWindowConfig {
     pub dirty: bool,
     /// True if the window is showing the edit overlay
     pub editing: bool,
+    /// True if the window is being resized. Captures pointer hits even if not directly hit.
+    pub resizing: bool,
     /// Used by grab to pause following of HMD or other devices
     pub pause_movement: bool,
 }
@@ -99,12 +104,13 @@ impl OverlayWindowConfig {
             },
             active_state: None,
             z_order: 0,
-            keyboard_focus: None,
+            input_focus: None,
             category: OverlayCategory::Internal,
             show_on_spawn: false,
             global: false,
             dirty: true,
             editing: false,
+            resizing: false,
             pause_movement: false,
         }
     }
@@ -146,6 +152,7 @@ impl OverlayWindowConfig {
         let cur_transform = state
             .saved_transform
             .unwrap_or(self.default_state.transform);
+        let scale = scalar_scale(&cur_transform);
 
         let (parent_transform, lerp, align_to_hmd) = match state.positioning {
             Positioning::FollowHead { lerp } => (app.input_state.hmd, lerp, false),
@@ -167,8 +174,6 @@ impl OverlayWindowConfig {
         state.transform = match lerp {
             1.0 => target_transform,
             lerp => {
-                let scale = target_transform.matrix3.x_axis.length();
-
                 let rot_from = Quat::from_mat3a(&state.transform.matrix3.div_scalar(scale));
                 let rot_to = Quat::from_mat3a(&target_transform.matrix3.div_scalar(scale));
 
@@ -187,7 +192,12 @@ impl OverlayWindowConfig {
         };
 
         if align_to_hmd {
-            realign(&mut state.transform, &app.input_state.hmd);
+            realign(
+                &mut state.transform,
+                &app.input_state.hmd,
+                scale,
+                app.session.config.snap_angle_deg,
+            );
         }
 
         self.dirty = true;
@@ -232,7 +242,7 @@ impl OverlayWindowConfig {
                 if hard_reset {
                     (app.input_state.hmd, false)
                 } else {
-                    return;
+                    (Affine3A::IDENTITY, false)
                 }
             }
         };
@@ -244,13 +254,19 @@ impl OverlayWindowConfig {
         state.transform = parent_transform * cur_transform;
 
         if align_to_hmd || (state.grabbable && hard_reset) {
-            realign(&mut state.transform, &app.input_state.hmd);
+            let scale = scalar_scale(&cur_transform);
+            realign(
+                &mut state.transform,
+                &app.input_state.hmd,
+                scale,
+                app.session.config.snap_angle_deg,
+            );
         }
         self.dirty = true;
     }
 }
 
-pub fn realign(transform: &mut Affine3A, hmd: &Affine3A) {
+pub fn realign(transform: &mut Affine3A, hmd: &Affine3A, scale: f32, snap_angle: f32) {
     let to_hmd = hmd.translation - transform.translation;
     let up_dir: Vec3A;
 
@@ -277,16 +293,34 @@ pub fn realign(transform: &mut Affine3A, hmd: &Affine3A) {
         }
     }
 
-    let scale = transform.x_axis.length();
-
     let col_z = (transform.translation - hmd.translation).normalize();
     let col_y = up_dir;
     let col_x = col_y.cross(col_z);
     let col_y = col_z.cross(col_x).normalize();
     let col_x = col_x.normalize();
 
-    let rot = Mat3A::from_quat(Quat::from_axis_angle(Vec3::Y, PI));
-    transform.matrix3 = Mat3A::from_cols(col_x, col_y, col_z).mul_scalar(scale) * rot;
+    let flip = Mat3A::from_quat(Quat::from_axis_angle(Vec3::Y, PI));
+    let mut rotation = Mat3A::from_cols(col_x, col_y, col_z) * flip;
+
+    if snap_angle > f32::EPSILON {
+        let snap_step = snap_angle.to_radians();
+        let (yaw, pitch, roll) = rotation.to_euler(EulerRot::YXZ);
+
+        let pitch = (pitch / snap_step).round() * snap_step;
+        let roll = (roll / snap_step).round() * snap_step;
+
+        rotation = Mat3A::from_euler(EulerRot::YXZ, yaw, pitch, roll);
+    }
+
+    transform.matrix3 = rotation.mul_scalar(scale);
+}
+
+pub fn scalar_scale(a: &Affine3A) -> f32 {
+    let det = a.matrix3.determinant();
+    (a.matrix3.x_axis.length() * det.signum()
+        + a.matrix3.y_axis.length()
+        + a.matrix3.z_axis.length())
+        / 3.0
 }
 
 pub fn save_transform(state: &mut OverlayWindowState, app: &mut AppState) {
@@ -295,8 +329,35 @@ pub fn save_transform(state: &mut OverlayWindowState, app: &mut AppState) {
         Positioning::FollowHead { .. } => app.input_state.hmd,
         Positioning::FollowHand { hand, .. } => app.input_state.pointers[hand as usize].pose,
         Positioning::Anchored => snap_upright(app.anchor, Vec3A::Y),
-        Positioning::Static => return,
+        Positioning::Static => Affine3A::IDENTITY,
     };
 
     state.saved_transform = Some(parent_transform.inverse() * state.transform);
 }
+
+pub fn spawn_transform_from_parent(
+    parent: &Affine3A,
+    hmd: &Affine3A,
+    child_scale: f32,
+) -> Affine3A {
+    const LEFT: f32 = 0.08;
+    const DOWN: f32 = 0.08;
+    const CLOSER_TO_HMD: f32 = 0.06;
+
+    let x_axis = parent.x_axis.normalize();
+    let y_axis = parent.y_axis.normalize();
+    let z_axis = parent.z_axis.normalize();
+    let to_hmd = hmd.translation - parent.translation;
+    let toward_hmd = if z_axis.dot(to_hmd) >= 0.0 {
+        z_axis
+    } else {
+        -z_axis
+    };
+
+    let translation =
+        parent.translation - x_axis * LEFT - y_axis * DOWN + toward_hmd * CLOSER_TO_HMD;
+
+    let rotation = Quat::from_mat3a(&Mat3A::from_cols(x_axis, y_axis, z_axis));
+
+    Affine3A::from_scale_rotation_translation(Vec3::ONE * child_scale, rotation, translation.into())
+}
diff --git a/wayvrctl/Cargo.toml b/wayvrctl/Cargo.toml
index d8a3444d..dc175715 100644
--- a/wayvrctl/Cargo.toml
+++ b/wayvrctl/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wayvrctl"
-version = "26.2.1"
+version = "26.7.1"
 edition = "2024"
 description = "CLI for controlling WayVR"
 license = "GPL-3.0-only"
@@ -8,12 +8,14 @@ authors = ["galister", "oo8dev"]
 repository = "https://github.com/wlx-team/wayvr"
 
 [dependencies]
+wayvr-ipc = { path = "../wayvr-ipc" }
+
 anyhow.workspace = true
-log.workspace = true
 clap.workspace = true
+log.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-env_logger = "0.11.8"
-tokio = "1.48.0"
-wayvr-ipc = { path = "../wayvr-ipc" }
+smol.workspace = true
+
+env_logger = "0.11.11"
 shell-words = "1.1.1"
diff --git a/wayvrctl/src/helper.rs b/wayvrctl/src/helper.rs
index 60fb91e3..6193a192 100644
--- a/wayvrctl/src/helper.rs
+++ b/wayvrctl/src/helper.rs
@@ -5,7 +5,7 @@ use serde::Serialize;
 use wayvr_ipc::{
     client::{WayVRClient, WayVRClientMutex},
     ipc,
-    packet_client::{self, PositionMode},
+    packet_client::{self, HandsfreeParams, PositionMode},
     packet_server,
 };
 
@@ -135,6 +135,14 @@ pub async fn wvr_process_launch(
     )
 }
 
+pub async fn wlr_input_capture(state: &mut WayVRClientState, grab: bool) {
+    handle_empty_result(
+        WayVRClient::fn_wvr_input_capture(state.wayvr_client.clone(), grab)
+            .await
+            .context("failed to change input capture"),
+    )
+}
+
 pub async fn wlx_device_haptics(
     state: &mut WayVRClientState,
     device: usize,
@@ -173,6 +181,14 @@ pub async fn wlx_switch_set(state: &mut WayVRClientState, set: Option<usize>) {
     )
 }
 
+pub async fn wlx_handsfree(state: &mut WayVRClientState, params: HandsfreeParams) {
+    handle_empty_result(
+        WayVRClient::fn_wlx_handsfree(state.wayvr_client.clone(), params)
+            .await
+            .context("failed to set handsfree mode"),
+    )
+}
+
 pub async fn wlx_panel_modify(
     state: &mut WayVRClientState,
     overlay: String,
diff --git a/wayvrctl/src/main.rs b/wayvrctl/src/main.rs
index 6df69149..967505dd 100644
--- a/wayvrctl/src/main.rs
+++ b/wayvrctl/src/main.rs
@@ -11,47 +11,50 @@ use wayvr_ipc::{
     client::WayVRClient,
     ipc,
     packet_client::{self, PositionMode},
+    packet_server::{WvrProcessHandle, WvrWindowHandle},
 };
 
 use crate::helper::{
-    WayVRClientState, wlx_device_haptics, wlx_input_state, wlx_panel_modify, wlx_show_hide,
-    wlx_switch_set, wvr_process_get, wvr_process_launch, wvr_process_list, wvr_process_terminate,
-    wvr_window_list, wvr_window_set_visible,
+    WayVRClientState, wlr_input_capture, wlx_device_haptics, wlx_handsfree, wlx_input_state,
+    wlx_panel_modify, wlx_show_hide, wlx_switch_set, wvr_process_get, wvr_process_launch,
+    wvr_process_list, wvr_process_terminate, wvr_window_list, wvr_window_set_visible,
 };
 
 mod helper;
+mod types;
 
-#[tokio::main(flavor = "current_thread")]
-async fn main() -> ExitCode {
+fn main() -> ExitCode {
     env_logger::init_from_env(Env::default().default_filter_or("info"));
     let args = Args::parse();
 
-    let mut state = WayVRClientState {
-        wayvr_client: WayVRClient::new(&format!("wayvrctl-{}", process::id()))
-            .await
-            .inspect_err(|e| {
-                log::error!("Failed to initialize WayVR connection: {e:?}");
-                process::exit(1);
-            })
-            .unwrap(),
-        serial_generator: ipc::SerialGenerator::new(),
-        pretty_print: args.pretty,
-    };
+    smol::block_on(async move {
+        let mut state = WayVRClientState {
+            wayvr_client: WayVRClient::new(&format!("wayvrctl-{}", process::id()))
+                .await
+                .inspect_err(|e| {
+                    log::error!("Failed to initialize WayVR connection: {e:?}");
+                    process::exit(1);
+                })
+                .unwrap(),
+            serial_generator: ipc::SerialGenerator::new(),
+            pretty_print: args.pretty,
+        };
 
-    let maybe_err = if let Subcommands::Batch { fail_fast } = args.command {
-        run_batch(&mut state, fail_fast).await
-    } else {
-        run_once(&mut state, args).await
-    };
+        let maybe_err = if let Subcommands::Batch { fail_fast } = args.command {
+            run_batch(&mut state, fail_fast).await
+        } else {
+            run_once(&mut state, args).await
+        };
 
-    if let Err(e) = maybe_err {
-        log::error!("{e:?}");
-        return ExitCode::FAILURE;
-    } else {
-        std::thread::sleep(Duration::from_millis(20));
-    }
+        if let Err(e) = maybe_err {
+            log::error!("{e:?}");
+            return ExitCode::FAILURE;
+        } else {
+            std::thread::sleep(Duration::from_millis(20));
+        }
 
-    ExitCode::SUCCESS
+        ExitCode::SUCCESS
+    })
 }
 
 async fn run_batch(state: &mut WayVRClientState, fail_fast: bool) -> anyhow::Result<()> {
@@ -105,11 +108,13 @@ async fn run_once(state: &mut WayVRClientState, args: Args) -> anyhow::Result<()
             handle,
             visible_0_or_1,
         } => {
-            let handle = serde_json::from_str(&handle).context("Invalid handle")?;
+            let handle =
+                serde_json::from_str::<WvrWindowHandle>(&handle).context("Invalid handle")?;
             wvr_window_set_visible(state, handle, visible_0_or_1 != 0).await;
         }
         Subcommands::ProcessGet { handle } => {
-            let handle = serde_json::from_str(&handle).context("Invalid handle")?;
+            let handle =
+                serde_json::from_str::<WvrProcessHandle>(&handle).context("Invalid handle")?;
             wvr_process_get(state, handle).await;
         }
         Subcommands::ProcessList => {
@@ -195,6 +200,12 @@ async fn run_once(state: &mut WayVRClientState, args: Args) -> anyhow::Result<()
             let set = if set == 0 { None } else { Some((set - 1) as _) };
             wlx_switch_set(state, set).await;
         }
+        Subcommands::Handsfree { command } => {
+            wlx_handsfree(state, command.into()).await;
+        }
+        Subcommands::InputCapture { command } => {
+            wlr_input_capture(state, matches!(command, GrabRelease::Grab)).await;
+        }
     }
     Ok(())
 }
@@ -291,6 +302,20 @@ enum Subcommands {
         /// Set number to switch to, 0 to hide all sets
         set_or_0: usize,
     },
+    Handsfree {
+        /// Command to execute
+        #[command(subcommand)]
+        command: SubcommandHandsfree,
+    },
+    InputCapture {
+        command: GrabRelease,
+    },
+}
+
+#[derive(Debug, Clone, Copy, clap::ValueEnum)]
+enum GrabRelease {
+    Grab,
+    Release,
 }
 
 #[derive(Debug, Clone, Copy, clap::ValueEnum)]
@@ -300,6 +325,47 @@ enum PosModeEnum {
     Static,
 }
 
+#[derive(Debug, Clone, Copy, clap::ValueEnum)]
+pub enum HandsfreeMode {
+    /// No handsfree pointer control
+    None,
+    /// Pointer controlled by HMD
+    Hmd,
+    /// Pointer controlled by HMD. Left pinch click, right pinch grab.
+    HmdPinch,
+    /// Pointer controlled by eye gaze
+    EyeTracking,
+    /// Pointer controlled eye gaze. Left pinch click, right pinch grab.
+    EyeTrackingPinch,
+}
+
+#[derive(Debug, Clone, Copy, clap::ValueEnum)]
+pub enum HandsfreeAction {
+    /// The click action
+    Click,
+    /// The grab action
+    Grab,
+    /// Right-click modifier (use with click)
+    RightModifier,
+    /// Middle-click modifier (use with click)
+    MiddleModifier,
+}
+
+#[derive(clap::Parser, Debug)]
+#[allow(clippy::enum_variant_names)]
+pub enum SubcommandHandsfree {
+    /// Set the handsfree mode
+    SetMode { mode: HandsfreeMode },
+    /// Press and hold an action
+    Press { action: HandsfreeAction },
+    /// Release a held action
+    Release { action: HandsfreeAction },
+    /// Toggle the state of an action
+    Toggle { action: HandsfreeAction },
+    /// Emulate a joystick scroll
+    Scroll { amount: f32 },
+}
+
 #[derive(clap::Parser, Debug)]
 #[allow(clippy::enum_variant_names)]
 enum SubcommandPanelModify {
diff --git a/wayvrctl/src/types.rs b/wayvrctl/src/types.rs
new file mode 100644
index 00000000..254ed653
--- /dev/null
+++ b/wayvrctl/src/types.rs
@@ -0,0 +1,36 @@
+use wayvr_ipc::packet_client as ipc;
+
+impl From<crate::HandsfreeMode> for ipc::HandsfreeMode {
+    fn from(mode: crate::HandsfreeMode) -> Self {
+        match mode {
+            crate::HandsfreeMode::None => Self::None,
+            crate::HandsfreeMode::Hmd => Self::Hmd,
+            crate::HandsfreeMode::HmdPinch => Self::HmdPinch,
+            crate::HandsfreeMode::EyeTracking => Self::EyeTracking,
+            crate::HandsfreeMode::EyeTrackingPinch => Self::EyeTrackingPinch,
+        }
+    }
+}
+
+impl From<crate::HandsfreeAction> for ipc::HandsfreeAction {
+    fn from(action: crate::HandsfreeAction) -> Self {
+        match action {
+            crate::HandsfreeAction::Click => Self::Click,
+            crate::HandsfreeAction::Grab => Self::Grab,
+            crate::HandsfreeAction::RightModifier => Self::RightModifier,
+            crate::HandsfreeAction::MiddleModifier => Self::MiddleModifier,
+        }
+    }
+}
+
+impl From<crate::SubcommandHandsfree> for ipc::HandsfreeParams {
+    fn from(cmd: crate::SubcommandHandsfree) -> Self {
+        match cmd {
+            crate::SubcommandHandsfree::SetMode { mode } => Self::SetMode(mode.into()),
+            crate::SubcommandHandsfree::Press { action } => Self::Press(action.into()),
+            crate::SubcommandHandsfree::Release { action } => Self::Release(action.into()),
+            crate::SubcommandHandsfree::Toggle { action } => Self::Toggle(action.into()),
+            crate::SubcommandHandsfree::Scroll { amount } => Self::Scroll(amount),
+        }
+    }
+}
diff --git a/wgui/Cargo.toml b/wgui/Cargo.toml
index 3b6ab1f8..4f6a9570 100644
--- a/wgui/Cargo.toml
+++ b/wgui/Cargo.toml
@@ -9,29 +9,43 @@ repository = "https://github.com/wlx-team/wayvr"
 
 [dependencies]
 anyhow.workspace = true
-cosmic-text = "0.15.0"
-etagere = "0.2.15"
+bytes = { workspace = true, optional = true }
 glam.workspace = true
-image = { version = "0.25.9", default-features = false, features = [
-  "gif",
-  "jpeg",
-  "png",
-  "rayon",
-  "webp",
-] }
 log.workspace = true
-lru = "0.16.2"
-ouroboros = "0.18.5"
-parking_lot = "0.12.5"
 regex.workspace = true
-resvg = { version = "0.45.1", default-features = false }
-roxmltree = "0.21.1"
-rustc-hash = "2.1.1"
+rust-embed.workspace = true
 serde_json.workspace = true
 slotmap.workspace = true
-smallvec = "1.15.1"
-taffy = "0.9.2"
+smallvec.workspace = true
+strum.workspace = true
 vulkano.workspace = true
 vulkano-shaders.workspace = true
-rust-embed.workspace = true
-flate2 = "1.1.5"
+
+cosmic-text = "0.19.0"
+etagere = "0.3.0"
+flate2 = "1.1.9"
+image = {
+  version = "0.25.10",
+  default-features = false,
+  features = [
+    "gif",
+    "jpeg",
+    "png",
+    "rayon",
+    "webp",
+  ]
+}
+lru = "0.18.1"
+ouroboros = "0.18.5"
+parking_lot = "0.12.5"
+resvg = { version = "0.47.0", default-features = false }
+roxmltree = "0.21.1"
+rustc-hash = "2.1.3"
+taffy = "0.12.1"
+
+# `video` wgui feature
+dav1d-sys = { version = "0.8.3", optional = true }
+
+[features]
+default = ["video"]
+video = ["dep:bytes", "dep:dav1d-sys"]
diff --git a/wgui/assets/wgui/color_selector.xml b/wgui/assets/wgui/color_selector.xml
new file mode 100644
index 00000000..d2b1d9d4
--- /dev/null
+++ b/wgui/assets/wgui/color_selector.xml
@@ -0,0 +1,25 @@
+<layout>
+  <macro name="slider" min_value="0" max_value="255" width="200" height="24" />
+  <macro name="color_pip" width="16" height="16" round="100%" />
+  <macro name="slider_flow" align_items="center" gap="8" />
+
+  <elements>
+    <div gap="8" align_items="center">
+      <div gap="8" flex_direction="column">
+        <div macro="slider_flow">
+          <rectangle macro="color_pip" color="#FF0000"/>
+          <Slider id="slider_r" macro="slider" />
+        </div>
+        <div macro="slider_flow">
+          <rectangle macro="color_pip" color="#00FF00"/>
+          <Slider id="slider_g" macro="slider" />
+        </div>
+        <div macro="slider_flow">
+          <rectangle macro="color_pip" color="#0000FF"/>
+          <Slider id="slider_b" macro="slider" />
+        </div>
+      </div>
+      <rectangle id="rect_color" width="96" height="96" border="4" color="#ffffff" border_color="#000000" round="4" />
+    </div>
+  </elements>
+</layout>
diff --git a/wgui/assets/wgui/context_menu.xml b/wgui/assets/wgui/context_menu.xml
index cdf08d79..2e0cd360 100644
--- a/wgui/assets/wgui/context_menu.xml
+++ b/wgui/assets/wgui/context_menu.xml
@@ -1,15 +1,15 @@
 <layout>
   <!-- text: str -->
   <template name="Cell">
-    <Button id="button" text="${text}" tooltip_str="${tooltip_str}" weight="bold" border="0" padding="4" color="#FFFFFF00" />
+    <Button id="button" text="${text}" tooltip_str="${tooltip_str}" weight="bold" border="0" padding="4" color="background(transparent)" height="24" justify_content="start" />
   </template>
 
   <template name="Separator">
-    <rectangle width="100%" height="2" color="~color_accent" />
+    <rectangle width="100%" height="2" color="outline" />
   </template>
 
   <elements>
-    <rectangle consume_mouse_events="1" color="#000000fa" round="8" border="2" border_color="~color_accent" gap="4" padding="8" id="buttons" flex_direction="column">
+    <rectangle consume_mouse_events="1" color="background(opacity-0.98)" round="8" border="2" border_color="outline" gap="4" padding="8" id="buttons" flex_direction="column">
 
     </rectangle>
   </elements>
diff --git a/wgui/assets/wgui/window_frame.xml b/wgui/assets/wgui/window_frame.xml
index 9abbbe71..5f9a1e5d 100644
--- a/wgui/assets/wgui/window_frame.xml
+++ b/wgui/assets/wgui/window_frame.xml
@@ -6,19 +6,21 @@
       and WINDOW_DECORATION_HEADER_HEIGHT in the source code accordingly
     -->
     <rectangle
+      position="absolute"
       consume_mouse_events="1"
       flex_direction="column"
-      round="16"
+      round="8"
       border="2"
-      border_color="#ffffff33"
-      color="#080c20fa"
+      border_color="outline"
+      color="background"
       padding="2">
       <!-- window title -->
       <div width="100%" height="32" align_items="center" position="relative" justify_content="end">
         <div width="100%" justify_content="center">
-          <label id="text_window_title" weight="bold" />
+          <label id="text_window_title" weight="bold" color="on_background" />
         </div>
-        <Button id="but_close" border="0" round="16" color="#FFFFFF00" position="absolute">
+        <Button id="but_close" border="0" round="4" color="on_background(transparent)" position="absolute"
+          hover_color="danger" hover_border_color="danger(rgb-mult-0.5)" >
           <sprite src_internal="wgui/close.svg" width="32" height="32" />
         </Button>
       </div>
@@ -27,6 +29,7 @@
       <div id="content" padding="8" padding_top="0" gap="4" flex_direction="column">
 
       </div>
+
     </rectangle>
   </elements>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/wgui/doc/widgets.md b/wgui/doc/widgets.md
deleted file mode 100644
index 2c094160..00000000
--- a/wgui/doc/widgets.md
+++ /dev/null
@@ -1,589 +0,0 @@
-# Quick jump
-
-## [Widgets](#widgets)
-
-[div](#div-widget), [label](#label-widget), [rectangle](#rectangle-widget), [sprite](#sprite-widget)
-
-## [Built-in components](#components)
-
-[Button](#button-component), [Slider](#slider-component), [CheckBox](#checkbox-component), [Tabs](#tabs-component) ([Tab](#tab-component)), [EditBox](#editbox-component), [BarGraph](#bargraph-component)
-
-## [Examples](#examples)
-
-[Simple layout](#simple-layout)
-
-[Value substitution (themes)](#value-substitution-themes)
-
-[File inclusion](#file-inclusion)
-
-[Macros](#macros)
-
-[Templates](#templates)
-
-# Universal widget attributes
-
-_They can be used in any widget/component._
-
-`display`: "flex" | "block" | "grid"
-
-`position`: "absolute" | "relative"
-
-`flex_grow`: **float**
-
-`flex_shrink`: **float**
-
-`gap`: **float** | **percent**
-
-`flex_basis`: **float** | **percent**
-
-`justify_self`: "center" | "end" | "flex_end" | "flex_start" | "start" | "stretch"
-
-`justify_content`: "center" | "end" | "flex_start" | "flex_end" | "space_around" | "space_between" | "space_evenly" | "start" | "stretch"
-
-`flex_wrap`: "wrap" | "no_wrap" | "wrap_reverse"
-
-`flex_direction`: "row" | "column" | "column_reverse" | "row_reverse"
-
-`align_items`, `align_self`: "baseline" | "center" | "end" | "flex_start" | "flex_end" | "start" | "stretch"
-
-`box_sizing`: "border_box" | "content_box"
-
-`margin`, `margin_left`, `margin_right`, `margin_top`, `margin_bottom`: **float** | **percent**
-
-`padding`, `padding_left`, `padding_right`, `padding_top`, `padding_bottom`: **float** | **percent**
-
-`overflow`, `overflow_x`, `overflow_y`: "hidden" | "visible" | "clip" | "scroll"
-
-`min_width`, `min_height`: **float** | **percent**
-
-`max_width`, `max_height`: **float** | **percent**
-
-`width`, `height`: **float** | **percent**
-
-## Advanced attributes
-
-`interactable`: "1" | "0"
-
-_Set to 0 if you want to exclude this widget from altering the event state_
-
-`consume_mouse_events`: "1" | "0"
-
-_Used in case of overlapping pop-ups or windows, most notably applied to various backgrounds_
-
-`new_pass`: "1" | "0"
-
-_Set to 1 if you want to render overlapping pop-ups to properly render your widgets in order. Wgui renders with as few Vulkan drawcalls as possible, so this is your responsibility._
-
-## Default Colors
-
-_These colors can be defined by the user to control the color scheme. They always exists and can be used in any place a normal color could be used._
-
-`~color_text`: default: white(#FFFFFF)
-`~color_accent`: default: light blue(#21ADFF)
-`~color_danger`: default: red(#E60000)
-`~color_faded`: default: grey(#ABBDCC)
-`~color_bg`: default: black(#00121ABF) (color_background in config)
-
-_Only the default colors can be changed with the following suffixes._
-
-`_translucent`
-
-_Halves the alpha of the color._
-
-`_10`
-`_20`
-`_30`
-`_40`
-`_50`
-
-_Darkens the color by multiplying it with a percentage. `~color_accent_50` Would be half of the normal brightness but the same alpha. You can't combine the suffixes_
-
-### Color
-
-# Widgets
-
-## div widget
-
-### `<div>`
-
-### The most simple element
-
-#### Parameters
-
-_None_
-
----
-
-## label widget
-
-### `<label>`
-
-### A simple text element
-
-#### Parameters
-
-`text`: **string**
-
-_Simple text_
-
-`translation`: **string**
-
-_Translated by key_
-
-`size`: **float** (default: 14)
-
-_Text size in pixel units_
-
-`wrap`: "1" | "0" (default: "0")
-
-_Enable text wrapping?_
-
-`color`: #FFAABB | #FFAABBCC
-
-`align`: "left" | "right" | "center" | "justified" | "end"
-
-`weight`: "normal" | "bold"
-
-`shadow`: #112233 | #112233CC (default: None)
-
-`shadow_x`: **float** (default: 1.5)
-
-_Horizontal offset of the shadow from the original text. Positive is right._
-
-`shadow_y`: **float** (default: 1.5)
-
-_Vertical offset of the shadow from the original text. Positive is down._
-
----
-
-## rectangle widget
-
-### `<rectangle>`
-
-### A styled rectangle
-
-#### Parameters
-
-`color`: #FFAABB | #FFAABBCC
-
-_1st gradient color_
-
-`color2`: #FFAABB | #FFAABBCC
-
-_2nd gradient color_
-
-`gradient`: "horizontal" | "vertical" | "radial" | "none"
-
-`round`: **float** (default: 0) | **percent** (0-100%)
-
-`border`: **float**
-
-`border_color`: #FFAABB | #FFAABBCC
-
----
-
-## sprite widget
-
-### `<sprite>`
-
-### Image widget for small images
-
-Always set the `width` & `height` of a `<sprite>`!
-
-Supported formats: svg, png, jpeg, gif, webp
-
-Maximum image size: 256x256 pixels
-
-For large or frequently changing images (e.g. album art), or if borders/rounding is desired, consider the `<image>` tag instead.
-
-Sprite images are atlassed, making them very efficient to render.
-
-Adding large sprites permanently increases the atlas size (and thus VRAM usage) for the session. (Atlas space can be re-used, but the atlas won't shrink back.)
-
-#### Parameters
-
-`src`: **string**
-
-_External (filesystem) image path. Falls back to Internal (assets) if not found._
-
-`src_ext`: **string**
-
-_External (filesystem) image path_
-
-`src_builtin`: **string**
-
-_Internal (assets) image path_
-
-`src_internal`: **string**
-
-_wgui internal image path. Do not use directly unless it's related to the core wgui assets._
-
-## image widget
-
-### `<image>`
-
-### Image widget for large images
-
-Always set the `width` & `height` of an `<image>`!
-
-Supported formats: svg, png, jpeg, gif, webp
-
-Maximum image size: Max texture size for the GPU (usually 8K+)
-
-For small images such as icons, consider using the `<sprite>` tag instead.
-
-`<image>` requires a single draw call per widget, while `<sprite>` widgets all share a single draw call per panel.
-
-#### Parameters
-
-`src`: **string**
-
-_External (filesystem) image path. Falls back to Internal (assets) if not found._
-
-`src_ext`: **string**
-
-_External (filesystem) image path_
-
-`src_builtin`: **string**
-
-_Internal (assets) image path_
-
-`src_internal`: **string**
-
-_wgui internal image path. Do not use directly unless it's related to the core wgui assets._
-
-`round`: **float** (default: 0) | **percent** (0-100%)
-
-`border`: **float**
-
-`border_color`: #FFAABB | #FFAABBCC
-
----
-
-# Components
-
-## Button component
-
-### `<Button>`
-
-### A clickable, decorated button
-
-#### Parameters
-
-`text`: **string**
-
-_Simple text_
-
-`translation`: **string**
-
-_Translated by key_
-
-`round`: **float** (default: 4) | **percent** (0-100%)
-
-`border`: **float** (default: 2)
-
-`color`: #FFAABB | #FFAABBCC
-
-`border_color`: #FFAABB | #FFAABBCC
-
-`hover_color`: #FFAABB | #FFAABBCC
-
-`hover_border_color`: #FFAABB | #FFAABBCC
-
-`tooltip`: **string**
-
-_Tooltip text on hover, translated by key_
-
-`tooltip_str`: **string**
-
-_Tooltip text on hover, raw text (not translated)_
-
-`tooltip_side`: "top" | "bottom" | "left" | "right" (default: top)
-
-`sticky`: "1" | "0" (default: "0")
-
-_make button act as a toggle (visual only)_
-
-`sprite_src` | `sprite_src_ext` | `sprite_src_builtin` | `sprite_src_internal`
-
-_Image path (see [sprite](#sprite-widget)) for src descriptions_
-
-#### Info
-
-Child widgets are supported and can be added directly in XML.
-
----
-
-## Slider component
-
-### `<Slider>`
-
-### A simple slider.
-
-#### Parameters
-
-`min_value`: **float**
-
-`max_value`: **float**
-
-_Needs to be bigger than `min_value`_
-
-`value`: **float**
-
-_Initial slider value_
-
-`show_value`: "1" | "0"
-
-_Set to 0 if you don't want to display value text in the slider handle_
-
----
-
-## Checkbox component
-
-### `<CheckBox>`
-
-### A check-box with label.
-
-#### Parameters
-
-`text`: **string**
-
-_Simple text_
-
-`translation`: **string**
-
-_Translated by key_
-
-`box_size`: **float** (default: 24)
-
-`color_checked`: #FFAABB | #FFAABBCC
-
-`value`: **string**
-
-_optional value that will be sent with internal events_
-
-`checked`: **int** (default: 0)
-
----
-
-## Radiobox component
-
-### `<RadioBox>`
-
-### A radio-box with label.
-
-#### Parameters
-
-`text`: **string**
-
-_Simple text_
-
-`translation`: **string**
-
-_Translated by key_
-
-`box_size`: **float** (default: 24)
-
-`value`: **string**
-
-_optional value that will be set as the RadioGroup's value_
-
-`checked`: **int** (default: 0)
-
----
-
-## RadioGroup component
-
-### `<RadioGroup>`
-
-### A radio group. Place `<RadioBox>` components inside this.
-
-## Tabs component
-
-### `<Tabs>`
-
-### A tab bar component
-
-#### Parameters
-
-`id`: **string**
-
-_Unique identifier for the tab group_
-
-Only `<Tab>` components should be placed inside `<Tabs>`.
-
----
-
-## Tab component
-
-### `<Tab>`
-
-### A single tab inside a `<Tabs>` component
-
-#### Parameters
-
-`name`: **string**
-
-_Unique identifier for the tab_
-
-`translation`: **string**
-
-_Translated by key_
-
-`sprite_src` | `sprite_src_ext` | `sprite_src_builtin` | `sprite_src_internal`
-
-_Image path (see [sprite](#sprite-widget)) for src descriptions_
-
----
-
-## EditBox component
-
-### `<EditBox>`
-
-### A single-line text input field.
-
-#### Parameters
-
-`text`: **string**
-
-_Initial text content_
-
-## BarGraph component
-
-### `<BarGraph>`
-
-### A bar graph widget
-
-#### Parameters
-
-`limit_min`: **float**
-
-_Minimum limit value_
-
-`limit_max`: **float**
-
-_Maximum limit value_
-
-`unit`: **string** (default: "")
-
-_Unit type, for example "%" or "ms"_
-
-`capacity`: **int** (default: 50)
-
-_Value count_
-
----
-
-# Examples
-
-## Simple layout
-
-```xml
-<layout>
-  <elements>
-    <label text="Hello, world!"/>
-    <label translation="WELCOME.HELLO_WORLD" size="20" color="#FF0000"/>
-    <div gap="16" flex_direction="row">
-      <rectangle width="16" height="16" color="#FF0000"/>
-      <rectangle width="16" height="16" color="#00FF00"/>
-      <rectangle width="16" height="16" color="#0000FF"/>
-    </div>
-  </elements>
-</layout>
-```
-
-## Value substitution (themes)
-
-```xml
-<layout>
-  <theme>
-    <var key="hello" value="Hello, world!" />
-    <var key="text_color" value="#FF0000" />
-  </theme>
-
-  <elements>
-    <!-- "~hello" will be replaced to "Hello, world!" -->
-    <label text="~hello"/>
-    <!-- "~text_color" will be replaced to "#FF0000" -->
-    <label text="This text will be red" color="~text_color"/>
-  </elements>
-</layout>
-```
-
-## Macros
-
-```xml
-<layout>
-  <macro name="my_macro"
-    margin="4" min_width="100" min_height="100" flex_direction="row" gap="8"
-    align_items="center" justify_content="center"/>
-
-  <elements>
-    <!-- This div will have all attributes specified in "my_macro" -->
-    <div macro="my_macro">
-      <label text="hello, world!"/>
-    </div>
-  </elements>
-</layout>
-
-```
-
-## File inclusion
-
-theme.xml:
-
-```xml
-<layout>
-  <theme>
-    <var key="my_red" value="#FF0000" />
-    <var key="my_green" value="#00FF00" />
-    <var key="my_blue" value="#0000FF" />
-  </theme>
-</layout>
-```
-
-bar.xml:
-
-```xml
-<layout>
-  <elements>
-    <!-- utilize theme variables included in theme.xml -->
-    <rectangle width="16" height="16" color="~my_red"/>
-    <rectangle width="16" height="16" color="~my_green"/>
-    <rectangle width="16" height="16" color="~my_blue"/>
-  </elements>
-</layout>
-```
-
-main.xml:
-
-```xml
-<layout>
-  <!-- Include theme -->
-  <include src="theme.xml"/>
-
-  <elements>
-    <!-- Include as additional elements here -->
-    <include src="bar.xml"/>
-  </elements>
-</layout>
-```
-
-## Templates
-
-```xml
-<layout>
-  <!-- "title" attrib will be passed to every matching ${title} -->
-  <template name="DecoratedTitle">
-    <rectangle color="#FFFF00" padding="8" round="4" gap="4">
-      <label text="${title}"/>
-    </rectangle>
-  </template>
-
-  <elements>
-    <!-- "title" used here -->
-    <DecoratedTitle title="This is a title.">
-  </elements>
-</layout>
-
-```
diff --git a/wgui/src/animation.rs b/wgui/src/animation.rs
index c89d29cb..ff8c6a0d 100644
--- a/wgui/src/animation.rs
+++ b/wgui/src/animation.rs
@@ -49,6 +49,7 @@ pub struct CallbackData<'a> {
 	pub widget_id: WidgetID,
 	pub widget_boundary: Boundary,
 	pub pos: f32, // 0.0 (start of animation) - 1.0 (end of animation)
+	pub stop_me: &'a mut bool,
 }
 
 pub type AnimationCallback = Box<dyn Fn(&mut CallbackDataCommon, &mut CallbackData)>;
@@ -93,13 +94,16 @@ impl Animation {
 		}
 	}
 
-	fn call(&self, state: &LayoutState, alterables: &mut EventAlterables, pos: f32) {
+	/// @returns false if it wants to be stopped
+	#[must_use]
+	fn call(&self, state: &LayoutState, alterables: &mut EventAlterables, pos: f32) -> bool {
 		let Some(widget) = state.widgets.get(self.target_widget).cloned() else {
-			return; // failed
+			return false; // failed
 		};
 
 		let mut widget_state = widget.state();
 		let (data, obj) = widget_state.get_data_obj_mut();
+		let mut stop_me = false;
 
 		let data = &mut CallbackData {
 			widget_id: self.target_widget,
@@ -107,11 +111,14 @@ impl Animation {
 			obj,
 			data,
 			pos,
+			stop_me: &mut stop_me,
 		};
 
 		let common = &mut CallbackDataCommon { state, alterables };
 
 		(self.callback)(common, data);
+
+		!stop_me
 	}
 }
 
@@ -133,22 +140,24 @@ impl Animations {
 
 			anim.pos_prev = anim.pos;
 			anim.pos = pos;
-			anim.call(state, alterables, 1.0);
 
 			if anim.last_tick {
+				let _ = anim.call(state, alterables, 1.0);
 				alterables.needs_redraw = true;
+			} else {
+				anim.ticks_remaining -= 1;
 			}
-
-			anim.ticks_remaining -= 1;
 		}
 
-		self.running_animations.retain(|anim| anim.ticks_remaining > 0);
+		self.running_animations.retain(|anim| !anim.last_tick);
 	}
 
 	pub fn process(&mut self, state: &LayoutState, alterables: &mut EventAlterables, alpha: f32) {
 		for anim in &mut self.running_animations {
 			let pos = anim.pos_prev.lerp(anim.pos, alpha);
-			anim.call(state, alterables, pos);
+			if !anim.call(state, alterables, pos) {
+				anim.ticks_remaining = 0;
+			}
 		}
 	}
 
diff --git a/wgui/src/assets.rs b/wgui/src/assets.rs
index e1fb4511..7733b77f 100644
--- a/wgui/src/assets.rs
+++ b/wgui/src/assets.rs
@@ -2,9 +2,34 @@ use flate2::read::GzDecoder;
 use std::ffi::OsStr;
 use std::io::Read;
 use std::path::{Component, Path, PathBuf};
+use std::rc::Rc;
 
 use crate::i18n::LangsList;
 
+pub enum AssetPathRc {
+	WguiInternal(Rc<str>),  // tied to internal wgui AssetProvider. Used internally
+	BuiltIn(Rc<str>),       // tied to user AssetProvider
+	FileOrBuiltIn(Rc<str>), // attempts to load from a path relative to asset_folder, falls back to BuiltIn
+	File(Rc<str>),          // load from filesystem
+}
+
+impl AssetPathRc {
+	pub fn as_borrowed(&self) -> AssetPath<'_> {
+		match self {
+			Self::WguiInternal(path) => AssetPath::WguiInternal(path.as_ref()),
+			Self::BuiltIn(path) => AssetPath::BuiltIn(path.as_ref()),
+			Self::FileOrBuiltIn(path) => AssetPath::FileOrBuiltIn(path.as_ref()),
+			Self::File(path) => AssetPath::File(path.as_ref()),
+		}
+	}
+}
+
+impl<'a> From<&'a AssetPathRc> for AssetPath<'a> {
+	fn from(path: &'a AssetPathRc) -> Self {
+		path.as_borrowed()
+	}
+}
+
 #[derive(Debug, Clone, Copy)]
 pub enum AssetPath<'a> {
 	WguiInternal(&'a str),  // tied to internal wgui AssetProvider. Used internally
diff --git a/wgui/src/color.rs b/wgui/src/color.rs
new file mode 100644
index 00000000..85c42574
--- /dev/null
+++ b/wgui/src/color.rs
@@ -0,0 +1,226 @@
+use crate::{drawing, palette::WguiColorPalette};
+use strum::{EnumCount, EnumString};
+// Primary: button color
+// OnPrimary: text color placed on the Primary-colored button
+
+#[derive(Debug, Copy, Clone, EnumCount, EnumString)]
+#[repr(usize)]
+#[strum(serialize_all = "snake_case")]
+pub enum WguiColorName {
+	Primary,
+	OnPrimary,
+	Secondary,
+	OnSecondary,
+	Tertiary,
+	OnTertiary,
+	Danger,
+	OnDanger,
+	Background,
+	OnBackground,
+	BackgroundVariant,
+	OnBackgroundVariant,
+	BackgroundContrast,
+	OnBackgroundContrast,
+	Outline,
+	Shadow,
+	Highlight,
+}
+
+#[derive(Clone, Copy, Debug)]
+pub struct WguiNamedColor {
+	name: WguiColorName,
+	rgb_multiplier: f32,
+	rgb_addition: f32,
+	alpha: f32,
+}
+
+#[derive(Default, Clone, Copy, Debug, EnumString)]
+#[strum(ascii_case_insensitive, serialize_all = "snake_case")]
+pub enum ParentColor {
+	#[default]
+	Foreground,
+	Background,
+	Ignore,
+}
+
+#[derive(Clone, Copy, Debug)]
+pub enum WguiColor {
+	Raw(drawing::Color),
+	Named(WguiNamedColor),
+}
+
+impl WguiColor {
+	pub fn resolve(&self, palette: &WguiColorPalette) -> drawing::Color {
+		match &self {
+			WguiColor::Raw(color) => *color,
+			WguiColor::Named(color) => color.resolve(palette),
+		}
+	}
+
+	#[must_use]
+	pub const fn mult_rgb(&self, mult: f32) -> WguiColor {
+		match self {
+			WguiColor::Raw(color) => WguiColor::Raw(color.mult_rgb(mult)),
+			WguiColor::Named(color) => WguiColor::Named(WguiNamedColor {
+				name: color.name,
+				rgb_multiplier: color.rgb_multiplier * mult,
+				rgb_addition: color.rgb_addition,
+				alpha: color.alpha,
+			}),
+		}
+	}
+
+	#[must_use]
+	pub const fn add_rgb(&self, addition: f32) -> WguiColor {
+		match self {
+			WguiColor::Raw(color) => WguiColor::Raw(color.add_rgb(addition)),
+			WguiColor::Named(color) => WguiColor::Named(WguiNamedColor {
+				name: color.name,
+				rgb_multiplier: color.rgb_multiplier,
+				rgb_addition: color.rgb_addition + addition,
+				alpha: color.alpha,
+			}),
+		}
+	}
+
+	#[must_use]
+	pub const fn add_alpha(&self, alpha: f32) -> WguiColor {
+		match self {
+			WguiColor::Raw(color) => WguiColor::Raw(drawing::Color {
+				r: color.r,
+				g: color.g,
+				b: color.b,
+				a: color.a + alpha,
+			}),
+			WguiColor::Named(color) => WguiColor::Named(WguiNamedColor {
+				name: color.name,
+				rgb_multiplier: color.rgb_multiplier,
+				rgb_addition: color.rgb_addition,
+				alpha: color.alpha + alpha,
+			}),
+		}
+	}
+
+	#[must_use]
+	pub const fn with_alpha(&self, alpha: f32) -> WguiColor {
+		match self {
+			WguiColor::Raw(color) => WguiColor::Raw(color.with_alpha(alpha)),
+			WguiColor::Named(color) => WguiColor::Named(WguiNamedColor {
+				name: color.name,
+				rgb_multiplier: color.rgb_multiplier,
+				rgb_addition: color.rgb_addition,
+				alpha,
+			}),
+		}
+	}
+
+	// returns named colors if val is 0 or 1, raw otherwise
+	#[must_use]
+	pub fn lerp(&self, palette: &WguiColorPalette, other: &WguiColor, val: f32) -> WguiColor {
+		if val <= 0.0 {
+			*self
+		} else if val >= 1.0 {
+			*other
+		} else {
+			let c1 = self.resolve(palette);
+			let c2 = other.resolve(palette);
+			c1.lerp(&c2, val).into()
+		}
+	}
+
+	/// Gets a matching foreground color from a background color
+	pub fn fg_color(&self) -> Option<Self> {
+		if let Self::Named(name) = self {
+			name.name.fg_color().map(|x| x.into())
+		} else {
+			None
+		}
+	}
+
+	/// Gets a matching background color from a foreground color
+	pub fn bg_color(&self) -> Option<Self> {
+		if let Self::Named(name) = self {
+			name.name.bg_color().map(|x| x.into())
+		} else {
+			None
+		}
+	}
+}
+
+impl WguiColorName {
+	pub fn fg_color(&self) -> Option<Self> {
+		match self {
+			Self::Primary => Some(Self::OnPrimary),
+			Self::Secondary => Some(Self::OnSecondary),
+			Self::Tertiary => Some(Self::OnTertiary),
+			Self::Danger => Some(Self::OnDanger),
+			Self::Background => Some(Self::OnBackground),
+			Self::BackgroundVariant => Some(Self::OnBackgroundVariant),
+			Self::BackgroundContrast => Some(Self::OnBackgroundContrast),
+			_ => None,
+		}
+	}
+
+	pub fn bg_color(&self) -> Option<Self> {
+		match self {
+			Self::OnPrimary => Some(Self::Primary),
+			Self::OnSecondary => Some(Self::Secondary),
+			Self::OnTertiary => Some(Self::Tertiary),
+			Self::OnDanger => Some(Self::Danger),
+			Self::OnBackground => Some(Self::Background),
+			Self::OnBackgroundVariant => Some(Self::BackgroundVariant),
+			Self::OnBackgroundContrast => Some(Self::BackgroundContrast),
+			_ => None,
+		}
+	}
+
+	pub const fn to_wgui_color(&self) -> WguiColor {
+		WguiColor::Named(WguiNamedColor {
+			name: *self,
+			alpha: 1.0,
+			rgb_multiplier: 1.0,
+			rgb_addition: 0.0,
+		})
+	}
+}
+
+impl From<WguiColorName> for WguiColor {
+	fn from(name: WguiColorName) -> Self {
+		name.to_wgui_color()
+	}
+}
+
+impl From<drawing::Color> for WguiColor {
+	fn from(color: drawing::Color) -> Self {
+		WguiColor::Raw(color)
+	}
+}
+
+impl Default for WguiColor {
+	fn default() -> Self {
+		Self::Raw(Default::default())
+	}
+}
+
+impl WguiNamedColor {
+	pub fn resolve(&self, palette: &WguiColorPalette) -> drawing::Color {
+		let mut color = palette[self.name];
+		if self.alpha != 1.0 {
+			color.a *= self.alpha;
+		}
+
+		if self.rgb_multiplier != 1.0 {
+			color.r *= self.rgb_multiplier;
+			color.g *= self.rgb_multiplier;
+			color.b *= self.rgb_multiplier;
+		}
+
+		if self.rgb_addition != 0.0 {
+			color.r += self.rgb_addition;
+			color.g += self.rgb_addition;
+			color.b += self.rgb_addition;
+		}
+
+		color
+	}
+}
diff --git a/wgui/src/components/bar_graph.rs b/wgui/src/components/bar_graph.rs
index 083369a4..9e2e2e0e 100644
--- a/wgui/src/components/bar_graph.rs
+++ b/wgui/src/components/bar_graph.rs
@@ -70,7 +70,7 @@ impl ComponentTrait for ComponentBarGraph {
 
 	fn refresh(&self, data: &mut RefreshData) {
 		let state = self.state.borrow();
-		self.update_limits_text(&state, data.common);
+		self.update_limits_text(&state, &mut data.layout.common());
 	}
 }
 
@@ -120,7 +120,7 @@ pub fn construct(
 		root.id,
 		WidgetDiv::create(),
 		taffy::Style {
-			justify_content: Some(JustifyContent::SpaceBetween),
+			justify_content: Some(JustifyContent::SPACE_BETWEEN),
 			flex_direction: FlexDirection::Column,
 			size: taffy::Size {
 				width: auto(),
@@ -134,10 +134,10 @@ pub fn construct(
 		root.id,
 		WidgetRectangle::create(WidgetRectangleParams {
 			border: 2.0,
-			border_color: drawing::Color::new(1.0, 1.0, 1.0, 0.5),
+			border_color: drawing::Color::new(1.0, 1.0, 1.0, 0.5).into(),
 			round: WLength::Units(3.0),
 			gradient: GradientMode::Vertical,
-			color: drawing::Color::new(0.0, 0.0, 0.0, 0.6),
+			color: drawing::Color::new(0.0, 0.0, 0.0, 0.6).into(),
 			..Default::default()
 		}),
 		taffy::Style {
diff --git a/wgui/src/components/button.rs b/wgui/src/components/button.rs
index cb955c7f..19808d21 100644
--- a/wgui/src/components/button.rs
+++ b/wgui/src/components/button.rs
@@ -1,11 +1,12 @@
 use crate::{
 	animation::{Animation, AnimationEasing},
 	assets::AssetPath,
+	color::{ParentColor, WguiColor, WguiColorName},
 	components::{
 		self, Component, ComponentBase, ComponentTrait, RefreshData,
 		tooltip::{ComponentTooltip, TooltipTrait},
 	},
-	drawing::{self, Boundary, Color},
+	drawing::{self, Boundary},
 	event::{CallbackDataCommon, EventListenerCollection, EventListenerID, EventListenerKind},
 	i18n::Translation,
 	layout::{WidgetID, WidgetPair},
@@ -23,6 +24,7 @@ use crate::{
 	},
 };
 use glam::{Mat4, Vec2, Vec3};
+use slotmap::Key;
 use std::{
 	cell::RefCell,
 	rc::Rc,
@@ -33,11 +35,14 @@ use taffy::{AlignItems, JustifyContent, prelude::length};
 pub struct Params<'a> {
 	pub text: Option<Translation>, // if unset, label will not be populated
 	pub sprite_src: Option<AssetPath<'a>>,
-	pub color: Option<drawing::Color>,
+	pub sprite_color: Option<WguiColor>,
+	pub color: Option<WguiColor>,
 	pub border: f32,
-	pub border_color: Option<drawing::Color>,
-	pub hover_border_color: Option<drawing::Color>,
-	pub hover_color: Option<drawing::Color>,
+	pub border_color: Option<WguiColor>,
+	pub hover_color: Option<WguiColor>,
+	pub hover_border_color: Option<WguiColor>,
+	pub sticky_color: Option<WguiColor>,
+	pub sticky_border_color: Option<WguiColor>,
 	pub round: WLength,
 	pub style: taffy::Style,
 	pub text_style: TextStyle,
@@ -52,13 +57,16 @@ pub struct Params<'a> {
 impl Default for Params<'_> {
 	fn default() -> Self {
 		Self {
+			sprite_color: None,
 			text: Some(Translation::from_raw_text("")),
 			sprite_src: None,
 			color: None,
-			hover_color: None,
 			border_color: None,
-			border: 2.0,
+			hover_color: None,
 			hover_border_color: None,
+			sticky_color: None,
+			sticky_border_color: None,
+			border: 2.0,
 			round: WLength::Units(4.0),
 			style: Default::default(),
 			text_style: TextStyle::default(),
@@ -77,10 +85,12 @@ pub struct ButtonClickEvent {
 pub type ButtonClickCallback = Rc<dyn Fn(&mut CallbackDataCommon, ButtonClickEvent) -> anyhow::Result<()>>;
 
 pub struct Colors {
-	pub color: drawing::Color,
-	pub border_color: drawing::Color,
-	pub hover_color: drawing::Color,
-	pub hover_border_color: drawing::Color,
+	pub color: WguiColor,
+	pub border_color: WguiColor,
+	pub hover_color: WguiColor,
+	pub hover_border_color: WguiColor,
+	pub sticky_color: WguiColor,
+	pub sticky_border_color: WguiColor,
 }
 
 struct State {
@@ -91,6 +101,9 @@ struct State {
 	active_tooltip: Option<Rc<ComponentTooltip>>,
 	colors: Colors,
 	last_pressed: Instant,
+	id_label: WidgetID,  // Label
+	id_sprite: WidgetID, // Sprite
+	children_discovered: bool,
 }
 
 impl TooltipTrait for State {
@@ -100,8 +113,7 @@ impl TooltipTrait for State {
 }
 
 struct Data {
-	id_label: WidgetID, // Label
-	id_rect: WidgetID,  // Rectangle
+	id_rect: WidgetID, // Rectangle
 	sticky: bool,
 }
 
@@ -123,9 +135,48 @@ impl ComponentTrait for ComponentButton {
 	fn refresh(&self, data: &mut RefreshData) {
 		let mut state = self.state.borrow_mut();
 
+		if !state.children_discovered {
+			state.children_discovered = true;
+
+			let mut children = vec![];
+			data
+				.layout
+				.collect_children_ids_recursive(self.data.id_rect, &mut children);
+
+			for child in children {
+				if let Some(mut widget) = data.layout.state.widgets.get_as::<WidgetSprite>(child) {
+					if !state.id_sprite.is_null() && state.id_sprite != child {
+						log::error!("Button with more than one sprite!");
+					}
+					// apply initial color from button
+					if let Some(apply_color) = color_to_apply(widget.parent_color(), state.colors.color) {
+						let common = &mut CallbackDataCommon {
+							state: &data.layout.state,
+							alterables: &mut data.layout.alterables,
+						};
+						widget.set_color(common, apply_color);
+					}
+					state.id_sprite = child;
+				} else if let Some(mut widget) = data.layout.state.widgets.get_as::<WidgetLabel>(child) {
+					if !state.id_label.is_null() && state.id_label != child {
+						log::error!("Button with more than one label!");
+					}
+					if let Some(apply_color) = color_to_apply(widget.parent_color(), state.colors.color) {
+						let common = &mut CallbackDataCommon {
+							state: &data.layout.state,
+							alterables: &mut data.layout.alterables,
+						};
+						widget.set_color(common, apply_color, true);
+					}
+					state.id_label = child;
+				}
+			}
+		}
+
 		if state.active_tooltip.is_some() {
-			if let Some(node_id) = data.common.state.nodes.get(self.base.get_id()) {
-				if !widget::is_node_visible(&data.common.state.tree, *node_id) {
+			let l_state = &data.layout.state;
+			if let Some(node_id) = l_state.nodes.get(self.base.get_id()) {
+				if !widget::is_node_visible(&l_state.tree, *node_id) {
 					state.active_tooltip = None; // destroy the tooltip, this button is now hidden
 				}
 			} else {
@@ -133,41 +184,55 @@ impl ComponentTrait for ComponentButton {
 			}
 		}
 	}
+
+	fn destroy(&self, data: &mut components::DestroyData) {
+		if let Some(comp) = self.state.borrow_mut().active_tooltip.take() {
+			comp.destroy(data);
+			data.destroy_widgets.push(comp.base().id);
+		}
+	}
 }
 
-fn get_color2(color: &drawing::Color, gradient_intensity: f32) -> drawing::Color {
-	color.lerp(&Color::new(0.0, 0.0, 0.0, color.a), gradient_intensity)
+fn get_color2(color: &WguiColor, gradient_intensity: f32) -> WguiColor {
+	color.mult_rgb(1.0 - gradient_intensity)
 }
 
 impl ComponentButton {
-	pub fn get_label(&self) -> WidgetID {
-		self.data.id_label
-	}
-
 	pub fn get_rect(&self) -> WidgetID {
 		self.data.id_rect
 	}
 
 	pub fn set_text(&self, common: &mut CallbackDataCommon, text: Translation) {
-		let Some(mut label) = common.state.widgets.get_as::<WidgetLabel>(self.data.id_label) else {
+		let state = self.state.borrow();
+		let Some(mut label) = common.state.widgets.get_as::<WidgetLabel>(state.id_label) else {
 			return;
 		};
 
 		label.set_text(common, text);
 	}
 
-	pub fn set_color(&self, common: &mut CallbackDataCommon, color: Color) {
+	pub fn set_color(&self, common: &mut CallbackDataCommon, color: WguiColor) {
 		let gradient_intensity = common.state.theme.gradient_intensity;
 
 		let Some(mut rect) = common.state.widgets.get_as::<WidgetRectangle>(self.data.id_rect) else {
 			return;
 		};
+		rect.params.color = color;
+		rect.params.color2 = get_color2(&color, gradient_intensity);
 
 		let mut state = self.state.borrow_mut();
 		state.colors.color = color;
 
-		rect.params.color = color;
-		rect.params.color2 = get_color2(&color, gradient_intensity);
+		if let Some(mut label) = common.state.widgets.get_as::<WidgetLabel>(state.id_label)
+			&& let Some(apply_color) = color_to_apply(label.parent_color(), color)
+		{
+			label.set_color(common, apply_color, true);
+		}
+		if let Some(mut sprite) = common.state.widgets.get_as::<WidgetSprite>(state.id_sprite)
+			&& let Some(apply_color) = color_to_apply(sprite.parent_color(), color)
+		{
+			sprite.set_color(common, apply_color);
+		}
 	}
 
 	pub fn get_time_since_last_pressed(&self) -> Duration {
@@ -215,10 +280,39 @@ impl ComponentButton {
 
 				let state = state.borrow();
 				let colors = &state.colors;
-				let bgcolor = colors.color.lerp(&colors.hover_color, mult * 0.5);
-				rect.params.color = bgcolor;
-				rect.params.color2 = get_color2(&bgcolor, gradient_intensity);
-				rect.params.border_color = colors.border_color.lerp(&colors.hover_border_color, mult);
+
+				let (alt_color, alt_border_color) = if sticky_down {
+					(&colors.sticky_color, &colors.sticky_border_color)
+				} else {
+					(&colors.hover_color, &colors.hover_border_color)
+				};
+
+				{
+					let bg_color = colors.color.lerp(&common.globals().palette, alt_color, mult);
+
+					rect.params.color = bg_color;
+					rect.params.color2 = get_color2(&bg_color, gradient_intensity);
+					rect.params.border_color = colors
+						.border_color
+						.lerp(&common.globals().palette, alt_border_color, mult);
+
+					if let Some(fg_color0) = colors.color.fg_color()
+						&& let Some(fg_color1) = alt_color.fg_color()
+					{
+						let fg_color = fg_color0.lerp(&common.globals().palette, &fg_color1, mult);
+						if let Some(mut label) = common.state.widgets.get_as::<WidgetLabel>(state.id_label)
+							&& let Some(apply) = color_to_apply2(label.parent_color(), bg_color, fg_color)
+						{
+							label.set_color(common, apply, true);
+						}
+
+						if let Some(mut sprite) = common.state.widgets.get_as::<WidgetSprite>(state.id_sprite)
+							&& let Some(apply) = color_to_apply2(sprite.parent_color(), bg_color, fg_color)
+						{
+							sprite.set_color(common, apply);
+						}
+					}
+				}
 				common.alterables.mark_redraw();
 			}),
 		);
@@ -231,6 +325,8 @@ impl ComponentButton {
 fn anim_hover(
 	common: &mut CallbackDataCommon,
 	rect: &mut WidgetRectangle,
+	label: WidgetID,
+	sprite: WidgetID,
 	widget_data: &mut WidgetData,
 	colors: &Colors,
 	widget_boundary: Boundary,
@@ -241,12 +337,30 @@ fn anim_hover(
 	let mult = pos * if pressed { 1.5 } else { 1.0 };
 
 	let (init_border_color, init_color) = if sticky_down {
-		(colors.hover_border_color, colors.color.lerp(&colors.hover_color, 0.5))
+		(colors.sticky_border_color, colors.sticky_color)
 	} else {
 		(colors.border_color, colors.color)
 	};
+	let bg_color = init_color.lerp(&common.globals().palette, &colors.hover_color, mult);
 
-	let bgcolor = init_color.lerp(&colors.hover_color, mult);
+	if let Some(fg_color0) = init_color.fg_color()
+		&& let Some(fg_color1) = colors.hover_color.fg_color()
+	{
+		let fg_color = fg_color0.lerp(&common.globals().palette, &fg_color1, mult);
+		if let Some(mut label) = common.state.widgets.get_as::<WidgetLabel>(label)
+			&& let Some(apply) = color_to_apply2(label.parent_color(), bg_color, fg_color)
+		{
+			label.set_color(common, apply, true);
+		}
+
+		if let Some(mut sprite) = common.state.widgets.get_as::<WidgetSprite>(sprite)
+			&& let Some(apply) = color_to_apply2(sprite.parent_color(), bg_color, fg_color)
+		{
+			sprite.set_color(common, apply);
+		}
+	}
+
+	let globals = common.globals();
 
 	let gradient_intensity = common.state.theme.gradient_intensity;
 
@@ -255,10 +369,10 @@ fn anim_hover(
 	let t = Mat4::from_scale(Vec3::splat(1.0 + pos * 0.05));
 	widget_data.transform = centered_matrix(widget_boundary.size, &t);
 
-	rect.params.color = bgcolor;
-	rect.params.color2 = get_color2(&bgcolor, gradient_intensity);
+	rect.params.color = bg_color;
+	rect.params.color2 = get_color2(&bg_color, gradient_intensity);
 
-	rect.params.border_color = init_border_color.lerp(&colors.hover_border_color, mult);
+	rect.params.border_color = init_border_color.lerp(&globals.palette, &colors.hover_border_color, mult);
 }
 
 fn anim_hover_create(state: Rc<RefCell<State>>, widget_id: WidgetID, fade_in: bool, anim_mult: f32) -> Animation {
@@ -272,6 +386,8 @@ fn anim_hover_create(state: Rc<RefCell<State>>, widget_id: WidgetID, fade_in: bo
 			anim_hover(
 				common,
 				rect,
+				state.id_label,
+				state.id_sprite,
 				anim_data.data,
 				&state.colors,
 				anim_data.widget_boundary,
@@ -329,6 +445,18 @@ fn register_event_mouse_leave(
 	)
 }
 
+fn register_event_mouse_cancel(state: Rc<RefCell<State>>, listeners: &mut EventListenerCollection) -> EventListenerID {
+	listeners.register(
+		EventListenerKind::MouseCancel,
+		Box::new(move |_common, _event_data, (), ()| {
+			let mut state = state.borrow_mut();
+			state.down = false;
+			state.hovered = false;
+			Ok(EventResult::Pass)
+		}),
+	)
+}
+
 fn register_event_mouse_press(state: Rc<RefCell<State>>, listeners: &mut EventListenerCollection) -> EventListenerID {
 	listeners.register(
 		EventListenerKind::MousePress,
@@ -339,6 +467,8 @@ fn register_event_mouse_press(state: Rc<RefCell<State>>, listeners: &mut EventLi
 			anim_hover(
 				common,
 				rect,
+				state.id_label,
+				state.id_sprite,
 				event_data.widget_data,
 				&state.colors,
 				common.state.get_node_boundary(event_data.node_id),
@@ -378,16 +508,18 @@ fn register_event_mouse_release(
 				state.sticky_down = !state.sticky_down;
 			}
 
-			common.alterables.trigger_haptics();
-			common.alterables.play_sound(WguiSoundType::ButtonRelease);
-			common.alterables.mark_redraw();
-
 			if state.down {
+				common.alterables.trigger_haptics();
+				common.alterables.play_sound(WguiSoundType::ButtonRelease);
+				common.alterables.mark_redraw();
+
 				state.down = false;
 				if state.hovered {
 					anim_hover(
 						common,
 						rect,
+						state.id_label,
+						state.id_sprite,
 						event_data.widget_data,
 						&state.colors,
 						common.state.get_node_boundary(event_data.node_id),
@@ -416,39 +548,44 @@ fn register_event_mouse_release(
 	)
 }
 
+const DEFAULT_COLOR: WguiColor = WguiColorName::BackgroundVariant.to_wgui_color();
+const DEFAULT_BORDER_COLOR: WguiColor = WguiColorName::Outline.to_wgui_color();
+const DEFAULT_HOVER_COLOR: WguiColor = WguiColorName::Tertiary.to_wgui_color();
+const DEFAULT_HOVER_BORDER_COLOR: WguiColor = WguiColorName::Tertiary.to_wgui_color().mult_rgb(0.5);
+const DEFAULT_STICKY_COLOR: WguiColor = WguiColorName::Primary.to_wgui_color();
+const DEFAULT_STICKY_BORDER_COLOR: WguiColor = WguiColorName::Primary.to_wgui_color().mult_rgb(0.5);
+
 pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Result<(WidgetPair, Rc<ComponentButton>)> {
 	let mut style = params.style;
 	let theme = &ess.layout.state.theme;
 
-	// force-override style
-	style.align_items = Some(AlignItems::Center);
+	if style.align_items.is_none() {
+		style.align_items = Some(AlignItems::CENTER);
+	}
 	if style.justify_content.is_none() {
-		style.justify_content = Some(JustifyContent::Center);
+		style.justify_content = Some(JustifyContent::CENTER);
 	}
 	style.overflow.x = taffy::Overflow::Hidden;
 	style.overflow.y = taffy::Overflow::Hidden;
 
+	let globals = ess.layout.state.globals.get();
+
 	// update colors to default ones if they are not specified
-	let color = params.color.unwrap_or(theme.button_color);
+	let color = params.color.unwrap_or(DEFAULT_COLOR);
 
-	let border_color = params
-		.border_color
-		.unwrap_or_else(|| Color::new(color.r, color.g, color.b, color.a + 0.25));
+	let border_color = params.border_color.unwrap_or(DEFAULT_BORDER_COLOR);
 
-	let hover_color = params
-		.hover_color
-		.unwrap_or_else(|| Color::new(color.r + 0.25, color.g + 0.25, color.g + 0.25, color.a + 0.15));
+	let hover_color = params.hover_color.unwrap_or(DEFAULT_HOVER_COLOR);
 
-	let hover_border_color = params
-		.hover_border_color
-		.unwrap_or_else(|| Color::new(color.r + 0.5, color.g + 0.5, color.g + 0.5, color.a + 0.5));
+	let hover_border_color = params.hover_border_color.unwrap_or(DEFAULT_HOVER_BORDER_COLOR);
+
+	let sticky_color = params.sticky_color.unwrap_or(DEFAULT_STICKY_COLOR);
+
+	let sticky_border_color = params.sticky_border_color.unwrap_or(DEFAULT_STICKY_BORDER_COLOR);
 
 	let gradient_intensity = theme.gradient_intensity;
 
-	let light_text = {
-		let mult = if theme.dark_mode { color.a } else { 1.0 - color.a };
-		(color.r + color.g + color.b) * mult < 1.5
-	};
+	drop(globals);
 
 	let (root, _) = ess.layout.add_child(
 		ess.parent,
@@ -472,13 +609,14 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
 		right: length(4.0),
 	};
 
-	if let Some(sprite_path) = params.sprite_src {
+	let id_sprite = if let Some(sprite_path) = params.sprite_src {
 		let sprite = WidgetSprite::create(WidgetSpriteParams {
 			glyph_data: Some(CustomGlyphData::from_assets(&ess.layout.state.globals, sprite_path)?),
+			color: Some(params.sprite_color.unwrap_or(WguiColorName::OnBackground.into())),
 			..Default::default()
 		});
 
-		ess.layout.add_child(
+		let (sprite_pair, _) = ess.layout.add_child(
 			root.id,
 			sprite,
 			taffy::Style {
@@ -490,7 +628,11 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
 				..Default::default()
 			},
 		)?;
-	}
+
+		sprite_pair.id
+	} else {
+		WidgetID::default()
+	};
 
 	let id_label = if let Some(content) = params.text {
 		let widget_label = WidgetLabel::create(
@@ -499,13 +641,10 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
 				content,
 				style: TextStyle {
 					weight: Some(FontWeight::Bold),
-					color: Some(if light_text {
-						Color::new(1.0, 1.0, 1.0, 1.0)
-					} else {
-						Color::new(0.0, 0.0, 0.0, 1.0)
-					}),
+					color: Some(WguiColorName::OnBackground.into()),
 					..params.text_style
 				},
+				..Default::default()
 			},
 		);
 
@@ -523,7 +662,6 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
 	};
 
 	let data = Rc::new(Data {
-		id_label,
 		id_rect,
 		sticky: params.sticky,
 	});
@@ -540,7 +678,12 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
 			border_color,
 			hover_color,
 			hover_border_color,
+			sticky_color,
+			sticky_border_color,
 		},
+		id_label,
+		id_sprite,
+		children_discovered: false,
 	}));
 
 	let base = ComponentBase {
@@ -549,6 +692,7 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
 			let listeners = &mut root.widget.state().event_listeners;
 			let anim_mult = ess.layout.state.theme.animation_mult;
 			vec![
+				register_event_mouse_cancel(state.clone(), listeners),
 				register_event_mouse_enter(data.clone(), state.clone(), listeners, params.tooltip, anim_mult),
 				register_event_mouse_leave(state.clone(), listeners, anim_mult),
 				register_event_mouse_press(state.clone(), listeners),
@@ -562,3 +706,19 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
 	ess.layout.register_component_refresh(&Component(button.clone()));
 	Ok((root, button))
 }
+
+fn color_to_apply(parent_color: ParentColor, bg_color: WguiColor) -> Option<WguiColor> {
+	match parent_color {
+		ParentColor::Foreground => bg_color.fg_color(),
+		ParentColor::Background => Some(bg_color),
+		ParentColor::Ignore => None,
+	}
+}
+
+fn color_to_apply2(parent_color: ParentColor, bg_color: WguiColor, fg_color: WguiColor) -> Option<WguiColor> {
+	match parent_color {
+		ParentColor::Foreground => Some(fg_color),
+		ParentColor::Background => Some(bg_color),
+		ParentColor::Ignore => None,
+	}
+}
diff --git a/wgui/src/components/checkbox.rs b/wgui/src/components/checkbox.rs
index 552e7ed6..9f6f9700 100644
--- a/wgui/src/components/checkbox.rs
+++ b/wgui/src/components/checkbox.rs
@@ -9,12 +9,13 @@ use taffy::{
 
 use crate::{
 	animation::{Animation, AnimationEasing},
+	color::{WguiColor, WguiColorName},
 	components::{
-		Component, ComponentBase, ComponentTrait, RefreshData,
+		Component, ComponentBase, ComponentTrait, DestroyData, RefreshData,
 		radio_group::ComponentRadioGroup,
 		tooltip::{self, ComponentTooltip, TooltipTrait},
 	},
-	drawing::Color,
+	drawing,
 	event::{CallbackDataCommon, EventListenerCollection, EventListenerID, EventListenerKind},
 	i18n::Translation,
 	layout::{self, WidgetID, WidgetPair},
@@ -31,7 +32,7 @@ use crate::{
 pub struct Params {
 	pub text: Translation,
 	pub style: taffy::Style,
-	pub color_checked: Option<Color>,
+	pub color_checked: Option<WguiColor>,
 	pub box_size: f32,
 	pub checked: bool,
 	pub radio_group: Option<Rc<ComponentRadioGroup>>,
@@ -80,14 +81,13 @@ impl TooltipTrait for State {
 struct Data {
 	#[allow(dead_code)]
 	id_container: WidgetID, // Rectangle, transparent if not hovered
-
-	//id_outer_box: WidgetID, // Rectangle, parent of container
+	id_outer_box: WidgetID, // Rectangle, has the border
 	id_inner_box: WidgetID, // Rectangle, parent of outer_box
 	id_label: WidgetID,     // Label, parent of container
 	value: Option<Rc<str>>, // arbitrary value assigned to the element
 	radio_group: Option<Weak<ComponentRadioGroup>>,
 
-	color_checked: Color,
+	color_checked: WguiColor,
 }
 
 pub struct ComponentCheckbox {
@@ -96,7 +96,8 @@ pub struct ComponentCheckbox {
 	state: Rc<RefCell<State>>,
 }
 
-const COLOR_UNCHECKED: Color = Color::new(0.0, 0.0, 0.0, 0.0);
+const COLOR_UNCHECKED: WguiColor = WguiColor::Raw(drawing::Color::new(0., 0., 0., 0.));
+const COLOR_HOVERED: WguiColor = WguiColorName::Tertiary.to_wgui_color();
 
 impl ComponentTrait for ComponentCheckbox {
 	fn base(&self) -> &ComponentBase {
@@ -110,11 +111,26 @@ impl ComponentTrait for ComponentCheckbox {
 	fn refresh(&self, _data: &mut RefreshData) {
 		// nothing to do
 	}
+
+	fn destroy(&self, data: &mut DestroyData) {
+		if let Some(comp) = self.state.borrow_mut().active_tooltip.take() {
+			comp.destroy(data);
+			data.destroy_widgets.push(comp.base().id);
+		}
+	}
 }
 
-fn set_box_checked(widgets: &layout::WidgetMap, data: &Data, checked: bool) {
+fn set_box_checked(widgets: &layout::WidgetMap, data: &Data, checked: bool, hovered: bool) {
 	widgets.call(data.id_inner_box, |rect: &mut WidgetRectangle| {
-		rect.params.color = if checked { data.color_checked } else { COLOR_UNCHECKED }
+		rect.params.color = if checked {
+			if hovered {
+				COLOR_HOVERED.into()
+			} else {
+				data.color_checked
+			}
+		} else {
+			COLOR_UNCHECKED.into()
+		}
 	});
 }
 
@@ -128,14 +144,16 @@ impl ComponentCheckbox {
 	}
 
 	pub fn set_checked(&self, common: &mut CallbackDataCommon, checked: bool) {
+		let hovered;
 		{
 			let mut state = self.state.borrow_mut();
 			if state.checked == checked {
 				return;
 			}
 			state.checked = checked;
+			hovered = state.hovered;
 		}
-		set_box_checked(&common.state.widgets, &self.data, checked);
+		set_box_checked(&common.state.widgets, &self.data, checked, hovered);
 		common.alterables.mark_redraw();
 	}
 
@@ -158,37 +176,37 @@ impl ComponentCheckbox {
 	}
 }
 
-fn anim_hover(rect: &mut WidgetRectangle, pos: f32, pressed: bool) {
-	let brightness = pos * if pressed { 0.6 } else { 0.4 };
+fn anim_hover(anim_data: &mut crate::animation::CallbackData<'_>, pos: f32, _pressed: bool) {
+	let rect = anim_data.obj.as_any_mut().downcast_mut::<WidgetRectangle>().unwrap();
 	rect.params.border = 2.0;
-	rect.params.color.a = brightness;
-	rect.params.border_color.a = rect.params.color.a;
-	if pressed {
-		rect.params.border_color.a += 0.4;
-	}
+	rect.params.border_color = if pos > 0.0 {
+		COLOR_HOVERED.into()
+	} else {
+		WguiColorName::OnBackground.into()
+	};
 }
 
-fn anim_hover_in(state: Rc<RefCell<State>>, widget_id: WidgetID, anim_mult: f32) -> Animation {
+fn anim_hover_in(state: Rc<RefCell<State>>, data: Rc<Data>, anim_mult: f32) -> Animation {
+	let down = state.borrow().down;
 	Animation::new(
-		widget_id,
+		data.id_outer_box,
 		(5. * anim_mult) as _,
 		AnimationEasing::OutQuad,
 		Box::new(move |common, anim_data| {
-			let rect = anim_data.obj.get_as_mut::<WidgetRectangle>().unwrap();
-			anim_hover(rect, anim_data.pos, state.borrow().down);
+			anim_hover(anim_data, anim_data.pos, down);
 			common.alterables.mark_redraw();
 		}),
 	)
 }
 
-fn anim_hover_out(state: Rc<RefCell<State>>, widget_id: WidgetID, anim_mult: f32) -> Animation {
+fn anim_hover_out(state: Rc<RefCell<State>>, data: Rc<Data>, anim_mult: f32) -> Animation {
+	let down = state.borrow().down;
 	Animation::new(
-		widget_id,
+		data.id_outer_box,
 		(8. * anim_mult) as _,
 		AnimationEasing::OutQuad,
 		Box::new(move |common, anim_data| {
-			let rect = anim_data.obj.get_as_mut::<WidgetRectangle>().unwrap();
-			anim_hover(rect, 1.0 - anim_data.pos, state.borrow().down);
+			anim_hover(anim_data, 1.0 - anim_data.pos, down);
 			common.alterables.mark_redraw();
 		}),
 	)
@@ -196,43 +214,34 @@ fn anim_hover_out(state: Rc<RefCell<State>>, widget_id: WidgetID, anim_mult: f32
 
 fn register_event_mouse_enter(
 	state: Rc<RefCell<State>>,
+	data: Rc<Data>,
 	listeners: &mut EventListenerCollection,
 	tooltip_info: Option<tooltip::TooltipInfo>,
 	anim_mult: f32,
 ) -> EventListenerID {
 	listeners.register(
 		EventListenerKind::MouseEnter,
-		Box::new(move |common, event_data, (), ()| {
+		Box::new(move |common, _event_data, (), ()| {
 			common.alterables.trigger_haptics();
 			common
 				.alterables
-				.animate(anim_hover_in(state.clone(), event_data.widget_id, anim_mult));
+				.animate(anim_hover_in(state.clone(), data.clone(), anim_mult));
 
-			ComponentTooltip::register_hover_in(common, &tooltip_info, event_data.widget_id, state.clone());
+			ComponentTooltip::register_hover_in(common, &tooltip_info, data.id_container, state.clone());
 
-			state.borrow_mut().hovered = true;
-			Ok(EventResult::Pass)
-		}),
-	)
-}
-
-fn register_event_mouse_leave(
-	state: Rc<RefCell<State>>,
-	listeners: &mut EventListenerCollection,
-	anim_mult: f32,
-) -> EventListenerID {
-	listeners.register(
-		EventListenerKind::MouseLeave,
-		Box::new(move |common, event_data, (), ()| {
-			common.alterables.trigger_haptics();
-			common
-				.alterables
-				.animate(anim_hover_out(state.clone(), event_data.widget_id, anim_mult));
-
-			{
+			let checked = {
 				let mut state = state.borrow_mut();
-				state.hovered = false;
-				state.active_tooltip = None;
+				state.hovered = true;
+				state.checked
+			};
+
+			if checked {
+				common
+					.state
+					.widgets
+					.call(data.id_inner_box, |rect: &mut WidgetRectangle| {
+						rect.params.color = COLOR_HOVERED.into();
+					});
 			}
 
 			Ok(EventResult::Pass)
@@ -240,14 +249,74 @@ fn register_event_mouse_leave(
 	)
 }
 
-fn register_event_mouse_press(state: Rc<RefCell<State>>, listeners: &mut EventListenerCollection) -> EventListenerID {
+fn register_event_mouse_leave(
+	state: Rc<RefCell<State>>,
+	data: Rc<Data>,
+	listeners: &mut EventListenerCollection,
+	anim_mult: f32,
+) -> EventListenerID {
+	listeners.register(
+		EventListenerKind::MouseLeave,
+		Box::new(move |common, _event_data, (), ()| {
+			common.alterables.trigger_haptics();
+			common
+				.alterables
+				.animate(anim_hover_out(state.clone(), data.clone(), anim_mult));
+
+			let checked = {
+				let mut state = state.borrow_mut();
+				state.hovered = false;
+				state.active_tooltip = None;
+				state.checked
+			};
+
+			if checked {
+				common
+					.state
+					.widgets
+					.call(data.id_inner_box, |rect: &mut WidgetRectangle| {
+						rect.params.color = data.color_checked;
+					});
+			}
+
+			Ok(EventResult::Pass)
+		}),
+	)
+}
+
+fn register_event_mouse_cancel(state: Rc<RefCell<State>>, listeners: &mut EventListenerCollection) -> EventListenerID {
+	listeners.register(
+		EventListenerKind::MouseCancel,
+		Box::new(move |_common, _event_data, (), ()| {
+			let mut state = state.borrow_mut();
+			state.down = false;
+			Ok(EventResult::Pass)
+		}),
+	)
+}
+
+fn register_event_mouse_press(
+	state: Rc<RefCell<State>>,
+	data: Rc<Data>,
+	listeners: &mut EventListenerCollection,
+) -> EventListenerID {
 	listeners.register(
 		EventListenerKind::MousePress,
-		Box::new(move |common, event_data, (), ()| {
+		Box::new(move |common, _event_data, (), ()| {
 			let mut state = state.borrow_mut();
+			let pressed_hovered = state.hovered;
 
-			let rect = event_data.obj.get_as_mut::<WidgetRectangle>().unwrap();
-			anim_hover(rect, 1.0, true);
+			common
+				.state
+				.widgets
+				.call(data.id_outer_box, |rect: &mut WidgetRectangle| {
+					rect.params.border = 2.0;
+					rect.params.border_color = if pressed_hovered {
+						COLOR_HOVERED.into()
+					} else {
+						WguiColorName::OnBackground.into()
+					};
+				});
 
 			common.alterables.trigger_haptics();
 			common.alterables.mark_redraw();
@@ -270,15 +339,27 @@ fn register_event_mouse_release(
 ) -> EventListenerID {
 	listeners.register(
 		EventListenerKind::MouseRelease,
-		Box::new(move |common, event_data, (), ()| {
-			let rect = event_data.obj.get_as_mut::<WidgetRectangle>().unwrap();
-			anim_hover(rect, 1.0, false);
+		Box::new(move |common, _event_data, (), ()| {
+			let mut state = state.borrow_mut();
+			let released_hovered = state.hovered;
+			let was_down = state.down;
+
+			common
+				.state
+				.widgets
+				.call(data.id_outer_box, |rect: &mut WidgetRectangle| {
+					rect.params.border = 2.0;
+					rect.params.border_color = if released_hovered {
+						COLOR_HOVERED.into()
+					} else {
+						WguiColorName::OnBackground.into()
+					};
+				});
 
 			common.alterables.trigger_haptics();
 			common.alterables.mark_redraw();
 
-			let mut state = state.borrow_mut();
-			if state.down {
+			if was_down {
 				state.down = false;
 
 				if let Some(self_ref) = state.self_ref.upgrade()
@@ -296,7 +377,7 @@ fn register_event_mouse_release(
 					});
 				}
 
-				set_box_checked(&common.state.widgets, &data, state.checked);
+				set_box_checked(&common.state.widgets, &data, state.checked, state.hovered);
 				if state.hovered
 					&& let Some(on_toggle) = &state.on_toggle
 				{
@@ -318,11 +399,10 @@ fn register_event_mouse_release(
 
 pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Result<(WidgetPair, Rc<ComponentCheckbox>)> {
 	let mut style = params.style;
-	let theme = &ess.layout.state.theme;
 
 	// force-override style
 	style.flex_wrap = taffy::FlexWrap::NoWrap;
-	style.align_items = Some(AlignItems::Center);
+	style.align_items = Some(AlignItems::CENTER);
 
 	// make checkbox interaction box larger by setting padding and negative margin
 	style.padding = taffy::Rect {
@@ -347,13 +427,12 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
 		(WLength::Units(5.0), WLength::Units(8.0))
 	};
 
-	let color_checked = params.color_checked.unwrap_or(theme.accent_color);
+	let color_checked = params.color_checked.unwrap_or(WguiColorName::Primary.into());
 
 	let (root, _) = ess.layout.add_child(
 		ess.parent,
 		WidgetRectangle::create(WidgetRectangleParams {
-			color: Color::new(1.0, 1.0, 1.0, 0.0),
-			border_color: Color::new(1.0, 1.0, 1.0, 0.0),
+			color: WguiColor::from(WguiColorName::OnPrimary).with_alpha(0.0),
 			round: round_5,
 			..Default::default()
 		}),
@@ -371,9 +450,9 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
 		id_container,
 		WidgetRectangle::create(WidgetRectangleParams {
 			border: 2.0,
-			border_color: Color::new(1.0, 1.0, 1.0, 1.0),
+			border_color: WguiColorName::OnBackground.into(),
 			round: round_8,
-			color: Color::new(1.0, 1.0, 1.0, 0.0),
+			color: WguiColor::from(WguiColorName::OnPrimary).with_alpha(0.0),
 			..Default::default()
 		}),
 		taffy::Style {
@@ -389,7 +468,11 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
 		outer_box.id,
 		WidgetRectangle::create(WidgetRectangleParams {
 			round: round_5,
-			color: if params.checked { color_checked } else { COLOR_UNCHECKED },
+			color: if params.checked {
+				color_checked
+			} else {
+				COLOR_UNCHECKED.into()
+			},
 			..Default::default()
 		}),
 		taffy::Style {
@@ -407,14 +490,17 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
 			content: params.text,
 			style: TextStyle {
 				weight: Some(FontWeight::Bold),
+				color: Some(WguiColorName::OnBackground.into()),
 				..Default::default()
 			},
+			..Default::default()
 		},
 	);
 	let (label, _node_label) = ess.layout.add_child(id_container, widget_label, Default::default())?;
 
 	let data = Rc::new(Data {
 		id_container,
+		id_outer_box: outer_box.id,
 		id_inner_box: inner_box.id,
 		id_label: label.id,
 		value: params.value,
@@ -437,9 +523,10 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
 			let listeners = &mut root.widget.state().event_listeners;
 			let anim_mult = ess.layout.state.theme.animation_mult;
 			vec![
-				register_event_mouse_enter(state.clone(), listeners, params.tooltip, anim_mult),
-				register_event_mouse_leave(state.clone(), listeners, anim_mult),
-				register_event_mouse_press(state.clone(), listeners),
+				register_event_mouse_enter(state.clone(), data.clone(), listeners, params.tooltip, anim_mult),
+				register_event_mouse_leave(state.clone(), data.clone(), listeners, anim_mult),
+				register_event_mouse_cancel(state.clone(), listeners),
+				register_event_mouse_press(state.clone(), data.clone(), listeners),
 				register_event_mouse_release(data.clone(), state.clone(), listeners),
 			]
 		},
diff --git a/wgui/src/components/color_selector.rs b/wgui/src/components/color_selector.rs
new file mode 100644
index 00000000..5885d04e
--- /dev/null
+++ b/wgui/src/components/color_selector.rs
@@ -0,0 +1,294 @@
+use crate::{
+	assets::AssetPath,
+	components::{
+		Component, ComponentBase, ComponentTrait, RefreshData,
+		button::{self, ComponentButton},
+		slider::{ComponentSlider, SliderValueChangedCallback},
+	},
+	drawing::{self},
+	event::CallbackDataCommon,
+	i18n::Translation,
+	layout::{Layout, WidgetID, WidgetPair},
+	parser::{self, Fetchable, ParseDocumentParams},
+	widget::{ConstructEssentials, rectangle::WidgetRectangle, util::WLength},
+	windowing::window::{WguiWindow, WguiWindowParams, WguiWindowParamsExtra},
+};
+use glam::Vec2;
+use std::{
+	cell::RefCell,
+	rc::{Rc, Weak},
+};
+use taffy::prelude::length;
+
+pub struct Params {
+	pub color: drawing::Color,
+	pub style: taffy::Style,
+}
+
+impl Default for Params {
+	fn default() -> Self {
+		Self {
+			color: drawing::Color::new(1.0, 1.0, 1.0, 1.0),
+			style: Default::default(),
+		}
+	}
+}
+
+struct WantsOpen {
+	position: Vec2,
+}
+
+#[allow(dead_code)]
+struct PopupState {
+	slider_r: Rc<ComponentSlider>,
+	slider_g: Rc<ComponentSlider>,
+	slider_b: Rc<ComponentSlider>,
+	id_rect_color: WidgetID,
+}
+
+#[allow(clippy::struct_field_names)]
+struct State {
+	color: drawing::Color,
+	self_ref: Weak<ComponentColorSelector>,
+	wants_open: Option<WantsOpen>,
+	on_changed: Option<ColorSelectorChangedCallback>,
+	popup_state: Option<PopupState>,
+}
+
+struct Data {
+	button: Rc<ComponentButton>,
+}
+
+pub struct ColorSelectorChangedEvent {
+	pub color: drawing::Color,
+}
+
+pub type ColorSelectorChangedCallback = Box<dyn Fn(&mut CallbackDataCommon, ColorSelectorChangedEvent)>;
+
+pub struct ComponentColorSelector {
+	base: ComponentBase,
+	data: Rc<Data>,
+	state: Rc<RefCell<State>>,
+	window: WguiWindow,
+}
+
+impl ComponentTrait for ComponentColorSelector {
+	fn base(&self) -> &ComponentBase {
+		&self.base
+	}
+
+	fn base_mut(&mut self) -> &mut ComponentBase {
+		&mut self.base
+	}
+
+	fn refresh(&self, data: &mut RefreshData) {
+		let mut state = self.state.borrow_mut();
+
+		if let Some(wants_open) = state.wants_open.take()
+			&& let Err(e) = self.open(data.layout, &mut state, wants_open.position)
+		{
+			log::error!("{e:?}");
+			debug_assert!(false);
+		}
+
+		self.data.button.set_text(
+			&mut data.layout.common(),
+			Translation::from_raw_text_string(state.color.to_hex_rgb()),
+		);
+
+		self
+			.data
+			.button
+			.set_color(&mut data.layout.common(), state.color.into());
+	}
+}
+
+enum ColorIndex {
+	Red,
+	Green,
+	Blue,
+}
+
+fn set_color_internal(state: &mut State, common: &mut CallbackDataCommon, color: drawing::Color) {
+	if state.color == color {
+		return;
+	}
+
+	if let Some(on_changed) = &state.on_changed {
+		on_changed(common, ColorSelectorChangedEvent { color });
+	}
+
+	state.color = color;
+	common.alterables.refresh_component_once(&state.self_ref);
+	common.alterables.mark_redraw();
+}
+
+impl ComponentColorSelector {
+	pub fn on_changed(&self, func: ColorSelectorChangedCallback) {
+		self.state.borrow_mut().on_changed = Some(func);
+	}
+
+	pub fn set_color(&self, common: &mut CallbackDataCommon, color: drawing::Color) {
+		let mut state = self.state.borrow_mut();
+		set_color_internal(&mut state, common, color);
+	}
+
+	pub fn get_color(&self) -> drawing::Color {
+		self.state.borrow().color
+	}
+
+	fn open(&self, layout: &mut Layout, state: &mut State, position: Vec2) -> anyhow::Result<()> {
+		self.window.open(&mut WguiWindowParams {
+			position,
+			layout,
+			extra: WguiWindowParamsExtra {
+				close_if_clicked_outside: true,
+				// TODO: translation text in wgui too?
+				title: Some(Translation::from_raw_text("Select color")),
+				..Default::default()
+			},
+		})?;
+
+		let id_content = self.window.get_content().id;
+
+		let parser_state = parser::parse_from_assets(
+			&ParseDocumentParams {
+				globals: layout.state.globals.clone(),
+				path: AssetPath::WguiInternal("wgui/color_selector.xml"),
+				extra: Default::default(),
+			},
+			layout,
+			id_content,
+		)?;
+
+		let slider_r = parser_state.fetch_component_as::<ComponentSlider>("slider_r")?;
+		let slider_g = parser_state.fetch_component_as::<ComponentSlider>("slider_g")?;
+		let slider_b = parser_state.fetch_component_as::<ComponentSlider>("slider_b")?;
+
+		{
+			let mut common = layout.common();
+			slider_r.set_value_primary(&mut common, state.color.r * 255.0);
+			slider_g.set_value_primary(&mut common, state.color.g * 255.0);
+			slider_b.set_value_primary(&mut common, state.color.b * 255.0);
+		}
+
+		slider_r.on_value_changed(self.gen_slider_callback(ColorIndex::Red));
+		slider_g.on_value_changed(self.gen_slider_callback(ColorIndex::Green));
+		slider_b.on_value_changed(self.gen_slider_callback(ColorIndex::Blue));
+
+		let id_rect_color = parser_state.get_widget_id("rect_color")?;
+
+		state.popup_state = Some(PopupState {
+			slider_r,
+			slider_g,
+			slider_b,
+			id_rect_color,
+		});
+		Ok(())
+	}
+
+	fn gen_slider_callback(&self, idx: ColorIndex) -> SliderValueChangedCallback {
+		let state = Rc::downgrade(&self.state);
+		Box::new(move |common, evt| {
+			let Some(state) = state.upgrade() else {
+				return;
+			};
+
+			let mut state = state.borrow_mut();
+			let Some(popup_state) = &state.popup_state else {
+				return;
+			};
+
+			let norm = evt.value / 255.0;
+
+			let mut new_color = state.color;
+			match idx {
+				ColorIndex::Red => new_color.r = norm,
+				ColorIndex::Green => new_color.g = norm,
+				ColorIndex::Blue => new_color.b = norm,
+			}
+
+			if let Some(mut rect) = common
+				.state
+				.widgets
+				.get_as::<WidgetRectangle>(popup_state.id_rect_color)
+			{
+				rect.set_color(common, new_color.into());
+			}
+			set_color_internal(&mut state, common, new_color);
+		})
+	}
+}
+
+const DEFAULT_WIDTH: f32 = 96.0;
+const DEFAULT_HEIGHT: f32 = 32.0;
+
+pub fn construct(
+	ess: &mut ConstructEssentials,
+	params: Params,
+) -> anyhow::Result<(WidgetPair, Rc<ComponentColorSelector>)> {
+	let mut style = params.style;
+
+	if style.size.width.is_auto() {
+		style.size.width = length(DEFAULT_WIDTH);
+	}
+
+	if style.size.height.is_auto() {
+		style.size.height = length(DEFAULT_HEIGHT);
+	}
+
+	style.min_size = style.size;
+	style.max_size = style.size;
+
+	let (widget_button, button) = button::construct(
+		ess,
+		button::Params {
+			color: Some(params.color.into()),
+			round: WLength::Percent(1.0),
+			border: 2.0,
+			border_color: Some(drawing::Color::new(0.0, 0.0, 0.0, 1.0).into()),
+			style,
+			..Default::default()
+		},
+	)?;
+
+	let data = Rc::new(Data { button: button.clone() });
+
+	let state = Rc::new(RefCell::new(State {
+		color: params.color,
+		self_ref: Default::default(),
+		wants_open: None,
+		popup_state: None,
+		on_changed: None,
+	}));
+
+	let base = ComponentBase {
+		id: widget_button.id,
+		lhandles: Default::default(),
+	};
+
+	let color_selector = Rc::new(ComponentColorSelector {
+		base,
+		data,
+		state: state.clone(),
+		window: WguiWindow::default(),
+	});
+
+	let self_ref = Rc::downgrade(&color_selector);
+	state.borrow_mut().self_ref = self_ref.clone();
+
+	button.on_click(Rc::new({
+		let color_selector = color_selector.clone();
+		move |common, evt| {
+			let mut state = color_selector.state.borrow_mut();
+			state.wants_open = Some(WantsOpen {
+				position: evt.mouse_pos_absolute.unwrap_or_default(),
+			});
+			common.alterables.refresh_component_once(&self_ref);
+			Ok(())
+		}
+	}));
+
+	ess.layout.defer_component_refresh(Component(color_selector.clone()));
+	Ok((widget_button, color_selector))
+}
diff --git a/wgui/src/components/editbox.rs b/wgui/src/components/editbox.rs
index 7dff8cb5..214cc632 100644
--- a/wgui/src/components/editbox.rs
+++ b/wgui/src/components/editbox.rs
@@ -8,12 +8,12 @@ use taffy::prelude::{auto, length, percent};
 
 use crate::{
 	animation::{Animation, AnimationEasing},
+	color::{WguiColor, WguiColorName},
 	components::{Component, ComponentBase, ComponentTrait, FocusChangeData, RefreshData},
-	drawing::{self, Color},
 	event::{self, CallbackDataCommon, CallbackMetadata, EventListenerCollection, EventListenerKind, StyleSetRequest},
 	i18n::Translation,
 	layout::{WidgetID, WidgetPair},
-	renderer_vk::text::{TextShadow, TextStyle},
+	renderer_vk::text::{TextStyle, WguiTextShadow},
 	widget::{
 		ConstructEssentials, EventResult,
 		div::WidgetDiv,
@@ -55,7 +55,7 @@ pub struct ComponentEditBox {
 
 fn anim_bottom_rect(
 	common: &mut CallbackDataCommon,
-	accent_color: drawing::Color,
+	accent_color: WguiColor,
 	id_rect: WidgetID,
 	anim_mult: f32,
 	focused: bool,
@@ -69,10 +69,12 @@ fn anim_bottom_rect(
 				let rect = data.obj.get_as_mut::<WidgetRectangle>().unwrap();
 				let pos_bidir = if focused { data.pos } else { 1.0 - data.pos };
 
-				rect.set_color(
-					common,
-					accent_color.lerp(&drawing::Color::new(1.0, 1.0, 1.0, 1.0), pos_bidir),
+				let color_lerped = accent_color.lerp(
+					&common.globals().palette,
+					&WguiColorName::OnBackgroundVariant.into(),
+					pos_bidir,
 				);
+				rect.set_color(common, color_lerped);
 
 				common.alterables.set_style(
 					data.widget_id,
@@ -100,9 +102,9 @@ fn anim_bottom_rect(
 
 fn refresh_all(common: &mut CallbackDataCommon, data: &Data, state: &mut State) -> Option<()> {
 	let theme = &common.state.theme;
-	let editbox_color = theme.editbox_color;
+	let editbox_color = WguiColor::from(WguiColorName::BackgroundVariant);
+	let accent_color = WguiColor::from(WguiColorName::Primary);
 	let anim_mult = theme.animation_mult;
-	let accent_color = theme.accent_color;
 
 	let (rect_color, border_color) = if state.focused {
 		(editbox_color.add_rgb(0.15), editbox_color.add_rgb(0.15 + 0.25))
@@ -123,14 +125,7 @@ fn refresh_all(common: &mut CallbackDataCommon, data: &Data, state: &mut State)
 	}
 
 	// Cursor
-	common.alterables.set_style(
-		data.id_rect_cursor,
-		StyleSetRequest::Display(if state.focused {
-			taffy::Display::Flex
-		} else {
-			taffy::Display::None
-		}),
-	);
+	common.alterables.set_widget_visible(data.id_rect_cursor, state.focused);
 
 	state.first_refresh = false;
 
@@ -148,7 +143,7 @@ impl ComponentTrait for ComponentEditBox {
 
 	fn refresh(&self, data: &mut RefreshData) {
 		let mut state = self.state.borrow_mut();
-		let res = refresh_all(data.common, &self.data, &mut state);
+		let res = refresh_all(&mut data.layout.common(), &self.data, &mut state);
 		debug_assert!(res.is_some());
 	}
 
@@ -278,7 +273,7 @@ pub fn construct(
 	ess: &mut ConstructEssentials,
 	mut params: Params,
 ) -> anyhow::Result<(WidgetPair, Rc<ComponentEditBox>)> {
-	let text_color = ess.layout.state.theme.text_color;
+	let text_color = WguiColor::from(WguiColorName::OnBackgroundVariant);
 
 	if params.style.size.width.is_auto() {
 		params.style.size.width = length(128.0);
@@ -289,7 +284,7 @@ pub fn construct(
 	}
 
 	// override style
-	params.style.align_items = Some(taffy::AlignItems::Center);
+	params.style.align_items = Some(taffy::AlignItems::CENTER);
 	params.style.position = taffy::Position::Relative;
 	params.style.overflow = taffy::Point {
 		x: taffy::Overflow::Scroll,
@@ -314,8 +309,8 @@ pub fn construct(
 		taffy::Style {
 			position: taffy::Position::Absolute,
 			flex_direction: taffy::FlexDirection::Column,
-			align_content: Some(taffy::AlignContent::Center),
-			align_items: Some(taffy::AlignItems::Center),
+			align_content: Some(taffy::AlignContent::CENTER),
+			align_items: Some(taffy::AlignItems::CENTER),
 			size: taffy::Size {
 				width: percent(1.0),
 				height: percent(1.0),
@@ -346,13 +341,14 @@ pub fn construct(
 		WidgetLabelParams {
 			content: Translation::from_raw_text(&params.initial_text),
 			style: TextStyle {
-				shadow: Some(TextShadow {
+				shadow: Some(WguiTextShadow {
 					x: 1.0,
 					y: 1.0,
-					color: Color::new(0.0, 0.0, 0.0, 1.0),
+					..Default::default()
 				}),
 				..Default::default()
 			},
+			..Default::default()
 		},
 	);
 	let (label, _node_label) = ess.layout.add_child(
@@ -371,8 +367,8 @@ pub fn construct(
 			..Default::default()
 		}),
 		taffy::Style {
-			align_self: Some(taffy::AlignSelf::Center),
-			justify_self: Some(taffy::JustifySelf::End),
+			align_self: Some(taffy::AlignSelf::CENTER),
+			justify_self: Some(taffy::JustifySelf::END),
 			min_size: taffy::Size {
 				width: length(2.0),
 				height: length(16.0),
diff --git a/wgui/src/components/mod.rs b/wgui/src/components/mod.rs
index b5916f18..cbe7a03a 100644
--- a/wgui/src/components/mod.rs
+++ b/wgui/src/components/mod.rs
@@ -1,6 +1,7 @@
 use std::hash::Hash;
 use std::{hash::Hasher, rc::Rc};
 
+use crate::layout::Layout;
 use crate::{
 	any::AnyTrait,
 	event::{CallbackDataCommon, EventListenerID},
@@ -10,14 +11,23 @@ use crate::{
 pub mod bar_graph;
 pub mod button;
 pub mod checkbox;
+pub mod color_selector;
 pub mod editbox;
 pub mod radio_group;
 pub mod slider;
 pub mod tabs;
 pub mod tooltip;
 
+#[cfg(feature = "video")]
+pub mod video;
+
 pub struct RefreshData<'a> {
-	pub common: &'a mut CallbackDataCommon<'a>,
+	pub layout: &'a mut Layout,
+}
+
+pub struct DestroyData<'a> {
+	pub layout: &'a mut Layout,
+	pub destroy_widgets: &'a mut Vec<WidgetID>,
 }
 
 pub struct FocusChangeData<'a> {
@@ -44,6 +54,7 @@ pub trait ComponentTrait: AnyTrait {
 	fn base_mut(&mut self) -> &mut ComponentBase;
 	fn refresh(&self, data: &mut RefreshData);
 	fn on_focus_change(&self, _data: &mut FocusChangeData) {}
+	fn destroy(&self, _data: &mut DestroyData) {}
 }
 
 #[derive(Clone)]
diff --git a/wgui/src/components/radio_group.rs b/wgui/src/components/radio_group.rs
index d4590eb9..e3deed77 100644
--- a/wgui/src/components/radio_group.rs
+++ b/wgui/src/components/radio_group.rs
@@ -86,17 +86,6 @@ impl ComponentRadioGroup {
 		self.state.borrow().selected.as_ref().and_then(|b| b.get_value())
 	}
 
-	pub fn set_value_simple(&self, value: &str) -> anyhow::Result<()> {
-		let mut state = self.state.borrow_mut();
-		for radio_box in &state.radio_boxes {
-			if radio_box.get_value().is_some_and(|box_val| &*box_val == value) {
-				state.selected = Some(radio_box.clone());
-				return Ok(());
-			}
-		}
-		anyhow::bail!("No RadioBox found with value '{value}'")
-	}
-
 	pub fn set_value(&self, common: &mut CallbackDataCommon, value: &str) -> anyhow::Result<()> {
 		let mut state = self.state.borrow_mut();
 		let mut selected = None;
diff --git a/wgui/src/components/slider.rs b/wgui/src/components/slider.rs
index af94d3ec..e3f61848 100644
--- a/wgui/src/components/slider.rs
+++ b/wgui/src/components/slider.rs
@@ -1,21 +1,22 @@
-use std::{cell::RefCell, rc::Rc};
+use std::{cell::RefCell, f32, rc::Rc};
 
 use glam::{Mat4, Vec2, Vec3};
 use taffy::prelude::{length, percent};
 
 use crate::{
-	animation::{Animation, AnimationEasing},
+	animation::{Animation, AnimationCallback, AnimationEasing},
+	color::{WguiColor, WguiColorName},
 	components::{
-		Component, ComponentBase, ComponentTrait, RefreshData,
+		Component, ComponentBase, ComponentTrait, DestroyData, RefreshData,
 		tooltip::{self, ComponentTooltip, TooltipTrait},
 	},
-	drawing::{self},
 	event::{
-		self, CallbackDataCommon, CallbackMetadata, EventAlterables, EventListenerCollection, EventListenerKind,
-		StyleSetRequest,
+		self, CallbackDataCommon, CallbackMetadata, DeviceBitmask, EventAlterables, EventListenerCollection,
+		EventListenerKind, StyleSetRequest,
 	},
 	i18n::Translation,
 	layout::{WidgetID, WidgetPair},
+	palette::WguiColorPalette,
 	renderer_vk::{
 		text::{FontWeight, HorizontalAlign, TextStyle},
 		util,
@@ -29,31 +30,29 @@ use crate::{
 	},
 };
 
+#[derive(Default, Clone)]
+pub struct Value(pub f32);
+
 #[derive(Default)]
-pub struct ValuesMinMax {
-	pub value: f32,
+pub struct Limits {
 	pub min_value: f32,
 	pub max_value: f32,
 	pub step: f32,
 }
 
-impl ValuesMinMax {
-	fn to_normalized(&self) -> f32 {
-		(self.value - self.min_value) / (self.max_value - self.min_value)
+impl Value {
+	pub const fn get(&self) -> f32 {
+		self.0
 	}
 
-	fn get_from_normalized(&self, normalized: f32) -> f32 {
-		normalized * (self.max_value - self.min_value) + self.min_value
-	}
-
-	fn set_value(&mut self, new_value: f32) -> &mut Self {
-		let span = self.max_value - self.min_value;
-		let clamped = new_value.max(self.min_value).min(self.max_value);
+	pub fn set(&mut self, limits: &Limits, new_value: f32) {
+		let span = limits.max_value - limits.min_value;
+		let clamped = new_value.max(limits.min_value).min(limits.max_value);
 
 		// get the step index from min
-		let mut k = ((clamped - self.min_value) / self.step).round();
+		let mut k = ((clamped - limits.min_value) / limits.step).round();
 
-		let k_max = (span / self.step).floor();
+		let k_max = (span / limits.step).round();
 		if k < 0.0 {
 			k = 0.0;
 		}
@@ -61,25 +60,50 @@ impl ValuesMinMax {
 			k = k_max;
 		}
 
-		let snapped = self.min_value + k * self.step;
-		self.value = snapped.max(self.min_value).min(self.max_value);
+		let snapped = limits.min_value + k * limits.step;
+		self.0 = snapped.max(limits.min_value).min(limits.max_value);
+	}
+}
 
-		self
+impl Limits {
+	fn to_normalized(&self, value: f32) -> f32 {
+		(value - self.min_value) / (self.max_value - self.min_value)
+	}
+
+	fn get_from_normalized(&self, normalized: f32) -> f32 {
+		normalized * (self.max_value - self.min_value) + self.min_value
 	}
 }
 
 #[derive(Default)]
 pub struct Params {
 	pub style: taffy::Style,
-	pub values: ValuesMinMax,
+	pub limits: Limits,
+	pub value1: Value,
+	pub value2: Option<Value>, // range slider support
 	pub show_value: bool,
 	pub tooltip: Option<tooltip::TooltipInfo>,
 }
 
+#[derive(Clone, Copy, PartialEq, Eq)]
+pub enum ValueIndex {
+	Primary,
+	Secondary, /* for range sliders */
+}
+
+struct DraggedBy {
+	index: ValueIndex,
+	device: DeviceBitmask,
+}
+
 struct State {
-	dragged_by: Option<usize>,
-	hovered: bool,
-	values: ValuesMinMax,
+	dragged_by: Option<DraggedBy>,
+	hovered_body: bool,
+	hovered1: bool,
+	hovered2: bool,
+	value1: Value,
+	value2: Option<Value>,
+	limits: Limits,
 	on_value_changed: Option<SliderValueChangedCallback>,
 	active_tooltip: Option<Rc<ComponentTooltip>>,
 }
@@ -90,19 +114,25 @@ impl TooltipTrait for State {
 	}
 }
 
+#[allow(clippy::struct_field_names)]
+struct SliderHandleData {
+	id_handle_rect: WidgetID,   // Rectangle
+	id_label: Option<WidgetID>, // Label
+	id_handle: WidgetID,
+}
+
 struct Data {
 	body_node: taffy::NodeId,
-	slider_handle_rect_id: WidgetID,  // Rectangle
-	slider_text_id: Option<WidgetID>, // Text
-	slider_handle_id: WidgetID,
+	handle1: SliderHandleData,
+	handle2: Option<SliderHandleData>,
 }
 
 pub struct SliderValueChangedEvent {
+	pub index: ValueIndex,
 	pub value: f32,
 }
 
-pub type SliderValueChangedCallback =
-	Box<dyn Fn(&mut CallbackDataCommon, SliderValueChangedEvent) -> anyhow::Result<()>>;
+pub type SliderValueChangedCallback = Box<dyn Fn(&mut CallbackDataCommon, SliderValueChangedEvent)>;
 
 pub struct ComponentSlider {
 	base: ComponentBase,
@@ -111,10 +141,16 @@ pub struct ComponentSlider {
 }
 
 impl ComponentTrait for ComponentSlider {
-	fn refresh(&self, init_data: &mut RefreshData) {
+	fn refresh(&self, data: &mut RefreshData) {
+		let mut common = data.layout.common();
 		let mut state = self.state.borrow_mut();
-		let value = state.values.value;
-		state.set_value(init_data.common, &self.data, value);
+
+		let value1 = state.value1.get();
+		state.set_value(&mut common, &self.data, ValueIndex::Primary, value1);
+
+		if let Some(value2) = state.value2.as_ref().map(Value::get) {
+			state.set_value(&mut common, &self.data, ValueIndex::Secondary, value2);
+		}
 	}
 
 	fn base(&self) -> &ComponentBase {
@@ -124,16 +160,35 @@ impl ComponentTrait for ComponentSlider {
 	fn base_mut(&mut self) -> &mut ComponentBase {
 		&mut self.base
 	}
+
+	fn destroy(&self, data: &mut DestroyData) {
+		if let Some(comp) = self.state.borrow_mut().active_tooltip.take() {
+			comp.destroy(data);
+			data.destroy_widgets.push(comp.base().id);
+		}
+	}
 }
 
 impl ComponentSlider {
-	pub fn get_value(&self) -> f32 {
-		self.state.borrow().values.value
+	pub fn get_value_primary(&self) -> f32 {
+		self.get_value(ValueIndex::Primary).unwrap() /* safe */
 	}
 
-	pub fn set_value(&self, common: &mut CallbackDataCommon, value: f32) {
+	pub fn get_value(&self, index: ValueIndex) -> Option<f32> {
+		let state = self.state.borrow();
+		match index {
+			ValueIndex::Primary => Some(state.value1.get()),
+			ValueIndex::Secondary => state.value2.as_ref().map(Value::get),
+		}
+	}
+
+	pub fn set_value(&self, common: &mut CallbackDataCommon, index: ValueIndex, new_value: f32) {
 		let mut state = self.state.borrow_mut();
-		state.set_value(common, &self.data, value);
+		state.set_value(common, &self.data, index, new_value);
+	}
+
+	pub fn set_value_primary(&self, common: &mut CallbackDataCommon, new_value: f32) {
+		self.set_value(common, ValueIndex::Primary, new_value);
 	}
 
 	pub fn on_value_changed(&self, func: SliderValueChangedCallback) {
@@ -153,14 +208,15 @@ fn get_width(slider_body_node: taffy::NodeId, tree: &taffy::tree::TaffyTree<Widg
 
 fn conf_handle_style(
 	alterables: &mut EventAlterables,
-	values: &ValuesMinMax,
+	limits: &Limits,
+	value: f32,
 	slider_handle_id: WidgetID,
 	body_node: taffy::NodeId,
 	slider_handle_style: &taffy::Style,
 	tree: &taffy::tree::TaffyTree<WidgetID>,
 ) -> bool {
-	/* returns false if nothing changed */
-	let norm = values.to_normalized();
+	/* returns false if nothing has changed */
+	let norm = limits.to_normalized(value);
 
 	// convert normalized value to taffy percentage margin in percent
 	let width = get_width(body_node, tree);
@@ -184,11 +240,22 @@ const HANDLE_WIDTH: f32 = 32.0;
 const HANDLE_HEIGHT: f32 = 24.0;
 
 impl State {
+	const fn get_hovered_index(&self) -> Option<ValueIndex> {
+		if self.hovered1 {
+			Some(ValueIndex::Primary)
+		} else if self.hovered2 {
+			Some(ValueIndex::Secondary)
+		} else {
+			None
+		}
+	}
+
 	fn update_value_to_mouse(
 		&mut self,
 		event_data: &event::CallbackData<'_>,
 		data: &Data,
 		common: &mut CallbackDataCommon,
+		index: ValueIndex,
 	) {
 		let mouse_pos = event_data
 			.metadata
@@ -200,10 +267,10 @@ impl State {
 			get_width(data.body_node, &common.state.tree) - HANDLE_WIDTH,
 		);
 
-		let target_value = self.values.get_from_normalized(norm);
+		let target_value = self.limits.get_from_normalized(norm);
 		let val = target_value;
 
-		self.set_value(common, data, val);
+		self.set_value(common, data, index, val);
 	}
 
 	fn update_text(common: &mut CallbackDataCommon, text: &mut WidgetLabel, value: f32) {
@@ -217,23 +284,48 @@ impl State {
 		text.set_text(common, Translation::from_raw_text(&pretty));
 	}
 
-	fn set_value(&mut self, common: &mut CallbackDataCommon, data: &Data, value: f32) {
-		let before = self.values.value;
-		self.values.set_value(value);
+	fn set_value(&mut self, common: &mut CallbackDataCommon, data: &Data, index: ValueIndex, new_value: f32) {
+		let val1 = self.value1.get();
+		let val2 = self.value2.as_ref().map_or(f32::MAX, Value::get);
 
-		let changed = self.values.value != before;
+		let Some(value) = (match index {
+			ValueIndex::Primary => Some(&mut self.value1),
+			ValueIndex::Secondary => self.value2.as_mut(),
+		}) else {
+			return;
+		};
 
-		let Some(slider_handle_node_id) = common.state.nodes.get(data.slider_handle_id) else {
+		// Slider handle widget
+		let Some(handle_data) = (match index {
+			ValueIndex::Primary => Some(&data.handle1),
+			ValueIndex::Secondary => data.handle2.as_ref(),
+		}) else {
+			unreachable!();
+		};
+
+		let before = value.get();
+
+		if index == ValueIndex::Secondary {
+			value.set(&self.limits, new_value.max(val1 + self.limits.step));
+		} else {
+			value.set(&self.limits, new_value.min(val2 - self.limits.step));
+		}
+
+		let has_changed = value.get() != before;
+
+		let Some(slider_handle_node_id) = common.state.nodes.get(handle_data.id_handle) else {
 			return;
 		};
 
 		let Ok(style) = common.state.tree.style(*slider_handle_node_id) else {
 			return;
 		};
+
 		if !conf_handle_style(
 			common.alterables,
-			&self.values,
-			data.slider_handle_id,
+			&self.limits,
+			value.get(),
+			handle_data.id_handle,
 			data.body_node,
 			style,
 			&common.state.tree,
@@ -241,89 +333,138 @@ impl State {
 			return; // nothing changed visually
 		}
 
-		common.alterables.mark_dirty(data.slider_handle_id);
+		common.alterables.mark_dirty(handle_data.id_handle);
 		common.alterables.mark_redraw();
 
-		if let Some(slider_text_id) = data.slider_text_id
-			&& let Some(mut label) = common.state.widgets.get_as::<WidgetLabel>(slider_text_id)
+		if let Some(id_label) = handle_data.id_label
+			&& let Some(mut label) = common.state.widgets.get_as::<WidgetLabel>(id_label)
 		{
-			Self::update_text(common, &mut label, self.values.value);
+			Self::update_text(common, &mut label, value.get());
 		}
 
-		if changed
-			&& let Some(on_value_changed) = &self.on_value_changed
-			&& let Err(e) = on_value_changed(
+		if has_changed && let Some(on_value_changed) = &self.on_value_changed {
+			on_value_changed(
 				common,
 				SliderValueChangedEvent {
-					value: self.values.value,
+					index,
+					value: value.get(),
 				},
-			) {
-			log::error!("{e:?}"); // FIXME: proper error handling
+			);
 		}
 	}
 }
 
-const BODY_COLOR: drawing::Color = drawing::Color::new(0.6, 0.65, 0.7, 0.2);
-const BODY_BORDER_COLOR: drawing::Color = drawing::Color::new(0.4, 0.45, 0.5, 1.0);
-const HANDLE_BORDER_COLOR: drawing::Color = drawing::Color::new(0.85, 0.85, 0.85, 1.0);
-const HANDLE_BORDER_COLOR_HOVERED: drawing::Color = drawing::Color::new(0.0, 0.0, 0.0, 1.0);
-const HANDLE_COLOR: drawing::Color = drawing::Color::new(1.0, 1.0, 1.0, 1.0);
-const HANDLE_COLOR_HOVERED: drawing::Color = drawing::Color::new(0.9, 0.9, 0.9, 1.0);
+const BODY_COLOR: WguiColor = WguiColorName::Background.to_wgui_color();
+const BODY_BORDER_COLOR: WguiColor = WguiColorName::Outline.to_wgui_color();
+const HANDLE_COLOR: WguiColorName = WguiColorName::BackgroundVariant;
+const HANDLE_COLOR_HOVERED: WguiColor = WguiColorName::Tertiary.to_wgui_color();
+const HANDLE_BORDER_COLOR: WguiColor = WguiColorName::Outline.to_wgui_color();
+const HANDLE_BORDER_COLOR_HOVERED: WguiColor = WguiColorName::Tertiary.to_wgui_color().mult_rgb(0.5);
+const HANDLE_TEXT_COLOR: WguiColorName = WguiColorName::OnBackgroundVariant;
+const HANDLE_TEXT_COLOR_HOVERED: WguiColorName = WguiColorName::OnSecondary;
 
 const SLIDER_HOVER_SCALE: f32 = 0.25;
-fn get_anim_transform(pos: f32, widget_size: Vec2) -> Mat4 {
-	util::centered_matrix(
-		widget_size,
-		&Mat4::from_scale(Vec3::splat(SLIDER_HOVER_SCALE.mul_add(pos, 1.0))),
-	)
+
+fn anim_rect(rect: &mut WidgetRectangle, palette: &WguiColorPalette, pos: f32) {
+	rect.params.color = WguiColor::lerp(&HANDLE_COLOR.into(), palette, &HANDLE_COLOR_HOVERED, pos);
+	rect.params.border_color = WguiColor::lerp(&HANDLE_BORDER_COLOR, palette, &HANDLE_BORDER_COLOR_HOVERED, pos);
 }
 
-fn anim_rect(rect: &mut WidgetRectangle, pos: f32) {
-	rect.params.color = drawing::Color::lerp(&HANDLE_COLOR, &HANDLE_COLOR_HOVERED, pos);
-	rect.params.border_color = drawing::Color::lerp(&HANDLE_BORDER_COLOR, &HANDLE_BORDER_COLOR_HOVERED, pos);
+fn get_callback_rect(inverse: bool) -> AnimationCallback {
+	Box::new(move |common, data| {
+		let rect = data.obj.get_as_mut::<WidgetRectangle>().unwrap();
+		let pos = if inverse { 1.0 - data.pos } else { data.pos };
+		data.data.transform = util::centered_matrix(
+			data.widget_boundary.size,
+			&Mat4::from_scale(Vec3::splat(SLIDER_HOVER_SCALE.mul_add(pos, 1.0))),
+		);
+		anim_rect(rect, &common.globals().palette, pos);
+		common.alterables.mark_redraw();
+	})
 }
 
-fn on_enter_anim(common: &mut event::CallbackDataCommon, handle_id: WidgetID, anim_mult: f32) {
+fn get_callback_label(inverse: bool) -> AnimationCallback {
+	Box::new(move |common, data| {
+		let label = data.obj.get_as_mut::<WidgetLabel>().unwrap();
+		let pos = if inverse { 1.0 - data.pos } else { data.pos };
+		data.data.transform = util::centered_matrix(
+			data.widget_boundary.size,
+			&Mat4::from_scale(Vec3::splat(1.0 + pos * 0.25)),
+		);
+
+		let text_color = HANDLE_TEXT_COLOR.to_wgui_color().lerp(
+			&common.globals().palette,
+			&HANDLE_TEXT_COLOR_HOVERED.to_wgui_color(),
+			pos,
+		);
+
+		label.set_color(common, text_color, true);
+
+		common.alterables.mark_redraw();
+	})
+}
+
+fn on_enter_anim(
+	common: &mut event::CallbackDataCommon,
+	id_handle: WidgetID,
+	id_label: Option<WidgetID>,
+	anim_mult: f32,
+) {
+	let duration = 20. * anim_mult;
+
 	common.alterables.animate(Animation::new(
-		handle_id,
-		(20. * anim_mult) as _,
+		id_handle,
+		duration as _,
 		AnimationEasing::OutBack,
-		Box::new(move |common, data| {
-			let rect = data.obj.get_as_mut::<WidgetRectangle>().unwrap();
-			data.data.transform = get_anim_transform(data.pos, data.widget_boundary.size);
-			anim_rect(rect, data.pos);
-			common.alterables.mark_redraw();
-		}),
+		get_callback_rect(false),
 	));
+
+	if let Some(id_label) = id_label {
+		common.alterables.animate(Animation::new(
+			id_label,
+			duration as _,
+			AnimationEasing::OutBack,
+			get_callback_label(false),
+		));
+	}
 }
 
-fn on_leave_anim(common: &mut event::CallbackDataCommon, handle_id: WidgetID, anim_mult: f32) {
+fn on_leave_anim(
+	common: &mut event::CallbackDataCommon,
+	id_handle: WidgetID,
+	id_label: Option<WidgetID>,
+	anim_mult: f32,
+) {
+	let duration = 10. * anim_mult;
+
 	common.alterables.animate(Animation::new(
-		handle_id,
-		(10. * anim_mult) as _,
+		id_handle,
+		duration as _,
 		AnimationEasing::OutQuad,
-		Box::new(move |common, data| {
-			let rect = data.obj.get_as_mut::<WidgetRectangle>().unwrap();
-			data.data.transform = get_anim_transform(1.0 - data.pos, data.widget_boundary.size);
-			anim_rect(rect, 1.0 - data.pos);
-			common.alterables.mark_redraw();
-		}),
+		get_callback_rect(true),
 	));
+
+	if let Some(id_label) = id_label {
+		common.alterables.animate(Animation::new(
+			id_label,
+			duration as _,
+			AnimationEasing::OutQuad,
+			get_callback_label(true),
+		));
+	}
 }
 
 fn register_event_mouse_enter(
-	data: Rc<Data>,
 	state: Rc<RefCell<State>>,
 	listeners: &mut EventListenerCollection,
 	tooltip_info: Option<tooltip::TooltipInfo>,
-	anim_mult: f32,
 ) -> event::EventListenerID {
 	listeners.register(
 		EventListenerKind::MouseEnter,
 		Box::new(move |common, event_data, (), ()| {
 			common.alterables.trigger_haptics();
-			state.borrow_mut().hovered = true;
-			on_enter_anim(common, data.slider_handle_rect_id, anim_mult);
+			state.borrow_mut().hovered_body = true;
+
 			ComponentTooltip::register_hover_in(common, &tooltip_info, event_data.widget_id, state.clone());
 
 			Ok(EventResult::Pass)
@@ -332,10 +473,8 @@ fn register_event_mouse_enter(
 }
 
 fn register_event_mouse_leave(
-	data: Rc<Data>,
 	state: Rc<RefCell<State>>,
 	listeners: &mut EventListenerCollection,
-	anim_mult: f32,
 ) -> event::EventListenerID {
 	listeners.register(
 		EventListenerKind::MouseLeave,
@@ -344,36 +483,109 @@ fn register_event_mouse_leave(
 
 			{
 				let mut state = state.borrow_mut();
-				state.hovered = false;
+				state.hovered_body = false;
 				state.active_tooltip = None;
 			}
-			on_leave_anim(common, data.slider_handle_rect_id, anim_mult);
 
 			Ok(EventResult::Pass)
 		}),
 	)
 }
 
+fn get_handle_dist(common: &mut CallbackDataCommon, handle: &SliderHandleData, mouse_pos: Vec2) -> f32 {
+	let center = common.state.get_widget_boundary(handle.id_handle).center();
+	Vec2::distance(center, mouse_pos)
+}
+
+const MAX_HOVER_DIST: f32 = 64.0;
+
+fn update_handle_hovers(
+	common: &mut CallbackDataCommon,
+	data: &Data,
+	state: &mut State,
+	anim_mult: f32,
+	mouse_pos: Vec2,
+) {
+	let hovered1_prev = state.hovered1;
+	let hovered2_prev = state.hovered2;
+
+	if state.hovered_body {
+		let dist1 = get_handle_dist(common, &data.handle1, mouse_pos);
+
+		let dist2 = data
+			.handle2
+			.as_ref()
+			.map_or(f32::MAX, |h| get_handle_dist(common, h, mouse_pos));
+
+		state.hovered1 = dist1 <= MAX_HOVER_DIST;
+		state.hovered2 = dist2 <= MAX_HOVER_DIST;
+
+		// both of them are hovered, hover the closest one
+		if state.hovered1 && state.hovered2 {
+			if dist1 < dist2 {
+				state.hovered2 = false;
+			} else {
+				state.hovered1 = false;
+			}
+		}
+	} else {
+		state.hovered1 = false;
+		state.hovered2 = false;
+	}
+
+	// hover state changed, run animations
+	if state.hovered1 != hovered1_prev {
+		if state.hovered1 && !hovered1_prev {
+			on_enter_anim(common, data.handle1.id_handle_rect, data.handle1.id_label, anim_mult);
+		} else {
+			on_leave_anim(common, data.handle1.id_handle_rect, data.handle1.id_label, anim_mult);
+		}
+	}
+
+	if state.hovered2 != hovered2_prev
+		&& let Some(handle2) = data.handle2.as_ref()
+	{
+		if state.hovered2 && !hovered2_prev {
+			on_enter_anim(common, handle2.id_handle_rect, handle2.id_label, anim_mult);
+		} else {
+			on_leave_anim(common, handle2.id_handle_rect, handle2.id_label, anim_mult);
+		}
+	}
+}
+
 fn register_event_mouse_motion(
 	data: Rc<Data>,
 	state: Rc<RefCell<State>>,
 	listeners: &mut EventListenerCollection,
+	anim_mult: f32,
 ) -> event::EventListenerID {
 	listeners.register(
 		EventListenerKind::MouseMotion,
 		Box::new(move |common, event_data, (), ()| {
 			let mut state = state.borrow_mut();
 
-			let CallbackMetadata::MousePosition(pos) = event_data.metadata else {
+			let Some(pos_relative) = event_data
+				.metadata
+				.get_mouse_pos_relative(&common.alterables.transform_stack)
+			else {
 				unreachable!();
 			};
 
-			if state.dragged_by.is_some_and(|device| device == pos.device) {
-				state.update_value_to_mouse(event_data, &data, common);
-				Ok(EventResult::Consumed)
-			} else {
-				Ok(EventResult::Pass)
+			let CallbackMetadata::MousePosition(pos) = &event_data.metadata else {
+				unreachable!();
+			};
+
+			update_handle_hovers(common, &data, &mut state, anim_mult, pos_relative);
+
+			if let Some(dragged_by) = &state.dragged_by
+				&& dragged_by.device == pos.device
+			{
+				let index = dragged_by.index;
+				state.update_value_to_mouse(event_data, &data, common, index);
+				return Ok(EventResult::Consumed);
 			}
+
+			Ok(EventResult::Pass)
 		}),
 	)
 }
@@ -394,13 +606,18 @@ fn register_event_mouse_press(
 				unreachable!();
 			};
 
-			if state.hovered {
-				state.dragged_by = Some(btn.device);
-				state.update_value_to_mouse(event_data, &data, common);
-				Ok(EventResult::Consumed)
-			} else {
-				Ok(EventResult::Pass)
+			if !state.hovered_body {
+				// this slider isn't hovered at all?
+				return Ok(EventResult::Pass);
 			}
+
+			let hovered_index = state.get_hovered_index().unwrap_or(ValueIndex::Primary);
+			state.dragged_by = Some(DraggedBy {
+				device: btn.device,
+				index: hovered_index,
+			});
+			state.update_value_to_mouse(event_data, &data, common, hovered_index);
+			Ok(EventResult::ConsumedExclusive)
 		}),
 	)
 }
@@ -425,6 +642,72 @@ fn register_event_mouse_release(
 	)
 }
 
+fn mount_slider_handle(
+	ess: &mut ConstructEssentials,
+	body_id: WidgetID,
+	show_value: bool,
+) -> anyhow::Result<SliderHandleData> {
+	let slider_handle_style = taffy::Style {
+		size: taffy::Size {
+			width: length(0.0),
+			height: percent(1.0),
+		},
+		position: taffy::Position::Absolute,
+		align_items: Some(taffy::AlignItems::CENTER),
+		justify_content: Some(taffy::JustifyContent::CENTER),
+		..Default::default()
+	};
+
+	// invisible outer handle body
+	let (slider_handle, _) = ess
+		.layout
+		.add_child(body_id, WidgetDiv::create(), slider_handle_style)?;
+
+	let (slider_handle_rect, _) = ess.layout.add_child(
+		slider_handle.id,
+		WidgetRectangle::create(WidgetRectangleParams {
+			color: HANDLE_COLOR.into(),
+			border_color: HANDLE_BORDER_COLOR,
+			border: 2.0,
+			round: WLength::Percent(1.0),
+			..Default::default()
+		}),
+		taffy::Style {
+			position: taffy::Position::Absolute,
+			size: taffy::Size {
+				width: length(HANDLE_WIDTH),
+				height: length(HANDLE_HEIGHT),
+			},
+			..Default::default()
+		},
+	)?;
+
+	let slider_text: Option<(WidgetPair, taffy::NodeId)> = if show_value {
+		let label = WidgetLabel::create(
+			&mut ess.layout.state,
+			WidgetLabelParams {
+				content: Translation::default(),
+				style: TextStyle {
+					color: Some(HANDLE_TEXT_COLOR.into()),
+					weight: Some(FontWeight::Bold),
+					align: Some(HorizontalAlign::Center),
+					..Default::default()
+				},
+				..Default::default()
+			},
+		);
+		Some(ess.layout.add_child(slider_handle.id, label, Default::default())?)
+	} else {
+		None
+	};
+
+	Ok(SliderHandleData {
+		id_handle_rect: slider_handle_rect.id,
+		id_label: slider_text.map(|s| s.0.id),
+		id_handle: slider_handle.id,
+	})
+}
+
 pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Result<(WidgetPair, Rc<ComponentSlider>)> {
 	let mut style = params.style;
 	style.position = taffy::Position::Relative;
@@ -449,78 +732,35 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
 				height: percent(PAD_PERCENT),
 			},
 			position: taffy::Position::Absolute,
-			align_self: Some(taffy::AlignItems::Center),
-			justify_self: Some(taffy::JustifySelf::Center),
+			align_self: Some(taffy::AlignItems::CENTER),
+			justify_self: Some(taffy::JustifySelf::CENTER),
 			..Default::default()
 		},
 	)?;
 
-	let slider_handle_style = taffy::Style {
-		size: taffy::Size {
-			width: length(0.0),
-			height: percent(1.0),
-		},
-		position: taffy::Position::Absolute,
-		align_items: Some(taffy::AlignItems::Center),
-		justify_content: Some(taffy::JustifyContent::Center),
-		..Default::default()
-	};
-
-	// invisible outer handle body
-	let (slider_handle, _) = ess
-		.layout
-		.add_child(body_id, WidgetDiv::create(), slider_handle_style)?;
-
-	let (slider_handle_rect, _) = ess.layout.add_child(
-		slider_handle.id,
-		WidgetRectangle::create(WidgetRectangleParams {
-			color: HANDLE_COLOR,
-			border_color: HANDLE_BORDER_COLOR,
-			border: 2.0,
-			round: WLength::Percent(1.0),
-			..Default::default()
-		}),
-		taffy::Style {
-			position: taffy::Position::Absolute,
-			size: taffy::Size {
-				width: length(HANDLE_WIDTH),
-				height: length(HANDLE_HEIGHT),
-			},
-			..Default::default()
-		},
-	)?;
-
-	let state = State {
-		dragged_by: None,
-		hovered: false,
-		values: params.values,
-		on_value_changed: None,
-		active_tooltip: None,
-	};
-
-	let slider_text: Option<(WidgetPair, taffy::NodeId)> = if params.show_value {
-		let label = WidgetLabel::create(
-			&mut ess.layout.state,
-			WidgetLabelParams {
-				content: Translation::default(),
-				style: TextStyle {
-					color: Some(drawing::Color::new(0.0, 0.0, 0.0, 1.0)), // always black
-					weight: Some(FontWeight::Bold),
-					align: Some(HorizontalAlign::Center),
-					..Default::default()
-				},
-			},
-		);
-		Some(ess.layout.add_child(slider_handle.id, label, Default::default())?)
+	let slider_handle1 = mount_slider_handle(ess, body_id, params.show_value)?;
+	let slider_handle2 = if params.value2.is_some() {
+		Some(mount_slider_handle(ess, body_id, params.show_value)?)
 	} else {
 		None
 	};
 
+	let state = State {
+		dragged_by: None,
+		hovered_body: false,
+		hovered1: false,
+		hovered2: false,
+		value1: params.value1,
+		value2: params.value2,
+		limits: params.limits,
+		on_value_changed: None,
+		active_tooltip: None,
+	};
+
 	let data = Rc::new(Data {
-		slider_handle_rect_id: slider_handle_rect.id,
 		body_node: slider_body_node,
-		slider_handle_id: slider_handle.id,
-		slider_text_id: slider_text.map(|s| s.0.id),
+		handle1: slider_handle1,
+		handle2: slider_handle2,
 	});
 
 	let state = Rc::new(RefCell::new(state));
@@ -531,9 +771,9 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
 			let listeners = &mut root.widget.state().event_listeners;
 			let anim_mult = ess.layout.state.theme.animation_mult;
 			vec![
-				register_event_mouse_enter(data.clone(), state.clone(), listeners, params.tooltip, anim_mult),
-				register_event_mouse_leave(data.clone(), state.clone(), listeners, anim_mult),
-				register_event_mouse_motion(data.clone(), state.clone(), listeners),
+				register_event_mouse_enter(state.clone(), listeners, params.tooltip),
+				register_event_mouse_leave(state.clone(), listeners),
+				register_event_mouse_motion(data.clone(), state.clone(), listeners, anim_mult),
 				register_event_mouse_press(data.clone(), state.clone(), listeners),
 				register_event_mouse_release(state.clone(), listeners),
 			]
diff --git a/wgui/src/components/tabs.rs b/wgui/src/components/tabs.rs
index 521fb842..05561ab7 100644
--- a/wgui/src/components/tabs.rs
+++ b/wgui/src/components/tabs.rs
@@ -1,13 +1,14 @@
 use crate::{
-	assets::AssetPath,
+	assets::AssetPathRc,
+	color::WguiColor,
 	components::{
-		Component, ComponentBase, ComponentTrait, RefreshData,
+		Component, ComponentBase, ComponentTrait, DestroyData, RefreshData,
 		button::{self, ComponentButton},
 	},
 	event::CallbackDataCommon,
 	i18n::Translation,
 	layout::WidgetPair,
-	widget::{ConstructEssentials, div::WidgetDiv},
+	widget::{ConstructEssentials, div::WidgetDiv, util::WLength},
 };
 use std::{cell::RefCell, rc::Rc};
 use taffy::{
@@ -15,17 +16,25 @@ use taffy::{
 	prelude::{length, percent},
 };
 
-pub struct Entry<'a> {
-	pub sprite_src: Option<AssetPath<'a>>,
+pub struct Entry {
+	pub sprite_src: Option<AssetPathRc>,
 	pub text: Translation,
-	pub name: &'a str,
+	pub name: Rc<str>,
 }
 
 pub struct Params<'a> {
 	pub style: taffy::Style,
-	pub entries: Vec<Entry<'a>>,
+	pub entries: Vec<Entry>,
 	pub selected_entry_name: &'a str, // default: ""
 	pub on_select: Option<TabSelectCallback>,
+	pub round: WLength,
+	pub color: Option<WguiColor>,
+	pub border: f32,
+	pub border_color: Option<WguiColor>,
+	pub hover_color: Option<WguiColor>,
+	pub hover_border_color: Option<WguiColor>,
+	pub sticky_color: Option<WguiColor>,
+	pub sticky_border_color: Option<WguiColor>,
 }
 
 struct MountedEntry {
@@ -62,21 +71,19 @@ impl ComponentTrait for ComponentTabs {
 	fn refresh(&self, _data: &mut RefreshData) {
 		// nothing to do
 	}
+
+	fn destroy(&self, data: &mut DestroyData) {
+		for e in self.state.borrow_mut().mounted_entries.drain(..) {
+			e.button.destroy(data);
+			data.destroy_widgets.push(e.button.base().id);
+		}
+	}
 }
 
 impl State {
 	fn select_entry(&mut self, common: &mut CallbackDataCommon, name: &Rc<str>) {
-		let (color_accent, color_button) = {
-			let theme = &common.state.theme;
-			(theme.accent_color, theme.button_color)
-		};
-
 		for entry in &self.mounted_entries {
-			if *entry.name == **name {
-				entry.button.set_color(common, color_accent);
-			} else {
-				entry.button.set_color(common, color_button);
-			}
+			entry.button.set_sticky_state(common, *entry.name == **name);
 		}
 		self.selected_entry_name = name.clone();
 
@@ -94,6 +101,16 @@ impl ComponentTabs {
 	pub fn on_select(&self, callback: TabSelectCallback) {
 		self.state.borrow_mut().on_select = Some(callback);
 	}
+
+	pub fn get_tab_button(&self, name: &str) -> Option<Rc<ComponentButton>> {
+		self
+			.state
+			.borrow_mut()
+			.mounted_entries
+			.iter()
+			.find(|e| name == &*e.name)
+			.map(|e| e.button.clone())
+	}
 }
 
 pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Result<(WidgetPair, Rc<ComponentTabs>)> {
@@ -103,7 +120,7 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
 	style.overflow.y = taffy::Overflow::Scroll;
 	style.flex_direction = taffy::FlexDirection::Column;
 	style.flex_wrap = taffy::FlexWrap::NoWrap;
-	style.align_items = Some(AlignItems::Center);
+	style.align_items = Some(AlignItems::CENTER);
 	style.gap = length(4.0);
 
 	let (root, _) = ess.layout.add_child(ess.parent, WidgetDiv::create(), style)?;
@@ -111,7 +128,9 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
 	let mut mounted_entries = Vec::<MountedEntry>::new();
 
 	// Mount entries
-	for entry in params.entries {
+	for (idx, entry) in params.entries.into_iter().enumerate() {
+		let sprite_src = entry.sprite_src.as_ref().map(AssetPathRc::as_borrowed);
+
 		let (_, button) = button::construct(
 			&mut ConstructEssentials {
 				layout: ess.layout,
@@ -119,21 +138,32 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
 			},
 			button::Params {
 				text: Some(entry.text),
-				sprite_src: entry.sprite_src,
+				sprite_src,
 				style: taffy::Style {
 					min_size: taffy::Size {
 						width: percent(1.0),
 						height: length(32.0),
 					},
-					justify_content: Some(taffy::JustifyContent::Start),
+					justify_content: Some(taffy::JustifyContent::START),
 					..Default::default()
 				},
+				round: params.round,
+				color: params.color,
+				border: params.border,
+				border_color: params.border_color,
+				hover_color: params.hover_color,
+				hover_border_color: params.hover_border_color,
+				sticky_color: params.sticky_color,
+				sticky_border_color: params.sticky_border_color,
 				..Default::default()
 			},
 		)?;
 
+		// init colors
+		button.set_sticky_state(&mut ess.layout.common(), idx == 0);
+
 		mounted_entries.push(MountedEntry {
-			name: Rc::from(entry.name),
+			name: entry.name,
 			button,
 		});
 	}
diff --git a/wgui/src/components/tooltip.rs b/wgui/src/components/tooltip.rs
index 05648ae5..d15ec048 100644
--- a/wgui/src/components/tooltip.rs
+++ b/wgui/src/components/tooltip.rs
@@ -4,8 +4,8 @@ use taffy::prelude::length;
 
 use crate::{
 	animation::{Animation, AnimationEasing},
+	color::{WguiColor, WguiColorName},
 	components::{self, Component, ComponentBase, ComponentTrait, RefreshData},
-	drawing::Color,
 	event::CallbackDataCommon,
 	i18n::Translation,
 	layout::{self, LayoutTask, LayoutTasks, WidgetID, WidgetPair},
@@ -75,11 +75,15 @@ impl Default for Params {
 	}
 }
 
-struct State {}
+struct State {
+	position_shift: Vec2, // in case if the tooltip goes out of bounds
+}
 
 #[allow(clippy::struct_field_names)]
 struct Data {
-	id_root: WidgetID, // Rectangle
+	id_root: WidgetID, // div
+	id_rect: WidgetID, // rectangle
+	side: TooltipSide,
 }
 
 pub struct ComponentTooltip {
@@ -99,8 +103,47 @@ impl ComponentTrait for ComponentTooltip {
 		&self.base
 	}
 
-	fn refresh(&self, _data: &mut RefreshData) {
-		// nothing to do
+	fn refresh(&self, data: &mut RefreshData) {
+		let layout_size = data.layout.content_size;
+		let pin_pos = data.layout.state.get_widget_boundary(self.data.id_root).pos;
+		let rect_size = data.layout.state.get_widget_boundary(self.data.id_rect).size;
+
+		let rect_pos_topleft: Vec2 = match self.data.side {
+			TooltipSide::Left => pin_pos + Vec2::new(-rect_size.x, -rect_size.y / 2.0),
+			TooltipSide::Right => pin_pos + Vec2::new(0.0, -rect_size.y / 2.0),
+			TooltipSide::Top => pin_pos + Vec2::new(-rect_size.x / 2.0, -rect_size.y),
+			TooltipSide::Bottom => pin_pos + Vec2::new(-rect_size.x / 2.0, 0.0),
+		};
+
+		let mut state = self.state.borrow_mut();
+
+		let padding = 8.0;
+		let rect_right = rect_pos_topleft.x + rect_size.x + padding;
+		let rect_bottom = rect_pos_topleft.y + rect_size.y + padding;
+
+		let diff_right = rect_right - layout_size.x;
+		let diff_bottom = rect_bottom - layout_size.y;
+
+		// limit x < 0 or rect_right > layout_size.x
+		if rect_pos_topleft.x < 0.0 {
+			state.position_shift.x = -rect_pos_topleft.x;
+		} else if diff_right > 0.0 {
+			state.position_shift.x = -diff_right;
+		}
+
+		// limit y < 0 or rect_bottom > layout_size.y
+		if rect_pos_topleft.y < 0.0 {
+			state.position_shift.y = -rect_pos_topleft.y;
+		} else if diff_bottom > 0.0 {
+			state.position_shift.y = -diff_bottom;
+		}
+
+		/*log::info!(
+			"layout size {:?}, pin pos {:?}, rect size {:?}",
+			layout_size,
+			pin_pos,
+			rect_size
+		);*/
 	}
 }
 
@@ -110,8 +153,8 @@ impl Drop for ComponentTooltip {
 	}
 }
 
-pub const TOOLTIP_COLOR: Color = Color::new(0.02, 0.02, 0.02, 0.95);
-pub const TOOLTIP_BORDER_COLOR: Color = Color::new(0.4, 0.4, 0.4, 1.0);
+pub const TOOLTIP_COLOR: WguiColorName = WguiColorName::BackgroundContrast;
+pub const TOOLTIP_BORDER_COLOR: WguiColorName = WguiColorName::Outline;
 
 pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Result<(WidgetPair, Rc<ComponentTooltip>)> {
 	let absolute_boundary = {
@@ -127,7 +170,7 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
 
 	let spacing = 8.0;
 
-	let transform = Mat4::from_translation(Vec3::new(-0.5, 0.0, 0.0));
+	let transform = Mat4::from_translation(Vec3::new(0.0, 0.0, 0.0));
 
 	// this value needs to be bigger than rectangle padding sizes due to the
 	// transform stack & scissoring design. Needs investigation, zero-size objects
@@ -140,26 +183,26 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
 		TooltipSide::Left => (
 			absolute_boundary.left() - spacing - pin_size,
 			absolute_boundary.top() + absolute_boundary.size.y / 2.0 - pin_size / 2.0,
-			taffy::AlignItems::Center,
-			taffy::JustifyContent::End,
+			taffy::AlignItems::CENTER,
+			taffy::JustifyContent::END,
 		),
 		TooltipSide::Right => (
 			absolute_boundary.left() + absolute_boundary.size.x + spacing,
 			absolute_boundary.top() + absolute_boundary.size.y / 2.0 - pin_size / 2.0,
-			taffy::AlignItems::Center,
-			taffy::JustifyContent::Start,
+			taffy::AlignItems::CENTER,
+			taffy::JustifyContent::START,
 		),
 		TooltipSide::Top => (
 			absolute_boundary.left() + absolute_boundary.size.x / 2.0 - pin_size / 2.0,
 			absolute_boundary.top() - spacing - pin_size,
-			taffy::AlignItems::End,
-			taffy::JustifyContent::Center,
+			taffy::AlignItems::END,
+			taffy::JustifyContent::CENTER,
 		),
 		TooltipSide::Bottom => (
 			absolute_boundary.left() + absolute_boundary.size.x / 2.0 - pin_size / 2.0,
 			absolute_boundary.top() + absolute_boundary.size.y + spacing,
-			taffy::AlignItems::Baseline,
-			taffy::JustifyContent::Center,
+			taffy::AlignItems::BASELINE,
+			taffy::JustifyContent::CENTER,
 		),
 	};
 
@@ -190,8 +233,8 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
 	let (rect, _) = ess.layout.add_child(
 		div.id,
 		WidgetRectangle::create(WidgetRectangleParams {
-			color: TOOLTIP_COLOR,
-			border_color: TOOLTIP_BORDER_COLOR,
+			color: TOOLTIP_COLOR.into(),
+			border_color: TOOLTIP_BORDER_COLOR.into(),
 			border: 2.0,
 			round: WLength::Units(24.0),
 			..Default::default()
@@ -217,20 +260,28 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
 				weight: Some(FontWeight::Bold),
 				..Default::default()
 			},
+			..Default::default()
 		},
 	);
+
 	let (label, _) = ess.layout.add_child(rect.id, label, Default::default())?;
 
-	let data = Rc::new(Data { id_root: div.id });
+	let data = Rc::new(Data {
+		id_root: div.id,
+		id_rect: rect.id,
+		side: params.info.side.clone(),
+	});
 
-	let state = Rc::new(RefCell::new(State {}));
+	let state = Rc::new(RefCell::new(State {
+		position_shift: Vec2::default(),
+	}));
 
 	let base = ComponentBase::default();
 
 	let tooltip = Rc::new(ComponentTooltip {
 		base,
 		data,
-		state,
+		state: state.clone(),
 		tasks: ess.layout.tasks.clone(),
 	});
 
@@ -246,21 +297,33 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
 		rect.id,
 		(10.0 * anim_mult) as u32,
 		AnimationEasing::OutQuad,
-		Box::new(move |common, data| {
-			let rect = data.obj.get_as_mut::<WidgetRectangle>().unwrap(); /* safe */
-			let alpha = data.pos;
-			rect.params.color.a = alpha;
-			rect.params.border_color.a = alpha;
+		{
+			Box::new(move |common, data| {
+				let rect = data.obj.get_as_mut::<WidgetRectangle>().unwrap(); /* safe */
+				let alpha = data.pos;
+				rect.params.color = rect.params.color.with_alpha(alpha);
+				rect.params.border_color = rect.params.border_color.with_alpha(alpha);
 
-			let dir_mult = (1.0 - data.pos) * 5.0;
-			data.data.transform = Mat4::from_translation(Vec3::new(direction.x * dir_mult, direction.y * dir_mult, 0.0));
+				let position_shift = state.borrow().position_shift;
 
-			if let Some(mut label) = common.state.widgets.get_as::<WidgetLabel>(label.id) {
-				label.set_color(common, Color::new(1.0, 1.0, 1.0, alpha), true);
-			}
+				let dir_mult = (1.0 - data.pos) * 5.0;
+				data.data.transform = Mat4::from_translation(Vec3::new(
+					direction.x * dir_mult + position_shift.x,
+					direction.y * dir_mult + position_shift.y,
+					0.0,
+				));
 
-			common.alterables.mark_redraw();
-		}),
+				if let Some(mut label) = common.state.widgets.get_as::<WidgetLabel>(label.id) {
+					label.set_color(
+						common,
+						WguiColor::from(WguiColorName::OnBackground).with_alpha(alpha),
+						true,
+					);
+				}
+
+				common.alterables.mark_redraw();
+			})
+		},
 	));
 
 	ess.layout.defer_component_refresh(Component(tooltip.clone()));
diff --git a/wgui/src/components/video.rs b/wgui/src/components/video.rs
new file mode 100644
index 00000000..c629e56b
--- /dev/null
+++ b/wgui/src/components/video.rs
@@ -0,0 +1,285 @@
+use image::ImageBuffer;
+use taffy::prelude::percent;
+
+use crate::{
+	animation::Animation,
+	assets::AssetPath,
+	color::WguiColorName,
+	components::{Component, ComponentBase, ComponentTrait, RefreshData},
+	event::EventAlterables,
+	globals::WguiGlobals,
+	layout::{Layout, WidgetID, WidgetPair},
+	renderer_vk::text::custom_glyph::{CustomGlyphContent, CustomGlyphData},
+	time::get_millis,
+	video_dec::{self, Av1Decoder, IvfReader},
+	widget::{
+		ConstructEssentials,
+		image::WidgetImage,
+		rectangle::{WidgetRectangle, WidgetRectangleParams},
+	},
+};
+use std::{
+	cell::RefCell,
+	rc::{Rc, Weak},
+	sync::Arc,
+};
+
+#[derive(Default)]
+pub struct Params<'a> {
+	pub style: taffy::Style,
+	pub src: Option<AssetPath<'a>>,
+	pub looping: bool,
+	pub speed: f32,
+}
+
+struct PlayingSource {
+	demuxer: IvfReader,
+	decoder: video_dec::Av1Decoder,
+	cur_frame: u32,
+}
+
+struct State {
+	source: Option<PlayingSource>,
+	self_ref: Weak<ComponentVideo>,
+	playing: bool,
+	play_requested: bool,
+}
+
+struct Data {
+	#[allow(dead_code)]
+	id_container: WidgetID,
+	id_image: WidgetID,
+
+	looping: bool,
+	speed: f32,
+}
+
+#[allow(dead_code)]
+pub struct ComponentVideo {
+	base: ComponentBase,
+	data: Rc<Data>,
+	state: Rc<RefCell<State>>,
+}
+
+impl ComponentTrait for ComponentVideo {
+	fn base(&self) -> &ComponentBase {
+		&self.base
+	}
+
+	fn base_mut(&mut self) -> &mut ComponentBase {
+		&mut self.base
+	}
+
+	fn refresh(&self, data: &mut RefreshData) {
+		let mut state = self.state.borrow_mut();
+
+		if state.play_requested {
+			state.play_requested = false;
+			if let Err(e) = self.play(&mut state, data.layout) {
+				log::error!("play failed: {e:?}");
+			}
+		}
+	}
+}
+
+const PLAYBACK_ANIMATION_ID: u32 = 1000;
+
+impl ComponentVideo {
+	fn play(&self, state: &mut State, layout: &mut Layout) -> anyhow::Result<()> {
+		let Some(source) = &mut state.source else {
+			// no source available, do nothing
+			return Ok(());
+		};
+
+		state.playing = false;
+		source.decoder = Av1Decoder::new()?;
+		source.demuxer.rewind();
+		source.cur_frame = 0;
+
+		if let Some(component) = state.self_ref.upgrade() {
+			layout.defer_component_refresh(Component(component));
+		}
+
+		layout
+			.animations
+			.stop_by_widget(self.data.id_image, Some(PLAYBACK_ANIMATION_ID));
+
+		state.playing = true;
+
+		let framerate = source.demuxer.framerate * self.data.speed;
+		let looping = self.data.looping;
+		let id_image = self.data.id_image;
+		let start_time = get_millis();
+		// log::info!("num frames: {}", source.demuxer.num_frames);
+
+		layout.animations.add(Animation::new_ex(
+			self.data.id_image,
+			PLAYBACK_ANIMATION_ID,
+			u32::MAX, // infinity
+			crate::animation::AnimationEasing::Linear,
+			Box::new({
+				let state_ref = self.state.clone();
+
+				move |common, data| {
+					let mut state = state_ref.borrow_mut();
+					if !state.playing {
+						*data.stop_me = true;
+						return;
+					}
+
+					loop {
+						let Some(source) = &mut state.source else {
+							return;
+						};
+
+						let cur_time = get_millis() - start_time;
+						let target_frame = ((cur_time as f32) / 1000.0 * framerate) as u32;
+
+						let cur_frame = source.cur_frame;
+						if cur_frame >= target_frame {
+							break;
+						}
+
+						let image = data.obj.cast_mut::<WidgetImage>().unwrap();
+
+						match ComponentVideo::read_next_frame(image, &mut state, common.alterables) {
+							Ok(data_available) => {
+								if !data_available {
+									if looping {
+										state.play_requested = true;
+										common.alterables.refresh_component_once(&state.self_ref);
+										common.mark_widget_dirty(id_image);
+									} else {
+										state.playing = false;
+									}
+									break;
+								}
+							}
+							Err(e) => {
+								state.playing = false;
+								log::error!("read_next_frame failed: {e:?}");
+							}
+						}
+					}
+				}
+			}),
+		));
+		Ok(())
+	}
+
+	fn read_next_frame(
+		image: &mut WidgetImage,
+		state: &mut State,
+		alterables: &mut EventAlterables,
+	) -> anyhow::Result<bool> {
+		let Some(source) = &mut state.source else {
+			return Ok(false);
+		};
+
+		let rgbx_frame = match source.decoder.read_frame(&mut source.demuxer)? {
+			video_dec::ReadFrameResult::Ok(rgbx_frame) => rgbx_frame,
+			video_dec::ReadFrameResult::EndOfFile => {
+				// log::info!("got EOF");
+				return Ok(false);
+			}
+		};
+
+		let Some(buffer) = ImageBuffer::from_raw(rgbx_frame.width.into(), rgbx_frame.height.into(), rgbx_frame.data) else {
+			anyhow::bail!("ImageBuffer failed");
+		};
+
+		let glyph_content = CustomGlyphContent::Image(buffer);
+
+		image.set_content(
+			alterables,
+			Some(CustomGlyphData {
+				// force-update image content (FIXME: stream image data directly instead)
+				id: source.cur_frame as usize,
+				content: Arc::new(glyph_content),
+			}),
+		);
+
+		source.cur_frame += 1;
+
+		Ok(true)
+	}
+}
+
+impl State {
+	fn set_source(&mut self, globals: &WguiGlobals, src: AssetPath) -> anyhow::Result<()> {
+		let video_data = globals.get_asset(src)?;
+		let demuxer = IvfReader::new(video_data)?;
+		let decoder = Av1Decoder::new()?;
+
+		self.source = Some(PlayingSource {
+			demuxer,
+			decoder,
+			cur_frame: 0,
+		});
+
+		Ok(())
+	}
+}
+
+pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Result<(WidgetPair, Rc<ComponentVideo>)> {
+	let style = params.style;
+
+	let (root, _) = ess.layout.add_child(
+		ess.parent,
+		WidgetRectangle::create(WidgetRectangleParams {
+			color: WguiColorName::Background.into(),
+			..Default::default()
+		}),
+		style,
+	)?;
+
+	let (image, _) = ess.layout.add_child(
+		root.id,
+		WidgetImage::create(Default::default()),
+		taffy::Style {
+			size: taffy::Size {
+				width: percent(1.0),
+				height: percent(1.0),
+			},
+			..Default::default()
+		},
+	)?;
+
+	let id_container = root.id;
+	let data = Rc::new(Data {
+		id_container,
+		id_image: image.id,
+		looping: params.looping,
+		speed: params.speed,
+	});
+
+	let state = Rc::new(RefCell::new(State {
+		source: None,
+		self_ref: Default::default(),
+		playing: false,
+		play_requested: false,
+	}));
+
+	let base = ComponentBase {
+		id: root.id,
+		lhandles: Default::default(),
+	};
+
+	let video = Rc::new(ComponentVideo { base, data, state });
+
+	// configure state and set video source
+	{
+		let mut state = video.state.borrow_mut();
+		state.self_ref = Rc::downgrade(&video);
+		if let Some(src) = params.src
+			&& let Err(e) = state.set_source(&ess.layout.state.globals, src)
+		{
+			log::error!("set_source failed: {e:?}");
+		}
+
+		state.play_requested = true;
+	}
+
+	ess.layout.defer_component_refresh(Component(video.clone()));
+	Ok((root, video))
+}
diff --git a/wgui/src/drawing.rs b/wgui/src/drawing.rs
index 71a66e43..a3bd018c 100644
--- a/wgui/src/drawing.rs
+++ b/wgui/src/drawing.rs
@@ -102,7 +102,7 @@ impl Boundary {
 	}
 }
 
-#[derive(Debug, Copy, Clone)]
+#[derive(Debug, Copy, Clone, PartialEq)]
 pub struct Color {
 	pub r: f32,
 	pub g: f32,
@@ -119,7 +119,7 @@ impl Color {
 	}
 
 	#[must_use]
-	pub fn add_rgb(&self, n: f32) -> Self {
+	pub const fn add_rgb(&self, n: f32) -> Self {
 		Self {
 			r: self.r + n,
 			g: self.g + n,
@@ -129,7 +129,7 @@ impl Color {
 	}
 
 	#[must_use]
-	pub fn mult_rgb(&self, n: f32) -> Self {
+	pub const fn mult_rgb(&self, n: f32) -> Self {
 		Self {
 			r: self.r * n,
 			g: self.g * n,
@@ -139,7 +139,7 @@ impl Color {
 	}
 
 	#[must_use]
-	pub fn lerp(&self, other: &Self, n: f32) -> Self {
+	pub const fn lerp(&self, other: &Self, n: f32) -> Self {
 		Self {
 			r: self.r * (1.0 - n) + other.r * n,
 			g: self.g * (1.0 - n) + other.g * n,
@@ -179,10 +179,81 @@ impl Color {
 		format!("#{r:02X}{g:02X}{b:02X}{a:02X}")
 	}
 
+	#[must_use]
+	pub fn to_hex_rgb(&self) -> String {
+		let r = (self.r.clamp(0.0, 1.0) * 255.0).round() as u8;
+		let g = (self.g.clamp(0.0, 1.0) * 255.0).round() as u8;
+		let b = (self.b.clamp(0.0, 1.0) * 255.0).round() as u8;
+		format!("#{r:02X}{g:02X}{b:02X}")
+	}
+
 	#[must_use]
 	pub const fn as_arr(&self) -> [f32; 4] {
 		[self.r, self.b, self.g, self.a]
 	}
+
+	// expects strings like "#424242" or "#424242FF"
+	pub const fn from_hex(html_hex: &str) -> Option<drawing::Color> {
+		const fn hex_nibble(byte: u8) -> Option<u8> {
+			match byte {
+				b'0'..=b'9' => Some(byte - b'0'),
+				b'a'..=b'f' => Some(byte - b'a' + 10),
+				b'A'..=b'F' => Some(byte - b'A' + 10),
+				_ => None,
+			}
+		}
+
+		const fn hex_byte(high: u8, low: u8) -> Option<u8> {
+			let high = match hex_nibble(high) {
+				Some(value) => value,
+				None => return None,
+			};
+
+			let low = match hex_nibble(low) {
+				Some(value) => value,
+				None => return None,
+			};
+
+			Some((high << 4) | low)
+		}
+
+		let bytes = html_hex.as_bytes();
+
+		if (bytes.len() != 7 && bytes.len() != 9) || bytes[0] != b'#' {
+			return None;
+		}
+
+		let r = match hex_byte(bytes[1], bytes[2]) {
+			Some(value) => value,
+			None => return None,
+		};
+
+		let g = match hex_byte(bytes[3], bytes[4]) {
+			Some(value) => value,
+			None => return None,
+		};
+
+		let b = match hex_byte(bytes[5], bytes[6]) {
+			Some(value) => value,
+			None => return None,
+		};
+
+		let a = if bytes.len() == 9 {
+			match hex_byte(bytes[7], bytes[8]) {
+				Some(value) => value,
+				None => return None,
+			}
+		} else {
+			255
+		};
+
+		Some(drawing::Color::new(
+			r as f32 / 255.0,
+			g as f32 / 255.0,
+			b as f32 / 255.0,
+			a as f32 / 255.0,
+		))
+	}
 }
 
 impl Default for Color {
@@ -192,6 +263,69 @@ impl Default for Color {
 	}
 }
 
+pub struct HsvColor {
+	pub h: f32,
+	pub s: f32,
+	pub v: f32,
+	pub a: f32,
+}
+
+#[allow(clippy::many_single_char_names)]
+impl HsvColor {
+	pub const fn new(h: f32, s: f32, v: f32, a: f32) -> Self {
+		Self { h, s, v, a }
+	}
+
+	pub fn to_rgb(&self) -> Color {
+		if self.s == 0.0 {
+			// gray
+			return Color::new(self.v, self.v, self.v, 1.0);
+		}
+
+		let h6 = self.h * 6.0;
+		let i = h6.floor();
+		let f = h6 - i;
+
+		let p = self.v * (1.0 - self.s);
+		let q = self.v * (1.0 - self.s * f);
+		let t = self.v * (1.0 - self.s * (1.0 - f));
+
+		let (r, g, b) = match i as i32 % 6 {
+			0 => (self.v, t, p),
+			1 => (q, self.v, p),
+			2 => (p, self.v, t),
+			3 => (p, q, self.v),
+			4 => (t, p, self.v),
+			_ => (self.v, p, q),
+		};
+
+		Color::new(r, g, b, 1.0)
+	}
+}
+
+impl From<Color> for HsvColor {
+	fn from(value: Color) -> Self {
+		let max = value.r.max(value.g).max(value.b);
+		let min = value.r.min(value.g).min(value.b);
+		let delta = max - min;
+
+		let h = if delta == 0.0 {
+			0.0
+		} else if max == value.r {
+			(((value.g - value.b) / delta) / 6.0 + 1.0) % 1.0
+		} else if max == value.g {
+			((value.b - value.r) / delta + 2.0) / 6.0
+		} else {
+			((value.r - value.g) / delta + 4.0) / 6.0
+		};
+
+		let s = if max == 0.0 { 0.0 } else { delta / max };
+		let v = max;
+
+		Self::new(h, s, v, value.a)
+	}
+}
+
 #[repr(u8)]
 #[derive(Debug, Default, Clone, Copy)]
 pub enum GradientMode {
@@ -218,6 +352,7 @@ pub struct Rectangle {
 pub struct ImagePrimitive {
 	pub content: CustomGlyphData,
 	pub content_key: usize,
+	pub skip_cache: bool,
 
 	pub border: f32, // width in pixels
 	pub border_color: Color,
diff --git a/wgui/src/event.rs b/wgui/src/event.rs
index 83e2c921..6dd5daa2 100644
--- a/wgui/src/event.rs
+++ b/wgui/src/event.rs
@@ -11,6 +11,7 @@ use slotmap::{DenseSlotMap, new_key_type};
 use crate::{
 	animation::{self, Animation},
 	components::{ComponentTrait, ComponentWeak},
+	drawing::Boundary,
 	globals,
 	i18n::I18n,
 	layout::{LayoutDispatchFunc, LayoutState, LayoutTask, WidgetID},
@@ -19,6 +20,19 @@ use crate::{
 	widget::{EventResult, WidgetData, WidgetObj},
 };
 
+#[derive(Debug, Eq, PartialEq, Clone, Copy)]
+pub struct DeviceBitmask(pub u8);
+
+impl DeviceBitmask {
+	pub fn from_index(index: usize) -> Self {
+		debug_assert!(index < 8);
+		Self(1u8 << index)
+	}
+	pub fn to_index(self) -> Option<usize> {
+		(self.0 != 0).then(|| self.0.trailing_zeros() as usize)
+	}
+}
+
 #[derive(Debug, Clone, Copy)]
 pub enum MouseButtonIndex {
 	Left,
@@ -30,28 +44,28 @@ pub enum MouseButtonIndex {
 pub struct MouseButtonEvent {
 	pub index: MouseButtonIndex,
 	pub pos: Vec2,
-	pub device: usize,
+	pub device: DeviceBitmask,
 }
 
 #[derive(Debug, Clone, Copy)]
 pub struct MousePosition {
 	pub pos: Vec2,
-	pub device: usize,
+	pub device: DeviceBitmask,
 }
 
 pub struct MouseLeaveEvent {
-	pub device: usize,
+	pub device: DeviceBitmask,
 }
 
 pub struct MouseMotionEvent {
 	pub pos: Vec2,
-	pub device: usize,
+	pub device: DeviceBitmask,
 }
 
 pub struct MouseWheelEvent {
 	pub pos: Vec2,   /* mouse position */
 	pub delta: Vec2, /* wheel delta */
-	pub device: usize,
+	pub device: DeviceBitmask,
 }
 
 #[derive(Clone)]
@@ -70,23 +84,26 @@ pub enum Event {
 	MouseMotion(MouseMotionEvent),
 	MouseUp(MouseButtonEvent),
 	MouseWheel(MouseWheelEvent),
+	MouseCancel, // Called if the user started scrolling by swiping above the button, to cancel all currently pressed buttons (prevent clicks)
 	TextInput(TextInputEvent),
 }
 
 impl Event {
-	fn test_transform_pos(transform: &Transform, pos: Vec2) -> bool {
+	pub fn test_transform_pos(transform: &Transform, pos: Vec2) -> bool {
 		pos.x >= transform.abs_pos.x
 			&& pos.x < transform.abs_pos.x + transform.visual_dim.x
 			&& pos.y >= transform.abs_pos.y
 			&& pos.y < transform.abs_pos.y + transform.visual_dim.y
 	}
 
-	pub fn test_mouse_within_transform(&self, transform: &Transform) -> bool {
+	pub fn test_mouse_within_transform(&self, transform: &Transform, scissor_boundary: &Boundary) -> bool {
 		match self {
-			Self::MouseDown(evt) => Self::test_transform_pos(transform, evt.pos),
-			Self::MouseMotion(evt) => Self::test_transform_pos(transform, evt.pos),
-			Self::MouseUp(evt) => Self::test_transform_pos(transform, evt.pos),
-			Self::MouseWheel(evt) => Self::test_transform_pos(transform, evt.pos),
+			Self::MouseDown(evt) => Self::test_transform_pos(transform, evt.pos) && scissor_boundary.contains_point(evt.pos),
+			Self::MouseMotion(evt) => {
+				Self::test_transform_pos(transform, evt.pos) && scissor_boundary.contains_point(evt.pos)
+			}
+			Self::MouseUp(evt) => Self::test_transform_pos(transform, evt.pos) && scissor_boundary.contains_point(evt.pos),
+			Self::MouseWheel(evt) => Self::test_transform_pos(transform, evt.pos) && scissor_boundary.contains_point(evt.pos),
 			_ => false,
 		}
 	}
@@ -95,6 +112,7 @@ impl Event {
 pub enum StyleSetRequest {
 	Display(taffy::Display),
 	Margin(taffy::Rect<taffy::LengthPercentageAuto>),
+	Padding(taffy::Rect<taffy::LengthPercentage>),
 	Width(taffy::Dimension),
 	Height(taffy::Dimension),
 	Size(taffy::Size<taffy::Dimension>),
@@ -106,6 +124,7 @@ pub struct EventAlterables {
 	pub dirty_widgets: Vec<WidgetID>,
 	pub components_to_refresh_once: Vec<ComponentWeak>,
 	pub style_set_requests: Vec<(WidgetID, StyleSetRequest)>,
+	pub global_events_to_emit: Vec<Event>,
 	pub animations: Vec<animation::Animation>,
 	pub widgets_to_tick: HashSet<WidgetID>, // widgets which needs to be ticked in the next `Layout::update()` fn
 	pub transform_stack: TransformStack,
@@ -125,10 +144,30 @@ impl EventAlterables {
 		self.style_set_requests.push((widget_id, request));
 	}
 
+	pub fn set_widget_visible(&mut self, widget_id: WidgetID, visible: bool) {
+		self.style_set_requests.push((
+			widget_id,
+			StyleSetRequest::Display(if visible {
+				taffy::Display::Flex
+			} else {
+				taffy::Display::None
+			}),
+		));
+	}
+
 	pub fn mark_dirty(&mut self, widget_id: WidgetID) {
 		self.dirty_widgets.push(widget_id);
 	}
 
+	pub fn mark_dirty_and_redraw(&mut self, widget_id: WidgetID) {
+		self.mark_dirty(widget_id);
+		self.mark_redraw();
+	}
+
+	pub fn emit_global_event(&mut self, event: Event) {
+		self.global_events_to_emit.push(event);
+	}
+
 	pub fn mark_tick(&mut self, widget_id: WidgetID) {
 		self.widgets_to_tick.insert(widget_id);
 	}
@@ -174,8 +213,7 @@ impl CallbackDataCommon<'_> {
 
 	// helper functions
 	pub fn mark_widget_dirty(&mut self, id: WidgetID) {
-		self.alterables.mark_dirty(id);
-		self.alterables.mark_redraw();
+		self.alterables.mark_dirty_and_redraw(id);
 	}
 
 	pub fn globals(&self) -> RefMut<'_, globals::Globals> {
@@ -224,9 +262,10 @@ impl CallbackMetadata {
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum EventListenerKind {
 	MousePress,
-	MouseRelease,
-	MouseEnter,
 	MouseMotion,
+	MouseRelease,
+	MouseCancel,
+	MouseEnter,
 	MouseLeave,
 	TextInput,
 	InternalStateChange,
diff --git a/wgui/src/globals.rs b/wgui/src/globals.rs
index e1a54333..4f8b4d12 100644
--- a/wgui/src/globals.rs
+++ b/wgui/src/globals.rs
@@ -14,6 +14,7 @@ use crate::{
 	assets_internal,
 	font_config::{WguiFontConfig, WguiFontSystem},
 	i18n::I18n,
+	palette::WguiColorPalette,
 	renderer_vk::text::custom_glyph::CustomGlyphCache,
 };
 
@@ -24,6 +25,7 @@ pub struct Globals {
 	pub i18n_builtin: I18n,
 	pub font_system: WguiFontSystem,
 	pub custom_glyph_cache: CustomGlyphCache,
+	pub palette: WguiColorPalette,
 }
 
 #[derive(Clone)]
@@ -35,6 +37,7 @@ impl WguiGlobals {
 		lang_provider: &dyn LangProvider,
 		font_config: &WguiFontConfig,
 		asset_folder: PathBuf,
+		palette: WguiColorPalette,
 	) -> anyhow::Result<Self> {
 		let i18n_builtin = I18n::new(assets_builtin.as_mut(), lang_provider)?;
 		let assets_internal = Box::new(assets_internal::AssetInternal {});
@@ -46,6 +49,7 @@ impl WguiGlobals {
 			font_system: WguiFontSystem::new(font_config, i18n_builtin.get_locale()),
 			i18n_builtin,
 			custom_glyph_cache: CustomGlyphCache::new(),
+			palette,
 		}))))
 	}
 
diff --git a/wgui/src/layout.rs b/wgui/src/layout.rs
index 2569f8b7..b57cea30 100644
--- a/wgui/src/layout.rs
+++ b/wgui/src/layout.rs
@@ -7,11 +7,11 @@ use std::{
 
 use crate::{
 	animation::Animations,
-	components::{self, Component, ComponentWeak, FocusChangeData, RefreshData},
+	components::{self, Component, ComponentWeak, DestroyData, FocusChangeData, RefreshData},
 	drawing::{
 		self, ANSI_BOLD_CODE, ANSI_RESET_CODE, Boundary, PushScissorStackResult, push_scissor_stack, push_transform_stack,
 	},
-	event::{self, CallbackDataCommon, EventAlterables},
+	event::{self, CallbackDataCommon, Event, EventAlterables, StyleSetRequest},
 	globals::WguiGlobals,
 	sound::WguiSoundType,
 	task::Tasks,
@@ -86,6 +86,11 @@ impl WidgetMap {
 		self.0.get(handle)
 	}
 
+	// same as get(), but with error message
+	pub fn fetch(&self, handle: WidgetID) -> anyhow::Result<Widget> {
+		self.get(handle).cloned().context("Failed to fetch widget")
+	}
+
 	pub fn insert(&mut self, obj: Widget) -> WidgetID {
 		self
 			.0
@@ -123,6 +128,7 @@ pub struct LayoutState {
 	pub widgets: WidgetMap,
 	pub nodes: WidgetNodeMap,
 	pub tree: taffy::tree::TaffyTree<WidgetID>,
+	pub components_by_widget_id: SecondaryMap<WidgetID, ComponentWeak>,
 }
 
 pub struct ModifyLayoutStateData<'a> {
@@ -144,10 +150,12 @@ pub type LayoutDispatchFunc = Box<dyn FnOnce(&mut CallbackDataCommon) -> anyhow:
 pub enum LayoutTask {
 	RemoveWidget(WidgetID),
 	SetWidgetStyle(WidgetID, event::StyleSetRequest),
+	SetWidgetVisible(WidgetID, bool), // if true, sets Display to Flex; None, otherwise
 	ModifyLayoutState(LayoutModifyStateFunc),
 	PlaySound(WguiSoundType),
 	Dispatch(LayoutDispatchFunc),
 	SetFocus(ComponentWeak),
+	RefreshPalette,
 	Unfocus,
 }
 
@@ -163,8 +171,13 @@ pub struct Layout {
 	sounds_to_play_once: Vec<WguiSoundType>,
 	focused_component: Option<ComponentWeak>,
 
+	// Global EventAlterables queue, always processed in update() call at the end
+	pub alterables: EventAlterables,
+
 	pub widgets_to_tick: Vec<WidgetID>,
 
+	global_events_to_emit: Vec<Event>,
+
 	// *Main root*
 	// contains content_root_widget and topmost widgets
 	pub tree_root_widget: WidgetID,
@@ -176,7 +189,7 @@ pub struct Layout {
 	pub content_root_node: taffy::NodeId,
 
 	pub prev_size: Vec2,
-	pub content_size: Vec2,
+	pub content_size: Vec2, // cached value
 
 	pub needs_redraw: bool,
 	pub haptics_triggered: bool,
@@ -218,31 +231,11 @@ fn add_child_internal(
 	))
 }
 
-pub struct LayoutCommon<'a> {
-	alterables: EventAlterables,
-	pub layout: &'a mut Layout,
-}
-
-impl LayoutCommon<'_> {
+impl Layout {
 	pub const fn common(&mut self) -> CallbackDataCommon<'_> {
 		CallbackDataCommon {
 			alterables: &mut self.alterables,
-			state: &self.layout.state,
-		}
-	}
-
-	pub fn finish(self) -> anyhow::Result<()> {
-		self.layout.process_alterables(self.alterables)?;
-		Ok(())
-	}
-}
-
-impl Layout {
-	// helper function
-	pub fn start_common(&mut self) -> LayoutCommon<'_> {
-		LayoutCommon {
-			alterables: EventAlterables::default(),
-			layout: self,
+			state: &self.state,
 		}
 	}
 
@@ -291,21 +284,35 @@ impl Layout {
 		})
 	}
 
-	fn collect_children_ids_recursive(&self, widget_id: WidgetID, out: &mut Vec<(WidgetID, taffy::NodeId)>) {
+	pub fn collect_children_ids_recursive(&self, widget_id: WidgetID, out: &mut Vec<WidgetID>) {
 		let Some(node_id) = self.state.nodes.get(widget_id) else {
 			return;
 		};
 
 		for child_id in self.state.tree.child_ids(*node_id) {
 			let child_widget_id = self.state.tree.get_node_context(child_id).unwrap();
-			out.push((*child_widget_id, child_id));
+			out.push(*child_widget_id);
 			self.collect_children_ids_recursive(*child_widget_id, out);
 		}
 	}
 
-	fn remove_widget_single(&mut self, widget_id: WidgetID, node_id: Option<taffy::NodeId>) {
+	fn remove_widget_single(&mut self, widget_id: WidgetID) {
 		self.state.widgets.remove_single(widget_id);
-		self.state.nodes.remove(widget_id);
+		let node_id = self.state.nodes.remove(widget_id);
+
+		if let Some(component_weak) = self.state.components_by_widget_id.remove(widget_id)
+			&& let Some(component) = component_weak.upgrade()
+		{
+			let mut destroy_widgets = vec![];
+			component.destroy(&mut DestroyData {
+				layout: self,
+				destroy_widgets: &mut destroy_widgets,
+			});
+			for wid in destroy_widgets {
+				self.remove_widget_single(wid);
+			}
+		}
+
 		if let Some(node_id) = node_id {
 			self.registered_components_to_refresh.remove(&node_id);
 			let _ = self.state.tree.remove(node_id);
@@ -321,16 +328,15 @@ impl Layout {
 			self.mark_redraw();
 		}
 
-		for (widget_id, node_id) in ids {
-			self.remove_widget_single(widget_id, Some(node_id));
+		for widget_id in ids {
+			self.remove_widget_single(widget_id);
 		}
 	}
 
 	// remove widget and its children, recursively
 	pub fn remove_widget(&mut self, widget_id: WidgetID) {
 		self.remove_children(widget_id);
-		let node_id = self.state.nodes.get(widget_id);
-		self.remove_widget_single(widget_id, node_id.copied());
+		self.remove_widget_single(widget_id);
 		self.mark_redraw();
 	}
 
@@ -338,16 +344,10 @@ impl Layout {
 		self.needs_redraw = true;
 	}
 
-	fn process_pending_components(&mut self, alterables: &mut EventAlterables) {
-		for comp in &self.components_to_refresh_once {
-			let mut common = CallbackDataCommon {
-				state: &self.state,
-				alterables,
-			};
-
-			comp.0.refresh(&mut RefreshData { common: &mut common });
+	fn process_pending_components(&mut self) {
+		for comp in std::mem::take(&mut self.components_to_refresh_once) {
+			comp.0.refresh(&mut RefreshData { layout: self });
 		}
-		self.components_to_refresh_once.clear();
 	}
 
 	fn process_pending_widget_ticks(&mut self, alterables: &mut EventAlterables) {
@@ -468,19 +468,24 @@ impl Layout {
 			.as_ref()
 			.is_none_or(PushScissorStackResult::should_display)
 		{
-			// check children first
-			self.push_event_children(node_id, event, event_result, alterables, user_data)?;
+			let res_priority = widget.process_event_priority(
+				&mut self.get_event_params(l, node_id, style, alterables),
+				widget_id,
+				event,
+				event_result,
+			)?;
 
-			if event_result.can_propagate() {
-				let mut params = EventParams {
-					state: &self.state,
-					layout: l,
-					alterables,
-					node_id,
-					style,
-				};
+			if res_priority.can_propagate() {
+				// check children first
+				self.push_event_children(node_id, event, event_result, alterables, user_data)?;
 
-				widget.process_event(widget_id, node_id, event, event_result, user_data, &mut params)?;
+				widget.process_event(
+					&mut self.get_event_params(l, node_id, style, alterables),
+					widget_id,
+					event,
+					event_result,
+					user_data,
+				)?;
 			}
 		}
 
@@ -492,6 +497,22 @@ impl Layout {
 		Ok(())
 	}
 
+	const fn get_event_params<'a>(
+		&'a self,
+		l: &'a taffy::Layout,
+		node_id: taffy::NodeId,
+		style: &'a taffy::Style,
+		alterables: &'a mut EventAlterables,
+	) -> EventParams<'a> {
+		EventParams {
+			node_id,
+			style,
+			state: &self.state,
+			alterables,
+			taffy_layout: l,
+		}
+	}
+
 	pub const fn check_toggle_needs_redraw(&mut self) -> bool {
 		if self.needs_redraw {
 			self.needs_redraw = false;
@@ -526,6 +547,18 @@ impl Layout {
 			&mut (user1, user2),
 		)?;
 		self.process_alterables(alterables)?;
+
+		let mut alterables = EventAlterables::default();
+		for event in std::mem::take(&mut self.global_events_to_emit) {
+			self.push_event_widget(
+				self.tree_root_node,
+				&event,
+				&mut event_result,
+				&mut alterables,
+				&mut (user1, user2),
+			)?;
+		}
+
 		Ok(event_result)
 	}
 
@@ -536,6 +569,7 @@ impl Layout {
 			nodes: WidgetNodeMap::default(),
 			globals,
 			theme: params.theme,
+			components_by_widget_id: SecondaryMap::default(),
 		};
 
 		let size = if params.resize_to_parent {
@@ -597,6 +631,8 @@ impl Layout {
 			tasks: LayoutTasks::new(),
 			sounds_to_play_once: Vec::new(),
 			focused_component: None,
+			alterables: Default::default(),
+			global_events_to_emit: Vec::new(),
 		})
 	}
 
@@ -684,12 +720,15 @@ impl Layout {
 	}
 
 	pub fn update(&mut self, params: &mut LayoutUpdateParams) -> anyhow::Result<LayoutUpdateResult> {
-		let mut alterables = EventAlterables::default();
+		// get all queued alterables and process them
+		let alterables = std::mem::take(&mut self.alterables);
+
 		self
 			.animations
-			.process(&self.state, &mut alterables, params.timestep_alpha);
+			.process(&self.state, &mut self.alterables, params.timestep_alpha);
 		self.process_alterables(alterables)?;
 		self.try_recompute_layout(params.size)?;
+		self.process_pending_components();
 
 		Ok(LayoutUpdateResult {
 			sounds_to_play: std::mem::take(&mut self.sounds_to_play_once),
@@ -699,9 +738,10 @@ impl Layout {
 	pub fn tick(&mut self) -> anyhow::Result<()> {
 		let mut alterables = EventAlterables::default();
 		self.animations.tick(&self.state, &mut alterables);
-		self.process_pending_components(&mut alterables);
 		self.process_pending_widget_ticks(&mut alterables);
 		self.process_alterables(alterables)?;
+		self.try_recompute_layout(self.content_size /* cached value */)?;
+		self.process_pending_components();
 		Ok(())
 	}
 
@@ -709,6 +749,10 @@ impl Layout {
 		let mut tasks = self.tasks.drain();
 		while let Some(task) = tasks.pop_front() {
 			match task {
+				LayoutTask::RefreshPalette => {
+					let root = self.tree_root_widget;
+					LayoutState::refresh_palette_recur(&mut self.common(), root);
+				}
 				LayoutTask::RemoveWidget(widget_id) => {
 					self.remove_widget(widget_id);
 				}
@@ -721,13 +765,21 @@ impl Layout {
 					}
 				}
 				LayoutTask::Dispatch(func) => {
-					let mut c = self.start_common();
-					func(&mut c.common())?;
-					c.finish()?;
+					func(&mut self.common())?;
 				}
 				LayoutTask::SetWidgetStyle(widget_id, style_request) => {
 					self.set_style_request(widget_id, &style_request);
 				}
+				LayoutTask::SetWidgetVisible(widget_id, visible) => {
+					self.set_style_request(
+						widget_id,
+						&StyleSetRequest::Display(if visible {
+							taffy::Display::Flex
+						} else {
+							taffy::Display::None
+						}),
+					);
+				}
 				LayoutTask::SetFocus(weak) => {
 					if let Some(c) = weak.upgrade() {
 						self.set_focus(Some(&components::Component(c)))?;
@@ -741,29 +793,26 @@ impl Layout {
 	}
 
 	pub fn set_focus(&mut self, to_focus: Option<&Component>) -> anyhow::Result<()> {
-		let mut c = self.start_common();
-
-		if let Some(focused) = &c.layout.focused_component
+		if let Some(focused) = &self.focused_component
 			&& let Some(focused) = focused.upgrade()
 		{
 			// Unfocus
 			focused.on_focus_change(&mut FocusChangeData {
-				common: &mut c.common(),
+				common: &mut self.common(),
 				focused: false,
 			});
-			c.layout.focused_component = None;
+			self.focused_component = None;
 		}
 
 		if let Some(to_focus) = to_focus {
 			to_focus.0.on_focus_change(&mut FocusChangeData {
-				common: &mut c.common(),
+				common: &mut self.common(),
 				focused: true,
 			});
 
-			c.layout.focused_component = Some(to_focus.weak());
+			self.focused_component = Some(to_focus.weak());
 		}
 
-		c.finish()?;
 		Ok(())
 	}
 
@@ -791,6 +840,9 @@ impl Layout {
 			event::StyleSetRequest::Margin(margin) => {
 				cur_style.margin = *margin;
 			}
+			event::StyleSetRequest::Padding(padding) => {
+				cur_style.padding = *padding;
+			}
 			event::StyleSetRequest::Width(val) => {
 				cur_style.size.width = *val;
 			}
@@ -835,10 +887,12 @@ impl Layout {
 			}
 		}
 
-		if !alterables.widgets_to_tick.is_empty() {
-			for widget_id in &alterables.widgets_to_tick {
-				self.widgets_to_tick.push(*widget_id);
-			}
+		for widget_id in alterables.widgets_to_tick {
+			self.widgets_to_tick.push(widget_id);
+		}
+
+		for event in alterables.global_events_to_emit {
+			self.global_events_to_emit.push(event);
 		}
 
 		for c in alterables.components_to_refresh_once {
@@ -898,7 +952,7 @@ impl Layout {
 			layout.location.y,
 			layout.content_size.width,
 			layout.content_size.height,
-			state.obj.debug_print()
+			state.obj.debug_print(&self.state.globals.get())
 		);
 
 		buf.append(&mut line.into_bytes());
@@ -956,4 +1010,50 @@ impl LayoutState {
 	pub fn get_widget_style(&self, id: WidgetID) -> Option<&taffy::Style> {
 		self.get_node_style(*self.nodes.get(id)?)
 	}
+
+	pub fn fetch_component_by_widget_id(&self, widget_id: WidgetID) -> anyhow::Result<Component> {
+		let Some(weak) = self.components_by_widget_id.get(widget_id) else {
+			anyhow::bail!("Component by widget ID \"{widget_id:?}\" doesn't exist");
+		};
+
+		let Some(component) = weak.upgrade() else {
+			anyhow::bail!("Component by widget ID \"{widget_id:?}\" has disappeared");
+		};
+
+		Ok(Component(component))
+	}
+
+	pub fn fetch_component_from_widget_id_as<T: 'static>(&self, widget_id: WidgetID) -> anyhow::Result<Rc<T>> {
+		let component = self.fetch_component_by_widget_id(widget_id)?;
+
+		if !(*component.0).as_any().is::<T>() {
+			anyhow::bail!("fetch_component_from_widget_id_as({widget_id:?}): type not matching");
+		}
+
+		// safety: we just checked the type
+		unsafe { Ok(Rc::from_raw(Rc::into_raw(component.0).cast())) }
+	}
+
+	fn refresh_palette_recur(common: &mut CallbackDataCommon, widget_id: WidgetID) {
+		if let Some(widget) = common.state.widgets.get(widget_id) {
+			widget.state().obj.palette_updated(common);
+		} else {
+			debug_assert!(false);
+			return;
+		}
+
+		let Some(node_id) = common.state.nodes.get(widget_id) else {
+			/* node/widget desync, this shouldn't happen */
+			debug_assert!(false);
+			return;
+		};
+
+		for child_node_id in common.state.tree.child_ids(*node_id) {
+			let Some(widget_id) = common.state.tree.get_node_context(child_node_id) else {
+				debug_assert!(false);
+				continue;
+			};
+			LayoutState::refresh_palette_recur(common, *widget_id);
+		}
+	}
 }
diff --git a/wgui/src/lib.rs b/wgui/src/lib.rs
index d913f0bf..83a5fcdd 100644
--- a/wgui/src/lib.rs
+++ b/wgui/src/lib.rs
@@ -26,6 +26,7 @@ pub mod animation;
 pub mod any;
 pub mod assets;
 mod assets_internal;
+pub mod color;
 pub mod components;
 pub mod drawing;
 pub mod event;
@@ -35,15 +36,20 @@ pub mod globals;
 pub mod i18n;
 pub mod layout;
 pub mod log;
+pub mod palette;
 pub mod parser;
 pub mod renderer_vk;
 pub mod sound;
 pub mod stack;
 pub mod task;
 pub mod theme;
+pub mod time;
 pub mod widget;
 pub mod windowing;
 
+#[cfg(feature = "video")]
+pub mod video_dec;
+
 // re-exported libs
 pub use cosmic_text;
 pub use taffy;
diff --git a/wgui/src/palette.rs b/wgui/src/palette.rs
new file mode 100644
index 00000000..8490e5e3
--- /dev/null
+++ b/wgui/src/palette.rs
@@ -0,0 +1,755 @@
+use std::ops::Index;
+
+use strum::EnumCount;
+
+use crate::{
+	color::{WguiColor, WguiColorName},
+	drawing,
+};
+
+#[derive(Clone)]
+pub struct WguiColorPalette {
+	colors: [drawing::Color; WguiColorName::COUNT],
+}
+
+impl WguiColorPalette {
+	pub fn get_builtin(palette_name: &str) -> Self {
+		for (name, palette) in PALETTES {
+			if *name == palette_name {
+				// just clone here, makes it easier for future customization
+				return (*palette).clone();
+			}
+		}
+
+		log::warn!("No color palette with name '{palette_name}', using default colors.");
+		DEFAULT.clone()
+	}
+
+	pub const fn from_inner(colors: [drawing::Color; WguiColorName::COUNT]) -> Self {
+		Self { colors }
+	}
+
+	fn apply_modifier(color: WguiColor, modifier: &str) -> Option<WguiColor> {
+		match modifier {
+			"transparent" => Some(color.with_alpha(0.0)),
+			"opaque" => Some(color.with_alpha(1.0)),
+			other => {
+				let (prefix, val_str) = other.rsplit_once('-')?;
+				let val = val_str.parse::<f32>().ok()?;
+				match prefix {
+					"opacity" => Some(color.with_alpha(val)),
+					"rgb-mult" => Some(color.mult_rgb(val)),
+					"rgb-add" => Some(color.add_rgb(val)),
+					_ => None,
+				}
+			}
+		}
+	}
+
+	pub fn find(&self, in_name: &str) -> Option<WguiColor> {
+		if let Some((base, modifiers_str)) = in_name.split_once('(') {
+			let base_name = base.trim();
+			let modifiers = modifiers_str.trim_end_matches(')');
+
+			let name = WguiColorName::try_from(base_name).ok()?;
+			let mut color = name.to_wgui_color();
+
+			for mod_str in modifiers.split(',') {
+				color = WguiColorPalette::apply_modifier(color, mod_str.trim())?;
+			}
+
+			Some(color)
+		} else {
+			WguiColorName::try_from(in_name).ok().map(|n| n.to_wgui_color())
+		}
+	}
+}
+
+impl Index<WguiColorName> for WguiColorPalette {
+	type Output = drawing::Color;
+
+	fn index(&self, name: WguiColorName) -> &Self::Output {
+		// internally guaranteed to never be out of range
+		&self.colors[name as usize]
+	}
+}
+
+// palettes below
+
+const fn hex(hex: &str) -> drawing::Color {
+	match drawing::Color::from_hex(hex) {
+		Some(color) => color,
+		// just fail the build
+		None => panic!("invalid static color"),
+	}
+}
+
+pub static PALETTES: &[(&'static str, &WguiColorPalette)] = &[
+	("Default", DEFAULT),
+	("Ayu Dusk", AYU),
+	("Catppuccin", CATPPUCCIN),
+	("Cyberpunk", CYBERPUNK),
+	("Dracula", DRACULA),
+	("Eldritch", ELDRITCH),
+	("Everforest", EVERFOREST),
+	("Gruvbox", GRUVBOX),
+	("Kanagawa", KANAGAWA),
+	("Monochrome", MONOCHROME),
+	("Nord", NORD),
+	("Osaka Jade", OSAKA_JADE),
+	("Rosé Pine", ROSEPINE),
+	("Solarized Night", SOLARIZED_NIGHT),
+	("Tokyo Night", TOKYO_NIGHT),
+	("Ayu Day", AYU_LIGHT),
+	("Catppuccin Latte", CATPPUCCIN_LATTE),
+	("Cyberpunk Light", CYBERPUNK_LIGHT),
+	("Alucard", DRACULA_LIGHT),
+	("Eldritch Dusk", ELDRITCH_LIGHT),
+	("Everforest Light", EVERFOREST_LIGHT),
+	("Gruvbox Light", GRUVBOX_LIGHT),
+	("Kanagawa Lotus", KANAGAWA_LIGHT),
+	("Monochrome Light", MONOCHROME_LIGHT),
+	("Nord Light", NORD_LIGHT),
+	("Osaka Jade Light", OSAKA_JADE_LIGHT),
+	("Rosé Pine Dawn", ROSEPINE_LIGHT),
+	("Solarized Day", SOLARIZED_DAY),
+	("Tokyo Day", TOKYO_DAY),
+];
+
+static DEFAULT: &WguiColorPalette = &WguiColorPalette {
+	colors: [
+		hex("#21adff"), // Primary
+		hex("#eaf7ff"), // OnPrimary
+		hex("#f4c95d"), // Secondary
+		hex("#2a2105"), // OnSecondary
+		hex("#10d0b3"), // Tertiary
+		hex("#000000"), // OnTertiary
+		hex("#f7469a"), // Danger
+		hex("#ffebf5"), // OnDanger
+		hex("#002e43"), // Background
+		hex("#e4f5f6"), // OnBackground
+		hex("#0c5170"), // OackgroundVariant
+		hex("#b5cacc"), // OnBackgroundVariant
+		hex("#00131c"), // BackgroundContrast
+		hex("#e4edf6"), // OnBackgroundContrast
+		hex("#1c6788"), // Outline
+		hex("#000000"), // Shadow
+		hex("#ffffff"), // Highlight
+	],
+};
+
+static AYU: &WguiColorPalette = &WguiColorPalette {
+	colors: [
+		hex("#E6B450"), // Primary
+		hex("#0B0E14"), // OnPrimary
+		hex("#AAD94C"), // Secondary
+		hex("#0B0E14"), // OnSecondary
+		hex("#39BAE6"), // Tertiary
+		hex("#0B0E14"), // OnTertiary
+		hex("#D95757"), // Danger
+		hex("#0B0E14"), // OnDanger
+		hex("#1E222A"), // Background
+		hex("#BFBDB6"), // OnBackground
+		hex("#0B0E14"), // BackgroundVariant
+		hex("#636A72"), // OnBackgroundVariant
+		hex("#07090D"), // BackgroundContrast
+		hex("#BFBDB6"), // OnBackgroundContrast
+		hex("#565B66"), // Outline
+		hex("#000000"), // Shadow
+		hex("#ffffff"), // Highlight
+	],
+};
+
+static AYU_LIGHT: &WguiColorPalette = &WguiColorPalette {
+	colors: [
+		hex("#FF8F40"), // Primary
+		hex("#F8F9FA"), // OnPrimary
+		hex("#86B300"), // Secondary
+		hex("#F8F9FA"), // OnSecondary
+		hex("#55B4D4"), // Tertiary
+		hex("#F8F9FA"), // OnTertiary
+		hex("#E65050"), // Danger
+		hex("#F8F9FA"), // OnDanger
+		hex("#E4E6E9"), // Background
+		hex("#5C6166"), // OnBackground
+		hex("#F8F9FA"), // BackgroundVariant
+		hex("#ABADB1"), // OnBackgroundVariant
+		hex("#D5D7DA"), // BackgroundContrast
+		hex("#5C6166"), // OnBackgroundContrast
+		hex("#8A9199"), // Outline
+		hex("#F8F9FA"), // Shadow
+		hex("#000000"), // Highlight
+	],
+};
+
+static CATPPUCCIN: &WguiColorPalette = &WguiColorPalette {
+	colors: [
+		hex("#cba6f7"), // Primary
+		hex("#11111b"), // OnPrimary
+		hex("#fab387"), // Secondary
+		hex("#11111b"), // OnSecondary
+		hex("#94e2d5"), // Tertiary
+		hex("#11111b"), // OnTertiary
+		hex("#f38ba8"), // Danger
+		hex("#11111b"), // OnDanger
+		hex("#1e1e2e"), // Background
+		hex("#cdd6f4"), // OnBackground
+		hex("#313244"), // BackgroundVariant
+		hex("#a3b4eb"), // OnBackgroundVariant
+		hex("#181825"), // BackgroundContrast
+		hex("#cdd6f4"), // OnBackgroundContrast
+		hex("#4c4f69"), // Outline
+		hex("#11111b"), // Shadow
+		hex("#ffffff"), // Highlight
+	],
+};
+
+static CATPPUCCIN_LATTE: &WguiColorPalette = &WguiColorPalette {
+	colors: [
+		hex("#8839EF"), // Primary
+		hex("#EFF1F5"), // OnPrimary
+		hex("#FE640B"), // Secondary
+		hex("#EFF1F5"), // OnSecondary
+		hex("#179299"), // Tertiary
+		hex("#EFF1F5"), // OnTertiary
+		hex("#D20F39"), // Danger
+		hex("#DCE0E8"), // OnDanger
+		hex("#EFF1F5"), // Background
+		hex("#4C4F69"), // OnBackground
+		hex("#CCD0DA"), // BackgroundVariant
+		hex("#6C6F85"), // OnBackgroundVariant
+		hex("#DCE0E8"), // BackgroundContrast
+		hex("#4C4F69"), // OnBackgroundContrast
+		hex("#A5ADCB"), // Outline
+		hex("#DCE0E8"), // Shadow
+		hex("#000000"), // Highlight
+	],
+};
+
+static CYBERPUNK: &WguiColorPalette = &WguiColorPalette {
+	colors: [
+		hex("#C4A82E"), // Primary
+		hex("#0E1015"), // OnPrimary
+		hex("#D14358"), // Secondary
+		hex("#0E1015"), // OnSecondary
+		hex("#00A66C"), // Tertiary
+		hex("#0E1015"), // OnTertiary
+		hex("#B32D2D"), // Danger
+		hex("#0E1015"), // OnDanger
+		hex("#0C1017"), // Background
+		hex("#5C8AC4"), // OnBackground
+		hex("#11151D"), // BackgroundVariant
+		hex("#9B6BC1"), // OnBackgroundVariant
+		hex("#070A0F"), // BackgroundContrast
+		hex("#5C8AC4"), // OnBackgroundContrast
+		hex("#45A0D6"), // Outline
+		hex("#090D13"), // Shadow
+		hex("#ffffff"), // Highlight
+	],
+};
+
+static CYBERPUNK_LIGHT: &WguiColorPalette = &WguiColorPalette {
+	colors: [
+		hex("#00B8B3"), // Primary
+		hex("#1A1914"), // OnPrimary
+		hex("#D957A0"), // Secondary
+		hex("#1A1914"), // OnSecondary
+		hex("#45D395"), // Tertiary
+		hex("#1A1914"), // OnTertiary
+		hex("#E63E5D"), // Danger
+		hex("#1A1914"), // OnDanger
+		hex("#DAE6E8"), // Background
+		hex("#1A1914"), // OnBackground
+		hex("#C8DEE6"), // BackgroundVariant
+		hex("#1A1914"), // OnBackgroundVariant
+		hex("#B8D4E6"), // BackgroundContrast
+		hex("#1A1914"), // OnBackgroundContrast
+		hex("#7B52AB"), // Outline
+		hex("#B8D4E6"), // Shadow
+		hex("#000000"), // Highlight
+	],
+};
+
+static DRACULA: &WguiColorPalette = &WguiColorPalette {
+	colors: [
+		hex("#BD93F9"), // Primary
+		hex("#282A36"), // OnPrimary
+		hex("#FF79C6"), // Secondary
+		hex("#4E1D32"), // OnSecondary
+		hex("#8BE9FD"), // Tertiary
+		hex("#003543"), // OnTertiary
+		hex("#FF5555"), // Danger
+		hex("#282A36"), // OnDanger
+		hex("#282A36"), // Background
+		hex("#F8F8F2"), // OnBackground
+		hex("#44475A"), // BackgroundVariant
+		hex("#D6D8E0"), // OnBackgroundVariant
+		hex("#1E1F29"), // BackgroundContrast
+		hex("#F8F8F2"), // OnBackgroundContrast
+		hex("#5A5E77"), // Outline
+		hex("#282A36"), // Shadow
+		hex("#ffffff"), // Highlight
+	],
+};
+
+static DRACULA_LIGHT: &WguiColorPalette = &WguiColorPalette {
+	colors: [
+		hex("#8332F4"), // Primary
+		hex("#FFFFFF"), // OnPrimary
+		hex("#FF1399"), // Secondary
+		hex("#FFFFFF"), // OnSecondary
+		hex("#0398B9"), // Tertiary
+		hex("#FFFFFF"), // OnTertiary
+		hex("#FF5555"), // Danger
+		hex("#282A36"), // OnDanger
+		hex("#F8F8F2"), // Background
+		hex("#282A36"), // OnBackground
+		hex("#E6E6EA"), // BackgroundVariant
+		hex("#44475A"), // OnBackgroundVariant
+		hex("#FFFFFF"), // BackgroundContrast
+		hex("#282A36"), // OnBackgroundContrast
+		hex("#CACAD3"), // Outline
+		hex("#D6D8E0"), // Shadow
+		hex("#000000"), // Highlight
+	],
+};
+
+static ELDRITCH: &WguiColorPalette = &WguiColorPalette {
+	colors: [
+		hex("#37F499"), // Primary
+		hex("#171928"), // OnPrimary
+		hex("#04D1F9"), // Secondary
+		hex("#171928"), // OnSecondary
+		hex("#A48CF2"), // Tertiary
+		hex("#171928"), // OnTertiary
+		hex("#F16C75"), // Danger
+		hex("#171928"), // OnDanger
+		hex("#212337"), // Background
+		hex("#EBFAFA"), // OnBackground
+		hex("#292E42"), // BackgroundVariant
+		hex("#ABB4DA"), // OnBackgroundVariant
+		hex("#171928"), // BackgroundContrast
+		hex("#EBFAFA"), // OnBackgroundContrast
+		hex("#3B4261"), // Outline
+		hex("#414868"), // Shadow
+		hex("#ffffff"), // Highlight
+	],
+};
+
+static ELDRITCH_LIGHT: &WguiColorPalette = &WguiColorPalette {
+	colors: [
+		hex("#37F499"), // Primary
+		hex("#171928"), // OnPrimary
+		hex("#04D1F9"), // Secondary
+		hex("#171928"), // OnSecondary
+		hex("#A48CF2"), // Tertiary
+		hex("#171928"), // OnTertiary
+		hex("#F16C75"), // Danger
+		hex("#171928"), // OnDanger
+		hex("#FFFFFF"), // Background
+		hex("#171928"), // OnBackground
+		hex("#F2F4F8"), // BackgroundVariant
+		hex("#3B4261"), // OnBackgroundVariant
+		hex("#E0E3E8"), // BackgroundContrast
+		hex("#171928"), // OnBackgroundContrast
+		hex("#B0B6C3"), // Outline
+		hex("#E0E3E8"), // Shadow
+		hex("#000000"), // Highlight
+	],
+};
+
+static EVERFOREST: &WguiColorPalette = &WguiColorPalette {
+	colors: [
+		hex("#D3C6AA"), // Primary
+		hex("#232A2E"), // OnPrimary
+		hex("#D3C6AA"), // Secondary
+		hex("#232A2E"), // OnSecondary
+		hex("#9DA9A0"), // Tertiary
+		hex("#232A2E"), // OnTertiary
+		hex("#E67E80"), // Danger
+		hex("#232A2E"), // OnDanger
+		hex("#232A2E"), // Background
+		hex("#859289"), // OnBackground
+		hex("#2D353B"), // BackgroundVariant
+		hex("#D3C6AA"), // OnBackgroundVariant
+		hex("#1E2326"), // BackgroundContrast
+		hex("#D3C6AA"), // OnBackgroundContrast
+		hex("#D3C6AA"), // Outline
+		hex("#475258"), // Shadow
+		hex("#ffffff"), // Highlight
+	],
+};
+
+static EVERFOREST_LIGHT: &WguiColorPalette = &WguiColorPalette {
+	colors: [
+		hex("#434F55"), // Primary
+		hex("#D3C6AA"), // OnPrimary
+		hex("#232A2E"), // Secondary
+		hex("#D3C6AA"), // OnSecondary
+		hex("#333C43"), // Tertiary
+		hex("#9DA9A0"), // OnTertiary
+		hex("#E66868"), // Danger
+		hex("#9DA9A0"), // OnDanger
+		hex("#9DA9A0"), // Background
+		hex("#232A2E"), // OnBackground
+		hex("#BEC5B2"), // BackgroundVariant
+		hex("#333C43"), // OnBackgroundVariant
+		hex("#859289"), // BackgroundContrast
+		hex("#232A2E"), // OnBackgroundContrast
+		hex("#232A2E"), // Outline
+		hex("#ECF5ED"), // Shadow
+		hex("#000000"), // Highlight
+	],
+};
+
+static GRUVBOX: &WguiColorPalette = &WguiColorPalette {
+	colors: [
+		hex("#B8BB26"), // Primary
+		hex("#282828"), // OnPrimary
+		hex("#FABD2F"), // Secondary
+		hex("#282828"), // OnSecondary
+		hex("#83A598"), // Tertiary
+		hex("#282828"), // OnTertiary
+		hex("#FB4934"), // Danger
+		hex("#282828"), // OnDanger
+		hex("#282828"), // Background
+		hex("#FBF1C7"), // OnBackground
+		hex("#3C3836"), // BackgroundVariant
+		hex("#EBDBB2"), // OnBackgroundVariant
+		hex("#1D2021"), // BackgroundContrast
+		hex("#FBF1C7"), // OnBackgroundContrast
+		hex("#57514E"), // Outline
+		hex("#282828"), // Shadow
+		hex("#ffffff"), // Highlight
+	],
+};
+
+static GRUVBOX_LIGHT: &WguiColorPalette = &WguiColorPalette {
+	colors: [
+		hex("#98971A"), // Primary
+		hex("#FBF1C7"), // OnPrimary
+		hex("#D79921"), // Secondary
+		hex("#FBF1C7"), // OnSecondary
+		hex("#458588"), // Tertiary
+		hex("#FBF1C7"), // OnTertiary
+		hex("#CC241D"), // Danger
+		hex("#FBF1C7"), // OnDanger
+		hex("#FBF1C7"), // Background
+		hex("#3C3836"), // OnBackground
+		hex("#EBDBB2"), // BackgroundVariant
+		hex("#7C6F64"), // OnBackgroundVariant
+		hex("#F2E5BC"), // BackgroundContrast
+		hex("#3C3836"), // OnBackgroundContrast
+		hex("#BDAE93"), // Outline
+		hex("#D5C4A1"), // Shadow
+		hex("#000000"), // Highlight
+	],
+};
+
+static KANAGAWA: &WguiColorPalette = &WguiColorPalette {
+	colors: [
+		hex("#76946A"), // Primary
+		hex("#1F1F28"), // OnPrimary
+		hex("#C0A36E"), // Secondary
+		hex("#1F1F28"), // OnSecondary
+		hex("#7E9CD8"), // Tertiary
+		hex("#1F1F28"), // OnTertiary
+		hex("#C34043"), // Danger
+		hex("#1F1F28"), // OnDanger
+		hex("#1F1F28"), // Background
+		hex("#C8C093"), // OnBackground
+		hex("#2A2A37"), // BackgroundVariant
+		hex("#717C7C"), // OnBackgroundVariant
+		hex("#16161D"), // BackgroundContrast
+		hex("#C8C093"), // OnBackgroundContrast
+		hex("#363646"), // Outline
+		hex("#1F1F28"), // Shadow
+		hex("#ffffff"), // Highlight
+	],
+};
+
+static KANAGAWA_LIGHT: &WguiColorPalette = &WguiColorPalette {
+	colors: [
+		hex("#6F894E"), // Primary
+		hex("#F2ECBC"), // OnPrimary
+		hex("#77713F"), // Secondary
+		hex("#F2ECBC"), // OnSecondary
+		hex("#4D699B"), // Tertiary
+		hex("#F2ECBC"), // OnTertiary
+		hex("#C84053"), // Danger
+		hex("#F2ECBC"), // OnDanger
+		hex("#F2ECBC"), // Background
+		hex("#545464"), // OnBackground
+		hex("#E5DDB0"), // BackgroundVariant
+		hex("#8A8980"), // OnBackgroundVariant
+		hex("#D5CEA3"), // BackgroundContrast
+		hex("#545464"), // OnBackgroundContrast
+		hex("#CFC49C"), // Outline
+		hex("#F2ECBC"), // Shadow
+		hex("#000000"), // Highlight
+	],
+};
+
+static MONOCHROME: &WguiColorPalette = &WguiColorPalette {
+	colors: [
+		hex("#AAAAAA"), // Primary
+		hex("#111111"), // OnPrimary
+		hex("#A7A7A7"), // Secondary
+		hex("#111111"), // OnSecondary
+		hex("#CCCCCC"), // Tertiary
+		hex("#111111"), // OnTertiary
+		hex("#DDDDDD"), // Danger
+		hex("#111111"), // OnDanger
+		hex("#111111"), // Background
+		hex("#828282"), // OnBackground
+		hex("#191919"), // BackgroundVariant
+		hex("#5D5D5D"), // OnBackgroundVariant
+		hex("#080808"), // BackgroundContrast
+		hex("#828282"), // OnBackgroundContrast
+		hex("#3C3C3C"), // Outline
+		hex("#000000"), // Shadow
+		hex("#ffffff"), // Highlight
+	],
+};
+
+static MONOCHROME_LIGHT: &WguiColorPalette = &WguiColorPalette {
+	colors: [
+		hex("#555555"), // Primary
+		hex("#EEEEEE"), // OnPrimary
+		hex("#505058"), // Secondary
+		hex("#EEEEEE"), // OnSecondary
+		hex("#333333"), // Tertiary
+		hex("#EEEEEE"), // OnTertiary
+		hex("#222222"), // Danger
+		hex("#EFEFEF"), // OnDanger
+		hex("#D4D4D4"), // Background
+		hex("#696969"), // OnBackground
+		hex("#E8E8E8"), // BackgroundVariant
+		hex("#9E9E9E"), // OnBackgroundVariant
+		hex("#BEBEBE"), // BackgroundContrast
+		hex("#555555"), // OnBackgroundContrast
+		hex("#C3C3C3"), // Outline
+		hex("#FAFAFA"), // Shadow
+		hex("#000000"), // Highlight
+	],
+};
+
+static NORD: &WguiColorPalette = &WguiColorPalette {
+	colors: [
+		hex("#8FBCBB"), // Primary
+		hex("#2E3440"), // OnPrimary
+		hex("#88C0D0"), // Secondary
+		hex("#2E3440"), // OnSecondary
+		hex("#5E81AC"), // Tertiary
+		hex("#2E3440"), // OnTertiary
+		hex("#BF616A"), // Danger
+		hex("#2E3440"), // OnDanger
+		hex("#2E3440"), // Background
+		hex("#ECEFF4"), // OnBackground
+		hex("#3B4252"), // BackgroundVariant
+		hex("#D8DEE9"), // OnBackgroundVariant
+		hex("#242933"), // BackgroundContrast
+		hex("#ECEFF4"), // OnBackgroundContrast
+		hex("#505A70"), // Outline
+		hex("#2E3440"), // Shadow
+		hex("#ffffff"), // Highlight
+	],
+};
+
+static NORD_LIGHT: &WguiColorPalette = &WguiColorPalette {
+	colors: [
+		hex("#5E81AC"), // Primary
+		hex("#ECEFF4"), // OnPrimary
+		hex("#64ADC2"), // Secondary
+		hex("#ECEFF4"), // OnSecondary
+		hex("#6FA9A8"), // Tertiary
+		hex("#ECEFF4"), // OnTertiary
+		hex("#BF616A"), // Danger
+		hex("#ECEFF4"), // OnDanger
+		hex("#ECEFF4"), // Background
+		hex("#2E3440"), // OnBackground
+		hex("#E5E9F0"), // BackgroundVariant
+		hex("#4C566A"), // OnBackgroundVariant
+		hex("#D8DEE9"), // BackgroundContrast
+		hex("#2E3440"), // OnBackgroundContrast
+		hex("#C5CEDD"), // Outline
+		hex("#D8DEE9"), // Shadow
+		hex("#000000"), // Highlight
+	],
+};
+
+static OSAKA_JADE: &WguiColorPalette = &WguiColorPalette {
+	colors: [
+		hex("#1E9177"), // Primary
+		hex("#B8C8C4"), // OnPrimary
+		hex("#167A63"), // Secondary
+		hex("#B8C8C4"), // OnSecondary
+		hex("#26A589"), // Tertiary
+		hex("#B8C8C4"), // OnTertiary
+		hex("#933636"), // Danger
+		hex("#B8C8C4"), // OnDanger
+		hex("#081512"), // Background
+		hex("#A6B5B1"), // OnBackground
+		hex("#0F251F"), // BackgroundVariant
+		hex("#99A8A4"), // OnBackgroundVariant
+		hex("#040A09"), // BackgroundContrast
+		hex("#A6B5B1"), // OnBackgroundContrast
+		hex("#1B6352"), // Outline
+		hex("#040A09"), // Shadow
+		hex("#ffffff"), // Highlight
+	],
+};
+
+static OSAKA_JADE_LIGHT: &WguiColorPalette = &WguiColorPalette {
+	colors: [
+		hex("#3B7561"), // Primary
+		hex("#D8E5DB"), // OnPrimary
+		hex("#526E4A"), // Secondary
+		hex("#D8E5DB"), // OnSecondary
+		hex("#4A8069"), // Tertiary
+		hex("#D8E5DB"), // OnTertiary
+		hex("#854145"), // Danger
+		hex("#D8E5DB"), // OnDanger
+		hex("#AEC2B4"), // Background
+		hex("#2C3D35"), // OnBackground
+		hex("#95AD9C"), // BackgroundVariant
+		hex("#263731"), // OnBackgroundVariant
+		hex("#83998B"), // BackgroundContrast
+		hex("#263731"), // OnBackgroundContrast
+		hex("#5C7A6A"), // Outline
+		hex("#8A9E90"), // Shadow
+		hex("#000000"), // Highlight
+	],
+};
+
+static ROSEPINE: &WguiColorPalette = &WguiColorPalette {
+	colors: [
+		hex("#EBBCBA"), // Primary
+		hex("#191724"), // OnPrimary
+		hex("#9CCFD8"), // Secondary
+		hex("#191724"), // OnSecondary
+		hex("#31748F"), // Tertiary
+		hex("#E0DEF4"), // OnTertiary
+		hex("#EB6F92"), // Danger
+		hex("#191724"), // OnDanger
+		hex("#1F1D2E"), // Background
+		hex("#E0DEF4"), // OnBackground
+		hex("#26233A"), // BackgroundVariant
+		hex("#908CAA"), // OnBackgroundVariant
+		hex("#191724"), // BackgroundContrast
+		hex("#E0DEF4"), // OnBackgroundContrast
+		hex("#403D52"), // Outline
+		hex("#191724"), // Shadow
+		hex("#ffffff"), // Highlight
+	],
+};
+
+static ROSEPINE_LIGHT: &WguiColorPalette = &WguiColorPalette {
+	colors: [
+		hex("#D7827E"), // Primary
+		hex("#FAF4ED"), // OnPrimary
+		hex("#56949F"), // Secondary
+		hex("#FAF4ED"), // OnSecondary
+		hex("#286983"), // Tertiary
+		hex("#FAF4ED"), // OnTertiary
+		hex("#B4637A"), // Danger
+		hex("#FAF4ED"), // OnDanger
+		hex("#FFFAF3"), // Background
+		hex("#575279"), // OnBackground
+		hex("#F2E9E1"), // BackgroundVariant
+		hex("#797593"), // OnBackgroundVariant
+		hex("#DFDAD9"), // BackgroundContrast
+		hex("#575279"), // OnBackgroundContrast
+		hex("#DFDAD9"), // Outline
+		hex("#FAF4ED"), // Shadow
+		hex("#000000"), // Highlight
+	],
+};
+
+static SOLARIZED_NIGHT: &WguiColorPalette = &WguiColorPalette {
+	colors: [
+		hex("#B58900"), // Primary
+		hex("#002B36"), // OnPrimary
+		hex("#D33682"), // Secondary
+		hex("#002B36"), // OnSecondary
+		hex("#CB4B16"), // Tertiary
+		hex("#002B36"), // OnTertiary
+		hex("#DC322F"), // Danger
+		hex("#002B36"), // OnDanger
+		hex("#002B36"), // Background
+		hex("#839496"), // OnBackground
+		hex("#073642"), // BackgroundVariant
+		hex("#657B83"), // OnBackgroundVariant
+		hex("#001F27"), // BackgroundContrast
+		hex("#839496"), // OnBackgroundContrast
+		hex("#0C5C70"), // Outline
+		hex("#002B36"), // Shadow
+		hex("#ffffff"), // Highlight
+	],
+};
+
+static SOLARIZED_DAY: &WguiColorPalette = &WguiColorPalette {
+	colors: [
+		hex("#B58900"), // Primary
+		hex("#FDF6E3"), // OnPrimary
+		hex("#D33682"), // Secondary
+		hex("#FDF6E3"), // OnSecondary
+		hex("#CB4B16"), // Tertiary
+		hex("#FDF6E3"), // OnTertiary
+		hex("#DC322F"), // Danger
+		hex("#FDF6E3"), // OnDanger
+		hex("#FDF6E3"), // Background
+		hex("#657B83"), // OnBackground
+		hex("#EEE8D5"), // BackgroundVariant
+		hex("#839496"), // OnBackgroundVariant
+		hex("#DFD4B1"), // BackgroundContrast
+		hex("#657B83"), // OnBackgroundContrast
+		hex("#DFD4B1"), // Outline
+		hex("#EEE8D5"), // Shadow
+		hex("#000000"), // Highlight
+	],
+};
+
+static TOKYO_NIGHT: &WguiColorPalette = &WguiColorPalette {
+	colors: [
+		hex("#7AA2F7"), // Primary
+		hex("#16161E"), // OnPrimary
+		hex("#BB9AF7"), // Secondary
+		hex("#16161E"), // OnSecondary
+		hex("#9ECE6A"), // Tertiary
+		hex("#16161E"), // OnTertiary
+		hex("#F7768E"), // Danger
+		hex("#16161E"), // OnDanger
+		hex("#1A1B26"), // Background
+		hex("#C0CAF5"), // OnBackground
+		hex("#24283B"), // BackgroundVariant
+		hex("#9AA5CE"), // OnBackgroundVariant
+		hex("#15161E"), // BackgroundContrast
+		hex("#C0CAF5"), // OnBackgroundContrast
+		hex("#565F89"), // Outline
+		hex("#15161E"), // Shadow
+		hex("#ffffff"), // Highlight
+	],
+};
+
+static TOKYO_DAY: &WguiColorPalette = &WguiColorPalette {
+	colors: [
+		hex("#2E7DE9"), // Primary
+		hex("#E1E2E7"), // OnPrimary
+		hex("#9854F1"), // Secondary
+		hex("#E1E2E7"), // OnSecondary
+		hex("#587539"), // Tertiary
+		hex("#E1E2E7"), // OnTertiary
+		hex("#F52A65"), // Danger
+		hex("#E1E2E7"), // OnDanger
+		hex("#E1E2E7"), // Background
+		hex("#3760BF"), // OnBackground
+		hex("#D0D5E3"), // BackgroundVariant
+		hex("#6172B0"), // OnBackgroundVariant
+		hex("#BCC2D1"), // BackgroundContrast
+		hex("#3760BF"), // OnBackgroundContrast
+		hex("#B4B5B9"), // Outline
+		hex("#A8AECB"), // Shadow
+		hex("#000000"), // Highlight
+	],
+};
diff --git a/wgui/src/parser/component_button.rs b/wgui/src/parser/component_button.rs
index 4e640c1c..b058fa4f 100644
--- a/wgui/src/parser/component_button.rs
+++ b/wgui/src/parser/component_button.rs
@@ -1,7 +1,7 @@
 use crate::{
 	assets::AssetPath,
+	color::WguiColor,
 	components::{Component, button},
-	drawing::Color,
 	i18n::Translation,
 	layout::WidgetID,
 	parser::{
@@ -21,11 +21,14 @@ pub fn parse_component_button<'a>(
 	attribs: &[AttribPair],
 	tag_name: &str,
 ) -> anyhow::Result<WidgetID> {
-	let mut color: Option<Color> = None;
+	let mut color: Option<WguiColor> = None;
+	let mut sprite_color: Option<WguiColor> = None;
 	let mut border = 2.0;
-	let mut border_color: Option<Color> = None;
-	let mut hover_color: Option<Color> = None;
-	let mut hover_border_color: Option<Color> = None;
+	let mut border_color: Option<WguiColor> = None;
+	let mut hover_color: Option<WguiColor> = None;
+	let mut hover_border_color: Option<WguiColor> = None;
+	let mut sticky_color: Option<WguiColor> = None;
+	let mut sticky_border_color: Option<WguiColor> = None;
 	let mut round = WLength::Units(4.0);
 	let mut tooltip = TooltipAttribs::default();
 	let mut sticky: bool = false;
@@ -34,7 +37,7 @@ pub fn parse_component_button<'a>(
 
 	let mut translation: Option<Translation> = None;
 
-	let text_style = parse_text_style(ctx, attribs, tag_name);
+	let text_style = parse_text_style(ctx, attribs, tag_name, "text_");
 	let style = parse_style(ctx, attribs, tag_name);
 
 	for pair in attribs {
@@ -63,6 +66,9 @@ pub fn parse_component_button<'a>(
 			"color" => {
 				parse_color_opt(ctx, tag_name, key, value, &mut color);
 			}
+			"sprite_color" => {
+				parse_color_opt(ctx, tag_name, key, value, &mut sprite_color);
+			}
 			"border" => {
 				ctx.parse_check_f32(tag_name, key, value, &mut border);
 			}
@@ -75,6 +81,12 @@ pub fn parse_component_button<'a>(
 			"hover_border_color" => {
 				parse_color_opt(ctx, tag_name, key, value, &mut hover_border_color);
 			}
+			"sticky_color" => {
+				parse_color_opt(ctx, tag_name, key, value, &mut sticky_color);
+			}
+			"sticky_border_color" => {
+				parse_color_opt(ctx, tag_name, key, value, &mut sticky_border_color);
+			}
 			"sprite_src" | "sprite_src_ext" | "sprite_src_builtin" | "sprite_src_internal" => {
 				let asset_path = get_asset_path_from_kv("sprite_", key, value);
 
@@ -98,11 +110,14 @@ pub fn parse_component_button<'a>(
 	let (widget, button) = button::construct(
 		&mut ctx.get_construct_essentials(parent_id),
 		button::Params {
+			sprite_color,
 			color,
 			border,
 			border_color,
-			hover_border_color,
 			hover_color,
+			hover_border_color,
+			sticky_color,
+			sticky_border_color,
 			text: translation,
 			style,
 			text_style,
diff --git a/wgui/src/parser/component_checkbox.rs b/wgui/src/parser/component_checkbox.rs
index 3f011422..d844bcdc 100644
--- a/wgui/src/parser/component_checkbox.rs
+++ b/wgui/src/parser/component_checkbox.rs
@@ -3,7 +3,7 @@ use crate::{
 	i18n::Translation,
 	layout::WidgetID,
 	parser::{
-		AttribPair, Fetchable, ParserContext,
+		AttribPair, ParserContext,
 		helpers::{TooltipAttribs, parse_attrib_tooltip},
 		process_component,
 		style::parse_style,
@@ -66,7 +66,8 @@ pub fn parse_component_checkbox(
 
 		while let Some(parent_id) = maybe_parent_id {
 			if let Ok(radio) = ctx
-				.data_local
+				.layout
+				.state
 				.fetch_component_from_widget_id_as::<ComponentRadioGroup>(parent_id)
 			{
 				radio_group = Some(radio);
diff --git a/wgui/src/parser/component_color_selector.rs b/wgui/src/parser/component_color_selector.rs
new file mode 100644
index 00000000..63fa2110
--- /dev/null
+++ b/wgui/src/parser/component_color_selector.rs
@@ -0,0 +1,25 @@
+use crate::{
+	components::{Component, color_selector},
+	drawing,
+	layout::WidgetID,
+	parser::{AttribPair, ParserContext, process_component, style::parse_style},
+};
+
+pub fn parse_component_color_selector(
+	ctx: &mut ParserContext,
+	parent_id: WidgetID,
+	attribs: &[AttribPair],
+	tag_name: &str,
+) -> anyhow::Result<WidgetID> {
+	let style = parse_style(ctx, attribs, tag_name);
+	let color = drawing::Color::new(1.0, 1.0, 1.0, 1.0);
+
+	let (widget, component) = color_selector::construct(
+		&mut ctx.get_construct_essentials(parent_id),
+		color_selector::Params { color, style },
+	)?;
+
+	process_component(ctx, Component(component), widget.id, attribs);
+
+	Ok(widget.id)
+}
diff --git a/wgui/src/parser/component_slider.rs b/wgui/src/parser/component_slider.rs
index ef09e8a8..f14d21a6 100644
--- a/wgui/src/parser/component_slider.rs
+++ b/wgui/src/parser/component_slider.rs
@@ -18,7 +18,8 @@ pub fn parse_component_slider(
 ) -> anyhow::Result<WidgetID> {
 	let mut min_value = 0.0;
 	let mut max_value = 1.0;
-	let mut initial_value = 0.5;
+	let mut initial_value1 = 0.5;
+	let mut initial_value2: Option<f32> = None;
 	let mut step = 1.0;
 	let mut show_value = 1;
 	let mut tooltip = TooltipAttribs::default();
@@ -35,7 +36,13 @@ pub fn parse_component_slider(
 				ctx.parse_check_f32(tag_name, key, value, &mut max_value);
 			}
 			"value" => {
-				ctx.parse_check_f32(tag_name, key, value, &mut initial_value);
+				ctx.parse_check_f32(tag_name, key, value, &mut initial_value1);
+			}
+			"value2" => {
+				let mut val = 0.0;
+				if ctx.parse_check_f32(tag_name, key, value, &mut val) {
+					initial_value2 = Some(val);
+				}
 			}
 			"step" => {
 				ctx.parse_check_f32(tag_name, key, value, &mut step);
@@ -56,12 +63,13 @@ pub fn parse_component_slider(
 		},
 		slider::Params {
 			style,
-			values: slider::ValuesMinMax {
+			limits: slider::Limits {
 				min_value,
 				max_value,
-				value: initial_value,
 				step,
 			},
+			value1: slider::Value(initial_value1),
+			value2: initial_value2.map(slider::Value),
 			show_value: show_value != 0,
 			tooltip: tooltip.get_info(),
 		},
diff --git a/wgui/src/parser/component_tabs.rs b/wgui/src/parser/component_tabs.rs
index c195de7b..e3319a90 100644
--- a/wgui/src/parser/component_tabs.rs
+++ b/wgui/src/parser/component_tabs.rs
@@ -1,12 +1,20 @@
+use std::rc::Rc;
+
 use crate::{
-	assets::AssetPath,
+	assets::AssetPathRc,
+	color::WguiColor,
 	components::{Component, tabs},
 	i18n::Translation,
 	layout::WidgetID,
-	parser::{AttribPair, ParserContext, get_asset_path_from_kv, process_component, style::parse_style},
+	parser::{
+		AttribPair, ParserContext, ParserFile, get_asset_path_rc_from_kv, process_attribs, process_component,
+		style::{parse_color_opt, parse_round, parse_style},
+	},
+	widget::util::WLength,
 };
 
 pub fn parse_component_tabs<'a>(
+	file: &'a ParserFile,
 	ctx: &mut ParserContext,
 	node: roxmltree::Node<'a, 'a>,
 	parent_id: WidgetID,
@@ -17,25 +25,71 @@ pub fn parse_component_tabs<'a>(
 
 	let mut entries = Vec::<tabs::Entry>::new();
 
+	let mut border = 2.0;
+	let mut color: Option<WguiColor> = None;
+	let mut border_color: Option<WguiColor> = None;
+	let mut hover_color: Option<WguiColor> = None;
+	let mut hover_border_color: Option<WguiColor> = None;
+	let mut sticky_color: Option<WguiColor> = None;
+	let mut sticky_border_color: Option<WguiColor> = None;
+	let mut round = WLength::Units(4.0);
+
 	for child in node.children() {
 		match child.tag_name().name() {
 			"" => { /* ignore */ }
 			"Tab" => {
-				let mut name: Option<&str> = None;
+				let mut name: Option<Rc<str>> = None;
 				let mut text: Option<Translation> = None;
-				let mut sprite_src: Option<AssetPath> = None;
+				let mut sprite_src: Option<AssetPathRc> = None;
 
-				for attrib in child.attributes() {
-					let (key, value) = (attrib.name(), attrib.value());
-					match key {
-						"name" => name = Some(value),
-						"text" => text = Some(Translation::from_raw_text(value)),
-						"translation" => text = Some(Translation::from_translation_key(value)),
+				let attribs = process_attribs(file, ctx, &child, false);
+
+				for attrib in attribs.iter() {
+					match &*attrib.attrib {
+						"name" => name = Some(attrib.value.clone()),
+						"text" => text = Some(Translation::from_raw_text(&*attrib.value)),
+						"translation" => text = Some(Translation::from_translation_key(&*attrib.value)),
 						"sprite_src" | "sprite_src_ext" | "sprite_src_builtin" | "sprite_src_internal" => {
-							sprite_src = Some(get_asset_path_from_kv("sprite_", key, value));
+							sprite_src = Some(get_asset_path_rc_from_kv(
+								"sprite_",
+								&*attrib.attrib,
+								attrib.value.clone(),
+							));
+							continue;
+						}
+						"round" => {
+							parse_round(
+								ctx,
+								tag_name,
+								&*attrib.attrib,
+								&*attrib.value,
+								&mut round,
+								ctx.layout.state.theme.rounding_mult,
+							);
+						}
+						"color" => {
+							parse_color_opt(ctx, tag_name, &*attrib.attrib, &*attrib.value, &mut color);
+						}
+						"border" => {
+							ctx.parse_check_f32(tag_name, &*attrib.attrib, &*attrib.value, &mut border);
+						}
+						"border_color" => {
+							parse_color_opt(ctx, tag_name, &*attrib.attrib, &*attrib.value, &mut border_color);
+						}
+						"hover_color" => {
+							parse_color_opt(ctx, tag_name, &*attrib.attrib, &*attrib.value, &mut hover_color);
+						}
+						"hover_border_color" => {
+							parse_color_opt(ctx, tag_name, &*attrib.attrib, &*attrib.value, &mut hover_border_color);
+						}
+						"sticky_color" => {
+							parse_color_opt(ctx, tag_name, &*attrib.attrib, &*attrib.value, &mut sticky_color);
+						}
+						"sticky_border_color" => {
+							parse_color_opt(ctx, tag_name, &*attrib.attrib, &*attrib.value, &mut sticky_border_color);
 						}
 						other_key => {
-							ctx.print_invalid_attrib("Tab", other_key, value);
+							ctx.print_invalid_attrib("Tab", other_key, &*attrib.value);
 						}
 					}
 				}
@@ -59,6 +113,14 @@ pub fn parse_component_tabs<'a>(
 			selected_entry_name: "first",
 			entries,
 			on_select: None,
+			border,
+			color,
+			border_color,
+			hover_color,
+			hover_border_color,
+			sticky_color,
+			sticky_border_color,
+			round,
 		},
 	)?;
 
diff --git a/wgui/src/parser/component_video.rs b/wgui/src/parser/component_video.rs
new file mode 100644
index 00000000..90233002
--- /dev/null
+++ b/wgui/src/parser/component_video.rs
@@ -0,0 +1,63 @@
+use crate::{
+	assets::AssetPath,
+	components::{self, Component},
+	layout::WidgetID,
+	parser::{
+		AttribPair, ParserContext, ParserFile, get_asset_path_from_kv, parse_children, parse_f32, parse_i32,
+		process_component, style::parse_style,
+	},
+};
+
+pub fn parse_component_video<'a>(
+	file: &'a ParserFile,
+	ctx: &mut ParserContext,
+	node: roxmltree::Node<'a, 'a>,
+	parent_id: WidgetID,
+	attribs: &[AttribPair],
+	tag_name: &str,
+) -> anyhow::Result<WidgetID> {
+	let mut src: Option<AssetPath> = None;
+	let mut looping: bool = false;
+	let mut speed: f32 = 1.0;
+
+	let style = parse_style(ctx, attribs, tag_name);
+
+	for pair in attribs {
+		let (key, value) = (pair.attrib.as_ref(), pair.value.as_ref());
+		match key {
+			"speed" => {
+				speed = parse_f32(value).unwrap_or(speed);
+			}
+			"looping" => {
+				if let Some(v) = parse_i32(value)
+					&& v != 0
+				{
+					looping = true;
+				}
+			}
+			"src" | "src_ext" | "src_builtin" | "src_internal" => {
+				let asset_path = get_asset_path_from_kv("", key, value);
+
+				if !value.is_empty() {
+					src = Some(asset_path);
+				}
+			}
+			_ => {}
+		}
+	}
+
+	let (widget, video) = components::video::construct(
+		&mut ctx.get_construct_essentials(parent_id),
+		components::video::Params {
+			style,
+			src,
+			looping,
+			speed,
+		},
+	)?;
+
+	process_component(ctx, Component(video), widget.id, attribs);
+	parse_children(file, ctx, node, widget.id)?;
+
+	Ok(widget.id)
+}
diff --git a/wgui/src/parser/mod.rs b/wgui/src/parser/mod.rs
index a715b4df..42067933 100644
--- a/wgui/src/parser/mod.rs
+++ b/wgui/src/parser/mod.rs
@@ -1,10 +1,15 @@
 mod component_bar_graph;
 mod component_button;
 mod component_checkbox;
+mod component_color_selector;
 mod component_editbox;
 mod component_radio_group;
 mod component_slider;
 mod component_tabs;
+
+#[cfg(feature = "video")]
+mod component_video;
+
 mod helpers;
 mod style;
 mod widget_div;
@@ -14,9 +19,8 @@ mod widget_rectangle;
 mod widget_sprite;
 
 use crate::{
-	assets::{AssetPath, AssetPathOwned, normalize_path},
+	assets::{AssetPath, AssetPathOwned, AssetPathRc, normalize_path},
 	components::{Component, ComponentWeak},
-	drawing::{self},
 	globals::WguiGlobals,
 	i18n::Translation,
 	layout::{Layout, LayoutParams, LayoutState, Widget, WidgetID, WidgetMap, WidgetPair},
@@ -25,6 +29,7 @@ use crate::{
 		component_bar_graph::parse_component_bar_graph,
 		component_button::parse_component_button,
 		component_checkbox::{CheckboxKind, parse_component_checkbox},
+		component_color_selector::parse_component_color_selector,
 		component_editbox::parse_component_editbox,
 		component_radio_group::parse_component_radio_group,
 		component_slider::parse_component_slider,
@@ -57,10 +62,13 @@ pub struct Template {
 	node: roxmltree::NodeId, // belongs to node_document which could be included in another file
 }
 
+#[derive(Clone, Default)]
+pub struct TemplateParams(HashMap<Rc<str>, Rc<str>>);
+
 struct ParserFile {
 	path: AssetPathOwned,
 	document: Rc<XmlDocument>,
-	template_parameters: HashMap<Rc<str>, Rc<str>>,
+	template_parameters: TemplateParams,
 }
 
 /*
@@ -71,7 +79,6 @@ struct ParserFile {
 #[derive(Default, Clone)]
 pub struct ParserData {
 	pub components_by_id: HashMap<Rc<str>, ComponentWeak>,
-	pub components_by_widget_id: HashMap<WidgetID, ComponentWeak>,
 	pub components: Vec<Component>,
 	pub ids: HashMap<Rc<str>, WidgetID>,
 	pub templates: HashMap<Rc<str>, Rc<Template>>,
@@ -83,14 +90,18 @@ pub trait Fetchable {
 	/// Return a component by its string ID
 	fn fetch_component_by_id(&self, id: &str) -> anyhow::Result<Component>;
 
-	/// Return a component by the ID of the widget that owns it
-	fn fetch_component_by_widget_id(&self, widget_id: WidgetID) -> anyhow::Result<Component>;
+	/// Fetch a component by widget ID (returns Component)
+	fn fetch_component_by_widget_id(&self, state: &LayoutState, widget_id: WidgetID) -> anyhow::Result<Component>;
 
 	/// Fetch a component by string ID and down‑cast it to a concrete component type `T` (see `components/mod.rs`)
 	fn fetch_component_as<T: 'static>(&self, id: &str) -> anyhow::Result<Rc<T>>;
 
 	/// Fetch a component by widget ID and down‑cast it to a concrete component type `T` (see `components/mod.rs`)
-	fn fetch_component_from_widget_id_as<T: 'static>(&self, widget_id: WidgetID) -> anyhow::Result<Rc<T>>;
+	fn fetch_component_from_widget_id_as<T: 'static>(
+		&self,
+		state: &LayoutState,
+		widget_id: WidgetID,
+	) -> anyhow::Result<Rc<T>>;
 
 	/// Return a widget by its string ID
 	fn get_widget_id(&self, id: &str) -> anyhow::Result<WidgetID>;
@@ -102,12 +113,33 @@ pub trait Fetchable {
 	fn fetch_widget_as<'a, T: 'static>(&self, state: &'a LayoutState, id: &str) -> anyhow::Result<RefMut<'a, T>>;
 }
 
+impl TemplateParams {
+	pub fn new() -> Self {
+		Self(HashMap::new())
+	}
+
+	pub const fn from_hashmap(map: HashMap<Rc<str>, Rc<str>>) -> Self {
+		Self(map)
+	}
+
+	pub fn insert(&mut self, key: &str, value: &str) -> Option<Rc<str>> {
+		self.0.insert(Rc::from(key), Rc::from(value))
+	}
+
+	pub fn insert_rc(&mut self, key: &str, value: Rc<str>) -> Option<Rc<str>> {
+		self.0.insert(Rc::from(key), value)
+	}
+
+	pub fn insert_str(&mut self, key: &str, value: String) -> Option<Rc<str>> {
+		self.0.insert(Rc::from(key), value.into())
+	}
+}
+
 impl ParserData {
 	pub(crate) fn take_results_from(&mut self, from: &mut Self) {
 		let ids = std::mem::take(&mut from.ids);
 		let components = std::mem::take(&mut from.components);
 		let components_by_id = std::mem::take(&mut from.components_by_id);
-		let components_by_widget_id = std::mem::take(&mut from.components_by_widget_id);
 
 		for (id, key) in ids {
 			self.ids.insert(id, key);
@@ -120,10 +152,6 @@ impl ParserData {
 		for (k, v) in components_by_id {
 			self.components_by_id.insert(k, v);
 		}
-
-		for (k, v) in components_by_widget_id {
-			self.components_by_widget_id.insert(k, v);
-		}
 	}
 }
 
@@ -140,16 +168,16 @@ impl Fetchable for ParserData {
 		Ok(Component(component))
 	}
 
-	fn fetch_component_by_widget_id(&self, widget_id: WidgetID) -> anyhow::Result<Component> {
-		let Some(weak) = self.components_by_widget_id.get(&widget_id) else {
-			anyhow::bail!("Component by widget ID \"{widget_id:?}\" doesn't exist");
-		};
+	fn fetch_component_by_widget_id(&self, state: &LayoutState, widget_id: WidgetID) -> anyhow::Result<Component> {
+		state.fetch_component_by_widget_id(widget_id)
+	}
 
-		let Some(component) = weak.upgrade() else {
-			anyhow::bail!("Component by widget ID \"{widget_id:?}\" has disappeared");
-		};
-
-		Ok(Component(component))
+	fn fetch_component_from_widget_id_as<T: 'static>(
+		&self,
+		state: &LayoutState,
+		widget_id: WidgetID,
+	) -> anyhow::Result<Rc<T>> {
+		state.fetch_component_from_widget_id_as(widget_id)
 	}
 
 	fn fetch_component_as<T: 'static>(&self, id: &str) -> anyhow::Result<Rc<T>> {
@@ -163,17 +191,6 @@ impl Fetchable for ParserData {
 		unsafe { Ok(Rc::from_raw(Rc::into_raw(component.0).cast())) }
 	}
 
-	fn fetch_component_from_widget_id_as<T: 'static>(&self, widget_id: WidgetID) -> anyhow::Result<Rc<T>> {
-		let component = self.fetch_component_by_widget_id(widget_id)?;
-
-		if !(*component.0).as_any().is::<T>() {
-			anyhow::bail!("fetch_component_by_widget_id({widget_id:?}): type not matching");
-		}
-
-		// safety: we just checked the type
-		unsafe { Ok(Rc::from_raw(Rc::into_raw(component.0).cast())) }
-	}
-
 	fn get_widget_id(&self, id: &str) -> anyhow::Result<WidgetID> {
 		match self.ids.get(id) {
 			Some(id) => Ok(*id),
@@ -223,14 +240,14 @@ impl ParserState {
 	/// but it keeps components data in this `ParserState` object for you.
 	/// The result can be safely dropped, all required event listeners and components
 	/// will be kept intact in this `ParserState`.
-	/// Resulting ParserData::components Vec will be left empty (they are moved into this `ParserState::data`)
+	/// Resulting `ParserData::components` Vec will be left empty (they are moved into this `ParserState::data`)
 	pub fn realize_template(
 		&mut self,
 		doc_params: &ParseDocumentParams,
 		template_name: &str,
 		layout: &mut Layout,
 		widget_id: WidgetID,
-		template_parameters: HashMap<Rc<str>, Rc<str>>,
+		template_parameters: TemplateParams,
 	) -> anyhow::Result<ParserData> {
 		let mut parser_data =
 			self.parse_template_only(doc_params, template_name, layout, widget_id, template_parameters)?;
@@ -243,7 +260,7 @@ impl ParserState {
 	/// Semi-internal - This function is suitable in cases if you don't want to pollute
 	/// the main parser state state with dynamic IDs (this won't propagate components!)
 	/// Use `realize_template` (or in some rare cases: `instantiate_template`) instead unless you want to handle `components` results yourself.
-	/// Make sure not to drop resulting ParserData if you want to have your listener handles valid
+	/// Make sure not to drop resulting `ParserData` if you want to have your listener handles valid
 	/// (they are contained in components). Use `realize_template` instead if you don't want to think about it.
 	pub fn parse_template_only(
 		&self,
@@ -251,7 +268,7 @@ impl ParserState {
 		template_name: &str,
 		layout: &mut Layout,
 		widget_id: WidgetID,
-		template_parameters: HashMap<Rc<str>, Rc<str>>,
+		template_parameters: TemplateParams,
 	) -> anyhow::Result<ParserData> {
 		let Some(template) = self.data.templates.get(template_name) else {
 			anyhow::bail!(
@@ -280,7 +297,7 @@ impl ParserState {
 	/// Parse named <template> tag and process it.
 	/// Instantiate template by saving all the results into the main `ParserState`.
 	/// Be aware you this function will save ALL parsed IDs and other metadata
-	/// into your main ParserState context (deep move).
+	/// into your main `ParserState` context (deep move).
 	/// You shouldn't instantiate the same template twice, to prevent ID name clash.
 	/// Consider using `parse_template_only` or `realize_template` instead if you want
 	/// to instantiate more than a single template of the same type.
@@ -290,7 +307,7 @@ impl ParserState {
 		template_name: &str,
 		layout: &mut Layout,
 		widget_id: WidgetID,
-		template_parameters: HashMap<Rc<str>, Rc<str>>,
+		template_parameters: TemplateParams,
 	) -> anyhow::Result<()> {
 		let mut data_local = self.parse_template_only(doc_params, template_name, layout, widget_id, template_parameters)?;
 
@@ -301,7 +318,7 @@ impl ParserState {
 	pub(crate) fn context_menu_parse_cells(
 		&mut self,
 		template_name: &str,
-		template_params: &HashMap<Rc<str>, Rc<str>>,
+		template_params: &TemplateParams,
 	) -> anyhow::Result<Vec<context_menu::Cell>> {
 		let Some(template) = self.data.templates.get(template_name) else {
 			anyhow::bail!("no template named \"{template_name}\" found");
@@ -368,18 +385,22 @@ impl Fetchable for ParserState {
 		self.data.fetch_component_by_id(id)
 	}
 
-	fn fetch_component_by_widget_id(&self, widget_id: WidgetID) -> anyhow::Result<Component> {
-		self.data.fetch_component_by_widget_id(widget_id)
+	fn fetch_component_by_widget_id(&self, state: &LayoutState, widget_id: WidgetID) -> anyhow::Result<Component> {
+		self.data.fetch_component_by_widget_id(state, widget_id)
+	}
+
+	fn fetch_component_from_widget_id_as<T: 'static>(
+		&self,
+		state: &LayoutState,
+		widget_id: WidgetID,
+	) -> anyhow::Result<Rc<T>> {
+		self.data.fetch_component_from_widget_id_as(state, widget_id)
 	}
 
 	fn fetch_component_as<T: 'static>(&self, id: &str) -> anyhow::Result<Rc<T>> {
 		self.data.fetch_component_as(id)
 	}
 
-	fn fetch_component_from_widget_id_as<T: 'static>(&self, widget_id: WidgetID) -> anyhow::Result<Rc<T>> {
-		self.data.fetch_component_from_widget_id_as(widget_id)
-	}
-
 	fn get_widget_id(&self, id: &str) -> anyhow::Result<WidgetID> {
 		self.data.get_widget_id(id)
 	}
@@ -469,7 +490,8 @@ impl ParserContext<'_> {
 
 	fn insert_component(&mut self, widget_id: WidgetID, component: Component, id: Option<Rc<str>>) {
 		self
-			.data_local
+			.layout
+			.state
 			.components_by_widget_id
 			.insert(widget_id, component.weak());
 
@@ -492,29 +514,10 @@ impl ParserContext<'_> {
 		}
 	}
 
-	fn populate_theme_variables(&mut self) {
-		let theme = self.layout.state.theme.clone();
-
-		macro_rules! insert_color_vars {
-			($self:expr, $name:literal, $field:expr, $alpha:expr) => {
-				$self.insert_var(concat!("color_", $name), &$field.to_hex());
-				$self.insert_var(
-					concat!("color_", $name, "_translucent"),
-					&$field.with_alpha($alpha).to_hex(),
-				);
-				$self.insert_var(concat!("color_", $name, "_50"), &$field.mult_rgb(0.50).to_hex());
-				$self.insert_var(concat!("color_", $name, "_40"), &$field.mult_rgb(0.40).to_hex());
-				$self.insert_var(concat!("color_", $name, "_30"), &$field.mult_rgb(0.30).to_hex());
-				$self.insert_var(concat!("color_", $name, "_20"), &$field.mult_rgb(0.20).to_hex());
-				$self.insert_var(concat!("color_", $name, "_10"), &$field.mult_rgb(0.10).to_hex());
-			};
+	fn populate_extra_variables(&mut self, other: &HashMap<Rc<str>, Rc<str>>) {
+		for (k, v) in other.iter() {
+			self.data_local.var_map.insert(k.clone(), v.clone());
 		}
-
-		insert_color_vars!(self, "text", theme.text_color, theme.translucent_alpha);
-		insert_color_vars!(self, "accent", theme.accent_color, theme.translucent_alpha);
-		insert_color_vars!(self, "danger", theme.danger_color, theme.translucent_alpha);
-		insert_color_vars!(self, "faded", theme.faded_color, theme.translucent_alpha);
-		insert_color_vars!(self, "bg", theme.bg_color, theme.translucent_alpha);
 	}
 
 	fn print_invalid_attrib(&self, tag_name: &str, key: &str, value: &str) {
@@ -559,6 +562,10 @@ impl ParserContext<'_> {
 		Some(val / 100.0)
 	}
 
+	pub fn parse_auto(value: &str) -> bool {
+		value.contains("auto")
+	}
+
 	fn parse_size_unit<T>(&self, tag_name: &str, key: &str, value: &str) -> Option<T>
 	where
 		T: taffy::prelude::FromPercent + taffy::prelude::FromLength,
@@ -603,38 +610,6 @@ fn is_percent(value: &str) -> bool {
 	value.ends_with('%')
 }
 
-// Parses a color from a HTML hex string
-pub fn parse_color_hex(html_hex: &str) -> Option<drawing::Color> {
-	if html_hex.len() == 7 {
-		if let (Ok(r), Ok(g), Ok(b)) = (
-			u8::from_str_radix(&html_hex[1..3], 16),
-			u8::from_str_radix(&html_hex[3..5], 16),
-			u8::from_str_radix(&html_hex[5..7], 16),
-		) {
-			return Some(drawing::Color::new(
-				f32::from(r) / 255.,
-				f32::from(g) / 255.,
-				f32::from(b) / 255.,
-				1.,
-			));
-		}
-	} else if html_hex.len() == 9
-		&& let (Ok(r), Ok(g), Ok(b), Ok(a)) = (
-			u8::from_str_radix(&html_hex[1..3], 16),
-			u8::from_str_radix(&html_hex[3..5], 16),
-			u8::from_str_radix(&html_hex[5..7], 16),
-			u8::from_str_radix(&html_hex[7..9], 16),
-		) {
-		return Some(drawing::Color::new(
-			f32::from(r) / 255.,
-			f32::from(g) / 255.,
-			f32::from(b) / 255.,
-			f32::from(a) / 255.,
-		));
-	}
-	None
-}
-
 fn get_tag_by_name<'a>(node: &roxmltree::Node<'a, 'a>, name: &str) -> Option<roxmltree::Node<'a, 'a>> {
 	node.children().find(|&child| child.tag_name().name() == name)
 }
@@ -645,7 +620,7 @@ fn require_tag_by_name<'a>(node: &roxmltree::Node<'a, 'a>, name: &str) -> anyhow
 
 fn parse_widget_other_internal(
 	template: &Rc<Template>,
-	template_parameters: HashMap<Rc<str>, Rc<str>>,
+	template_parameters: TemplateParams,
 	file: &ParserFile,
 	ctx: &mut ParserContext,
 	parent_id: WidgetID,
@@ -683,10 +658,16 @@ fn parse_widget_other(
 		return Ok(()); // not critical
 	};
 
-	let template_parameters: HashMap<Rc<str>, Rc<str>> =
+	let template_params: HashMap<Rc<str>, Rc<str>> =
 		attribs.iter().map(|a| (a.attrib.clone(), a.value.clone())).collect();
 
-	parse_widget_other_internal(&template, template_parameters, file, ctx, parent_id)
+	parse_widget_other_internal(
+		&template,
+		TemplateParams::from_hashmap(template_params),
+		file,
+		ctx,
+		parent_id,
+	)
 }
 
 fn parse_tag_include(
@@ -786,7 +767,7 @@ fn parse_tag_var<'a>(ctx: &mut ParserContext, tag_name: &str, node: roxmltree::N
 	ctx.insert_var(key, value);
 }
 
-pub fn replace_vars(input: &str, vars: &HashMap<Rc<str>, Rc<str>>) -> Rc<str> {
+pub fn replace_vars(input: &str, vars: &TemplateParams) -> Rc<str> {
 	let re = regex::Regex::new(r"\$\{([^}]*)\}").unwrap();
 
 	/*if !vars.is_empty() {
@@ -796,7 +777,7 @@ pub fn replace_vars(input: &str, vars: &HashMap<Rc<str>, Rc<str>>) -> Rc<str> {
 	let out = re.replace_all(input, |captures: &regex::Captures| {
 		let input_var = &captures[1];
 
-		if let Some(replacement) = vars.get(input_var) {
+		if let Some(replacement) = vars.0.get(input_var) {
 			replacement.clone()
 		} else {
 			// failed to find var, return an empty string
@@ -809,12 +790,7 @@ pub fn replace_vars(input: &str, vars: &HashMap<Rc<str>, Rc<str>>) -> Rc<str> {
 
 #[allow(clippy::manual_strip)]
 #[allow(clippy::single_match_else)]
-fn process_attrib(
-	template_parameters: &HashMap<Rc<str>, Rc<str>>,
-	ctx: &ParserContext,
-	key: &str,
-	value: &str,
-) -> AttribPair {
+fn process_attrib(template_parameters: &TemplateParams, ctx: &ParserContext, key: &str, value: &str) -> AttribPair {
 	if value.starts_with('~') {
 		let name = &value[1..];
 
@@ -822,7 +798,7 @@ fn process_attrib(
 			Some(name) => AttribPair::new(key, name),
 			None => {
 				log::warn!("{}: undefined variable \"{value}\"", ctx.doc_params.path.get_str());
-				AttribPair::new(key, "undefined")
+				AttribPair::new(key, format!("undefined_{}", value))
 			}
 		}
 	} else {
@@ -1060,9 +1036,18 @@ fn parse_child<'a>(
 				file, ctx, child_node, parent_id, &attribs, tag_name,
 			)?);
 		}
+		#[cfg(feature = "video")]
+		"Video" => {
+			use crate::parser::component_video::parse_component_video;
+
+			new_widget_id = Some(parse_component_video(
+				file, ctx, child_node, parent_id, &attribs, tag_name,
+			)?);
+		}
 		"Slider" => {
 			new_widget_id = Some(parse_component_slider(ctx, parent_id, &attribs, tag_name)?);
 		}
+		"ColorSelector" => new_widget_id = Some(parse_component_color_selector(ctx, parent_id, &attribs, tag_name)?),
 		"CheckBox" => {
 			new_widget_id = Some(parse_component_checkbox(
 				ctx,
@@ -1089,7 +1074,9 @@ fn parse_child<'a>(
 		"EditBox" => new_widget_id = Some(parse_component_editbox(ctx, parent_id, &attribs, tag_name)?),
 		"BarGraph" => new_widget_id = Some(parse_component_bar_graph(ctx, parent_id, &attribs, tag_name)?),
 		"Tabs" => {
-			new_widget_id = Some(parse_component_tabs(ctx, child_node, parent_id, &attribs, tag_name)?);
+			new_widget_id = Some(parse_component_tabs(
+				file, ctx, child_node, parent_id, &attribs, tag_name,
+			)?);
 		}
 		"" => { /* ignore */ }
 		other_tag_name => {
@@ -1230,6 +1217,7 @@ pub type OnCustomAttribsFunc = Rc<dyn Fn(CustomAttribsInfo)>;
 pub struct ParseDocumentExtra {
 	pub on_custom_attribs: Option<OnCustomAttribsFunc>, // all attributes with '_' character prepended
 	pub dev_mode: bool,
+	pub extra_vars: HashMap<Rc<str>, Rc<str>>,
 }
 
 // filled-in by you in `new_layout_from_assets` function
@@ -1246,7 +1234,7 @@ pub fn parse_from_assets(
 ) -> anyhow::Result<ParserState> {
 	let parser_data = ParserData::default();
 	let mut ctx = create_default_context(doc_params, layout, &parser_data);
-	ctx.populate_theme_variables();
+	ctx.populate_extra_variables(&doc_params.extra.extra_vars);
 
 	let (file, node_layout) = get_doc_from_asset_path(&ctx, doc_params.path)?;
 	parse_document_root(&file, &mut ctx, parent_id, node_layout)?;
@@ -1296,7 +1284,7 @@ fn get_doc_from_asset_path(
 	let file = ParserFile {
 		path: asset_path.to_owned(),
 		document: document.clone(),
-		template_parameters: Default::default(),
+		template_parameters: TemplateParams::new(),
 	};
 
 	Ok((file, tag_layout.id()))
@@ -1333,21 +1321,26 @@ fn parse_document_root(
 	Ok(())
 }
 
-fn get_asset_path_from_kv<'a>(prefix: &'static str, key: &'a str, value: &'a str) -> AssetPath<'a> {
-	let key_split = match key.find(prefix) {
-		Some(pos) => {
-			assert!(pos == 0, "invalid split");
-			key.get(prefix.len()..).unwrap()
-		}
-		None => key,
-	};
-	match key_split {
+fn get_asset_path_from_kv<'a>(prefix: &str, key: &'a str, value: &'a str) -> AssetPath<'a> {
+	let key = key.strip_prefix(prefix).unwrap_or(key);
+
+	match key {
 		"src" => AssetPath::FileOrBuiltIn(value),
 		"src_ext" => AssetPath::File(value),
 		"src_builtin" => AssetPath::BuiltIn(value),
 		"src_internal" => AssetPath::WguiInternal(value),
-		other => {
-			panic!("unexpected attrib {other}");
-		}
+		other => panic!("unexpected attrib {other}"),
+	}
+}
+
+fn get_asset_path_rc_from_kv(prefix: &'static str, key: &str, value: Rc<str>) -> AssetPathRc {
+	let key = key.strip_prefix(prefix).unwrap_or(key);
+
+	match key {
+		"src" => AssetPathRc::FileOrBuiltIn(value),
+		"src_ext" => AssetPathRc::File(value),
+		"src_builtin" => AssetPathRc::BuiltIn(value),
+		"src_internal" => AssetPathRc::WguiInternal(value),
+		other => panic!("unexpected attrib {other}"),
 	}
 }
diff --git a/wgui/src/parser/style.rs b/wgui/src/parser/style.rs
index c0b8d423..ef85b226 100644
--- a/wgui/src/parser/style.rs
+++ b/wgui/src/parser/style.rs
@@ -4,8 +4,9 @@ use taffy::{
 };
 
 use crate::{
+	color::{WguiColor, WguiColorName},
 	drawing,
-	parser::{AttribPair, ParserContext, is_percent, parse_color_hex, parse_f32},
+	parser::{AttribPair, ParserContext, is_percent, parse_f32},
 	renderer_vk::text::{FontWeight, HorizontalAlign, TextStyle},
 	widget::util::WLength,
 };
@@ -31,12 +32,19 @@ pub fn parse_round(
 	}
 }
 
-pub fn parse_color(ctx: &ParserContext<'_>, tag_name: &str, key: &str, value: &str, color: &mut drawing::Color) {
-	if let Some(res_color) = parse_color_hex(value) {
-		*color = res_color;
-	} else {
-		ctx.print_invalid_attrib(tag_name, key, value);
+pub fn parse_color(ctx: &ParserContext<'_>, tag_name: &str, key: &str, value: &str, out_color: &mut WguiColor) -> bool {
+	if let Some(color) = drawing::Color::from_hex(value) {
+		*out_color = color.into();
+		return true;
 	}
+
+	if let Some(color) = ctx.layout.state.globals.get().palette.find(value) {
+		*out_color = color;
+		return true;
+	}
+
+	ctx.print_invalid_attrib(tag_name, key, value);
+	false
 }
 
 pub fn parse_color_opt(
@@ -44,78 +52,81 @@ pub fn parse_color_opt(
 	tag_name: &str,
 	key: &str,
 	value: &str,
-	color: &mut Option<drawing::Color>,
+	out_color: &mut Option<WguiColor>,
 ) {
-	if let Some(res_color) = parse_color_hex(value) {
-		*color = Some(res_color);
-	} else {
-		ctx.print_invalid_attrib(tag_name, key, value);
+	let mut color = WguiColor::default();
+	if parse_color(ctx, tag_name, key, value, &mut color) {
+		*out_color = Some(color);
 	}
 }
 
-pub fn parse_text_style(ctx: &ParserContext<'_>, attribs: &[AttribPair], tag_name: &str) -> TextStyle {
-	let mut style = TextStyle::default();
+pub fn parse_text_style(ctx: &ParserContext<'_>, attribs: &[AttribPair], tag_name: &str, prefix: &str) -> TextStyle {
+	let mut style = TextStyle {
+		color: Some(WguiColorName::OnBackground.into()),
+		..Default::default()
+	};
 
 	for pair in attribs {
 		let (key, value) = (pair.attrib.as_ref(), pair.value.as_ref());
-		match key {
-			"color" => {
-				if let Some(color) = parse_color_hex(value) {
-					style.color = Some(color);
+		if let Some(suffix) = key.strip_prefix(prefix) {
+			match suffix {
+				"color" => {
+					parse_color_opt(ctx, tag_name, key, value, &mut style.color);
 				}
+				"align" => match value {
+					"left" => style.align = Some(HorizontalAlign::Left),
+					"right" => style.align = Some(HorizontalAlign::Right),
+					"center" => style.align = Some(HorizontalAlign::Center),
+					"justified" => style.align = Some(HorizontalAlign::Justified),
+					"end" => style.align = Some(HorizontalAlign::End),
+					_ => {
+						ctx.print_invalid_attrib(tag_name, key, value);
+					}
+				},
+				"weight" => match value {
+					"light" => style.weight = Some(FontWeight::Light),
+					"normal" => style.weight = Some(FontWeight::Normal),
+					"bold" => style.weight = Some(FontWeight::Bold),
+					_ => {
+						ctx.print_invalid_attrib(tag_name, key, value);
+					}
+				},
+				"size" => {
+					if let Ok(size) = value.parse::<f32>() {
+						style.size = Some(size);
+					} else {
+						ctx.print_invalid_attrib(tag_name, key, value);
+					}
+				}
+				"shadow" => {
+					let mut color = WguiColor::default();
+					if parse_color(ctx, tag_name, key, value, &mut color) {
+						style.shadow.get_or_insert_default().color = color;
+					}
+				}
+				"shadow_x" => {
+					if let Ok(x) = value.parse::<f32>() {
+						style.shadow.get_or_insert_default().x = x;
+					} else {
+						ctx.print_invalid_attrib(tag_name, key, value);
+					}
+				}
+				"shadow_y" => {
+					if let Ok(y) = value.parse::<f32>() {
+						style.shadow.get_or_insert_default().y = y;
+					} else {
+						ctx.print_invalid_attrib(tag_name, key, value);
+					}
+				}
+				"wrap" => {
+					if let Ok(y) = value.parse::<i32>() {
+						style.wrap = y == 1;
+					} else {
+						ctx.print_invalid_attrib(tag_name, key, value);
+					}
+				}
+				_ => {}
 			}
-			"align" => match value {
-				"left" => style.align = Some(HorizontalAlign::Left),
-				"right" => style.align = Some(HorizontalAlign::Right),
-				"center" => style.align = Some(HorizontalAlign::Center),
-				"justified" => style.align = Some(HorizontalAlign::Justified),
-				"end" => style.align = Some(HorizontalAlign::End),
-				_ => {
-					ctx.print_invalid_attrib(tag_name, key, value);
-				}
-			},
-			"weight" => match value {
-				"light" => style.weight = Some(FontWeight::Light),
-				"normal" => style.weight = Some(FontWeight::Normal),
-				"bold" => style.weight = Some(FontWeight::Bold),
-				_ => {
-					ctx.print_invalid_attrib(tag_name, key, value);
-				}
-			},
-			"size" => {
-				if let Ok(size) = value.parse::<f32>() {
-					style.size = Some(size);
-				} else {
-					ctx.print_invalid_attrib(tag_name, key, value);
-				}
-			}
-			"shadow" => {
-				if let Some(color) = parse_color_hex(value) {
-					style.shadow.get_or_insert_default().color = color;
-				}
-			}
-			"shadow_x" => {
-				if let Ok(x) = value.parse::<f32>() {
-					style.shadow.get_or_insert_default().x = x;
-				} else {
-					ctx.print_invalid_attrib(tag_name, key, value);
-				}
-			}
-			"shadow_y" => {
-				if let Ok(y) = value.parse::<f32>() {
-					style.shadow.get_or_insert_default().y = y;
-				} else {
-					ctx.print_invalid_attrib(tag_name, key, value);
-				}
-			}
-			"wrap" => {
-				if let Ok(y) = value.parse::<i32>() {
-					style.wrap = y == 1;
-				} else {
-					ctx.print_invalid_attrib(tag_name, key, value);
-				}
-			}
-			_ => {}
 		}
 	}
 
@@ -233,34 +244,51 @@ pub fn parse_style(ctx: &ParserContext<'_>, attribs: &[AttribPair], tag_name: &s
 					ctx.print_invalid_attrib(tag_name, key, value);
 				}
 			},
+			"aspect_ratio" => {
+				if let Some(aspect) = ctx.parse_val(tag_name, key, value) {
+					style.aspect_ratio = Some(aspect);
+				}
+			}
 			"min_width" => {
 				if let Some(dim) = ctx.parse_size_unit(tag_name, key, value) {
 					style.min_size.width = dim;
+				} else if ParserContext::parse_auto(value) {
+					style.min_size.width = taffy::prelude::auto();
 				}
 			}
 			"min_height" => {
 				if let Some(dim) = ctx.parse_size_unit(tag_name, key, value) {
 					style.min_size.height = dim;
+				} else if ParserContext::parse_auto(value) {
+					style.min_size.height = taffy::prelude::auto();
 				}
 			}
 			"max_width" => {
 				if let Some(dim) = ctx.parse_size_unit(tag_name, key, value) {
 					style.max_size.width = dim;
+				} else if ParserContext::parse_auto(value) {
+					style.max_size.width = taffy::prelude::auto();
 				}
 			}
 			"max_height" => {
 				if let Some(dim) = ctx.parse_size_unit(tag_name, key, value) {
 					style.max_size.height = dim;
+				} else if ParserContext::parse_auto(value) {
+					style.max_size.height = taffy::prelude::auto();
 				}
 			}
 			"width" => {
 				if let Some(dim) = ctx.parse_size_unit(tag_name, key, value) {
 					style.size.width = dim;
+				} else if ParserContext::parse_auto(value) {
+					style.size.width = taffy::prelude::auto();
 				}
 			}
 			"height" => {
 				if let Some(dim) = ctx.parse_size_unit(tag_name, key, value) {
 					style.size.height = dim;
+				} else if ParserContext::parse_auto(value) {
+					style.size.height = taffy::prelude::auto();
 				}
 			}
 			"gap" => {
@@ -298,64 +326,64 @@ pub fn parse_style(ctx: &ParserContext<'_>, attribs: &[AttribPair], tag_name: &s
 				}
 			},
 			"align_self" => match value {
-				"baseline" => style.align_self = Some(AlignSelf::Baseline),
-				"center" => style.align_self = Some(AlignSelf::Center),
-				"end" => style.align_self = Some(AlignSelf::End),
-				"flex_end" => style.align_self = Some(AlignSelf::FlexEnd),
-				"flex_start" => style.align_self = Some(AlignSelf::FlexStart),
-				"start" => style.align_self = Some(AlignSelf::Start),
-				"stretch" => style.align_self = Some(AlignSelf::Stretch),
+				"baseline" => style.align_self = Some(AlignSelf::BASELINE),
+				"center" => style.align_self = Some(AlignSelf::CENTER),
+				"end" => style.align_self = Some(AlignSelf::END),
+				"flex_end" => style.align_self = Some(AlignSelf::FLEX_END),
+				"flex_start" => style.align_self = Some(AlignSelf::FLEX_START),
+				"start" => style.align_self = Some(AlignSelf::START),
+				"stretch" => style.align_self = Some(AlignSelf::STRETCH),
 				_ => {
 					ctx.print_invalid_attrib(tag_name, key, value);
 				}
 			},
 			"justify_self" => match value {
-				"center" => style.justify_self = Some(JustifySelf::Center),
-				"end" => style.justify_self = Some(JustifySelf::End),
-				"flex_end" => style.justify_self = Some(JustifySelf::FlexEnd),
-				"flex_start" => style.justify_self = Some(JustifySelf::FlexStart),
-				"start" => style.justify_self = Some(JustifySelf::Start),
-				"stretch" => style.justify_self = Some(JustifySelf::Stretch),
+				"center" => style.justify_self = Some(JustifySelf::CENTER),
+				"end" => style.justify_self = Some(JustifySelf::END),
+				"flex_end" => style.justify_self = Some(JustifySelf::FLEX_END),
+				"flex_start" => style.justify_self = Some(JustifySelf::FLEX_START),
+				"start" => style.justify_self = Some(JustifySelf::START),
+				"stretch" => style.justify_self = Some(JustifySelf::STRETCH),
 				_ => {
 					ctx.print_invalid_attrib(tag_name, key, value);
 				}
 			},
 			"align_items" => match value {
-				"baseline" => style.align_items = Some(AlignItems::Baseline),
-				"center" => style.align_items = Some(AlignItems::Center),
-				"end" => style.align_items = Some(AlignItems::End),
-				"flex_end" => style.align_items = Some(AlignItems::FlexEnd),
-				"flex_start" => style.align_items = Some(AlignItems::FlexStart),
-				"start" => style.align_items = Some(AlignItems::Start),
-				"stretch" => style.align_items = Some(AlignItems::Stretch),
+				"baseline" => style.align_items = Some(AlignItems::BASELINE),
+				"center" => style.align_items = Some(AlignItems::CENTER),
+				"end" => style.align_items = Some(AlignItems::END),
+				"flex_end" => style.align_items = Some(AlignItems::FLEX_END),
+				"flex_start" => style.align_items = Some(AlignItems::FLEX_START),
+				"start" => style.align_items = Some(AlignItems::START),
+				"stretch" => style.align_items = Some(AlignItems::STRETCH),
 				_ => {
 					ctx.print_invalid_attrib(tag_name, key, value);
 				}
 			},
 			"align_content" => match value {
-				"center" => style.align_content = Some(AlignContent::Center),
-				"end" => style.align_content = Some(AlignContent::End),
-				"flex_end" => style.align_content = Some(AlignContent::FlexEnd),
-				"flex_start" => style.align_content = Some(AlignContent::FlexStart),
-				"space_around" => style.align_content = Some(AlignContent::SpaceAround),
-				"space_between" => style.align_content = Some(AlignContent::SpaceBetween),
-				"space_evenly" => style.align_content = Some(AlignContent::SpaceEvenly),
-				"start" => style.align_content = Some(AlignContent::Start),
-				"stretch" => style.align_content = Some(AlignContent::Stretch),
+				"center" => style.align_content = Some(AlignContent::CENTER),
+				"end" => style.align_content = Some(AlignContent::END),
+				"flex_end" => style.align_content = Some(AlignContent::FLEX_END),
+				"flex_start" => style.align_content = Some(AlignContent::FLEX_START),
+				"space_around" => style.align_content = Some(AlignContent::SPACE_AROUND),
+				"space_between" => style.align_content = Some(AlignContent::SPACE_BETWEEN),
+				"space_evenly" => style.align_content = Some(AlignContent::SPACE_EVENLY),
+				"start" => style.align_content = Some(AlignContent::START),
+				"stretch" => style.align_content = Some(AlignContent::STRETCH),
 				_ => {
 					ctx.print_invalid_attrib(tag_name, key, value);
 				}
 			},
 			"justify_content" => match value {
-				"center" => style.justify_content = Some(JustifyContent::Center),
-				"end" => style.justify_content = Some(JustifyContent::End),
-				"flex_end" => style.justify_content = Some(JustifyContent::FlexEnd),
-				"flex_start" => style.justify_content = Some(JustifyContent::FlexStart),
-				"space_around" => style.justify_content = Some(JustifyContent::SpaceAround),
-				"space_between" => style.justify_content = Some(JustifyContent::SpaceBetween),
-				"space_evenly" => style.justify_content = Some(JustifyContent::SpaceEvenly),
-				"start" => style.justify_content = Some(JustifyContent::Start),
-				"stretch" => style.justify_content = Some(JustifyContent::Stretch),
+				"center" => style.justify_content = Some(JustifyContent::CENTER),
+				"end" => style.justify_content = Some(JustifyContent::END),
+				"flex_end" => style.justify_content = Some(JustifyContent::FLEX_END),
+				"flex_start" => style.justify_content = Some(JustifyContent::FLEX_START),
+				"space_around" => style.justify_content = Some(JustifyContent::SPACE_AROUND),
+				"space_between" => style.justify_content = Some(JustifyContent::SPACE_BETWEEN),
+				"space_evenly" => style.justify_content = Some(JustifyContent::SPACE_EVENLY),
+				"start" => style.justify_content = Some(JustifyContent::START),
+				"stretch" => style.justify_content = Some(JustifyContent::STRETCH),
 				_ => {
 					ctx.print_invalid_attrib(tag_name, key, value);
 				}
diff --git a/wgui/src/parser/widget_label.rs b/wgui/src/parser/widget_label.rs
index 4ad72e19..1d7c3b31 100644
--- a/wgui/src/parser/widget_label.rs
+++ b/wgui/src/parser/widget_label.rs
@@ -1,4 +1,5 @@
 use crate::{
+	color::ParentColor,
 	i18n::Translation,
 	layout::WidgetID,
 	parser::{
@@ -19,7 +20,7 @@ pub fn parse_widget_label<'a>(
 	let mut params = WidgetLabelParams::default();
 
 	let style = parse_style(ctx, attribs, tag_name);
-	params.style = parse_text_style(ctx, attribs, tag_name);
+	params.style = parse_text_style(ctx, attribs, tag_name, "");
 
 	for pair in attribs {
 		let (key, value) = (pair.attrib.as_ref(), pair.value.as_ref());
@@ -36,10 +37,11 @@ pub fn parse_widget_label<'a>(
 					params.content = Translation::from_raw_text(value);
 				}
 			}
-			"translation" => {
-				if !value.is_empty() {
-					params.content = Translation::from_translation_key(value);
-				}
+			"translation" if !value.is_empty() => {
+				params.content = Translation::from_translation_key(value);
+			}
+			"parent_color" => {
+				params.parent_color = ParentColor::try_from(value).unwrap_or_default();
 			}
 			_ => {}
 		}
diff --git a/wgui/src/parser/widget_sprite.rs b/wgui/src/parser/widget_sprite.rs
index 15ab6846..0e3eed54 100644
--- a/wgui/src/parser/widget_sprite.rs
+++ b/wgui/src/parser/widget_sprite.rs
@@ -1,15 +1,14 @@
 use crate::{
+	color::ParentColor,
 	layout::WidgetID,
 	parser::{
 		AttribPair, ParserContext, ParserFile, get_asset_path_from_kv, parse_children, parse_widget_universal,
-		style::parse_style,
+		style::{parse_color_opt, parse_style},
 	},
 	renderer_vk::text::custom_glyph::CustomGlyphData,
 	widget::sprite::{WidgetSprite, WidgetSpriteParams},
 };
 
-use super::parse_color_hex;
-
 pub fn parse_widget_sprite<'a>(
 	file: &'a ParserFile,
 	ctx: &mut ParserContext,
@@ -39,11 +38,10 @@ pub fn parse_widget_sprite<'a>(
 				}
 			}
 			"color" => {
-				if let Some(color) = parse_color_hex(value) {
-					params.color = Some(color);
-				} else {
-					ctx.print_invalid_attrib(tag_name, key, value);
-				}
+				parse_color_opt(ctx, tag_name, key, value, &mut params.color);
+			}
+			"parent_color" => {
+				params.parent_color = ParentColor::try_from(value).unwrap_or_default();
 			}
 			_ => {}
 		}
diff --git a/wgui/src/renderer_vk/context.rs b/wgui/src/renderer_vk/context.rs
index 4dd552dc..74be225b 100644
--- a/wgui/src/renderer_vk/context.rs
+++ b/wgui/src/renderer_vk/context.rs
@@ -9,7 +9,7 @@ use crate::{
 	drawing::{self},
 	font_config,
 	gfx::{WGfx, cmd::GfxCommandBuffer},
-	renderer_vk::image::{ImagePipeline, ImageRenderer},
+	renderer_vk::image::{ImagePipeline, ImageRenderer, ImageViewCache},
 };
 
 use super::{
@@ -62,6 +62,7 @@ impl RendererPass<'_> {
 		viewport: &mut Viewport,
 		cmd_buf: &mut GfxCommandBuffer,
 		text_atlas: &mut TextAtlas,
+		image_view_cache: &mut ImageViewCache,
 	) -> anyhow::Result<()> {
 		if self.submitted {
 			return Ok(());
@@ -95,7 +96,9 @@ impl RendererPass<'_> {
 
 		self.submitted = true;
 		self.rect_renderer.render(gfx, viewport, &vk_scissor, cmd_buf)?;
-		self.image_renderer.render(gfx, viewport, &vk_scissor, cmd_buf)?;
+		self
+			.image_renderer
+			.render(gfx, viewport, &vk_scissor, cmd_buf, image_view_cache)?;
 
 		{
 			let mut font_system = font_system.system.lock();
@@ -169,6 +172,7 @@ pub struct Context {
 	pub dirty: bool,
 	pixel_scale: f32,
 	empty_text: Rc<RefCell<Buffer>>,
+	image_cache: ImageViewCache,
 }
 
 pub struct ContextDrawResult {
@@ -187,6 +191,7 @@ impl Context {
 			pixel_scale,
 			dirty: true,
 			empty_text: Rc::new(RefCell::new(Buffer::new_empty(DEFAULT_METRICS))),
+			image_cache: ImageViewCache::new(),
 		})
 	}
 
@@ -242,6 +247,9 @@ impl Context {
 		let mut needs_new_pass = true;
 		let mut cur_scissor: Option<drawing::Boundary> = None;
 
+		// drop unreferenced image views to avoid vram leaks
+		self.image_cache.retain(|_, v| v.content.strong_count() > 0);
+
 		for primitive in primitives {
 			if needs_new_pass {
 				passes.push(RendererPass::new(
@@ -339,6 +347,7 @@ impl Context {
 				&mut self.viewport,
 				cmd_buf,
 				&mut atlas.text_atlas,
+				&mut self.image_cache,
 			)?;
 		}
 
diff --git a/wgui/src/renderer_vk/image.rs b/wgui/src/renderer_vk/image.rs
index bf2aacca..541ede09 100644
--- a/wgui/src/renderer_vk/image.rs
+++ b/wgui/src/renderer_vk/image.rs
@@ -1,10 +1,13 @@
-use std::{collections::HashMap, sync::Arc};
+use std::{
+	collections::HashMap,
+	sync::{Arc, Weak},
+};
 
 use cosmic_text::SubpixelBin;
 use glam::Mat4;
 use smallvec::smallvec;
 use vulkano::{
-	buffer::{BufferContents, BufferUsage, Subbuffer},
+	buffer::{BufferContents, BufferUsage},
 	command_buffer::CommandBufferUsage,
 	format::Format,
 	image::view::ImageView,
@@ -16,12 +19,11 @@ use crate::{
 	gfx::{
 		BLEND_ALPHA, WGfx,
 		cmd::GfxCommandBuffer,
-		pass::WGfxPass,
 		pipeline::{WGfxPipeline, WPipelineCreateInfo},
 	},
 	renderer_vk::{
 		model_buffer::ModelBuffer,
-		text::custom_glyph::{CustomGlyphData, RasterizeCustomGlyphRequest, RasterizedCustomGlyph},
+		text::custom_glyph::{CustomGlyphContent, CustomGlyphData, RasterizeCustomGlyphRequest, RasterizedCustomGlyph},
 	},
 };
 
@@ -65,24 +67,36 @@ impl ImagePipeline {
 	}
 }
 
+pub type ImageViewCache = HashMap<usize, CachedImageView>;
+
+pub struct CachedImageView {
+	pub(super) content: Weak<CustomGlyphContent>,
+	view: Arc<ImageView>,
+	res: [u32; 2],
+}
+
 struct ImageVertexWithContent {
 	vert: ImageVertex,
 	content: CustomGlyphData,
-	content_key: usize, // identifies an image tag.
+	skip_cache: bool,
 }
 
-struct CachedPass {
+struct PendingImageUpload {
 	content_id: usize,
-	vert_buffer: Subbuffer<[ImageVertex]>,
-	inner: WGfxPass<ImageVertex>,
-	res: [u32; 2],
+	content: Weak<CustomGlyphContent>,
+	raster: RasterizedCustomGlyph,
+}
+
+enum ImageViewSource {
+	Ready(Arc<ImageView>),
+	PendingUpload(usize),
+	Missing,
 }
 
 pub struct ImageRenderer {
 	pipeline: ImagePipeline,
 	image_verts: Vec<ImageVertexWithContent>,
 	model_buffer: ModelBuffer,
-	cached_passes: HashMap<usize, CachedPass>,
 }
 
 impl ImageRenderer {
@@ -91,15 +105,9 @@ impl ImageRenderer {
 			model_buffer: ModelBuffer::new(&pipeline.gfx)?,
 			pipeline,
 			image_verts: vec![],
-			cached_passes: HashMap::new(),
 		})
 	}
 
-	pub fn begin(&mut self) {
-		self.image_verts.clear();
-		self.model_buffer.begin();
-	}
-
 	pub fn add_image(&mut self, boundary: Boundary, image: ImagePrimitive, transform: &Mat4) {
 		let in_model_idx = self
 			.model_buffer
@@ -118,15 +126,11 @@ impl ImageRenderer {
 				],
 			},
 			content: image.content,
-			content_key: image.content_key,
+			skip_cache: image.skip_cache,
 		});
 	}
 
-	fn upload_image(
-		gfx: &Arc<WGfx>,
-		res: [u32; 2],
-		img: &ImageVertexWithContent,
-	) -> anyhow::Result<Option<Arc<ImageView>>> {
+	fn rasterize_image(res: [u32; 2], img: &ImageVertexWithContent) -> Option<RasterizedCustomGlyph> {
 		let Some(raster) = RasterizedCustomGlyph::try_from(&RasterizeCustomGlyphRequest {
 			data: img.content.clone(),
 			width: res[0] as _,
@@ -136,21 +140,10 @@ impl ImageRenderer {
 			scale: 1.0, // unused
 		}) else {
 			log::error!("Unable to rasterize custom image");
-			return Ok(None);
+			return None;
 		};
-		let mut cmd_buf = gfx.create_xfer_command_buffer(CommandBufferUsage::OneTimeSubmit)?;
 
-		let image = cmd_buf.upload_image(
-			raster.width.into(),
-			raster.height.into(),
-			Format::R8G8B8A8_UNORM,
-			&raster.data,
-		)?;
-		let image_view = ImageView::new_default(image)?;
-
-		cmd_buf.build_and_execute_now()?;
-
-		Ok(Some(image_view))
+		Some(raster)
 	}
 
 	pub fn render(
@@ -159,65 +152,122 @@ impl ImageRenderer {
 		viewport: &mut Viewport,
 		vk_scissor: &graphics::viewport::Scissor,
 		cmd_buf: &mut GfxCommandBuffer,
+		image_view_cache: &mut ImageViewCache,
 	) -> anyhow::Result<()> {
 		let res = viewport.resolution();
 		self.model_buffer.upload(gfx)?;
 
+		let mut pending_upload_by_key = HashMap::<usize, usize>::new();
+		let mut pending_uploads = Vec::<PendingImageUpload>::new();
+		let mut image_sources = Vec::<ImageViewSource>::with_capacity(self.image_verts.len());
+
+		// decide which images need to be rasterized and uploaded
 		for img in &self.image_verts {
-			let pass = if let Some(x) = self.cached_passes.get_mut(&img.content_key) {
-				if x.content_id != img.content.id || x.res != res {
-					// image changed
-					let Some(image_view) = Self::upload_image(&self.pipeline.gfx, res, img)? else {
-						continue;
-					};
+			if let Some(upload_idx) = pending_upload_by_key.get(&img.content.id) {
+				image_sources.push(ImageViewSource::PendingUpload(*upload_idx));
+				continue;
+			}
 
-					x.inner
-						.update_sampler(2, image_view, self.pipeline.gfx.texture_filter)?;
-				}
+			if let Some(cached) = image_view_cache.get(&img.content.id)
+				&& !img.skip_cache
+				&& cached.res == res
+			{
+				image_sources.push(ImageViewSource::Ready(cached.view.clone()));
+				continue;
+			}
 
-				x
-			} else {
-				let vert_buffer = self.pipeline.gfx.empty_buffer(
-					BufferUsage::VERTEX_BUFFER | BufferUsage::TRANSFER_DST,
-					(std::mem::size_of::<ImageVertex>()) as _,
+			let Some(raster) = Self::rasterize_image(res, img) else {
+				image_sources.push(ImageViewSource::Missing);
+				continue;
+			};
+
+			let upload_idx = pending_uploads.len();
+			pending_uploads.push(PendingImageUpload {
+				content: Arc::downgrade(&img.content.content),
+				content_id: img.content.id,
+				raster,
+			});
+			pending_upload_by_key.insert(img.content.id, upload_idx);
+			image_sources.push(ImageViewSource::PendingUpload(upload_idx));
+		}
+
+		// upload every missing/stale image using one transfer command buffer
+		let mut uploaded_image_views = vec![None; pending_uploads.len()];
+
+		if !pending_uploads.is_empty() {
+			let mut xfer_cmd_buf = gfx.create_xfer_command_buffer(CommandBufferUsage::OneTimeSubmit)?;
+
+			for (upload_idx, upload) in pending_uploads.iter().enumerate() {
+				log::trace!("Uploading image {}", upload.content_id);
+				let image = xfer_cmd_buf.upload_image(
+					upload.raster.width.into(),
+					upload.raster.height.into(),
+					Format::R8G8B8A8_UNORM,
+					&upload.raster.data,
 				)?;
+				uploaded_image_views[upload_idx] = Some(ImageView::new_default(image)?);
+			}
 
-				let Some(image_view) = Self::upload_image(&self.pipeline.gfx, res, img)? else {
+			xfer_cmd_buf.build_and_execute_now()?;
+
+			for (upload_idx, upload) in pending_uploads.iter().enumerate() {
+				let Some(image_view) = uploaded_image_views[upload_idx].as_ref() else {
 					continue;
 				};
 
-				let set0 = viewport.get_image_descriptor(&self.pipeline);
-				let set1 = self.model_buffer.get_image_descriptor(&self.pipeline);
-				let set2 = self
-					.pipeline
-					.inner
-					.uniform_sampler(2, image_view, self.pipeline.gfx.texture_filter)?;
-
-				let pass = self.pipeline.inner.create_pass(
-					[res[0] as _, res[1] as _],
-					[0.0, 0.0],
-					vert_buffer.clone(),
-					0..4,
-					0..1,
-					vec![set0, set1, set2],
-					vk_scissor,
-				)?;
-
-				self.cached_passes.insert(
-					img.content_key,
-					CachedPass {
-						content_id: img.content.id,
-						vert_buffer,
-						inner: pass,
+				image_view_cache.insert(
+					upload.content_id,
+					CachedImageView {
+						content: upload.content.clone(),
+						view: image_view.clone(),
 						res,
 					},
 				);
-				self.cached_passes.get_mut(&img.content_key).unwrap()
+			}
+		}
+
+		// run the rendering work
+		for (img, image_source) in self.image_verts.iter().zip(image_sources.iter()) {
+			let image_view = match image_source {
+				ImageViewSource::Ready(image_view) => image_view.clone(),
+				ImageViewSource::PendingUpload(upload_idx, ..) => {
+					let Some(image_view) = uploaded_image_views
+						.get(*upload_idx)
+						.and_then(|image_view| image_view.as_ref())
+					else {
+						continue;
+					};
+
+					image_view.clone()
+				}
+				ImageViewSource::Missing => continue,
 			};
 
-			pass.vert_buffer.write()?[0..1].clone_from_slice(&[img.vert]);
+			let vert_buffer = self.pipeline.gfx.empty_buffer(
+				BufferUsage::VERTEX_BUFFER | BufferUsage::TRANSFER_DST,
+				(std::mem::size_of::<ImageVertex>()) as _,
+			)?;
 
-			cmd_buf.run_ref(&pass.inner)?;
+			let set0 = viewport.get_image_descriptor(&self.pipeline);
+			let set1 = self.model_buffer.get_image_descriptor(&self.pipeline);
+			let set2 = self
+				.pipeline
+				.inner
+				.uniform_sampler(2, image_view, self.pipeline.gfx.texture_filter)?;
+
+			let pass = self.pipeline.inner.create_pass(
+				[res[0] as _, res[1] as _],
+				[0.0, 0.0],
+				vert_buffer.clone(),
+				0..4,
+				0..1,
+				vec![set0, set1, set2],
+				vk_scissor,
+			)?;
+
+			vert_buffer.write()?[0..1].clone_from_slice(&[img.vert]);
+
+			cmd_buf.run_ref(&pass)?;
 		}
 
 		Ok(())
diff --git a/wgui/src/renderer_vk/rect.rs b/wgui/src/renderer_vk/rect.rs
index 4047d65d..c197e734 100644
--- a/wgui/src/renderer_vk/rect.rs
+++ b/wgui/src/renderer_vk/rect.rs
@@ -12,7 +12,6 @@ use crate::{
 	gfx::{
 		BLEND_ALPHA, WGfx,
 		cmd::GfxCommandBuffer,
-		pass::WGfxPass,
 		pipeline::{WGfxPipeline, WPipelineCreateInfo},
 	},
 	renderer_vk::model_buffer::ModelBuffer,
@@ -59,18 +58,12 @@ impl RectPipeline {
 	}
 }
 
-struct CachedPass {
-	pass: WGfxPass<RectVertex>,
-	res: [u32; 2],
-}
-
 pub struct RectRenderer {
 	pipeline: RectPipeline,
 	rect_vertices: Vec<RectVertex>,
 	vert_buffer: Subbuffer<[RectVertex]>,
 	vert_buffer_len: usize,
 	model_buffer: ModelBuffer,
-	pass: Option<CachedPass>,
 }
 
 impl RectRenderer {
@@ -88,15 +81,9 @@ impl RectRenderer {
 			rect_vertices: vec![],
 			vert_buffer,
 			vert_buffer_len: BUFFER_SIZE,
-			pass: None,
 		})
 	}
 
-	pub fn begin(&mut self) {
-		self.rect_vertices.clear();
-		self.model_buffer.begin();
-	}
-
 	pub fn add_rect(&mut self, boundary: Boundary, rectangle: Rectangle, transform: &Mat4) {
 		let in_model_idx = self
 			.model_buffer
@@ -144,27 +131,20 @@ impl RectRenderer {
 		self.model_buffer.upload(gfx)?;
 		self.upload_verts()?;
 
-		let cache = match self.pass.take() {
-			Some(p) if p.res == res => p,
-			_ => {
-				let set0 = viewport.get_rect_descriptor(&self.pipeline);
-				let set1 = self.model_buffer.get_rect_descriptor(&self.pipeline);
-				let pass = self.pipeline.color_rect.create_pass(
-					[res[0] as _, res[1] as _],
-					[0.0, 0.0],
-					self.vert_buffer.clone(),
-					0..4,
-					0..self.rect_vertices.len() as _,
-					vec![set0, set1],
-					vk_scissor,
-				)?;
-				CachedPass { pass, res }
-			}
-		};
+		let set0 = viewport.get_rect_descriptor(&self.pipeline);
+		let set1 = self.model_buffer.get_rect_descriptor(&self.pipeline);
+		let pass = self.pipeline.color_rect.create_pass(
+			[res[0] as _, res[1] as _],
+			[0.0, 0.0],
+			self.vert_buffer.clone(),
+			0..4,
+			0..self.rect_vertices.len() as _,
+			vec![set0, set1],
+			vk_scissor,
+		)?;
 
 		self.rect_vertices.clear();
-		cmd_buf.run_ref(&cache.pass)?;
-		self.pass = Some(cache);
+		cmd_buf.run_ref(&pass)?;
 		Ok(())
 	}
 }
diff --git a/wgui/src/renderer_vk/text/custom_glyph.rs b/wgui/src/renderer_vk/text/custom_glyph.rs
index 7bcdcd7a..10237969 100644
--- a/wgui/src/renderer_vk/text/custom_glyph.rs
+++ b/wgui/src/renderer_vk/text/custom_glyph.rs
@@ -163,6 +163,7 @@ impl CustomGlyphData {
 			Ok(data) => Ok(data),
 			Err(hashed_asset) => {
 				let data = Self::new(CustomGlyphContent::from_bin_raster(data)?);
+				log::trace!("Caching {path} with content_id {}", data.id);
 				globals_borrow.custom_glyph_cache.insert(hashed_asset, &data);
 				Ok(data)
 			}
diff --git a/wgui/src/renderer_vk/text/mod.rs b/wgui/src/renderer_vk/text/mod.rs
index 991f2244..4366026c 100644
--- a/wgui/src/renderer_vk/text/mod.rs
+++ b/wgui/src/renderer_vk/text/mod.rs
@@ -11,7 +11,11 @@ use etagere::AllocId;
 use glam::Mat4;
 use parking_lot::Mutex;
 
-use crate::drawing::{self};
+use crate::{
+	color::{WguiColor, WguiColorName},
+	drawing::{self},
+	palette::WguiColorPalette,
+};
 
 pub static SWASH_CACHE: LazyLock<Mutex<SwashCache>> = LazyLock::new(|| Mutex::new(SwashCache::new()));
 
@@ -41,24 +45,51 @@ impl Default for TextShadow {
 	}
 }
 
+#[derive(Debug, Clone)]
+pub struct WguiTextShadow {
+	pub y: f32,
+	pub x: f32,
+	pub color: WguiColor,
+}
+
+impl WguiTextShadow {
+	pub fn to_text_shadow(&self, palette: &WguiColorPalette) -> TextShadow {
+		TextShadow {
+			x: self.x,
+			y: self.y,
+			color: self.color.resolve(palette),
+		}
+	}
+}
+
 #[derive(Debug, Default, Clone)]
 pub struct TextStyle {
 	pub size: Option<f32>,
 	pub line_height: Option<f32>,
-	pub color: Option<drawing::Color>,
+	pub color: Option<WguiColor>,
 	pub style: Option<FontStyle>,
 	pub weight: Option<FontWeight>,
 	pub align: Option<HorizontalAlign>,
 	pub wrap: bool,
-	pub shadow: Option<TextShadow>,
+	pub shadow: Option<WguiTextShadow>,
 }
 
-impl From<&TextStyle> for Attrs<'_> {
-	fn from(style: &TextStyle) -> Self {
+impl Default for WguiTextShadow {
+	fn default() -> Self {
+		Self {
+			y: 1.5,
+			x: 1.5,
+			color: WguiColorName::Shadow.into(),
+		}
+	}
+}
+
+impl TextStyle {
+	pub fn to_attrs(&self, palette: &WguiColorPalette) -> Attrs<'_> {
 		Attrs::new()
-			.color(style.color.unwrap_or_default().into())
-			.style(style.style.unwrap_or_default().into())
-			.weight(style.weight.unwrap_or_default().into())
+			.color(self.color.unwrap_or_default().resolve(palette).into())
+			.style(self.style.unwrap_or_default().into())
+			.weight(self.weight.unwrap_or_default().into())
 	}
 }
 
diff --git a/wgui/src/renderer_vk/text/text_renderer.rs b/wgui/src/renderer_vk/text/text_renderer.rs
index a02d7e49..74fa1df7 100644
--- a/wgui/src/renderer_vk/text/text_renderer.rs
+++ b/wgui/src/renderer_vk/text/text_renderer.rs
@@ -1,5 +1,5 @@
 use crate::{
-	gfx::{cmd::GfxCommandBuffer, pass::WGfxPass},
+	gfx::cmd::GfxCommandBuffer,
 	renderer_vk::{model_buffer::ModelBuffer, text::text_atlas::TEXT_ATLAS_ISLAND_PADDING_PX, viewport::Viewport},
 };
 
@@ -9,19 +9,16 @@ use super::{
 	text_atlas::{GlyphVertex, TextAtlas, TextPipeline},
 };
 use cosmic_text::{Color, SubpixelBin, SwashContent};
-use etagere::size2;
+use etagere::{AllocId, size2};
 use glam::{Mat4, Vec2, Vec3};
+use std::collections::HashSet;
+
 use vulkano::{
 	buffer::{BufferUsage, Subbuffer},
 	command_buffer::CommandBufferUsage,
 	pipeline::graphics,
 };
 
-struct CachedPass {
-	pass: WGfxPass<GlyphVertex>,
-	res: [u32; 2],
-}
-
 /// A text renderer that uses cached glyphs to render text into an existing render pass.
 pub struct TextRenderer {
 	pipeline: TextPipeline,
@@ -29,7 +26,6 @@ pub struct TextRenderer {
 	vertex_buffer_capacity: usize,
 	glyph_vertices: Vec<GlyphVertex>,
 	model_buffer: ModelBuffer,
-	pass: Option<CachedPass>,
 }
 
 impl TextRenderer {
@@ -49,7 +45,6 @@ impl TextRenderer {
 			vertex_buffer,
 			vertex_buffer_capacity: INITIAL_CAPACITY,
 			glyph_vertices: Vec::new(),
-			pass: None,
 		})
 	}
 
@@ -65,6 +60,8 @@ impl TextRenderer {
 		self.glyph_vertices.clear();
 
 		let resolution = viewport.resolution();
+		let mut glyphs_to_render = Vec::new();
+		let mut glyphs_todo = GlyphsTodo::default();
 
 		for text_area in text_areas {
 			let bounds_min_x = text_area.bounds.left.max(0);
@@ -101,25 +98,13 @@ impl TextRenderer {
 					.or(glyph.color)
 					.unwrap_or(text_area.default_color);
 
-				if let Some(glyph_to_render) = prepare_glyph(
-					&mut PrepareGlyphParams {
-						label_pos: Vec2::new(text_area.left, text_area.top),
-						x,
-						y,
-						line_y: 0.0,
-						color,
-						cache_key,
+				if queue_missing_glyph_upload(
+					&mut QueueMissingGlyphUploadParams {
 						atlas,
-						cache,
 						font_system,
-						model_buffer: &mut self.model_buffer,
-						scale_factor: text_area.scale,
-						glyph_scale: f32::from(width) / f32::from(cached_width),
-						bounds_min_x,
-						bounds_min_y,
-						bounds_max_x,
-						bounds_max_y,
-						transform: &text_area.transform,
+						cache,
+						cache_key,
+						glyphs_todo: &mut glyphs_todo,
 					},
 					|_cache, _font_system| -> Option<GetGlyphImageResult> {
 						if cached_width == 0 || cached_height == 0 {
@@ -148,8 +133,22 @@ impl TextRenderer {
 							data: output.data,
 						})
 					},
-				)? {
-					self.glyph_vertices.push(glyph_to_render);
+				) {
+					glyphs_to_render.push(QueuedGlyph {
+						label_pos: Vec2::new(text_area.left, text_area.top),
+						x,
+						y,
+						line_y: 0.0,
+						color,
+						cache_key,
+						transform: text_area.transform,
+						scale_factor: text_area.scale,
+						glyph_scale: f32::from(width) / f32::from(cached_width),
+						bounds_min_x,
+						bounds_min_y,
+						bounds_max_x,
+						bounds_max_y,
+					});
 				}
 			}
 
@@ -160,6 +159,14 @@ impl TextRenderer {
 				start_y_physical <= text_area.bounds.bottom && text_area.bounds.top <= end_y_physical
 			};
 
+			// ensure layout is up to date before reading
+			// `set_size()` in draw() sets dirty flags but doesn't trigger shape_until_scroll
+			// without this, layout_runs() on &Buffer returns stale layouts
+			{
+				let mut buf = text_area.buffer.borrow_mut();
+				buf.shape_until_scroll(font_system, false);
+			}
+
 			let buffer = text_area.buffer.borrow();
 
 			let layout_runs = buffer
@@ -176,25 +183,15 @@ impl TextRenderer {
 						.or(glyph.color_opt)
 						.unwrap_or(text_area.default_color);
 
-					if let Some(glyph_to_render) = prepare_glyph(
-						&mut PrepareGlyphParams {
-							label_pos: Vec2::new(text_area.left, text_area.top),
-							x: physical_glyph.x,
-							y: physical_glyph.y,
-							line_y: run.line_y,
-							color,
-							cache_key: GlyphonCacheKey::Text(physical_glyph.cache_key),
+					let cache_key = GlyphonCacheKey::Text(physical_glyph.cache_key);
+
+					if queue_missing_glyph_upload(
+						&mut QueueMissingGlyphUploadParams {
 							atlas,
-							cache,
 							font_system,
-							model_buffer: &mut self.model_buffer,
-							glyph_scale: 1.0,
-							scale_factor: text_area.scale,
-							bounds_min_x,
-							bounds_min_y,
-							bounds_max_x,
-							bounds_max_y,
-							transform: &text_area.transform,
+							cache,
+							cache_key,
+							glyphs_todo: &mut glyphs_todo,
 						},
 						|cache, font_system| -> Option<GetGlyphImageResult> {
 							let image = cache.get_image_uncached(font_system, physical_glyph.cache_key)?;
@@ -217,13 +214,39 @@ impl TextRenderer {
 								data: image.data,
 							})
 						},
-					)? {
-						self.glyph_vertices.push(glyph_to_render);
+					) {
+						glyphs_to_render.push(QueuedGlyph {
+							label_pos: Vec2::new(text_area.left, text_area.top),
+							x: physical_glyph.x,
+							y: physical_glyph.y,
+							line_y: run.line_y,
+							color,
+							cache_key,
+							transform: text_area.transform,
+							glyph_scale: 1.0,
+							scale_factor: text_area.scale,
+							bounds_min_x,
+							bounds_min_y,
+							bounds_max_x,
+							bounds_max_y,
+						});
 					}
 				}
 			}
 		}
 
+		upload_missing_glyphs(atlas, font_system, cache, glyphs_todo.pending_uploads)?;
+
+		for glyph in &glyphs_to_render {
+			if let Some(glyph_to_render) = prepare_glyph(&mut PrepareGlyphParams {
+				glyph,
+				atlas,
+				model_buffer: &mut self.model_buffer,
+			}) {
+				self.glyph_vertices.push(glyph_to_render);
+			}
+		}
+
 		let will_render = !self.glyph_vertices.is_empty();
 		if !will_render {
 			return Ok(());
@@ -259,31 +282,24 @@ impl TextRenderer {
 		let res = viewport.resolution();
 		self.model_buffer.upload(&atlas.common.gfx)?;
 
-		let cache = match self.pass.take() {
-			Some(p) if p.res == res => p,
-			_ => {
-				let descriptor_sets = vec![
-					atlas.color_atlas.image_descriptor.clone(),
-					atlas.mask_atlas.image_descriptor.clone(),
-					viewport.get_text_descriptor(&self.pipeline),
-					self.model_buffer.get_text_descriptor(&self.pipeline),
-				];
+		let descriptor_sets = vec![
+			atlas.color_atlas.image_descriptor.clone(),
+			atlas.mask_atlas.image_descriptor.clone(),
+			viewport.get_text_descriptor(&self.pipeline),
+			self.model_buffer.get_text_descriptor(&self.pipeline),
+		];
 
-				let pass = self.pipeline.inner.create_pass(
-					[res[0] as _, res[1] as _],
-					[0.0, 0.0],
-					self.vertex_buffer.clone(),
-					0..4,
-					0..self.glyph_vertices.len() as u32,
-					descriptor_sets,
-					vk_scissor,
-				)?;
-				CachedPass { pass, res }
-			}
-		};
+		let pass = self.pipeline.inner.create_pass(
+			[res[0] as _, res[1] as _],
+			[0.0, 0.0],
+			self.vertex_buffer.clone(),
+			0..4,
+			0..self.glyph_vertices.len() as u32,
+			descriptor_sets,
+			vk_scissor,
+		)?;
 
-		cmd_buf.run_ref(&cache.pass)?;
-		self.pass = Some(cache);
+		cmd_buf.run_ref(&pass)?;
 		Ok(())
 	}
 }
@@ -303,18 +319,28 @@ struct GetGlyphImageResult {
 	data: Vec<u8>,
 }
 
-struct PrepareGlyphParams<'a> {
+struct PendingGlyphUpload {
+	cache_key: GlyphonCacheKey,
+	image: GetGlyphImageResult,
+}
+
+struct AtlasGlyphUpload {
+	upload_index: usize,
+	atlas_id: AllocId,
+	atlas_with_island_min: [u32; 2],
+	size_with_island: [u32; 2],
+	size_with_island_area: usize,
+	atlas_glyph_min: [u32; 2],
+}
+
+struct QueuedGlyph {
 	label_pos: Vec2,
 	x: i32,
 	y: i32,
 	line_y: f32,
 	color: Color,
 	cache_key: GlyphonCacheKey,
-	atlas: &'a mut TextAtlas,
-	cache: &'a mut SwashCache,
-	font_system: &'a mut FontSystem,
-	model_buffer: &'a mut ModelBuffer,
-	transform: &'a Mat4,
+	transform: Mat4,
 	scale_factor: f32,
 	glyph_scale: f32,
 	bounds_min_x: i32,
@@ -323,102 +349,220 @@ struct PrepareGlyphParams<'a> {
 	bounds_max_y: i32,
 }
 
-fn prepare_glyph(
-	par: &mut PrepareGlyphParams,
+struct PrepareGlyphParams<'a> {
+	glyph: &'a QueuedGlyph,
+	atlas: &'a mut TextAtlas,
+	model_buffer: &'a mut ModelBuffer,
+}
+
+#[derive(Default)]
+struct GlyphsTodo {
+	pending_uploads: Vec<PendingGlyphUpload>,
+	missing: HashSet<GlyphonCacheKey>,
+	unavailable: HashSet<GlyphonCacheKey>,
+}
+
+struct QueueMissingGlyphUploadParams<'a> {
+	atlas: &'a mut TextAtlas,
+	font_system: &'a mut FontSystem,
+	cache: &'a mut SwashCache,
+	cache_key: GlyphonCacheKey,
+	glyphs_todo: &'a mut GlyphsTodo,
+}
+
+fn queue_missing_glyph_upload(
+	par: &mut QueueMissingGlyphUploadParams,
 	get_glyph_image: impl FnOnce(&mut SwashCache, &mut FontSystem) -> Option<GetGlyphImageResult>,
-) -> anyhow::Result<Option<GlyphVertex>> {
-	let gfx = par.atlas.common.gfx.clone();
-	let details = if let Some(details) = par.atlas.mask_atlas.glyph_cache.get(&par.cache_key) {
-		par.atlas.mask_atlas.glyphs_in_use.insert(par.cache_key);
-		details
-	} else if let Some(details) = par.atlas.color_atlas.glyph_cache.get(&par.cache_key) {
-		par.atlas.color_atlas.glyphs_in_use.insert(par.cache_key);
-		details
-	} else {
-		let Some(image) = (get_glyph_image)(par.cache, par.font_system) else {
-			return Ok(None);
+) -> bool {
+	if mark_glyph_in_use_if_cached(par.atlas, par.cache_key) {
+		return true;
+	}
+
+	if par.glyphs_todo.unavailable.contains(&par.cache_key) {
+		return false;
+	}
+
+	if par.glyphs_todo.missing.insert(par.cache_key) {
+		let Some(image) = get_glyph_image(par.cache, par.font_system) else {
+			par.glyphs_todo.unavailable.insert(par.cache_key);
+			return false;
 		};
 
-		let should_rasterize = image.width > 0 && image.height > 0;
+		par.glyphs_todo.pending_uploads.push(PendingGlyphUpload {
+			cache_key: par.cache_key,
+			image,
+		});
+	}
 
-		let (gpu_cache, atlas_id, inner) = if should_rasterize {
-			let mut inner = par.atlas.inner_for_content_mut(image.content_type);
+	true
+}
 
-			// Find a position in the packer
-			let allocation = loop {
-				if let Some(a) = inner.try_allocate(image.width as usize, image.height as usize) {
-					break a;
-				}
-				if !par.atlas.grow(par.font_system, par.cache, image.content_type)? {
-					anyhow::bail!(
-						"Atlas full. atlas: {:?} cache_key: {:?}",
-						image.content_type,
-						par.cache_key
-					);
-				}
+fn mark_glyph_in_use_if_cached(atlas: &mut TextAtlas, cache_key: GlyphonCacheKey) -> bool {
+	if atlas.mask_atlas.glyph_cache.get(&cache_key).is_some() {
+		atlas.mask_atlas.glyphs_in_use.insert(cache_key);
+		true
+	} else if atlas.color_atlas.glyph_cache.get(&cache_key).is_some() {
+		atlas.color_atlas.glyphs_in_use.insert(cache_key);
+		true
+	} else {
+		false
+	}
+}
 
-				inner = par.atlas.inner_for_content_mut(image.content_type);
-			};
+fn upload_missing_glyphs(
+	atlas: &mut TextAtlas,
+	font_system: &mut FontSystem,
+	cache: &mut SwashCache,
+	pending_glyph_uploads: Vec<PendingGlyphUpload>,
+) -> anyhow::Result<()> {
+	if pending_glyph_uploads.is_empty() {
+		return Ok(());
+	}
 
-			let atlas_with_island_min = allocation.rectangle.min;
-			let size_with_island = allocation.rectangle.size();
-			let atlas_glyph_min =
-				allocation.rectangle.min + size2(TEXT_ATLAS_ISLAND_PADDING_PX as i32, TEXT_ATLAS_ISLAND_PADDING_PX as i32);
+	let gfx = atlas.common.gfx.clone();
+	let mut rasterized_uploads = Vec::new();
+	let mut skipped_uploads = Vec::new();
 
-			let mut cmd_buf = gfx.create_xfer_command_buffer(CommandBufferUsage::OneTimeSubmit)?;
+	for upload in pending_glyph_uploads {
+		if upload.image.width > 0 && upload.image.height > 0 {
+			rasterized_uploads.push(upload);
+		} else {
+			skipped_uploads.push(upload);
+		}
+	}
 
-			// Set data to zeros for the whole glyph island
-			// TODO: use `vkCmdClearColorImage` with an image subresource (or xywh region?) to omit unnecessary allocation
-			let zero_bytes_data: Vec<u8> = vec![0x00; size_with_island.area() as usize * 4 /* RGBX */];
+	let mut atlas_uploads = Vec::new();
+
+	if !rasterized_uploads.is_empty() {
+		'allocate_all: loop {
+			atlas_uploads.clear();
+
+			for (upload_index, upload) in rasterized_uploads.iter().enumerate() {
+				let content_type = upload.image.content_type;
+
+				#[allow(clippy::never_loop)]
+				let allocation = loop {
+					if let Some(allocation) = {
+						let inner = atlas.inner_for_content_mut(content_type);
+						inner.try_allocate(upload.image.width as usize, upload.image.height as usize)
+					} {
+						break allocation;
+					}
+
+					if !atlas.grow(font_system, cache, content_type)? {
+						anyhow::bail!(
+							"Atlas full. atlas: {:?} cache_key: {:?}",
+							content_type,
+							upload.cache_key
+						);
+					}
+
+					// `grow` can rebuild the atlas allocator and move existing glyphs. Any
+					// allocations made for this batch before the grow are provisional, so
+					// discard them and recompute the batch offsets against the new atlas.
+					continue 'allocate_all;
+				};
+
+				let atlas_with_island_min = allocation.rectangle.min;
+				let size_with_island = allocation.rectangle.size();
+				let atlas_glyph_min =
+					allocation.rectangle.min + size2(TEXT_ATLAS_ISLAND_PADDING_PX as i32, TEXT_ATLAS_ISLAND_PADDING_PX as i32);
+
+				atlas_uploads.push(AtlasGlyphUpload {
+					upload_index,
+					atlas_id: allocation.id,
+					atlas_with_island_min: [atlas_with_island_min.x as u32, atlas_with_island_min.y as u32],
+					size_with_island: [size_with_island.width as u32, size_with_island.height as u32],
+					size_with_island_area: size_with_island.area() as usize,
+					atlas_glyph_min: [atlas_glyph_min.x as u32, atlas_glyph_min.y as u32],
+				});
+			}
+
+			break;
+		}
+
+		let mut cmd_buf = gfx.create_xfer_command_buffer(CommandBufferUsage::OneTimeSubmit)?;
+
+		for upload in &atlas_uploads {
+			let rasterized = &rasterized_uploads[upload.upload_index];
+			let inner = atlas.inner_for_content_mut(rasterized.image.content_type);
+
+			// Set data to zeros for the whole glyph island.
+			// TODO: use `vkCmdClearColorImage` with an image subresource (or xywh region?) to omit unnecessary allocation.
+			let zero_bytes_data: Vec<u8> = vec![0x00; upload.size_with_island_area * 4 /* RGBX */];
 			cmd_buf.update_image(
 				inner.image_view.image(),
 				&zero_bytes_data,
-				[atlas_with_island_min.x as u32, atlas_with_island_min.y as u32, 0],
-				Some([size_with_island.width as u32, size_with_island.height as u32, 1]),
+				[upload.atlas_with_island_min[0], upload.atlas_with_island_min[1], 0],
+				Some([upload.size_with_island[0], upload.size_with_island[1], 1]),
 			)?;
 
-			// Upload glyph itself
+			// Upload glyph itself.
 			cmd_buf.update_image(
 				inner.image_view.image(),
-				&image.data,
-				[atlas_glyph_min.x as u32, atlas_glyph_min.y as u32, 0],
-				Some([image.width.into(), image.height.into(), 1]),
+				&rasterized.image.data,
+				[upload.atlas_glyph_min[0], upload.atlas_glyph_min[1], 0],
+				Some([rasterized.image.width.into(), rasterized.image.height.into(), 1]),
 			)?;
+		}
 
-			cmd_buf.build_and_execute_now()?; //TODO: do not wait for fence here
+		cmd_buf.build_and_execute_now()?;
+	}
 
-			(
-				GpuCacheStatus::InAtlas {
-					x: atlas_glyph_min.x as u16,
-					y: atlas_glyph_min.y as u16,
-					content_type: image.content_type,
-				},
-				Some(allocation.id),
-				inner,
-			)
-		} else {
-			let inner = &mut par.atlas.color_atlas;
-			(GpuCacheStatus::SkipRasterization, None, inner)
-		};
+	for upload in atlas_uploads {
+		let rasterized = &rasterized_uploads[upload.upload_index];
+		let inner = atlas.inner_for_content_mut(rasterized.image.content_type);
 
-		inner.glyphs_in_use.insert(par.cache_key);
-		// Insert the glyph into the cache and return the details reference
-		inner.glyph_cache.get_or_insert(par.cache_key, || GlyphDetails {
-			width: image.width,
-			height: image.height,
-			gpu_cache,
-			atlas_id,
-			top: image.top,
-			left: image.left,
-		})
+		inner.glyphs_in_use.insert(rasterized.cache_key);
+		let _ = inner.glyph_cache.get_or_insert(rasterized.cache_key, || GlyphDetails {
+			width: rasterized.image.width,
+			height: rasterized.image.height,
+			gpu_cache: GpuCacheStatus::InAtlas {
+				x: upload.atlas_glyph_min[0] as u16,
+				y: upload.atlas_glyph_min[1] as u16,
+				content_type: rasterized.image.content_type,
+			},
+			atlas_id: Some(upload.atlas_id),
+			top: rasterized.image.top,
+			left: rasterized.image.left,
+		});
+	}
+
+	for upload in skipped_uploads {
+		let inner = &mut atlas.color_atlas;
+
+		inner.glyphs_in_use.insert(upload.cache_key);
+		let _ = inner.glyph_cache.get_or_insert(upload.cache_key, || GlyphDetails {
+			width: upload.image.width,
+			height: upload.image.height,
+			gpu_cache: GpuCacheStatus::SkipRasterization,
+			atlas_id: None,
+			top: upload.image.top,
+			left: upload.image.left,
+		});
+	}
+
+	Ok(())
+}
+
+fn prepare_glyph(par: &mut PrepareGlyphParams) -> Option<GlyphVertex> {
+	let glyph = par.glyph;
+	let details = if let Some(details) = par.atlas.mask_atlas.glyph_cache.get(&glyph.cache_key) {
+		par.atlas.mask_atlas.glyphs_in_use.insert(glyph.cache_key);
+		details
+	} else if let Some(details) = par.atlas.color_atlas.glyph_cache.get(&glyph.cache_key) {
+		par.atlas.color_atlas.glyphs_in_use.insert(glyph.cache_key);
+		details
+	} else {
+		return None;
 	};
 
-	let mut x = par.x + i32::from(details.left);
-	let mut y = (par.line_y * par.scale_factor).round() as i32 + par.y - i32::from(details.top);
+	let mut x = glyph.x + i32::from(details.left);
+	let mut y = (glyph.line_y * glyph.scale_factor).round() as i32 + glyph.y - i32::from(details.top);
 
 	let (mut atlas_x, mut atlas_y, content_type) = match details.gpu_cache {
 		GpuCacheStatus::InAtlas { x, y, content_type } => (x, y, content_type),
-		GpuCacheStatus::SkipRasterization => return Ok(None),
+		GpuCacheStatus::SkipRasterization => return None,
 	};
 
 	let mut glyph_width = i32::from(details.width);
@@ -426,79 +570,79 @@ fn prepare_glyph(
 
 	// Starts beyond right edge or ends beyond left edge
 	let max_x = x + glyph_width;
-	if x > par.bounds_max_x || max_x < par.bounds_min_x {
-		return Ok(None);
+	if x > glyph.bounds_max_x || max_x < glyph.bounds_min_x {
+		return None;
 	}
 
 	// Starts beyond bottom edge or ends beyond top edge
 	let max_y = y + glyph_height;
-	if y > par.bounds_max_y || max_y < par.bounds_min_y {
-		return Ok(None);
+	if y > glyph.bounds_max_y || max_y < glyph.bounds_min_y {
+		return None;
 	}
 
 	// Clip left edge
-	if x < par.bounds_min_x {
-		let right_shift = par.bounds_min_x - x;
+	if x < glyph.bounds_min_x {
+		let right_shift = glyph.bounds_min_x - x;
 
-		x = par.bounds_min_x;
-		glyph_width = max_x - par.bounds_min_x;
+		x = glyph.bounds_min_x;
+		glyph_width = max_x - glyph.bounds_min_x;
 		atlas_x += right_shift as u16;
 	}
 
 	// Clip right edge
-	if x + glyph_width > par.bounds_max_x {
-		glyph_width = par.bounds_max_x - x;
+	if x + glyph_width > glyph.bounds_max_x {
+		glyph_width = glyph.bounds_max_x - x;
 	}
 
 	// Clip top edge
-	if y < par.bounds_min_y {
-		let bottom_shift = par.bounds_min_y - y;
+	if y < glyph.bounds_min_y {
+		let bottom_shift = glyph.bounds_min_y - y;
 
-		y = par.bounds_min_y;
-		glyph_height = max_y - par.bounds_min_y;
+		y = glyph.bounds_min_y;
+		glyph_height = max_y - glyph.bounds_min_y;
 		atlas_y += bottom_shift as u16;
 	}
 
 	// Clip bottom edge
-	if y + glyph_height > par.bounds_max_y {
-		glyph_height = par.bounds_max_y - y;
+	if y + glyph_height > glyph.bounds_max_y {
+		glyph_height = glyph.bounds_max_y - y;
 	}
 
 	let mut model = Mat4::IDENTITY;
 
 	// top-left text transform
 	model *= Mat4::from_translation(Vec3::new(
-		par.label_pos.x / par.scale_factor,
-		par.label_pos.y / par.scale_factor,
+		glyph.label_pos.x / glyph.scale_factor,
+		glyph.label_pos.y / glyph.scale_factor,
 		0.0,
 	));
 
-	model *= *par.transform;
+	model *= glyph.transform;
 
 	// per-character transform
 	model *= Mat4::from_translation(Vec3::new(
-		((x as f32) - par.label_pos.x) / par.scale_factor,
-		((y as f32) - par.label_pos.y) / par.scale_factor,
+		((x as f32) - glyph.label_pos.x) / glyph.scale_factor,
+		((y as f32) - glyph.label_pos.y) / glyph.scale_factor,
 		0.0,
 	));
 
 	model *= glam::Mat4::from_scale(Vec3::new(
-		glyph_width as f32 / par.scale_factor,
-		glyph_height as f32 / par.scale_factor,
+		glyph_width as f32 / glyph.scale_factor,
+		glyph_height as f32 / glyph.scale_factor,
 		0.0,
 	));
 
 	let in_model_idx = par.model_buffer.register(&model);
 
-	Ok(Some(GlyphVertex {
+	Some(GlyphVertex {
 		in_model_idx,
 		in_rect_dim: [glyph_width as u16, glyph_height as u16],
 		in_uv: [atlas_x, atlas_y],
-		in_color: par.color.0,
+		in_color: glyph.color.0,
 		in_content_type: [
 			content_type as u16,
 			0, // unused (TODO!)
 		],
-		scale: par.glyph_scale,
-	}))
+		scale: glyph.glyph_scale,
+	})
 }
diff --git a/wgui/src/task.rs b/wgui/src/task.rs
index e3437cf7..e34be1ad 100644
--- a/wgui/src/task.rs
+++ b/wgui/src/task.rs
@@ -1,4 +1,4 @@
-use crate::components::button::ComponentButton;
+use crate::components::button::{ButtonClickCallback, ComponentButton};
 use std::{cell::RefCell, collections::VecDeque, rc::Rc};
 
 pub struct Tasks<TaskType>(Rc<RefCell<VecDeque<TaskType>>>);
@@ -30,21 +30,31 @@ impl<TaskType: 'static> Default for Tasks<TaskType> {
 	}
 }
 
+// copyable tasks only!
 impl<TaskType: Clone + 'static> Tasks<TaskType> {
-	pub fn handle_button(&self, button: &Rc<ComponentButton>, task: TaskType) {
-		button.on_click({
-			let this = self.clone();
-			Rc::new(move |_, _| {
-				this.push(task.clone());
-				Ok(())
-			})
-		});
+	pub fn get_button_click_callback(&self, task: TaskType) -> ButtonClickCallback {
+		let this = self.clone();
+		Rc::new(move |_, _| {
+			this.push(task.clone());
+			Ok(())
+		})
 	}
 
-	pub fn make_callback(&self, task: TaskType) -> Rc<dyn Fn()> {
+	pub fn handle_button(&self, button: &Rc<ComponentButton>, task: TaskType) {
+		button.on_click(self.get_button_click_callback(task));
+	}
+
+	pub fn make_callback_rc(&self, task: TaskType) -> Rc<dyn Fn()> {
 		let this = self.clone();
 		Rc::new(move || {
 			this.push(task.clone());
 		})
 	}
+
+	pub fn make_callback_box(&self, task: TaskType) -> Box<dyn Fn()> {
+		let this = self.clone();
+		Box::new(move || {
+			this.push(task.clone());
+		})
+	}
 }
diff --git a/wgui/src/theme.rs b/wgui/src/theme.rs
index 6d9c530a..a5ec82e1 100644
--- a/wgui/src/theme.rs
+++ b/wgui/src/theme.rs
@@ -1,16 +1,5 @@
-use crate::drawing;
-
 #[derive(Clone)]
 pub struct WguiTheme {
-	pub dark_mode: bool,
-	pub text_color: drawing::Color,
-	pub button_color: drawing::Color,
-	pub accent_color: drawing::Color,
-	pub danger_color: drawing::Color,
-	pub faded_color: drawing::Color,
-	pub bg_color: drawing::Color,
-	pub editbox_color: drawing::Color,
-	pub translucent_alpha: f32,
 	pub animation_mult: f32,
 	pub rounding_mult: f32,
 	pub gradient_intensity: f32, // currently used for buttons
@@ -19,15 +8,6 @@ pub struct WguiTheme {
 impl Default for WguiTheme {
 	fn default() -> Self {
 		Self {
-			dark_mode: true,
-			text_color: drawing::Color::new(1.0, 1.0, 1.0, 1.0),
-			button_color: drawing::Color::new(1.0, 1.0, 1.0, 0.02),
-			accent_color: drawing::Color::new(0.13, 0.68, 1.0, 1.0),
-			danger_color: drawing::Color::new(0.9, 0.0, 0.0, 1.0),
-			faded_color: drawing::Color::new(0.67, 0.74, 0.80, 1.0),
-			bg_color: drawing::Color::new(0.0, 0.07, 0.1, 0.75),
-			editbox_color: drawing::Color::new(0.15, 0.25, 0.35, 0.95),
-			translucent_alpha: 0.5,
 			animation_mult: 1.0,
 			rounding_mult: 1.0,
 			gradient_intensity: 0.3,
diff --git a/wgui/src/time.rs b/wgui/src/time.rs
new file mode 100644
index 00000000..e9271ed1
--- /dev/null
+++ b/wgui/src/time.rs
@@ -0,0 +1,6 @@
+use std::time::{SystemTime, UNIX_EPOCH};
+
+// Returns milliseconds since unix epoch
+pub fn get_millis() -> u64 {
+	SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_millis() as u64
+}
diff --git a/wgui/src/video_dec.rs b/wgui/src/video_dec.rs
new file mode 100644
index 00000000..380f67fa
--- /dev/null
+++ b/wgui/src/video_dec.rs
@@ -0,0 +1,339 @@
+use std::ptr::null_mut;
+
+use bytes::{Buf, Bytes};
+use dav1d_sys::{
+	DAV1D_ERR_AGAIN, Dav1dContext, Dav1dData, Dav1dPicture, Dav1dSettings, dav1d_close, dav1d_default_settings,
+	dav1d_get_picture, dav1d_open, dav1d_picture_unref, dav1d_send_data,
+};
+
+pub struct IvfReader {
+	file_data: Vec<u8>, // Used by `reader`, do not remove!
+	reader: Bytes,
+	header_size: usize,
+	pub cur_frame: u32,
+	pub num_frames: u32,
+	pub framerate: f32,
+	pub width: u16,
+	pub height: u16,
+}
+
+// Duck IVF video container. Documentation:
+// https://wiki.multimedia.cx/index.php/Duck_IVF
+// Yes, it's just as simple as that.
+//
+// Header:
+// bytes 0-3    signature: 'DKIF'
+// bytes 4-5    version (should be 0)
+// bytes 6-7    length of header in bytes
+// bytes 8-11   codec FourCC (e.g., 'VP80')
+// bytes 12-13  width in pixels
+// bytes 14-15  height in pixels
+// bytes 16-19  time base denominator
+// bytes 20-23  time base numerator
+// bytes 24-27  number of `Frame`s in file
+// bytes 28-31  unused
+//
+// Frame:
+//   bytes 0-3    size of frame in bytes (not including the 12-byte header)
+//   bytes 4-11   64-bit presentation timestamp
+//   bytes 12..   frame data
+
+const IVF_MAGIC: [u8; 4] = [0x44, 0x4B, 0x49, 0x46];
+
+pub enum IvfReadFrameResult<'a> {
+	Ok((&'a [u8], u64 /* pts */)),
+	EndOfFile,
+}
+
+impl IvfReader {
+	pub fn new(file_data: Vec<u8>) -> anyhow::Result<IvfReader> {
+		// safety: both reader and file_data are located in the same struct
+		// file_data won't move at all.
+		let mut reader = Bytes::from_static(unsafe { std::mem::transmute::<&[u8], &'static [u8]>(&file_data) });
+
+		// read ivf magic
+		let mut header_magic: [u8; 4] = [0; 4];
+		reader.try_copy_to_slice(&mut header_magic)?;
+
+		if header_magic != IVF_MAGIC {
+			anyhow::bail!("invalid magic");
+		}
+
+		let header_version = reader.try_get_u16_le()?;
+
+		if header_version != 0 {
+			anyhow::bail!("unsupported version"); // there's no other version than 0
+		}
+
+		let header_len = reader.try_get_u16_le()?;
+		if header_len != 32 {
+			anyhow::bail!("header length mismatching");
+		}
+
+		let mut header_fourcc: [u8; 4] = [0; 4];
+		reader.try_copy_to_slice(&mut header_fourcc)?;
+
+		let header_width = reader.try_get_u16_le()?;
+		let header_height = reader.try_get_u16_le()?;
+		let header_timebase_den = reader.try_get_u32_le()?;
+		let header_timebase_num = reader.try_get_u32_le()?;
+		let header_num_frames = reader.try_get_u32_le()?;
+
+		let framerate = header_timebase_den as f32 / header_timebase_num as f32;
+
+		let mut padding: [u8; 4] = [0; 4];
+		reader.try_copy_to_slice(&mut padding)?;
+
+		log::debug!("IvfReader: width {header_width}, height {header_height}, framerate {framerate}");
+
+		let header_size = file_data.len() - reader.remaining();
+
+		Ok(IvfReader {
+			header_size,
+			file_data,
+			reader,
+			cur_frame: 0,
+			width: header_width,
+			height: header_height,
+			framerate,
+			num_frames: header_num_frames,
+		})
+	}
+
+	pub fn rewind(&mut self) {
+		self.reader = Bytes::from_static(unsafe { std::mem::transmute::<&[u8], &'static [u8]>(&self.file_data) });
+		// do not read header again
+		self.reader.advance(self.header_size);
+	}
+
+	// Read demuxed video packet to a chunk
+	pub fn read_frame(&mut self) -> anyhow::Result<IvfReadFrameResult<'_>> {
+		if self.reader.remaining() == 0 {
+			return Ok(IvfReadFrameResult::EndOfFile);
+		}
+
+		let frame_size = self.reader.try_get_u32_le()? as usize;
+		let frame_pts = self.reader.try_get_u64_le()?;
+
+		if frame_size > 8 * 1024 * 1024 {
+			// something went really wrong
+			anyhow::bail!("Invalid frame size {frame_size}");
+		}
+
+		// SAFETY: reader.chunk() slice lifetime is the same as Self, no risk here.
+		let chunk_a /* 'a */ = unsafe /* it's safe */ {
+			let Some(chunk) = self.reader.chunk().get(0..(frame_size)) else {
+				anyhow::bail!("chunk read error");
+			};
+			std::mem::transmute::<&[u8], &'static [u8]>(chunk)
+		};
+
+		self.reader.advance(frame_size);
+
+		self.cur_frame += 1;
+
+		Ok(IvfReadFrameResult::Ok((chunk_a, frame_pts)))
+	}
+}
+
+// RGB with 255 A
+pub struct RgbxFrame {
+	pub width: u16,
+	pub height: u16,
+	pub data: Vec<u8>,
+}
+
+fn yuv_to_rgb(y: u8, u: u8, v: u8) -> (u8, u8, u8) {
+	let y_i = i32::from(y);
+	let u_i = i32::from(u) - 128;
+	let v_i = i32::from(v) - 128;
+	let c = (1192 * (y_i - 16)).max(0);
+	let out_r = (c + 1634 * v_i) >> 10;
+	let out_g = (c - 401 * u_i - 834 * v_i) >> 10;
+	let out_b = (c + 2066 * u_i) >> 10;
+	(
+		out_r.clamp(0, 255) as u8,
+		out_g.clamp(0, 255) as u8,
+		out_b.clamp(0, 255) as u8,
+	)
+}
+
+impl RgbxFrame {
+	// Simple, temporary, best-effort yuv420->rgb converter. Not performant at all, but at least it works.
+	// Temporary till we get native YUV support in shaders (as 3 vulkan textures).
+	// SAFETY: this function expects YUV420 data only.
+	#[allow(clippy::uninit_vec)]
+	fn from_yuv(
+		width: u16,
+		height: u16,
+		data_y: *const u8,
+		data_u: *const u8,
+		data_v: *const u8,
+		stride_luma: usize,
+		stride_chroma: usize,
+	) -> RgbxFrame {
+		unsafe {
+			let channels = 4; // rgbx
+
+			let rgbx_size = width as usize * height as usize * channels;
+			let mut rgbx = Vec::<u8>::with_capacity(rgbx_size);
+			rgbx.set_len(rgbx_size);
+
+			let ptr_rgbx = rgbx.as_mut_ptr();
+
+			for y in 0..height as usize {
+				for x in 0..width as usize {
+					let val_y = *data_y.add(y * stride_luma + x);
+					let val_u = *data_u.add((y / 2) * stride_chroma + (x / 2));
+					let val_v = *data_v.add((y / 2) * stride_chroma + (x / 2));
+					let (r, g, b) = yuv_to_rgb(val_y, val_u, val_v);
+
+					let pos = y * (width as usize * channels) + x * channels;
+					*ptr_rgbx.add(pos) = r;
+					*ptr_rgbx.add(pos + 1) = g;
+					*ptr_rgbx.add(pos + 2) = b;
+					*ptr_rgbx.add(pos + 3) = 255;
+				}
+			}
+
+			RgbxFrame {
+				width,
+				height,
+				data: rgbx,
+			}
+		}
+	}
+}
+
+pub struct Av1Decoder {
+	ctx: *mut Dav1dContext,
+}
+
+impl Drop for Av1Decoder {
+	fn drop(&mut self) {
+		unsafe {
+			dav1d_close(&raw mut self.ctx);
+		}
+	}
+}
+
+enum GetPictureResult {
+	Ok,
+	Again,
+	Failed(i32),
+}
+
+enum ReadFrameIterResult {
+	Ok(RgbxFrame),
+	Again,
+	EndOfFile,
+}
+
+pub enum ReadFrameResult {
+	Ok(RgbxFrame),
+	EndOfFile,
+}
+
+impl Av1Decoder {
+	pub fn new() -> anyhow::Result<Self> {
+		unsafe {
+			let mut set: Dav1dSettings = std::mem::zeroed();
+			dav1d_default_settings(&raw mut set);
+
+			let mut ctx = null_mut();
+			let ret = dav1d_open(&raw mut ctx, &raw mut set);
+			if ret < 0 {
+				anyhow::bail!("dav1d_open failed: {ret}");
+			}
+			Ok(Self { ctx })
+		}
+	}
+
+	fn get_picture(&mut self, picture: &mut Dav1dPicture) -> GetPictureResult {
+		let ret = unsafe { dav1d_get_picture(self.ctx, picture) };
+		if ret == DAV1D_ERR_AGAIN {
+			return GetPictureResult::Again;
+		}
+
+		if ret < 0 {
+			return GetPictureResult::Failed(ret);
+		}
+
+		GetPictureResult::Ok
+	}
+
+	fn send_data(&mut self, reader: &mut IvfReader) -> anyhow::Result<bool> {
+		unsafe {
+			let (packet, pts) = match reader.read_frame()? {
+				IvfReadFrameResult::Ok((packet, pts)) => (packet, pts),
+				IvfReadFrameResult::EndOfFile => return Ok(false),
+			};
+			let mut data: Dav1dData = std::mem::zeroed();
+			data.data = packet.as_ptr();
+			data.sz = packet.len();
+			data.m.timestamp = pts as i64;
+			data.m.size = packet.len();
+			data.m.offset = -1;
+			data.m.duration = 0;
+
+			let ret = dav1d_send_data(self.ctx, &raw mut data);
+			if ret < 0 {
+				anyhow::bail!("dav1d_send_data failed: {ret}");
+			}
+
+			Ok(true)
+		}
+	}
+
+	fn read_frame_iter(&mut self, reader: &mut IvfReader) -> anyhow::Result<ReadFrameIterResult> {
+		unsafe {
+			let mut picture: Dav1dPicture = std::mem::zeroed();
+			match self.get_picture(&mut picture) {
+				GetPictureResult::Ok => {}
+				GetPictureResult::Again => {
+					dav1d_picture_unref(&raw mut picture);
+					if !self.send_data(reader)? {
+						return Ok(ReadFrameIterResult::EndOfFile);
+					}
+					return Ok(ReadFrameIterResult::Again);
+				}
+				GetPictureResult::Failed(code) => {
+					dav1d_picture_unref(&raw mut picture);
+					anyhow::bail!("dav1d_get_picture failed: {code}");
+				}
+			}
+
+			let pic_y = picture.data[0]; // luma Y
+			let pic_u = picture.data[1]; // chroma U
+			let pic_v = picture.data[2]; // chroma V
+			let stride_luma = picture.stride[0];
+			let stride_chroma = picture.stride[1];
+
+			let rgbx = RgbxFrame::from_yuv(
+				reader.width,
+				reader.height,
+				pic_y as *const u8,
+				pic_u as *const u8,
+				pic_v as *const u8,
+				stride_luma as usize,
+				stride_chroma as usize,
+			);
+
+			dav1d_picture_unref(&raw mut picture);
+
+			Ok(ReadFrameIterResult::Ok(rgbx))
+		}
+	}
+
+	pub fn read_frame(&mut self, reader: &mut IvfReader) -> anyhow::Result<ReadFrameResult> {
+		loop {
+			match self.read_frame_iter(reader)? {
+				ReadFrameIterResult::Ok(rgbx_frame) => {
+					return Ok(ReadFrameResult::Ok(rgbx_frame));
+				}
+				ReadFrameIterResult::Again => { /* loop again */ }
+				ReadFrameIterResult::EndOfFile => return Ok(ReadFrameResult::EndOfFile),
+			}
+		}
+	}
+}
diff --git a/wgui/src/widget/custom_draw.rs b/wgui/src/widget/custom_draw.rs
index e262bca4..45d1a527 100644
--- a/wgui/src/widget/custom_draw.rs
+++ b/wgui/src/widget/custom_draw.rs
@@ -2,6 +2,7 @@ use slotmap::Key;
 
 use crate::{
 	drawing::{self},
+	globals::Globals,
 	layout::WidgetID,
 	stack,
 	widget::WidgetStateFlags,
@@ -59,7 +60,7 @@ impl WidgetObj for WidgetCustomDraw {
 		super::WidgetType::Rectangle
 	}
 
-	fn debug_print(&self) -> String {
+	fn debug_print(&self, _globals: &Globals) -> String {
 		String::default()
 	}
 }
diff --git a/wgui/src/widget/div.rs b/wgui/src/widget/div.rs
index 6dc5ffb9..0da1546c 100644
--- a/wgui/src/widget/div.rs
+++ b/wgui/src/widget/div.rs
@@ -1,6 +1,6 @@
 use slotmap::Key;
 
-use crate::{layout::WidgetID, widget::WidgetStateFlags};
+use crate::{globals::Globals, layout::WidgetID, widget::WidgetStateFlags};
 
 use super::{WidgetObj, WidgetState};
 
@@ -31,7 +31,7 @@ impl WidgetObj for WidgetDiv {
 		super::WidgetType::Div
 	}
 
-	fn debug_print(&self) -> String {
+	fn debug_print(&self, _globals: &Globals) -> String {
 		String::default()
 	}
 }
diff --git a/wgui/src/widget/image.rs b/wgui/src/widget/image.rs
index 0b27aa43..85d6c781 100644
--- a/wgui/src/widget/image.rs
+++ b/wgui/src/widget/image.rs
@@ -3,8 +3,9 @@ use std::sync::atomic::{AtomicUsize, Ordering};
 use slotmap::Key;
 
 use crate::{
+	color::WguiColor,
 	drawing::{self, ImagePrimitive, PrimitiveExtent},
-	event::CallbackDataCommon,
+	event::EventAlterables,
 	globals::Globals,
 	layout::WidgetID,
 	renderer_vk::text::custom_glyph::CustomGlyphData,
@@ -20,7 +21,7 @@ pub struct WidgetImageParams {
 	pub glyph_data: Option<CustomGlyphData>,
 
 	pub border: f32,
-	pub border_color: drawing::Color,
+	pub border_color: WguiColor,
 
 	pub round: WLength,
 }
@@ -30,6 +31,7 @@ pub struct WidgetImage {
 	params: WidgetImageParams,
 	id: WidgetID,
 	content_key: usize,
+	dirty: bool,
 }
 
 impl WidgetImage {
@@ -40,17 +42,19 @@ impl WidgetImage {
 				params,
 				id: WidgetID::null(),
 				content_key: AUTO_INCREMENT.fetch_add(1, Ordering::Relaxed),
+				dirty: true,
 			}),
 		)
 	}
 
-	pub fn set_content(&mut self, common: &mut CallbackDataCommon, content: Option<CustomGlyphData>) {
+	pub fn set_content(&mut self, alterables: &mut EventAlterables, content: Option<CustomGlyphData>) {
 		if self.params.glyph_data == content {
 			return;
 		}
 
 		self.params.glyph_data = content;
-		common.mark_widget_dirty(self.id);
+		self.dirty = true;
+		alterables.mark_dirty_and_redraw(self.id);
 	}
 
 	pub fn get_content(&self) -> Option<CustomGlyphData> {
@@ -79,11 +83,13 @@ impl WidgetObj for WidgetImage {
 			ImagePrimitive {
 				content,
 				content_key: self.content_key,
+				skip_cache: self.dirty,
 				border: self.params.border,
-				border_color: self.params.border_color,
+				border_color: self.params.border_color.resolve(&state.globals.palette),
 				round_units,
 			},
 		));
+		self.dirty = false;
 	}
 
 	fn measure(
@@ -107,7 +113,7 @@ impl WidgetObj for WidgetImage {
 		super::WidgetType::Sprite
 	}
 
-	fn debug_print(&self) -> String {
+	fn debug_print(&self, _globals: &Globals) -> String {
 		String::default()
 	}
 }
diff --git a/wgui/src/widget/label.rs b/wgui/src/widget/label.rs
index 8e4cf0b2..43474aca 100644
--- a/wgui/src/widget/label.rs
+++ b/wgui/src/widget/label.rs
@@ -1,17 +1,18 @@
 use std::{cell::RefCell, rc::Rc};
 
-use cosmic_text::{Attrs, AttrsList, Buffer, Metrics, Shaping, Wrap};
+use cosmic_text::{Attrs, AttrsList, BorrowedWithFontSystem, Buffer, Metrics, Shaping, Wrap};
 use slotmap::Key;
 use taffy::AvailableSpace;
 
 use crate::{
-	drawing::{self, Boundary, PrimitiveExtent},
+	color::{ParentColor, WguiColor, WguiColorName},
+	drawing::{self, PrimitiveExtent},
 	event::CallbackDataCommon,
 	globals::Globals,
 	i18n::Translation,
 	layout::{LayoutState, WidgetID},
+	palette::WguiColorPalette,
 	renderer_vk::text::TextStyle,
-	theme::WguiTheme,
 	widget::WidgetStateFlags,
 };
 
@@ -21,28 +22,30 @@ use super::{WidgetObj, WidgetState};
 pub struct WidgetLabelParams {
 	pub content: Translation,
 	pub style: TextStyle,
+	pub parent_color: ParentColor,
 }
 
+const DEFAULT_COLOR: WguiColor = WguiColorName::OnBackground.to_wgui_color();
+
 pub struct WidgetLabel {
 	id: WidgetID,
 
 	params: WidgetLabelParams,
 	buffer: Rc<RefCell<Buffer>>,
-	last_boundary: Boundary,
 }
 
 impl WidgetLabel {
 	pub fn create(state: &mut LayoutState, params: WidgetLabelParams) -> WidgetState {
-		WidgetLabel::create_ex(&mut state.globals.get(), &state.theme, params)
+		WidgetLabel::create_ex(&mut state.globals.get(), params)
 	}
 
-	pub fn create_ex(globals: &mut Globals, theme: &WguiTheme, mut params: WidgetLabelParams) -> WidgetState {
+	pub fn create_ex(globals: &mut Globals, mut params: WidgetLabelParams) -> WidgetState {
 		if params.style.color.is_none() {
-			params.style.color = Some(theme.text_color);
+			params.style.color = Some(DEFAULT_COLOR);
 		}
 
 		let metrics = Metrics::from(&params.style);
-		let attrs = Attrs::from(&params.style);
+		let attrs = params.style.to_attrs(&globals.palette);
 		let wrap = Wrap::from(&params.style);
 
 		let mut buffer = Buffer::new_empty(metrics);
@@ -64,12 +67,21 @@ impl WidgetLabel {
 			Box::new(Self {
 				params,
 				buffer: Rc::new(RefCell::new(buffer)),
-				last_boundary: Boundary::default(),
 				id: WidgetID::null(),
 			}),
 		)
 	}
 
+	fn with_buffer<F, R>(buffer: &Rc<RefCell<Buffer>>, globals: &Globals, func: F) -> R
+	where
+		F: FnOnce(BorrowedWithFontSystem<'_, Buffer>) -> R,
+	{
+		let mut font_system = globals.font_system.system.lock();
+		let mut buffer = buffer.borrow_mut();
+		let buffer = buffer.borrow_with(&mut font_system);
+		func(buffer)
+	}
+
 	// set text without layout/re-render update.
 	// Not recommended unless the widget wasn't rendered yet (first init).
 	pub fn set_text_simple(&mut self, globals: &mut Globals, translation: Translation) -> bool {
@@ -78,23 +90,23 @@ impl WidgetLabel {
 		}
 
 		self.params.content = translation;
-		let attrs = Attrs::from(&self.params.style);
-		let mut font_system = globals.font_system.system.lock();
+		let attrs = self.params.style.to_attrs(&globals.palette);
 
-		let mut buffer = self.buffer.borrow_mut();
-		buffer.set_rich_text(
-			&mut font_system,
-			[(self.params.content.generate(&mut globals.i18n_builtin).as_ref(), attrs)],
-			&Attrs::new(),
-			Shaping::Advanced,
-			self.params.style.align.map(Into::into),
-		);
+		let text = self.params.content.generate(&mut globals.i18n_builtin);
 
+		WidgetLabel::with_buffer(&self.buffer, globals, |mut buffer| {
+			buffer.set_rich_text(
+				[(text.as_ref(), attrs)],
+				&Attrs::new(),
+				Shaping::Advanced,
+				self.params.style.align.map(Into::into),
+			);
+		});
 		true
 	}
 
-	fn update_attrs(&mut self) {
-		let attrs = Attrs::from(&self.params.style);
+	fn update_attrs(&mut self, palette: &WguiColorPalette) {
+		let attrs = self.params.style.to_attrs(palette);
 		for line in &mut self.buffer.borrow_mut().lines {
 			line.set_attrs_list(AttrsList::new(&attrs));
 		}
@@ -109,25 +121,30 @@ impl WidgetLabel {
 		}
 	}
 
-	pub fn set_color(&mut self, common: &mut CallbackDataCommon, color: drawing::Color, apply_to_existing_text: bool) {
+	pub fn set_color(&mut self, common: &mut CallbackDataCommon, color: WguiColor, apply_to_existing_text: bool) {
 		self.params.style.color = Some(color);
 		if apply_to_existing_text {
-			self.update_attrs();
+			self.update_attrs(&common.globals().palette);
 			common.mark_widget_dirty(self.id);
 		}
 	}
+
+	pub const fn get_color(&self) -> WguiColor {
+		self.params.style.color.unwrap() // create_ex populates this
+	}
+
+	pub const fn parent_color(&self) -> ParentColor {
+		self.params.parent_color
+	}
 }
 
 impl WidgetObj for WidgetLabel {
 	fn draw(&mut self, state: &mut super::DrawState, _params: &super::DrawParams) {
 		let boundary = drawing::Boundary::construct_relative(state.transform_stack);
 
-		if self.last_boundary != boundary {
-			self.last_boundary = boundary;
-			let mut font_system = state.globals.font_system.system.lock();
-			let mut buffer = self.buffer.borrow_mut();
-			buffer.set_size(&mut font_system, Some(boundary.size.x), Some(boundary.size.y));
-		}
+		WidgetLabel::with_buffer(&self.buffer, state.globals, |mut buffer| {
+			buffer.set_size(Some(boundary.size.x), Some(boundary.size.y));
+		});
 
 		state.primitives.push(drawing::RenderPrimitive::Text(
 			PrimitiveExtent {
@@ -135,7 +152,12 @@ impl WidgetObj for WidgetLabel {
 				transform: state.transform_stack.get().transform,
 			},
 			self.buffer.clone(),
-			self.params.style.shadow.clone(),
+			self
+				.params
+				.style
+				.shadow
+				.clone()
+				.map(|s| s.to_text_shadow(&state.globals.palette)),
 		));
 	}
 
@@ -152,22 +174,23 @@ impl WidgetObj for WidgetLabel {
 			AvailableSpace::Definite(width) => Some(width),
 		});
 
-		let wgui_font_system = &globals.font_system;
-		let mut font_system = wgui_font_system.system.lock();
-		let mut buffer = self.buffer.borrow_mut();
+		WidgetLabel::with_buffer(&self.buffer, globals, |mut buffer| {
+			buffer.set_size(width_constraint, None);
+			// Determine measured size of text
+			let (width, total_lines) = buffer.layout_runs().fold((0.0, 0usize), |(width, total_lines), run| {
+				(run.line_w.max(width), total_lines + 1)
+			});
+			let height = total_lines as f32 * buffer.metrics().line_height;
+			taffy::Size {
+				width: width + 1.0, /* f32 aliasing fix */
+				height,
+			}
+		})
+	}
 
-		buffer.set_size(&mut font_system, width_constraint, None);
-
-		// Determine measured size of text
-		let (width, total_lines) = buffer.layout_runs().fold((0.0, 0usize), |(width, total_lines), run| {
-			(run.line_w.max(width), total_lines + 1)
-		});
-		let height = total_lines as f32 * buffer.metrics().line_height;
-
-		taffy::Size {
-			width: width + 1.0, /* f32 aliasing fix */
-			height,
-		}
+	fn palette_updated(&mut self, common: &mut CallbackDataCommon) {
+		let cur_color = self.get_color();
+		self.set_color(common, cur_color, true);
 	}
 
 	fn get_id(&self) -> WidgetID {
@@ -182,9 +205,9 @@ impl WidgetObj for WidgetLabel {
 		super::WidgetType::Label
 	}
 
-	fn debug_print(&self) -> String {
+	fn debug_print(&self, globals: &Globals) -> String {
 		let color = if let Some(color) = self.params.style.color {
-			format!("[color: {}]", color.debug_ansi_block())
+			format!("[color: {}]", color.resolve(&globals.palette).debug_ansi_block())
 		} else {
 			String::default()
 		};
diff --git a/wgui/src/widget/mod.rs b/wgui/src/widget/mod.rs
index 08f7aeda..d00e172d 100644
--- a/wgui/src/widget/mod.rs
+++ b/wgui/src/widget/mod.rs
@@ -1,5 +1,5 @@
 use anyhow::Context;
-use glam::Vec2;
+use glam::{FloatExt, Vec2};
 use taffy::{NodeId, TaffyTree};
 
 use super::drawing::RenderPrimitive;
@@ -8,7 +8,8 @@ use crate::{
 	any::AnyTrait,
 	drawing::{self, PrimitiveExtent},
 	event::{
-		self, CallbackData, CallbackDataCommon, CallbackMetadata, Event, EventAlterables, EventListenerCollection,
+		self, CallbackData, CallbackDataCommon, CallbackMetadata, DeviceBitmask, Event, EventAlterables,
+		EventListenerCollection,
 		EventListenerKind::{self, InternalStateChange, MouseLeave},
 		MouseWheelEvent,
 	},
@@ -25,57 +26,66 @@ pub mod rectangle;
 pub mod sprite;
 pub mod util;
 
+const SWIPE_START_THRESHOLD_UNITS: f32 = 16.0;
+const KINETIC_VELOCITY_DAMPING: f32 = 0.92;
+const KINETIC_VELOCITY_BRAKE: f32 = 0.85;
+const RUBBERBANDING_DAMP: f32 = 0.8;
+
 pub struct WidgetData {
-	hovered: usize,
-	pressed: usize,
-	pub scrolling_target: Vec2,   // normalized, 0.0-1.0. Not used in case if overflow != scroll
-	pub scrolling_cur: Vec2,      // normalized, used for smooth scrolling animation
-	pub scrolling_cur_prev: Vec2, // for motion interpolation while rendering between ticks
+	hovered: DeviceBitmask,
+	pressed: DeviceBitmask,
+	scrolling_target: Vec2,   // normalized, 0.0-1.0. Not used in case if overflow != scroll
+	scrolling_cur: Vec2,      // normalized, used for smooth scrolling animation
+	scrolling_cur_prev: Vec2, // for motion interpolation while rendering between ticks
+	scrolling_velocity: Vec2,
+	press_down_start_mouse_pos: Option<Vec2>,
+	swipe_running: bool,
+	swipe_scroll_start: Vec2, // normalized, 0.0-1.0
 	pub transform: glam::Mat4,
 	pub cached_absolute_boundary: drawing::Boundary, // updated in Layout::push_event_widget
 }
 
 impl WidgetData {
-	pub const fn set_device_pressed(&mut self, device: usize, pressed: bool) -> bool {
-		let bit = 1 << device;
+	pub const fn set_device_pressed(&mut self, device: DeviceBitmask, pressed: bool) -> bool {
+		let bit = 1 << device.0;
 		let state_changed;
 		if pressed {
-			state_changed = self.pressed == 0;
-			self.pressed |= bit;
+			state_changed = self.pressed.0 == 0;
+			self.pressed.0 |= bit;
 		} else {
-			state_changed = self.pressed == bit;
-			self.pressed &= !bit;
+			state_changed = self.pressed.0 == bit;
+			self.pressed.0 &= !bit;
 		}
 		state_changed
 	}
 
-	pub const fn set_device_hovered(&mut self, device: usize, hovered: bool) -> bool {
-		let bit = 1 << device;
+	pub const fn set_device_hovered(&mut self, device: DeviceBitmask, hovered: bool) -> bool {
+		let bit = 1 << device.0;
 		let state_changed;
 		if hovered {
-			state_changed = self.hovered == 0;
-			self.hovered |= bit;
+			state_changed = self.hovered.0 == 0;
+			self.hovered.0 |= bit;
 		} else {
-			state_changed = self.hovered == bit;
-			self.hovered &= !bit;
+			state_changed = self.hovered.0 == bit;
+			self.hovered.0 &= !bit;
 		}
 		state_changed
 	}
 
-	pub const fn get_pressed(&self, device: usize) -> bool {
-		self.pressed & (1 << device) != 0
+	pub const fn get_pressed(&self, device: DeviceBitmask) -> bool {
+		self.pressed.0 & (1 << device.0) != 0
 	}
 
-	pub const fn get_hovered(&self, device: usize) -> bool {
-		self.hovered & (1 << device) != 0
+	pub const fn get_hovered(&self, device: DeviceBitmask) -> bool {
+		self.hovered.0 & (1 << device.0) != 0
 	}
 
 	pub const fn is_pressed(&self) -> bool {
-		self.pressed != 0
+		self.pressed.0 != 0
 	}
 
 	pub const fn is_hovered(&self) -> bool {
-		self.hovered != 0
+		self.hovered.0 != 0
 	}
 }
 
@@ -116,13 +126,17 @@ impl WidgetState {
 	fn new(flags: WidgetStateFlags, obj: Box<dyn WidgetObj>) -> Self {
 		Self {
 			data: WidgetData {
-				hovered: 0,
-				pressed: 0,
+				hovered: DeviceBitmask(0),
+				pressed: DeviceBitmask(0),
 				scrolling_target: Vec2::default(),
 				scrolling_cur: Vec2::default(),
 				scrolling_cur_prev: Vec2::default(),
 				transform: glam::Mat4::IDENTITY,
 				cached_absolute_boundary: drawing::Boundary::default(),
+				press_down_start_mouse_pos: None,
+				swipe_running: false,
+				swipe_scroll_start: Vec2::default(),
+				scrolling_velocity: Vec2::default(),
 			},
 			obj,
 			event_listeners: EventListenerCollection::default(),
@@ -173,10 +187,12 @@ pub trait WidgetObj: AnyTrait {
 	fn get_id(&self) -> WidgetID;
 	fn set_id(&mut self, id: WidgetID); // always set at insertion
 	fn get_type(&self) -> WidgetType;
-	fn debug_print(&self) -> String;
+	fn debug_print(&self, _globals: &Globals) -> String;
 
 	fn draw(&mut self, state: &mut DrawState, params: &DrawParams);
 
+	fn palette_updated(&mut self, _common: &mut CallbackDataCommon) {}
+
 	fn measure(
 		&mut self,
 		_globals: &Globals,
@@ -192,20 +208,21 @@ pub struct EventParams<'a> {
 	pub style: &'a taffy::Style,
 	pub state: &'a LayoutState,
 	pub alterables: &'a mut EventAlterables,
-	pub layout: &'a taffy::Layout,
+	pub taffy_layout: &'a taffy::Layout,
 }
 
 #[derive(Clone, Copy, Eq, PartialEq, PartialOrd)]
 pub enum EventResult {
-	NoHit,    // event was pushed but has not found a listener (yet)
-	Pass,     // widget acknowledged it and allows the event to propagate further
-	Consumed, // widget triggered an action, do not propagate further
+	NoHit,             // event was pushed but has not found a listener (yet)
+	Pass,              // widget acknowledged it and allows the event to propagate further
+	Consumed,          // widget triggered an action, do not propagate further
+	ConsumedExclusive, // same as `Consumed`, but with force-disabled swipe-scroll event (used in sliders for example)
 }
 
 impl EventResult {
 	#[must_use]
-	pub const fn can_propagate(self) -> bool {
-		!matches!(self, EventResult::Consumed)
+	pub const fn can_propagate(&self) -> bool {
+		!matches!(self, EventResult::Consumed | EventResult::ConsumedExclusive)
 	}
 
 	#[must_use]
@@ -221,6 +238,22 @@ fn get_scroll_enabled(style: &taffy::Style) -> (bool, bool) {
 	)
 }
 
+const OVERFLOW_START_THRESHOLD_UNITS: f32 = 3.0; // don't show scrollbars for nearly non-scrollable lists
+
+fn get_scroll_active_axis(style: &taffy::Style, taffy_layout: &taffy::Layout) -> (bool, bool) {
+	let (enabled_horiz, enabled_vert) = get_scroll_enabled(style);
+	if !enabled_horiz && !enabled_vert {
+		return (false, false);
+	}
+
+	let overflow = Vec2::new(taffy_layout.scroll_width(), taffy_layout.scroll_height());
+
+	(
+		overflow.x >= OVERFLOW_START_THRESHOLD_UNITS,
+		overflow.y >= OVERFLOW_START_THRESHOLD_UNITS,
+	)
+}
+
 pub struct ScrollbarInfo {
 	// total contents size of the currently scrolling widget
 	content_size: Vec2,
@@ -229,15 +262,13 @@ pub struct ScrollbarInfo {
 	handle_size: Vec2,
 }
 
-pub fn get_scrollbar_info(l: &taffy::Layout) -> Option<ScrollbarInfo> {
-	let overflow_start_threshold_units = 3.0; // don't show scrollbars for nearly non-scrollable lists
-
-	let overflow = Vec2::new(l.scroll_width(), l.scroll_height());
-	if overflow.x < overflow_start_threshold_units && overflow.y < overflow_start_threshold_units {
+pub fn get_scrollbar_info(taffy_layout: &taffy::Layout) -> Option<ScrollbarInfo> {
+	let overflow = Vec2::new(taffy_layout.scroll_width(), taffy_layout.scroll_height());
+	if overflow.x < OVERFLOW_START_THRESHOLD_UNITS && overflow.y < OVERFLOW_START_THRESHOLD_UNITS {
 		return None; // not overflowing
 	}
 
-	let content_size = Vec2::new(l.content_size.width, l.content_size.height);
+	let content_size = Vec2::new(taffy_layout.content_size.width, taffy_layout.content_size.height);
 	let handle_size = 1.0 - (overflow / content_size);
 
 	Some(ScrollbarInfo {
@@ -246,6 +277,15 @@ pub fn get_scrollbar_info(l: &taffy::Layout) -> Option<ScrollbarInfo> {
 	})
 }
 
+impl ScrollbarInfo {
+	fn get_potential_scroll_axis_multiplier(&self, taffy_layout: &taffy::Layout) -> Vec2 {
+		Vec2::new(
+			self.content_size.x - taffy_layout.content_box_width(),
+			self.content_size.y - taffy_layout.content_box_height(),
+		)
+	}
+}
+
 impl dyn WidgetObj {
 	pub fn get_as<T: 'static>(&self) -> Option<&T> {
 		let any = self.as_any();
@@ -314,8 +354,6 @@ impl WidgetState {
 	}
 
 	pub fn get_scroll_shift_smooth(&self, info: &ScrollbarInfo, l: &taffy::Layout, timestep_alpha: f32) -> (Vec2, bool) {
-		//return (self.get_scroll_shift_raw(info, l), false);
-
 		let currently_animating = self.data.scrolling_cur != self.data.scrolling_cur_prev;
 
 		let scrolling = self
@@ -348,6 +386,46 @@ impl WidgetState {
 		let scrolling_cur_prev = &mut self.data.scrolling_cur_prev;
 		let scrolling_target = &mut self.data.scrolling_target;
 
+		let mut perform_next_tick = false;
+
+		// check for boundaries
+		if !self.data.swipe_running {
+			// top bound
+			if scrolling_target.y < 0.0 {
+				self.data.scrolling_velocity.y *= KINETIC_VELOCITY_BRAKE;
+				scrolling_target.y *= RUBBERBANDING_DAMP;
+				perform_next_tick = true;
+			}
+
+			// left bound
+			if scrolling_target.x < 0.0 {
+				self.data.scrolling_velocity.x *= KINETIC_VELOCITY_BRAKE;
+				scrolling_target.x *= RUBBERBANDING_DAMP;
+				perform_next_tick = true;
+			}
+
+			// right bound
+			if scrolling_target.x > 1.0 {
+				self.data.scrolling_velocity.x *= KINETIC_VELOCITY_BRAKE;
+				scrolling_target.x = 1.0.lerp(scrolling_target.x, RUBBERBANDING_DAMP);
+				perform_next_tick = true;
+			}
+
+			// bottom bound
+			if scrolling_target.y > 1.0 {
+				self.data.scrolling_velocity.y *= KINETIC_VELOCITY_BRAKE;
+				scrolling_target.y = 1.0.lerp(scrolling_target.y, RUBBERBANDING_DAMP);
+				perform_next_tick = true;
+			}
+		}
+
+		// Perform kinetic velocity animation
+		if self.data.scrolling_velocity.length_squared() > 1e-9 {
+			*scrolling_target += self.data.scrolling_velocity;
+			self.data.scrolling_velocity *= KINETIC_VELOCITY_DAMPING;
+			perform_next_tick = true;
+		}
+
 		*scrolling_cur_prev = *scrolling_cur;
 
 		if scrolling_cur != scrolling_target {
@@ -355,8 +433,7 @@ impl WidgetState {
 			*scrolling_cur = scrolling_cur.lerp(*scrolling_target, 0.2);
 
 			// trigger tick request again
-			alterables.mark_tick(this_widget_id);
-			alterables.mark_redraw();
+			perform_next_tick = true;
 
 			let epsilon = 0.00001;
 			if (scrolling_cur.x - scrolling_target.x).abs() < epsilon
@@ -365,6 +442,11 @@ impl WidgetState {
 				*scrolling_cur = *scrolling_target;
 			}
 		}
+
+		if perform_next_tick {
+			alterables.mark_tick(this_widget_id);
+			alterables.mark_redraw();
+		}
 	}
 
 	pub fn draw_scrollbars(&mut self, state: &mut DrawState, params: &DrawParams, info: &ScrollbarInfo) {
@@ -385,40 +467,41 @@ impl WidgetState {
 			..Default::default()
 		};
 
+		#[allow(clippy::useless_let_if_seq)]
+		let mut boundary: Option<drawing::Boundary> = None;
+
 		// Horizontal handle
 		if enabled_horiz && info.handle_size.x < 1.0 {
-			state.primitives.push(drawing::RenderPrimitive::Rectangle(
-				PrimitiveExtent {
-					boundary: drawing::Boundary::from_pos_size(
-						Vec2::new(
-							// X
-							transform_widget.content_rel_pos.x
-								+ transform_parent.raw_dim.x * (1.0 - info.handle_size.x) * self.data.scrolling_cur.x,
-							// Y
-							transform_widget.content_rel_pos.y + transform_widget.raw_dim.y - thickness - margin,
-						),
-						Vec2::new(transform_widget.raw_dim.x * info.handle_size.x, thickness),
-					),
-					transform: transform_parent.transform,
-				},
-				rect_params,
+			boundary = Some(drawing::Boundary::from_pos_size(
+				Vec2::new(
+					// X
+					transform_widget.content_rel_pos.x
+						+ transform_parent.raw_dim.x * (1.0 - info.handle_size.x) * self.data.scrolling_cur.x.clamp(0.0, 1.0),
+					// Y
+					transform_widget.content_rel_pos.y + transform_widget.raw_dim.y - thickness - margin,
+				),
+				Vec2::new(transform_widget.raw_dim.x * info.handle_size.x, thickness),
 			));
 		}
 
 		// Vertical handle
 		if enabled_vert && info.handle_size.y < 1.0 {
+			boundary = Some(drawing::Boundary::from_pos_size(
+				Vec2::new(
+					// X
+					transform_widget.content_rel_pos.x + transform_widget.raw_dim.x - thickness - margin,
+					// Y
+					transform_widget.content_rel_pos.y
+						+ transform_parent.raw_dim.y * (1.0 - info.handle_size.y) * self.data.scrolling_cur.y.clamp(0.0, 1.0),
+				),
+				Vec2::new(thickness, transform_widget.raw_dim.y * info.handle_size.y),
+			));
+		}
+
+		if let Some(boundary) = boundary.take() {
 			state.primitives.push(drawing::RenderPrimitive::Rectangle(
 				PrimitiveExtent {
-					boundary: drawing::Boundary::from_pos_size(
-						Vec2::new(
-							// X
-							transform_widget.content_rel_pos.x + transform_widget.raw_dim.x - thickness - margin,
-							// Y
-							transform_widget.content_rel_pos.y
-								+ transform_parent.raw_dim.y * (1.0 - info.handle_size.y) * self.data.scrolling_cur.y,
-						),
-						Vec2::new(thickness, transform_widget.raw_dim.y * info.handle_size.y),
-					),
+					boundary,
 					transform: transform_parent.transform,
 				},
 				rect_params,
@@ -432,13 +515,13 @@ impl WidgetState {
 			return false;
 		}
 
-		let l = params.layout;
+		let l = params.taffy_layout;
 		let overflow = Vec2::new(l.scroll_width(), l.scroll_height());
 		if overflow.x == 0.0 && overflow.y == 0.0 {
 			return false; // not overflowing
 		}
 
-		let Some(info) = get_scrollbar_info(params.layout) else {
+		let Some(info) = get_scrollbar_info(l) else {
 			return false;
 		};
 
@@ -451,7 +534,7 @@ impl WidgetState {
 				}
 
 				let mult = (1.0 / (content_box_length - content_length)) * step_pixels;
-				let new_scroll = (*scrolling_target + wheel_delta * mult).clamp(0.0, 1.0);
+				let new_scroll = *scrolling_target + wheel_delta * mult;
 				if *scrolling_target == new_scroll {
 					return;
 				}
@@ -479,20 +562,111 @@ impl WidgetState {
 		true
 	}
 
+	// this is called before calling children of this widget
+	pub fn process_event_priority<'a>(
+		&mut self,
+		params: &mut EventParams,
+		widget_id: WidgetID,
+		event: &Event,
+		event_result: &'a mut EventResult,
+	) -> anyhow::Result<EventResult> {
+		match &event {
+			Event::MouseCancel => {
+				*event_result = EventResult::Pass;
+			}
+			Event::MouseUp(_e) => {
+				if self.data.swipe_running {
+					self.data.swipe_running = false;
+					let kinetic_force = (self.data.scrolling_cur - self.data.scrolling_cur_prev) * 20.0;
+					self.data.scrolling_velocity += kinetic_force;
+					params.alterables.mark_tick(widget_id);
+					params.alterables.mark_redraw();
+				}
+				self.data.press_down_start_mouse_pos = None;
+			}
+			Event::MouseMotion(e) => {
+				if let Some(start_mouse_pos) = &self.data.press_down_start_mouse_pos {
+					let (active_x, active_y) = get_scroll_active_axis(params.style, params.taffy_layout);
+
+					if !self.data.swipe_running
+						&& ((active_x && (e.pos.x - start_mouse_pos.x).abs() >= SWIPE_START_THRESHOLD_UNITS)
+							|| (active_y && (e.pos.y - start_mouse_pos.y).abs() >= SWIPE_START_THRESHOLD_UNITS))
+					{
+						self.data.swipe_running = true;
+						params.alterables.emit_global_event(Event::MouseCancel);
+					}
+
+					if self.data.swipe_running
+						&& let Some(scrollbar_info) = get_scrollbar_info(params.taffy_layout)
+					{
+						let mouse_diff = e.pos - start_mouse_pos;
+
+						let mult = scrollbar_info.get_potential_scroll_axis_multiplier(params.taffy_layout);
+
+						let scroll_diff_x = if mult.x == 0.0 { 0.0 } else { -mouse_diff.x / mult.x };
+						let scroll_diff_y = if mult.y == 0.0 { 0.0 } else { -mouse_diff.y / mult.y };
+
+						self.data.scrolling_target = self.data.swipe_scroll_start + Vec2::new(scroll_diff_x, scroll_diff_y);
+						params.alterables.mark_tick(self.obj.get_id());
+
+						return Ok(EventResult::Consumed);
+					}
+				}
+			}
+			_ => {}
+		}
+
+		Ok(EventResult::Pass)
+	}
+
+	fn process_swipe_event(&mut self, event: &Event, params: &EventParams) {
+		let Event::MouseDown(evt) = &event else {
+			return;
+		};
+
+		// firstly, check if this widget is scrollable at all
+		let (active_x, active_y) = get_scroll_active_axis(params.style, params.taffy_layout);
+		if !active_x && !active_y {
+			return;
+		}
+
+		// check if the mouse hovers over *parent* boundaries
+		// we assume there that our parent is non-scrollable
+		let transform_parent = params.alterables.transform_stack.parent();
+		if !Event::test_transform_pos(transform_parent, evt.pos) {
+			return;
+		}
+
+		self.data.press_down_start_mouse_pos = Some(evt.pos);
+		self.data.swipe_scroll_start = self.data.scrolling_target;
+	}
+
 	pub fn process_event<'a, 'b, U1: 'static, U2: 'static>(
 		&mut self,
+		params: &'a mut EventParams<'a>,
 		widget_id: WidgetID,
-		node_id: taffy::NodeId,
 		event: &Event,
 		event_result: &'a mut EventResult,
 		user_data: &'a mut (&'b mut U1, &'b mut U2),
-		params: &'a mut EventParams<'a>,
 	) -> anyhow::Result<()> {
-		let hovered = event.test_mouse_within_transform(params.alterables.transform_stack.get());
+		// check if we should swipe-scroll this widget
+		if *event_result != EventResult::ConsumedExclusive {
+			self.process_swipe_event(event, params);
+		}
+
+		if !event_result.can_propagate() {
+			// we don't want to pass any other events
+			return Ok(());
+		}
+
+		let hovered = event.test_mouse_within_transform(
+			params.alterables.transform_stack.get(),
+			&params.alterables.scissor_stack.get().0,
+		);
 
 		let mut invoke_data = InvokeData {
 			widget_id,
-			node_id,
+			node_id: params.node_id,
 			event_result,
 			user_data,
 			params,
@@ -508,6 +682,9 @@ impl WidgetState {
 					CallbackMetadata::TextInput(e.clone()),
 				)?);
 			}
+			Event::MouseCancel => {
+				res = Some(self.invoke_listeners(&mut invoke_data, EventListenerKind::MouseCancel, CallbackMetadata::None)?);
+			}
 			Event::MouseDown(e) => {
 				if hovered && self.data.set_device_pressed(e.device, true) {
 					res = Some(self.invoke_listeners(
@@ -528,7 +705,6 @@ impl WidgetState {
 			}
 			Event::MouseMotion(e) => {
 				let hover_state_changed = self.data.set_device_hovered(e.device, hovered);
-
 				if hover_state_changed {
 					if self.data.is_hovered() {
 						res =
diff --git a/wgui/src/widget/rectangle.rs b/wgui/src/widget/rectangle.rs
index b5a14a26..c711bec1 100644
--- a/wgui/src/widget/rectangle.rs
+++ b/wgui/src/widget/rectangle.rs
@@ -1,8 +1,10 @@
 use slotmap::Key;
 
 use crate::{
+	color::WguiColor,
 	drawing::{self, GradientMode, PrimitiveExtent},
 	event::CallbackDataCommon,
+	globals::Globals,
 	layout::WidgetID,
 	widget::{WidgetStateFlags, util::WLength},
 };
@@ -11,12 +13,12 @@ use super::{WidgetObj, WidgetState};
 
 #[derive(Debug, Default)]
 pub struct WidgetRectangleParams {
-	pub color: drawing::Color,
-	pub color2: drawing::Color,
+	pub color: WguiColor,
+	pub color2: WguiColor,
 	pub gradient: GradientMode,
 
 	pub border: f32,
-	pub border_color: drawing::Color,
+	pub border_color: WguiColor,
 
 	pub round: WLength,
 }
@@ -36,10 +38,16 @@ impl WidgetRectangle {
 			}),
 		)
 	}
-	pub fn set_color(&mut self, common: &mut CallbackDataCommon, color: drawing::Color) {
+
+	pub fn set_color(&mut self, common: &mut CallbackDataCommon, color: WguiColor) {
 		self.params.color = color;
 		common.mark_widget_dirty(self.id);
 	}
+
+	pub fn set_border_color(&mut self, common: &mut CallbackDataCommon, color: WguiColor) {
+		self.params.border_color = color;
+		common.mark_widget_dirty(self.id);
+	}
 }
 
 impl WidgetObj for WidgetRectangle {
@@ -51,17 +59,21 @@ impl WidgetObj for WidgetRectangle {
 			WLength::Percent(percent) => (f32::min(boundary.size.x, boundary.size.y) * percent / 2.0) as u8,
 		};
 
+		let color = self.params.color.resolve(&state.globals.palette);
+		let color2 = self.params.color2.resolve(&state.globals.palette);
+		let border_color = self.params.border_color.resolve(&state.globals.palette);
+
 		state.primitives.push(drawing::RenderPrimitive::Rectangle(
 			PrimitiveExtent {
 				boundary,
 				transform: state.transform_stack.get().transform,
 			},
 			drawing::Rectangle {
-				color: self.params.color,
-				color2: self.params.color2,
+				color,
+				color2,
+				border_color,
 				gradient: self.params.gradient,
 				border: self.params.border,
-				border_color: self.params.border_color,
 				round_units,
 			},
 		));
@@ -79,11 +91,11 @@ impl WidgetObj for WidgetRectangle {
 		super::WidgetType::Rectangle
 	}
 
-	fn debug_print(&self) -> String {
+	fn debug_print(&self, globals: &Globals) -> String {
 		format!(
 			"[color: {}][color2: {}][gradient: {:?}]",
-			self.params.color.debug_ansi_block(),
-			self.params.color2.debug_ansi_block(),
+			self.params.color.resolve(&globals.palette).debug_ansi_block(),
+			self.params.color2.resolve(&globals.palette).debug_ansi_block(),
 			self.params.gradient,
 		)
 	}
diff --git a/wgui/src/widget/sprite.rs b/wgui/src/widget/sprite.rs
index e8063913..0c3530ce 100644
--- a/wgui/src/widget/sprite.rs
+++ b/wgui/src/widget/sprite.rs
@@ -4,8 +4,9 @@ use cosmic_text::{Attrs, Buffer, Color, Shaping, Weight};
 use slotmap::Key;
 
 use crate::{
+	color::{ParentColor, WguiColor},
 	drawing::{self, PrimitiveExtent},
-	event::CallbackDataCommon,
+	event::{CallbackDataCommon, EventAlterables},
 	globals::Globals,
 	layout::WidgetID,
 	renderer_vk::text::{
@@ -20,9 +21,12 @@ use super::{WidgetObj, WidgetState};
 #[derive(Debug, Default)]
 pub struct WidgetSpriteParams {
 	pub glyph_data: Option<CustomGlyphData>,
-	pub color: Option<drawing::Color>,
+	pub color: Option<WguiColor>,
+	pub parent_color: ParentColor,
 }
 
+const DEFAULT_COLOR: WguiColor = WguiColor::Raw(drawing::Color::from_hex("#ffffff").unwrap());
+
 #[derive(Debug, Default)]
 pub struct WidgetSprite {
 	params: WidgetSpriteParams,
@@ -40,27 +44,31 @@ impl WidgetSprite {
 		)
 	}
 
-	pub fn set_color(&mut self, common: &mut CallbackDataCommon, color: drawing::Color) {
+	pub fn set_color(&mut self, common: &mut CallbackDataCommon, color: WguiColor) {
 		self.params.color = Some(color);
 		common.mark_widget_dirty(self.id);
 	}
 
-	pub const fn get_color(&self) -> Option<drawing::Color> {
-		self.params.color
+	pub fn get_color(&self) -> WguiColor {
+		self.params.color.unwrap_or(DEFAULT_COLOR)
 	}
 
-	pub fn set_content(&mut self, common: &mut CallbackDataCommon, content: Option<CustomGlyphData>) {
+	pub fn set_content(&mut self, alterables: &mut EventAlterables, content: Option<CustomGlyphData>) {
 		if self.params.glyph_data == content {
 			return;
 		}
 
 		self.params.glyph_data = content;
-		common.mark_widget_dirty(self.id);
+		alterables.mark_dirty_and_redraw(self.id);
 	}
 
 	pub fn get_content(&self) -> Option<CustomGlyphData> {
 		self.params.glyph_data.clone()
 	}
+
+	pub fn parent_color(&self) -> ParentColor {
+		self.params.parent_color
+	}
 }
 
 impl WidgetObj for WidgetSprite {
@@ -78,7 +86,9 @@ impl WidgetObj for WidgetSprite {
 					self
 						.params
 						.color
-						.map_or(cosmic_text::Color::rgb(255, 255, 255), Into::into),
+						.unwrap_or(DEFAULT_COLOR)
+						.resolve(&state.globals.palette)
+						.into(),
 				),
 				snap_to_physical_pixel: true,
 			};
@@ -135,7 +145,7 @@ impl WidgetObj for WidgetSprite {
 		super::WidgetType::Sprite
 	}
 
-	fn debug_print(&self) -> String {
+	fn debug_print(&self, _globals: &Globals) -> String {
 		String::default()
 	}
 }
diff --git a/wgui/src/windowing/context_menu.rs b/wgui/src/windowing/context_menu.rs
index 6852604e..d9de5415 100644
--- a/wgui/src/windowing/context_menu.rs
+++ b/wgui/src/windowing/context_menu.rs
@@ -1,17 +1,15 @@
-use std::{collections::HashMap, rc::Rc};
-
-use glam::Vec2;
-
 use crate::{
 	assets::AssetPath,
 	components::{ComponentTrait, button::ComponentButton},
 	globals::WguiGlobals,
 	i18n::Translation,
 	layout::Layout,
-	parser::{self, Fetchable, ParserState},
+	parser::{self, Fetchable, ParserState, TemplateParams},
 	task::Tasks,
-	windowing::window::{WguiWindow, WguiWindowParams, WguiWindowParamsExtra},
+	windowing::window::{WguiWindow, WguiWindowParams, WguiWindowParamsExtra, WguiWindowPlacement},
 };
+use glam::Vec2;
+use std::rc::Rc;
 
 #[derive(Clone)]
 pub struct Cell {
@@ -25,7 +23,7 @@ pub enum Blueprint {
 	Cells(Vec<Cell>),
 	Template {
 		template_name: Rc<str>,
-		template_params: HashMap<Rc<str>, Rc<str>>,
+		template_params: TemplateParams,
 	},
 }
 
@@ -77,7 +75,7 @@ impl ContextMenu {
 		self.window.close();
 	}
 
-	fn open_process(
+	fn process_open(
 		&mut self,
 		params: OpenParams,
 		layout: &mut Layout,
@@ -91,15 +89,27 @@ impl ContextMenu {
 			Blueprint::Cells(cells) => cells,
 		};
 
+		let root_size = layout.state.get_widget_size(layout.content_root_widget);
+
+		let (window_pos, placement) = if params.position.y < root_size.y / 2.0 {
+			(params.position, WguiWindowPlacement::TopLeft)
+		} else {
+			// invert y axis (position.y is counted from the bottom)
+			(
+				Vec2::new(params.position.x, root_size.y - params.position.y),
+				WguiWindowPlacement::BottomLeft,
+			)
+		};
+
 		let globals = layout.state.globals.clone();
 
 		self.window.open(&mut WguiWindowParams {
-			globals: &globals,
 			layout,
-			position: params.position,
+			position: window_pos,
 			extra: WguiWindowParamsExtra {
 				with_decorations: false,
 				close_if_clicked_outside: true,
+				placement,
 				..Default::default()
 			},
 		})?;
@@ -112,13 +122,13 @@ impl ContextMenu {
 		let id_buttons = inner_parser.get_widget_id("buttons")?;
 
 		for (idx, cell) in cells.iter().enumerate() {
-			let mut par = HashMap::new();
-			par.insert(Rc::from("text"), cell.title.generate(&mut globals.i18n()));
+			let mut par = TemplateParams::new();
+			par.insert_rc("text", cell.title.generate(&mut globals.i18n()));
 			if let Some(tooltip) = cell.tooltip.as_ref() {
-				par.insert(Rc::from("tooltip_str"), tooltip.generate(&mut globals.i18n()));
+				par.insert_rc("tooltip_str", tooltip.generate(&mut globals.i18n()));
 			}
 
-			let mut data_cell = inner_parser.realize_template(&doc_params, "Cell", layout, id_buttons, par)?;
+			let mut data_cell = inner_parser.parse_template_only(&doc_params, "Cell", layout, id_buttons, par)?;
 
 			let button = data_cell.fetch_component_as::<ComponentButton>("button")?;
 			let button_id = button.base().get_id();
@@ -145,7 +155,7 @@ impl ContextMenu {
 
 	pub fn tick(&mut self, layout: &mut Layout, parser_state: &mut ParserState) -> anyhow::Result<TickResult> {
 		if let Some(p) = self.pending_open.take() {
-			self.open_process(p, layout, parser_state)?;
+			self.process_open(p, layout, parser_state)?;
 			let _ = self.tasks.drain();
 			return Ok(TickResult::Opened);
 		}
diff --git a/wgui/src/windowing/window.rs b/wgui/src/windowing/window.rs
index 2ab6fc95..456ccf04 100644
--- a/wgui/src/windowing/window.rs
+++ b/wgui/src/windowing/window.rs
@@ -9,7 +9,6 @@ use crate::{
 	components::button::ComponentButton,
 	drawing,
 	event::{EventListenerKind, StyleSetRequest},
-	globals::WguiGlobals,
 	i18n::Translation,
 	layout::{Layout, LayoutTask, LayoutTasks, WidgetPair},
 	parser::{self, Fetchable, ParserState},
@@ -81,7 +80,6 @@ impl Default for WguiWindowParamsExtra {
 
 pub struct WguiWindowParams<'a> {
 	pub position: Vec2,
-	pub globals: &'a WguiGlobals,
 	pub layout: &'a mut Layout,
 	pub extra: WguiWindowParamsExtra,
 }
@@ -100,7 +98,7 @@ impl WguiWindow {
 		self.0.borrow_mut().opened_window = None;
 	}
 
-	pub fn open(&mut self, params: &mut WguiWindowParams) -> anyhow::Result<()> {
+	pub fn open(&self, params: &mut WguiWindowParams) -> anyhow::Result<()> {
 		// close previous one if it's already open
 		self.close();
 
@@ -124,8 +122,8 @@ impl WguiWindow {
 					bottom: length(0.0),
 					right: length(0.0),
 				},
-				taffy::JustifyContent::Start, // x start
-				taffy::AlignItems::Start,     // y start
+				taffy::JustifyContent::START, // x start
+				taffy::AlignItems::START,     // y start
 			),
 			WguiWindowPlacement::BottomLeft => (
 				taffy::Rect {
@@ -134,8 +132,8 @@ impl WguiWindow {
 					bottom: length(params.position.y - window_padding),
 					right: length(0.0),
 				},
-				taffy::JustifyContent::Start, // x start
-				taffy::AlignItems::End,       // y end
+				taffy::JustifyContent::START, // x start
+				taffy::AlignItems::END,       // y end
 			),
 			WguiWindowPlacement::TopRight => (
 				taffy::Rect {
@@ -144,8 +142,8 @@ impl WguiWindow {
 					bottom: length(0.0),
 					right: length(params.position.x - window_padding),
 				},
-				taffy::JustifyContent::End, // x end
-				taffy::AlignItems::Start,   // y start
+				taffy::JustifyContent::END, // x end
+				taffy::AlignItems::START,   // y start
 			),
 			WguiWindowPlacement::BottomRight => (
 				taffy::Rect {
@@ -154,8 +152,8 @@ impl WguiWindow {
 					bottom: length(params.position.y - window_padding),
 					right: length(params.position.x - window_padding),
 				},
-				taffy::JustifyContent::End, // x end
-				taffy::AlignItems::End,     // y end
+				taffy::JustifyContent::END, // x end
+				taffy::AlignItems::END,     // y end
 			),
 		};
 
@@ -191,7 +189,7 @@ impl WguiWindow {
 				AnimationEasing::OutQuad,
 				Box::new(|common, data| {
 					let rect = data.obj.get_as_mut::<WidgetRectangle>().unwrap() /* should always succeed */;
-					rect.params.color = drawing::Color::new(0.0, 0.0, 0.0, data.pos * 0.3);
+					rect.params.color = drawing::Color::new(0.0, 0.0, 0.0, data.pos * 0.3).into();
 					common.alterables.mark_redraw();
 				}),
 			));
@@ -216,12 +214,14 @@ impl WguiWindow {
 			},
 		)?;
 
+		let globals = params.layout.state.globals.clone();
+
 		let content_id = if params.extra.with_decorations {
 			let xml_path: AssetPath = AssetPath::WguiInternal("wgui/window_frame.xml");
 
 			let state = parser::parse_from_assets(
 				&parser::ParseDocumentParams {
-					globals: params.globals.clone(),
+					globals: globals.clone(),
 					path: xml_path,
 					extra: Default::default(),
 				},
@@ -240,7 +240,7 @@ impl WguiWindow {
 
 			if let Some(title) = &params.extra.title {
 				let mut text_title = state.fetch_widget_as::<WidgetLabel>(&params.layout.state, "text_window_title")?;
-				text_title.set_text_simple(&mut params.globals.get(), title.clone());
+				text_title.set_text_simple(&mut globals.get(), title.clone());
 			}
 			let content = state.fetch_widget(&params.layout.state, "content")?;
 
@@ -270,21 +270,20 @@ impl WguiWindow {
 			content.id
 		};
 
-		let mut c = params.layout.start_common();
 		if let Some(width) = params.extra.fixed_width {
-			c.common()
+			params
+				.layout
 				.alterables
 				.set_style(content_id, StyleSetRequest::Width(length(width)));
 		}
 
 		if let Some(height) = params.extra.fixed_height {
-			c.common()
+			params
+				.layout
 				.alterables
 				.set_style(content_id, StyleSetRequest::Height(length(height)));
 		}
 
-		c.finish()?;
-
 		Ok(())
 	}
 
diff --git a/wlx-capture/Cargo.toml b/wlx-capture/Cargo.toml
index 8ff3a9e0..899d7bb4 100644
--- a/wlx-capture/Cargo.toml
+++ b/wlx-capture/Cargo.toml
@@ -5,47 +5,50 @@ edition = "2024"
 authors = ["galister"]
 description = "Screen capture library for Wayland and X11"
 repository = "https://github.com/galister/wlx-capture"
-keywords = ["desktop", "capture", "pipewire", "wayland", "x11"]
+keywords = ["capture", "desktop", "pipewire", "wayland", "x11"]
 categories = ["computer-vision", "multimedia::images"]
 documentation = "https://docs.rs/wlx-capture"
 license = "GPL-3.0-only"
 
+[dependencies]
+dbus = { workspace = true, features = ["futures"], optional = true }
+idmap = { workspace = true }
+libc.workspace = true
+log = { workspace = true }
+pipewire = { workspace = true, optional = true }
+slotmap.workspace = true
+wayland-client = { workspace = true, optional = true }
+wayland-protocols = {
+  workspace = true,
+  features = [
+    "client",
+    "staging",
+    "unstable",
+    "wayland-client",
+  ],
+  optional = true
+}
+
+drm-fourcc = "2.2.0"
+rxscreen = {
+  version = "0.1.7",
+  features = [
+    "mouse",
+    "shm",
+    "xrandr",
+  ],
+  optional = true
+}
+smithay-client-toolkit = { version = "0.20.0", optional = true }
+
 [features]
-default = ["wayland", "pipewire"]
+default = ["pipewire", "wayland"]
 egl = []
-wlr = ["wayland"]
-pipewire = ["wayland", "dep:ashpd", "dep:pipewire"]
+pipewire = ["dep:dbus", "dep:pipewire", "wayland"]
 wayland = [
   "dep:smithay-client-toolkit",
   "dep:wayland-client",
   "dep:wayland-protocols",
 ]
+wlr = ["wayland"]
 xshm = ["dep:rxscreen"]
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-ashpd = { version = "0.12.0", default-features = false, features = [
-  "async-std",
-], optional = true }
-drm-fourcc = "2.2.0"
-idmap = { workspace = true }
-libc = "0.2.178"
-log = { workspace = true }
-pipewire = { git = "https://gitlab.freedesktop.org/galister/pipewire-rs.git", rev = "6ef2cd1af41e5e8844c63c37ea9a01f0758079b0", features = [
-  "v0_3_33",
-], optional = true }
-#pipewire = { version = "0.8.0", features = ["v0_3_33"], optional = true }
-rxscreen = { version = "0.1.7", features = [
-  "shm",
-  "xrandr",
-  "mouse",
-], optional = true }
-smithay-client-toolkit = { version = "0.20.0", optional = true }
-wayland-client = { workspace = true, optional = true }
-wayland-protocols = { version = "0.32.9", features = [
-  "wayland-client",
-  "client",
-  "staging",
-  "unstable",
-], optional = true }
diff --git a/wlx-capture/src/frame.rs b/wlx-capture/src/frame.rs
index c0c7fc18..c1c9c7b9 100644
--- a/wlx-capture/src/frame.rs
+++ b/wlx-capture/src/frame.rs
@@ -16,7 +16,7 @@ pub enum WlxFrame {
     Dmabuf(DmabufFrame),
     MemFd(MemFdFrame),
     MemPtr(MemPtrFrame),
-    Implicit,
+    Implicit(Transform),
 }
 
 #[derive(Debug, Clone, Copy, Default, PartialEq)]
diff --git a/wlx-capture/src/pipewire.rs b/wlx-capture/src/pipewire/capture.rs
similarity index 81%
rename from wlx-capture/src/pipewire.rs
rename to wlx-capture/src/pipewire/capture.rs
index 3d5de1cf..cb588c81 100644
--- a/wlx-capture/src/pipewire.rs
+++ b/wlx-capture/src/pipewire/capture.rs
@@ -1,30 +1,24 @@
 use std::any::Any;
 use std::collections::HashMap;
 use std::sync::Arc;
-use std::sync::atomic::AtomicU32;
-use std::sync::atomic::Ordering;
 use std::sync::mpsc;
 use std::thread::JoinHandle;
 
-use ashpd::desktop::{
-    PersistMode,
-    screencast::{CursorMode, Screencast, SourceType},
-};
-
-pub use ashpd::Error as AshpdError;
-
 use drm_fourcc::DrmFormat;
 use drm_fourcc::DrmFourcc;
 use drm_fourcc::DrmModifier;
 use pipewire as pw;
+use pipewire::context::ContextRc;
+use pipewire::main_loop::MainLoopRc;
+use pipewire::spa::buffer::meta::MetaVideoTransformValue;
+use pipewire::spa::buffer::meta::{MetaCursor, MetaHeader, MetaHeaderFlags, MetaVideoTransform};
+use pipewire::stream::StreamRc;
 use pw::spa;
 
+use pw::Error;
 use pw::properties::properties;
 use pw::stream::{Stream, StreamFlags};
-use pw::{Error, context::Context, main_loop::MainLoop};
 use spa::buffer::DataType;
-use spa::buffer::MetaData;
-use spa::buffer::MetaType;
 use spa::param::ParamType;
 use spa::param::video::VideoFormat;
 use spa::param::video::VideoInfoRaw;
@@ -43,93 +37,6 @@ use crate::frame::Transform;
 use crate::frame::WlxFrame;
 use crate::frame::{DmabufFrame, FramePlane, MemFdFrame, MemPtrFrame};
 
-#[derive(Debug, Clone)]
-pub struct PipewireStream {
-    pub node_id: u32,
-    pub position: Option<(i32, i32)>,
-    pub size: Option<(i32, i32)>,
-}
-
-#[derive(Debug, Clone)]
-pub struct PipewireSelectScreenResult {
-    pub streams: Vec<PipewireStream>,
-    pub restore_token: Option<String>,
-}
-
-pub async fn pipewire_select_screen(
-    token: Option<&str>,
-    embed_mouse: bool,
-    screens_only: bool,
-    persist: bool,
-    multiple: bool,
-) -> Result<PipewireSelectScreenResult, AshpdError> {
-    static CURSOR_MODES: AtomicU32 = AtomicU32::new(0);
-
-    let proxy = Screencast::new().await?;
-    let session = proxy.create_session().await?;
-
-    let mut cursor_modes = CURSOR_MODES.load(Ordering::Relaxed);
-    if cursor_modes == 0 {
-        cursor_modes = proxy.get_property::<u32>("AvailableCursorModes").await?;
-
-        log::debug!("Available cursor modes: {cursor_modes:#x}");
-
-        // properly will be same system-wide, so race condition not a concern
-        CURSOR_MODES.store(cursor_modes, Ordering::Relaxed);
-    }
-
-    let cursor_mode = match embed_mouse {
-        true if cursor_modes & (CursorMode::Embedded as u32) != 0 => CursorMode::Embedded,
-        _ if cursor_modes & (CursorMode::Metadata as u32) != 0 => CursorMode::Metadata,
-        _ => CursorMode::Hidden,
-    };
-
-    log::debug!("Selected cursor mode: {cursor_mode:?}");
-
-    let source_type = if screens_only {
-        SourceType::Monitor.into()
-    } else {
-        SourceType::Monitor | SourceType::Window | SourceType::Virtual
-    };
-
-    let persist_mode = if persist {
-        PersistMode::ExplicitlyRevoked
-    } else {
-        PersistMode::DoNot
-    };
-
-    proxy
-        .select_sources(
-            &session,
-            cursor_mode,
-            source_type,
-            multiple,
-            token,
-            persist_mode,
-        )
-        .await?;
-
-    let response = proxy.start(&session, None).await?.response()?;
-
-    let streams: Vec<_> = response
-        .streams()
-        .iter()
-        .map(|stream| PipewireStream {
-            node_id: stream.pipe_wire_node_id(),
-            position: stream.position(),
-            size: stream.size(),
-        })
-        .collect();
-    if !streams.is_empty() {
-        return Ok(PipewireSelectScreenResult {
-            streams,
-            restore_token: response.restore_token().map(String::from),
-        });
-    }
-
-    Err(ashpd::Error::NoResponse)
-}
-
 #[derive(Default)]
 struct StreamData {
     format: Option<FrameFormat>,
@@ -278,12 +185,12 @@ where
     R: Any,
 {
     log::debug!("{}: pipewire main_loop start", &name);
-    let main_loop = MainLoop::new(None)?;
-    let context = Context::new(&main_loop)?;
-    let core = context.connect(None)?;
+    let main_loop = MainLoopRc::new(None)?;
+    let context = ContextRc::new(&main_loop, None)?;
+    let core = context.connect_rc(None)?;
 
-    let stream = Stream::new(
-        &core,
+    let stream = StreamRc::new(
+        core,
         &name,
         properties! {
             *pw::keys::MEDIA_TYPE => "Video",
@@ -377,36 +284,35 @@ where
                 }
 
                 if let Some(mut buffer) = maybe_buffer {
-                    if let MetaData::Header(header) = buffer.find_meta_data(MetaType::Header)
-                        && header.flags & spa::sys::SPA_META_HEADER_FLAG_CORRUPTED != 0
+                    if let Some(header) = buffer.find_meta::<MetaHeader>()
+                        && header.flags().contains(MetaHeaderFlags::CORRUPTED)
                     {
                         log::warn!("{}: PipeWire buffer is corrupt.", &name);
                         return;
                     }
-                    if let MetaData::VideoTransform(transform) =
-                        buffer.find_meta_data(MetaType::VideoTransform)
-                    {
-                        format.transform = match transform.transform {
-                            spa::sys::SPA_META_TRANSFORMATION_None => Transform::Normal,
-                            spa::sys::SPA_META_TRANSFORMATION_90 => Transform::Rotated90,
-                            spa::sys::SPA_META_TRANSFORMATION_180 => Transform::Rotated180,
-                            spa::sys::SPA_META_TRANSFORMATION_270 => Transform::Rotated270,
-                            spa::sys::SPA_META_TRANSFORMATION_Flipped => Transform::Flipped,
-                            spa::sys::SPA_META_TRANSFORMATION_Flipped90 => Transform::Flipped90,
-                            spa::sys::SPA_META_TRANSFORMATION_Flipped180 => Transform::Flipped180,
-                            spa::sys::SPA_META_TRANSFORMATION_Flipped270 => Transform::Flipped270,
+
+                    if let Some(transform) = buffer.find_meta::<MetaVideoTransform>() {
+                        format.transform = match transform.transform() {
+                            MetaVideoTransformValue::NONE => Transform::Normal,
+                            MetaVideoTransformValue::ROTATED90 => Transform::Rotated90,
+                            MetaVideoTransformValue::ROTATED180 => Transform::Rotated180,
+                            MetaVideoTransformValue::ROTATED270 => Transform::Rotated270,
+                            MetaVideoTransformValue::FLIPPED => Transform::Flipped,
+                            MetaVideoTransformValue::FLIPPED90 => Transform::Flipped90,
+                            MetaVideoTransformValue::FLIPPED180 => Transform::Flipped180,
+                            MetaVideoTransformValue::FLIPPED270 => Transform::Flipped270,
                             _ => Transform::Undefined,
                         };
                         log::debug!("{}: Transform: {:?}", &name, &format.transform);
                     }
 
-                    let mouse_meta = match buffer.find_meta_data(MetaType::Cursor) {
-                        MetaData::Cursor(cursor) if cursor.id != 0 => Some(MouseMeta {
-                            x: cursor.position.x as f32 / format.width as f32,
-                            y: cursor.position.y as f32 / format.height as f32,
-                        }),
-                        _ => None,
-                    };
+                    let mouse_meta = buffer
+                        .find_meta::<MetaCursor>()
+                        .filter(|c| c.is_valid())
+                        .map(|c| MouseMeta {
+                            x: c.position().x as f32 / format.width as f32,
+                            y: c.position().y as f32 / format.height as f32,
+                        });
 
                     let datas = buffer.datas_mut();
                     if datas.is_empty() {
diff --git a/wlx-capture/src/pipewire/dbus_screencast.rs b/wlx-capture/src/pipewire/dbus_screencast.rs
new file mode 100644
index 00000000..29b3a713
--- /dev/null
+++ b/wlx-capture/src/pipewire/dbus_screencast.rs
@@ -0,0 +1,105 @@
+// This code was autogenerated with `dbus-codegen-rust -g -m None --client nonblock`, see https://github.com/diwic/dbus-rs
+use dbus;
+#[allow(unused_imports)]
+use dbus::arg;
+use dbus::nonblock;
+
+pub trait OrgFreedesktopPortalScreenCast {
+    fn create_session(&self, options: arg::PropMap) -> nonblock::MethodReply<dbus::Path<'static>>;
+    fn select_sources(
+        &self,
+        session_handle: dbus::Path,
+        options: arg::PropMap,
+    ) -> nonblock::MethodReply<dbus::Path<'static>>;
+    fn start(
+        &self,
+        session_handle: dbus::Path,
+        parent_window: &str,
+        options: arg::PropMap,
+    ) -> nonblock::MethodReply<dbus::Path<'static>>;
+    fn open_pipe_wire_remote(
+        &self,
+        session_handle: dbus::Path,
+        options: arg::PropMap,
+    ) -> nonblock::MethodReply<arg::OwnedFd>;
+    fn available_source_types(&self) -> nonblock::MethodReply<u32>;
+    fn available_cursor_modes(&self) -> nonblock::MethodReply<u32>;
+    fn version(&self) -> nonblock::MethodReply<u32>;
+}
+
+impl<'a, T: nonblock::NonblockReply, C: ::std::ops::Deref<Target = T>>
+    OrgFreedesktopPortalScreenCast for nonblock::Proxy<'a, C>
+{
+    fn create_session(&self, options: arg::PropMap) -> nonblock::MethodReply<dbus::Path<'static>> {
+        self.method_call(
+            "org.freedesktop.portal.ScreenCast",
+            "CreateSession",
+            (options,),
+        )
+        .and_then(|r: (dbus::Path<'static>,)| Ok(r.0))
+    }
+
+    fn select_sources(
+        &self,
+        session_handle: dbus::Path,
+        options: arg::PropMap,
+    ) -> nonblock::MethodReply<dbus::Path<'static>> {
+        self.method_call(
+            "org.freedesktop.portal.ScreenCast",
+            "SelectSources",
+            (session_handle, options),
+        )
+        .and_then(|r: (dbus::Path<'static>,)| Ok(r.0))
+    }
+
+    fn start(
+        &self,
+        session_handle: dbus::Path,
+        parent_window: &str,
+        options: arg::PropMap,
+    ) -> nonblock::MethodReply<dbus::Path<'static>> {
+        self.method_call(
+            "org.freedesktop.portal.ScreenCast",
+            "Start",
+            (session_handle, parent_window, options),
+        )
+        .and_then(|r: (dbus::Path<'static>,)| Ok(r.0))
+    }
+
+    fn open_pipe_wire_remote(
+        &self,
+        session_handle: dbus::Path,
+        options: arg::PropMap,
+    ) -> nonblock::MethodReply<arg::OwnedFd> {
+        self.method_call(
+            "org.freedesktop.portal.ScreenCast",
+            "OpenPipeWireRemote",
+            (session_handle, options),
+        )
+        .and_then(|r: (arg::OwnedFd,)| Ok(r.0))
+    }
+
+    fn available_source_types(&self) -> nonblock::MethodReply<u32> {
+        <Self as nonblock::stdintf::org_freedesktop_dbus::Properties>::get(
+            self,
+            "org.freedesktop.portal.ScreenCast",
+            "AvailableSourceTypes",
+        )
+    }
+
+    fn available_cursor_modes(&self) -> nonblock::MethodReply<u32> {
+        <Self as nonblock::stdintf::org_freedesktop_dbus::Properties>::get(
+            self,
+            "org.freedesktop.portal.ScreenCast",
+            "AvailableCursorModes",
+        )
+    }
+
+    fn version(&self) -> nonblock::MethodReply<u32> {
+        <Self as nonblock::stdintf::org_freedesktop_dbus::Properties>::get(
+            self,
+            "org.freedesktop.portal.ScreenCast",
+            "version",
+        )
+    }
+}
diff --git a/wlx-capture/src/pipewire/mod.rs b/wlx-capture/src/pipewire/mod.rs
new file mode 100644
index 00000000..1b733ff7
--- /dev/null
+++ b/wlx-capture/src/pipewire/mod.rs
@@ -0,0 +1,905 @@
+use std::{
+    collections::{HashMap, VecDeque},
+    error::Error as StdError,
+    fmt,
+    future::Future,
+    pin::Pin,
+    rc::Rc,
+    sync::{Arc, Mutex, MutexGuard},
+    task::{Context, Poll, Wake, Waker},
+    time::Duration,
+};
+
+use dbus::{
+    arg::{self, RefArg},
+    channel::{BusType, Channel},
+    message::{MatchRule, Message},
+    nonblock::{self, MsgMatch, Process, Proxy, SyncConnection},
+};
+use slotmap::SlotMap;
+
+use dbus_screencast::OrgFreedesktopPortalScreenCast;
+
+slotmap::new_key_type! {
+    pub struct ScreenCastRequestId;
+}
+
+pub mod capture;
+mod dbus_screencast;
+
+#[derive(Debug, Clone)]
+pub struct PipewireStream {
+    pub node_id: u32,
+    pub position: Option<(i32, i32)>,
+    pub size: Option<(i32, i32)>,
+}
+
+#[derive(Debug, Clone)]
+pub struct ScreenCastResponse {
+    pub streams: Vec<PipewireStream>,
+    pub restore_token: Option<String>,
+}
+
+#[derive(Default, Debug, Clone)]
+pub struct ScreenCastParams {
+    /// Optional restore token.
+    pub token: Option<Rc<str>>,
+
+    /// If true, use the first available: EMBEDDED, METADATA/FALLBACK, HIDDEN.
+    pub embed_mouse: bool,
+
+    /// false: only request MONITOR
+    /// true: request MONITOR, WINDOW, VIRTUAL
+    pub screens_only: bool,
+
+    /// true: EXPLICITLY_REVOKED
+    /// false: DO_NOT
+    pub persist: bool,
+
+    /// Allow the user to select multiple sources.
+    pub allow_multiple: bool,
+}
+
+#[derive(Debug, Clone)]
+pub enum ScreenCastResult {
+    Ok(ScreenCastResponse),
+    Queued,
+    Pending,
+    WaitingForUser,
+    Failed(ScreenCastError),
+}
+
+impl PartialEq for ScreenCastResult {
+    fn eq(&self, other: &Self) -> bool {
+        match (self, other) {
+            (Self::Ok(_), Self::Ok(_)) => true,
+            (Self::Queued, Self::Queued) => true,
+            (Self::Pending, Self::Pending) => true,
+            (Self::WaitingForUser, Self::WaitingForUser) => true,
+            (Self::Failed(_), Self::Failed(_)) => true,
+            _ => false,
+        }
+    }
+    fn ne(&self, other: &Self) -> bool {
+        !self.eq(other)
+    }
+}
+
+#[derive(Debug, Clone)]
+pub enum ScreenCastError {
+    Dbus(String),
+    DbusDisconnected,
+    InvalidObjectPath(String),
+    UnknownRequest,
+    UnsupportedSourceTypes { requested: u32, available: u32 },
+    UnsupportedCursorMode { available: u32 },
+    PortalResponse(u32),
+    MissingField(&'static str),
+    InvalidResponse(&'static str),
+}
+
+impl fmt::Display for ScreenCastError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Self::Dbus(e) => write!(f, "D-Bus error: {e}"),
+            Self::DbusDisconnected => write!(f, "D-Bus connection is disconnected"),
+            Self::InvalidObjectPath(e) => write!(f, "invalid D-Bus object path: {e}"),
+            Self::UnknownRequest => write!(f, "unknown screen select request"),
+            Self::UnsupportedSourceTypes {
+                requested,
+                available,
+            } => {
+                write!(
+                    f,
+                    "unsupported source types: requested={requested:#x}, available={available:#x}"
+                )
+            }
+            Self::UnsupportedCursorMode { available } => {
+                write!(f, "unsupported cursor mode: available={available:#x}")
+            }
+            Self::PortalResponse(code) => write!(f, "portal returned response code {code}"),
+            Self::MissingField(name) => write!(f, "portal response missing field {name}"),
+            Self::InvalidResponse(what) => write!(f, "invalid portal response: {what}"),
+        }
+    }
+}
+
+impl StdError for ScreenCastError {}
+
+impl From<dbus::Error> for ScreenCastError {
+    fn from(value: dbus::Error) -> Self {
+        Self::Dbus(value.to_string())
+    }
+}
+
+/// manages pipewire screen requests
+pub struct ScreenCastManager {
+    conn: Arc<SyncConnection>,
+    timeout: Duration,
+    sender_component: String,
+
+    source_types: OneShot<u32>,
+    cursor_modes: OneShot<u32>,
+
+    requests: SlotMap<ScreenCastRequestId, RequestEntry>,
+    queue: VecDeque<ScreenCastRequestId>,
+    active: Option<ScreenCastRequestId>,
+
+    responses: Arc<Mutex<HashMap<String, Result<PortalResponse, ScreenCastError>>>>,
+    cleanup: Vec<DbusFuture<()>>,
+
+    next_token: u64,
+}
+
+impl ScreenCastManager {
+    pub fn new() -> Result<Self, ScreenCastError> {
+        let channel = Channel::get_private(BusType::Session)?;
+        let conn = Arc::new(SyncConnection::from(channel));
+
+        let timeout = Duration::from_secs(120);
+        let proxy = portal_proxy(conn.clone(), timeout);
+
+        let sender_component = sender_path_component(&format!("{}", conn.unique_name()));
+
+        Ok(Self {
+            conn,
+            timeout,
+            sender_component,
+
+            source_types: OneShot::Pending(proxy.available_source_types()),
+            cursor_modes: OneShot::Pending(proxy.available_cursor_modes()),
+
+            requests: SlotMap::with_key(),
+            queue: VecDeque::new(),
+            active: None,
+
+            responses: Arc::new(Mutex::new(HashMap::new())),
+            cleanup: Vec::new(),
+
+            next_token: 0,
+        })
+    }
+
+    pub fn request(
+        &mut self,
+        params: ScreenCastParams,
+    ) -> Result<ScreenCastRequestId, ScreenCastError> {
+        let id = self.requests.insert(RequestEntry {
+            params,
+            state: RequestState::Queued,
+        });
+
+        self.queue.push_back(id);
+        Ok(id)
+    }
+
+    pub fn check(&mut self, request_id: &ScreenCastRequestId) -> ScreenCastResult {
+        if !self.requests.contains_key(*request_id) {
+            return ScreenCastResult::Failed(ScreenCastError::UnknownRequest);
+        }
+
+        if let Err(e) = self.pump_dbus() {
+            return ScreenCastResult::Failed(e);
+        }
+
+        self.poll_cleanup();
+        self.poll_globals();
+
+        self.ensure_active();
+
+        // drive several immediate transitions, but never spin forever
+        for _ in 0..12 {
+            if !self.drive_active_once() {
+                break;
+            }
+
+            self.ensure_active();
+        }
+
+        let result = self.result_for(*request_id);
+
+        if is_terminal(&result) {
+            let _ = self.requests.remove(*request_id);
+
+            if self.active == Some(*request_id) {
+                self.active = None;
+            }
+
+            self.queue.retain(|id| id != request_id);
+        }
+
+        result
+    }
+
+    fn pump_dbus(&self) -> Result<(), ScreenCastError> {
+        let channel: &Channel = self.conn.as_ref().as_ref();
+        channel
+            .read_write(Some(Duration::ZERO))
+            .map_err(|_| ScreenCastError::DbusDisconnected)?;
+
+        self.conn.process_all();
+        Ok(())
+    }
+
+    fn poll_cleanup(&mut self) {
+        let mut i = 0;
+        while i < self.cleanup.len() {
+            match poll_boxed(&mut self.cleanup[i]) {
+                Poll::Ready(_) => {
+                    let _ = self.cleanup.swap_remove(i);
+                }
+                Poll::Pending => i += 1,
+            }
+        }
+    }
+
+    fn poll_globals(&mut self) {
+        poll_one_shot(&mut self.source_types);
+        poll_one_shot(&mut self.cursor_modes);
+    }
+
+    fn globals(&self) -> Result<Option<Globals>, ScreenCastError> {
+        match (&self.source_types, &self.cursor_modes) {
+            (OneShot::Ready(source_types), OneShot::Ready(cursor_modes)) => Ok(Some(Globals {
+                source_types: *source_types,
+                cursor_modes: *cursor_modes,
+            })),
+            (OneShot::Failed(e), _) | (_, OneShot::Failed(e)) => Err(e.clone()),
+            _ => Ok(None),
+        }
+    }
+
+    fn ensure_active(&mut self) {
+        if self.active.is_some() {
+            return;
+        }
+
+        while let Some(id) = self.queue.pop_front() {
+            let Some(entry) = self.requests.get_mut(id) else {
+                continue;
+            };
+
+            if matches!(entry.state, RequestState::Queued) {
+                entry.state = RequestState::Init;
+                self.active = Some(id);
+                return;
+            }
+        }
+    }
+
+    fn drive_active_once(&mut self) -> bool {
+        let Some(id) = self.active else {
+            return false;
+        };
+
+        let Some(params) = self.requests.get(id).map(|r| r.params.clone()) else {
+            self.active = None;
+            return true;
+        };
+
+        let state = match self.requests.get_mut(id) {
+            Some(entry) => std::mem::replace(&mut entry.state, RequestState::Queued),
+            None => {
+                self.active = None;
+                return true;
+            }
+        };
+
+        let next_state = match self.advance_state(params, state) {
+            Ok(state) => state,
+            Err(error) => RequestState::Terminal(ScreenCastResult::Failed(error)),
+        };
+
+        let progressed = !matches!(next_state, RequestState::Queued);
+
+        let terminal = matches!(next_state, RequestState::Terminal(_));
+
+        if let Some(entry) = self.requests.get_mut(id) {
+            entry.state = next_state;
+        } else {
+            self.active = None;
+            return true;
+        }
+
+        if terminal {
+            self.active = None;
+        }
+
+        progressed
+    }
+
+    fn advance_state(
+        &mut self,
+        params: ScreenCastParams,
+        state: RequestState,
+    ) -> Result<RequestState, ScreenCastError> {
+        match state {
+            RequestState::Queued => Ok(RequestState::Queued),
+
+            RequestState::Init => {
+                if self.globals()?.is_none() {
+                    return Ok(RequestState::Init);
+                }
+
+                let session_token = self.next_token("pw_session");
+                self.begin_step(PortalStep::CreateSession { session_token })
+            }
+
+            RequestState::AddMatch {
+                step,
+                handle_token,
+                request_path,
+                mut future,
+            } => match poll_boxed(&mut future) {
+                Poll::Pending => Ok(RequestState::AddMatch {
+                    step,
+                    handle_token,
+                    request_path,
+                    future,
+                }),
+                Poll::Ready(Err(e)) => Err(e.into()),
+                Poll::Ready(Ok(match_handle)) => {
+                    let reply = self.call_step(&params, &step, &handle_token)?;
+                    Ok(RequestState::MethodCall {
+                        step,
+                        request_path,
+                        match_handle,
+                        reply,
+                    })
+                }
+            },
+
+            RequestState::MethodCall {
+                step,
+                request_path,
+                match_handle,
+                mut reply,
+            } => match poll_unpin(&mut reply) {
+                Poll::Pending => Ok(RequestState::MethodCall {
+                    step,
+                    request_path,
+                    match_handle,
+                    reply,
+                }),
+                Poll::Ready(Err(e)) => {
+                    self.schedule_remove_match(match_handle);
+                    Err(e.into())
+                }
+                Poll::Ready(Ok(_handle)) => Ok(RequestState::WaitResponse {
+                    step,
+                    request_path,
+                    match_handle,
+                }),
+            },
+
+            RequestState::WaitResponse {
+                step,
+                request_path,
+                match_handle,
+            } => {
+                let Some(response) = self.take_response(&request_path) else {
+                    return Ok(RequestState::WaitResponse {
+                        step,
+                        request_path,
+                        match_handle,
+                    });
+                };
+
+                self.schedule_remove_match(match_handle);
+
+                let response = response?;
+
+                if response.response != 0 {
+                    return Ok(RequestState::Terminal(ScreenCastResult::Failed(
+                        ScreenCastError::PortalResponse(response.response),
+                    )));
+                }
+
+                match step {
+                    PortalStep::CreateSession { .. } => {
+                        let session_handle = required_string(&response.results, "session_handle")?;
+                        let session_handle = dbus::Path::new(session_handle)
+                            .map_err(ScreenCastError::InvalidObjectPath)?;
+
+                        self.begin_step(PortalStep::SelectSources { session_handle })
+                    }
+
+                    PortalStep::SelectSources { session_handle } => {
+                        self.begin_step(PortalStep::Start { session_handle })
+                    }
+
+                    PortalStep::Start { .. } => {
+                        let response = parse_start_response(&response.results)?;
+                        Ok(RequestState::Terminal(ScreenCastResult::Ok(response)))
+                    }
+                }
+            }
+
+            RequestState::Terminal(result) => Ok(RequestState::Terminal(result)),
+        }
+    }
+
+    fn begin_step(&mut self, step: PortalStep) -> Result<RequestState, ScreenCastError> {
+        let handle_token = self.next_token("pw_request");
+        let request_path = self.request_path(&handle_token)?;
+
+        let future = make_response_match(
+            self.conn.clone(),
+            self.responses.clone(),
+            request_path.clone(),
+        )?;
+
+        Ok(RequestState::AddMatch {
+            step,
+            handle_token,
+            request_path,
+            future,
+        })
+    }
+
+    fn call_step(
+        &self,
+        params: &ScreenCastParams,
+        step: &PortalStep,
+        handle_token: &str,
+    ) -> Result<nonblock::MethodReply<dbus::Path<'static>>, ScreenCastError> {
+        let proxy = portal_proxy(self.conn.clone(), self.timeout);
+
+        match step {
+            PortalStep::CreateSession { session_token } => {
+                let mut options = arg::PropMap::new();
+                prop_insert(&mut options, "handle_token", handle_token.to_owned());
+                prop_insert(
+                    &mut options,
+                    "session_handle_token",
+                    session_token.to_owned(),
+                );
+
+                Ok(proxy.create_session(options))
+            }
+
+            PortalStep::SelectSources { session_handle } => {
+                let globals = self.globals()?.ok_or(ScreenCastError::InvalidResponse(
+                    "global portal properties not ready",
+                ))?;
+
+                let requested_types = if params.screens_only {
+                    SOURCE_MONITOR
+                } else {
+                    SOURCE_MONITOR | SOURCE_WINDOW | SOURCE_VIRTUAL
+                };
+
+                let source_types = requested_types & globals.source_types;
+                if source_types == 0 {
+                    return Err(ScreenCastError::UnsupportedSourceTypes {
+                        requested: requested_types,
+                        available: globals.source_types,
+                    });
+                }
+
+                let cursor_mode = choose_cursor_mode(globals.cursor_modes, params.embed_mouse)
+                    .ok_or(ScreenCastError::UnsupportedCursorMode {
+                        available: globals.cursor_modes,
+                    })?;
+
+                let mut options = arg::PropMap::new();
+                prop_insert(&mut options, "handle_token", handle_token.to_owned());
+                prop_insert(&mut options, "types", source_types);
+                prop_insert(&mut options, "multiple", params.allow_multiple);
+                prop_insert(&mut options, "cursor_mode", cursor_mode);
+                prop_insert(
+                    &mut options,
+                    "persist_mode",
+                    if params.persist { 2u32 } else { 0u32 },
+                );
+
+                if let Some(token) = &params.token {
+                    prop_insert(&mut options, "restore_token", token.to_string());
+                }
+
+                Ok(proxy.select_sources(session_handle.clone(), options))
+            }
+
+            PortalStep::Start { session_handle } => {
+                let mut options = arg::PropMap::new();
+                prop_insert(&mut options, "handle_token", handle_token.to_owned());
+
+                Ok(proxy.start(session_handle.clone(), "", options))
+            }
+        }
+    }
+
+    fn request_path(&self, handle_token: &str) -> Result<String, ScreenCastError> {
+        let path = format!(
+            "/org/freedesktop/portal/desktop/request/{}/{}",
+            self.sender_component, handle_token
+        );
+
+        let _ = dbus::Path::new(path.clone()).map_err(ScreenCastError::InvalidObjectPath)?;
+
+        Ok(path)
+    }
+
+    fn next_token(&mut self, prefix: &str) -> String {
+        self.next_token = self.next_token.saturating_add(1);
+        format!("{prefix}_{}", self.next_token)
+    }
+
+    fn take_response(&self, request_path: &str) -> Option<Result<PortalResponse, ScreenCastError>> {
+        lock_response_map(&self.responses).remove(request_path)
+    }
+
+    fn schedule_remove_match(&mut self, match_handle: MsgMatch) {
+        let token = match_handle.token();
+        let conn = self.conn.clone();
+
+        self.cleanup
+            .push(Box::pin(async move { conn.remove_match(token).await }));
+    }
+
+    fn result_for(&self, id: ScreenCastRequestId) -> ScreenCastResult {
+        let Some(entry) = self.requests.get(id) else {
+            return ScreenCastResult::Failed(ScreenCastError::UnknownRequest);
+        };
+
+        match &entry.state {
+            RequestState::Queued => ScreenCastResult::Queued,
+            RequestState::Init
+            | RequestState::AddMatch { .. }
+            | RequestState::MethodCall { .. } => ScreenCastResult::Pending,
+            RequestState::WaitResponse { step, .. } => match step {
+                PortalStep::Start { .. } => ScreenCastResult::WaitingForUser,
+                _ => ScreenCastResult::Pending,
+            },
+            RequestState::Terminal(result) => result.clone(),
+        }
+    }
+}
+
+struct RequestEntry {
+    params: ScreenCastParams,
+    state: RequestState,
+}
+
+enum RequestState {
+    Queued,
+    Init,
+    AddMatch {
+        step: PortalStep,
+        handle_token: String,
+        request_path: String,
+        future: DbusFuture<MsgMatch>,
+    },
+    MethodCall {
+        step: PortalStep,
+        request_path: String,
+        match_handle: MsgMatch,
+        reply: nonblock::MethodReply<dbus::Path<'static>>,
+    },
+    WaitResponse {
+        step: PortalStep,
+        request_path: String,
+        match_handle: MsgMatch,
+    },
+    Terminal(ScreenCastResult),
+}
+
+#[derive(Clone)]
+enum PortalStep {
+    CreateSession { session_token: String },
+    SelectSources { session_handle: dbus::Path<'static> },
+    Start { session_handle: dbus::Path<'static> },
+}
+
+#[derive(Debug, Clone, Copy)]
+struct Globals {
+    source_types: u32,
+    cursor_modes: u32,
+}
+
+enum OneShot<T> {
+    Pending(nonblock::MethodReply<T>),
+    Ready(T),
+    Failed(ScreenCastError),
+}
+
+#[derive(Debug)]
+struct PortalResponse {
+    response: u32,
+    results: arg::PropMap,
+}
+
+type DbusFuture<T> = Pin<Box<dyn Future<Output = Result<T, dbus::Error>>>>;
+
+const PORTAL_DEST: &str = "org.freedesktop.portal.Desktop";
+const PORTAL_PATH: &str = "/org/freedesktop/portal/desktop";
+const REQUEST_IFACE: &str = "org.freedesktop.portal.Request";
+
+const SOURCE_MONITOR: u32 = 1;
+const SOURCE_WINDOW: u32 = 2;
+const SOURCE_VIRTUAL: u32 = 4;
+
+const CURSOR_HIDDEN: u32 = 1;
+const CURSOR_EMBEDDED: u32 = 2;
+const CURSOR_METADATA: u32 = 4;
+
+fn portal_proxy(
+    conn: Arc<SyncConnection>,
+    timeout: Duration,
+) -> Proxy<'static, Arc<SyncConnection>> {
+    Proxy::new(PORTAL_DEST, PORTAL_PATH, timeout, conn)
+}
+
+fn make_response_match(
+    conn: Arc<SyncConnection>,
+    responses: Arc<Mutex<HashMap<String, Result<PortalResponse, ScreenCastError>>>>,
+    request_path: String,
+) -> Result<DbusFuture<MsgMatch>, ScreenCastError> {
+    let path = dbus::Path::new(request_path.clone()).map_err(ScreenCastError::InvalidObjectPath)?;
+
+    let rule = MatchRule::new_signal(REQUEST_IFACE, "Response")
+        .with_sender(PORTAL_DEST)
+        .with_path(path);
+
+    Ok(Box::pin(async move {
+        let match_handle = conn.add_match(rule).await?;
+
+        let key = request_path.clone();
+        let responses = responses.clone();
+
+        Ok(match_handle.msg_cb(move |msg: Message| {
+            let parsed = parse_portal_response_message(&msg);
+            lock_response_map(&responses).insert(key.clone(), parsed);
+            false
+        }))
+    }))
+}
+
+fn parse_portal_response_message(msg: &Message) -> Result<PortalResponse, ScreenCastError> {
+    let (response, results): (u32, arg::PropMap) = msg
+        .read2()
+        .map_err(|_| ScreenCastError::InvalidResponse("Request::Response signal"))?;
+
+    Ok(PortalResponse { response, results })
+}
+
+fn parse_start_response(results: &arg::PropMap) -> Result<ScreenCastResponse, ScreenCastError> {
+    Ok(ScreenCastResponse {
+        streams: parse_streams(results)?,
+        restore_token: optional_string(results, "restore_token"),
+    })
+}
+
+fn parse_streams(results: &arg::PropMap) -> Result<Vec<PipewireStream>, ScreenCastError> {
+    let streams = required_arg(results, "streams")?;
+    let streams = unvariant(streams);
+
+    let iter = streams
+        .as_iter()
+        .ok_or(ScreenCastError::InvalidResponse("streams array"))?;
+
+    let mut out = Vec::new();
+
+    for stream in iter {
+        let mut fields = stream
+            .as_iter()
+            .ok_or(ScreenCastError::InvalidResponse("stream tuple"))?;
+
+        let node_id = fields
+            .next()
+            .and_then(|v| v.as_u64())
+            .and_then(|v| u32::try_from(v).ok())
+            .ok_or(ScreenCastError::InvalidResponse("stream node id"))?;
+
+        let props = fields
+            .next()
+            .ok_or(ScreenCastError::InvalidResponse("stream properties"))?;
+
+        let position = dict_get(props, "position").and_then(tuple_i32);
+        let size = dict_get(props, "size").and_then(tuple_i32);
+
+        out.push(PipewireStream {
+            node_id,
+            position,
+            size,
+        });
+    }
+
+    if out.is_empty() {
+        return Err(ScreenCastError::InvalidResponse("empty streams array"));
+    }
+
+    Ok(out)
+}
+
+fn required_string(map: &arg::PropMap, key: &'static str) -> Result<String, ScreenCastError> {
+    optional_string(map, key).ok_or(ScreenCastError::MissingField(key))
+}
+
+fn optional_string(map: &arg::PropMap, key: &str) -> Option<String> {
+    map.get(key)
+        .and_then(|v| unvariant(&*v.0).as_str())
+        .map(str::to_owned)
+}
+
+fn required_arg<'a>(
+    map: &'a arg::PropMap,
+    key: &'static str,
+) -> Result<&'a dyn RefArg, ScreenCastError> {
+    map.get(key)
+        .map(|v| &*v.0 as &dyn RefArg)
+        .ok_or(ScreenCastError::MissingField(key))
+}
+
+fn dict_get<'a>(dict: &'a dyn RefArg, key: &str) -> Option<&'a dyn RefArg> {
+    let dict = unvariant(dict);
+    let mut iter = dict.as_iter()?;
+
+    loop {
+        let k = iter.next()?;
+        let v = iter.next()?;
+
+        if k.as_str() == Some(key) {
+            return Some(unvariant(v));
+        }
+    }
+}
+
+fn tuple_i32(value: &dyn RefArg) -> Option<(i32, i32)> {
+    let value = unvariant(value);
+    let mut iter = value.as_iter()?;
+
+    let x = i32::try_from(iter.next()?.as_i64()?).ok()?;
+    let y = i32::try_from(iter.next()?.as_i64()?).ok()?;
+
+    Some((x, y))
+}
+
+fn unvariant(value: &dyn RefArg) -> &dyn RefArg {
+    if value.arg_type() != arg::ArgType::Variant {
+        return value;
+    }
+
+    value
+        .as_iter()
+        .and_then(|mut iter| iter.next())
+        .unwrap_or(value)
+}
+
+fn prop_insert<T>(map: &mut arg::PropMap, key: &str, value: T)
+where
+    T: RefArg + 'static,
+{
+    map.insert(key.to_owned(), arg::Variant(Box::new(value)));
+}
+
+fn choose_cursor_mode(available: u32, embed_mouse: bool) -> Option<u32> {
+    let choices: &[u32] = if embed_mouse {
+        // The portal names this METADATA; this is the closest "fallback" mode.
+        &[CURSOR_EMBEDDED, CURSOR_METADATA, CURSOR_HIDDEN]
+    } else {
+        &[CURSOR_HIDDEN]
+    };
+
+    choices.iter().copied().find(|mode| available & *mode != 0)
+}
+
+fn poll_one_shot<T>(value: &mut OneShot<T>) {
+    let old = std::mem::replace(
+        value,
+        OneShot::Failed(ScreenCastError::InvalidResponse(
+            "internal one-shot placeholder",
+        )),
+    );
+
+    *value = match old {
+        OneShot::Pending(mut future) => match poll_unpin(&mut future) {
+            Poll::Ready(Ok(value)) => OneShot::Ready(value),
+            Poll::Ready(Err(e)) => OneShot::Failed(e.into()),
+            Poll::Pending => OneShot::Pending(future),
+        },
+        other => other,
+    };
+}
+
+fn poll_unpin<F>(future: &mut F) -> Poll<F::Output>
+where
+    F: Future + Unpin,
+{
+    let waker = noop_waker();
+    let mut cx = Context::from_waker(&waker);
+    Pin::new(future).poll(&mut cx)
+}
+
+fn poll_boxed<T>(future: &mut DbusFuture<T>) -> Poll<Result<T, dbus::Error>> {
+    let waker = noop_waker();
+    let mut cx = Context::from_waker(&waker);
+    future.as_mut().poll(&mut cx)
+}
+
+fn noop_waker() -> Waker {
+    struct NoopWake;
+
+    impl Wake for NoopWake {
+        fn wake(self: Arc<Self>) {}
+        fn wake_by_ref(self: &Arc<Self>) {}
+    }
+
+    Waker::from(Arc::new(NoopWake))
+}
+
+fn sender_path_component(unique_name: &str) -> String {
+    let name = unique_name.strip_prefix(':').unwrap_or(unique_name);
+
+    let mut out = String::with_capacity(name.len());
+    for ch in name.chars() {
+        if ch.is_ascii_alphanumeric() || ch == '_' {
+            out.push(ch);
+        } else {
+            out.push('_');
+        }
+    }
+
+    if out.is_empty() {
+        "unknown".to_owned()
+    } else {
+        out
+    }
+}
+
+fn lock_response_map(
+    responses: &Arc<Mutex<HashMap<String, Result<PortalResponse, ScreenCastError>>>>,
+) -> MutexGuard<'_, HashMap<String, Result<PortalResponse, ScreenCastError>>> {
+    match responses.lock() {
+        Ok(guard) => guard,
+        Err(poisoned) => poisoned.into_inner(),
+    }
+}
+
+fn is_terminal(result: &ScreenCastResult) -> bool {
+    matches!(
+        result,
+        ScreenCastResult::Ok(_) | ScreenCastResult::Failed(_)
+    )
+}
+
+/// Helper function to make a single screen cast selection
+pub fn screen_cast_select_blocking(
+    params: ScreenCastParams,
+) -> Result<ScreenCastResponse, ScreenCastError> {
+    let mut manager = ScreenCastManager::new()?;
+    let request_id = manager.request(params)?;
+
+    loop {
+        match manager.check(&request_id) {
+            ScreenCastResult::Ok(response) => return Ok(response),
+            ScreenCastResult::Failed(error) => return Err(error),
+
+            ScreenCastResult::Queued
+            | ScreenCastResult::Pending
+            | ScreenCastResult::WaitingForUser => {
+                std::thread::sleep(Duration::from_millis(10));
+            }
+        }
+    }
+}
diff --git a/wlx-capture/src/wayland.rs b/wlx-capture/src/wayland.rs
index 4ad7c74c..450ceeb5 100644
--- a/wlx-capture/src/wayland.rs
+++ b/wlx-capture/src/wayland.rs
@@ -17,7 +17,6 @@ use smithay_client_toolkit::reexports::{
     },
 };
 
-pub use wayland_client;
 use wayland_client::{
     Connection, Dispatch, EventQueue, Proxy, QueueHandle,
     backend::WaylandError,
diff --git a/wlx-capture/src/wlr_screencopy.rs b/wlx-capture/src/wlr_screencopy.rs
index 4f694a68..8d4f1caf 100644
--- a/wlx-capture/src/wlr_screencopy.rs
+++ b/wlx-capture/src/wlr_screencopy.rs
@@ -227,7 +227,7 @@ where
     let mut maybe_dmabuf = None;
 
     'receiver: loop {
-        for event in rx.try_iter() {
+        for event in rx.iter() {
             match event {
                 ScreenCopyEvent::Buffer { .. } => {
                     log::trace!("{name}: ScreenCopy Buffer event received");
@@ -267,7 +267,8 @@ where
                         // copy_with_damage seems to not work here
                         proxy.copy(&wl_buffer);
 
-                        frame_buffer = Some((WlxFrame::Implicit, BufData::Dma { wl_buffer }));
+                        frame_buffer =
+                            Some((WlxFrame::Implicit(transform), BufData::Dma { wl_buffer }));
                     } else if let Some(ScreenCopyEvent::Buffer {
                         shm_format,
                         width,
diff --git a/wlx-common/Cargo.toml b/wlx-common/Cargo.toml
index ee5c9d68..ca92bea3 100644
--- a/wlx-common/Cargo.toml
+++ b/wlx-common/Cargo.toml
@@ -7,29 +7,30 @@ license = "GPL-3.0-only"
 authors = ["galister", "oo8dev"]
 repository = "https://github.com/wlx-team/wayvr"
 
-
 [dependencies]
 wayvr-ipc = { path = "../wayvr-ipc", default-features = false }
 
 anyhow.workspace = true
+chrono.workspace = true
 glam.workspace = true
 idmap = { workspace = true, features = ["serde"] }
 idmap-derive.workspace = true
 log.workspace = true
 serde = { workspace = true, features = ["rc"] }
 serde_json.workspace = true
+serde_json5.workspace = true
+slotmap.workspace = true
+smol.workspace = true
 strum.workspace = true
 xdg.workspace = true
 
-chrono = "0.4.42"
-smol = { workspace = true }
-wgui = { path = "../wgui/" }
-rodio = { version = "0.21.1", default-features = false, features = [
-  "playback",
-  "mp3",
-  "hound",
-] }
 glob = "0.3.3"
-walkdir = "2.5.0"
-rust-ini = "0.21.3"
 identicons-svg = "0.1.0"
+rodio = {
+  version = "0.22.2",
+  default-features = false,
+  features = ["hound", "mp3", "playback", "recording"]
+}
+rust-ini = "0.21.3"
+walkdir = "2.5.0"
+wgui = { path = "../wgui/" }
diff --git a/wayvr/src/backend/openxr/openxr_actions.json5 b/wlx-common/assets/openxr_actions.json5
similarity index 61%
rename from wayvr/src/backend/openxr/openxr_actions.json5
rename to wlx-common/assets/openxr_actions.json5
index c0950db7..155cfb88 100644
--- a/wayvr/src/backend/openxr/openxr_actions.json5
+++ b/wlx-common/assets/openxr_actions.json5
@@ -191,6 +191,61 @@
     }
   },
 
+  // Steam Frame Controller
+  {
+    profile: "/interaction_profiles/valve/frame_controller_valve",
+    pose: {
+      left: "/user/hand/left/input/aim/pose",
+      right: "/user/hand/right/input/aim/pose"
+    },
+    click: {
+      left: "/user/hand/left/input/trigger/click",
+      right: "/user/hand/right/input/trigger/click"
+    },
+    grab: {
+      left: "/user/hand/left/input/squeeze/click",
+      right: "/user/hand/right/input/squeeze/click"
+    },
+    alt_click: { },
+    show_hide: {
+      left: "/user/hand/left/input/view/click"
+    },
+    toggle_dashboard: {
+      right: "/user/hand/right/input/menu/click"
+    },
+    space_drag: {
+      left: "/user/hand/left/input/system/click"
+    },
+    space_rotate: {
+      right: "/user/hand/right/input/system/click",
+      double_click: true
+    },
+    space_reset: {
+      left: "/user/hand/left/input/system/click",
+      double_click: true
+    },
+    click_modifier_right: {
+      left: "/user/hand/left/input/dpad_right/touch",
+      right: "/user/hand/right/input/x/touch"
+    },
+    click_modifier_middle: {
+      left: "/user/hand/left/input/dpad_left/touch",
+      right: "/user/hand/right/input/b/touch"
+    },
+    move_mouse: {
+      left: "/user/hand/left/input/trigger/touch",
+      right: "/user/hand/right/input/trigger/touch"
+    },
+    scroll: {
+      left: "/user/hand/left/input/thumbstick/y",
+      right: "/user/hand/right/input/thumbstick/y"
+    },
+    haptic: {
+      left: "/user/hand/left/output/haptic",
+      right: "/user/hand/right/output/haptic"
+    }
+  },
+
   // Vive controller
   {
     profile: "/interaction_profiles/htc/vive_controller",
@@ -227,6 +282,18 @@
       double_click: true,
       right: "/user/hand/right/input/menu/click",
     },
+    move_mouse: {
+      left: "/user/hand/left/input/trigger/value",
+      right: "/user/hand/right/input/trigger/value",
+      threshold_left: [
+        0.1,
+        0.2
+      ],
+      threshold_right: [
+        0.1,
+        0.2
+      ]
+    },
     haptic: {
       left: "/user/hand/left/output/haptic",
       right: "/user/hand/right/output/haptic"
@@ -261,19 +328,27 @@
       right: "/user/hand/right/input/thumbstick/x"
     },
     show_hide: {
-      left: "/user/hand/left/input/system/click",
+      left: "/user/hand/left/input/menu/click",
     },
     space_drag: {
       double_click: true,
-      right: "/user/hand/left/input/system/click",
+      right: "/user/hand/right/input/menu/click",
     },
     click_modifier_right: {
-      left: "/user/hand/left/input/trackpad/dpad_up",
-      right: "/user/hand/right/input/trackpad/dpad_up"
+      left: "/user/hand/left/input/trackpad/touch",
+      right: "/user/hand/right/input/trackpad/touch"
     },
-    click_modifier_middle: {
-      left: "/user/hand/left/input/trackpad/dpad_down",
-      right: "/user/hand/right/input/trackpad/dpad_down"
+    move_mouse: {
+      left: "/user/hand/left/input/trigger/value",
+      right: "/user/hand/right/input/trigger/value",
+      threshold_left: [
+        0.1,
+        0.2
+      ],
+      threshold_right: [
+        0.1,
+        0.2
+      ]
     },
   },
 
@@ -305,12 +380,125 @@
       right: "/user/hand/right/input/thumbstick/x"
     },
     show_hide: {
-      left: "/user/hand/left/input/system/click",
+      left: "/user/hand/left/input/menu/click",
     },
     space_drag: {
       double_click: true,
-      right: "/user/hand/left/input/system/click",
+      right: "/user/hand/left/input/menu/click",
+    },
+    move_mouse: {
+      left: "/user/hand/left/input/trigger/value",
+      right: "/user/hand/right/input/trigger/value",
+      threshold_left: [
+        0.1,
+        0.2
+      ],
+      threshold_right: [
+        0.1,
+        0.2
+      ]
     },
   },
-
+  {
+    profile: "/interaction_profiles/khr/generic_controller",
+    pose: {
+      left: "/user/hand/left/input/aim/pose",
+      right: "/user/hand/right/input/aim/pose"
+    },
+    click: {
+      left: "/user/hand/left/input/trigger/value",
+      right: "/user/hand/right/input/trigger/value"
+    },
+    grab: {
+      left: "/user/hand/left/input/squeeze/value",
+      right: "/user/hand/right/input/squeeze/value"
+    },
+    show_hide: {
+      left: "/user/hand/left/input/secondary/click",
+      double_click: true
+    },
+    click_modifier_right: {
+      left: "/user/hand/left/input/secondary/click",
+      right: "/user/hand/right/input/secondary/click"
+    },
+    click_modifier_middle: {
+      left: "/user/hand/left/input/primary/click",
+      right: "/user/hand/right/input/primary/click"
+    },
+    move_mouse: {
+      left: "/user/hand/left/input/trigger/value",
+      right: "/user/hand/right/input/trigger/value",
+      threshold_left: [
+        0.1,
+        0.2
+      ],
+      threshold_right: [
+        0.1,
+        0.2
+      ]
+    },
+    scroll: {
+      left: "/user/hand/left/input/thumbstick/y",
+      right: "/user/hand/right/input/thumbstick/y"
+    },
+    scroll_horizontal: {
+      left: "/user/hand/left/input/thumbstick/x",
+      right: "/user/hand/right/input/thumbstick/x"
+    },
+    haptic: {
+      left: "/user/hand/left/output/haptic",
+      right: "/user/hand/right/output/haptic"
+    }
+  },
+  {
+    profile: "/interaction_profiles/samsung/odyssey_controller",
+    pose: {
+      left: "/user/hand/left/input/aim/pose",
+      right: "/user/hand/right/input/aim/pose"
+    },
+    click: {
+      left: "/user/hand/left/input/trigger/value",
+      right: "/user/hand/right/input/trigger/value"
+    },
+    grab: {
+      left: "/user/hand/left/input/squeeze/click",
+      right: "/user/hand/right/input/squeeze/click"
+    },
+    show_hide: {
+      left: "/user/hand/left/input/menu/click"
+    },
+    space_drag: {
+      right: "/user/hand/right/input/menu/click",
+      double_click: true
+    },
+    click_modifier_right: {
+      left: "/user/hand/left/input/trackpad/touch",
+      right: "/user/hand/right/input/trackpad/touch"
+    },
+    click_modifier_middle: {},
+    move_mouse: {
+      left: "/user/hand/left/input/trigger/value",
+      right: "/user/hand/right/input/trigger/value",
+      threshold_left: [
+        0.1,
+        0.2
+      ],
+      threshold_right: [
+        0.1,
+        0.2
+      ]
+    },
+    scroll: {
+      left: "/user/hand/left/input/thumbstick/y",
+      right: "/user/hand/right/input/thumbstick/y"
+    },
+    scroll_horizontal: {
+      left: "/user/hand/left/input/thumbstick/x",
+      right: "/user/hand/right/input/thumbstick/x"
+    },
+    haptic: {
+      left: "/user/hand/left/output/haptic",
+      right: "/user/hand/right/output/haptic"
+    }
+  }
 ]
diff --git a/wlx-common/src/audio.rs b/wlx-common/src/audio.rs
index 946d47ab..90ea1c78 100644
--- a/wlx-common/src/audio.rs
+++ b/wlx-common/src/audio.rs
@@ -1,15 +1,27 @@
-use std::{collections::HashMap, io::Cursor, rc::Rc};
+use std::{
+	collections::HashMap,
+	io::Cursor,
+	rc::Rc,
+	sync::mpsc::{Receiver, SyncSender, sync_channel},
+};
 
 use rodio::Source;
 use wgui::{assets::AssetProvider, sound::WguiSoundType};
 
 use std::io::Read;
 
-pub struct AudioSystem {
-	audio_stream: Option<rodio::OutputStream>,
-	first_try: bool,
+pub use rodio;
+
+enum AudioThreadMessage {
+	PlaySample(AudioSample),
 }
 
+pub struct AudioSystem {
+	receiver: Option<Receiver<AudioThreadMessage>>,
+	sender: SyncSender<AudioThreadMessage>,
+}
+
+#[derive(Clone)]
 pub struct AudioSample {
 	buffer: rodio::buffer::SamplesBuffer,
 }
@@ -18,6 +30,25 @@ pub struct SamplePlayer {
 	samples: HashMap<String, AudioSample>,
 }
 
+fn audio_thread(receiver: Receiver<AudioThreadMessage>) {
+	log::debug!("audio_thread starting");
+	let Ok(mut stream) = rodio::DeviceSinkBuilder::open_default_sink() else {
+		log::error!("Failed to open audio stream. Audio will not work.");
+		return;
+	};
+	stream.log_on_drop(false);
+
+	while let Ok(msg) = receiver.recv() {
+		match msg {
+			AudioThreadMessage::PlaySample(audio_sample) => {
+				stream.mixer().add(audio_sample.buffer.clone());
+			}
+		}
+	}
+
+	log::debug!("audio_thread exiting");
+}
+
 fn get_sample_name_from_wgui_sound_type(sound: WguiSoundType) -> &'static str {
 	match sound {
 		WguiSoundType::ButtonMouseEnter => "wgui_mouse_enter",
@@ -93,29 +124,26 @@ impl Default for SamplePlayer {
 }
 
 impl AudioSystem {
-	pub const fn new() -> Self {
+	pub fn new() -> Self {
+		let (sender, receiver) = sync_channel::<AudioThreadMessage>(8);
+
 		Self {
-			audio_stream: None,
-			first_try: true,
+			receiver: Some(receiver),
+			sender,
 		}
 	}
 
-	fn get_handle(&mut self) -> Option<&rodio::OutputStream> {
-		if self.audio_stream.is_none() && self.first_try {
-			self.first_try = false;
-			if let Ok(stream) = rodio::OutputStreamBuilder::open_default_stream() {
-				self.audio_stream = Some(stream);
-			} else {
-				log::error!("Failed to open audio stream. Audio will not work.");
-				return None;
-			}
-		}
-		self.audio_stream.as_ref()
+	fn lazy_start_thread(&mut self) {
+		let Some(receiver) = self.receiver.take() else {
+			return; // already started
+		};
+
+		std::thread::spawn(move || audio_thread(receiver));
 	}
 
 	pub fn play_sample(&mut self, sample: &AudioSample) -> Option<()> {
-		let handle = self.get_handle()?;
-		handle.mixer().add(sample.buffer.clone());
+		self.lazy_start_thread();
+		let _dont_care = self.sender.try_send(AudioThreadMessage::PlaySample(sample.clone()));
 		Some(())
 	}
 }
diff --git a/wlx-common/src/config.rs b/wlx-common/src/config.rs
index 1878df81..8951fe1c 100644
--- a/wlx-common/src/config.rs
+++ b/wlx-common/src/config.rs
@@ -1,13 +1,17 @@
-use std::{collections::HashMap, sync::Arc};
+use std::{collections::HashMap, rc::Rc, sync::Arc};
 
 use chrono::Offset;
 use idmap::IdMap;
 use serde::{Deserialize, Serialize};
-use strum::{AsRefStr, EnumProperty, EnumString, VariantArray};
+use strum::{AsRefStr, EnumProperty, EnumString, VariantArray, VariantNames};
 use wayvr_ipc::packet_client::WvrProcessLaunchParams;
+use wgui::drawing::{self, HsvColor};
 
 use crate::{
-	astr_containers::{AStrMap, AStrSet}, locale::{self}, overlays::{BackendAttribValue, ToastDisplayMethod, ToastTopic}, windowing::OverlayWindowState
+	astr_containers::{AStrMap, AStrSet},
+	locale::{self},
+	overlays::{BackendAttribValue, ToastDisplayMethod, ToastTopic},
+	windowing::OverlayWindowState,
 };
 
 pub type PwTokenMap = AStrMap<String>;
@@ -36,6 +40,41 @@ pub enum CaptureMethod {
 	ScreenCopyCpu,
 }
 
+#[derive(Default, Clone, Copy, Serialize, Deserialize, AsRefStr, EnumString, EnumProperty, VariantArray)]
+pub enum InputEmulationMethod {
+	#[default]
+	#[strum(props(
+		Translation = "APP_SETTINGS.OPTION.UINPUT",
+		Tooltip = "APP_SETTINGS.OPTION.UINPUT_HELP"
+	))]
+	Uinput,
+
+	#[strum(props(
+		Translation = "APP_SETTINGS.OPTION.WL_VIRTUAL",
+		Tooltip = "APP_SETTINGS.OPTION.WL_VIRTUAL_HELP"
+	))]
+	WlVirtual,
+
+	#[strum(props(
+		Translation = "APP_SETTINGS.OPTION.NONE",
+		Tooltip = "APP_SETTINGS.OPTION.NONE_INPUT_HELP"
+	))]
+	None,
+}
+
+#[derive(Default, Clone, Copy, Serialize, Deserialize, AsRefStr, EnumString, EnumProperty, VariantArray)]
+pub enum InputCaptureMethod {
+	#[strum(props(Tooltip = "APP_SETTINGS.OPTION.EVDEV_HELP"))]
+	Evdev,
+
+	#[default]
+	#[strum(props(
+		Translation = "APP_SETTINGS.OPTION.NONE",
+		Tooltip = "APP_SETTINGS.OPTION.NONE_INPUT_CAPTURE_HELP"
+	))]
+	None,
+}
+
 #[derive(Debug, Default, Clone, Copy, Serialize, Deserialize, AsRefStr, EnumString, EnumProperty, VariantArray)]
 pub enum AltModifier {
 	#[default]
@@ -45,7 +84,8 @@ pub enum AltModifier {
 	Ctrl,
 	Alt,
 	Super,
-	Meta,
+	#[serde(alias = "Meta")]
+	AltGr,
 }
 
 #[derive(Debug, Default, Clone, Copy, Serialize, Deserialize, AsRefStr, EnumString, EnumProperty, VariantArray)]
@@ -63,6 +103,75 @@ pub enum HandsfreePointer {
 	EyeTrackingOnly,
 }
 
+#[derive(Debug, Default, Clone, Copy, Serialize, Deserialize, AsRefStr, EnumString, EnumProperty, VariantArray)]
+pub enum HandsfreeAltTab {
+	#[strum(props(Translation = "APP_SETTINGS.OPTION.HMD_ONLY"))]
+	#[default]
+	Hmd,
+	#[strum(props(Translation = "APP_SETTINGS.OPTION.EYE_ONLY"))]
+	EyeTracking,
+}
+
+impl From<HandsfreeAltTab> for HandsfreePointer {
+	fn from(value: HandsfreeAltTab) -> Self {
+		match value {
+			HandsfreeAltTab::Hmd => HandsfreePointer::HmdOnly,
+			HandsfreeAltTab::EyeTracking => HandsfreePointer::EyeTrackingOnly,
+		}
+	}
+}
+
+#[derive(Clone, Serialize, Deserialize)]
+pub struct ChromaKeyParams {
+	pub hsv_min: [f32; 3],
+	pub hsv_max: [f32; 3],
+	pub curve: f32,
+	pub despill: f32,
+}
+
+fn hsv_green() -> [f32; 3] {
+	[2.0 / 6.0, 1.0, 1.0]
+}
+
+impl Default for ChromaKeyParams {
+	fn default() -> Self {
+		Self {
+			hsv_min: hsv_green(),
+			hsv_max: hsv_green(),
+			curve: 0.0, // Monado will ignore chroma keying completely if this value is zero
+			despill: 0.0,
+		}
+	}
+}
+
+impl ChromaKeyParams {
+	pub fn update_hsv_range_from_rgb(&mut self, rgb_color: drawing::Color, range_h: f32, range_s: f32, range_v: f32) {
+		let hsv = HsvColor::from(rgb_color);
+		self.hsv_min[0] = hsv.h - range_h / 2.0;
+		self.hsv_min[1] = hsv.s - range_s / 2.0;
+		self.hsv_min[2] = hsv.v - range_v / 2.0;
+		self.hsv_max[0] = hsv.h + range_h / 2.0;
+		self.hsv_max[1] = hsv.s + range_s / 2.0;
+		self.hsv_max[2] = hsv.v + range_v / 2.0;
+	}
+
+	// Inverse of `update_hsv_range_from_rgb` function
+	pub fn get_rgb_and_hsv_ranges(&self) -> (drawing::Color, f32, f32, f32) {
+		(
+			HsvColor::new(
+				(self.hsv_min[0] + self.hsv_max[0]) / 2.0,
+				(self.hsv_min[1] + self.hsv_max[1]) / 2.0,
+				(self.hsv_min[2] + self.hsv_max[2]) / 2.0,
+				1.0,
+			)
+			.to_rgb(),
+			self.hsv_max[0] - self.hsv_min[0],
+			self.hsv_max[1] - self.hsv_min[1],
+			self.hsv_max[2] - self.hsv_min[2],
+		)
+	}
+}
+
 #[derive(Clone, Serialize, Deserialize)]
 pub struct SerializedWindowSet {
 	pub name: Arc<str>,
@@ -74,6 +183,44 @@ pub struct SerializedWindowSet {
 	pub hidden_overlays: SerializedWindowStates,
 }
 
+#[derive(Debug, Serialize, Deserialize, Clone, Copy, Eq, PartialEq, EnumString, VariantNames, AsRefStr)]
+pub enum AppPosMode {
+	Floating,
+	Anchored,
+	Static,
+}
+#[derive(Debug, Serialize, Deserialize, Clone, Copy, Eq, PartialEq, EnumString, VariantNames, AsRefStr)]
+pub enum AppOrientationMode {
+	Wide,
+	SemiWide,
+	Square,
+	SemiTall,
+	Tall,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone, Copy, Eq, PartialEq, EnumString, VariantNames, AsRefStr)]
+pub enum AppCompositorMode {
+	Cage,
+	Native,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone, Copy, Eq, PartialEq, EnumString, VariantNames, AsRefStr)]
+pub enum AppResMode {
+	Res1440,
+	Res1080,
+	Res720,
+	Res480,
+}
+
+#[derive(Eq, PartialEq, Debug, Clone, Serialize, Deserialize)]
+pub struct PinnedApp {
+	pub app_id: Rc<str>, // desktop entry app id, for example "libreoffice-draw"
+	pub compositor_mode: AppCompositorMode,
+	pub pos_mode: AppPosMode,
+	pub orientation_mode: AppOrientationMode,
+	pub res_mode: AppResMode,
+}
+
 pub const fn def_pw_tokens() -> PwTokenMap {
 	AStrMap::new()
 }
@@ -90,10 +237,6 @@ const fn def_true() -> bool {
 	true
 }
 
-const fn def_false() -> bool {
-	false
-}
-
 const fn def_one() -> f32 {
 	1.0
 }
@@ -126,8 +269,8 @@ fn def_timezones() -> Vec<String> {
 	}
 }
 
-fn def_empty() -> Arc<str> {
-	"".into()
+fn def_default() -> Arc<str> {
+	"Default".into()
 }
 
 fn def_theme_path() -> Arc<str> {
@@ -138,19 +281,11 @@ const fn def_max_height() -> u16 {
 	1440
 }
 
-
-
 #[derive(Deserialize, Serialize)]
 pub struct GeneralConfig {
 	#[serde(default = "def_theme_path")]
 	pub theme_path: Arc<str>,
 
-	pub color_text: Option<String>,
-	pub color_accent: Option<String>,
-	pub color_danger: Option<String>,
-	pub color_faded: Option<String>,
-	pub color_background: Option<String>,
-
 	pub language: Option<locale::Language>, // auto-detected at runtime if unset
 
 	#[serde(default = "def_one")]
@@ -172,10 +307,10 @@ pub struct GeneralConfig {
 	#[serde(default = "def_click_freeze_time_ms")]
 	pub click_freeze_time_ms: i32,
 
-	#[serde(default = "def_false")]
+	#[serde(default)]
 	pub invert_scroll_direction_x: bool,
 
-	#[serde(default = "def_false")]
+	#[serde(default)]
 	pub invert_scroll_direction_y: bool,
 
 	#[serde(default = "def_one")]
@@ -203,7 +338,7 @@ pub struct GeneralConfig {
 	pub keyboard_scale: f32,
 
 	#[serde(default = "def_one")]
-	pub desktop_view_scale: f32,
+	pub default_overlay_scale: f32,
 
 	#[serde(default = "def_half")]
 	pub watch_view_angle_min: f32,
@@ -214,16 +349,19 @@ pub struct GeneralConfig {
 	#[serde(default = "def_osc_port")]
 	pub osc_out_port: u16,
 
-	#[serde(default = "def_false")]
+	#[serde(default)]
 	pub upright_screen_fix: bool,
 
-	#[serde(default = "def_false")]
+	#[serde(default)]
 	pub double_cursor_fix: bool,
 
-	#[serde(default = "def_false")]
+	#[serde(default = "def_true")]
+	pub enable_watch: bool,
+
+	#[serde(default)]
 	pub sets_on_watch: bool,
 
-	#[serde(default = "def_false")]
+	#[serde(default)]
 	pub hide_grab_help: bool,
 
 	#[serde(default)]
@@ -232,22 +370,19 @@ pub struct GeneralConfig {
 	#[serde(default)]
 	pub capture_method: CaptureMethod,
 
-	#[serde(default = "def_point7")]
-	pub xr_click_sensitivity: f32,
-
-	#[serde(default = "def_half")]
-	pub xr_click_sensitivity_release: f32,
+	#[serde(default)]
+	pub input_emulation_method: InputEmulationMethod,
 
 	#[serde(default = "def_true")]
 	pub allow_sliding: bool,
 
-	#[serde(default = "def_false")]
+	#[serde(default)]
 	pub focus_follows_mouse_mode: bool,
 
-	#[serde(default = "def_false")]
+	#[serde(default)]
 	pub left_handed_mouse: bool,
 
-	#[serde(default = "def_false")]
+	#[serde(default)]
 	pub block_game_input: bool,
 
 	#[serde(default = "def_true")]
@@ -259,7 +394,7 @@ pub struct GeneralConfig {
 	#[serde(default = "def_one")]
 	pub space_drag_multiplier: f32,
 
-	#[serde(default = "def_empty")]
+	#[serde(default)]
 	pub skybox_texture: Arc<str>,
 
 	#[serde(default = "def_true")]
@@ -271,7 +406,7 @@ pub struct GeneralConfig {
 	#[serde(default = "def_max_height")]
 	pub screen_max_height: u16,
 
-	#[serde(default = "def_false")]
+	#[serde(default)]
 	pub screen_render_down: bool,
 
 	#[serde(default = "def_point3")]
@@ -280,9 +415,30 @@ pub struct GeneralConfig {
 	#[serde(default = "def_true")]
 	pub space_drag_unlocked: bool,
 
-	#[serde(default = "def_false")]
+	#[serde(default)]
+	pub space_drag_affects_world: bool,
+
+	#[serde(default)]
 	pub space_rotate_unlocked: bool,
 
+	#[serde(default)]
+	pub space_gravity_enabled: bool,
+
+	#[serde(default = "def_one")]
+	pub space_gravity_gravity: f32,
+
+	#[serde(default = "def_one")]
+	pub space_gravity_damping: f32,
+
+	#[serde(default = "def_one")]
+	pub space_gravity_fling_strength: f32,
+
+	#[serde(default = "def_one")]
+	pub space_gravity_ground_friction: f32,
+
+	#[serde(default)]
+	pub space_gravity_floor_height: f32,
+
 	#[serde(default)]
 	pub alt_click_down: Vec<String>,
 
@@ -292,7 +448,7 @@ pub struct GeneralConfig {
 	#[serde(default = "def_timezones")]
 	pub timezones: Vec<String>,
 
-	#[serde(default = "def_false")]
+	#[serde(default)]
 	pub clock_12h: bool,
 
 	#[serde(default)]
@@ -304,6 +460,9 @@ pub struct GeneralConfig {
 	#[serde(default)]
 	pub autostart_apps: Vec<WvrProcessLaunchParams>,
 
+	#[serde(default)]
+	pub pinned_apps: Vec<PinnedApp>,
+
 	#[serde(default)]
 	pub last_set: u32,
 
@@ -325,9 +484,36 @@ pub struct GeneralConfig {
 	#[serde(default)]
 	pub handsfree_pointer: HandsfreePointer,
 
+	#[serde(default)]
+	pub handsfree_alt_tab: HandsfreeAltTab,
+
 	#[serde(default = "def_one")]
 	pub grid_opacity: f32,
 
 	#[serde(default = "def_false")]
 	pub keyboard_swipe_to_type_enabled: bool,
+
+	#[serde(default)]
+	pub chroma_key_params: ChromaKeyParams,
+
+	#[serde(default)]
+	pub tutorial_graduated: bool,
+
+	#[serde(default)]
+	pub whisper_model: Arc<str>,
+
+	#[serde(default = "def_default")]
+	pub color_palette: Arc<str>,
+
+	#[serde(default)]
+	pub snap_angle_deg: f32,
+
+	#[serde(default = "def_true")]
+	pub wvr_mouse_acceleration: bool,
+
+	#[serde(default)]
+	pub wvr_mouse_speed: f32,
+
+	#[serde(default)]
+	pub wvr_input_capture: InputCaptureMethod,
 }
diff --git a/wlx-common/src/config_io.rs b/wlx-common/src/config_io.rs
index 961e4b1a..17aeecc9 100644
--- a/wlx-common/src/config_io.rs
+++ b/wlx-common/src/config_io.rs
@@ -21,6 +21,27 @@ pub fn get_config_root() -> PathBuf {
 	CONFIG_ROOT_PATH.clone()
 }
 
+pub fn get_skymaps_root() -> PathBuf {
+	get_config_root().join("skymaps")
+}
+
+pub fn get_palettes_root() -> PathBuf {
+	get_config_root().join("palettes")
+}
+
+pub fn get_skymaps_uuids() -> anyhow::Result<Vec<String>> {
+	let data = std::fs::read_to_string(get_skymaps_root().join("skymaps.txt"))?;
+	Ok(data.lines().filter(|line| !line.is_empty()).map(String::from).collect())
+}
+
+pub fn set_skymaps_uuids(uuids: &[String]) -> anyhow::Result<()> {
+	let skymaps_root = get_skymaps_root();
+	let _ = std::fs::create_dir_all(&skymaps_root);
+	let data = String::from_iter(uuids.iter().map(|uuid| format!("{}\n", uuid)));
+	std::fs::write(skymaps_root.join("skymaps.txt"), data)?;
+	Ok(())
+}
+
 impl ConfigRoot {
 	pub fn get_conf_d_path(&self) -> PathBuf {
 		get_config_root().join(match self {
@@ -49,3 +70,9 @@ pub fn load(filename: &str) -> Option<String> {
 
 	std::fs::read_to_string(path).ok()
 }
+
+pub fn save(filename: &str, content: &str) -> anyhow::Result<()> {
+	let path = get_config_file_path(filename);
+	std::fs::write(path, content)?;
+	Ok(())
+}
diff --git a/wlx-common/src/dash_interface.rs b/wlx-common/src/dash_interface.rs
index 7f80d557..420931a4 100644
--- a/wlx-common/src/dash_interface.rs
+++ b/wlx-common/src/dash_interface.rs
@@ -37,10 +37,19 @@ pub struct MonadoDumpSessionFrame {
 }
 
 #[derive(Clone, Copy)]
-pub enum RecenterMode {
+pub enum DashPlayspaceTask {
 	FixFloor,
 	Recenter,
 	Reset,
+	SaveCenter,
+	ResetCenter,
+}
+
+#[derive(Clone, Copy)]
+pub struct InterfaceFeats {
+	pub openxr: bool,
+	pub monado: bool,
+	pub whisper: bool,
 }
 
 pub trait DashInterface<T> {
@@ -62,12 +71,24 @@ pub trait DashInterface<T> {
 	fn monado_brightness_set(&mut self, data: &mut T, brightness: f32) -> Option<()>;
 	fn monado_metrics_set_enabled(&mut self, data: &mut T, enabled: bool) -> bool;
 	fn monado_metrics_dump_session_frames(&mut self, data: &mut T) -> Vec<MonadoDumpSessionFrame>;
-	fn recenter_playspace(&mut self, data: &mut T, mode: RecenterMode) -> anyhow::Result<()>;
+	fn playspace_task(&mut self, data: &mut T, mode: DashPlayspaceTask) -> anyhow::Result<()>;
 	fn desktop_finder<'a>(&'a mut self, data: &'a mut T) -> &'a mut DesktopFinder;
 	fn general_config<'a>(&'a mut self, data: &'a mut T) -> &'a mut GeneralConfig;
-	fn config_changed(&mut self, data: &mut T);
+	fn config_changed(&mut self, data: &mut T, kind: ConfigChangeKind);
 	fn restart(&mut self, data: &mut T);
 	fn toggle_dashboard(&mut self, data: &mut T);
+	fn get_feats(&mut self, data: &mut T) -> InterfaceFeats;
+}
+
+#[derive(Default, Clone, Copy)]
+pub enum ConfigChangeKind {
+	OverlayConfig,
+	EnvironmentBlend,
+	WguiColorPaletteChange,
+	WvrServerConfig,
+	/// Marks the config for saving but doesn't notify any components
+	#[default]
+	Other,
 }
 
 pub type BoxDashInterface<T> = Box<dyn DashInterface<T>>;
diff --git a/wlx-common/src/dash_interface_emulated.rs b/wlx-common/src/dash_interface_emulated.rs
index 3526de94..9a4ff1a0 100644
--- a/wlx-common/src/dash_interface_emulated.rs
+++ b/wlx-common/src/dash_interface_emulated.rs
@@ -1,3 +1,4 @@
+use slotmap::{DenseSlotMap, new_key_type};
 use wayvr_ipc::{
 	packet_client::WvrProcessLaunchParams,
 	packet_server::{WvrProcess, WvrProcessHandle, WvrWindow, WvrWindowHandle},
@@ -5,27 +6,21 @@ use wayvr_ipc::{
 
 use crate::{
 	config::GeneralConfig,
-	dash_interface::{self, DashInterface, RecenterMode},
+	dash_interface::{self, ConfigChangeKind, DashInterface, DashPlayspaceTask},
 	desktop_finder::DesktopFinder,
-	gen_id,
 };
 
+new_key_type! {
+	pub struct EmuProcessHandle;
+}
+
 #[derive(Debug)]
 pub struct EmuProcess {
 	name: String,
 }
 
-impl EmuProcess {
-	fn to(&self, handle: EmuProcessHandle) -> WvrProcess {
-		WvrProcess {
-			handle: WvrProcessHandle {
-				generation: handle.generation,
-				idx: handle.idx,
-			},
-			name: self.name.clone(),
-			userdata: Default::default(),
-		}
-	}
+new_key_type! {
+	pub struct EmuWindowHandle;
 }
 
 #[derive(Debug)]
@@ -34,6 +29,18 @@ pub struct EmuWindow {
 	process_handle: EmuProcessHandle,
 }
 
+impl EmuProcess {
+	fn to(&self, handle: EmuProcessHandle) -> WvrProcess {
+		WvrProcess {
+			handle: WvrProcessHandle {
+				user: handle.0.as_ffi(),
+			},
+			name: self.name.clone(),
+			userdata: Default::default(),
+		}
+	}
+}
+
 impl EmuWindow {
 	fn to(&self, handle: EmuWindowHandle) -> WvrWindow {
 		WvrWindow {
@@ -41,24 +48,18 @@ impl EmuWindow {
 			size_y: 720,  /* stub */
 			visible: true,
 			handle: WvrWindowHandle {
-				generation: handle.generation,
-				idx: handle.idx,
+				user: handle.0.as_ffi(),
 			},
 			process_handle: WvrProcessHandle {
-				generation: self.process_handle.generation,
-				idx: self.process_handle.idx,
+				user: self.process_handle.0.as_ffi(),
 			},
 		}
 	}
 }
 
-gen_id!(EmuWindowVec, EmuWindow, EmuWindowCell, EmuWindowHandle);
-
-gen_id!(EmuProcessVec, EmuProcess, EmuProcessCell, EmuProcessHandle);
-
 pub struct DashInterfaceEmulated {
-	processes: EmuProcessVec,
-	windows: EmuWindowVec,
+	windows: DenseSlotMap<EmuWindowHandle, EmuWindow>,
+	processes: DenseSlotMap<EmuProcessHandle, EmuProcess>,
 	desktop_finder: DesktopFinder,
 	general_config: GeneralConfig,
 	monado_clients: Vec<dash_interface::MonadoClient>,
@@ -69,13 +70,13 @@ pub struct DashInterfaceEmulated {
 
 impl DashInterfaceEmulated {
 	pub fn new() -> Self {
-		let mut processes = EmuProcessVec::new();
-		let process_handle = processes.add(EmuProcess {
+		let mut processes = DenseSlotMap::<EmuProcessHandle, EmuProcess>::default();
+		let process_handle = processes.insert(EmuProcess {
 			name: String::from("My app"),
 		});
 
-		let mut windows = EmuWindowVec::new();
-		windows.add(EmuWindow {
+		let mut windows = DenseSlotMap::<EmuWindowHandle, EmuWindow>::default();
+		windows.insert(EmuWindow {
 			process_handle,
 			visible: true,
 		});
@@ -144,16 +145,15 @@ impl DashInterface<()> for DashInterfaceEmulated {
 	}
 
 	fn window_request_close(&mut self, _: &mut (), handle: WvrWindowHandle) -> anyhow::Result<()> {
-		self.windows.remove(&EmuWindowHandle {
-			generation: handle.generation,
-			idx: handle.idx,
-		});
+		self
+			.windows
+			.remove(EmuWindowHandle::from(slotmap::KeyData::from_ffi(handle.user)));
 		Ok(())
 	}
 
 	fn process_get(&mut self, _: &mut (), handle: WvrProcessHandle) -> Option<WvrProcess> {
-		let emu_handle = EmuProcessHandle::new(handle.idx, handle.generation);
-		self.processes.get(&emu_handle).map(|process| process.to(emu_handle))
+		let emu_handle = EmuProcessHandle::from(slotmap::KeyData::from_ffi(handle.user));
+		self.processes.get(emu_handle).map(|process| process.to(emu_handle))
 	}
 
 	fn process_launch(
@@ -162,17 +162,14 @@ impl DashInterface<()> for DashInterfaceEmulated {
 		_: bool,
 		params: WvrProcessLaunchParams,
 	) -> anyhow::Result<WvrProcessHandle> {
-		let res = self.processes.add(EmuProcess { name: params.name });
+		let res = self.processes.insert(EmuProcess { name: params.name });
 
-		self.windows.add(EmuWindow {
+		self.windows.insert(EmuWindow {
 			process_handle: res,
 			visible: true,
 		});
 
-		Ok(WvrProcessHandle {
-			generation: res.generation,
-			idx: res.idx,
-		})
+		Ok(WvrProcessHandle { user: res.0.as_ffi() })
 	}
 
 	fn process_list(&mut self, _: &mut ()) -> anyhow::Result<Vec<WvrProcess>> {
@@ -189,26 +186,26 @@ impl DashInterface<()> for DashInterfaceEmulated {
 		let mut to_remove = None;
 
 		for (wh, w) in self.windows.iter() {
-			if w.process_handle == EmuProcessHandle::new(handle.idx, handle.generation) {
+			if w.process_handle == EmuProcessHandle::from(slotmap::KeyData::from_ffi(handle.user)) {
 				to_remove = Some(wh);
 			}
 		}
 
 		if let Some(wh) = to_remove {
-			self.windows.remove(&wh);
+			self.windows.remove(wh);
 		}
 
 		self
 			.processes
-			.remove(&EmuProcessHandle::new(handle.idx, handle.generation));
+			.remove(EmuProcessHandle::from(slotmap::KeyData::from_ffi(handle.user)));
 		Ok(())
 	}
 
 	fn window_set_visible(&mut self, _: &mut (), handle: WvrWindowHandle, visible: bool) -> anyhow::Result<()> {
-		match self.windows.get_mut(&EmuWindowHandle {
-			generation: handle.generation,
-			idx: handle.idx,
-		}) {
+		match self
+			.windows
+			.get_mut(EmuWindowHandle::from(slotmap::KeyData::from_ffi(handle.user)))
+		{
 			Some(w) => {
 				w.visible = visible;
 				Ok(())
@@ -217,7 +214,7 @@ impl DashInterface<()> for DashInterfaceEmulated {
 		}
 	}
 
-	fn recenter_playspace(&mut self, _: &mut (), _: RecenterMode) -> anyhow::Result<()> {
+	fn playspace_task(&mut self, _: &mut (), _: DashPlayspaceTask) -> anyhow::Result<()> {
 		// stub!
 		Ok(())
 	}
@@ -230,12 +227,20 @@ impl DashInterface<()> for DashInterfaceEmulated {
 		&mut self.general_config
 	}
 
-	fn config_changed(&mut self, _: &mut ()) {}
+	fn config_changed(&mut self, _: &mut (), _: ConfigChangeKind) {}
 
 	fn restart(&mut self, _data: &mut ()) {}
 
 	fn toggle_dashboard(&mut self, _data: &mut ()) {}
 
+	fn get_feats(&mut self, _data: &mut ()) -> dash_interface::InterfaceFeats {
+		dash_interface::InterfaceFeats {
+			openxr: true,
+			monado: true,
+			whisper: true,
+		}
+	}
+
 	fn monado_client_list(
 		&mut self,
 		_data: &mut (),
diff --git a/wlx-common/src/data_dir.rs b/wlx-common/src/data_dir.rs
new file mode 100644
index 00000000..c843284d
--- /dev/null
+++ b/wlx-common/src/data_dir.rs
@@ -0,0 +1,20 @@
+use std::{path::PathBuf, sync::LazyLock};
+
+const FALLBACK_DATA_PATH: &str = "/tmp/wayvr_data";
+
+static DATA_ROOT_PATH: LazyLock<PathBuf> = LazyLock::new(|| {
+	if let Some(mut dir) = xdg::BaseDirectories::new().get_data_home() {
+		dir.push("wayvr");
+		return dir;
+	}
+	log::error!("Err: Failed to find data path, using {FALLBACK_DATA_PATH}");
+	PathBuf::from(FALLBACK_DATA_PATH)
+});
+
+fn get_data_root() -> PathBuf {
+	DATA_ROOT_PATH.clone()
+}
+
+pub fn get_path(data_path: &str) -> PathBuf {
+	get_data_root().join(data_path)
+}
diff --git a/wlx-common/src/desktop_finder.rs b/wlx-common/src/desktop_finder.rs
index 2bcbf580..f405a240 100644
--- a/wlx-common/src/desktop_finder.rs
+++ b/wlx-common/src/desktop_finder.rs
@@ -17,6 +17,7 @@ use serde::{Deserialize, Serialize};
 use walkdir::WalkDir;
 
 struct DesktopEntryOwned {
+	app_id: String,
 	exec_path: String,
 	exec_args: String,
 	app_name: String,
@@ -28,6 +29,7 @@ struct DesktopEntryOwned {
 pub struct DesktopEntry {
 	pub exec_path: Rc<str>,
 	pub exec_args: Rc<str>,
+	pub app_id: Rc<str>,
 	pub app_name: Rc<str>,
 	pub icon_path: Option<Rc<str>>,
 	pub categories: Vec<Rc<str>>,
@@ -36,6 +38,7 @@ pub struct DesktopEntry {
 impl From<DesktopEntryOwned> for DesktopEntry {
 	fn from(value: DesktopEntryOwned) -> Self {
 		Self {
+			app_id: value.app_id.into(),
 			exec_path: value.exec_path.into(),
 			exec_args: value.exec_args.into(),
 			app_name: value.app_name.into(),
@@ -242,8 +245,9 @@ impl DesktopFinder {
 				known_files.insert(file_name.to_string());
 
 				entries.insert(
-					app_id,
+					app_id.clone(),
 					DesktopEntryOwned {
+						app_id,
 						app_name: String::from(app_name),
 						exec_path: String::from(exec_path),
 						exec_args: exec_args.join(" "),
diff --git a/wlx-common/src/handle.rs b/wlx-common/src/handle.rs
deleted file mode 100644
index d300d052..00000000
--- a/wlx-common/src/handle.rs
+++ /dev/null
@@ -1,172 +0,0 @@
-#[macro_export]
-macro_rules! gen_id {
-	(
-		$container_name:ident,
-		$instance_name:ident,
-		$cell_name:ident,
-		$handle_name:ident) => {
-		//ThingCell
-		#[derive(Debug)]
-		pub struct $cell_name {
-			pub obj: $instance_name,
-			pub generation: u64,
-		}
-
-		//ThingVec
-		#[derive(Debug)]
-		pub struct $container_name {
-			// Vec<Option<ThingCell>>
-			pub vec: Vec<Option<$cell_name>>,
-
-			cur_generation: u64,
-		}
-
-		//ThingHandle
-		#[derive(Default, Debug, Clone, Copy, PartialEq, Hash, Eq)]
-		pub struct $handle_name {
-			idx: u32,
-			generation: u64,
-		}
-
-		#[allow(dead_code)]
-		impl $handle_name {
-			pub const fn reset(&mut self) {
-				self.generation = 0;
-			}
-
-			pub const fn is_set(&self) -> bool {
-				self.generation > 0
-			}
-
-			pub const fn id(&self) -> u32 {
-				self.idx
-			}
-
-			pub const fn new(idx: u32, generation: u64) -> Self {
-				Self { idx, generation }
-			}
-		}
-
-		//ThingVec
-		impl $container_name {
-			#[allow(clippy::new_without_default)]
-			pub const fn new() -> Self {
-				Self {
-					vec: Vec::new(),
-					cur_generation: 0,
-				}
-			}
-
-			pub fn iter(&self) -> impl Iterator<Item = ($handle_name, &$instance_name)> {
-				self.vec.iter().enumerate().filter_map(|(idx, opt_cell)| {
-					opt_cell.as_ref().map(|cell| {
-						let handle = $container_name::get_handle(&cell, idx);
-						(handle, &cell.obj)
-					})
-				})
-			}
-
-			pub fn iter_mut(&mut self) -> impl Iterator<Item = ($handle_name, &mut $instance_name)> {
-				self.vec.iter_mut().enumerate().filter_map(|(idx, opt_cell)| {
-					opt_cell.as_mut().map(|cell| {
-						let handle = $container_name::get_handle(&cell, idx);
-						(handle, &mut cell.obj)
-					})
-				})
-			}
-
-			pub const fn get_handle(cell: &$cell_name, idx: usize) -> $handle_name {
-				$handle_name {
-					idx: idx as u32,
-					generation: cell.generation,
-				}
-			}
-
-			fn find_unused_idx(&mut self) -> Option<u32> {
-				for (num, obj) in self.vec.iter().enumerate() {
-					if obj.is_none() {
-						return Some(num as u32);
-					}
-				}
-				None
-			}
-
-			pub fn add(&mut self, obj: $instance_name) -> $handle_name {
-				self.cur_generation += 1;
-				let generation = self.cur_generation;
-
-				let unused_idx = self.find_unused_idx();
-
-				let idx = if let Some(idx) = unused_idx {
-					idx
-				} else {
-					self.vec.len() as u32
-				};
-
-				let handle = $handle_name { idx, generation };
-
-				let cell = $cell_name { obj, generation };
-
-				if let Some(idx) = unused_idx {
-					self.vec[idx as usize] = Some(cell);
-				} else {
-					self.vec.push(Some(cell))
-				}
-
-				handle
-			}
-
-			pub fn remove(&mut self, handle: &$handle_name) {
-				// Out of bounds, ignore
-				if handle.idx as usize >= self.vec.len() {
-					return;
-				}
-
-				// Remove only if the generation matches
-				if let Some(cell) = &self.vec[handle.idx as usize] {
-					if cell.generation == handle.generation {
-						self.vec[handle.idx as usize] = None;
-					}
-				}
-			}
-
-			pub fn get(&self, handle: &$handle_name) -> Option<&$instance_name> {
-				// Out of bounds, ignore
-				if handle.idx as usize >= self.vec.len() {
-					return None;
-				}
-
-				if let Some(cell) = &self.vec[handle.idx as usize] {
-					if cell.generation == handle.generation {
-						return Some(&cell.obj);
-					}
-				}
-
-				None
-			}
-
-			pub fn get_mut(&mut self, handle: &$handle_name) -> Option<&mut $instance_name> {
-				// Out of bounds, ignore
-				if handle.idx as usize >= self.vec.len() {
-					return None;
-				}
-
-				if let Some(cell) = &mut self.vec[handle.idx as usize] {
-					if cell.generation == handle.generation {
-						return Some(&mut cell.obj);
-					}
-				}
-
-				None
-			}
-		}
-	};
-}
-
-/* Example usage:
-gen_id!(ThingVec, ThingInstance, ThingCell, ThingHandle);
-
-struct ThingInstance {}
-
-impl ThingInstance {}
- */
diff --git a/wlx-common/src/lib.rs b/wlx-common/src/lib.rs
index c2c46177..59be4476 100644
--- a/wlx-common/src/lib.rs
+++ b/wlx-common/src/lib.rs
@@ -7,9 +7,13 @@ pub mod config;
 pub mod config_io;
 pub mod dash_interface;
 pub mod dash_interface_emulated;
+pub mod data_dir;
 pub mod desktop_finder;
-mod handle;
 pub mod locale;
+pub mod openxr_actions;
+pub mod openxr_bindings_schema;
+pub mod openxr_controller_profiles;
 pub mod overlays;
+pub mod palette;
 pub mod timestep;
 pub mod windowing;
diff --git a/wlx-common/src/openxr_actions.rs b/wlx-common/src/openxr_actions.rs
new file mode 100644
index 00000000..43abdb3f
--- /dev/null
+++ b/wlx-common/src/openxr_actions.rs
@@ -0,0 +1,88 @@
+use serde::{Deserialize, Serialize};
+
+use crate::config_io;
+
+const DEFAULT_XR_INPUT_PROFILES: &str = include_str!("../assets/openxr_actions.json5");
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum OneOrMany<T> {
+	One(T),
+	Many(Vec<T>),
+}
+
+#[derive(Debug, Default, Clone, Serialize, Deserialize)]
+pub struct OpenXrInputAction {
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub left: Option<OneOrMany<String>>,
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub right: Option<OneOrMany<String>>,
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub handsfree: Option<OneOrMany<String>>,
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub threshold_left: Option<[f32; 2]>,
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub threshold_right: Option<[f32; 2]>,
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub double_click: Option<bool>,
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub triple_click: Option<bool>,
+}
+
+#[derive(Debug, Default, Clone, Serialize, Deserialize)]
+pub struct OpenXrInputProfile {
+	pub profile: String,
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub pose: Option<OpenXrInputAction>,
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub click: Option<OpenXrInputAction>,
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub grab: Option<OpenXrInputAction>,
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub alt_click: Option<OpenXrInputAction>,
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub show_hide: Option<OpenXrInputAction>,
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub toggle_dashboard: Option<OpenXrInputAction>,
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub space_drag: Option<OpenXrInputAction>,
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub space_rotate: Option<OpenXrInputAction>,
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub space_reset: Option<OpenXrInputAction>,
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub click_modifier_right: Option<OpenXrInputAction>,
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub click_modifier_middle: Option<OpenXrInputAction>,
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub move_mouse: Option<OpenXrInputAction>,
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub scroll: Option<OpenXrInputAction>,
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub haptic: Option<OpenXrInputAction>,
+}
+
+pub fn load_xr_input_profiles() -> Vec<OpenXrInputProfile> {
+	let mut profiles: Vec<OpenXrInputProfile> = serde_json5::from_str(DEFAULT_XR_INPUT_PROFILES).unwrap(); // want panic
+
+	let Some(conf) = config_io::load("openxr_actions.json5") else {
+		return profiles;
+	};
+
+	match serde_json5::from_str::<Vec<OpenXrInputProfile>>(&conf) {
+		Ok(override_profiles) => {
+			for new in override_profiles {
+				if let Some(i) = profiles.iter().position(|old| old.profile == new.profile) {
+					profiles[i] = new;
+				} else {
+					profiles.push(new);
+				}
+			}
+		}
+		Err(e) => {
+			log::error!("Failed to load openxr_actions.json5: {e}");
+		}
+	}
+
+	profiles
+}
diff --git a/wlx-common/src/openxr_bindings_schema.rs b/wlx-common/src/openxr_bindings_schema.rs
new file mode 100644
index 00000000..93012080
--- /dev/null
+++ b/wlx-common/src/openxr_bindings_schema.rs
@@ -0,0 +1,138 @@
+use serde::{Deserialize, Serialize};
+use strum::{AsRefStr, EnumProperty, EnumString};
+
+pub const DEFAULT_BUTTON_THRESHOLDS: [f32; 2] = [0.5, 0.7];
+
+pub struct XrControllerProfile {
+	pub display_name: &'static str,
+	pub profile_id: &'static str,
+	pub extension: Option<&'static str>,
+	pub user_paths: &'static [XrControllerUserPath],
+}
+
+impl XrControllerProfile {
+	pub fn find_userpath(&self, side: XrInputSide) -> Option<&XrControllerUserPath> {
+		self.user_paths.iter().find(|x| x.hand == side)
+	}
+}
+
+pub struct XrControllerUserPath {
+	pub hand: XrInputSide,
+	pub paths: &'static [XrInputSubpath],
+}
+
+impl XrControllerUserPath {
+	pub fn find_subpath(&self, subpath: XrInputSubpathKind) -> Option<&XrInputSubpath> {
+		self.paths.iter().find(|x| x.kind == subpath)
+	}
+}
+
+pub struct XrInputSubpath {
+	pub kind: XrInputSubpathKind,
+	pub components: &'static [XrInputComponent],
+}
+
+#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, EnumString, AsRefStr, EnumProperty)]
+#[strum(ascii_case_insensitive, serialize_all = "snake_case")]
+pub enum XrInputSubpathKind {
+	#[strum(props(Translation = "APP_SETTINGS.BINDINGS.TYPE.TRIGGER"))]
+	Trigger,
+	#[strum(props(Translation = "APP_SETTINGS.BINDINGS.TYPE.TRACKPAD"))]
+	Trackpad,
+	#[strum(props(Translation = "APP_SETTINGS.BINDINGS.TYPE.THUMBSTICK"))]
+	Thumbstick,
+	#[strum(props(Translation = "APP_SETTINGS.BINDINGS.TYPE.JOYSTICK"))]
+	Joystick,
+	#[strum(props(Translation = "APP_SETTINGS.BINDINGS.TYPE.SYSTEM"))]
+	System,
+	Menu,
+	View,
+
+	Primary,
+	Secondary,
+
+	A,
+	B,
+	X,
+	Y,
+	Start,
+	Home,
+	End,
+	Select,
+	#[strum(props(Translation = "APP_SETTINGS.BINDINGS.TYPE.THUMBREST"))]
+	Thumbrest,
+	#[strum(props(Translation = "APP_SETTINGS.BINDINGS.TYPE.SHOULDER"))]
+	Shoulder,
+	#[strum(props(Translation = "APP_SETTINGS.BINDINGS.TYPE.SQUEEZE"))]
+	Squeeze,
+	#[strum(props(Translation = "APP_SETTINGS.BINDINGS.TYPE.BUMPER"))]
+	Bumper,
+
+	#[strum(props(Translation = "APP_SETTINGS.BINDINGS.TYPE.DPAD_UP"))]
+	DpadUp,
+	#[strum(props(Translation = "APP_SETTINGS.BINDINGS.TYPE.DPAD_DOWN"))]
+	DpadDown,
+	#[strum(props(Translation = "APP_SETTINGS.BINDINGS.TYPE.DPAD_LEFT"))]
+	DpadLeft,
+	#[strum(props(Translation = "APP_SETTINGS.BINDINGS.TYPE.DPAD_RIGHT"))]
+	DpadRight,
+
+	#[strum(props(Hidden = true))]
+	Grip,
+	#[strum(props(Hidden = true))]
+	Aim,
+	#[strum(props(Hidden = true))]
+	Haptic,
+}
+
+#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, EnumString, AsRefStr, EnumProperty)]
+#[serde(rename_all = "snake_case")]
+#[strum(ascii_case_insensitive, serialize_all = "snake_case")]
+pub enum XrInputComponent {
+	#[strum(props(Translation = "APP_SETTINGS.BINDINGS.COMP.CLICK"))]
+	Click,
+	#[strum(props(Translation = "APP_SETTINGS.BINDINGS.COMP.FORCE"))]
+	Force,
+	#[strum(props(Translation = "APP_SETTINGS.BINDINGS.COMP.TOUCH"))]
+	Touch,
+	#[strum(props(Translation = "APP_SETTINGS.BINDINGS.COMP.VALUE"))]
+	Value,
+
+	#[strum(props(Translation = "APP_SETTINGS.BINDINGS.COMP.PROXIMITY"))]
+	Proximity,
+
+	#[strum(props(Translation = "APP_SETTINGS.BINDINGS.COMP.X_AXIS"))]
+	X,
+	#[strum(props(Translation = "APP_SETTINGS.BINDINGS.COMP.Y_AXIS"))]
+	Y,
+
+	// thumbstick/trackpad d-pad bindings via EXT_dpad_binding
+	#[strum(props(Translation = "APP_SETTINGS.BINDINGS.TYPE.DPAD_UP"))]
+	DpadUp,
+	#[strum(props(Translation = "APP_SETTINGS.BINDINGS.TYPE.DPAD_DOWN"))]
+	DpadDown,
+	#[strum(props(Translation = "APP_SETTINGS.BINDINGS.TYPE.DPAD_LEFT"))]
+	DpadLeft,
+	#[strum(props(Translation = "APP_SETTINGS.BINDINGS.TYPE.DPAD_RIGHT"))]
+	DpadRight,
+
+	// below are hidden
+	Pose,
+}
+
+impl XrInputComponent {
+	pub fn is_analog(&self) -> bool {
+		matches!(
+			self,
+			XrInputComponent::Force | XrInputComponent::Value | XrInputComponent::X | XrInputComponent::Y
+		)
+	}
+}
+
+#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, EnumString, AsRefStr)]
+#[serde(rename_all = "snake_case")]
+#[strum(ascii_case_insensitive, serialize_all = "snake_case")]
+pub enum XrInputSide {
+	Left,
+	Right,
+}
diff --git a/wlx-common/src/openxr_controller_profiles.rs b/wlx-common/src/openxr_controller_profiles.rs
new file mode 100644
index 00000000..fa49046a
--- /dev/null
+++ b/wlx-common/src/openxr_controller_profiles.rs
@@ -0,0 +1,740 @@
+use crate::openxr_bindings_schema::{
+	XrControllerProfile, XrControllerUserPath, XrInputComponent, XrInputSide, XrInputSubpath, XrInputSubpathKind,
+};
+
+pub const OPENXR_INPUT_PROFILES: &[&XrControllerProfile] = &[
+	&OCULUS_TOUCH_CONTROLLER_PROFILE,
+	&VALVE_INDEX_CONTROLLER_PROFILE,
+	&VALVE_FRAME_CONTROLLER_VALVE_PROFILE,
+	&HTC_VIVE_CONTROLLER_PROFILE,
+	&HP_MIXED_REALITY_CONTROLLER_PROFILE,
+	&MICROSOFT_MOTION_CONTROLLER_PROFILE,
+	&SAMSUNG_ODYSSEY_CONTROLLER_PROFILE,
+	&KHR_GENERIC_CONTROLLER_PROFILE,
+];
+
+pub const VALVE_INDEX_CONTROLLER_PROFILE: XrControllerProfile = XrControllerProfile {
+	display_name: "Valve Index Controller",
+	extension: None,
+	profile_id: "/interaction_profiles/valve/index_controller",
+	user_paths: &[
+		XrControllerUserPath {
+			hand: XrInputSide::Left,
+			paths: VALVE_INDEX_USER_PATHS,
+		},
+		XrControllerUserPath {
+			hand: XrInputSide::Right,
+			paths: VALVE_INDEX_USER_PATHS,
+		},
+	],
+};
+
+const VALVE_INDEX_USER_PATHS: &[XrInputSubpath] = &[
+	XrInputSubpath {
+		kind: XrInputSubpathKind::System,
+		components: &[XrInputComponent::Click, XrInputComponent::Touch],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::A,
+		components: &[XrInputComponent::Click, XrInputComponent::Touch],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::B,
+		components: &[XrInputComponent::Click, XrInputComponent::Touch],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Squeeze,
+		components: &[XrInputComponent::Value, XrInputComponent::Force],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Trigger,
+		components: &[
+			XrInputComponent::Click,
+			XrInputComponent::Value,
+			XrInputComponent::Touch,
+		],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Thumbstick,
+		components: &[
+			XrInputComponent::Click,
+			XrInputComponent::Touch,
+			XrInputComponent::X,
+			XrInputComponent::Y,
+			XrInputComponent::DpadUp,
+			XrInputComponent::DpadDown,
+			XrInputComponent::DpadLeft,
+			XrInputComponent::DpadRight,
+		],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Trackpad,
+		components: &[
+			XrInputComponent::Force,
+			XrInputComponent::Touch,
+			XrInputComponent::X,
+			XrInputComponent::Y,
+			XrInputComponent::DpadUp,
+			XrInputComponent::DpadDown,
+			XrInputComponent::DpadLeft,
+			XrInputComponent::DpadRight,
+		],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Grip,
+		components: &[XrInputComponent::Pose],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Aim,
+		components: &[XrInputComponent::Pose],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Haptic,
+		components: &[],
+	},
+];
+
+pub static VALVE_FRAME_CONTROLLER_VALVE_PROFILE: XrControllerProfile = XrControllerProfile {
+	display_name: "Steam Frame Controller",
+	extension: Some("XR_VALVE_frame_controller_interaction"),
+	profile_id: "/interaction_profiles/valve/frame_controller_valve",
+	user_paths: &[
+		XrControllerUserPath {
+			hand: XrInputSide::Left,
+			paths: VALVE_FRAME_CONTROLLER_VALVE_LEFT_USER_PATHS,
+		},
+		XrControllerUserPath {
+			hand: XrInputSide::Right,
+			paths: VALVE_FRAME_CONTROLLER_VALVE_RIGHT_USER_PATHS,
+		},
+	],
+};
+
+static VALVE_FRAME_CONTROLLER_VALVE_RIGHT_USER_PATHS: &[XrInputSubpath] = &[
+	XrInputSubpath {
+		kind: XrInputSubpathKind::A,
+		components: &[XrInputComponent::Click, XrInputComponent::Touch],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::B,
+		components: &[XrInputComponent::Click, XrInputComponent::Touch],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::X,
+		components: &[XrInputComponent::Click, XrInputComponent::Touch],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Y,
+		components: &[XrInputComponent::Click, XrInputComponent::Touch],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Menu,
+		components: &[XrInputComponent::Click, XrInputComponent::Touch],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::System,
+		components: &[XrInputComponent::Click, XrInputComponent::Touch],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Bumper,
+		components: &[XrInputComponent::Click, XrInputComponent::Touch],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Squeeze,
+		components: &[
+			XrInputComponent::Click,
+			XrInputComponent::Touch,
+			XrInputComponent::Value,
+		],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Trigger,
+		components: &[
+			XrInputComponent::Click,
+			XrInputComponent::Touch,
+			XrInputComponent::Value,
+		],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Thumbstick,
+		components: &[
+			XrInputComponent::Click,
+			XrInputComponent::Touch,
+			XrInputComponent::X,
+			XrInputComponent::Y,
+			XrInputComponent::DpadUp,
+			XrInputComponent::DpadDown,
+			XrInputComponent::DpadLeft,
+			XrInputComponent::DpadRight,
+		],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Grip,
+		components: &[XrInputComponent::Pose],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Aim,
+		components: &[XrInputComponent::Pose],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Haptic,
+		components: &[],
+	},
+];
+
+static VALVE_FRAME_CONTROLLER_VALVE_LEFT_USER_PATHS: &[XrInputSubpath] = &[
+	XrInputSubpath {
+		kind: XrInputSubpathKind::DpadUp,
+		components: &[XrInputComponent::Click, XrInputComponent::Touch],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::DpadLeft,
+		components: &[XrInputComponent::Click, XrInputComponent::Touch],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::DpadDown,
+		components: &[XrInputComponent::Click, XrInputComponent::Touch],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::DpadRight,
+		components: &[XrInputComponent::Click, XrInputComponent::Touch],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::View,
+		components: &[XrInputComponent::Click, XrInputComponent::Touch],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::System,
+		components: &[XrInputComponent::Click, XrInputComponent::Touch],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Bumper,
+		components: &[XrInputComponent::Click, XrInputComponent::Touch],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Squeeze,
+		components: &[
+			XrInputComponent::Click,
+			XrInputComponent::Touch,
+			XrInputComponent::Value,
+		],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Trigger,
+		components: &[
+			XrInputComponent::Click,
+			XrInputComponent::Touch,
+			XrInputComponent::Value,
+		],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Thumbstick,
+		components: &[
+			XrInputComponent::Click,
+			XrInputComponent::Touch,
+			XrInputComponent::X,
+			XrInputComponent::Y,
+			XrInputComponent::DpadUp,
+			XrInputComponent::DpadDown,
+			XrInputComponent::DpadLeft,
+			XrInputComponent::DpadRight,
+		],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Grip,
+		components: &[XrInputComponent::Pose],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Aim,
+		components: &[XrInputComponent::Pose],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Haptic,
+		components: &[],
+	},
+];
+
+pub const OCULUS_TOUCH_CONTROLLER_PROFILE: XrControllerProfile = XrControllerProfile {
+	display_name: "Touch Controller",
+	extension: None,
+	profile_id: "/interaction_profiles/oculus/touch_controller",
+	user_paths: &[
+		XrControllerUserPath {
+			hand: XrInputSide::Left,
+			paths: OCULUS_TOUCH_LEFT_USER_PATHS,
+		},
+		XrControllerUserPath {
+			hand: XrInputSide::Right,
+			paths: OCULUS_TOUCH_RIGHT_USER_PATHS,
+		},
+	],
+};
+
+const OCULUS_TOUCH_LEFT_USER_PATHS: &[XrInputSubpath] = &[
+	XrInputSubpath {
+		kind: XrInputSubpathKind::X,
+		components: &[XrInputComponent::Click, XrInputComponent::Touch],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Y,
+		components: &[XrInputComponent::Click, XrInputComponent::Touch],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Menu,
+		components: &[XrInputComponent::Click],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Squeeze,
+		components: &[XrInputComponent::Value],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Trigger,
+		components: &[XrInputComponent::Value, XrInputComponent::Touch],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Thumbstick,
+		components: &[
+			XrInputComponent::Click,
+			XrInputComponent::Touch,
+			XrInputComponent::X,
+			XrInputComponent::Y,
+			XrInputComponent::DpadUp,
+			XrInputComponent::DpadDown,
+			XrInputComponent::DpadLeft,
+			XrInputComponent::DpadRight,
+		],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Thumbrest,
+		components: &[XrInputComponent::Touch],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Grip,
+		components: &[XrInputComponent::Pose],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Aim,
+		components: &[XrInputComponent::Pose],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Haptic,
+		components: &[],
+	},
+];
+
+const OCULUS_TOUCH_RIGHT_USER_PATHS: &[XrInputSubpath] = &[
+	XrInputSubpath {
+		kind: XrInputSubpathKind::A,
+		components: &[XrInputComponent::Click, XrInputComponent::Touch],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::B,
+		components: &[XrInputComponent::Click, XrInputComponent::Touch],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::System,
+		components: &[XrInputComponent::Click],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Squeeze,
+		components: &[XrInputComponent::Value],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Trigger,
+		components: &[XrInputComponent::Value, XrInputComponent::Touch],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Thumbstick,
+		components: &[
+			XrInputComponent::Click,
+			XrInputComponent::Touch,
+			XrInputComponent::X,
+			XrInputComponent::Y,
+			XrInputComponent::DpadUp,
+			XrInputComponent::DpadDown,
+			XrInputComponent::DpadLeft,
+			XrInputComponent::DpadRight,
+		],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Thumbrest,
+		components: &[XrInputComponent::Touch],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Grip,
+		components: &[XrInputComponent::Pose],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Aim,
+		components: &[XrInputComponent::Pose],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Haptic,
+		components: &[],
+	},
+];
+
+pub const HP_MIXED_REALITY_CONTROLLER_PROFILE: XrControllerProfile = XrControllerProfile {
+	display_name: "HP Reverb G2 Controller",
+	extension: None,
+	profile_id: "/interaction_profiles/hp/mixed_reality_controller",
+	user_paths: &[
+		XrControllerUserPath {
+			hand: XrInputSide::Left,
+			paths: HP_MIXED_REALITY_LEFT_USER_PATHS,
+		},
+		XrControllerUserPath {
+			hand: XrInputSide::Right,
+			paths: HP_MIXED_REALITY_RIGHT_USER_PATHS,
+		},
+	],
+};
+
+const HP_MIXED_REALITY_LEFT_USER_PATHS: &[XrInputSubpath] = &[
+	XrInputSubpath {
+		kind: XrInputSubpathKind::X,
+		components: &[XrInputComponent::Click],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Y,
+		components: &[XrInputComponent::Click],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Menu,
+		components: &[XrInputComponent::Click],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Squeeze,
+		components: &[XrInputComponent::Value],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Trigger,
+		components: &[XrInputComponent::Value],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Thumbstick,
+		components: &[
+			XrInputComponent::Click,
+			XrInputComponent::X,
+			XrInputComponent::Y,
+			XrInputComponent::DpadUp,
+			XrInputComponent::DpadDown,
+			XrInputComponent::DpadLeft,
+			XrInputComponent::DpadRight,
+		],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Grip,
+		components: &[XrInputComponent::Pose],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Aim,
+		components: &[XrInputComponent::Pose],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Haptic,
+		components: &[],
+	},
+];
+
+const HP_MIXED_REALITY_RIGHT_USER_PATHS: &[XrInputSubpath] = &[
+	XrInputSubpath {
+		kind: XrInputSubpathKind::A,
+		components: &[XrInputComponent::Click],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::B,
+		components: &[XrInputComponent::Click],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Menu,
+		components: &[XrInputComponent::Click],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Squeeze,
+		components: &[XrInputComponent::Value],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Trigger,
+		components: &[XrInputComponent::Value],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Thumbstick,
+		components: &[
+			XrInputComponent::Click,
+			XrInputComponent::X,
+			XrInputComponent::Y,
+			XrInputComponent::DpadUp,
+			XrInputComponent::DpadDown,
+			XrInputComponent::DpadLeft,
+			XrInputComponent::DpadRight,
+		],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Grip,
+		components: &[XrInputComponent::Pose],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Aim,
+		components: &[XrInputComponent::Pose],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Haptic,
+		components: &[],
+	},
+];
+
+pub const SAMSUNG_ODYSSEY_CONTROLLER_PROFILE: XrControllerProfile = XrControllerProfile {
+	display_name: "Samsung Odyssey Controller",
+	extension: Some("XR_EXT_samsung_odyssey_controller"),
+	profile_id: "/interaction_profiles/samsung/odyssey_controller",
+	user_paths: &[
+		XrControllerUserPath {
+			hand: XrInputSide::Left,
+			paths: SAMSUNG_ODYSSEY_USER_PATHS,
+		},
+		XrControllerUserPath {
+			hand: XrInputSide::Right,
+			paths: SAMSUNG_ODYSSEY_USER_PATHS,
+		},
+	],
+};
+
+const SAMSUNG_ODYSSEY_USER_PATHS: &[XrInputSubpath] = &[
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Menu,
+		components: &[XrInputComponent::Click],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Squeeze,
+		components: &[XrInputComponent::Click],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Trigger,
+		components: &[XrInputComponent::Value],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Thumbstick,
+		components: &[
+			XrInputComponent::Click,
+			XrInputComponent::X,
+			XrInputComponent::Y,
+			XrInputComponent::DpadUp,
+			XrInputComponent::DpadDown,
+			XrInputComponent::DpadLeft,
+			XrInputComponent::DpadRight,
+		],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Trackpad,
+		components: &[
+			XrInputComponent::Click,
+			XrInputComponent::Touch,
+			XrInputComponent::X,
+			XrInputComponent::Y,
+			XrInputComponent::DpadUp,
+			XrInputComponent::DpadDown,
+			XrInputComponent::DpadLeft,
+			XrInputComponent::DpadRight,
+		],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Grip,
+		components: &[XrInputComponent::Pose],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Aim,
+		components: &[XrInputComponent::Pose],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Haptic,
+		components: &[],
+	},
+];
+
+pub const HTC_VIVE_CONTROLLER_PROFILE: XrControllerProfile = XrControllerProfile {
+	display_name: "HTC Vive Controller",
+	extension: None,
+	profile_id: "/interaction_profiles/htc/vive_controller",
+	user_paths: &[
+		XrControllerUserPath {
+			hand: XrInputSide::Left,
+			paths: HTC_VIVE_USER_PATHS,
+		},
+		XrControllerUserPath {
+			hand: XrInputSide::Right,
+			paths: HTC_VIVE_USER_PATHS,
+		},
+	],
+};
+
+const HTC_VIVE_USER_PATHS: &[XrInputSubpath] = &[
+	XrInputSubpath {
+		kind: XrInputSubpathKind::System,
+		components: &[XrInputComponent::Click],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Squeeze,
+		components: &[XrInputComponent::Click],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Menu,
+		components: &[XrInputComponent::Click],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Trigger,
+		components: &[XrInputComponent::Click, XrInputComponent::Value],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Trackpad,
+		components: &[
+			XrInputComponent::Click,
+			XrInputComponent::Touch,
+			XrInputComponent::X,
+			XrInputComponent::Y,
+			XrInputComponent::DpadUp,
+			XrInputComponent::DpadDown,
+			XrInputComponent::DpadLeft,
+			XrInputComponent::DpadRight,
+		],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Grip,
+		components: &[XrInputComponent::Pose],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Aim,
+		components: &[XrInputComponent::Pose],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Haptic,
+		components: &[],
+	},
+];
+
+pub const MICROSOFT_MOTION_CONTROLLER_PROFILE: XrControllerProfile = XrControllerProfile {
+	display_name: "Microsoft WMR Controller",
+	extension: None,
+	profile_id: "/interaction_profiles/microsoft/motion_controller",
+	user_paths: &[
+		XrControllerUserPath {
+			hand: XrInputSide::Left,
+			paths: MICROSOFT_MOTION_CONTROLLER_USER_PATHS,
+		},
+		XrControllerUserPath {
+			hand: XrInputSide::Right,
+			paths: MICROSOFT_MOTION_CONTROLLER_USER_PATHS,
+		},
+	],
+};
+
+const MICROSOFT_MOTION_CONTROLLER_USER_PATHS: &[XrInputSubpath] = &[
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Menu,
+		components: &[XrInputComponent::Click],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Squeeze,
+		components: &[XrInputComponent::Click],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Trigger,
+		components: &[XrInputComponent::Value],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Thumbstick,
+		components: &[
+			XrInputComponent::Click,
+			XrInputComponent::X,
+			XrInputComponent::Y,
+			XrInputComponent::DpadUp,
+			XrInputComponent::DpadDown,
+			XrInputComponent::DpadLeft,
+			XrInputComponent::DpadRight,
+		],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Trackpad,
+		components: &[
+			XrInputComponent::Click,
+			XrInputComponent::Touch,
+			XrInputComponent::X,
+			XrInputComponent::Y,
+			XrInputComponent::DpadUp,
+			XrInputComponent::DpadDown,
+			XrInputComponent::DpadLeft,
+			XrInputComponent::DpadRight,
+		],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Grip,
+		components: &[XrInputComponent::Pose],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Aim,
+		components: &[XrInputComponent::Pose],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Haptic,
+		components: &[],
+	},
+];
+
+pub const KHR_GENERIC_CONTROLLER_PROFILE: XrControllerProfile = XrControllerProfile {
+	display_name: "Khronos Generic Controller",
+	extension: None,
+	profile_id: "/interaction_profiles/khr/generic_controller",
+	user_paths: &[
+		XrControllerUserPath {
+			hand: XrInputSide::Left,
+			paths: KHR_GENERIC_CONTROLLER_USER_PATHS,
+		},
+		XrControllerUserPath {
+			hand: XrInputSide::Right,
+			paths: KHR_GENERIC_CONTROLLER_USER_PATHS,
+		},
+	],
+};
+
+const KHR_GENERIC_CONTROLLER_USER_PATHS: &[XrInputSubpath] = &[
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Primary,
+		components: &[XrInputComponent::Click],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Secondary,
+		components: &[XrInputComponent::Click],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Thumbstick,
+		components: &[
+			XrInputComponent::Click,
+			XrInputComponent::X,
+			XrInputComponent::Y,
+			XrInputComponent::DpadUp,
+			XrInputComponent::DpadDown,
+			XrInputComponent::DpadLeft,
+			XrInputComponent::DpadRight,
+		],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Squeeze,
+		components: &[XrInputComponent::Value],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Trigger,
+		components: &[XrInputComponent::Value],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Grip,
+		components: &[XrInputComponent::Pose],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Aim,
+		components: &[XrInputComponent::Pose],
+	},
+	XrInputSubpath {
+		kind: XrInputSubpathKind::Haptic,
+		components: &[],
+	},
+];
diff --git a/wlx-common/src/overlays.rs b/wlx-common/src/overlays.rs
index 63490e71..2728b596 100644
--- a/wlx-common/src/overlays.rs
+++ b/wlx-common/src/overlays.rs
@@ -26,6 +26,7 @@ pub enum BackendAttrib {
 	StereoAdjustMouse,
 	MouseTransform,
 	Icon,
+	Resizable,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -36,9 +37,12 @@ pub enum BackendAttribValue {
 	MouseTransform(MouseTransform),
 	#[serde(skip_serializing, skip_deserializing)]
 	Icon(Arc<str>),
+	#[serde(skip_serializing, skip_deserializing)]
+	Resizable(bool),
 }
 
 impl BackendAttribValue {
+	/// Used to determine if value should be saved
 	pub fn is_default(&self) -> bool {
 		match self {
 			Self::Stereo(val) => *val == StereoMode::default(),
@@ -46,6 +50,7 @@ impl BackendAttribValue {
 			Self::StereoAdjustMouse(val) => !*val,
 			Self::MouseTransform(val) => *val == MouseTransform::default(),
 			Self::Icon(_) => false,
+			Self::Resizable(_) => false,
 		}
 	}
 }
diff --git a/wlx-common/src/palette.rs b/wlx-common/src/palette.rs
new file mode 100644
index 00000000..2b1a7488
--- /dev/null
+++ b/wlx-common/src/palette.rs
@@ -0,0 +1,153 @@
+use std::{fs::File, io::BufReader};
+
+use serde::{Deserialize, Deserializer, de::Error as _};
+use wgui::{
+	drawing,
+	log::LogErr,
+	palette::{PALETTES, WguiColorPalette},
+};
+
+use crate::config_io;
+
+pub fn load_palette(want_palette: &str) -> WguiColorPalette {
+	if is_custom_palette(want_palette) {
+		if let Ok(palette) = load_custom_palette(want_palette).log_warn("Could not load custom color palette") {
+			return palette;
+		}
+	} else {
+		for (name, palette) in PALETTES {
+			if *name == want_palette {
+				return (*palette).clone();
+			}
+		}
+		log::warn!("No color palette found with name: {want_palette}")
+	}
+	PALETTES[0].1.clone()
+}
+
+fn is_custom_palette(name: &str) -> bool {
+	name
+		.as_bytes()
+		.get(name.len().saturating_sub(5)..)
+		.is_some_and(|suffix| suffix.eq_ignore_ascii_case(b".json"))
+}
+
+pub fn list_palette_files() -> Vec<String> {
+	let path = config_io::get_palettes_root();
+	let Ok(entries) = std::fs::read_dir(path) else {
+		return Vec::new();
+	};
+
+	let mut files: Vec<_> = entries
+		.filter_map(Result::ok)
+		.filter_map(|entry| {
+			let path = entry.path();
+
+			if !path.is_file() || !path.extension()?.to_str()?.eq_ignore_ascii_case("json") {
+				return None;
+			}
+
+			Some(path.file_name()?.to_str()?.to_owned())
+		})
+		.collect();
+
+	files.sort_unstable();
+	files
+}
+
+pub fn load_custom_palette(name: &str) -> anyhow::Result<WguiColorPalette> {
+	let path = config_io::get_palettes_root().join(name);
+	let file = File::open(path)?;
+	let reader = BufReader::new(file);
+	let scp = serde_json::from_reader::<_, SerializedWguiColorPalette>(reader)?;
+	Ok(scp.into_palette())
+}
+
+fn deserialize_color<'de, D>(deserializer: D) -> Result<drawing::Color, D::Error>
+where
+	D: Deserializer<'de>,
+{
+	let value = String::deserialize(deserializer)?;
+
+	drawing::Color::from_hex(&value).ok_or_else(|| D::Error::custom(format!("invalid hexadecimal color: {value:?}")))
+}
+
+#[derive(Deserialize)]
+#[serde(deny_unknown_fields)]
+struct SerializedWguiColorPalette {
+	#[serde(deserialize_with = "deserialize_color")]
+	primary: drawing::Color,
+
+	#[serde(deserialize_with = "deserialize_color")]
+	on_primary: drawing::Color,
+
+	#[serde(deserialize_with = "deserialize_color")]
+	secondary: drawing::Color,
+
+	#[serde(deserialize_with = "deserialize_color")]
+	on_secondary: drawing::Color,
+
+	#[serde(deserialize_with = "deserialize_color")]
+	tertiary: drawing::Color,
+
+	#[serde(deserialize_with = "deserialize_color")]
+	on_tertiary: drawing::Color,
+
+	#[serde(deserialize_with = "deserialize_color")]
+	danger: drawing::Color,
+
+	#[serde(deserialize_with = "deserialize_color")]
+	on_danger: drawing::Color,
+
+	#[serde(deserialize_with = "deserialize_color")]
+	background: drawing::Color,
+
+	#[serde(deserialize_with = "deserialize_color")]
+	on_background: drawing::Color,
+
+	#[serde(deserialize_with = "deserialize_color")]
+	background_variant: drawing::Color,
+
+	#[serde(deserialize_with = "deserialize_color")]
+	on_background_variant: drawing::Color,
+
+	#[serde(deserialize_with = "deserialize_color")]
+	background_contrast: drawing::Color,
+
+	#[serde(deserialize_with = "deserialize_color")]
+	on_background_contrast: drawing::Color,
+
+	#[serde(deserialize_with = "deserialize_color")]
+	outline: drawing::Color,
+
+	#[serde(deserialize_with = "deserialize_color")]
+	shadow: drawing::Color,
+
+	#[serde(deserialize_with = "deserialize_color")]
+	highlight: drawing::Color,
+}
+
+impl SerializedWguiColorPalette {
+	pub fn into_palette(&self) -> WguiColorPalette {
+		// order must stay the same as per WguiColorName
+		WguiColorPalette::from_inner([
+			self.primary,
+			self.on_primary,
+			self.secondary,
+			self.on_secondary,
+			self.tertiary,
+			self.on_tertiary,
+			self.danger,
+			self.on_danger,
+			self.background,
+			self.on_background,
+			self.background_variant,
+			self.on_background_variant,
+			self.background_contrast,
+			self.on_background_contrast,
+			self.outline,
+			self.shadow,
+			self.highlight,
+		])
+	}
+}
diff --git a/wlx-common/src/windowing.rs b/wlx-common/src/windowing.rs
index 139d6dab..16130de6 100644
--- a/wlx-common/src/windowing.rs
+++ b/wlx-common/src/windowing.rs
@@ -28,9 +28,6 @@ pub enum Positioning {
 }
 
 impl Positioning {
-	pub const fn moves_with_space(self) -> bool {
-		matches!(self, Self::Floating | Self::Anchored | Self::Static)
-	}
 	pub const fn get_lerp(self) -> Option<f32> {
 		match self {
 			Self::FollowHead { lerp } => Some(lerp),