diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index c584463d..65240d15 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -24,9 +24,10 @@ jobs:
     steps:
       - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
       - name: Install system dependencies
-        # webkit/gtk/xdo: required to compile rustmotion-studio (dioxus desktop)
+        # xkbcommon-x11/wayland/xcb-cursor: required to LINK rustmotion-studio (gpui).
+        # clippy passes without them — it never links — so the failure only shows in tests.
         # asound: required by cpal, which rodio pulls in for preview audio
-        run: sudo apt-get update && sudo apt-get install -y libfontconfig1-dev libfreetype6-dev libwebkit2gtk-4.1-dev libgtk-3-dev libxdo-dev libasound2-dev
+        run: sudo apt-get update && sudo apt-get install -y libfontconfig1-dev libfreetype6-dev libxkbcommon-x11-dev libwayland-dev libxcb-cursor-dev libasound2-dev
       - uses: dtolnay/rust-toolchain@6bed0761d98439e5a578e2877258200ad565ba87 # stable channel, 2026-09-22
         with:
           components: clippy
@@ -39,9 +40,10 @@ jobs:
     steps:
       - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
       - name: Install system dependencies
-        # webkit/gtk/xdo: required to compile rustmotion-studio (dioxus desktop)
+        # xkbcommon-x11/wayland/xcb-cursor: required to LINK rustmotion-studio (gpui).
+        # clippy passes without them — it never links — so the failure only shows in tests.
         # asound: required by cpal, which rodio pulls in for preview audio
-        run: sudo apt-get update && sudo apt-get install -y libfontconfig1-dev libfreetype6-dev libwebkit2gtk-4.1-dev libgtk-3-dev libxdo-dev libasound2-dev
+        run: sudo apt-get update && sudo apt-get install -y libfontconfig1-dev libfreetype6-dev libxkbcommon-x11-dev libwayland-dev libxcb-cursor-dev libasound2-dev
       - uses: dtolnay/rust-toolchain@6bed0761d98439e5a578e2877258200ad565ba87 # stable channel, 2026-09-22
       - uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
       - name: Run tests
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index c30152cd..f54fd937 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -13,12 +13,15 @@ jobs:
 
       - name: Install system dependencies
         # Doit rester identique à ci.yaml : l'étape « Run tests » ci-dessous lance
-        # `cargo test --workspace`, qui compile rustmotion-studio et tire donc la
-        # pile GTK/WebKit, elle-même adossée à glib-2.0. Sans ces paquets le build
-        # de glib-sys échoue et la release s'arrête avant toute publication.
-        # webkit/gtk/xdo: required to compile rustmotion-studio (dioxus desktop)
+        # `cargo test --workspace`, qui compile ET LIE rustmotion-studio. Sans ces
+        # paquets l'édition de liens échoue et la release s'arrête avant toute
+        # publication.
+        # xkbcommon-x11/wayland/xcb-cursor : exigés par gpui, à l'édition de liens
+        # seulement. clippy passe sans eux puisqu'il ne lie pas — la panne
+        # n'apparaît donc qu'au job de test. C'est ce qui a cassé le premier CI du
+        # chantier gpui (#306) : `-lxkbcommon-x11` introuvable, clippy vert.
         # asound: required by cpal, which rodio pulls in for preview audio
-        run: sudo apt-get update && sudo apt-get install -y libfontconfig1-dev libfreetype6-dev libwebkit2gtk-4.1-dev libgtk-3-dev libxdo-dev libasound2-dev
+        run: sudo apt-get update && sudo apt-get install -y libfontconfig1-dev libfreetype6-dev libxkbcommon-x11-dev libwayland-dev libxcb-cursor-dev libasound2-dev
 
       - uses: dtolnay/rust-toolchain@6bed0761d98439e5a578e2877258200ad565ba87 # stable channel, 2026-09-22
 
diff --git a/Cargo.lock b/Cargo.lock
index 39836ca3..f46bbd86 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,12 +2,126 @@
 # It is not intended for manual editing.
 version = 4
 
+[[package]]
+name = "accesskit"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3b7f7f85a7e5f68090000ed7622545829afd484d210358702ae4cb97dd0c320"
+dependencies = [
+ "enumn",
+ "uuid",
+]
+
+[[package]]
+name = "accesskit_atspi_common"
+version = "0.19.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "023da0e5097f46df7092d5280b02efb9bbf8d93298daeced42652463e357d636"
+dependencies = [
+ "accesskit",
+ "accesskit_consumer",
+ "atspi-common",
+ "phf 0.13.1",
+ "serde",
+ "zvariant",
+]
+
+[[package]]
+name = "accesskit_consumer"
+version = "0.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d10a236f96f87d70732e44520046785431ef01d5bcd6b041317bfadd2f88245"
+dependencies = [
+ "accesskit",
+ "hashbrown 0.16.1",
+]
+
+[[package]]
+name = "accesskit_macos"
+version = "0.26.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce02dc63b43f0c9296af9ac946312a2dc8814427d7a64d2d600971dac55b6076"
+dependencies = [
+ "accesskit",
+ "accesskit_consumer",
+ "hashbrown 0.16.1",
+ "objc2 0.5.2",
+ "objc2-app-kit 0.2.2",
+ "objc2-foundation 0.2.2",
+]
+
+[[package]]
+name = "accesskit_unix"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03e156ed3802e35eefe894ef2671bc6c889303d8a7e110b5e1b48f504b91362f"
+dependencies = [
+ "accesskit",
+ "accesskit_atspi_common",
+ "async-channel",
+ "async-executor",
+ "async-task",
+ "atspi",
+ "futures-lite",
+ "futures-util",
+ "serde",
+ "zbus",
+]
+
+[[package]]
+name = "accesskit_windows"
+version = "0.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "106c2b961215864d1c2e703ee63269c25c4e80a577ffb2c1017b9c17dcdf83a1"
+dependencies = [
+ "accesskit",
+ "accesskit_consumer",
+ "hashbrown 0.16.1",
+ "static_assertions",
+ "windows 0.62.2",
+ "windows-core 0.62.2",
+]
+
+[[package]]
+name = "addr2line"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b"
+dependencies = [
+ "gimli",
+]
+
 [[package]]
 name = "adler2"
 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",
+ "zeroize",
+]
+
+[[package]]
+name = "ahash"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
+dependencies = [
+ "cfg-if",
+ "const-random",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
 [[package]]
 name = "aho-corasick"
 version = "1.1.4"
@@ -48,7 +162,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "812947049edcd670a82cd5c73c3661d2e58468577ba8489de58e1a73c04cbd5d"
 dependencies = [
  "alsa-sys",
- "bitflags 2.11.0",
+ "bitflags 2.13.2",
  "cfg-if",
  "libc",
 ]
@@ -63,6 +177,25 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "android_system_properties"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae221649c9976a6f6c56ae1facf410f3ddb33cc661c4b7b61020a912d4237fbc"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "annotate-snippets"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96401ca08501972288ecbcde33902fce858bf73fbcbdf91dab8c3a9544e106bb"
+dependencies = [
+ "anstyle",
+ "unicode-width 0.2.0",
+]
+
 [[package]]
 name = "anstream"
 version = "0.6.21"
@@ -134,6 +267,15 @@ version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1"
 
+[[package]]
+name = "arc-swap"
+version = "1.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c049c0be4daef0b145cb3555416b3b8ef5b7888a38aea1a3a155801fe7b0810b"
+dependencies = [
+ "rustversion",
+]
+
 [[package]]
 name = "arg_enum_proc_macro"
 version = "0.3.4"
@@ -145,6 +287,12 @@ dependencies = [
  "syn 2.0.117",
 ]
 
+[[package]]
+name = "arraydeque"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236"
+
 [[package]]
 name = "arrayref"
 version = "0.3.9"
@@ -157,6 +305,12 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
+[[package]]
+name = "as-raw-xcb-connection"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b"
+
 [[package]]
 name = "as-slice"
 version = "0.2.1"
@@ -166,6 +320,187 @@ dependencies = [
  "stable_deref_trait",
 ]
 
+[[package]]
+name = "ash"
+version = "0.38.0+1.3.281"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f"
+dependencies = [
+ "libloading",
+]
+
+[[package]]
+name = "ashpd"
+version = "0.13.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb8421aaa9644a5faf26735f258b669b15f063313ef8f8e2bdb28912a1a6f111"
+dependencies = [
+ "enumflags2",
+ "futures-channel",
+ "futures-util",
+ "getrandom 0.4.2",
+ "serde",
+ "serde_repr",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2"
+dependencies = [
+ "concurrent-queue",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-compression"
+version = "0.4.48"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb61aea1a7def73ee7c350a184f0e70b32c182344e2e75bf70c9b621b83417fd"
+dependencies = [
+ "compression-codecs",
+ "compression-core",
+ "futures-io",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-executor"
+version = "1.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c96bf972d85afc50bf5ab8fe2d54d1586b4e0b46c97c50a0c9e71e2f7bcd812a"
+dependencies = [
+ "async-task",
+ "concurrent-queue",
+ "fastrand",
+ "futures-lite",
+ "pin-project-lite",
+ "slab",
+]
+
+[[package]]
+name = "async-fs"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8034a681df4aed8b8edbd7fbe472401ecf009251c8b40556b304567052e294c5"
+dependencies = [
+ "async-lock",
+ "blocking",
+ "futures-lite",
+]
+
+[[package]]
+name = "async-io"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "456b8a8feb6f42d237746d4b3e9a178494627745c3c56c6ea55d92ba50d026fc"
+dependencies = [
+ "autocfg",
+ "cfg-if",
+ "concurrent-queue",
+ "futures-io",
+ "futures-lite",
+ "parking",
+ "polling",
+ "rustix 1.1.4",
+ "slab",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "async-lock"
+version = "3.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "290f7f2596bd5b78a9fec8088ccd89180d7f9f55b94b0576823bbbdc72ee8311"
+dependencies = [
+ "event-listener",
+ "event-listener-strategy",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-net"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7"
+dependencies = [
+ "async-io",
+ "blocking",
+ "futures-lite",
+]
+
+[[package]]
+name = "async-process"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc50921ec0055cdd8a16de48773bfeec5c972598674347252c0399676be7da75"
+dependencies = [
+ "async-channel",
+ "async-io",
+ "async-lock",
+ "async-signal",
+ "async-task",
+ "blocking",
+ "cfg-if",
+ "event-listener",
+ "futures-lite",
+ "rustix 1.1.4",
+]
+
+[[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.117",
+]
+
+[[package]]
+name = "async-signal"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52b5aaafa020cf5053a01f2a60e8ff5dccf550f0f77ec54a4e47285ac2bab485"
+dependencies = [
+ "async-io",
+ "async-lock",
+ "atomic-waker",
+ "cfg-if",
+ "futures-core",
+ "futures-io",
+ "rustix 1.1.4",
+ "signal-hook-registry",
+ "slab",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "async-task"
+version = "4.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
+
 [[package]]
 name = "async-trait"
 version = "0.1.89"
@@ -178,26 +513,52 @@ dependencies = [
 ]
 
 [[package]]
-name = "atk"
-version = "0.18.2"
+name = "atomic"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba"
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "atspi"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c77886257be21c9cd89a4ae7e64860c6f0eefca799bb79127913052bd0eefb3d"
+dependencies = [
+ "atspi-common",
+ "atspi-proxies",
+]
+
+[[package]]
+name = "atspi-common"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "241b621213072e993be4f6f3a9e4b45f65b7e6faad43001be957184b7bb1824b"
+checksum = "20c5617155740c98003016429ad13fe43ce7a77b007479350a9f8bf95a29f63d"
 dependencies = [
- "atk-sys",
- "glib",
- "libc",
+ "enumflags2",
+ "serde",
+ "static_assertions",
+ "zbus",
+ "zbus-lockstep",
+ "zbus-lockstep-macros",
+ "zbus_names",
+ "zvariant",
 ]
 
 [[package]]
-name = "atk-sys"
-version = "0.18.2"
+name = "atspi-proxies"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5e48b684b0ca77d2bbadeef17424c2ea3c897d44d566a1617e7e8f30614d086"
+checksum = "2230e48787ed3eb4088996eab66a32ca20c0b67bbd4fd6cdfe79f04f1f04c9fc"
 dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
+ "atspi-common",
+ "serde",
+ "zbus",
 ]
 
 [[package]]
@@ -249,6 +610,27 @@ dependencies = [
  "arrayvec",
 ]
 
+[[package]]
+name = "backtrace"
+version = "0.3.76"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6"
+dependencies = [
+ "addr2line",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "base62"
+version = "2.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3a647dce9631f152a99ec16cfc09267ae55fe280d5dc288964027d458076323"
+
 [[package]]
 name = "base64"
 version = "0.22.1"
@@ -270,7 +652,7 @@ version = "0.69.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.2",
  "cexpr",
  "clang-sys",
  "itertools 0.12.1",
@@ -284,7 +666,7 @@ dependencies = [
  "rustc-hash 1.1.0",
  "shlex",
  "syn 2.0.117",
- "which",
+ "which 4.4.2",
 ]
 
 [[package]]
@@ -293,7 +675,7 @@ version = "0.71.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.2",
  "cexpr",
  "clang-sys",
  "itertools 0.13.0",
@@ -313,7 +695,7 @@ version = "0.72.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.2",
  "cexpr",
  "clang-sys",
  "itertools 0.13.0",
@@ -333,7 +715,16 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
 dependencies = [
- "bit-vec",
+ "bit-vec 0.8.0",
+]
+
+[[package]]
+name = "bit-set"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34ddef2995421ab6a5c779542c81ee77c115206f4ad9d5a8e05f4ff49716a3dd"
+dependencies = [
+ "bit-vec 0.9.1",
 ]
 
 [[package]]
@@ -342,6 +733,12 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
 
+[[package]]
+name = "bit-vec"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b71798fca2c1fe1086445a7258a4bc81e6e49dcd24c8d0dd9a1e57395b603f51"
+
 [[package]]
 name = "bit_field"
 version = "0.10.3"
@@ -356,12 +753,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.11.0"
+version = "2.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af"
-dependencies = [
- "serde_core",
-]
+checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06"
 
 [[package]]
 name = "bitstream-io"
@@ -388,16 +782,76 @@ dependencies = [
 ]
 
 [[package]]
-name = "block2"
-version = "0.6.2"
+name = "block-buffer"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5"
+checksum = "d2f6c7dbe95a6ed67ad9f18e57daf93a2f034c524b99fd2b76d18fdfeb6660aa"
 dependencies = [
- "objc2",
+ "hybrid-array",
 ]
 
 [[package]]
-name = "built"
+name = "block-padding"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "block2"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
+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.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a70e4329df6cb94385eed412ec92375c3cdd8a6e502493d1229b6414e4036dfa"
+dependencies = [
+ "async-channel",
+ "async-task",
+ "futures-io",
+ "futures-lite",
+ "piper",
+]
+
+[[package]]
+name = "borsh"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "553c5d846a6ba5150c65e3b1b8ec073bcf1abc20f9b7220de384a4443ea4e20a"
+dependencies = [
+ "bytes",
+ "cfg_aliases",
+]
+
+[[package]]
+name = "bstr"
+version = "1.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6bb31b46c14244e20ee9984b11bf5c992b91fb6939fea616e3512c8baecdbe5f"
+dependencies = [
+ "memchr",
+ "serde_core",
+]
+
+[[package]]
+name = "built"
 version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c0e531d93d39c34eef561e929e8a7f86d77a5af08aac4f6d6e39976c51858e9"
@@ -451,33 +905,39 @@ name = "bytes"
 version = "1.11.1"
 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 = [
- "serde",
+ "libbz2-rs-sys",
 ]
 
 [[package]]
-name = "cairo-rs"
-version = "0.18.5"
+name = "calloop"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2"
+checksum = "4dbf9978365bac10f54d1d4b04f7ce4427e51f71d61f2fe15e3fed5166474df7"
 dependencies = [
- "bitflags 2.11.0",
- "cairo-sys-rs",
- "glib",
- "libc",
- "once_cell",
- "thiserror 1.0.69",
+ "bitflags 2.13.2",
+ "polling",
+ "rustix 1.1.4",
+ "slab",
+ "tracing",
 ]
 
 [[package]]
-name = "cairo-sys-rs"
-version = "0.18.2"
+name = "calloop-wayland-source"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51"
+checksum = "138efcf0940a02ebf0cc8d1eff41a1682a46b431630f4c52450d6265876021fa"
 dependencies = [
- "glib-sys",
- "libc",
- "system-deps",
+ "calloop",
+ "rustix 1.1.4",
+ "wayland-backend",
+ "wayland-client",
 ]
 
 [[package]]
@@ -495,6 +955,33 @@ dependencies = [
  "rustversion",
 ]
 
+[[package]]
+name = "cbc"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
+dependencies = [
+ "cipher",
+]
+
+[[package]]
+name = "cbindgen"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eadd868a2ce9ca38de7eeafdcec9c7065ef89b42b32f0839278d55f35c54d1ff"
+dependencies = [
+ "heck 0.4.1",
+ "indexmap",
+ "log",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_json",
+ "syn 2.0.117",
+ "tempfile",
+ "toml 0.8.23",
+]
+
 [[package]]
 name = "cc"
 version = "1.2.56"
@@ -523,31 +1010,61 @@ dependencies = [
 ]
 
 [[package]]
-name = "cfb"
-version = "0.7.3"
+name = "cfg-if"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f079e83a288787bcd14a6aea84cee5c87a67c5a3e660c30f557a3d24761b3527"
+
+[[package]]
+name = "cgl"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f"
+checksum = "0ced0551234e87afee12411d535648dd89d2e7f34c78b753395567aff3d447ff"
 dependencies = [
- "byteorder",
- "fnv",
- "uuid",
+ "libc",
 ]
 
 [[package]]
-name = "cfg-expr"
-version = "0.15.8"
+name = "chacha20"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
+checksum = "65c35e4b699c7e15ccbe7ee35c005e4fc0a278d22238a2857e6ce2dadeda1b06"
 dependencies = [
- "smallvec",
- "target-lexicon",
+ "cfg-if",
+ "cpufeatures 0.3.1",
+ "rand_core 0.10.1",
 ]
 
 [[package]]
-name = "cfg-if"
-version = "1.0.4"
+name = "chrono"
+version = "0.4.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
+checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327"
+dependencies = [
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "serde",
+ "wasm-bindgen",
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "cipher"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+dependencies = [
+ "crypto-common 0.1.7",
+ "inout",
+ "zeroize",
+]
 
 [[package]]
 name = "clang-sys"
@@ -557,7 +1074,7 @@ checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
 dependencies = [
  "glob",
  "libc",
- "libloading 0.8.9",
+ "libloading",
 ]
 
 [[package]]
@@ -609,18 +1126,48 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9"
 
+[[package]]
+name = "cocoa"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c"
+dependencies = [
+ "bitflags 1.3.2",
+ "block",
+ "cocoa-foundation 0.1.2",
+ "core-foundation 0.9.4",
+ "core-graphics 0.23.2",
+ "foreign-types",
+ "libc",
+ "objc",
+]
+
 [[package]]
 name = "cocoa"
 version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ad36507aeb7e16159dfe68db81ccc27571c3ccd4b76fb2fb72fc59e7a4b1b64c"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.2",
  "block",
- "cocoa-foundation",
- "core-foundation",
+ "cocoa-foundation 0.2.1",
+ "core-foundation 0.10.1",
  "core-graphics 0.24.0",
- "foreign-types 0.5.0",
+ "foreign-types",
+ "libc",
+ "objc",
+]
+
+[[package]]
+name = "cocoa-foundation"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7"
+dependencies = [
+ "bitflags 1.3.2",
+ "block",
+ "core-foundation 0.9.4",
+ "core-graphics-types 0.1.3",
  "libc",
  "objc",
 ]
@@ -631,13 +1178,24 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81411967c50ee9a1fc11365f8c585f863a22a9697c89239c452292c40ba79b0d"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.2",
  "block",
- "core-foundation",
- "core-graphics-types",
+ "core-foundation 0.10.1",
+ "core-graphics-types 0.2.0",
  "objc",
 ]
 
+[[package]]
+name = "codespan-reporting"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af491d569909a7e4dee0ad7db7f5341fef5c614d5b8ec8cf765732aba3cff681"
+dependencies = [
+ "serde",
+ "termcolor",
+ "unicode-width 0.2.0",
+]
+
 [[package]]
 name = "color_quant"
 version = "1.1.0"
@@ -675,91 +1233,85 @@ dependencies = [
 ]
 
 [[package]]
-name = "const-serialize"
-version = "0.7.2"
+name = "compression-codecs"
+version = "0.4.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad7154afa56de2f290e3c82c2c6dc4f5b282b6870903f56ef3509aba95866edc"
+checksum = "bef16c47ba2797aa6a909cc37d39911f3a6743811fe7408ac0b0cc0276b656e9"
 dependencies = [
- "const-serialize-macro 0.7.2",
+ "bzip2",
+ "compression-core",
+ "flate2",
+ "memchr",
 ]
 
 [[package]]
-name = "const-serialize"
-version = "0.8.0-alpha.0"
+name = "compression-core"
+version = "0.4.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e42cd5aabba86f128b3763da1fec1491c0f728ce99245062cd49b6f9e6d235b"
-dependencies = [
- "const-serialize 0.7.2",
- "const-serialize-macro 0.8.0-alpha.0",
- "serde",
-]
+checksum = "6e8ccc4ea9f6acc32d102c0f6d471d11d913ad15f20c04de743374861fa1d414"
 
 [[package]]
-name = "const-serialize-macro"
-version = "0.7.2"
+name = "concurrent-queue"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f160aad86b4343e8d4e261fee9965c3005b2fd6bc117d172ab65948779e4acf"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
+ "crossbeam-utils",
 ]
 
 [[package]]
-name = "const-serialize-macro"
-version = "0.8.0-alpha.0"
+name = "console_error_panic_hook"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42571ed01eb46d2e1adcf99c8ca576f081e46f2623d13500eba70d1d99a4c439"
+checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
+ "cfg-if",
+ "wasm-bindgen",
 ]
 
 [[package]]
-name = "const_format"
-version = "0.2.36"
+name = "const-oid"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4481a617ad9a412be3b97c5d403fef8ed023103368908b9c50af598ff467cc1e"
-dependencies = [
- "const_format_proc_macros",
- "konst",
-]
+checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c"
 
 [[package]]
-name = "const_format_proc_macros"
-version = "0.2.34"
+name = "const-random"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744"
+checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
 dependencies = [
- "proc-macro2",
- "quote",
- "unicode-xid",
+ "const-random-macro",
 ]
 
 [[package]]
-name = "convert_case"
-version = "0.4.0"
+name = "const-random-macro"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
+checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
+dependencies = [
+ "getrandom 0.2.17",
+ "once_cell",
+ "tiny-keccak",
+]
 
 [[package]]
 name = "convert_case"
-version = "0.8.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baaaa0ecca5b51987b9423ccdc971514dd8b0bb7b4060b983d3664dad3f1f89f"
+checksum = "633458d4ef8c78b72454de2d54fd6ab2e60f9e02be22f3c6104cdc8a4e0fceb9"
 dependencies = [
  "unicode-segmentation",
 ]
 
 [[package]]
-name = "cookie"
-version = "0.18.1"
+name = "core-foundation"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
 dependencies = [
- "time",
- "version_check",
+ "core-foundation-sys",
+ "libc",
 ]
 
 [[package]]
@@ -778,29 +1330,53 @@ version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
+[[package]]
+name = "core-graphics"
+version = "0.23.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation 0.9.4",
+ "core-graphics-types 0.1.3",
+ "foreign-types",
+ "libc",
+]
+
 [[package]]
 name = "core-graphics"
 version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1"
 dependencies = [
- "bitflags 2.11.0",
- "core-foundation",
- "core-graphics-types",
- "foreign-types 0.5.0",
+ "bitflags 2.13.2",
+ "core-foundation 0.10.1",
+ "core-graphics-types 0.2.0",
+ "foreign-types",
  "libc",
 ]
 
 [[package]]
-name = "core-graphics"
-version = "0.25.0"
+name = "core-graphics-helmer-fork"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32eb7c354ae9f6d437a6039099ce7ecd049337a8109b23d73e48e8ffba8e9cd5"
+dependencies = [
+ "bitflags 2.13.2",
+ "core-foundation 0.9.4",
+ "core-graphics-types 0.1.3",
+ "foreign-types",
+ "libc",
+]
+
+[[package]]
+name = "core-graphics-types"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "064badf302c3194842cf2c5d61f56cc88e54a759313879cdf03abdd27d0c3b97"
+checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
 dependencies = [
- "bitflags 2.11.0",
- "core-foundation",
- "core-graphics-types",
- "foreign-types 0.5.0",
+ "bitflags 1.3.2",
+ "core-foundation 0.9.4",
  "libc",
 ]
 
@@ -810,9 +1386,48 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
 dependencies = [
- "bitflags 2.11.0",
- "core-foundation",
+ "bitflags 2.13.2",
+ "core-foundation 0.10.1",
+ "libc",
+]
+
+[[package]]
+name = "core-graphics2"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4416167a69126e617f8d0a214af0e3c1dbdeffcb100ddf72dcd1a1ac9893c146"
+dependencies = [
+ "bitflags 2.13.2",
+ "block",
+ "cfg-if",
+ "core-foundation 0.10.1",
+ "libc",
+]
+
+[[package]]
+name = "core-text"
+version = "21.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a593227b66cbd4007b2a050dfdd9e1d1318311409c8d600dc82ba1b15ca9c130"
+dependencies = [
+ "core-foundation 0.10.1",
+ "core-graphics 0.24.0",
+ "foreign-types",
+ "libc",
+]
+
+[[package]]
+name = "core-video"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "139679cc63eb9504bdbe37e37874b0247136177655f0008588781e90863afa62"
+dependencies = [
+ "block",
+ "core-foundation 0.10.1",
+ "core-graphics2",
+ "io-surface",
  "libc",
+ "metal",
 ]
 
 [[package]]
@@ -830,7 +1445,7 @@ version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d5d7dca3ebcf65a035582c9ad4385371a9d9ee6537474d2a278f4e1e475bb58"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.2",
  "libc",
  "objc2-audio-toolbox",
  "objc2-core-audio",
@@ -844,7 +1459,7 @@ version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be17b688510d934ce13f48a2beba700e11583e281e0fda99c22bb256a14eda73"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.2",
  "fontdb 0.23.0",
  "harfrust",
  "linebender_resource_handle",
@@ -871,7 +1486,7 @@ dependencies = [
  "alsa",
  "coreaudio-rs",
  "dasp_sample",
- "jni 0.21.1",
+ "jni",
  "js-sys",
  "libc",
  "mach2",
@@ -879,17 +1494,17 @@ dependencies = [
  "ndk-context",
  "num-derive",
  "num-traits",
- "objc2",
+ "objc2 0.6.4",
  "objc2-audio-toolbox",
  "objc2-avf-audio",
  "objc2-core-audio",
  "objc2-core-audio-types",
  "objc2-core-foundation",
- "objc2-foundation",
+ "objc2-foundation 0.3.2",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "windows",
+ "windows 0.61.3",
 ]
 
 [[package]]
@@ -902,21 +1517,21 @@ dependencies = [
 ]
 
 [[package]]
-name = "crc32fast"
-version = "1.5.0"
+name = "cpufeatures"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
+checksum = "5ca28b0ae3115b884660db4118d803791fd6756b6e88f39c0f3f7859060d7566"
 dependencies = [
- "cfg-if",
+ "libc",
 ]
 
 [[package]]
-name = "crossbeam-channel"
-version = "0.5.15"
+name = "crc32fast"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
 dependencies = [
- "crossbeam-utils",
+ "cfg-if",
 ]
 
 [[package]]
@@ -938,6 +1553,15 @@ dependencies = [
  "crossbeam-utils",
 ]
 
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03e8bd762f7479489c70ed6c768ddca99d7296857de437a68dcb2a94365b3fae"
+dependencies = [
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.21"
@@ -950,7 +1574,7 @@ version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.2",
  "crossterm_winapi",
  "mio",
  "parking_lot",
@@ -986,40 +1610,22 @@ dependencies = [
 ]
 
 [[package]]
-name = "cssparser"
-version = "0.29.6"
+name = "crypto-common"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93d03419cb5950ccfd3daf3ff1c7a36ace64609a1a8746d493df1ca0afde0fa"
+checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453"
 dependencies = [
- "cssparser-macros",
- "dtoa-short",
- "itoa",
- "matches",
- "phf 0.10.1",
- "proc-macro2",
- "quote",
- "smallvec",
- "syn 1.0.109",
+ "hybrid-array",
 ]
 
 [[package]]
-name = "cssparser-macros"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
-dependencies = [
- "quote",
- "syn 2.0.117",
-]
-
-[[package]]
-name = "darling"
-version = "0.21.3"
+name = "ctor"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0"
+checksum = "914a755b7c2d4af2bdcff7ce1739e2db9a1b81a9b07123d8015786ae03c0980d"
 dependencies = [
- "darling_core 0.21.3",
- "darling_macro 0.21.3",
+ "link-section",
+ "linktime-proc-macro",
 ]
 
 [[package]]
@@ -1028,21 +1634,8 @@ version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25ae13da2f202d56bd7f91c25fba009e7717a1e4a1cc98a76d844b65ae912e9d"
 dependencies = [
- "darling_core 0.23.0",
- "darling_macro 0.23.0",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.21.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "syn 2.0.117",
+ "darling_core",
+ "darling_macro",
 ]
 
 [[package]]
@@ -1058,24 +1651,13 @@ dependencies = [
  "syn 2.0.117",
 ]
 
-[[package]]
-name = "darling_macro"
-version = "0.21.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
-dependencies = [
- "darling_core 0.21.3",
- "quote",
- "syn 2.0.117",
-]
-
 [[package]]
 name = "darling_macro"
 version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d"
 dependencies = [
- "darling_core 0.23.0",
+ "darling_core",
  "quote",
  "syn 2.0.117",
 ]
@@ -1100,12 +1682,6 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"
 
-[[package]]
-name = "data-encoding"
-version = "2.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4ae5f15dda3c708c0ade84bfee31ccab44a3da4f88015ed22f63732abe300c8"
-
 [[package]]
 name = "data-url"
 version = "0.3.2"
@@ -1123,15 +1699,25 @@ dependencies = [
 
 [[package]]
 name = "derive_more"
-version = "0.99.20"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f"
+checksum = "d751e9e49156b02b44f9c1815bcb94b984cdcc4396ecc32521c739452808b134"
 dependencies = [
- "convert_case 0.4.0",
+ "derive_more-impl",
+]
+
+[[package]]
+name = "derive_more-impl"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "799a97264921d8623a957f6c3b9011f3b5492f557bbb7a5a19b7fa6d06ba8dcb"
+dependencies = [
+ "convert_case",
  "proc-macro2",
  "quote",
  "rustc_version",
  "syn 2.0.117",
+ "unicode-xid",
 ]
 
 [[package]]
@@ -1140,654 +1726,321 @@ version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
- "block-buffer",
- "crypto-common",
+ "block-buffer 0.10.4",
+ "crypto-common 0.1.7",
+ "subtle",
 ]
 
 [[package]]
-name = "dioxus"
-version = "0.7.9"
+name = "digest"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c01ecf7ddbae18a419ad3d83c486101a85ffc5740ea09cdd0f09a30dc12170d"
+checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2"
 dependencies = [
- "dioxus-asset-resolver",
- "dioxus-cli-config",
- "dioxus-config-macro",
- "dioxus-config-macros",
- "dioxus-core",
- "dioxus-core-macro",
- "dioxus-desktop",
- "dioxus-devtools",
- "dioxus-document",
- "dioxus-history",
- "dioxus-hooks",
- "dioxus-html",
- "dioxus-logger",
- "dioxus-signals",
- "dioxus-stores",
- "dioxus-web",
- "manganis",
- "subsecond",
- "warnings",
+ "block-buffer 0.12.1",
+ "const-oid",
+ "crypto-common 0.2.2",
 ]
 
 [[package]]
-name = "dioxus-asset-resolver"
-version = "0.7.9"
+name = "dirs"
+version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69387edbbc60c7cb93ad96d8cc7a22b49a76e21643380b89b1c49a78d347ff60"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
 dependencies = [
- "dioxus-cli-config",
- "http",
- "infer",
- "jni 0.21.1",
- "ndk",
- "ndk-context",
- "ndk-sys",
- "percent-encoding",
- "thiserror 2.0.18",
- "tokio",
+ "dirs-sys 0.4.1",
 ]
 
 [[package]]
-name = "dioxus-attributes"
-version = "0.1.0"
-source = "git+https://github.com/DioxusLabs/components#02801f27e4b3e30606e5c77e435c9d955c708eb3"
+name = "dirs"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e"
 dependencies = [
- "dioxus-rsx",
- "proc-macro2",
- "quote",
- "syn 2.0.117",
+ "dirs-sys 0.5.0",
 ]
 
 [[package]]
-name = "dioxus-cli-config"
-version = "0.7.9"
+name = "dirs-sys"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c000f584ddf608e2b272b3074bf11512a474eeeb2eb85a1915f276ce5c4a8615"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
 dependencies = [
- "wasm-bindgen",
+ "libc",
+ "option-ext",
+ "redox_users 0.4.6",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
-name = "dioxus-config-macro"
-version = "0.7.9"
+name = "dirs-sys"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7637091592978fbfdb45a16b26bd99fd97fb1bd7e31c6a963530e00c022af321"
+checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
 dependencies = [
- "proc-macro2",
- "quote",
+ "libc",
+ "option-ext",
+ "redox_users 0.5.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
-name = "dioxus-config-macros"
-version = "0.7.9"
+name = "dispatch"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54f9ed8fc1a215ad34bb8dbae42a4ea54efbcd26ca9006bbe5cca78e511bf25f"
+checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
 
 [[package]]
-name = "dioxus-core"
-version = "0.7.9"
+name = "dispatch2"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45887100ff0cf89abeb8b659808294fda48cd53f3b424e36407dedffcfea830b"
+checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
 dependencies = [
- "anyhow",
- "const_format",
- "dioxus-core-types",
- "futures-channel",
- "futures-util",
- "generational-box",
- "longest-increasing-subsequence",
- "rustc-hash 2.1.1",
- "rustversion",
- "serde",
- "slab",
- "slotmap",
- "subsecond",
- "tracing",
+ "bitflags 2.13.2",
+ "block2 0.6.2",
+ "libc",
+ "objc2 0.6.4",
 ]
 
 [[package]]
-name = "dioxus-core-macro"
-version = "0.7.9"
+name = "displaydoc"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "370c63663dff0f24df5dfea643ca239283542c6b228a302f69b32e1d36762b7f"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
- "convert_case 0.8.0",
- "dioxus-rsx",
  "proc-macro2",
  "quote",
  "syn 2.0.117",
 ]
 
 [[package]]
-name = "dioxus-core-types"
-version = "0.7.9"
+name = "dlib"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36963eab106b169737762f9cd5ee5fd97f585989dcb2d8e30a596e97a6999009"
+checksum = "ab8ecd87370524b461f8557c119c405552c396ed91fc0a8eec68679eab26f94a"
+dependencies = [
+ "libloading",
+]
 
 [[package]]
-name = "dioxus-desktop"
-version = "0.7.9"
+name = "document-features"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "662cd78c73ca3f17346adbf2d64757df40dd0ce20536c05123097fd31828d2bd"
+checksum = "d4b8a88685455ed29a21542a33abd9cb6510b6b129abadabdcef0f4c55bc8f61"
 dependencies = [
- "anyhow",
- "async-trait",
- "base64",
- "bytes",
- "cocoa",
- "core-foundation",
- "dioxus-asset-resolver",
- "dioxus-cli-config",
- "dioxus-core",
- "dioxus-devtools",
- "dioxus-document",
- "dioxus-history",
- "dioxus-hooks",
- "dioxus-html",
- "dioxus-interpreter-js",
- "dioxus-signals",
- "dunce",
- "futures-channel",
- "futures-util",
- "generational-box",
- "global-hotkey",
- "image",
- "infer",
- "jni 0.21.1",
- "lazy-js-bundle",
- "libc",
- "muda",
- "ndk",
- "ndk-context",
- "ndk-sys",
- "objc",
- "objc_id",
- "percent-encoding",
- "rand 0.9.2",
- "rfd",
- "rustc-hash 2.1.1",
- "serde",
- "serde_json",
- "signal-hook",
- "slab",
- "subtle",
- "tao",
- "thiserror 2.0.18",
- "tokio",
- "tracing",
- "tray-icon",
- "tungstenite",
- "webbrowser",
- "wry",
+ "litrs",
 ]
 
 [[package]]
-name = "dioxus-devtools"
-version = "0.7.9"
+name = "downcast-rs"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2349cedbdf1b429df1f1bea61fdee0ad3dae7b2548eedfbeca82710122a57da0"
-dependencies = [
- "dioxus-cli-config",
- "dioxus-core",
- "dioxus-devtools-types",
- "dioxus-signals",
- "serde",
- "serde_json",
- "subsecond",
- "thiserror 2.0.18",
- "tracing",
- "tungstenite",
-]
+checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
 
 [[package]]
-name = "dioxus-devtools-types"
-version = "0.7.9"
+name = "dunce"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
+
+[[package]]
+name = "dwrote"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ab9b0f7565d1916b70915f59b89ea8054ef0a9d67a364a32bbee68ef5f3818d"
+checksum = "9e1b35532432acc8b19ceed096e35dfa088d3ea037fe4f3c085f1f97f33b4d02"
 dependencies = [
- "dioxus-core",
- "serde",
- "subsecond-types",
+ "lazy_static",
+ "libc",
+ "winapi",
+ "wio",
 ]
 
 [[package]]
-name = "dioxus-document"
-version = "0.7.9"
+name = "dyn-clone"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
+
+[[package]]
+name = "either"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+
+[[package]]
+name = "embed-resource"
+version = "3.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37e3a5bec7ffc999ff23446a487eb5cd86111d1574a23533dd3f8b3c69a53a22"
+checksum = "fbfdaacccebec3b28e4866b8973543c7647797db5ada1bdab552e48fe665fbbd"
 dependencies = [
- "dioxus-core",
- "dioxus-core-macro",
- "dioxus-core-types",
- "dioxus-html",
- "futures-channel",
- "futures-util",
- "generational-box",
- "lazy-js-bundle",
- "serde",
- "serde_json",
- "tracing",
+ "cc",
+ "memchr",
+ "rustc_version",
+ "toml 1.1.4+spec-1.1.0",
+ "vswhom",
+ "winreg",
 ]
 
 [[package]]
-name = "dioxus-history"
-version = "0.7.9"
+name = "encoding_rs"
+version = "0.8.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a15232302d1933015fcf2d6fe9e286ad36f6e9c205a546089a0f326023bb0d2"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
 dependencies = [
- "dioxus-core",
- "tracing",
+ "cfg-if",
 ]
 
 [[package]]
-name = "dioxus-hooks"
-version = "0.7.9"
+name = "encoding_rs_io"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4534f91cf6305204b948bdec130076ac9ecc7c22faab29475b76870558bf73ea"
+checksum = "fba3fe847045ecff794b9c138293a80db914678c453ad63fbf0c6a9eb6e00b22"
 dependencies = [
- "dioxus-core",
- "dioxus-signals",
- "futures-channel",
- "futures-util",
- "generational-box",
- "rustversion",
- "slab",
- "tracing",
+ "encoding_rs",
 ]
 
 [[package]]
-name = "dioxus-html"
-version = "0.7.9"
+name = "endi"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66b7e2430c6dff6a955451e2cfc438f09cea1965a9d6f87f7e3b90decc014099"
+
+[[package]]
+name = "enum-iterator"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e03d6ad4040b667f2b2eefcb678840e630938c09bf9ec39b04ea4d1d96d90d44"
+checksum = "a4549325971814bda7a44061bf3fe7e487d447cba01e4220a4b454d630d7a016"
 dependencies = [
- "async-trait",
- "bytes",
- "dioxus-core",
- "dioxus-core-macro",
- "dioxus-core-types",
- "dioxus-hooks",
- "dioxus-html-internal-macro",
- "enumset",
- "euclid",
- "futures-channel",
- "futures-util",
- "generational-box",
- "keyboard-types",
- "lazy-js-bundle",
- "rustversion",
- "serde",
- "serde_json",
- "serde_repr",
- "tracing",
+ "enum-iterator-derive",
 ]
 
 [[package]]
-name = "dioxus-html-internal-macro"
-version = "0.7.9"
+name = "enum-iterator-derive"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "584e2772127ab00f0d5e1d4d9795f39fecebc828ece0b7a02349d438bc1b1ce7"
+checksum = "685adfa4d6f3d765a26bc5dbc936577de9abf756c1feeb3089b01dd395034842"
 dependencies = [
- "convert_case 0.8.0",
  "proc-macro2",
  "quote",
  "syn 2.0.117",
 ]
 
 [[package]]
-name = "dioxus-icons"
-version = "0.1.0"
+name = "enumflags2"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ae929a4cdde2e51fca98ccb8a8fe2ea11640e5026c57486b15dbd5618ba7e56"
+checksum = "1027f7680c853e056ebcec683615fb6fbbc07dbaa13b4d5d9442b146ded4ecef"
 dependencies = [
- "dioxus",
- "dioxus-signals",
- "lazy-js-bundle",
+ "enumflags2_derive",
+ "serde",
 ]
 
 [[package]]
-name = "dioxus-interpreter-js"
-version = "0.7.9"
+name = "enumflags2_derive"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11999d6eb5bb179a9512dad30e5de408aab66f2cb65de9098c9fbe02927e2978"
+checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827"
 dependencies = [
- "dioxus-core",
- "dioxus-core-types",
- "dioxus-html",
- "js-sys",
- "lazy-js-bundle",
- "rustc-hash 2.1.1",
- "serde",
- "sledgehammer_bindgen",
- "sledgehammer_utils",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
 ]
 
 [[package]]
-name = "dioxus-logger"
-version = "0.7.9"
+name = "enumn"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28ccdfe36d2cb830a2784e40f7e6f7199805a2c6da99bd65b1ca308f11aed28"
+checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38"
 dependencies = [
- "dioxus-cli-config",
- "tracing",
- "tracing-subscriber",
- "tracing-wasm",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
 ]
 
 [[package]]
-name = "dioxus-primitives"
-version = "0.0.1"
-source = "git+https://github.com/DioxusLabs/components#02801f27e4b3e30606e5c77e435c9d955c708eb3"
+name = "equator"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4711b213838dfee0117e3be6ac926007d7f433d7bbe33595975d4190cb07e6fc"
 dependencies = [
- "dioxus",
- "dioxus-attributes",
- "dioxus-sdk-time",
- "lazy-js-bundle",
- "num-integer",
- "palette",
- "serde",
- "time",
- "tracing",
+ "equator-macro",
 ]
 
 [[package]]
-name = "dioxus-rsx"
-version = "0.7.9"
+name = "equator-macro"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2106afda239a4c7c22ffa1ca19117011225fc1c735c139c0a5b765996aa8bb1d"
+checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3"
 dependencies = [
  "proc-macro2",
- "proc-macro2-diagnostics",
  "quote",
- "rustversion",
  "syn 2.0.117",
 ]
 
 [[package]]
-name = "dioxus-sdk-time"
-version = "0.7.0"
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
+[[package]]
+name = "erased-serde"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80c25ae93a3f72e734873b97fbd09d9b1b6adff97205fb0ffd8543e3564fb78e"
+checksum = "d2add8a07dd6a8d93ff627029c51de145e12686fbc36ecb298ac22e74cf02dec"
 dependencies = [
- "dioxus",
- "futures",
- "gloo-timers",
- "tokio",
+ "serde",
+ "serde_core",
+ "typeid",
 ]
 
 [[package]]
-name = "dioxus-signals"
-version = "0.7.9"
+name = "errno"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3705754f5e043deec9fc7af0d159f18e5b21c02c47d255c7e477f31368f0b6d2"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
- "dioxus-core",
- "futures-channel",
- "futures-util",
- "generational-box",
- "parking_lot",
- "rustc-hash 2.1.1",
- "tracing",
- "warnings",
+ "libc",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
-name = "dioxus-stores"
-version = "0.7.9"
+name = "etagere"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64bec7b21c86b1360ec965a07a53a2c96b7caee3465049e1c299a45024e87614"
+checksum = "fc89bf99e5dc15954a60f707c1e09d7540e5cd9af85fa75caa0b510bc08c5342"
 dependencies = [
- "dioxus-core",
- "dioxus-signals",
- "dioxus-stores-macro",
- "generational-box",
+ "euclid",
+ "svg_fmt",
 ]
 
 [[package]]
-name = "dioxus-stores-macro"
-version = "0.7.9"
+name = "euclid"
+version = "0.22.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40a5875e9f890f27b1cc3e5b56c1e23601211470315a1fb8627c4ca4f3b2be9a"
+checksum = "df61bf483e837f88d5c2291dcf55c67be7e676b3a51acc48db3a7b163b91ed63"
 dependencies = [
- "convert_case 0.8.0",
- "proc-macro2",
- "quote",
- "syn 2.0.117",
+ "num-traits",
 ]
 
 [[package]]
-name = "dioxus-web"
-version = "0.7.9"
+name = "event-listener"
+version = "5.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc0a0be76b404e8242a597db0fb239d05f8dee4e7856bc1fc7144f7e244822fd"
+checksum = "5a23add41df1562121a9393cb065eab5146a1242410f23a644851e90cfd669d2"
 dependencies = [
- "dioxus-cli-config",
- "dioxus-core",
- "dioxus-core-types",
- "dioxus-devtools",
- "dioxus-document",
- "dioxus-history",
- "dioxus-html",
- "dioxus-interpreter-js",
- "dioxus-signals",
- "futures-channel",
- "futures-util",
- "generational-box",
- "gloo-timers",
- "js-sys",
- "lazy-js-bundle",
- "rustc-hash 2.1.1",
- "send_wrapper",
- "serde",
- "serde-wasm-bindgen",
- "serde_json",
- "tracing",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wasm-streams",
- "web-sys",
-]
-
-[[package]]
-name = "dirs"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e"
-dependencies = [
- "dirs-sys",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
-dependencies = [
- "libc",
- "option-ext",
- "redox_users",
- "windows-sys 0.61.2",
-]
-
-[[package]]
-name = "dispatch2"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
-dependencies = [
- "bitflags 2.11.0",
- "block2",
- "libc",
- "objc2",
-]
-
-[[package]]
-name = "displaydoc"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
-]
-
-[[package]]
-name = "dlib"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab8ecd87370524b461f8557c119c405552c396ed91fc0a8eec68679eab26f94a"
-dependencies = [
- "libloading 0.8.9",
-]
-
-[[package]]
-name = "dlopen2"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e2c5bd4158e66d1e215c49b837e11d62f3267b30c92f1d171c4d3105e3dc4d4"
-dependencies = [
- "dlopen2_derive",
- "libc",
- "once_cell",
- "winapi",
-]
-
-[[package]]
-name = "dlopen2_derive"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fbbb781877580993a8707ec48672673ec7b81eeba04cfd2310bd28c08e47c8f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
-]
-
-[[package]]
-name = "downcast-rs"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
-
-[[package]]
-name = "dpi"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
-
-[[package]]
-name = "dtoa"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c3cf4824e2d5f025c7b531afcb2325364084a16806f6d47fbc1f5fbd9960590"
-
-[[package]]
-name = "dtoa-short"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87"
-dependencies = [
- "dtoa",
-]
-
-[[package]]
-name = "dunce"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
-
-[[package]]
-name = "dyn-clone"
-version = "1.0.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
-
-[[package]]
-name = "either"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
-
-[[package]]
-name = "encoding_rs"
-version = "0.8.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "enumset"
-version = "1.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "839c4174b41e75c8f7306110b2c51996a293b8d1d850edd529011841d9fede7d"
-dependencies = [
- "enumset_derive",
-]
-
-[[package]]
-name = "enumset_derive"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bd536557b58c682b217b8fb199afdff47cd3eff260623f19e77074eb073d63a"
-dependencies = [
- "darling 0.21.3",
- "proc-macro2",
- "quote",
- "syn 2.0.117",
-]
-
-[[package]]
-name = "equator"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4711b213838dfee0117e3be6ac926007d7f433d7bbe33595975d4190cb07e6fc"
-dependencies = [
- "equator-macro",
-]
-
-[[package]]
-name = "equator-macro"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
-]
-
-[[package]]
-name = "equivalent"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
-
-[[package]]
-name = "errno"
-version = "0.3.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
-dependencies = [
- "libc",
- "windows-sys 0.61.2",
+ "parking",
+ "pin-project-lite",
 ]
 
 [[package]]
-name = "euclid"
-version = "0.22.13"
+name = "event-listener-strategy"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df61bf483e837f88d5c2291dcf55c67be7e676b3a51acc48db3a7b163b91ed63"
+checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
 dependencies = [
- "num-traits",
- "serde",
+ "event-listener",
+ "pin-project-lite",
 ]
 
 [[package]]
@@ -1817,7 +2070,7 @@ version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "998b056554fbe42e03ae0e152895cd1a7e1002aec800fdc6635d20270260c46f"
 dependencies = [
- "bit-set",
+ "bit-set 0.8.0",
  "regex-automata",
  "regex-syntax",
 ]
@@ -1833,6 +2086,9 @@ name = "fastrand"
 version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+dependencies = [
+ "getrandom 0.2.17",
+]
 
 [[package]]
 name = "fax"
@@ -1859,13 +2115,14 @@ dependencies = [
 ]
 
 [[package]]
-name = "field-offset"
-version = "0.3.6"
+name = "filedescriptor"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f"
+checksum = "e40758ed24c9b2eeb76c35fb0aebc66c626084edd827e07e1552279814c6682d"
 dependencies = [
- "memoffset",
- "rustc_version",
+ "libc",
+ "thiserror 1.0.69",
+ "winapi",
 ]
 
 [[package]]
@@ -1885,6 +2142,12 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
 
+[[package]]
+name = "fixedbitset"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
+
 [[package]]
 name = "flate2"
 version = "1.1.9"
@@ -1901,6 +2164,39 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
 
+[[package]]
+name = "float-ord"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ce81f49ae8a0482e4c55ea62ebbd7e5a686af544c00b9d090bba3ff9be97b3d"
+
+[[package]]
+name = "float_next_after"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8"
+
+[[package]]
+name = "fluent-uri"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17c704e9dbe1ddd863da1e6ff3567795087b1eb201ce80d8fa81162e1516500d"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "flume"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e139bc46ca777eb5efaf62df0ab8cc5fd400866427e56c68b22e414e53bd3be"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-sink",
+ "spin 0.9.9",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -1913,6 +2209,12 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
 
+[[package]]
+name = "foldhash"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
+
 [[package]]
 name = "font-types"
 version = "0.11.3"
@@ -1928,7 +2230,7 @@ version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbc773e24e02d4ddd8395fd30dc147524273a83e54e0f312d986ea30de5f5646"
 dependencies = [
- "roxmltree",
+ "roxmltree 0.20.0",
 ]
 
 [[package]]
@@ -1959,15 +2261,6 @@ dependencies = [
  "ttf-parser 0.25.1",
 ]
 
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared 0.1.1",
-]
-
 [[package]]
 name = "foreign-types"
 version = "0.5.0"
@@ -1975,7 +2268,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
 dependencies = [
  "foreign-types-macros",
- "foreign-types-shared 0.3.1",
+ "foreign-types-shared",
 ]
 
 [[package]]
@@ -1989,12 +2282,6 @@ dependencies = [
  "syn 2.0.117",
 ]
 
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
 [[package]]
 name = "foreign-types-shared"
 version = "0.3.1"
@@ -2010,6 +2297,17 @@ dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "freetype-sys"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e7edc5b9669349acfda99533e9e0bcf26a51862ab43b08ee7745c55d28eb134"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+]
+
 [[package]]
 name = "fsevent-sys"
 version = "4.1.0"
@@ -2031,9 +2329,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.32"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d"
+checksum = "9a31d2a3fbaaeb2af2368bbdd904aa8e812d3c04a1ee10d3171f52d556e5d0a3"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2046,25 +2344,38 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.32"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d"
+checksum = "b1f9e3d69d39e4862ffed03ed071a76f9a13ba1d9109d355b0f0aa6b15e393c4"
 dependencies = [
  "futures-core",
  "futures-sink",
 ]
 
+[[package]]
+name = "futures-concurrency"
+version = "7.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "175cd8cca9e1d45b87f18ffa75088f2099e3c4fe5e2f83e42de112560bea8ea6"
+dependencies = [
+ "fixedbitset",
+ "futures-core",
+ "futures-lite",
+ "pin-project",
+ "smallvec",
+]
+
 [[package]]
 name = "futures-core"
-version = "0.3.32"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
+checksum = "92d699e522242e69e3003b94ecc1f960f3a5e015aa7c5d7486e65ad01dd94f5e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.32"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d"
+checksum = "031b47cf1a3c6cc8bc2fc76cd437f521619387907d469316e7c0bc278f1f5432"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -2073,38 +2384,51 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.32"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718"
+checksum = "53c0fa8157de1303bfffdaa1cc2a673bfffb60102f76b0ef4441659124373fed"
 
 [[package]]
-name = "futures-macro"
-version = "0.3.32"
+name = "futures-lite"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b"
+checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "futures-macro"
+version = "0.3.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.6",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.32"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893"
+checksum = "1944426bf7d03f1d14f708785e4b33efd750b36d48a157b836b3efc15ede8e1d"
 
 [[package]]
 name = "futures-task"
-version = "0.3.32"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
+checksum = "cd417de3d1d015fc3bfd2b1ea46dfc7bab72ef86f1cc7cc9c78e728b34a6d1fd"
 
 [[package]]
 name = "futures-util"
-version = "0.3.32"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
+checksum = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2117,110 +2441,6 @@ dependencies = [
  "slab",
 ]
 
-[[package]]
-name = "fxhash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "gdk"
-version = "0.18.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9f245958c627ac99d8e529166f9823fb3b838d1d41fd2b297af3075093c2691"
-dependencies = [
- "cairo-rs",
- "gdk-pixbuf",
- "gdk-sys",
- "gio",
- "glib",
- "libc",
- "pango",
-]
-
-[[package]]
-name = "gdk-pixbuf"
-version = "0.18.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50e1f5f1b0bfb830d6ccc8066d18db35c487b1b2b1e8589b5dfe9f07e8defaec"
-dependencies = [
- "gdk-pixbuf-sys",
- "gio",
- "glib",
- "libc",
- "once_cell",
-]
-
-[[package]]
-name = "gdk-pixbuf-sys"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7"
-dependencies = [
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gdk-sys"
-version = "0.18.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c2d13f38594ac1e66619e188c6d5a1adb98d11b2fcf7894fc416ad76aa2f3f7"
-dependencies = [
- "cairo-sys-rs",
- "gdk-pixbuf-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "pango-sys",
- "pkg-config",
- "system-deps",
-]
-
-[[package]]
-name = "gdkwayland-sys"
-version = "0.18.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "140071d506d223f7572b9f09b5e155afbd77428cd5cc7af8f2694c41d98dfe69"
-dependencies = [
- "gdk-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "pkg-config",
- "system-deps",
-]
-
-[[package]]
-name = "gdkx11-sys"
-version = "0.18.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e2e7445fe01ac26f11601db260dd8608fe172514eb63b3b5e261ea6b0f4428d"
-dependencies = [
- "gdk-sys",
- "glib-sys",
- "libc",
- "system-deps",
- "x11",
-]
-
-[[package]]
-name = "generational-box"
-version = "0.7.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cd0d825b8d339701ad330dbcd6399519ced4d143484954daf6e3185dace4f77"
-dependencies = [
- "parking_lot",
- "tracing",
-]
-
 [[package]]
 name = "generic-array"
 version = "0.14.7"
@@ -2241,17 +2461,6 @@ dependencies = [
  "windows-link 0.2.1",
 ]
 
-[[package]]
-name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.17"
@@ -2259,8 +2468,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
- "wasi 0.11.1+wasi-snapshot-preview1",
+ "wasi",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -2270,9 +2481,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
  "r-efi 5.3.0",
  "wasip2",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -2282,10 +2495,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
  "r-efi 6.0.0",
+ "rand_core 0.10.1",
  "wasip2",
  "wasip3",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -2309,234 +2525,842 @@ dependencies = [
 ]
 
 [[package]]
-name = "gio"
-version = "0.18.4"
+name = "gimli"
+version = "0.32.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-util",
- "gio-sys",
- "glib",
- "libc",
- "once_cell",
- "pin-project-lite",
- "smallvec",
- "thiserror 1.0.69",
-]
+checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7"
 
 [[package]]
-name = "gio-sys"
-version = "0.18.1"
+name = "gl_generator"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2"
+checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d"
 dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
- "winapi",
+ "khronos_api",
+ "log",
+ "xml-rs",
 ]
 
 [[package]]
-name = "glib"
-version = "0.18.5"
+name = "glob"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5"
-dependencies = [
- "bitflags 2.11.0",
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-task",
- "futures-util",
- "gio-sys",
- "glib-macros",
- "glib-sys",
- "gobject-sys",
- "libc",
- "memchr",
- "once_cell",
- "smallvec",
- "thiserror 1.0.69",
-]
+checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
 
 [[package]]
-name = "glib-macros"
-version = "0.18.5"
+name = "globset"
+version = "0.4.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc"
+checksum = "e47d37d2ae4464254884b60ab7071be2b876a9c35b696bd018ddcc76847309cd"
 dependencies = [
- "heck 0.4.1",
- "proc-macro-crate 2.0.2",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 2.0.117",
+ "aho-corasick",
+ "bstr",
+ "log",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
-name = "glib-sys"
-version = "0.18.1"
+name = "globwalk"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898"
+checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc"
 dependencies = [
- "libc",
- "system-deps",
+ "bitflags 1.3.2",
+ "ignore",
+ "walkdir",
 ]
 
 [[package]]
-name = "glob"
-version = "0.3.3"
+name = "glow"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
+checksum = "29038e1c483364cc6bb3cf78feee1816002e127c331a1eec55a4d202b9e1adb5"
+dependencies = [
+ "js-sys",
+ "slotmap",
+ "wasm-bindgen",
+ "web-sys",
+]
 
 [[package]]
-name = "global-hotkey"
-version = "0.7.0"
+name = "glutin_wgl_sys"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9247516746aa8e53411a0db9b62b0e24efbcf6a76e0ba73e5a91b512ddabed7"
+checksum = "2c4ee00b289aba7a9e5306d57c2d05499b2e5dc427f84ac708bd2c090212cf3e"
 dependencies = [
- "crossbeam-channel",
- "keyboard-types",
- "objc2",
- "objc2-app-kit",
- "once_cell",
- "thiserror 2.0.18",
- "windows-sys 0.59.0",
- "x11rb",
- "xkeysym",
+ "gl_generator",
 ]
 
 [[package]]
-name = "gloo-timers"
-version = "0.3.0"
+name = "gpu-allocator"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
+checksum = "51255ea7cfaadb6c5f1528d43e92a82acb2b96c43365989a28b2d44ee38f8795"
 dependencies = [
- "futures-channel",
- "futures-core",
- "js-sys",
- "wasm-bindgen",
+ "ash",
+ "hashbrown 0.16.1",
+ "log",
+ "presser",
+ "thiserror 2.0.18",
+ "windows 0.61.3",
 ]
 
 [[package]]
-name = "gobject-sys"
-version = "0.18.0"
+name = "gpu-descriptor"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44"
+checksum = "b89c83349105e3732062a895becfc71a8f921bb71ecbbdd8ff99263e3b53a0ca"
 dependencies = [
- "glib-sys",
- "libc",
- "system-deps",
+ "bitflags 2.13.2",
+ "gpu-descriptor-types",
+ "hashbrown 0.15.5",
 ]
 
 [[package]]
-name = "grid"
-version = "1.0.1"
+name = "gpu-descriptor-types"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b40ca9252762c466af32d0b1002e91e4e1bc5398f77455e55474deb466355ff5"
+checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91"
+dependencies = [
+ "bitflags 2.13.2",
+]
 
 [[package]]
-name = "gtk"
-version = "0.18.2"
+name = "gpui-base"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd56fb197bfc42bd5d2751f4f017d44ff59fbb58140c6b49f9b3b2bdab08506a"
+checksum = "c9e904ee0d351f4e85b967e26ae986d3aa195a8d9d35fcd18184a2c40989694e"
 dependencies = [
- "atk",
- "cairo-rs",
- "field-offset",
- "futures-channel",
- "gdk",
- "gdk-pixbuf",
- "gio",
- "glib",
- "gtk-sys",
- "gtk3-macros",
- "libc",
- "pango",
- "pkg-config",
+ "aho-corasick",
+ "anyhow",
+ "ashpd",
+ "async-channel",
+ "chrono",
+ "data-url",
+ "futures",
+ "gpui-pre",
+ "gpui-pre-macros",
+ "gpui-pre-sum-tree",
+ "html5ever 0.27.0",
+ "instant",
+ "lsp-types",
+ "markdown",
+ "markup5ever_rcdom 0.3.0",
+ "objc2 0.6.4",
+ "objc2-app-kit 0.3.2",
+ "objc2-foundation 0.3.2",
+ "raw-window-handle",
+ "regex",
+ "ropey",
+ "schemars 1.2.2",
+ "serde",
+ "serde_json",
+ "smallvec",
+ "smol",
+ "tracing",
+ "unicode-segmentation",
+ "web-time",
+ "windows 0.58.0",
 ]
 
 [[package]]
-name = "gtk-sys"
-version = "0.18.2"
+name = "gpui-component"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f29a1c21c59553eb7dd40e918be54dccd60c52b049b75119d5d96ce6b624414"
+checksum = "0cf6c72516b44bb2e66a1bd2ccf77a122ecd1b54a75559ac299bb296bfcb5bb7"
 dependencies = [
- "atk-sys",
- "cairo-sys-rs",
- "gdk-pixbuf-sys",
- "gdk-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "pango-sys",
- "system-deps",
+ "anyhow",
+ "chrono",
+ "core-text",
+ "enum-iterator",
+ "gpui-base",
+ "gpui-component-macros",
+ "gpui-kit-assets",
+ "gpui-pre",
+ "gpui-pre-macros",
+ "gpui-pre-sum-tree",
+ "instant",
+ "itertools 0.13.0",
+ "log",
+ "lsp-types",
+ "markdown",
+ "notify",
+ "num-traits",
+ "objc2 0.6.4",
+ "objc2-app-kit 0.3.2",
+ "objc2-foundation 0.3.2",
+ "once_cell",
+ "paste",
+ "raw-window-handle",
+ "regex",
+ "resvg 0.45.1",
+ "ropey",
+ "rust-i18n",
+ "schemars 1.2.2",
+ "serde",
+ "serde_json",
+ "serde_repr",
+ "smallvec",
+ "smol",
+ "tracing",
+ "uuid",
+ "windows 0.58.0",
 ]
 
 [[package]]
-name = "gtk3-macros"
-version = "0.18.2"
+name = "gpui-component-macros"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ff3c5b21f14f0736fed6dcfc0bfb4225ebf5725f3c0209edeec181e4d73e9d"
+checksum = "3867545508c7cf6a5f6da586f60d894a3f8e7cce94b7fe82df7fad5f868ec20e"
 dependencies = [
- "proc-macro-crate 1.3.1",
- "proc-macro-error",
+ "proc-macro-crate",
  "proc-macro2",
  "quote",
  "syn 2.0.117",
 ]
 
 [[package]]
-name = "half"
-version = "2.7.1"
+name = "gpui-kit"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
+checksum = "42732dc20f50926278b2abf7a99d427a7741ab28bca6bfb49685f9ce3a53a1c7"
 dependencies = [
- "cfg-if",
- "crunchy",
- "zerocopy",
+ "gpui-base",
+ "gpui-component",
+ "gpui-kit-assets",
+ "gpui-pre",
+ "gpui-pre-platform",
+ "gpui-pre-web",
 ]
 
 [[package]]
-name = "harfrust"
-version = "0.5.2"
+name = "gpui-kit-assets"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9da2e5ae821f6e96664977bf974d6d6a2d6682f9ccee23e62ec1d134246845f9"
+checksum = "111d3d03a68454318a193f137419864ccebdc7d3dc0194b0b0b3f818a6bc3d55"
 dependencies = [
- "bitflags 2.11.0",
- "bytemuck",
- "core_maths",
- "read-fonts",
- "smallvec",
+ "anyhow",
+ "gpui-pre",
+ "gpui-pre-reqwest",
+ "log",
+ "rust-embed",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
 ]
 
 [[package]]
-name = "hashbrown"
-version = "0.14.5"
+name = "gpui-pre"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "a0437c0b83e636a92bd1a39fa1d05fb632ae671289537497b35871ffbe231b84"
+dependencies = [
+ "accesskit",
+ "anyhow",
+ "async-channel",
+ "async-task",
+ "bindgen 0.72.1",
+ "bitflags 2.13.2",
+ "chrono",
+ "core-video",
+ "ctor",
+ "derive_more",
+ "embed-resource",
+ "etagere",
+ "futures",
+ "futures-concurrency",
+ "getrandom 0.3.4",
+ "gpui-pre-collections",
+ "gpui-pre-http-client",
+ "gpui-pre-macros",
+ "gpui-pre-refineable",
+ "gpui-pre-scheduler",
+ "gpui-pre-shared-string",
+ "gpui-pre-sum-tree",
+ "gpui-pre-util",
+ "gpui-pre-util-macros",
+ "heapless",
+ "image",
+ "inventory",
+ "itertools 0.14.0",
+ "log",
+ "lyon",
+ "num_cpus",
+ "objc2-core-foundation",
+ "objc2-core-video",
+ "parking",
+ "parking_lot",
+ "pin-project",
+ "pollster 0.4.0",
+ "postage",
+ "profiling",
+ "rand 0.9.2",
+ "raw-window-handle",
+ "regex",
+ "resvg 0.46.0",
+ "schemars 1.2.2",
+ "seahash",
+ "serde",
+ "serde_json",
+ "slotmap",
+ "smallvec",
+ "spin 0.10.1",
+ "strum 0.28.0",
+ "taffy 0.13.0",
+ "thiserror 2.0.18",
+ "ttf-parser 0.25.1",
+ "url",
+ "usvg 0.46.0",
+ "uuid",
+ "waker-fn",
+ "web-time",
+ "windows 0.62.2",
+ "zed-font-kit",
+ "zed-scap",
+]
 
 [[package]]
-name = "hashbrown"
-version = "0.15.5"
+name = "gpui-pre-apple"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
+checksum = "3af534f0746eb9e014114bcc0ee00dc250c4b8d75df2e437180c403aa65649c1"
 dependencies = [
- "allocator-api2",
- "equivalent",
- "foldhash",
+ "anyhow",
+ "block",
+ "cbindgen",
+ "cocoa 0.26.1",
+ "core-foundation 0.10.1",
+ "core-video",
+ "derive_more",
+ "etagere",
+ "foreign-types",
+ "gpui-pre",
+ "image",
+ "log",
+ "metal",
+ "objc",
+ "objc2 0.6.4",
+ "parking_lot",
 ]
 
 [[package]]
-name = "hashbrown"
-version = "0.16.1"
+name = "gpui-pre-collections"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
+checksum = "15e7a65204039187d1f4b3d4c2e0233eeac54d4acb0b13f9dc1a3b5adad26c1f"
+dependencies = [
+ "gpui-pre-util",
+ "indexmap",
+ "rustc-hash 2.1.1",
+]
+
+[[package]]
+name = "gpui-pre-derive-refineable"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79dfb4a05f3cd9893d7768dbf5dba1bbbe99cab7394e89b360ccb3b2bcb6b34e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "gpui-pre-http-client"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfd5a7542c77887a5aff997d78c95884119c8463409569b63fcf060956da1682"
+dependencies = [
+ "anyhow",
+ "async-compression",
+ "bytes",
+ "derive_more",
+ "futures",
+ "http",
+ "http-body",
+ "log",
+ "parking_lot",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "url",
+]
+
+[[package]]
+name = "gpui-pre-linux"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aab655cda1d6dcd549ac869e8678babc84cf573ab6794a1fe1a39c6c70c60b48"
+dependencies = [
+ "accesskit",
+ "accesskit_unix",
+ "anyhow",
+ "as-raw-xcb-connection",
+ "ashpd",
+ "bitflags 2.13.2",
+ "bytemuck",
+ "calloop",
+ "calloop-wayland-source",
+ "filedescriptor",
+ "futures",
+ "gpui-pre",
+ "gpui-pre-collections",
+ "gpui-pre-http-client",
+ "gpui-pre-util",
+ "gpui-pre-wgpu",
+ "libc",
+ "log",
+ "notify-rust",
+ "oo7",
+ "open",
+ "parking_lot",
+ "raw-window-handle",
+ "smallvec",
+ "smol",
+ "strum 0.28.0",
+ "url",
+ "uuid",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-cursor",
+ "wayland-protocols",
+ "wayland-protocols-plasma",
+ "wayland-protocols-wlr",
+ "x11-clipboard",
+ "x11rb",
+ "xkbcommon",
+ "zed-scap",
+ "zed-xim",
+]
+
+[[package]]
+name = "gpui-pre-macos"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "951d17e41a72067ad2d35c60e08a62e8ad7fa9400b41c802e26cfb459f6c05da"
+dependencies = [
+ "accesskit",
+ "accesskit_macos",
+ "anyhow",
+ "async-task",
+ "block2 0.6.2",
+ "cocoa 0.26.1",
+ "core-foundation 0.10.1",
+ "core-foundation-sys",
+ "core-graphics 0.24.0",
+ "core-text",
+ "ctor",
+ "dispatch2",
+ "foreign-types",
+ "futures",
+ "gpui-pre",
+ "gpui-pre-apple",
+ "gpui-pre-collections",
+ "gpui-pre-util",
+ "image",
+ "itertools 0.14.0",
+ "libc",
+ "log",
+ "mach2",
+ "objc",
+ "objc2 0.6.4",
+ "objc2-app-kit 0.3.2",
+ "objc2-core-graphics",
+ "objc2-core-media",
+ "objc2-foundation 0.3.2",
+ "objc2-screen-capture-kit",
+ "objc2-user-notifications",
+ "parking_lot",
+ "pathfinder_geometry",
+ "raw-window-handle",
+ "semver",
+ "smallvec",
+ "strum 0.28.0",
+ "uuid",
+ "zed-font-kit",
+]
+
+[[package]]
+name = "gpui-pre-macros"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6324092b40ea8ec7c327a4a28427e366a489b4d5d23b5d1bd0243fc2f4ca7a9e"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "gpui-pre-perf"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b94bff26ccd8105f6206144f8dab16a2dc02e7a68f39dada02cdf492f0afd940"
+dependencies = [
+ "gpui-pre-collections",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "gpui-pre-platform"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8423d1e0a693d2f9f16c0326bb01b5e81ec0531854d596a18476934ac6880478"
+dependencies = [
+ "console_error_panic_hook",
+ "gpui-pre",
+ "gpui-pre-linux",
+ "gpui-pre-macos",
+ "gpui-pre-web",
+ "gpui-pre-windows",
+]
+
+[[package]]
+name = "gpui-pre-refineable"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93b4b0a8d296a3ee5beb1136bc48f8167a6028eb1e243b56851dcd8c9fc6d7a1"
+dependencies = [
+ "gpui-pre-derive-refineable",
+]
+
+[[package]]
+name = "gpui-pre-reqwest"
+version = "0.12.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05be23908e707966824f8c51a609904b7f30739e8d915e120a53c1b995ba964c"
+dependencies = [
+ "base64",
+ "bytes",
+ "encoding_rs",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-rustls",
+ "hyper-util",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "mime_guess",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "quinn",
+ "rustls",
+ "rustls-native-certs",
+ "rustls-pemfile",
+ "rustls-pki-types",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "system-configuration",
+ "tokio",
+ "tokio-rustls",
+ "tokio-socks",
+ "tokio-util",
+ "tower",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wasm-streams",
+ "web-sys",
+ "windows-registry 0.4.0",
+]
+
+[[package]]
+name = "gpui-pre-scheduler"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff7b10b3d2fc3fda24847a04436eca9531612c8414874a37ddc005f20e521e12"
+dependencies = [
+ "async-task",
+ "backtrace",
+ "chrono",
+ "flume",
+ "futures",
+ "parking_lot",
+ "rand 0.9.2",
+ "wasm_thread",
+ "web-time",
+]
+
+[[package]]
+name = "gpui-pre-shared-string"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe17f81bd98a0253140ea79f7f76442d7499bd8d17db302861af8e46c11d38df"
+dependencies = [
+ "schemars 1.2.2",
+ "serde",
+ "smol_str",
+]
+
+[[package]]
+name = "gpui-pre-sum-tree"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a6d35e998a51d24248dad731de1f09d386cbbf46a04edde3b67f469b2ce3f16"
+dependencies = [
+ "gpui-pre-ztracing",
+ "heapless",
+ "log",
+ "rayon",
+ "tracing",
+]
+
+[[package]]
+name = "gpui-pre-util"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a026a30c578930d20974fd8c3d77de36223ac7ba193bd4259e7238929bc8806"
+dependencies = [
+ "anyhow",
+ "log",
+ "which 8.0.6",
+]
+
+[[package]]
+name = "gpui-pre-util-macros"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cbf79627a6afc626d4e887dad9d2d92bb069413e8cc692ba3e90bff219eb7a9"
+dependencies = [
+ "gpui-pre-perf",
+ "quote",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "gpui-pre-web"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34be433b9fcb370b1fe9a1c7fe911f0eb6058791ef8167dcf6c5a5deb624975c"
+dependencies = [
+ "anyhow",
+ "console_error_panic_hook",
+ "futures",
+ "gpui-pre",
+ "gpui-pre-http-client",
+ "gpui-pre-scheduler",
+ "gpui-pre-wgpu",
+ "js-sys",
+ "log",
+ "parking_lot",
+ "raw-window-handle",
+ "smallvec",
+ "unicode-properties",
+ "unicode-script",
+ "unicode-segmentation",
+ "uuid",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wasm_thread",
+ "web-sys",
+ "web-time",
+]
+
+[[package]]
+name = "gpui-pre-wgpu"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05515b32799b1767d69300921c1b562cd53104965211a0e8905acdc7aa18e693"
+dependencies = [
+ "anyhow",
+ "bytemuck",
+ "cosmic-text",
+ "etagere",
+ "gpui-pre",
+ "gpui-pre-collections",
+ "gpui-pre-util",
+ "itertools 0.14.0",
+ "log",
+ "parking_lot",
+ "profiling",
+ "raw-window-handle",
+ "smallvec",
+ "swash",
+ "unicode-bidi",
+ "unicode-segmentation",
+ "web-sys",
+ "wgpu",
+ "zed-font-kit",
+]
+
+[[package]]
+name = "gpui-pre-windows"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27662e65bfcf4445d2cccfad91f1570ec07f4b1b5de98400a9f207fd19c464cf"
+dependencies = [
+ "accesskit",
+ "accesskit_windows",
+ "anyhow",
+ "dunce",
+ "etagere",
+ "futures",
+ "gpui-pre",
+ "gpui-pre-collections",
+ "gpui-pre-util",
+ "image",
+ "itertools 0.14.0",
+ "log",
+ "parking_lot",
+ "rand 0.9.2",
+ "raw-window-handle",
+ "smallvec",
+ "uuid",
+ "windows 0.62.2",
+ "windows-core 0.62.2",
+ "windows-numerics 0.3.1",
+ "windows-registry 0.6.1",
+]
+
+[[package]]
+name = "gpui-pre-zlog"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3a5af0b734a391a84872eb770b3ee9830091ec2487b79d06371fe14eefb2b5d"
+dependencies = [
+ "anyhow",
+ "chrono",
+ "gpui-pre-collections",
+ "log",
+]
+
+[[package]]
+name = "gpui-pre-ztracing"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a24cb19f78c5bc3aab8ddf1e8e0bd6b402fbcb9c7f112f64ddbedef8f8768a59"
+dependencies = [
+ "gpui-pre-zlog",
+ "gpui-pre-ztracing-macro",
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "gpui-pre-ztracing-macro"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1bb25850ad31b88bbdef454afb93ec4cdb81f5e200ba5b3f1a0368111780d2c"
+
+[[package]]
+name = "granit-parser"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e20f99e46474f56bd905c56e817ebddcf377a611f94c53ac4649e4d3fa3c0cd0"
+dependencies = [
+ "arraydeque",
+ "smallvec",
+]
+
+[[package]]
+name = "grid"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b40ca9252762c466af32d0b1002e91e4e1bc5398f77455e55474deb466355ff5"
+
+[[package]]
+name = "h2"
+version = "0.4.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef8e5e5a340588f4452631496976cf8636d4a7ecf600239fdc27615d2530bc16"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "http",
+ "indexmap",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "half"
+version = "2.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
+dependencies = [
+ "cfg-if",
+ "crunchy",
+ "num-traits",
+ "zerocopy",
+]
+
+[[package]]
+name = "harfrust"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9da2e5ae821f6e96664977bf974d6d6a2d6682f9ccee23e62ec1d134246845f9"
+dependencies = [
+ "bitflags 2.13.2",
+ "bytemuck",
+ "core_maths",
+ "read-fonts",
+ "smallvec",
+]
+
+[[package]]
+name = "hash32"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606"
+dependencies = [
+ "byteorder",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+
+[[package]]
+name = "hashbrown"
+version = "0.15.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash 0.1.5",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash 0.2.0",
+]
+
+[[package]]
+name = "heapless"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25ba4bd83f9415b58b4ed8dc5714c76e626a105be4646c02630ad730ad3b5aa4"
+dependencies = [
+ "hash32",
+ "stable_deref_trait",
+]
 
 [[package]]
 name = "heck"
@@ -2550,6 +3374,42 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
+[[package]]
+name = "hermit-abi"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e17592d60ebacc7d5e169f4663c5f84f9161cc90328abcfe8456f41e4dfcb284"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "hexf-parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
+
+[[package]]
+name = "hkdf"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
+dependencies = [
+ "hmac",
+]
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest 0.10.7",
+]
+
 [[package]]
 name = "home"
 version = "0.5.12"
@@ -2561,42 +3421,157 @@ dependencies = [
 
 [[package]]
 name = "html5ever"
-version = "0.29.1"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b7410cae13cbc75623c98ac4cbfd1f0bedddf3227afc24f370cf0f50a44a11c"
+checksum = "c13771afe0e6e846f1e67d038d4cb29998a6779f93c809212e4e9c32efd244d4"
 dependencies = [
  "log",
  "mac",
- "markup5ever 0.14.1",
- "match_token",
+ "markup5ever 0.12.1",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "html5ever"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46a1761807faccc9a19e86944bbf40610014066306f96edcdedc2fb714bcb7b8"
+dependencies = [
+ "log",
+ "markup5ever 0.39.0",
+]
+
+[[package]]
+name = "http"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a"
+dependencies = [
+ "bytes",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca2a8f2913ee65f60facd6a5905613afaa448497a0230cc41ce022d93290bc2c"
+dependencies = [
+ "bytes",
+ "http",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23169fe34a5fbcdd3f3862e78fb9b6fccd5f02a6dc6f732547005d45631ce71c"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "http",
+ "http-body",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
+
+[[package]]
+name = "hybrid-array"
+version = "0.4.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27f864f10dfb56725ce5ce5472bc52252c8f93a4ab86327122cebf62c5f59a17"
+dependencies = [
+ "typenum",
+]
+
+[[package]]
+name = "hyper"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27b501faa50e7a26c3d3560ca625132f4078a17771f4810baf70475ae48cbe43"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "h2",
+ "http",
+ "http-body",
+ "httparse",
+ "itoa",
+ "pin-project-lite",
+ "smallvec",
+ "tokio",
+ "want",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.27.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfa8e654703247911e29c23fbeaa261834bd9bb74efba2f9acddc37bfb127f53"
+dependencies = [
+ "http",
+ "hyper",
+ "hyper-util",
+ "rustls",
+ "rustls-native-certs",
+ "tokio",
+ "tokio-rustls",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-util"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "http",
+ "http-body",
+ "hyper",
+ "libc",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower-service",
+ "tracing",
 ]
 
 [[package]]
-name = "html5ever"
-version = "0.39.0"
+name = "iana-time-zone"
+version = "0.1.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46a1761807faccc9a19e86944bbf40610014066306f96edcdedc2fb714bcb7b8"
+checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470"
 dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
  "log",
- "markup5ever 0.39.0",
+ "wasm-bindgen",
+ "windows-core 0.61.2",
 ]
 
 [[package]]
-name = "http"
-version = "1.4.0"
+name = "iana-time-zone-haiku"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
 dependencies = [
- "bytes",
- "itoa",
+ "cc",
 ]
 
-[[package]]
-name = "httparse"
-version = "1.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
-
 [[package]]
 name = "icu_collections"
 version = "2.1.1"
@@ -2711,6 +3686,22 @@ dependencies = [
  "icu_properties",
 ]
 
+[[package]]
+name = "ignore"
+version = "0.4.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b17771570a2b94107741a7b033f19132c2eee21d59d21b24d2ced26500bd66e"
+dependencies = [
+ "crossbeam-deque",
+ "globset",
+ "log",
+ "memchr",
+ "regex-automata",
+ "same-file",
+ "walkdir",
+ "winapi-util",
+]
+
 [[package]]
 name = "image"
 version = "0.25.9"
@@ -2729,7 +3720,6 @@ dependencies = [
  "qoi",
  "ravif",
  "rayon",
- "rgb",
  "tiff",
  "zune-core 0.5.1",
  "zune-jpeg 0.5.12",
@@ -2761,6 +3751,12 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285"
 
+[[package]]
+name = "imagesize"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09e54e57b4c48b40f7aec75635392b12b3421fa26fe8b4332e63138ed278459c"
+
 [[package]]
 name = "imgref"
 version = "1.12.2"
@@ -2788,15 +3784,6 @@ dependencies = [
  "rustversion",
 ]
 
-[[package]]
-name = "infer"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a588916bfdfd92e71cacef98a63d9b1f0d74d6599980d11894290e7ddefffcf7"
-dependencies = [
- "cfb",
-]
-
 [[package]]
 name = "inotify"
 version = "0.10.2"
@@ -2817,13 +3804,23 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "inout"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
+dependencies = [
+ "block-padding",
+ "generic-array",
+]
+
 [[package]]
 name = "instability"
 version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5eb2d60ef19920a3a9193c3e371f726ec1dafc045dac788d0fb3704272458971"
 dependencies = [
- "darling 0.23.0",
+ "darling",
  "indoc",
  "proc-macro2",
  "quote",
@@ -2837,6 +3834,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
 dependencies = [
  "cfg-if",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
 ]
 
 [[package]]
@@ -2850,12 +3850,67 @@ dependencies = [
  "syn 2.0.117",
 ]
 
+[[package]]
+name = "inventory"
+version = "0.3.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4f0c30c76f2f4ccee3fe55a2435f691ca00c0e4bd87abe4f4a851b1d4dac39b"
+dependencies = [
+ "rustversion",
+]
+
+[[package]]
+name = "io-surface"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "554b8c5d64ec09a3a520fe58e4d48a73e00ff32899cdcbe32a4877afd4968b8e"
+dependencies = [
+ "cgl",
+ "core-foundation 0.10.1",
+ "core-foundation-sys",
+ "leaky-cow",
+]
+
+[[package]]
+name = "ipnet"
+version = "2.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "791930b43c0d5973160d90a8f3894509f2b273430f5c5c73b668636d0287c5c0"
+
+[[package]]
+name = "is-docker"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "is-wsl"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5"
+dependencies = [
+ "is-docker",
+ "once_cell",
+]
+
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
 
+[[package]]
+name = "itertools"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itertools"
 version = "0.12.1"
@@ -2889,29 +3944,6 @@ version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
 
-[[package]]
-name = "javascriptcore-rs"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca5671e9ffce8ffba57afc24070e906da7fc4b1ba66f2cabebf61bf2ea257fcc"
-dependencies = [
- "bitflags 1.3.2",
- "glib",
- "javascriptcore-rs-sys",
-]
-
-[[package]]
-name = "javascriptcore-rs-sys"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af1be78d14ffa4b75b66df31840478fef72b51f8c2465d4ca7c194da9f7a5124"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
-]
-
 [[package]]
 name = "jni"
 version = "0.21.1"
@@ -2928,36 +3960,6 @@ dependencies = [
  "windows-sys 0.45.0",
 ]
 
-[[package]]
-name = "jni"
-version = "0.22.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5efd9a482cf3a427f00d6b35f14332adc7902ce91efb778580e180ff90fa3498"
-dependencies = [
- "cfg-if",
- "combine",
- "jni-macros",
- "jni-sys 0.4.1",
- "log",
- "simd_cesu8",
- "thiserror 2.0.18",
- "walkdir",
- "windows-link 0.2.1",
-]
-
-[[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.117",
-]
-
 [[package]]
 name = "jni-sys"
 version = "0.3.1"
@@ -2998,39 +4000,31 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.91"
+version = "0.3.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b49715b7073f385ba4bc528e5747d02e66cb39c6146efb66b781f131f0fb399c"
+checksum = "ce57d20d1ea864ce2ac172ab472d409214f4fd359f0b2a2775abdf522e2af99e"
 dependencies = [
- "once_cell",
+ "cfg-if",
+ "futures-util",
  "wasm-bindgen",
 ]
 
 [[package]]
-name = "keyboard-types"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a"
-dependencies = [
- "bitflags 2.11.0",
- "serde",
- "unicode-segmentation",
-]
-
-[[package]]
-name = "konst"
-version = "0.2.20"
+name = "khronos-egl"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "128133ed7824fcd73d6e7b17957c5eb7bacb885649bd8c69708b2331a10bcefb"
+checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76"
 dependencies = [
- "konst_macro_rules",
+ "libc",
+ "libloading",
+ "pkg-config",
 ]
 
 [[package]]
-name = "konst_macro_rules"
-version = "0.2.19"
+name = "khronos_api"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4933f3f57a8e9d9da04db23fb153356ecaf00cbd14aee46279c33dc80925c37"
+checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
 
 [[package]]
 name = "kqueue"
@@ -3052,18 +4046,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "kuchikiki"
-version = "0.8.8-speedreader"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02cb977175687f33fa4afa0c95c112b987ea1443e5a51c8f8ff27dc618270cc2"
-dependencies = [
- "cssparser",
- "html5ever 0.29.1",
- "indexmap",
- "selectors",
-]
-
 [[package]]
 name = "kurbo"
 version = "0.11.3"
@@ -3076,10 +4058,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "lazy-js-bundle"
-version = "0.7.9"
+name = "kurbo"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccafada6c9541db44db758619236f2748f6e1bdaa84d04ded858567cd1e89321"
+checksum = "4b60dfc32f652b926df6192e55525b16d186c69d47876c3ead4da5cc9f8450e2"
+dependencies = [
+ "arrayvec",
+ "euclid",
+ "polycool",
+ "smallvec",
+]
 
 [[package]]
 name = "lazy_static"
@@ -3093,6 +4081,21 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
+[[package]]
+name = "leak"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd100e01f1154f2908dfa7d02219aeab25d0b9c7fa955164192e3245255a0c73"
+
+[[package]]
+name = "leaky-cow"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40a8225d44241fd324a8af2806ba635fc7c8a7e9a7de4d5cf3ef54e71f5926fc"
+dependencies = [
+ "leak",
+]
+
 [[package]]
 name = "leb128fmt"
 version = "0.1.0"
@@ -3106,28 +4109,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a79a3332a6609480d7d0c9eab957bca6b455b91bb84e66d19f5ff66294b85b8"
 
 [[package]]
-name = "libappindicator"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03589b9607c868cc7ae54c0b2a22c8dc03dd41692d48f2d7df73615c6a95dc0a"
-dependencies = [
- "glib",
- "gtk",
- "gtk-sys",
- "libappindicator-sys",
- "log",
-]
-
-[[package]]
-name = "libappindicator-sys"
-version = "0.9.0"
+name = "libbz2-rs-sys"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf"
-dependencies = [
- "gtk-sys",
- "libloading 0.7.4",
- "once_cell",
-]
+checksum = "34b357333733e8260735ba5894eb928c02ecc69c78715f01a8019e7fa7f2db4c"
 
 [[package]]
 name = "libc"
@@ -3145,16 +4130,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "libloading"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
-dependencies = [
- "cfg-if",
- "winapi",
-]
-
 [[package]]
 name = "libloading"
 version = "0.8.9"
@@ -3177,43 +4152,36 @@ version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1744e39d1d6a9948f4f388969627434e31128196de472883b39f148769bfe30a"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.2",
  "libc",
  "plain",
  "redox_syscall 0.7.3",
 ]
 
-[[package]]
-name = "libxdo"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00333b8756a3d28e78def82067a377de7fa61b24909000aeaa2b446a948d14db"
-dependencies = [
- "libxdo-sys",
-]
-
-[[package]]
-name = "libxdo-sys"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db23b9e7e2b7831bbd8aac0bbeeeb7b68cbebc162b227e7052e8e55829a09212"
-dependencies = [
- "libc",
- "x11",
-]
-
 [[package]]
 name = "linebender_resource_handle"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4a5ff6bcca6c4867b1c4fd4ef63e4db7436ef363e0ad7531d1558856bae64f4"
 
+[[package]]
+name = "link-section"
+version = "0.19.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39c29a617ce3df32c08497bdc1ab6e2376e0b17948ac166a2fbe5977c5954cd9"
+
 [[package]]
 name = "linked-hash-map"
 version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
+[[package]]
+name = "linktime-proc-macro"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e57c38c1e860fd37c604281cdfb1dd2216977fd76a50f85ba2f388ef3219616"
+
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.15"
@@ -3221,54 +4189,129 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
 
 [[package]]
-name = "linux-raw-sys"
-version = "0.12.1"
+name = "linux-raw-sys"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
+
+[[package]]
+name = "litemap"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
+
+[[package]]
+name = "litrs"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092"
+
+[[package]]
+name = "lock_api"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
+dependencies = [
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
+dependencies = [
+ "serde_core",
+ "value-bag",
+]
+
+[[package]]
+name = "loop9"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062"
+dependencies = [
+ "imgref",
+]
+
+[[package]]
+name = "lru"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
+dependencies = [
+ "hashbrown 0.15.5",
+]
+
+[[package]]
+name = "lru-slab"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
+checksum = "4050469837a6ff301cd14c1f8f24f88549e6d548f24f64e2148eb0f72cebc51f"
 
 [[package]]
-name = "litemap"
-version = "0.8.1"
+name = "lsp-types"
+version = "0.97.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
+checksum = "53353550a17c04ac46c585feb189c2db82154fc84b79c7a66c96c2c644f66071"
+dependencies = [
+ "bitflags 1.3.2",
+ "fluent-uri",
+ "serde",
+ "serde_json",
+ "serde_repr",
+]
 
 [[package]]
-name = "lock_api"
-version = "0.4.14"
+name = "lyon"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
+checksum = "bd0578bdecb7d6d88987b8b2b1e3a4e2f81df9d0ece1078623324a567904e7b7"
 dependencies = [
- "scopeguard",
+ "lyon_algorithms",
+ "lyon_tessellation",
 ]
 
 [[package]]
-name = "log"
-version = "0.4.29"
+name = "lyon_algorithms"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
+checksum = "cdfa8785f95e57914ddb35e3b59994aeba6f5e79e9cfd03da1c269f010f36009"
+dependencies = [
+ "lyon_path",
+ "num-traits",
+]
 
 [[package]]
-name = "longest-increasing-subsequence"
-version = "0.1.0"
+name = "lyon_geom"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3bd0dd2cd90571056fdb71f6275fada10131182f84899f4b2a916e565d81d86"
+checksum = "4336502e29e32af93cf2dad2214ed6003c17ceb5bd499df77b1de663b9042b92"
+dependencies = [
+ "arrayvec",
+ "euclid",
+ "num-traits",
+]
 
 [[package]]
-name = "loop9"
-version = "0.1.5"
+name = "lyon_path"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062"
+checksum = "5c463f9c428b7fc5ec885dcd39ce4aa61e29111d0e33483f6f98c74e89d8621e"
 dependencies = [
- "imgref",
+ "lyon_geom",
+ "num-traits",
 ]
 
 [[package]]
-name = "lru"
-version = "0.12.5"
+name = "lyon_tessellation"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
+checksum = "43b8dcf906637ecef61b3c0740c7a4e7f27caeb31257cfac0cc579ce15be6005"
 dependencies = [
- "hashbrown 0.15.5",
+ "float_next_after",
+ "lyon_path",
+ "num-traits",
 ]
 
 [[package]]
@@ -3278,23 +4321,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
 
 [[package]]
-name = "mach2"
-version = "0.5.0"
+name = "mac-notification-sys"
+version = "0.6.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a1b95cd5421ec55b445b5ae102f5ea0e768de1f82bd3001e11f426c269c3aea"
+checksum = "fd604973958ddcc11b561193c0fb96ba146506ef2f231ef2e7c35fd2cbc9beca"
 dependencies = [
- "libc",
+ "cc",
+ "log",
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
+ "time",
+ "uuid",
 ]
 
 [[package]]
-name = "macro-string"
-version = "0.1.4"
+name = "mach2"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b27834086c65ec3f9387b096d66e99f221cf081c2b738042aa252bcd41204e3"
+checksum = "6a1b95cd5421ec55b445b5ae102f5ea0e768de1f82bd3001e11f426c269c3aea"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
+ "libc",
 ]
 
 [[package]]
@@ -3307,54 +4353,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "manganis"
-version = "0.7.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bfcf56309de35b48b8780ea097ace5c3b773a617b52edc49dfc9a63a7d9dc43"
-dependencies = [
- "const-serialize 0.7.2",
- "const-serialize 0.8.0-alpha.0",
- "jni 0.21.1",
- "manganis-core",
- "manganis-macro",
- "ndk-context",
- "objc2",
- "thiserror 2.0.18",
-]
-
-[[package]]
-name = "manganis-core"
-version = "0.7.9"
+name = "markdown"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a24d6be68f594495aea60850a284029d585d7b7839b26096c1b6d758f8518648"
+checksum = "a5cab8f2cadc416a82d2e783a1946388b31654d391d1c7d92cc1f03e295b1deb"
 dependencies = [
- "const-serialize 0.7.2",
- "const-serialize 0.8.0-alpha.0",
- "dioxus-cli-config",
- "dioxus-core-types",
  "serde",
- "winnow 0.7.14",
-]
-
-[[package]]
-name = "manganis-macro"
-version = "0.7.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e782a10318d707c0833e31876ded8acf91287eee0010af8392559af614c7226"
-dependencies = [
- "dunce",
- "macro-string",
- "manganis-core",
- "proc-macro2",
- "quote",
- "syn 2.0.117",
+ "unicode-id",
 ]
 
 [[package]]
 name = "markup5ever"
-version = "0.14.1"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7a7213d12e1864c0f002f52c2923d4556935a43dec5e71355c2760e0f6e7a18"
+checksum = "16ce3abbeba692c8b8441d036ef91aea6df8da2c6b6e21c7e14d3c18e526be45"
 dependencies = [
  "log",
  "phf 0.11.3",
@@ -3377,50 +4389,46 @@ dependencies = [
 
 [[package]]
 name = "markup5ever_rcdom"
-version = "0.39.0+unofficial"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ac010f19d6c4af81eeb4018a39d7a115de9d285af45c126a4ac02e6fc5716b7"
+checksum = "edaa21ab3701bfee5099ade5f7e1f84553fd19228cf332f13cd6e964bf59be18"
 dependencies = [
- "html5ever 0.39.0",
- "markup5ever 0.39.0",
- "tendril 0.5.0",
- "xml5ever",
+ "html5ever 0.27.0",
+ "markup5ever 0.12.1",
+ "tendril 0.4.3",
+ "xml5ever 0.18.1",
 ]
 
 [[package]]
-name = "match_token"
-version = "0.1.0"
+name = "markup5ever_rcdom"
+version = "0.39.0+unofficial"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88a9689d8d44bf9964484516275f5cd4c9b59457a6940c1d5d0ecbb94510a36b"
+checksum = "3ac010f19d6c4af81eeb4018a39d7a115de9d285af45c126a4ac02e6fc5716b7"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
+ "html5ever 0.39.0",
+ "markup5ever 0.39.0",
+ "tendril 0.5.0",
+ "xml5ever 0.39.0",
 ]
 
 [[package]]
-name = "matchers"
-version = "0.2.0"
+name = "maybe-rayon"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
+checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519"
 dependencies = [
- "regex-automata",
+ "cfg-if",
+ "rayon",
 ]
 
 [[package]]
-name = "matches"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
-
-[[package]]
-name = "maybe-rayon"
-version = "0.1.1"
+name = "md-5"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519"
+checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
 dependencies = [
  "cfg-if",
- "rayon",
+ "digest 0.10.7",
 ]
 
 [[package]]
@@ -3429,15 +4437,6 @@ version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
 
-[[package]]
-name = "memfd"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad38eb12aea514a0466ea40a80fd8cc83637065948eb4a426e4aa46261175227"
-dependencies = [
- "rustix 1.1.4",
-]
-
 [[package]]
 name = "memmap2"
 version = "0.9.10"
@@ -3456,6 +4455,37 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "metal"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7047791b5bc903b8cd963014b355f71dc9864a9a0b727057676c1dcae5cbc15"
+dependencies = [
+ "bitflags 2.13.2",
+ "block",
+ "core-graphics-types 0.2.0",
+ "foreign-types",
+ "log",
+ "objc",
+ "paste",
+]
+
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
+[[package]]
+name = "mime_guess"
+version = "2.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
+dependencies = [
+ "mime",
+ "unicase",
+]
+
 [[package]]
 name = "minimal-lexical"
 version = "0.2.1"
@@ -3501,7 +4531,7 @@ checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc"
 dependencies = [
  "libc",
  "log",
- "wasi 0.11.1+wasi-snapshot-preview1",
+ "wasi",
  "windows-sys 0.61.2",
 ]
 
@@ -3516,24 +4546,29 @@ dependencies = [
 ]
 
 [[package]]
-name = "muda"
-version = "0.17.2"
+name = "naga"
+version = "29.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c9fec5a4e89860383d778d10563a605838f8f0b2f9303868937e5ff32e86177"
+checksum = "b2bf919621e7975acb27d881bae2fb993e0d45c8e0446e85e6272971e00dc8df"
 dependencies = [
- "crossbeam-channel",
- "dpi",
- "gtk",
- "keyboard-types",
- "libxdo",
- "objc2",
- "objc2-app-kit",
- "objc2-core-foundation",
- "objc2-foundation",
+ "arrayvec",
+ "bit-set 0.9.1",
+ "bitflags 2.13.2",
+ "cfg-if",
+ "cfg_aliases",
+ "codespan-reporting",
+ "half",
+ "hashbrown 0.16.1",
+ "hexf-parse",
+ "indexmap",
+ "libm",
+ "log",
+ "num-traits",
  "once_cell",
- "png 0.17.16",
+ "rustc-hash 1.1.0",
+ "spirv",
  "thiserror 2.0.18",
- "windows-sys 0.60.2",
+ "unicode-ident",
 ]
 
 [[package]]
@@ -3545,35 +4580,17 @@ dependencies = [
  "log",
 ]
 
-[[package]]
-name = "native-tls"
-version = "0.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "465500e14ea162429d264d44189adc38b199b62b1c21eea9f69e4b73cb03bbf2"
-dependencies = [
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
-]
-
 [[package]]
 name = "ndk"
 version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.2",
  "jni-sys 0.3.1",
  "log",
  "ndk-sys",
  "num_enum",
- "raw-window-handle 0.6.2",
  "thiserror 1.0.69",
 ]
 
@@ -3608,10 +4625,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "nodrop"
-version = "0.1.14"
+name = "nohash-hasher"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
+checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
 
 [[package]]
 name = "nom"
@@ -3638,13 +4655,22 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8"
 
+[[package]]
+name = "normpath"
+version = "1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b11ce00d2594068e8a27c9146fdc5cf9f3ac38eb42c7cd34d05fea618873ac9f"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "notify"
 version = "7.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c533b4c39709f9ba5005d8002048266593c1cfaf3c5f0739d5b8ab0c6c504009"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.2",
  "filetime",
  "fsevent-sys",
  "inotify",
@@ -3657,6 +4683,20 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "notify-rust"
+version = "4.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5b4c1b4f2aa9f25f63a7a49d3dd0ed567b3670da15330a66b29434be899b891"
+dependencies = [
+ "futures-lite",
+ "log",
+ "mac-notification-sys",
+ "serde",
+ "tauri-winrt-notification",
+ "zbus",
+]
+
 [[package]]
 name = "notify-types"
 version = "1.0.1"
@@ -3666,6 +4706,38 @@ dependencies = [
  "instant",
 ]
 
+[[package]]
+name = "ntapi"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3b335231dfd352ffb0f8017f3b6027a4917f7df785ea2143d8af2adc66980ae"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "nu-ansi-term"
+version = "0.50.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "num"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
+dependencies = [
+ "num-bigint",
+ "num-complex",
+ "num-integer",
+ "num-iter",
+ "num-rational",
+ "num-traits",
+]
+
 [[package]]
 name = "num-bigint"
 version = "0.4.6"
@@ -3676,6 +4748,23 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "num-bigint-dig"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7f9a86e097b0d187ad0e65667c2f58b9254671e86e7dbb78036b16692eae099"
+dependencies = [
+ "libm",
+ "num-integer",
+ "num-iter",
+ "num-traits",
+ "once_cell",
+ "rand 0.9.2",
+ "serde",
+ "smallvec",
+ "zeroize",
+]
+
 [[package]]
 name = "num-complex"
 version = "0.4.6"
@@ -3711,6 +4800,16 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "num-iter"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c92800bd69a1eac91786bcfe9da64a897eb72911b8dc3095decbd07429e8048b"
+dependencies = [
+ "num-integer",
+ "num-traits",
+]
+
 [[package]]
 name = "num-rational"
 version = "0.4.2"
@@ -3729,6 +4828,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
+ "libm",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b"
+dependencies = [
+ "hermit-abi",
+ "libc",
 ]
 
 [[package]]
@@ -3747,28 +4857,47 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "680998035259dcfcafe653688bf2aa6d3e2dc05e98be6ab46afb089dc84f1df8"
 dependencies = [
- "proc-macro-crate 3.5.0",
+ "proc-macro-crate",
  "proc-macro2",
  "quote",
  "syn 2.0.117",
 ]
 
 [[package]]
-name = "num_threads"
-version = "0.1.7"
+name = "objc"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
+checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
 dependencies = [
- "libc",
+ "malloc_buf",
+ "objc_exception",
 ]
 
 [[package]]
-name = "objc"
-version = "0.2.7"
+name = "objc-foundation"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
+checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
 dependencies = [
- "malloc_buf",
+ "block",
+ "objc",
+ "objc_id",
+]
+
+[[package]]
+name = "objc-sys"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"
+
+[[package]]
+name = "objc2"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"
+dependencies = [
+ "objc-sys",
+ "objc2-encode",
 ]
 
 [[package]]
@@ -3778,7 +4907,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3a12a8ed07aefc768292f076dc3ac8c48f3781c8f2d5851dd3d98950e8c5a89f"
 dependencies = [
  "objc2-encode",
- "objc2-exception-helper",
+]
+
+[[package]]
+name = "objc2-app-kit"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
+dependencies = [
+ "bitflags 2.13.2",
+ "block2 0.5.1",
+ "libc",
+ "objc2 0.5.2",
+ "objc2-core-data 0.2.2",
+ "objc2-core-image 0.2.2",
+ "objc2-foundation 0.2.2",
+ "objc2-quartz-core 0.2.2",
 ]
 
 [[package]]
@@ -3787,11 +4931,19 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
 dependencies = [
- "bitflags 2.11.0",
- "block2",
- "objc2",
+ "bitflags 2.13.2",
+ "block2 0.6.2",
+ "libc",
+ "objc2 0.6.4",
+ "objc2-cloud-kit",
+ "objc2-core-data 0.3.2",
  "objc2-core-foundation",
- "objc2-foundation",
+ "objc2-core-graphics",
+ "objc2-core-image 0.3.2",
+ "objc2-core-text",
+ "objc2-core-video",
+ "objc2-foundation 0.3.2",
+ "objc2-quartz-core 0.3.2",
 ]
 
 [[package]]
@@ -3800,13 +4952,13 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6948501a91121d6399b79abaa33a8aa4ea7857fe019f341b8c23ad6e81b79b08"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.2",
  "libc",
- "objc2",
+ "objc2 0.6.4",
  "objc2-core-audio",
  "objc2-core-audio-types",
  "objc2-core-foundation",
- "objc2-foundation",
+ "objc2-foundation 0.3.2",
 ]
 
 [[package]]
@@ -3815,8 +4967,19 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13a380031deed8e99db00065c45937da434ca987c034e13b87e4441f9e4090be"
 dependencies = [
- "objc2",
- "objc2-foundation",
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
+]
+
+[[package]]
+name = "objc2-cloud-kit"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c"
+dependencies = [
+ "bitflags 2.13.2",
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
 ]
 
 [[package]]
@@ -3826,10 +4989,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1eebcea8b0dbff5f7c8504f3107c68fc061a3eb44932051c8cf8a68d969c3b2"
 dependencies = [
  "dispatch2",
- "objc2",
+ "objc2 0.6.4",
  "objc2-core-audio-types",
  "objc2-core-foundation",
- "objc2-foundation",
+ "objc2-foundation 0.3.2",
 ]
 
 [[package]]
@@ -3838,8 +5001,31 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a89f2ec274a0cf4a32642b2991e8b351a404d290da87bb6a9a9d8632490bd1c"
 dependencies = [
- "bitflags 2.11.0",
- "objc2",
+ "bitflags 2.13.2",
+ "objc2 0.6.4",
+]
+
+[[package]]
+name = "objc2-core-data"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
+dependencies = [
+ "bitflags 2.13.2",
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
+]
+
+[[package]]
+name = "objc2-core-data"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa"
+dependencies = [
+ "bitflags 2.13.2",
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
 ]
 
 [[package]]
@@ -3848,11 +5034,11 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
 dependencies = [
- "bitflags 2.11.0",
- "block2",
+ "bitflags 2.13.2",
+ "block2 0.6.2",
  "dispatch2",
  "libc",
- "objc2",
+ "objc2 0.6.4",
 ]
 
 [[package]]
@@ -3861,8 +5047,83 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.2",
+ "dispatch2",
+ "objc2 0.6.4",
+ "objc2-core-foundation",
+ "objc2-io-surface",
+]
+
+[[package]]
+name = "objc2-core-image"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"
+dependencies = [
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
+ "objc2-metal 0.2.2",
+]
+
+[[package]]
+name = "objc2-core-image"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5d563b38d2b97209f8e861173de434bd0214cf020e3423a52624cd1d989f006"
+dependencies = [
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
+]
+
+[[package]]
+name = "objc2-core-location"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca347214e24bc973fc025fd0d36ebb179ff30536ed1f80252706db19ee452009"
+dependencies = [
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
+]
+
+[[package]]
+name = "objc2-core-media"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05ec576860167a15dd9fce7fbee7512beb4e31f532159d3482d1f9c6caedf31d"
+dependencies = [
+ "bitflags 2.13.2",
+ "dispatch2",
+ "objc2 0.6.4",
+ "objc2-core-audio",
+ "objc2-core-audio-types",
+ "objc2-core-foundation",
+ "objc2-core-video",
+]
+
+[[package]]
+name = "objc2-core-text"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d"
+dependencies = [
+ "bitflags 2.13.2",
+ "objc2 0.6.4",
  "objc2-core-foundation",
+ "objc2-core-graphics",
+]
+
+[[package]]
+name = "objc2-core-video"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d425caf1df73233f29fd8a5c3e5edbc30d2d4307870f802d18f00d83dc5141a6"
+dependencies = [
+ "bitflags 2.13.2",
+ "objc2 0.6.4",
+ "objc2-core-foundation",
+ "objc2-core-graphics",
+ "objc2-io-surface",
 ]
 
 [[package]]
@@ -3872,12 +5133,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33"
 
 [[package]]
-name = "objc2-exception-helper"
-version = "0.1.1"
+name = "objc2-foundation"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7a1c5fbb72d7735b076bb47b578523aedc40f3c439bea6dfd595c089d79d98a"
+checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
 dependencies = [
- "cc",
+ "bitflags 2.13.2",
+ "block2 0.5.1",
+ "libc",
+ "objc2 0.5.2",
 ]
 
 [[package]]
@@ -3886,37 +5150,108 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
 dependencies = [
- "bitflags 2.11.0",
- "block2",
+ "bitflags 2.13.2",
+ "block2 0.6.2",
  "libc",
- "objc2",
+ "objc2 0.6.4",
  "objc2-core-foundation",
 ]
 
 [[package]]
-name = "objc2-ui-kit"
+name = "objc2-io-surface"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
+checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
 dependencies = [
- "bitflags 2.11.0",
- "objc2",
+ "bitflags 2.13.2",
+ "objc2 0.6.4",
  "objc2-core-foundation",
- "objc2-foundation",
 ]
 
 [[package]]
-name = "objc2-web-kit"
+name = "objc2-metal"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
+dependencies = [
+ "bitflags 2.13.2",
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
+]
+
+[[package]]
+name = "objc2-metal"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0125f776a10d00af4152d74616409f0d4a2053a6f57fa5b7d6aa2854ac04794"
+dependencies = [
+ "bitflags 2.13.2",
+ "block2 0.6.2",
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
+]
+
+[[package]]
+name = "objc2-quartz-core"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
+dependencies = [
+ "bitflags 2.13.2",
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
+ "objc2-metal 0.2.2",
+]
+
+[[package]]
+name = "objc2-quartz-core"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2e5aaab980c433cf470df9d7af96a7b46a9d892d521a2cbbb2f8a4c16751e7f"
+checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
 dependencies = [
- "bitflags 2.11.0",
- "block2",
- "objc2",
- "objc2-app-kit",
+ "bitflags 2.13.2",
+ "objc2 0.6.4",
  "objc2-core-foundation",
- "objc2-foundation",
+ "objc2-foundation 0.3.2",
+ "objc2-metal 0.3.2",
+]
+
+[[package]]
+name = "objc2-screen-capture-kit"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74b7c5390f477482f001bc354d6571a70db7e4f8d5288e860c45521fbce11394"
+dependencies = [
+ "block2 0.6.2",
+ "dispatch2",
+ "objc2 0.6.4",
+ "objc2-core-graphics",
+ "objc2-core-media",
+ "objc2-foundation 0.3.2",
+]
+
+[[package]]
+name = "objc2-user-notifications"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9df9128cbbfef73cda168416ccf7f837b62737d748333bfe9ab71c245d76613e"
+dependencies = [
+ "bitflags 2.13.2",
+ "block2 0.6.2",
+ "objc2 0.6.4",
+ "objc2-core-location",
+ "objc2-foundation 0.3.2",
+]
+
+[[package]]
+name = "objc_exception"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4"
+dependencies = [
+ "cc",
 ]
 
 [[package]]
@@ -3928,6 +5263,15 @@ dependencies = [
  "objc",
 ]
 
+[[package]]
+name = "object"
+version = "0.37.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.21.3"
@@ -3940,6 +5284,51 @@ version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
 
+[[package]]
+name = "oo7"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78f2bfed90f1618b4b48dcad9307f25e14ae894e2949642c87c351601d62cebd"
+dependencies = [
+ "aes",
+ "ashpd",
+ "async-fs",
+ "async-io",
+ "async-lock",
+ "blocking",
+ "cbc",
+ "cipher",
+ "digest 0.10.7",
+ "endi",
+ "futures-lite",
+ "futures-util",
+ "getrandom 0.4.2",
+ "hkdf",
+ "hmac",
+ "md-5",
+ "num",
+ "num-bigint-dig",
+ "pbkdf2",
+ "serde",
+ "serde_bytes",
+ "sha2 0.10.9",
+ "subtle",
+ "zbus",
+ "zbus_macros",
+ "zeroize",
+ "zvariant",
+]
+
+[[package]]
+name = "open"
+version = "5.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa576c76302b7b808eecc68061e67336c47833ef9d22caa74dda10fa9675eebc"
+dependencies = [
+ "is-wsl",
+ "libc",
+]
+
 [[package]]
 name = "openh264"
 version = "0.6.6"
@@ -3961,31 +5350,6 @@ dependencies = [
  "walkdir",
 ]
 
-[[package]]
-name = "openssl"
-version = "0.10.80"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a45fa2aa886c42762255da344f0a0d313e254066c46aad76f300c3d3da62d967"
-dependencies = [
- "bitflags 2.11.0",
- "cfg-if",
- "foreign-types 0.3.2",
- "libc",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
-]
-
 [[package]]
 name = "openssl-probe"
 version = "0.2.1"
@@ -3993,22 +5357,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
 
 [[package]]
-name = "openssl-sys"
-version = "0.9.116"
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[package]]
+name = "ordered-float"
+version = "5.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f28a22dc7140cda5f096e5e7724a6962ca81a7f8bfd2979f9b18c11af56318c4"
+checksum = "8c7c9e0d9b23589f26070720bac724174bfec1083e82f7854cdd0267518343c0"
 dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
+ "num-traits",
 ]
 
 [[package]]
-name = "option-ext"
+name = "ordered-stream"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+]
 
 [[package]]
 name = "palette"
@@ -4019,7 +5390,6 @@ dependencies = [
  "approx",
  "fast-srgb8",
  "palette_derive",
- "phf 0.11.3",
 ]
 
 [[package]]
@@ -4035,29 +5405,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "pango"
-version = "0.18.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4"
-dependencies = [
- "gio",
- "glib",
- "libc",
- "once_cell",
- "pango-sys",
-]
-
-[[package]]
-name = "pango-sys"
-version = "0.18.0"
+name = "parking"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
-]
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
 
 [[package]]
 name = "parking_lot"
@@ -4095,38 +5446,46 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "35fb2e5f958ec131621fdd531e9fc186ed768cbe395337403ae56c17a74c68ec"
 
 [[package]]
-name = "percent-encoding"
-version = "2.3.2"
+name = "pathfinder_geometry"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
+checksum = "0b7b7e7b4ea703700ce73ebf128e1450eb69c3a8329199ffbfb9b2a0418e5ad3"
+dependencies = [
+ "log",
+ "pathfinder_simd",
+]
 
 [[package]]
-name = "phf"
-version = "0.8.0"
+name = "pathfinder_simd"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
+checksum = "4500030c302e4af1d423f36f3b958d1aecb6c04184356ed5a833bf6b60435777"
 dependencies = [
- "phf_shared 0.8.0",
+ "rustc_version",
 ]
 
 [[package]]
-name = "phf"
-version = "0.10.1"
+name = "pbkdf2"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
+checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
 dependencies = [
- "phf_macros 0.10.0",
- "phf_shared 0.10.0",
- "proc-macro-hack",
+ "digest 0.10.7",
+ "hmac",
 ]
 
+[[package]]
+name = "percent-encoding"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
+
 [[package]]
 name = "phf"
 version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
 dependencies = [
- "phf_macros 0.11.3",
  "phf_shared 0.11.3",
 ]
 
@@ -4136,20 +5495,11 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf"
 dependencies = [
+ "phf_macros",
  "phf_shared 0.13.1",
  "serde",
 ]
 
-[[package]]
-name = "phf_codegen"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
-dependencies = [
- "phf_generator 0.8.0",
- "phf_shared 0.8.0",
-]
-
 [[package]]
 name = "phf_codegen"
 version = "0.11.3"
@@ -4165,94 +5515,42 @@ name = "phf_codegen"
 version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49aa7f9d80421bca176ca8dbfebe668cc7a2684708594ec9f3c0db0805d5d6e1"
-dependencies = [
- "phf_generator 0.13.1",
- "phf_shared 0.13.1",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
-dependencies = [
- "phf_shared 0.8.0",
- "rand 0.7.3",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
-dependencies = [
- "phf_shared 0.10.0",
- "rand 0.8.6",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
-dependencies = [
- "phf_shared 0.11.3",
- "rand 0.8.6",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737"
-dependencies = [
- "fastrand",
- "phf_shared 0.13.1",
-]
-
-[[package]]
-name = "phf_macros"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0"
-dependencies = [
- "phf_generator 0.10.0",
- "phf_shared 0.10.0",
- "proc-macro-hack",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
+dependencies = [
+ "phf_generator 0.13.1",
+ "phf_shared 0.13.1",
 ]
 
 [[package]]
-name = "phf_macros"
+name = "phf_generator"
 version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216"
+checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
 dependencies = [
- "phf_generator 0.11.3",
  "phf_shared 0.11.3",
- "proc-macro2",
- "quote",
- "syn 2.0.117",
+ "rand 0.8.6",
 ]
 
 [[package]]
-name = "phf_shared"
-version = "0.8.0"
+name = "phf_generator"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
+checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737"
 dependencies = [
- "siphasher 0.3.11",
+ "fastrand",
+ "phf_shared 0.13.1",
 ]
 
 [[package]]
-name = "phf_shared"
-version = "0.10.0"
+name = "phf_macros"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
+checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef"
 dependencies = [
- "siphasher 0.3.11",
+ "phf_generator 0.13.1",
+ "phf_shared 0.13.1",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -4261,7 +5559,7 @@ version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
 dependencies = [
- "siphasher 1.0.2",
+ "siphasher",
 ]
 
 [[package]]
@@ -4270,7 +5568,7 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266"
 dependencies = [
- "siphasher 1.0.2",
+ "siphasher",
 ]
 
 [[package]]
@@ -4305,6 +5603,17 @@ version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
 
+[[package]]
+name = "piper"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c835479a4443ded371d6c535cbfd8d31ad92c5d23ae9770a61bc155e4992a3c1"
+dependencies = [
+ "atomic-waker",
+ "fastrand",
+ "futures-io",
+]
+
 [[package]]
 name = "pkg-config"
 version = "0.3.32"
@@ -4349,19 +5658,80 @@ version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.2",
  "crc32fast",
  "fdeflate",
  "flate2",
  "miniz_oxide",
 ]
 
+[[package]]
+name = "polling"
+version = "3.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "hermit-abi",
+ "pin-project-lite",
+ "rustix 1.1.4",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "pollster"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5da3b0203fd7ee5720aa0b5e790b591aa5d3f41c3ed2c34a3a393382198af2f7"
+
 [[package]]
 name = "pollster"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2f3a9f18d041e6d0e102a0a46750538147e5e8992d3b4873aaafee2520b00ce3"
 
+[[package]]
+name = "polycool"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50596ddc09eb5ad5f75cacd40209568e66df71baf86e1499a0e99c4cff12a5a6"
+dependencies = [
+ "arrayvec",
+]
+
+[[package]]
+name = "portable-atomic"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05c8b63e8d9609db387f0324918f81d68fe27748f084ef092fb35954d0539a85"
+
+[[package]]
+name = "portable-atomic-util"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10ab3eb7f3becc3a1cbc4f2c6f20267996cfc1a6467a873763411b136a122715"
+dependencies = [
+ "portable-atomic",
+]
+
+[[package]]
+name = "postage"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af3fb618632874fb76937c2361a7f22afd393c982a2165595407edc75b06d3c1"
+dependencies = [
+ "atomic",
+ "crossbeam-queue",
+ "futures",
+ "log",
+ "parking_lot",
+ "pin-project",
+ "pollster 0.2.5",
+ "static_assertions",
+ "thiserror 1.0.69",
+]
+
 [[package]]
 name = "potential_utf"
 version = "0.1.4"
@@ -4392,6 +5762,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 
+[[package]]
+name = "presser"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa"
+
 [[package]]
 name = "prettyplease"
 version = "0.2.37"
@@ -4411,26 +5787,6 @@ dependencies = [
  "num-integer",
 ]
 
-[[package]]
-name = "proc-macro-crate"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
-dependencies = [
- "once_cell",
- "toml_edit 0.19.15",
-]
-
-[[package]]
-name = "proc-macro-crate"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24"
-dependencies = [
- "toml_datetime 0.6.3",
- "toml_edit 0.20.2",
-]
-
 [[package]]
 name = "proc-macro-crate"
 version = "3.5.0"
@@ -4440,36 +5796,6 @@ dependencies = [
  "toml_edit 0.25.8+spec-1.1.0",
 ]
 
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.20+deprecated"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.106"
@@ -4479,18 +5805,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "proc-macro2-diagnostics"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
- "version_check",
-]
-
 [[package]]
 name = "profiling"
 version = "1.0.18"
@@ -4558,6 +5872,71 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "quick-xml"
+version = "0.41.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e660451e55124f798a69a5af3f49ccfbefbd41910eefd25caf2393e1f3473ec1"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "quinn"
+version = "0.11.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4051e23e9185c255a7e33ef59cdbca87a22d359052eecd22fc6b901fb37d9d11"
+dependencies = [
+ "bytes",
+ "cfg_aliases",
+ "pin-project-lite",
+ "quinn-proto",
+ "quinn-udp",
+ "rustc-hash 2.1.1",
+ "rustls",
+ "socket2",
+ "thiserror 2.0.18",
+ "tokio",
+ "tracing",
+ "web-time",
+]
+
+[[package]]
+name = "quinn-proto"
+version = "0.11.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9746dbde176634f4f2f1faf2404e30a31b2bc1e9cafb5329c95d8177a18c9fc"
+dependencies = [
+ "bytes",
+ "getrandom 0.4.2",
+ "lru-slab",
+ "rand 0.10.3",
+ "rand_pcg",
+ "ring",
+ "rustc-hash 2.1.1",
+ "rustls",
+ "rustls-pki-types",
+ "slab",
+ "thiserror 2.0.18",
+ "tinyvec",
+ "tracing",
+ "web-time",
+]
+
+[[package]]
+name = "quinn-udp"
+version = "0.5.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35a133f956daabe89a61a685c2649f13d82d5aa4bd5d12d1277e1072a21c0694"
+dependencies = [
+ "cfg_aliases",
+ "libc",
+ "once_cell",
+ "socket2",
+ "tracing",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "quote"
 version = "1.0.44"
@@ -4579,20 +5958,6 @@ version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
 
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc",
- "rand_pcg",
-]
-
 [[package]]
 name = "rand"
 version = "0.8.6"
@@ -4615,13 +5980,14 @@ dependencies = [
 ]
 
 [[package]]
-name = "rand_chacha"
-version = "0.2.2"
+name = "rand"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
+checksum = "65c9fb96cbc91e3478eaae79a69fcd3f1ae4ad052e471fe6732fff548984b4af"
 dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
+ "chacha20",
+ "getrandom 0.4.2",
+ "rand_core 0.10.1",
 ]
 
 [[package]]
@@ -4644,15 +6010,6 @@ dependencies = [
  "rand_core 0.9.5",
 ]
 
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
-]
-
 [[package]]
 name = "rand_core"
 version = "0.6.4"
@@ -4672,23 +6029,26 @@ dependencies = [
 ]
 
 [[package]]
-name = "rand_hc"
-version = "0.2.0"
+name = "rand_core"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
-]
+checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
 
 [[package]]
 name = "rand_pcg"
-version = "0.2.1"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
+checksum = "caa0f4137e1c0a72f4c651489402276c8e8e1cf081f3b0ba156d2cbeef09e86a"
 dependencies = [
- "rand_core 0.5.1",
+ "rand_core 0.10.1",
 ]
 
+[[package]]
+name = "range-alloc"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca45419789ae5a7899559e9512e58ca889e41f04f1f2445e9f4b290ceccd1d08"
+
 [[package]]
 name = "rangemap"
 version = "1.7.1"
@@ -4701,7 +6061,7 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eabd94c2f37801c20583fc49dd5cd6b0ba68c716787c2dd6ed18571e1e63117b"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.2",
  "cassowary",
  "compact_str",
  "crossterm",
@@ -4710,7 +6070,7 @@ dependencies = [
  "itertools 0.13.0",
  "lru",
  "paste",
- "strum",
+ "strum 0.26.3",
  "unicode-segmentation",
  "unicode-truncate",
  "unicode-width 0.2.0",
@@ -4768,15 +6128,21 @@ dependencies = [
 
 [[package]]
 name = "raw-window-handle"
-version = "0.5.2"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
+checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
 
 [[package]]
-name = "raw-window-handle"
-version = "0.6.2"
+name = "raw-window-metal"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
+checksum = "40d213455a5f1dc59214213c7330e074ddf8114c9a42411eb890c767357ce135"
+dependencies = [
+ "objc2 0.6.4",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.2",
+ "objc2-quartz-core 0.3.2",
+]
 
 [[package]]
 name = "rayon"
@@ -4824,7 +6190,7 @@ version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.2",
 ]
 
 [[package]]
@@ -4833,7 +6199,18 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ce70a74e890531977d37e532c34d45e9055d2409ed08ddba14529471ed0be16"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.2",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
+dependencies = [
+ "getrandom 0.2.17",
+ "libredox",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -4847,6 +6224,26 @@ dependencies = [
  "thiserror 2.0.18",
 ]
 
+[[package]]
+name = "ref-cast"
+version = "1.0.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e440fb4e4b4147295338efb76001ab9e4efc0e5839df2c47fc5ac2381d365c3"
+dependencies = [
+ "ref-cast-impl",
+]
+
+[[package]]
+name = "ref-cast-impl"
+version = "1.0.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92ecd8964f8453721699a1ed72037b0db49ce2f5a5138486ee89bed6f67cdf3a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.6",
+]
+
 [[package]]
 name = "regex"
 version = "1.12.3"
@@ -4876,41 +6273,81 @@ version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
 
+[[package]]
+name = "renderdoc-sys"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
+
+[[package]]
+name = "resvg"
+version = "0.44.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a325d5e8d1cebddd070b13f44cec8071594ab67d1012797c121f27a669b7958"
+dependencies = [
+ "gif 0.13.3",
+ "image-webp 0.1.3",
+ "log",
+ "pico-args",
+ "rgb",
+ "svgtypes 0.15.3",
+ "tiny-skia",
+ "usvg 0.44.0",
+ "zune-jpeg 0.4.21",
+]
+
 [[package]]
 name = "resvg"
-version = "0.44.0"
+version = "0.45.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a325d5e8d1cebddd070b13f44cec8071594ab67d1012797c121f27a669b7958"
+checksum = "a8928798c0a55e03c9ca6c4c6846f76377427d2c1e1f7e6de3c06ae57942df43"
 dependencies = [
  "gif 0.13.3",
- "image-webp 0.1.3",
+ "image-webp 0.2.4",
  "log",
  "pico-args",
  "rgb",
- "svgtypes",
+ "svgtypes 0.15.3",
  "tiny-skia",
- "usvg",
+ "usvg 0.45.1",
  "zune-jpeg 0.4.21",
 ]
 
+[[package]]
+name = "resvg"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b563218631706d614e23059436526d005b50ab5f2d506b55a17eb65c5eb83419"
+dependencies = [
+ "gif 0.14.2",
+ "image-webp 0.2.4",
+ "log",
+ "pico-args",
+ "rgb",
+ "svgtypes 0.16.1",
+ "tiny-skia",
+ "usvg 0.46.0",
+ "zune-jpeg 0.5.12",
+]
+
 [[package]]
 name = "rfd"
 version = "0.17.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "20dafead71c16a34e1ff357ddefc8afc11e7d51d6d2b9fbd07eaa48e3e540220"
 dependencies = [
- "block2",
+ "block2 0.6.2",
  "dispatch2",
  "js-sys",
  "libc",
  "log",
- "objc2",
- "objc2-app-kit",
+ "objc2 0.6.4",
+ "objc2-app-kit 0.3.2",
  "objc2-core-foundation",
- "objc2-foundation",
+ "objc2-foundation 0.3.2",
  "percent-encoding",
- "pollster",
- "raw-window-handle 0.6.2",
+ "pollster 0.4.0",
+ "raw-window-handle",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wayland-backend",
@@ -4955,12 +6392,30 @@ dependencies = [
  "thiserror 2.0.18",
 ]
 
+[[package]]
+name = "ropey"
+version = "2.0.0-beta.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4045a00dc327d084a2bbf126976e14125b54f23bd30511d45b842eba76c52d74"
+dependencies = [
+ "str_indices",
+]
+
 [[package]]
 name = "roxmltree"
 version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97"
 
+[[package]]
+name = "roxmltree"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1964b10c76125c36f8afe190065a4bf9a87bf324842c05701330bba9f1cacbb"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "rubato"
 version = "0.16.2"
@@ -4973,6 +6428,96 @@ dependencies = [
  "realfft",
 ]
 
+[[package]]
+name = "rust-embed"
+version = "8.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9e7760e252aaba7b09f4be00e36476cf585bdb68a53552ac954cdf504ab4bc9"
+dependencies = [
+ "rust-embed-impl",
+ "rust-embed-utils",
+ "walkdir",
+]
+
+[[package]]
+name = "rust-embed-impl"
+version = "8.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3bcfc4d6f53af43755f7a723e4b6b8794fcce052a178dd8c6c1dadc5f5343097"
+dependencies = [
+ "mime_guess",
+ "proc-macro2",
+ "quote",
+ "rust-embed-utils",
+ "shellexpand",
+ "syn 2.0.117",
+ "walkdir",
+]
+
+[[package]]
+name = "rust-embed-utils"
+version = "8.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42ffa149f6aa81b58a5b3011d01a857c4ed12c7a732d2c51947a4c7c692185f0"
+dependencies = [
+ "globset",
+ "sha2 0.11.0",
+ "walkdir",
+]
+
+[[package]]
+name = "rust-i18n"
+version = "4.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c43fd69c20da13756643a5bf51ae799965465c78e05c57a1242a736aaa56527"
+dependencies = [
+ "globwalk",
+ "regex",
+ "rust-i18n-macro",
+ "rust-i18n-support",
+ "smallvec",
+]
+
+[[package]]
+name = "rust-i18n-macro"
+version = "4.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "086ec8a9eaa6afda33919b9bc1661c1f4e017c40e99bbd33ca98f6e1cb6ca91f"
+dependencies = [
+ "glob",
+ "proc-macro2",
+ "quote",
+ "rust-i18n-support",
+ "serde",
+ "serde_json",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "rust-i18n-support"
+version = "4.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac02dcb9a01ec145d0a5534ea9554a966050ca250b346bb2a9ab0fcdafab5979"
+dependencies = [
+ "arc-swap",
+ "base62",
+ "globwalk",
+ "itertools 0.11.0",
+ "normpath",
+ "serde",
+ "serde-saphyr",
+ "serde_json",
+ "siphasher",
+ "toml 0.8.23",
+ "triomphe",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b74b56ffa8bb2830709a538c2cbcae9aa062db0d2a42563bfb09bdaae44020eb"
+
 [[package]]
 name = "rustc-hash"
 version = "1.1.0"
@@ -5014,7 +6559,7 @@ version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.2",
  "errno",
  "libc",
  "linux-raw-sys 0.4.15",
@@ -5027,7 +6572,7 @@ version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.2",
  "errno",
  "libc",
  "linux-raw-sys 0.12.1",
@@ -5049,12 +6594,34 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "rustls-native-certs"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dab5152771c58876a2146916e53e35057e1a4dfa2b9df0f0305b07f611fdea4d"
+dependencies = [
+ "openssl-probe",
+ "rustls-pki-types",
+ "schannel",
+ "security-framework",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
+dependencies = [
+ "rustls-pki-types",
+]
+
 [[package]]
 name = "rustls-pki-types"
 version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd"
 dependencies = [
+ "web-time",
  "zeroize",
 ]
 
@@ -5076,7 +6643,7 @@ dependencies = [
  "clap",
  "clap_complete",
  "crossterm",
- "dirs",
+ "dirs 6.0.0",
  "gif 0.13.3",
  "image",
  "minimp4",
@@ -5084,13 +6651,13 @@ dependencies = [
  "openh264",
  "ratatui",
  "rayon",
- "resvg",
+ "resvg 0.44.0",
  "rubato",
  "rustfft",
  "rustmotion-components",
  "rustmotion-core",
  "rustmotion-html",
- "schemars",
+ "schemars 0.8.22",
  "serde",
  "serde_json",
  "similar",
@@ -5099,7 +6666,7 @@ dependencies = [
  "syntect",
  "tiny-skia",
  "ureq",
- "usvg",
+ "usvg 0.44.0",
 ]
 
 [[package]]
@@ -5110,9 +6677,9 @@ dependencies = [
  "gif 0.13.3",
  "image",
  "qrcode",
- "resvg",
+ "resvg 0.44.0",
  "rustmotion-core",
- "schemars",
+ "schemars 0.8.22",
  "serde",
  "serde_json",
  "similar",
@@ -5120,7 +6687,7 @@ dependencies = [
  "syntect",
  "thorvg",
  "tiny-skia",
- "usvg",
+ "usvg 0.44.0",
 ]
 
 [[package]]
@@ -5133,18 +6700,18 @@ dependencies = [
  "notify",
  "qrcode",
  "rayon",
- "resvg",
- "schemars",
+ "resvg 0.44.0",
+ "schemars 0.8.22",
  "serde",
  "serde_json",
  "similar",
  "skia-safe",
  "syntect",
- "taffy",
+ "taffy 0.10.1",
  "thiserror 2.0.18",
  "tiny-skia",
  "ureq",
- "usvg",
+ "usvg 0.44.0",
 ]
 
 [[package]]
@@ -5152,7 +6719,7 @@ name = "rustmotion-html"
 version = "0.7.1"
 dependencies = [
  "html5ever 0.39.0",
- "markup5ever_rcdom",
+ "markup5ever_rcdom 0.39.0+unofficial",
  "serde_json",
  "thiserror 2.0.18",
 ]
@@ -5162,18 +6729,18 @@ name = "rustmotion-studio"
 version = "0.7.1"
 dependencies = [
  "clap",
- "dioxus",
- "dioxus-icons",
- "dioxus-primitives",
- "dirs",
+ "dirs 6.0.0",
+ "gpui-component",
+ "gpui-kit",
  "image",
  "notify",
  "palette",
  "rfd",
  "rodio",
  "rustmotion",
- "schemars",
+ "schemars 0.8.22",
  "serde_json",
+ "smallvec",
  "tokio",
 ]
 
@@ -5189,14 +6756,32 @@ version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c85d1ccd519e61834798eb52c4e886e8c2d7d698dd3d6ce0b1b47eb8557f1181"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.2",
  "bytemuck",
  "core_maths",
  "log",
  "smallvec",
  "ttf-parser 0.24.1",
- "unicode-bidi-mirroring",
- "unicode-ccc",
+ "unicode-bidi-mirroring 0.3.0",
+ "unicode-ccc 0.3.0",
+ "unicode-properties",
+ "unicode-script",
+]
+
+[[package]]
+name = "rustybuzz"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd3c7c96f8a08ee34eff8857b11b49b07d71d1c3f4e88f8a88d4c9e9f90b1702"
+dependencies = [
+ "bitflags 2.13.2",
+ "bytemuck",
+ "core_maths",
+ "log",
+ "smallvec",
+ "ttf-parser 0.25.1",
+ "unicode-bidi-mirroring 0.4.0",
+ "unicode-ccc 0.4.0",
  "unicode-properties",
  "unicode-script",
 ]
@@ -5241,7 +6826,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3fbf2ae1b8bc8e02df939598064d22402220cd5bbcca1c76f7d6a310974d5615"
 dependencies = [
  "dyn-clone",
- "schemars_derive",
+ "schemars_derive 0.8.22",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "schemars"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "687274d293b6cdc6e73e0fee520bf2049650090d7164f87672d212a3c530cf4a"
+dependencies = [
+ "dyn-clone",
+ "indexmap",
+ "ref-cast",
+ "schemars_derive 1.2.2",
  "serde",
  "serde_json",
 ]
@@ -5254,10 +6853,22 @@ checksum = "32e265784ad618884abaea0600a9adf15393368d840e0222d101a072f3f7534d"
 dependencies = [
  "proc-macro2",
  "quote",
- "serde_derive_internals",
+ "serde_derive_internals 0.29.1",
  "syn 2.0.117",
 ]
 
+[[package]]
+name = "schemars_derive"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d98c67716b46af2f0b8cf752abc930f6f9aecfbf671ecfb531db8a31dbe4e2ba"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "serde_derive_internals 0.30.0",
+ "syn 3.0.6",
+]
+
 [[package]]
 name = "scoped-tls"
 version = "1.0.1"
@@ -5270,14 +6881,43 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
+[[package]]
+name = "screencapturekit"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a5eeeb57ac94960cfe5ff4c402be6585ae4c8d29a2cf41b276048c2e849d64e"
+dependencies = [
+ "screencapturekit-sys",
+]
+
+[[package]]
+name = "screencapturekit-sys"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22411b57f7d49e7fe08025198813ee6fd65e1ee5eff4ebc7880c12c82bde4c60"
+dependencies = [
+ "block",
+ "dispatch",
+ "objc",
+ "objc-foundation",
+ "objc_id",
+ "once_cell",
+]
+
+[[package]]
+name = "seahash"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
+
 [[package]]
 name = "security-framework"
 version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d"
 dependencies = [
- "bitflags 2.11.0",
- "core-foundation",
+ "bitflags 2.13.2",
+ "core-foundation 0.10.1",
  "core-foundation-sys",
  "libc",
  "security-framework-sys",
@@ -5293,24 +6933,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "selectors"
-version = "0.24.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c37578180969d00692904465fb7f6b3d50b9a2b952b87c23d0e2e5cb5013416"
-dependencies = [
- "bitflags 1.3.2",
- "cssparser",
- "derive_more",
- "fxhash",
- "log",
- "phf 0.8.0",
- "phf_codegen 0.8.0",
- "precomputed-hash",
- "servo_arc",
- "smallvec",
-]
-
 [[package]]
 name = "self_cell"
 version = "1.2.2"
@@ -5322,14 +6944,9 @@ name = "semver"
 version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
-
-[[package]]
-name = "send_wrapper"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
 dependencies = [
- "futures-core",
+ "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -5343,14 +6960,30 @@ dependencies = [
 ]
 
 [[package]]
-name = "serde-wasm-bindgen"
-version = "0.6.5"
+name = "serde-saphyr"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8302e169f0eddcc139c70f139d19d6467353af16f9fce27e8c30158036a1e16b"
+checksum = "b8050abb251097357e24aff63ba2c52a6309ecb7d23a5474023df960a02694d8"
+dependencies = [
+ "annotate-snippets",
+ "base64",
+ "encoding_rs_io",
+ "granit-parser",
+ "nohash-hasher",
+ "num-traits",
+ "serde_core",
+ "smallvec",
+ "zmij",
+]
+
+[[package]]
+name = "serde_bytes"
+version = "0.11.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5d440709e79d88e51ac01c4b72fc6cb7314017bb7da9eeff678aa94c10e3ea8"
 dependencies = [
- "js-sys",
  "serde",
- "wasm-bindgen",
+ "serde_core",
 ]
 
 [[package]]
@@ -5384,6 +7017,26 @@ dependencies = [
  "syn 2.0.117",
 ]
 
+[[package]]
+name = "serde_derive_internals"
+version = "0.30.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f852137cce035d6a4df67ccce505ff6b3e9fd3a10e3e52b24dc71e650bb1a9bd"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.6",
+]
+
+[[package]]
+name = "serde_fmt"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e497af288b3b95d067a23a4f749f2861121ffcb2f6d8379310dcda040c345ed"
+dependencies = [
+ "serde_core",
+]
+
 [[package]]
 name = "serde_json"
 version = "1.0.149"
@@ -5428,35 +7081,43 @@ dependencies = [
 ]
 
 [[package]]
-name = "servo_arc"
-version = "0.2.0"
+name = "serde_urlencoded"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52aa42f8fdf0fed91e5ce7f23d8138441002fa31dca008acf47e6fd4721f741"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
 dependencies = [
- "nodrop",
- "stable_deref_trait",
+ "form_urlencoded",
+ "itoa",
+ "ryu",
+ "serde",
 ]
 
 [[package]]
-name = "sha1"
-version = "0.10.6"
+name = "sha1_smol"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d"
+
+[[package]]
+name = "sha2"
+version = "0.10.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 dependencies = [
  "cfg-if",
- "cpufeatures",
- "digest",
+ "cpufeatures 0.2.17",
+ "digest 0.10.7",
 ]
 
 [[package]]
 name = "sha2"
-version = "0.10.9"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
+checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4"
 dependencies = [
  "cfg-if",
- "cpufeatures",
- "digest",
+ "cpufeatures 0.3.1",
+ "digest 0.11.3",
 ]
 
 [[package]]
@@ -5468,6 +7129,15 @@ dependencies = [
  "lazy_static",
 ]
 
+[[package]]
+name = "shellexpand"
+version = "3.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32824fab5e16e6c4d86dc1ba84489390419a39f97699852b66480bb87d297ed8"
+dependencies = [
+ "dirs 6.0.0",
+]
+
 [[package]]
 name = "shlex"
 version = "1.3.0"
@@ -5511,16 +7181,6 @@ version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"
 
-[[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"
 version = "0.1.0"
@@ -5530,12 +7190,6 @@ dependencies = [
  "quote",
 ]
 
-[[package]]
-name = "simdutf8"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
-
 [[package]]
 name = "similar"
 version = "2.7.0"
@@ -5551,12 +7205,6 @@ dependencies = [
  "log",
 ]
 
-[[package]]
-name = "siphasher"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
-
 [[package]]
 name = "siphasher"
 version = "1.0.2"
@@ -5586,7 +7234,7 @@ version = "0.99.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f512ac418a64194842dd05566320805dad1c957c521039db2486fd6368865bc"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.2",
  "skia-bindings",
 ]
 
@@ -5601,39 +7249,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "slab"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
-
-[[package]]
-name = "sledgehammer_bindgen"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49e83e178d176459c92bc129cfd0958afac3ced925471b889b3a75546cfc4133"
-dependencies = [
- "sledgehammer_bindgen_macro",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "sledgehammer_bindgen_macro"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb251b407f50028476a600541542b605bb864d35d9ee1de4f6cab45d88475e6d"
-dependencies = [
- "quote",
- "syn 2.0.117",
-]
-
-[[package]]
-name = "sledgehammer_utils"
-version = "0.3.1"
+name = "slab"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "debdd4b83524961983cea3c55383b3910fd2f24fd13a188f5b091d2d504a61ae"
-dependencies = [
- "rustc-hash 1.1.0",
-]
+checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
 
 [[package]]
 name = "slotmap"
@@ -5641,7 +7260,6 @@ version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bdd58c3c93c3d278ca835519292445cb4b0d4dc59ccfdf7ceadaab3f8aeb4038"
 dependencies = [
- "serde",
  "version_check",
 ]
 
@@ -5651,36 +7269,68 @@ version = "1.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
+[[package]]
+name = "smol"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a33bd3e260892199c3ccfc487c88b2da2265080acb316cd920da72fdfd7c599f"
+dependencies = [
+ "async-channel",
+ "async-executor",
+ "async-fs",
+ "async-io",
+ "async-lock",
+ "async-net",
+ "async-process",
+ "blocking",
+ "futures-lite",
+]
+
 [[package]]
 name = "smol_str"
 version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4aaa7368fcf4852a4c2dd92df0cace6a71f2091ca0a23391ce7f3a31833f1523"
+dependencies = [
+ "borsh",
+ "serde_core",
+]
 
 [[package]]
-name = "soup3"
-version = "0.5.0"
+name = "socket2"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "471f924a40f31251afc77450e781cb26d55c0b650842efafc9c6cbd2f7cc4f9f"
+checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
 dependencies = [
- "futures-channel",
- "gio",
- "glib",
  "libc",
- "soup3-sys",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
-name = "soup3-sys"
-version = "0.5.0"
+name = "spin"
+version = "0.9.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebe8950a680a12f24f15ebe1bf70db7af98ad242d9db43596ad3108aab86c27"
+checksum = "3763264f6b73151db08c50ff20d7d8a0b8796e021cdea7ceedad07b80155fa0e"
 dependencies = [
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
+ "lock_api",
+]
+
+[[package]]
+name = "spin"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "023a211cb3138dbc438680b32560ad89f699977624c9f8dbb95a47d5b4c07dd3"
+dependencies = [
+ "lock_api",
+]
+
+[[package]]
+name = "spirv"
+version = "0.4.0+sdk-1.4.341.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9571ea910ebd84c86af4b3ed27f9dbdc6ad06f17c5f96146b2b671e2976744f"
+dependencies = [
+ "bitflags 2.13.2",
 ]
 
 [[package]]
@@ -5695,6 +7345,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
+[[package]]
+name = "str_indices"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d08889ec5408683408db66ad89e0e1f93dff55c73a4ccc71c427d5b277ee47e6"
+
 [[package]]
 name = "strength_reduce"
 version = "0.2.4"
@@ -5772,7 +7428,16 @@ version = "0.26.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
 dependencies = [
- "strum_macros",
+ "strum_macros 0.26.4",
+]
+
+[[package]]
+name = "strum"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9628de9b8791db39ceda2b119bbe13134770b56c138ec1d3af810d045c04f9bd"
+dependencies = [
+ "strum_macros 0.28.0",
 ]
 
 [[package]]
@@ -5789,38 +7454,107 @@ dependencies = [
 ]
 
 [[package]]
-name = "subsecond"
-version = "0.7.9"
+name = "strum_macros"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cc79674bd55726e6b123204403389400229a95fe4a3b2c5453dada70b06ca95"
+checksum = "ab85eea0270ee17587ed4156089e10b9e6880ee688791d45a905f5b1ca36f664"
 dependencies = [
- "js-sys",
- "libc",
- "libloading 0.8.9",
- "memfd",
- "memmap2",
- "serde",
- "subsecond-types",
- "thiserror 2.0.18",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
+[[package]]
+name = "sval"
+version = "2.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b81b254da21fe1fcc4e3a74fe39b46e25e3a863078f8b71c954d47f84889dbc6"
+
+[[package]]
+name = "sval_buffer"
+version = "2.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50be352d2822ffafb59e3e2ddac9d5ee60f2eeadbb7b5a2a951b9f3651e87a6f"
+dependencies = [
+ "sval",
+ "sval_ref",
+ "zerocopy",
 ]
 
 [[package]]
-name = "subsecond-types"
-version = "0.7.9"
+name = "sval_dynamic"
+version = "2.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9798bfed58797aed51c672aa99810aac30a50d3120ecfdcf28c13784e9a8f1c"
+checksum = "b048ca293b998d9a45659159f94a64063791e74cdc670164943dbb434405573d"
 dependencies = [
- "serde",
+ "sval",
 ]
 
 [[package]]
-name = "subtle"
-version = "2.6.1"
+name = "sval_fmt"
+version = "2.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+checksum = "e6b5888e40f80568733217f27b7317b845f463400ced36c424b1a804730e53b2"
+dependencies = [
+ "itoa",
+ "ryu",
+ "sval",
+]
+
+[[package]]
+name = "sval_json"
+version = "2.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e17664d6bb6b74947afaab9d7c991caa9bf5638d4dee16fcbef637f440796049"
+dependencies = [
+ "itoa",
+ "ryu",
+ "sval",
+]
+
+[[package]]
+name = "sval_nested"
+version = "2.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07c059969ca5ca163ea7fef6c9661758973d17691aba92abdcf5c428f4ec122c"
+dependencies = [
+ "sval",
+ "sval_buffer",
+ "sval_ref",
+]
+
+[[package]]
+name = "sval_ref"
+version = "2.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42d6b29ff568c85c87561807f51d2adfff4b6016c6363133f7cd1652a12548f3"
+dependencies = [
+ "sval",
+]
+
+[[package]]
+name = "sval_serde"
+version = "2.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f33ec9edc42b12764d5c90ca0a1d84189c6bde81ed27507f1e661c6e4e05853"
+dependencies = [
+ "serde_core",
+ "sval",
+ "sval_nested",
+]
+
+[[package]]
+name = "svg_fmt"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0193cc4331cfd2f3d2011ef287590868599a2f33c3e69bc22c1a3d3acf9e02fb"
 
 [[package]]
 name = "svgtypes"
@@ -5828,8 +7562,18 @@ version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68c7541fff44b35860c1a7a47a7cadf3e4a304c457b58f9870d9706ece028afc"
 dependencies = [
- "kurbo",
- "siphasher 1.0.2",
+ "kurbo 0.11.3",
+ "siphasher",
+]
+
+[[package]]
+name = "svgtypes"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "695b5790b3131dafa99b3bbfd25a216edb3d216dad9ca208d4657bfb8f2abc3d"
+dependencies = [
+ "kurbo 0.13.1",
+ "siphasher",
 ]
 
 [[package]]
@@ -6003,9 +7747,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6014,15 +7758,24 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.117"
+version = "3.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
+checksum = "8593e8e72159ed2257d083c7a454a85cbf854f37a0966d8d483aff8c8a3ebcee"
 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"
@@ -6065,16 +7818,38 @@ dependencies = [
 ]
 
 [[package]]
-name = "system-deps"
-version = "6.2.2"
+name = "sysinfo"
+version = "0.31.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349"
+checksum = "355dbe4f8799b304b05e1b0f05fc59b2a18d36645cf169607da45bde2f69a1be"
 dependencies = [
- "cfg-expr",
- "heck 0.5.0",
- "pkg-config",
- "toml 0.8.2",
- "version-compare",
+ "core-foundation-sys",
+ "libc",
+ "memchr",
+ "ntapi",
+ "rayon",
+ "windows 0.57.0",
+]
+
+[[package]]
+name = "system-configuration"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
+dependencies = [
+ "bitflags 2.13.2",
+ "core-foundation 0.9.4",
+ "system-configuration-sys",
+]
+
+[[package]]
+name = "system-configuration-sys"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
 ]
 
 [[package]]
@@ -6090,53 +7865,27 @@ dependencies = [
 ]
 
 [[package]]
-name = "tao"
-version = "0.34.8"
+name = "taffy"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9103edf55f2da3c82aea4c7fab7c4241032bfeea0e71fa557d98e00e7ce7cc20"
+checksum = "c034e05f6ee85a12daa63863c2245797715075c70649947aa0da54f3f2ab1d0f"
 dependencies = [
- "bitflags 2.11.0",
- "block2",
- "core-foundation",
- "core-graphics 0.25.0",
- "crossbeam-channel",
- "dispatch2",
- "dlopen2",
- "dpi",
- "gdkwayland-sys",
- "gdkx11-sys",
- "gtk",
- "jni 0.21.1",
- "libc",
- "log",
- "ndk",
- "ndk-context",
- "ndk-sys",
- "objc2",
- "objc2-app-kit",
- "objc2-foundation",
- "once_cell",
- "parking_lot",
- "raw-window-handle 0.5.2",
- "raw-window-handle 0.6.2",
- "tao-macros",
- "unicode-segmentation",
- "url",
- "windows",
- "windows-core",
- "windows-version",
- "x11-dl",
+ "arrayvec",
+ "serde",
+ "slotmap",
+ "smallvec",
 ]
 
 [[package]]
-name = "tao-macros"
-version = "0.1.3"
+name = "tao-core-video-sys"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4e16beb8b2ac17db28eab8bca40e62dbfbb34c0fcdc6d9826b11b7b5d047dfd"
+checksum = "271450eb289cb4d8d0720c6ce70c72c8c858c93dd61fc625881616752e6b98f6"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
+ "cfg-if",
+ "core-foundation-sys",
+ "libc",
+ "objc",
 ]
 
 [[package]]
@@ -6151,10 +7900,15 @@ dependencies = [
 ]
 
 [[package]]
-name = "target-lexicon"
-version = "0.12.16"
+name = "tauri-winrt-notification"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
+checksum = "9ed071c670382e85fc2f48ae706492d8c338f4f89bf72520d32f8abfe880aade"
+dependencies = [
+ "thiserror 2.0.18",
+ "windows 0.61.3",
+ "windows-version",
+]
 
 [[package]]
 name = "tempfile"
@@ -6190,6 +7944,15 @@ dependencies = [
  "utf-8",
 ]
 
+[[package]]
+name = "termcolor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+dependencies = [
+ "winapi-util",
+]
+
 [[package]]
 name = "thiserror"
 version = "1.0.69"
@@ -6282,9 +8045,7 @@ checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c"
 dependencies = [
  "deranged",
  "itoa",
- "libc",
  "num-conv",
- "num_threads",
  "powerfmt",
  "serde_core",
  "time-core",
@@ -6307,6 +8068,15 @@ dependencies = [
  "time-core",
 ]
 
+[[package]]
+name = "tiny-keccak"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
+dependencies = [
+ "crunchy",
+]
+
 [[package]]
 name = "tiny-skia"
 version = "0.11.4"
@@ -6360,36 +8130,64 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.52.3"
+version = "1.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe"
+checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d"
 dependencies = [
  "bytes",
+ "libc",
+ "mio",
  "pin-project-lite",
- "tokio-macros",
+ "socket2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
-name = "tokio-macros"
-version = "2.7.0"
+name = "tokio-rustls"
+version = "0.26.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496"
+checksum = "b0c85f2c3ef0b1cd58b36682f4b17aaa995f0e5db534d85692b4903abce21f67"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
+ "rustls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-socks"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7e2948f60dbe26b35f2c7fb74ac2854c1fddded0fe9d7548fcc674a246f7615"
+dependencies = [
+ "either",
+ "futures-util",
+ "thiserror 1.0.69",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "494815d09bf52b5548659851081238f0ca39ff638363907596da739561c62c52"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "libc",
+ "pin-project-lite",
+ "tokio",
 ]
 
 [[package]]
 name = "toml"
-version = "0.8.2"
+version = "0.8.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d"
+checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
 dependencies = [
  "serde",
  "serde_spanned 0.6.9",
- "toml_datetime 0.6.3",
- "toml_edit 0.20.2",
+ "toml_datetime 0.6.11",
+ "toml_edit 0.22.27",
 ]
 
 [[package]]
@@ -6409,9 +8207,9 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.3"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
 dependencies = [
  "serde",
 ]
@@ -6427,54 +8225,77 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.19.15"
+version = "0.22.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
 dependencies = [
  "indexmap",
- "toml_datetime 0.6.3",
- "winnow 0.5.40",
+ "serde",
+ "serde_spanned 0.6.9",
+ "toml_datetime 0.6.11",
+ "toml_write",
+ "winnow 0.7.14",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.20.2"
+version = "0.25.8+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
+checksum = "16bff38f1d86c47f9ff0647e6838d7bb362522bdf44006c7068c2b1e606f1f3c"
 dependencies = [
  "indexmap",
- "serde",
- "serde_spanned 0.6.9",
- "toml_datetime 0.6.3",
- "winnow 0.5.40",
+ "toml_datetime 1.1.1+spec-1.1.0",
+ "toml_parser",
+ "winnow 1.0.0",
 ]
 
 [[package]]
-name = "toml_edit"
-version = "0.25.8+spec-1.1.0"
+name = "toml_parser"
+version = "1.1.3+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d38ac1cf9b95face32296c0a3ede1fdc270627c9d9c02a7274dd6d960dc4d56"
+dependencies = [
+ "winnow 1.0.0",
+]
+
+[[package]]
+name = "toml_write"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
+
+[[package]]
+name = "toml_writer"
+version = "1.1.2+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d56353a2a665ad0f41a421187180aab746c8c325620617ad883a99a1cbe66d2"
+
+[[package]]
+name = "tower"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16bff38f1d86c47f9ff0647e6838d7bb362522bdf44006c7068c2b1e606f1f3c"
+checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4"
 dependencies = [
- "indexmap",
- "toml_datetime 1.1.1+spec-1.1.0",
- "toml_parser",
- "winnow 1.0.0",
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "sync_wrapper",
+ "tokio",
+ "tower-layer",
+ "tower-service",
 ]
 
 [[package]]
-name = "toml_parser"
-version = "1.1.3+spec-1.1.0"
+name = "tower-layer"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d38ac1cf9b95face32296c0a3ede1fdc270627c9d9c02a7274dd6d960dc4d56"
-dependencies = [
- "winnow 1.0.0",
-]
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
 
 [[package]]
-name = "toml_writer"
-version = "1.1.2+spec-1.1.0"
+name = "tower-service"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d56353a2a665ad0f41a421187180aab746c8c325620617ad883a99a1cbe66d2"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
@@ -6482,6 +8303,7 @@ version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
 dependencies = [
+ "log",
  "pin-project-lite",
  "tracing-attributes",
  "tracing-core",
@@ -6505,32 +8327,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"
 dependencies = [
  "once_cell",
+ "valuable",
 ]
 
 [[package]]
-name = "tracing-subscriber"
-version = "0.3.23"
+name = "tracing-log"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
 dependencies = [
- "matchers",
+ "log",
  "once_cell",
- "regex-automata",
- "sharded-slab",
- "thread_local",
- "tracing",
  "tracing-core",
 ]
 
 [[package]]
-name = "tracing-wasm"
-version = "0.2.1"
+name = "tracing-subscriber"
+version = "0.3.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4575c663a174420fa2d78f4108ff68f65bf2fbb7dd89f33749b6e826b3626e07"
+checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319"
 dependencies = [
- "tracing",
- "tracing-subscriber",
- "wasm-bindgen",
+ "nu-ansi-term",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing-core",
+ "tracing-log",
 ]
 
 [[package]]
@@ -6544,26 +8366,22 @@ dependencies = [
 ]
 
 [[package]]
-name = "tray-icon"
-version = "0.21.3"
+name = "triomphe"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5e85aa143ceb072062fc4d6356c1b520a51d636e7bc8e77ec94be3608e5e80c"
+checksum = "b40688ea6389c8171614b25491f71d4a27946e0c7ce2da1c6de27e25abf1a0ae"
 dependencies = [
- "crossbeam-channel",
- "dirs",
- "libappindicator",
- "muda",
- "objc2",
- "objc2-app-kit",
- "objc2-core-foundation",
- "objc2-core-graphics",
- "objc2-foundation",
- "once_cell",
- "png 0.17.16",
- "thiserror 2.0.18",
- "windows-sys 0.60.2",
+ "arc-swap",
+ "serde",
+ "stable_deref_trait",
 ]
 
+[[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.24.1"
@@ -6583,23 +8401,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "tungstenite"
-version = "0.28.0"
+name = "typeid"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8628dcc84e5a09eb3d8423d6cb682965dea9133204e8fb3efee74c2a0c259442"
-dependencies = [
- "bytes",
- "data-encoding",
- "http",
- "httparse",
- "log",
- "native-tls",
- "rand 0.9.2",
- "rustls",
- "sha1",
- "thiserror 2.0.18",
- "utf-8",
-]
+checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c"
 
 [[package]]
 name = "typenum"
@@ -6607,6 +8412,23 @@ version = "1.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20"
 
+[[package]]
+name = "uds_windows"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f6fb2847f6742cd76af783a2a2c49e9375d0a111c7bef6f71cd9e738c72d6e"
+dependencies = [
+ "memoffset",
+ "tempfile",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "unicase"
+version = "2.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142"
+
 [[package]]
 name = "unicode-bidi"
 version = "0.3.18"
@@ -6619,12 +8441,30 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64af057ad7466495ca113126be61838d8af947f41d93a949980b2389a118082f"
 
+[[package]]
+name = "unicode-bidi-mirroring"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dfa6e8c60bb66d49db113e0125ee8711b7647b5579dc7f5f19c42357ed039fe"
+
 [[package]]
 name = "unicode-ccc"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "260bc6647b3893a9a90668360803a15f96b85a5257b1c3a0c3daf6ae2496de42"
 
+[[package]]
+name = "unicode-ccc"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce61d488bcdc9bc8b5d1772c404828b17fc481c0a582b5581e95fb233aef503e"
+
+[[package]]
+name = "unicode-id"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65dd75ab2d9d379dbe86d4059e91d8b5a6e7054865eaba1ddbfc7a817ff96392"
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.24"
@@ -6747,16 +8587,70 @@ dependencies = [
  "data-url",
  "flate2",
  "fontdb 0.22.0",
- "imagesize",
- "kurbo",
+ "imagesize 0.13.0",
+ "kurbo 0.11.3",
+ "log",
+ "pico-args",
+ "roxmltree 0.20.0",
+ "rustybuzz 0.18.0",
+ "simplecss",
+ "siphasher",
+ "strict-num",
+ "svgtypes 0.15.3",
+ "tiny-skia-path",
+ "unicode-bidi",
+ "unicode-script",
+ "unicode-vo",
+ "xmlwriter",
+]
+
+[[package]]
+name = "usvg"
+version = "0.45.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80be9b06fbae3b8b303400ab20778c80bbaf338f563afe567cf3c9eea17b47ef"
+dependencies = [
+ "base64",
+ "data-url",
+ "flate2",
+ "fontdb 0.23.0",
+ "imagesize 0.13.0",
+ "kurbo 0.11.3",
+ "log",
+ "pico-args",
+ "roxmltree 0.20.0",
+ "rustybuzz 0.20.1",
+ "simplecss",
+ "siphasher",
+ "strict-num",
+ "svgtypes 0.15.3",
+ "tiny-skia-path",
+ "unicode-bidi",
+ "unicode-script",
+ "unicode-vo",
+ "xmlwriter",
+]
+
+[[package]]
+name = "usvg"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e419dff010bb12512b0ae9e3d2f318dfbdf0167fde7eb05465134d4e8756076f"
+dependencies = [
+ "base64",
+ "data-url",
+ "flate2",
+ "fontdb 0.23.0",
+ "imagesize 0.14.0",
+ "kurbo 0.13.1",
  "log",
  "pico-args",
- "roxmltree",
- "rustybuzz",
+ "roxmltree 0.21.1",
+ "rustybuzz 0.20.1",
  "simplecss",
- "siphasher 1.0.2",
+ "siphasher",
  "strict-num",
- "svgtypes",
+ "svgtypes 0.16.1",
  "tiny-skia-path",
  "unicode-bidi",
  "unicode-script",
@@ -6788,7 +8682,10 @@ version = "1.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a68d3c8f01c0cfa54a75291d83601161799e4a89a39e0929f4b0354d88757a37"
 dependencies = [
+ "getrandom 0.4.2",
  "js-sys",
+ "serde_core",
+ "sha1_smol",
  "wasm-bindgen",
 ]
 
@@ -6804,16 +8701,46 @@ dependencies = [
 ]
 
 [[package]]
-name = "vcpkg"
-version = "0.2.15"
+name = "valuable"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
 
 [[package]]
-name = "version-compare"
-version = "0.2.1"
+name = "value-bag"
+version = "1.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2799ffb329a792ecfd902b71306c8a815a6ef1c0470fa9953a6aa4d4cecbe511"
+dependencies = [
+ "value-bag-serde1",
+ "value-bag-sval2",
+]
+
+[[package]]
+name = "value-bag-serde1"
+version = "1.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0941feceafbe7a8f59ea1096d45b97002884a41306315ad797b3684b63a81d8c"
+dependencies = [
+ "erased-serde",
+ "serde_core",
+ "serde_fmt",
+]
+
+[[package]]
+name = "value-bag-sval2"
+version = "1.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03c2856837ef78f57382f06b2b8563a2f512f7185d732608fd9176cb3b8edf0e"
+checksum = "839752af8179287d27eb2b94164641b1ede9e60ab7424163388dc21ebd0508cd"
+dependencies = [
+ "sval",
+ "sval_buffer",
+ "sval_dynamic",
+ "sval_fmt",
+ "sval_json",
+ "sval_ref",
+ "sval_serde",
+]
 
 [[package]]
 name = "version_check"
@@ -6822,42 +8749,49 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
-name = "walkdir"
-version = "2.5.0"
+name = "vswhom"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b"
 dependencies = [
- "same-file",
- "winapi-util",
+ "libc",
+ "vswhom-sys",
 ]
 
 [[package]]
-name = "warnings"
-version = "0.2.1"
+name = "vswhom-sys"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64f68998838dab65727c9b30465595c6f7c953313559371ca8bf31759b3680ad"
+checksum = "fb067e4cbd1ff067d1df46c9194b5de0e98efd2810bbc95c5d5e5f25a3231150"
 dependencies = [
- "pin-project",
- "tracing",
- "warnings-macro",
+ "cc",
+ "libc",
 ]
 
 [[package]]
-name = "warnings-macro"
-version = "0.2.0"
+name = "waker-fn"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7"
+
+[[package]]
+name = "walkdir"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59195a1db0e95b920366d949ba5e0d3fc0e70b67c09be15ce5abb790106b0571"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
+ "same-file",
+ "winapi-util",
 ]
 
 [[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
+name = "want"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+dependencies = [
+ "try-lock",
+]
 
 [[package]]
 name = "wasi"
@@ -6885,9 +8819,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.114"
+version = "0.2.128"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6532f9a5c1ece3798cb1c2cfdba640b9b3ba884f5db45973a6f442510a87d38e"
+checksum = "aecb87a33d3b0c5e3b7aa46336eaf486cffafbd281b195e4c8b80d50df2351bf"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -6898,23 +8832,19 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.64"
+version = "0.4.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9c5522b3a28661442748e09d40924dfb9ca614b21c00d3fd135720e48b67db8"
+checksum = "6ef4c5d3d2cdf5c54f4231181768f5510842e350db025faf1f7163b1030ed928"
 dependencies = [
- "cfg-if",
- "futures-util",
  "js-sys",
- "once_cell",
  "wasm-bindgen",
- "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.114"
+version = "0.2.128"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18a2d50fcf105fb33bb15f00e7a77b772945a2ee45dcf454961fd843e74c18e6"
+checksum = "a690d511e3c1a8b3a55e33511e3c2c00c78415cd23650f32b808627f5696b9ed"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -6922,22 +8852,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.114"
+version = "0.2.128"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03ce4caeaac547cdf713d280eda22a730824dd11e6b8c3ca9e42247b25c631e3"
+checksum = "411e4887f0071ef2d2164a9d5fdf2d20efbef78fccd3a78b0c10a1dc5295e48a"
 dependencies = [
  "bumpalo",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 3.0.6",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.114"
+version = "0.2.128"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75a326b8c223ee17883a4251907455a2431acc2791c98c26279376490c378c16"
+checksum = "81941cd78d0c92026c33e5e01312845a4cb1e9af3407f9134b100dd03144103e"
 dependencies = [
  "unicode-ident",
 ]
@@ -6977,13 +8907,25 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "wasm_thread"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7516db7f32decdadb1c3b8deb1b7d78b9df7606c5cc2f6241737c2ab3a0258e"
+dependencies = [
+ "futures",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
+]
+
 [[package]]
 name = "wasmparser"
 version = "0.244.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.2",
  "hashbrown 0.15.5",
  "indexmap",
  "semver",
@@ -6997,6 +8939,7 @@ checksum = "2857dd20b54e916ec7253b3d6b4d5c4d7d4ca2c33c2e11c6c76a99bd8744755d"
 dependencies = [
  "cc",
  "downcast-rs",
+ "log",
  "rustix 1.1.4",
  "scoped-tls",
  "smallvec",
@@ -7009,21 +8952,58 @@ version = "0.31.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "645c7c96bb74690c3189b5c9cb4ca1627062bb23693a4fad9d8c3de958260144"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.2",
  "rustix 1.1.4",
  "wayland-backend",
  "wayland-scanner",
 ]
 
+[[package]]
+name = "wayland-cursor"
+version = "0.31.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a52d18780be9b1314328a3de5f930b73d2200112e3849ca6cb11822793fb34d"
+dependencies = [
+ "rustix 1.1.4",
+ "wayland-client",
+ "xcursor",
+]
+
 [[package]]
 name = "wayland-protocols"
 version = "0.32.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "563a85523cade2429938e790815fd7319062103b9f4a2dc806e9b53b95982d8f"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.13.2",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-protocols-plasma"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b6d8cf1eb2c1c31ed1f5643c88a6e53538129d4af80030c8cabd1f9fa884d91"
+dependencies = [
+ "bitflags 2.13.2",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-protocols-wlr"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb04e52f7836d7c7976c78ca0250d61e33873c34156a2a1fc9474828ec268234"
+dependencies = [
+ "bitflags 2.13.2",
  "wayland-backend",
  "wayland-client",
+ "wayland-protocols",
  "wayland-scanner",
 ]
 
@@ -7046,14 +9026,25 @@ checksum = "d8eab23fefc9e41f8e841df4a9c707e8a8c4ed26e944ef69297184de2785e3be"
 dependencies = [
  "dlib",
  "log",
+ "once_cell",
  "pkg-config",
 ]
 
 [[package]]
 name = "web-sys"
-version = "0.3.91"
+version = "0.3.105"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fbddc4a036f00ec4f18c83445bd3115cb306a91da554919a099d9222fe4a7f8"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-time"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "854ba17bb104abfb26ba36da9729addc7ce7f06f5c0f90f3c391f8461cca21f9"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -7072,115 +9063,197 @@ dependencies = [
 ]
 
 [[package]]
-name = "webbrowser"
-version = "1.2.1"
+name = "webpki-roots"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22cfaf3c063993ff62e73cb4311efde4db1efb31ab78a3e5c457939ad5cc0bed"
+dependencies = [
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "weezl"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88"
+
+[[package]]
+name = "wgpu"
+version = "29.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76e8840e1ba2881d4cbb18d2147627a56af426ff064c0401eb0c8410c6325d07"
+dependencies = [
+ "arrayvec",
+ "bitflags 2.13.2",
+ "bytemuck",
+ "cfg-if",
+ "cfg_aliases",
+ "document-features",
+ "hashbrown 0.16.1",
+ "js-sys",
+ "log",
+ "naga",
+ "parking_lot",
+ "portable-atomic",
+ "profiling",
+ "raw-window-handle",
+ "smallvec",
+ "static_assertions",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "wgpu-core",
+ "wgpu-hal",
+ "wgpu-types",
+]
+
+[[package]]
+name = "wgpu-core"
+version = "29.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fc95580916af1e68ff6a7be07446fc5db73ebf71cf092de939bbf5f7e189f72"
+checksum = "2f519832254e56965a9940c4af57dcb75f702b6f6fa4a0b172f685395843a4d7"
 dependencies = [
- "core-foundation",
- "jni 0.22.4",
+ "arrayvec",
+ "bit-set 0.9.1",
+ "bit-vec 0.9.1",
+ "bitflags 2.13.2",
+ "bytemuck",
+ "cfg_aliases",
+ "document-features",
+ "hashbrown 0.16.1",
+ "indexmap",
  "log",
- "ndk-context",
- "objc2",
- "objc2-foundation",
- "url",
- "web-sys",
+ "naga",
+ "once_cell",
+ "parking_lot",
+ "portable-atomic",
+ "profiling",
+ "raw-window-handle",
+ "rustc-hash 1.1.0",
+ "smallvec",
+ "thiserror 2.0.18",
+ "wgpu-core-deps-apple",
+ "wgpu-core-deps-emscripten",
+ "wgpu-core-deps-wasm",
+ "wgpu-core-deps-windows-linux-android",
+ "wgpu-hal",
+ "wgpu-naga-bridge",
+ "wgpu-types",
 ]
 
 [[package]]
-name = "webkit2gtk"
-version = "2.0.1"
+name = "wgpu-core-deps-apple"
+version = "29.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76b1bc1e54c581da1e9f179d0b38512ba358fb1af2d634a1affe42e37172361a"
+checksum = "f5e39e26c4c0e07589e67d18546cf79ff45383659fc72fca4dd293358a0347f3"
 dependencies = [
- "bitflags 1.3.2",
- "cairo-rs",
- "gdk",
- "gdk-sys",
- "gio",
- "gio-sys",
- "glib",
- "glib-sys",
- "gobject-sys",
- "gtk",
- "gtk-sys",
- "javascriptcore-rs",
- "libc",
- "once_cell",
- "soup3",
- "webkit2gtk-sys",
+ "wgpu-hal",
 ]
 
 [[package]]
-name = "webkit2gtk-sys"
-version = "2.0.1"
+name = "wgpu-core-deps-emscripten"
+version = "29.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62daa38afc514d1f8f12b8693d30d5993ff77ced33ce30cd04deebc267a6d57c"
+checksum = "01e09be551dc939498bdd5f6b2c66e55ab275dad25825267a08605a80fc9f0af"
 dependencies = [
- "bitflags 1.3.2",
- "cairo-sys-rs",
- "gdk-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "gtk-sys",
- "javascriptcore-rs-sys",
- "libc",
- "pkg-config",
- "soup3-sys",
- "system-deps",
+ "wgpu-hal",
 ]
 
 [[package]]
-name = "webpki-roots"
-version = "1.0.6"
+name = "wgpu-core-deps-wasm"
+version = "29.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22cfaf3c063993ff62e73cb4311efde4db1efb31ab78a3e5c457939ad5cc0bed"
+checksum = "af1fb1798be2a912497d4c224f72d39bb0cb34af50e8bcc29865bc339c943059"
 dependencies = [
- "rustls-pki-types",
+ "wgpu-hal",
 ]
 
 [[package]]
-name = "webview2-com"
-version = "0.38.2"
+name = "wgpu-core-deps-windows-linux-android"
+version = "29.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7130243a7a5b33c54a444e54842e6a9e133de08b5ad7b5861cd8ed9a6a5bc96a"
+checksum = "4e592c1bbef6ad047647ae6e666ebd8cee7a32bb4544d9700ec96cbf73230257"
 dependencies = [
- "webview2-com-macros",
- "webview2-com-sys",
- "windows",
- "windows-core",
- "windows-implement",
- "windows-interface",
+ "wgpu-hal",
 ]
 
 [[package]]
-name = "webview2-com-macros"
-version = "0.8.1"
+name = "wgpu-hal"
+version = "29.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67a921c1b6914c367b2b823cd4cde6f96beec77d30a939c8199bb377cf9b9b54"
+checksum = "97ace1c17727311c22a46e4e3faf56ea6de81af99dcc839bdfb54857b94d448d"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
+ "android_system_properties",
+ "arrayvec",
+ "ash",
+ "bit-set 0.9.1",
+ "bitflags 2.13.2",
+ "block2 0.6.2",
+ "bytemuck",
+ "cfg-if",
+ "cfg_aliases",
+ "glow",
+ "glutin_wgl_sys",
+ "gpu-allocator",
+ "gpu-descriptor",
+ "hashbrown 0.16.1",
+ "js-sys",
+ "khronos-egl",
+ "libc",
+ "libloading",
+ "log",
+ "naga",
+ "ndk-sys",
+ "objc2 0.6.4",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.2",
+ "objc2-metal 0.3.2",
+ "objc2-quartz-core 0.3.2",
+ "once_cell",
+ "ordered-float",
+ "parking_lot",
+ "portable-atomic",
+ "portable-atomic-util",
+ "profiling",
+ "range-alloc",
+ "raw-window-handle",
+ "raw-window-metal",
+ "renderdoc-sys",
+ "smallvec",
+ "thiserror 2.0.18",
+ "wasm-bindgen",
+ "wayland-sys",
+ "web-sys",
+ "wgpu-naga-bridge",
+ "wgpu-types",
+ "windows 0.62.2",
+ "windows-core 0.62.2",
+ "windows-result 0.4.1",
 ]
 
 [[package]]
-name = "webview2-com-sys"
-version = "0.38.2"
+name = "wgpu-naga-bridge"
+version = "29.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "381336cfffd772377d291702245447a5251a2ffa5bad679c99e61bc48bacbf9c"
+checksum = "95226013f547544b223281cd16a4fb549aa9dcb562adbda0faae4c73ffbbc161"
 dependencies = [
- "thiserror 2.0.18",
- "windows",
- "windows-core",
+ "naga",
+ "wgpu-types",
 ]
 
 [[package]]
-name = "weezl"
-version = "0.1.12"
+name = "wgpu-types"
+version = "29.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88"
+checksum = "84bf84cd9ca8ca45e2b223a3868f1adf9bfc0c66aeac212e76ee7e40fdadf8f5"
+dependencies = [
+ "bitflags 2.13.2",
+ "bytemuck",
+ "js-sys",
+ "log",
+ "raw-window-handle",
+ "web-sys",
+]
 
 [[package]]
 name = "which"
@@ -7194,6 +9267,15 @@ dependencies = [
  "rustix 0.38.44",
 ]
 
+[[package]]
+name = "which"
+version = "8.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bae2f2b2b816647a1cab1acc91f5bd20812d53cb344382635ec2181940c8034f"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "wide"
 version = "0.7.33"
@@ -7235,17 +9317,62 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "windows"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
+dependencies = [
+ "windows-core 0.57.0",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6"
+dependencies = [
+ "windows-core 0.58.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"
 dependencies = [
- "windows-collections",
- "windows-core",
- "windows-future",
+ "windows-collections 0.2.0",
+ "windows-core 0.61.2",
+ "windows-future 0.2.1",
  "windows-link 0.1.3",
- "windows-numerics",
+ "windows-numerics 0.2.0",
+]
+
+[[package]]
+name = "windows"
+version = "0.62.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580"
+dependencies = [
+ "windows-collections 0.3.2",
+ "windows-core 0.62.2",
+ "windows-future 0.3.2",
+ "windows-numerics 0.3.1",
+]
+
+[[package]]
+name = "windows-capture"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a4df73e95feddb9ec1a7e9c2ca6323b8c97d5eeeff78d28f1eccdf19c882b24"
+dependencies = [
+ "parking_lot",
+ "rayon",
+ "thiserror 2.0.18",
+ "windows 0.61.3",
+ "windows-future 0.2.1",
 ]
 
 [[package]]
@@ -7254,7 +9381,41 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8"
 dependencies = [
- "windows-core",
+ "windows-core 0.61.2",
+]
+
+[[package]]
+name = "windows-collections"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610"
+dependencies = [
+ "windows-core 0.62.2",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
+dependencies = [
+ "windows-implement 0.57.0",
+ "windows-interface 0.57.0",
+ "windows-result 0.1.2",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
+dependencies = [
+ "windows-implement 0.58.0",
+ "windows-interface 0.58.0",
+ "windows-result 0.2.0",
+ "windows-strings 0.1.0",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -7263,11 +9424,24 @@ version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
 dependencies = [
- "windows-implement",
- "windows-interface",
+ "windows-implement 0.60.2",
+ "windows-interface 0.59.3",
  "windows-link 0.1.3",
- "windows-result",
- "windows-strings",
+ "windows-result 0.3.4",
+ "windows-strings 0.4.2",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.62.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
+dependencies = [
+ "windows-implement 0.60.2",
+ "windows-interface 0.59.3",
+ "windows-link 0.2.1",
+ "windows-result 0.4.1",
+ "windows-strings 0.5.1",
 ]
 
 [[package]]
@@ -7276,9 +9450,42 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
 dependencies = [
- "windows-core",
+ "windows-core 0.61.2",
  "windows-link 0.1.3",
- "windows-threading",
+ "windows-threading 0.1.0",
+]
+
+[[package]]
+name = "windows-future"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb"
+dependencies = [
+ "windows-core 0.62.2",
+ "windows-link 0.2.1",
+ "windows-threading 0.2.1",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -7292,6 +9499,28 @@ dependencies = [
  "syn 2.0.117",
 ]
 
+[[package]]
+name = "windows-interface"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
 [[package]]
 name = "windows-interface"
 version = "0.59.3"
@@ -7321,10 +9550,60 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
 dependencies = [
- "windows-core",
+ "windows-core 0.61.2",
  "windows-link 0.1.3",
 ]
 
+[[package]]
+name = "windows-numerics"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26"
+dependencies = [
+ "windows-core 0.62.2",
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "windows-registry"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3"
+dependencies = [
+ "windows-result 0.3.4",
+ "windows-strings 0.3.1",
+ "windows-targets 0.53.5",
+]
+
+[[package]]
+name = "windows-registry"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720"
+dependencies = [
+ "windows-link 0.2.1",
+ "windows-result 0.4.1",
+ "windows-strings 0.5.1",
+]
+
+[[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.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-result"
 version = "0.3.4"
@@ -7334,6 +9613,34 @@ dependencies = [
  "windows-link 0.1.3",
 ]
 
+[[package]]
+name = "windows-result"
+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.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+dependencies = [
+ "windows-result 0.2.0",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319"
+dependencies = [
+ "windows-link 0.1.3",
+]
+
 [[package]]
 name = "windows-strings"
 version = "0.4.2"
@@ -7343,6 +9650,15 @@ dependencies = [
  "windows-link 0.1.3",
 ]
 
+[[package]]
+name = "windows-strings"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.45.0"
@@ -7354,29 +9670,29 @@ dependencies = [
 
 [[package]]
 name = "windows-sys"
-version = "0.52.0"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
- "windows-targets 0.52.6",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
 name = "windows-sys"
-version = "0.59.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
  "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows-sys"
-version = "0.60.2"
+version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
- "windows-targets 0.53.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -7403,6 +9719,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"
@@ -7445,6 +9776,15 @@ dependencies = [
  "windows-link 0.1.3",
 ]
 
+[[package]]
+name = "windows-threading"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
 [[package]]
 name = "windows-version"
 version = "0.1.7"
@@ -7460,6 +9800,12 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.52.6"
@@ -7478,6 +9824,12 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.52.6"
@@ -7496,6 +9848,12 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.52.6"
@@ -7526,6 +9884,12 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.52.6"
@@ -7544,6 +9908,12 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.52.6"
@@ -7562,6 +9932,12 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.52.6"
@@ -7580,6 +9956,12 @@ 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"
@@ -7594,29 +9976,39 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 
 [[package]]
 name = "winnow"
-version = "0.5.40"
+version = "0.7.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "winnow"
-version = "0.7.14"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829"
+checksum = "a90e88e4667264a994d34e6d1ab2d26d398dcdca8b7f52bec8668957517fc7d8"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
-name = "winnow"
-version = "1.0.0"
+name = "winreg"
+version = "0.55.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a90e88e4667264a994d34e6d1ab2d26d398dcdca8b7f52bec8668957517fc7d8"
+checksum = "cb5a765337c50e9ec252c2069be9bf91c7df47afb103b642ba3a53bf8101be97"
 dependencies = [
- "memchr",
+ "cfg-if",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "wio"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5"
+dependencies = [
+ "winapi",
 ]
 
 [[package]]
@@ -7677,7 +10069,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
 dependencies = [
  "anyhow",
- "bitflags 2.11.0",
+ "bitflags 2.13.2",
  "indexmap",
  "log",
  "serde",
@@ -7713,49 +10105,6 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
 
-[[package]]
-name = "wry"
-version = "0.53.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "728b7d4c8ec8d81cab295e0b5b8a4c263c0d41a785fb8f8c4df284e5411140a2"
-dependencies = [
- "base64",
- "block2",
- "cookie",
- "crossbeam-channel",
- "dirs",
- "dpi",
- "dunce",
- "gtk",
- "html5ever 0.29.1",
- "http",
- "javascriptcore-rs",
- "jni 0.21.1",
- "kuchikiki",
- "libc",
- "ndk",
- "objc2",
- "objc2-app-kit",
- "objc2-core-foundation",
- "objc2-foundation",
- "objc2-ui-kit",
- "objc2-web-kit",
- "once_cell",
- "percent-encoding",
- "raw-window-handle 0.6.2",
- "sha2",
- "soup3",
- "tao-macros",
- "thiserror 2.0.18",
- "url",
- "webkit2gtk",
- "webkit2gtk-sys",
- "webview2-com",
- "windows",
- "windows-core",
- "windows-version",
-]
-
 [[package]]
 name = "x11"
 version = "2.21.0"
@@ -7767,14 +10116,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "x11-dl"
-version = "2.21.0"
+name = "x11-clipboard"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f"
+checksum = "662d74b3d77e396b8e5beb00b9cad6a9eccf40b2ef68cc858784b14c41d535a3"
 dependencies = [
  "libc",
- "once_cell",
- "pkg-config",
+ "x11rb",
 ]
 
 [[package]]
@@ -7783,9 +10131,12 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9993aa5be5a26815fe2c3eacfc1fde061fc1a1f094bf1ad2a18bf9c495dd7414"
 dependencies = [
+ "as-raw-xcb-connection",
  "gethostname",
+ "libc",
  "rustix 1.1.4",
  "x11rb-protocol",
+ "xcursor",
 ]
 
 [[package]]
@@ -7804,12 +10155,77 @@ dependencies = [
  "rustix 1.1.4",
 ]
 
+[[package]]
+name = "xcb"
+version = "1.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6c2ad15e0e922856ee89afe862b8992334bbe7953adad56cd1199358cb30566"
+dependencies = [
+ "bitflags 2.13.2",
+ "libc",
+ "quick-xml 0.41.0",
+ "x11",
+]
+
+[[package]]
+name = "xcursor"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "163b33ed8786455e2fa5d72f554057ce3f3182425434f756cd39c99839d88e23"
+
+[[package]]
+name = "xim-ctext"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ac61a7062c40f3c37b6e82eeeef835d5cc7824b632a72784a89b3963c33284c"
+dependencies = [
+ "encoding_rs",
+]
+
+[[package]]
+name = "xim-parser"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dcee45f89572d5a65180af3a84e7ddb24f5ea690a6d3aa9de231281544dd7b7"
+dependencies = [
+ "bitflags 2.13.2",
+]
+
+[[package]]
+name = "xkbcommon"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d66ca9352cbd4eecbbc40871d8a11b4ac8107cfc528a6e14d7c19c69d0e1ac9"
+dependencies = [
+ "as-raw-xcb-connection",
+ "libc",
+ "memmap2",
+ "xkeysym",
+]
+
 [[package]]
 name = "xkeysym"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56"
 
+[[package]]
+name = "xml-rs"
+version = "0.8.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e450f9b2ed1dff33c94c12589a87338689467b9c4f5d8a5710bd09a847d2c8a7"
+
+[[package]]
+name = "xml5ever"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9bbb26405d8e919bc1547a5aa9abc95cbfa438f04844f5fdd9dc7596b748bf69"
+dependencies = [
+ "log",
+ "mac",
+ "markup5ever 0.12.1",
+]
+
 [[package]]
 name = "xml5ever"
 version = "0.39.0"
@@ -7847,6 +10263,17 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e01738255b5a16e78bbb83e7fbba0a1e7dd506905cfc53f4622d89015a03fbb5"
 
+[[package]]
+name = "yeslogic-fontconfig-sys"
+version = "6.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d8b8abf912b9a29ff112e1671c97c33636903d13a69712037190e6805af4f76"
+dependencies = [
+ "dlib",
+ "once_cell",
+ "pkg-config",
+]
+
 [[package]]
 name = "yoke"
 version = "0.8.1"
@@ -7870,6 +10297,173 @@ dependencies = [
  "synstructure",
 ]
 
+[[package]]
+name = "zbus"
+version = "5.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5db4be7c075cb421e4b7ee645541604239bd243ba7c357511f4ff3a74b555907"
+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",
+ "libc",
+ "ordered-stream",
+ "rustix 1.1.4",
+ "serde",
+ "serde_repr",
+ "tracing",
+ "uds_windows",
+ "uuid",
+ "windows-sys 0.61.2",
+ "winnow 1.0.0",
+ "zbus_macros",
+ "zbus_names",
+ "zvariant",
+]
+
+[[package]]
+name = "zbus-lockstep"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6998de05217a084b7578728a9443d04ea4cd80f2a0839b8d78770b76ccd45863"
+dependencies = [
+ "zbus_xml",
+ "zvariant",
+]
+
+[[package]]
+name = "zbus-lockstep-macros"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10da05367f3a7b7553c8cdf8fa91aee6b64afebe32b51c95177957efc47ca3a0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+ "zbus-lockstep",
+ "zbus_xml",
+ "zvariant",
+]
+
+[[package]]
+name = "zbus_macros"
+version = "5.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2990635d09ade6df1868f72f8cac69a876a90981e8bd3c40b1be413f8dc88f40"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 3.0.6",
+ "zbus_names",
+ "zvariant",
+ "zvariant_utils",
+]
+
+[[package]]
+name = "zbus_names"
+version = "4.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8bf88b4a3ff53e883001e0e0115b297a9d53c31b9c1edd2bfdd853e3428624e"
+dependencies = [
+ "serde",
+ "winnow 1.0.0",
+ "zvariant",
+]
+
+[[package]]
+name = "zbus_xml"
+version = "5.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1586c021a01ca0a9216dcd874e546382e156a5cbab5fab6cb5f10087e22682a"
+dependencies = [
+ "serde",
+ "winnow 1.0.0",
+ "zbus_names",
+ "zvariant",
+]
+
+[[package]]
+name = "zcheapstr"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1afec51604565183aeb5c54c20aeab286120d4e4460f7f76e3e8bb8c0d99473"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "zed-font-kit"
+version = "0.14.1-zed"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3898e450f36f852edda72e3f985c34426042c4951790b23b107f93394f9bff5"
+dependencies = [
+ "bitflags 2.13.2",
+ "byteorder",
+ "core-foundation 0.10.1",
+ "core-graphics 0.24.0",
+ "core-text",
+ "dirs 5.0.1",
+ "dwrote",
+ "float-ord",
+ "freetype-sys",
+ "lazy_static",
+ "libc",
+ "log",
+ "pathfinder_geometry",
+ "pathfinder_simd",
+ "walkdir",
+ "winapi",
+ "yeslogic-fontconfig-sys",
+]
+
+[[package]]
+name = "zed-scap"
+version = "0.0.8-zed"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6b338d705ae33a43ca00287c11129303a7a0aa57b101b72a1c08c863f698ac8"
+dependencies = [
+ "anyhow",
+ "cocoa 0.25.0",
+ "core-graphics-helmer-fork",
+ "log",
+ "objc",
+ "rand 0.8.6",
+ "screencapturekit",
+ "screencapturekit-sys",
+ "sysinfo",
+ "tao-core-video-sys",
+ "windows 0.61.3",
+ "windows-capture",
+ "x11",
+ "xcb",
+]
+
+[[package]]
+name = "zed-xim"
+version = "0.4.0-zed"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c0b46ed118eba34d9ba53d94ddc0b665e0e06a2cf874cfa2dd5dec278148642"
+dependencies = [
+ "ahash",
+ "hashbrown 0.14.5",
+ "log",
+ "x11rb",
+ "xim-ctext",
+ "xim-parser",
+]
+
 [[package]]
 name = "zeno"
 version = "0.3.3"
@@ -7922,6 +10516,20 @@ name = "zeroize"
 version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
+dependencies = [
+ "zeroize_derive",
+]
+
+[[package]]
+name = "zeroize_derive"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c50655cbb0fe3fc43170059e702f1ce5e19b84cec58dc87b037a09935c2f328"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
 
 [[package]]
 name = "zerotrie"
@@ -8000,3 +10608,45 @@ checksum = "410e9ecef634c709e3831c2cfdb8d9c32164fae1c67496d5b68fff728eec37fe"
 dependencies = [
  "zune-core 0.5.1",
 ]
+
+[[package]]
+name = "zvariant"
+version = "5.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1d34c27cc6cdd1f458427519dd6b8612f7b7e3f7b9a0b2355d041dda9869147"
+dependencies = [
+ "endi",
+ "enumflags2",
+ "serde",
+ "serde_bytes",
+ "winnow 1.0.0",
+ "zcheapstr",
+ "zvariant_derive",
+ "zvariant_utils",
+]
+
+[[package]]
+name = "zvariant_derive"
+version = "5.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "864155e69b4352db0c7f374917bf45d1e0c8d17659c8b3dbf9795f3673f8c497"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 3.0.6",
+ "zvariant_utils",
+]
+
+[[package]]
+name = "zvariant_utils"
+version = "4.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bad0294361a320b694a328460dc73add56c306150f5cb6bfafc44446120008a3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "serde",
+ "syn 3.0.6",
+ "winnow 1.0.0",
+]
diff --git a/crates/rustmotion-studio/Cargo.toml b/crates/rustmotion-studio/Cargo.toml
index 40970e2b..b2ecc592 100644
--- a/crates/rustmotion-studio/Cargo.toml
+++ b/crates/rustmotion-studio/Cargo.toml
@@ -13,28 +13,16 @@ path = "src/bin/main.rs"
 
 [dependencies]
 rustmotion = { path = "../rustmotion" }
-
-# Pinned exactly, for two reasons. These are 0.x crates that ship breaking
-# changes in patch slots (0.6.2 removed the dock tiles canvas), and 0.7.0
-# removes `Root::render_dialog_layer`/`_sheet_`/`_notification_` with no
-# documented replacement — the three calls this app needs, kept isolated in
-# `app/overlays.rs` so that migration stays a localised patch. The kit in turn
-# pins `gpui-pre` at `=0.3.6`, so the whole graph moves in lockstep anyway;
-# saying so here makes it visible rather than surprising.
 gpui-kit = "=0.6.6"
-
+gpui-component = "0.6.6"
 clap = { version = "4", features = ["derive"] }
 notify = "7"
-# Also a *direct* dependency now, not only a transitive one: `RenderImage::new`
-# takes an `image::Frame`, and gpui-kit does not re-export `image`, so the types
-# only unify if we name the same major version ourselves.
 image = { version = "0.25", default-features = false, features = ["png", "jpeg", "webp"] }
-# Same reason: `RenderImage::new` takes a `SmallVec<[Frame; 1]>`.
 smallvec = "1"
 serde_json = { version = "1", features = ["preserve_order"] }
 tokio = { version = "1", features = ["time"] }
 rfd = "0.17"
 rodio = { version = "0.22", default-features = false, features = ["playback"] }
 dirs = "6.0.0"
-palette = { version = "0.7.6", default-features = false }
+palette = { version = "0.7.6", default-features = false, features = ["std"] }
 schemars = "0.8"
diff --git a/crates/rustmotion-studio/assets/dx-components-theme.css b/crates/rustmotion-studio/assets/dx-components-theme.css
deleted file mode 100644
index 46b1aefe..00000000
--- a/crates/rustmotion-studio/assets/dx-components-theme.css
+++ /dev/null
@@ -1,70 +0,0 @@
-/* This file contains the theme variables for the styled dioxus-components components. You only
- * need to import this file once in your project root.
- */
-
-html[data-theme="dark"] {
-  --dark: initial;
-  --light: ;
-}
-
-html[data-theme="light"] {
-  --dark: ;
-  --light: initial;
-}
-
-html[data-theme="dark"] [class~="dxc-system"] {
-  --dxc-light-on: ;
-  --dxc-dark-on: initial;
-}
-
-html[data-theme="light"] [class~="dxc-system"] {
-  --dxc-light-on: initial;
-  --dxc-dark-on: ;
-}
-
-@media (prefers-color-scheme: dark) {
-  :root {
-    --dark: initial;
-    --light: ;
-  }
-}
-
-@media (prefers-color-scheme: light) {
-  :root {
-    --dark: ;
-    --light: initial;
-  }
-}
-
-:root {
-  /* Primary colors */
-  --primary-color: var(--dark, #000) var(--light, #fff);
-  --primary-color-1: var(--dark, #0e0e0e) var(--light, #fbfbfb);
-  --primary-color-2: var(--dark, #0a0a0a) var(--light, #fff);
-  --primary-color-3: var(--dark, #141313) var(--light, #f8f8f8);
-  --primary-color-4: var(--dark, #1a1a1a) var(--light, #f8f8f8);
-  --primary-color-5: var(--dark, #262626) var(--light, #f5f5f5);
-  --primary-color-6: var(--dark, #232323) var(--light, #e5e5e5);
-  --primary-color-7: var(--dark, #3e3e3e) var(--light, #b0b0b0);
-
-  /* Secondary colors */
-  --secondary-color: var(--dark, #fff) var(--light, #000);
-  --secondary-color-1: var(--dark, #fafafa) var(--light, #000);
-  --secondary-color-2: var(--dark, #e6e6e6) var(--light, #0d0d0d);
-  --secondary-color-3: var(--dark, #dcdcdc) var(--light, #2b2b2b);
-  --secondary-color-4: var(--dark, #d4d4d4) var(--light, #111);
-  --secondary-color-5: var(--dark, #a1a1a1) var(--light, #848484);
-  --secondary-color-6: var(--dark, #5d5d5d) var(--light, #d0d0d0);
-
-  /* Highlight colors */
-  --focused-border-color: var(--dark, #2b7fff) var(--light, #2b7fff);
-  --primary-success-color: var(--dark, #02271c) var(--light, #ecfdf5);
-  --secondary-success-color: var(--dark, #b6fae3) var(--light, #10b981);
-  --primary-warning-color: var(--dark, #342203) var(--light, #fffbeb);
-  --secondary-warning-color: var(--dark, #feeac7) var(--light, #f59e0b);
-  --primary-error-color: var(--dark, #a22e2e) var(--light, #dc2626);
-  --secondary-error-color: var(--dark, #9b1c1c) var(--light, #ef4444);
-  --contrast-error-color: var(--dark, var(--secondary-color-3)) var(--light, var(--primary-color));
-  --primary-info-color: var(--dark, var(--primary-color-5)) var(--light, var(--primary-color));
-  --secondary-info-color: var(--dark, var(--primary-color-7)) var(--light, var(--secondary-color-3));
-}
diff --git a/crates/rustmotion-studio/src/app/mod.rs b/crates/rustmotion-studio/src/app/mod.rs
index 9ed00827..a321ea77 100644
--- a/crates/rustmotion-studio/src/app/mod.rs
+++ b/crates/rustmotion-studio/src/app/mod.rs
@@ -1,8 +1,7 @@
-//! The application shell: process entry points, the launch wiring, and the
-//! re-targetable file watcher.
-
+mod overlays;
 mod root;
 pub mod state;
+mod window;
 
 use std::path::PathBuf;
 use std::sync::mpsc::Sender;
@@ -13,15 +12,12 @@ use rustmotion::error::Result;
 use rustmotion::schema::ResolvedScenario;
 
 use crate::library::{LibraryState, SharedLibrary, WatchMsg};
-use crate::scenario::{empty_scenario, Shared, StudioModel};
-use root::StudioRoot;
+use crate::scenario::{empty_scenario, Shared, StudioModel, View};
 
 fn default_workspace() -> PathBuf {
     std::env::current_dir().unwrap_or_else(|_| PathBuf::from("."))
 }
 
-/// CLI-facing entry: open a scenario directly into the editor. The library
-/// home uses the file's parent directory as the workspace.
 pub fn run_preview(
     scenario: ResolvedScenario,
     input_path: Option<PathBuf>,
@@ -31,7 +27,6 @@ pub fn run_preview(
     run_preview_root(scenario, None, input_path, workspace, true, watch)
 }
 
-/// CLI-facing entry for the error case (file failed to load).
 pub fn run_preview_with_error(
     initial_error: String,
     input_path: Option<PathBuf>,
@@ -56,8 +51,6 @@ fn workspace_for(input_path: &Option<PathBuf>) -> PathBuf {
         .unwrap_or_else(default_workspace)
 }
 
-/// Launch the studio root: library home + editor, sharing one model, a library
-/// state, and a re-targetable file watcher.
 pub fn run_preview_root(
     scenario: ResolvedScenario,
     initial_error: Option<String>,
@@ -66,13 +59,6 @@ pub fn run_preview_root(
     start_in_editor: bool,
     watch: bool,
 ) -> Result<()> {
-    for view in &scenario.views {
-        engine::prefetch_icons(&view.scenes);
-        engine::preextract_video_frames(&view.scenes, scenario.video.fps);
-    }
-    // Audio analysis is NOT done here: it belongs to `StudioModel::new`, which
-    // every load path goes through. Doing it once at launch left a scenario
-    // opened or reloaded later with the wrong (or no) analysis for the session.
     if !scenario.fonts.is_empty() {
         engine::renderer::load_custom_fonts(&scenario.fonts);
     }
@@ -85,6 +71,8 @@ pub fn run_preview_root(
     let library: SharedLibrary =
         Arc::new(Mutex::new(LibraryState::new(workspace, start_in_editor)));
 
+    spawn_scenario_warmup(shared.clone());
+
     if watch {
         let tx = spawn_watcher(shared.clone());
         if let Some(p) = input_path.clone() {
@@ -93,17 +81,53 @@ pub fn run_preview_root(
         library.lock().unwrap_or_else(|e| e.into_inner()).watch_tx = Some(tx);
     }
 
-    dioxus::LaunchBuilder::desktop()
-        .with_context(shared)
-        .with_context(library)
-        .launch(StudioRoot);
+    let view = if start_in_editor {
+        View::Editor
+    } else {
+        View::Library
+    };
+    let theme_pref = crate::theme::persist::load_theme_pref();
+
+    gpui_kit::application()
+        .with_assets(gpui_kit::assets::AllAssets::new(""))
+        .run(move |cx| {
+            gpui_kit::init(cx);
+            cx.spawn(async move |cx| {
+                window::open(shared, library, view, theme_pref, cx);
+            })
+            .detach();
+        });
 
     Ok(())
 }
 
-/// One long-lived watcher thread owning a single `notify::Watcher`, driven by a
-/// channel of [`WatchMsg`]. `Retarget` switches the watched file; `Changed`
-/// (from the notify callback) reloads the current file into the shared model.
+pub fn spawn_scenario_warmup(shared: Shared) {
+    std::thread::spawn(move || {
+        let (scenario, fps) = {
+            let m = shared.lock().unwrap_or_else(|e| e.into_inner());
+            (m.scenario.clone(), m.scenario.video.fps)
+        };
+        for view in &scenario.views {
+            engine::prefetch_icons(&view.scenes);
+            engine::preextract_video_frames(&view.scenes, fps);
+        }
+        let failures = rustmotion::encode::audio_analysis::analyze_scenario_audio(&scenario);
+        let audio_error = (!failures.is_empty()).then(|| {
+            failures
+                .iter()
+                .map(|f| f.to_string())
+                .collect::<Vec<_>>()
+                .join(" \u{b7} ")
+        });
+
+        let mut m = shared.lock().unwrap_or_else(|e| e.into_inner());
+        if Arc::ptr_eq(&m.scenario, &scenario) {
+            m.audio_error = audio_error;
+            m.generation = m.generation.wrapping_add(1);
+        }
+    });
+}
+
 fn spawn_watcher(shared: Shared) -> Sender<WatchMsg> {
     use notify::{RecursiveMode, Watcher};
     let (tx, rx) = std::sync::mpsc::channel::<WatchMsg>();
@@ -133,12 +157,6 @@ fn spawn_watcher(shared: Shared) -> Sender<WatchMsg> {
                 }
                 WatchMsg::Changed => {
                     if let Some(p) = current.clone() {
-                        // Self-write skip: if the disk content is exactly what
-                        // this process last wrote (debounced write, undo), the
-                        // in-memory model is already up to date — and possibly
-                        // NEWER under continuous typing. Reloading would
-                        // clobber it, so skip. External edits hash differently
-                        // and reload normally.
                         if let Ok(content) = std::fs::read_to_string(&p) {
                             if crate::scenario::is_self_write(
                                 &crate::scenario::self_write_slot(),
@@ -156,6 +174,8 @@ fn spawn_watcher(shared: Shared) -> Sender<WatchMsg> {
                         let g = m.generation.wrapping_add(1);
                         *m = StudioModel::new(scenario, error, Some(p.clone()));
                         m.generation = g;
+                        drop(m);
+                        spawn_scenario_warmup(shared.clone());
                     }
                 }
             }
diff --git a/crates/rustmotion-studio/src/app/overlays.rs b/crates/rustmotion-studio/src/app/overlays.rs
new file mode 100644
index 00000000..78427291
--- /dev/null
+++ b/crates/rustmotion-studio/src/app/overlays.rs
@@ -0,0 +1,9 @@
+use gpui_component::Root;
+use gpui_kit::*;
+
+pub fn render(window: &mut Window, cx: &mut App) -> impl IntoElement {
+    div()
+        .children(Root::render_sheet_layer(window, cx))
+        .children(Root::render_dialog_layer(window, cx))
+        .children(Root::render_notification_layer(window, cx))
+}
diff --git a/crates/rustmotion-studio/src/app/root.rs b/crates/rustmotion-studio/src/app/root.rs
index 918704a8..2e285ae8 100644
--- a/crates/rustmotion-studio/src/app/root.rs
+++ b/crates/rustmotion-studio/src/app/root.rs
@@ -1,194 +1,46 @@
-use std::sync::Arc;
-
-use dioxus::desktop::{
-    use_asset_handler, wry::http::Response, AssetRequest, RequestAsyncResponder,
-};
-use dioxus::prelude::*;
-
-use crate::editor::StudioApp;
-use crate::library::{render_thumbnail, Library, SharedLibrary};
-use crate::scenario::{Shared, Theme, View};
-
-/// dx-component CSS, injected globally. `#[css_module]` only injects its compiled
-/// stylesheet through the `dx` asset pipeline, which our plain `cargo`-built
-/// `rustmotion studio` binary doesn't run — so we bundle the (unscoped) CSS at
-/// compile time and inject it as a `<style>` block, the same way the theme is
-/// applied. The matching component wrappers use plain class names.
-const SELECT_CSS: &str = include_str!("../components/select/style.css");
-const COLOR_PICKER_CSS: &str = include_str!("../components/color_picker/style.css");
-const SWITCH_CSS: &str = include_str!("../components/switch/style.css");
-const SLIDER_CSS: &str = include_str!("../components/slider/style.css");
-const INPUT_CSS: &str = include_str!("../components/input/style.css");
-const BUTTON_CSS: &str = include_str!("../components/button/style.css");
-
-/// Semantic palette tokens (`--rm-*`) for each theme, plus the `--dx-*` vars the
-/// `components/` scaffold reads. `System` defaults to the light palette and
-/// swaps to dark under `prefers-color-scheme: dark`. Every studio inline style
-/// references these variables so a theme switch repaints the whole app.
-const THEME_CSS: &str = r##"
-.rm-dark, .rm-system {
-  --rm-bg:#0c0d10; --rm-surface:#13161d; --rm-surface-2:#0f1218; --rm-surface-3:#1c2230;
-  --rm-border:#1c1f27; --rm-border-2:#2a2f3a;
-  --rm-text:#cfd3dc; --rm-text-strong:#e6e9ef; --rm-text-muted:#7a7f8a;
-  --rm-accent:#4c8dff; --rm-on-accent:#ffffff; --rm-error:#ff6b6b;
-  --rm-overlay-hover:rgba(255,255,255,0.06); --rm-overlay-border:rgba(255,255,255,0.45);
-}
-.rm-light {
-  --rm-bg:#f4f2ee; --rm-surface:#ffffff; --rm-surface-2:#faf8f5; --rm-surface-3:#efece6;
-  --rm-border:#e7e4df; --rm-border-2:#d8d3cc;
-  --rm-text:#3f3a35; --rm-text-strong:#1c1917; --rm-text-muted:#857d73;
-  --rm-accent:#2563eb; --rm-on-accent:#ffffff; --rm-error:#d92d20;
-  --rm-overlay-hover:rgba(0,0,0,0.05); --rm-overlay-border:rgba(37,99,235,0.55);
+use gpui_component::ActiveTheme;
+use gpui_kit::base::v_flex;
+use gpui_kit::*;
+
+use crate::app::overlays;
+use crate::app::state::StudioState;
+use crate::editor::view::EditorView;
+use crate::library::Library;
+use crate::scenario::View;
+
+pub struct StudioRoot {
+    state: Entity<StudioState>,
+    library: Entity<Library>,
+    editor: Entity<EditorView>,
 }
-@media (prefers-color-scheme: light) {
-  .rm-system {
-    --rm-bg:#f4f2ee; --rm-surface:#ffffff; --rm-surface-2:#faf8f5; --rm-surface-3:#efece6;
-    --rm-border:#e7e4df; --rm-border-2:#d8d3cc;
-    --rm-text:#3f3a35; --rm-text-strong:#1c1917; --rm-text-muted:#857d73;
-    --rm-accent:#2563eb; --rm-on-accent:#ffffff; --rm-error:#d92d20;
-    --rm-overlay-hover:rgba(0,0,0,0.05); --rm-overlay-border:rgba(37,99,235,0.55);
-  }
-}
-.rm-dark, .rm-light, .rm-system {
-  --primary-color: var(--rm-text);
-  --primary-color-1: var(--rm-text-strong);
-  --primary-color-2: var(--rm-text-strong);
-  --primary-color-4: var(--rm-text-muted);
-  --primary-color-5: var(--rm-text-muted);
-  --primary-color-6: var(--rm-border-2);
-  --primary-color-7: var(--rm-border);
-  --secondary-color-1: var(--rm-surface-2);
-  --secondary-color-2: var(--rm-accent);
-  --secondary-color-4: var(--rm-border);
-  --secondary-color-5: var(--rm-surface);
-  --primary-error-color: var(--rm-error);
-  --contrast-error-color: var(--rm-on-accent);
-  --focused-border-color: var(--rm-accent);
-  --dx-sidebar-background: var(--rm-surface);
-  --dx-sidebar-foreground: var(--rm-text);
-  --dx-sidebar-border: var(--rm-border);
-  --dx-sidebar-accent: var(--rm-surface-3);
-  --dx-sidebar-accent-foreground: var(--rm-text-strong);
-  --dx-sidebar-ring: var(--rm-accent);
-  --dx-sidebar-width: 280px;
-  --dx-sidebar-width-icon: 56px;
-  --dx-sidebar-width-mobile: 280px;
-}
-html, body { margin: 0; font: 13px -apple-system, sans-serif; }
-* { box-sizing: border-box; }
-"##;
-
-/// The inspector's segmented-control container (the Align / B-I groups). The
-/// buttons inside are now `Button` components; this just gives the group its
-/// inset background and rounded border.
-const INSPECTOR_CSS: &str = r##"
-.rm-seg { display:flex; gap:2px; width:100%; box-sizing:border-box; background:var(--rm-surface-2); border:1px solid var(--rm-border); border-radius:7px; padding:2px; }
-"##;
 
-/// Root: switches between the library home and the editor, and serves
-/// per-scenario thumbnails (persists across view switches).
-#[component]
-pub fn StudioRoot() -> Element {
-    let library = use_context::<SharedLibrary>();
-    let _shared = use_context::<Shared>();
-
-    let view = use_signal(|| {
-        if library.lock().map(|l| l.start_in_editor).unwrap_or(false) {
-            View::Editor
-        } else {
-            View::Library
+impl StudioRoot {
+    pub fn new(state: Entity<StudioState>, window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let library = cx.new(|cx| Library::new(state.clone(), window, cx));
+        let editor = cx.new(|cx| EditorView::new(state.clone(), window, cx));
+        cx.observe(&state, |_, _, cx| cx.notify()).detach();
+        Self {
+            state,
+            library,
+            editor,
         }
-    });
-
-    // Active theme, shared via context so the topbar's swap control can flip it.
-    let theme = use_signal(|| Theme::System);
-    use_context_provider(|| theme);
-
-    // Open at 75% of the current monitor, centered. Runtime one-shot: tao
-    // monitors are only queryable once the window exists, so a pre-display
-    // Config sizing isn't possible — the first-frame resize flash is accepted.
-    // No detectable monitor → silent no-op.
-    use_effect(|| {
-        let window = dioxus::desktop::window();
-        if let Some(monitor) = window.current_monitor() {
-            let size = monitor.size();
-            if size.width == 0 || size.height == 0 {
-                return;
-            }
-            let w = (size.width as f64 * 0.75) as u32;
-            let h = (size.height as f64 * 0.75) as u32;
-            let pos = monitor.position();
-            let x = pos.x + ((size.width - w) / 2) as i32;
-            let y = pos.y + ((size.height - h) / 2) as i32;
-            window.set_inner_size(dioxus::desktop::tao::dpi::PhysicalSize::new(w, h));
-            window.set_outer_position(dioxus::desktop::tao::dpi::PhysicalPosition::new(x, y));
-        }
-    });
-
-    // /thumb/{i} -> scenario at flat index i, frame-0 JPEG (cached; rendered
-    // off-lock to avoid blocking other asset requests).
-    let thumb_lib = library.clone();
-    use_asset_handler(
-        "thumb",
-        move |request: AssetRequest, responder: RequestAsyncResponder| {
-            let uri = request.uri().to_string();
-            let i: usize = uri
-                .rsplit('/')
-                .next()
-                .and_then(|s| s.split('?').next())
-                .and_then(|s| s.parse().ok())
-                .unwrap_or(usize::MAX);
-
-            let (cached, path) = {
-                let lib = thumb_lib.lock().unwrap_or_else(|e| e.into_inner());
-                let path = lib.path_at(i);
-                let cached = path.as_ref().and_then(|p| lib.thumb_cache.get(p).cloned());
-                (cached, path)
-            };
-
-            let bytes: Vec<u8> = if let Some(c) = cached {
-                (*c).clone()
-            } else if let Some(p) = path {
-                match render_thumbnail(&p) {
-                    Some(jpeg) => {
-                        let arc = Arc::new(jpeg);
-                        thumb_lib
-                            .lock()
-                            .unwrap_or_else(|e| e.into_inner())
-                            .thumb_cache
-                            .insert(p, arc.clone());
-                        (*arc).clone()
-                    }
-                    None => Vec::new(),
-                }
-            } else {
-                Vec::new()
-            };
-
-            responder.respond(
-                Response::builder()
-                    .header("Content-Type", "image/jpeg")
-                    .header("Cache-Control", "no-store")
-                    .body(bytes)
-                    .unwrap(),
-            );
-        },
-    );
+    }
+}
 
-    rsx! {
-        style { "{THEME_CSS}" }
-        style { "{SELECT_CSS}" }
-        style { "{COLOR_PICKER_CSS}" }
-        style { "{SWITCH_CSS}" }
-        style { "{SLIDER_CSS}" }
-        style { "{INPUT_CSS}" }
-        style { "{BUTTON_CSS}" }
-        style { "{INSPECTOR_CSS}" }
-        div { class: "{theme().class()}", style: "min-height:100vh; background:var(--rm-bg); color:var(--rm-text);",
-            {match view() {
-                View::Library => rsx! { Library { view } },
-                View::Editor => rsx! { StudioApp { view } },
-            }}
-        }
+impl Render for StudioRoot {
+    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let view = self.state.read(cx).view;
+
+        let screen = match view {
+            View::Library => self.library.clone().into_any_element(),
+            View::Editor => self.editor.clone().into_any_element(),
+        };
+
+        v_flex()
+            .size_full()
+            .bg(cx.theme().background)
+            .text_color(cx.theme().foreground)
+            .child(screen)
+            .child(overlays::render(window, cx))
     }
 }
diff --git a/crates/rustmotion-studio/src/app/window.rs b/crates/rustmotion-studio/src/app/window.rs
new file mode 100644
index 00000000..3b673478
--- /dev/null
+++ b/crates/rustmotion-studio/src/app/window.rs
@@ -0,0 +1,55 @@
+use gpui_component::Root;
+use gpui_kit::{
+    px, size, App, AppContext as _, AsyncApp, Bounds, Pixels, TitlebarOptions, WindowBounds,
+    WindowOptions,
+};
+
+use crate::app::root::StudioRoot;
+use crate::app::state::{StudioState, ThemePref};
+use crate::library::SharedLibrary;
+use crate::scenario::{Shared, View};
+use crate::theme;
+
+pub fn open(
+    shared: Shared,
+    library: SharedLibrary,
+    view: View,
+    theme_pref: ThemePref,
+    cx: &mut AsyncApp,
+) {
+    let bounds = cx.update(initial_bounds);
+    let options = WindowOptions {
+        window_bounds: Some(WindowBounds::Windowed(bounds)),
+        titlebar: Some(TitlebarOptions {
+            title: Some("Rustmotion Studio".into()),
+            ..Default::default()
+        }),
+        window_min_size: Some(size(px(720.), px(480.))),
+        ..Default::default()
+    };
+
+    cx.open_window(options, move |window, cx| {
+        let state = cx.new(|_| StudioState {
+            shared,
+            library,
+            view,
+            theme_pref,
+        });
+
+        theme::apply(theme_pref, Some(window), cx);
+        theme::watch_system_appearance(state.clone(), window);
+
+        let root_view = cx.new(|cx| StudioRoot::new(state, window, cx));
+        cx.new(|cx| Root::new(root_view, window, cx))
+    })
+    .expect("failed to open window");
+}
+
+fn initial_bounds(cx: &mut App) -> Bounds<Pixels> {
+    let target = cx
+        .primary_display()
+        .map(|display| display.bounds().size)
+        .map(|full| size(full.width * 0.75, full.height * 0.75))
+        .unwrap_or_else(|| size(px(1280.), px(800.)));
+    Bounds::centered(None, target, cx)
+}
diff --git a/crates/rustmotion-studio/src/components/button/component.rs b/crates/rustmotion-studio/src/components/button/component.rs
deleted file mode 100644
index 9579fb69..00000000
--- a/crates/rustmotion-studio/src/components/button/component.rs
+++ /dev/null
@@ -1,107 +0,0 @@
-// UI kit scaffold — variants are consumed incrementally as the studio grows.
-#![allow(dead_code)]
-use dioxus::prelude::*;
-use dioxus_primitives::dioxus_attributes::attributes;
-use dioxus_primitives::merge_attributes;
-
-#[derive(Copy, Clone, PartialEq, Default)]
-#[non_exhaustive]
-pub enum ButtonVariant {
-    #[default]
-    Primary,
-    Secondary,
-    Destructive,
-    Outline,
-    Ghost,
-    Link,
-}
-
-impl ButtonVariant {
-    pub fn class(&self) -> &'static str {
-        match self {
-            ButtonVariant::Primary => "primary",
-            ButtonVariant::Secondary => "secondary",
-            ButtonVariant::Destructive => "destructive",
-            ButtonVariant::Outline => "outline",
-            ButtonVariant::Ghost => "ghost",
-            ButtonVariant::Link => "link",
-        }
-    }
-}
-
-#[derive(Copy, Clone, PartialEq, Default)]
-#[non_exhaustive]
-pub enum ButtonSize {
-    Xs,
-    Sm,
-    #[default]
-    Default,
-    Lg,
-    Icon,
-    IconXs,
-    IconSm,
-    IconLg,
-}
-
-impl ButtonSize {
-    pub fn class(&self) -> &'static str {
-        match self {
-            ButtonSize::Xs => "xs",
-            ButtonSize::Sm => "sm",
-            ButtonSize::Default => "default",
-            ButtonSize::Lg => "lg",
-            ButtonSize::Icon => "icon",
-            ButtonSize::IconXs => "icon-xs",
-            ButtonSize::IconSm => "icon-sm",
-            ButtonSize::IconLg => "icon-lg",
-        }
-    }
-}
-
-#[component]
-pub fn Button(
-    #[props(default)] variant: ButtonVariant,
-    #[props(default)] size: ButtonSize,
-    #[props(extends=GlobalAttributes)]
-    #[props(extends=button)]
-    attributes: Vec<Attribute>,
-    onclick: Option<EventHandler<MouseEvent>>,
-    onmousedown: Option<EventHandler<MouseEvent>>,
-    onmouseup: Option<EventHandler<MouseEvent>>,
-    onkeydown: Option<EventHandler<KeyboardEvent>>,
-    children: Element,
-) -> Element {
-    let base = attributes!(button {
-        class: "dx-button",
-        "data-style": variant.class(),
-        "data-size": size.class(),
-    });
-    let merged = merge_attributes(vec![base, attributes]);
-
-    rsx! {
-        button {
-            onclick: move |event| {
-                if let Some(f) = &onclick {
-                    f.call(event);
-                }
-            },
-            onmousedown: move |event| {
-                if let Some(f) = &onmousedown {
-                    f.call(event);
-                }
-            },
-            onmouseup: move |event| {
-                if let Some(f) = &onmouseup {
-                    f.call(event);
-                }
-            },
-            onkeydown: move |event| {
-                if let Some(f) = &onkeydown {
-                    f.call(event);
-                }
-            },
-            ..merged,
-            {children}
-        }
-    }
-}
diff --git a/crates/rustmotion-studio/src/components/button/mod.rs b/crates/rustmotion-studio/src/components/button/mod.rs
deleted file mode 100644
index 2590c013..00000000
--- a/crates/rustmotion-studio/src/components/button/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-mod component;
-pub use component::*;
diff --git a/crates/rustmotion-studio/src/components/button/style.css b/crates/rustmotion-studio/src/components/button/style.css
deleted file mode 100644
index a482807e..00000000
--- a/crates/rustmotion-studio/src/components/button/style.css
+++ /dev/null
@@ -1,202 +0,0 @@
-.dx-button {
-  display: inline-flex;
-  box-sizing: border-box;
-  flex-shrink: 0;
-  align-items: center;
-  justify-content: center;
-  padding: 0;
-  border: none;
-  border-radius: 0.5rem;
-  cursor: pointer;
-  font-family: inherit;
-  font-size: 0.875rem;
-  font-weight: 500;
-  gap: 0.5rem;
-  line-height: 1.25rem;
-  outline: none;
-  appearance: none;
-  -webkit-appearance: none;
-  transition-duration: 150ms;
-  transition-property: all;
-  transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-  white-space: nowrap;
-}
-
-.dx-button svg {
-  flex-shrink: 0;
-  pointer-events: none;
-}
-
-.dx-button svg:not([class*="size-"]) {
-  width: 1rem;
-  height: 1rem;
-}
-
-.dx-button[data-size="xs"] {
-  height: 1.5rem;
-  padding: 0 0.5rem;
-  border-radius: 0.5rem;
-  font-size: 0.75rem;
-  gap: 0.25rem;
-  line-height: 1rem;
-}
-
-.dx-button[data-size="xs"]:has(> svg) {
-  padding-inline: 0.375rem;
-}
-
-.dx-button[data-size="xs"] svg:not([class*="size-"]) {
-  width: 0.75rem;
-  height: 0.75rem;
-}
-
-.dx-button[data-size="sm"] {
-  height: 2rem;
-  padding: 0 0.75rem;
-  border-radius: 0.5rem;
-  gap: 0.375rem;
-}
-
-.dx-button[data-size="sm"]:has(> svg) {
-  padding-inline: 0.625rem;
-}
-
-.dx-button[data-size="default"] {
-  height: 2.25rem;
-  padding: 0.5rem 1rem;
-}
-
-.dx-button[data-size="default"]:has(> svg) {
-  padding-inline: 0.75rem;
-}
-
-.dx-button[data-size="lg"] {
-  height: 2.5rem;
-  padding: 0 1.5rem;
-  border-radius: 0.5rem;
-}
-
-.dx-button[data-size="lg"]:has(> svg) {
-  padding-inline: 1rem;
-}
-
-.dx-button[data-size="icon"] {
-  width: 2.25rem;
-  height: 2.25rem;
-}
-
-.dx-button[data-size="icon"] svg:not([class*="size-"]) {
-  width: 1rem;
-  height: 1rem;
-}
-
-.dx-button[data-size="icon-xs"] {
-  width: 1.5rem;
-  height: 1.5rem;
-  border-radius: 0.5rem;
-}
-
-.dx-button[data-size="icon-xs"] svg:not([class*="size-"]) {
-  width: 0.75rem;
-  height: 0.75rem;
-}
-
-.dx-button[data-size="icon-sm"] {
-  width: 2rem;
-  height: 2rem;
-}
-
-.dx-button[data-size="icon-sm"] svg:not([class*="size-"]) {
-  width: 1rem;
-  height: 1rem;
-}
-
-.dx-button[data-size="icon-lg"] {
-  width: 2.5rem;
-  height: 2.5rem;
-}
-
-.dx-button[data-size="icon-lg"] svg:not([class*="size-"]) {
-  width: 1rem;
-  height: 1rem;
-}
-
-.dx-button:disabled {
-  opacity: 0.5;
-  pointer-events: none;
-}
-
-.dx-button[data-style="primary"] {
-  background-color: var(--rm-accent);
-  color: var(--rm-on-accent);
-}
-
-.dx-button[data-style="primary"]:not(:disabled):hover {
-  background-color: color-mix(in oklab, var(--rm-accent) 88%, black);
-}
-
-.dx-button[data-style="secondary"] {
-  background-color: var(--rm-surface-3);
-  color: var(--rm-text-strong);
-}
-
-.dx-button[data-style="secondary"]:not(:disabled):hover {
-  background-color: color-mix(in oklab, var(--rm-surface-3) 75%, var(--rm-text-muted));
-}
-
-.dx-button[data-style="ghost"] {
-  background-color: transparent;
-  color: var(--rm-text);
-}
-
-.dx-button[data-style="ghost"]:not(:disabled):hover {
-  background-color: var(--rm-surface-3);
-  color: var(--rm-text-strong);
-}
-
-.dx-button[data-style="outline"] {
-  border: 1px solid var(--rm-border-2);
-  background-color: var(--rm-surface);
-  color: var(--rm-text);
-}
-
-.dx-button[data-style="outline"]:not(:disabled):hover {
-  background-color: var(--rm-surface-3);
-  color: var(--rm-text-strong);
-}
-
-.dx-button[data-style="destructive"] {
-  background-color: var(--rm-error);
-  color: var(--rm-on-accent);
-}
-
-.dx-button[data-style="destructive"]:not(:disabled):hover {
-  background-color: color-mix(in oklab, var(--rm-error) 88%, black);
-}
-
-.dx-button[data-style="destructive"]:focus-visible {
-  box-shadow: 0 0 0 3px color-mix(in oklab, var(--rm-error) 35%, transparent);
-}
-
-.dx-button[data-style="link"] {
-  background-color: transparent;
-  color: var(--rm-accent);
-  text-decoration: none;
-  text-underline-offset: 0.25rem;
-}
-
-.dx-button[data-style="link"]:not(:disabled):hover {
-  text-decoration: underline;
-}
-
-.dx-button:focus-visible {
-  box-shadow: 0 0 0 3px color-mix(in oklab, var(--rm-accent) 50%, transparent);
-}
-
-.dx-button[aria-invalid="true"] {
-  border-color: var(--rm-error);
-}
-
-.dx-button[aria-invalid="true"]:focus-visible {
-  box-shadow: 0 0 0 3px color-mix(in oklab, var(--rm-error) 35%, transparent);
-}
diff --git a/crates/rustmotion-studio/src/components/color_picker/component.rs b/crates/rustmotion-studio/src/components/color_picker/component.rs
deleted file mode 100644
index 2d58a5bb..00000000
--- a/crates/rustmotion-studio/src/components/color_picker/component.rs
+++ /dev/null
@@ -1,567 +0,0 @@
-use std::sync::atomic::{AtomicU64, Ordering};
-
-use dioxus::prelude::*;
-use dioxus_primitives::color_picker::{self, Color, ColorAreaProps, ColorPickerContext};
-use dioxus_primitives::label::Label;
-use dioxus_primitives::popover;
-use dioxus_primitives::slider::*;
-use dioxus_primitives::use_controlled;
-use palette::{encoding, FromColor, Hsv, IntoColor, RgbHue, Srgb};
-
-use crate::components::input::Input;
-
-// ADOPTION BOUNDARY — this file mirrors the OFFICIAL DioxusLabs/components
-// color picker (preview/src/components/color_picker/component.rs at the
-// pinned checkout), composed from the `dioxus_primitives::color_picker` and
-// `popover` primitives. Popover behavior (open state, outside-click dismiss,
-// global Escape) and positioning (CSS `absolute` under the trigger) are
-// UPSTREAM's — we deliberately implement no positioning of our own.
-//
-// Our divergences, kept to the minimum:
-// 1. `--rm-*` theming in style.css (values only; selectors upstream).
-// 2. A local HSV mirror in `ColorPickerRoot` (live drag preview + guaranteed
-//    `on_color_change` propagation).
-// 3. Panel-wide exclusivity: the `ColorPicker` wrapper drives the primitive's
-//    CONTROLLED `open` from the shared [`OpenPicker`] state (one picker open
-//    at a time); upstream's dismiss paths flow through `on_open_change` and
-//    compose cleanly with it.
-
-fn format_color_hex(color: Color) -> String {
-    format!("#{color:X}")
-}
-
-/// Which color picker is currently expanded, shared across the inspector
-/// panel so only ONE picker is open at a time. The wrapper feeds this into
-/// the primitive's controlled `open`; without the context the picker is
-/// uncontrolled (upstream default behavior).
-#[derive(Clone, Copy)]
-pub struct OpenPicker(pub Signal<Option<u64>>);
-
-/// Exclusive-state transition for a primitive `on_open_change(open)` event
-/// (pure): opening claims the slot (closing any other picker); closing only
-/// releases it if this picker holds it.
-pub fn apply_open_change(current: Option<u64>, id: u64, open: bool) -> Option<u64> {
-    if open {
-        Some(id)
-    } else if current == Some(id) {
-        None
-    } else {
-        current
-    }
-}
-
-/// Stable per-instance picker id.
-fn next_picker_id() -> u64 {
-    static NEXT: AtomicU64 = AtomicU64::new(1);
-    NEXT.fetch_add(1, Ordering::Relaxed)
-}
-
-#[derive(Clone, Copy)]
-struct ColorPickerRootContext {
-    open: Memo<bool>,
-    disabled: ReadSignal<bool>,
-    color: ReadSignal<Hsv<encoding::Srgb, f64>>,
-}
-
-/// The props for the [`ColorPickerRoot`] component.
-#[derive(Props, Clone, PartialEq)]
-pub struct ColorPickerRootProps {
-    /// The selected color
-    #[props(default)]
-    pub color: ReadSignal<Hsv<encoding::Srgb, f64>>,
-
-    /// Callback when color changes
-    #[props(default)]
-    pub on_color_change: Callback<Hsv<encoding::Srgb, f64>>,
-
-    /// Whether the color picker is disabled
-    #[props(default)]
-    pub disabled: ReadSignal<bool>,
-
-    /// The controlled open state of the popover.
-    pub open: ReadSignal<Option<bool>>,
-
-    /// The default open state when uncontrolled.
-    #[props(default)]
-    pub default_open: bool,
-
-    /// Callback fired when the open state changes.
-    #[props(default)]
-    pub on_open_change: Callback<bool>,
-
-    /// Additional attributes to extend the color picker element
-    #[props(extends = GlobalAttributes)]
-    pub attributes: Vec<Attribute>,
-
-    /// The children of the color picker element
-    pub children: Element,
-}
-
-#[component]
-pub fn ColorPickerRoot(props: ColorPickerRootProps) -> Element {
-    let (open, set_open) = use_controlled(props.open, props.default_open, props.on_open_change);
-
-    // OUR divergence: local mirror of the color. The picker internals (area
-    // drag, hue slider, hex field) read/write THIS state, so every selection
-    // — including mid-drag moves — previews live AND propagates through
-    // `on_color_change` immediately, independent of whether the parent echoes
-    // the new color back through the `color` prop.
-    let mut local = use_signal(|| (props.color)());
-    use_effect(move || {
-        let external = (props.color)();
-        if external != *local.peek() {
-            local.set(external);
-        }
-    });
-    let forward = props.on_color_change;
-    let on_change = move |c: Hsv<encoding::Srgb, f64>| {
-        local.set(c);
-        forward.call(c);
-    };
-
-    use_context_provider(|| ColorPickerRootContext {
-        open,
-        disabled: props.disabled,
-        color: local.into(),
-    });
-
-    rsx! {
-        color_picker::ColorPicker {
-            class: "dx-color-picker",
-            color: local(),
-            on_color_change: on_change,
-            disabled: props.disabled,
-            attributes: props.attributes,
-            popover::PopoverRoot {
-                is_modal: false,
-                open: Some(open()),
-                on_open_change: move |v| set_open.call(v),
-                {props.children}
-            }
-        }
-    }
-}
-
-/// The props for the [`ColorPickerTrigger`] component.
-#[derive(Props, Clone, PartialEq)]
-pub struct ColorPickerTriggerProps {
-    /// Optional label on the trigger button
-    #[props(default)]
-    pub label: Option<String>,
-
-    /// Additional attributes to extend the trigger button
-    #[props(extends = GlobalAttributes)]
-    pub attributes: Vec<Attribute>,
-
-    /// Additional content to render inside the trigger button
-    pub children: Element,
-}
-
-#[component]
-pub fn ColorPickerTrigger(props: ColorPickerTriggerProps) -> Element {
-    let ctx = use_context::<ColorPickerRootContext>();
-    let aria_hex = use_memo(move || {
-        let rgb: Color = Srgb::<f64>::from_color((ctx.color)()).into_format();
-        format_color_hex(rgb)
-    });
-
-    rsx! {
-        popover::PopoverTrigger {
-            class: "dx-color-picker-button",
-            disabled: if (ctx.disabled)() { true },
-            aria_label: format!("Color picker {aria_hex}"),
-            aria_expanded: (ctx.open)(),
-            attributes: props.attributes,
-            ColorSwatch { color: ctx.color }
-            if let Some(label) = props.label { span { {label} } }
-            {props.children}
-        }
-    }
-}
-
-/// The props for the [`ColorPickerPopover`] component.
-#[derive(Props, Clone, PartialEq)]
-pub struct ColorPickerPopoverProps {
-    /// Additional attributes to extend the popover content
-    #[props(extends = GlobalAttributes)]
-    pub attributes: Vec<Attribute>,
-
-    /// The children of the color picker popover
-    pub children: Element,
-}
-
-/// Upstream verbatim: the popover primitive owns open/dismiss (outside click,
-/// global Escape) and the position comes from the stylesheet — no runtime
-/// positioning on our side.
-#[component]
-pub fn ColorPickerPopover(props: ColorPickerPopoverProps) -> Element {
-    rsx! {
-        popover::PopoverContent {
-            class: "dx-color-picker-popover".to_string(),
-            attributes: props.attributes,
-            {props.children}
-        }
-    }
-}
-
-/// The props for the [`ColorPicker`] component.
-#[derive(Props, Clone, PartialEq)]
-pub struct ColorPickerProps {
-    /// The selected color
-    #[props(default)]
-    pub color: ReadSignal<Hsv<encoding::Srgb, f64>>,
-
-    /// Callback when color changes
-    #[props(default)]
-    pub on_color_change: Callback<Hsv<encoding::Srgb, f64>>,
-
-    /// Whether the color picker is disabled
-    #[props(default)]
-    pub disabled: ReadSignal<bool>,
-
-    /// Optional label on the trigger button
-    #[props(default)]
-    pub label: Option<String>,
-
-    /// Callback fired when the open state changes.
-    #[props(default)]
-    pub on_open_change: Callback<bool>,
-
-    /// Additional attributes to extend the color picker element
-    #[props(extends = GlobalAttributes)]
-    pub attributes: Vec<Attribute>,
-
-    /// Additional content to append to the default color picker popover
-    pub children: Element,
-}
-
-/// The styled wrapper every inspector row uses (swatch trigger + popover with
-/// the full editor). Adds panel-wide exclusivity on top of the upstream
-/// primitives by CONTROLLING their `open`.
-#[component]
-pub fn ColorPicker(props: ColorPickerProps) -> Element {
-    let id = use_hook(next_picker_id);
-    let shared = try_consume_context::<OpenPicker>();
-    // Controlled when the panel provides the exclusivity context, otherwise
-    // uncontrolled (upstream default).
-    let controlled_open: Option<bool> = shared.map(|s| (s.0)() == Some(id));
-
-    let forward_open = props.on_open_change;
-    let on_open_change = move |v: bool| {
-        if let Some(s) = shared {
-            let mut sig = s.0;
-            let next = apply_open_change(sig(), id, v);
-            sig.set(next);
-        }
-        forward_open.call(v);
-    };
-
-    rsx! {
-        ColorPickerRoot {
-            color: props.color,
-            on_color_change: props.on_color_change,
-            disabled: props.disabled,
-            open: controlled_open,
-            on_open_change,
-            attributes: props.attributes,
-            ColorPickerTrigger {
-                label: props.label,
-            }
-            ColorPickerPopover {
-                ColorPickerSelect {}
-                {props.children}
-            }
-        }
-    }
-}
-
-/// The props for the [`ColorField`] component.
-#[derive(Props, Clone, PartialEq)]
-pub struct ColorFieldProps {
-    /// Optional label above the input field
-    #[props(default)]
-    pub label: Option<String>,
-
-    /// Optional props for the text description element
-    #[props(default)]
-    pub description: Option<String>,
-
-    /// Additional attributes to extend the color field element
-    #[props(extends = GlobalAttributes)]
-    pub attributes: Vec<Attribute>,
-
-    /// The children of the color field element
-    pub children: Element,
-}
-
-/// # ColorField
-///
-/// The [`ColorField`] allows users to edit a hex color. Reads and writes the
-/// current color through the surrounding [`ColorPickerContext`].
-#[component]
-fn ColorField(props: ColorFieldProps) -> Element {
-    let ctx = use_context::<ColorPickerContext>();
-    let hex_from_hsv = |hsv: Hsv<encoding::Srgb, f64>| {
-        let rgb: Color = Srgb::<f64>::from_color(hsv).into_format();
-        format_color_hex(rgb)
-    };
-    let emit_rgb = move |rgb: Color| {
-        let hsv: Hsv<encoding::Srgb, f64> = rgb.into_format::<f64>().into_color();
-        ctx.set_color(hsv);
-    };
-
-    let mut value = use_signal(|| hex_from_hsv(ctx.color()));
-
-    // Synchronize local text with external color changes. Only overwrite
-    // when the field already holds a parseable hex — otherwise the user is
-    // mid-edit and replacing their text would clobber the input.
-    use_effect(move || {
-        let external = ctx.color();
-        let current = value();
-        if let Ok(parsed) = current.parse::<Color>() {
-            let external_rgb: Color = Srgb::<f64>::from_color(external).into_format();
-            if parsed != external_rgb {
-                value.set(hex_from_hsv(external));
-            }
-        } else if current.is_empty() {
-            value.set(hex_from_hsv(external));
-        }
-    });
-
-    rsx! {
-        div {
-            class: "dx-color-field-container",
-            ..props.attributes,
-            if let Some(label) = props.label {
-                Label {
-                    html_for: "color_field",
-                    class: "dx-color-slider-title",
-                    {label}
-                }
-            }
-            Input {
-                id: "color_field",
-                placeholder: "Enter a color",
-                value: "{value}",
-                oninput: move |e: FormEvent| {
-                    let mut input = e.value();
-
-                    // Sanitize input: allow only '#' and hex digits, length limit.
-                    input.retain(|c| c == '#' || c.is_ascii_hexdigit());
-
-                    // Automatically prepend '#' if missing.
-                    if !input.starts_with('#') && !input.is_empty() {
-                        input.insert(0, '#');
-                    }
-
-                    input.truncate(7);
-                    value.set(input.to_uppercase());
-
-                    if let Ok(parsed) = input.parse::<Color>() {
-                        emit_rgb(parsed);
-                    }
-                },
-            }
-            if let Some(text) = props.description {
-                span { class: "dx-color-field-description", {text} }
-            }
-            {props.children}
-        }
-    }
-}
-
-/// The props for the [`ColorSwatch`] component.
-#[derive(Props, Clone, PartialEq)]
-pub struct ColorSwatchProps {
-    /// The selected color
-    #[props(default)]
-    pub color: ReadSignal<Hsv<encoding::Srgb, f64>>,
-
-    /// Additional attributes to extend the color swatch element
-    #[props(extends = GlobalAttributes)]
-    pub attributes: Vec<Attribute>,
-
-    /// The children of the color swatch element
-    pub children: Element,
-}
-
-/// # ColorSwatch
-///
-/// The [`ColorSwatch`] displays a preview of a selected color.
-#[component]
-fn ColorSwatch(props: ColorSwatchProps) -> Element {
-    let hex_color = use_memo(move || {
-        let rgb: Color = Srgb::<f64>::from_color((props.color)()).into_format();
-        format_color_hex(rgb)
-    });
-
-    rsx! {
-        div {
-            role: "img",
-            aria_label: format!("Selected color {hex_color}"),
-            class: "dx-color-swatch",
-            style: "--swatch-color: {hex_color}",
-            ..props.attributes,
-            {props.children}
-        }
-    }
-}
-
-/// The props for the [`ColorSlider`] component.
-#[derive(Props, Clone, PartialEq)]
-pub struct ColorSliderProps {
-    pub title: ReadSignal<String>,
-
-    /// Additional attributes to extend the color slider element
-    #[props(extends = GlobalAttributes)]
-    pub attributes: Vec<Attribute>,
-
-    /// The children of the color slider element
-    pub children: Element,
-}
-
-/// # ColorSlider
-///
-/// The [`ColorSlider`] allows users to adjust the hue of the color held by
-/// the surrounding [`ColorPickerContext`].
-#[component]
-fn ColorSlider(props: ColorSliderProps) -> Element {
-    let ctx = use_context::<ColorPickerContext>();
-    let mut current_hue = use_signal(|| ctx.color().hue.into_positive_degrees());
-
-    let thumb_color = use_memo(move || {
-        Srgb::<f64>::from_color(Hsv::<encoding::Srgb, f64>::new(
-            RgbHue::new(current_hue()),
-            1.0,
-            1.0,
-        ))
-        .into_format()
-    });
-
-    use_effect(move || {
-        let value = ctx.color().hue.into_positive_degrees();
-        let current = current_hue();
-
-        let is_wrap_around = (value - current).abs() > 350.0;
-
-        // Update the signal only if this is an actual new position,
-        // and not a "flip" of the circle by the palette library.
-        if !is_wrap_around && value != current {
-            current_hue.set(value);
-        }
-    });
-
-    let display_value = {
-        let value = current_hue();
-        format!("{value:.2}")
-            .trim_end_matches('0')
-            .trim_end_matches('.')
-            .to_string()
-            + "°"
-    };
-
-    rsx! {
-
-        div {
-            class: "dx-color-slider-container",
-            ..props.attributes,
-            label { class: "dx-color-slider-title", {props.title} }
-            output { class: "dx-color-slider-output", "{display_value}" }
-            Slider {
-                class: "dx-color-slider",
-                label: "Color Slider",
-                horizontal: true,
-                max: 360.0,
-                value: current_hue(),
-                on_value_change: move |h: f64| {
-                    // Allow the value to be exactly 360.0
-                    // The palette will understand that 360.0 == 0.0, but the signal will remain 360.0 for the UI.
-                    current_hue.set(h);
-                    ctx.set_hue(h);
-                },
-                SliderTrack {
-                    class: "dx-color-slider-track",
-                    SliderThumb {
-                        class: "dx-color-slider-thumb",
-                        aria_label: "Hue",
-                        aria_valuetext: format!("{:.0}°", current_hue()),
-                        background_color: format_color_hex(thumb_color()),
-                    }
-                }
-            }
-            {props.children}
-        }
-    }
-}
-
-#[component]
-fn ColorArea(props: ColorAreaProps) -> Element {
-    rsx! {
-        color_picker::ColorArea {
-            class: "dx-color-area-container",
-            step: props.step,
-            attributes: props.attributes,
-            color_picker::AreaTrack {
-                class: "dx-color-area-track",
-                color_picker::AreaThumb {
-                    class: "dx-color-area-thumb",
-                    color_picker::AreaThumbSaturationInput {
-                        class: "dx-color-area-input",
-                    }
-                    color_picker::AreaThumbValueInput {
-                        class: "dx-color-area-input",
-                    }
-                }
-            }
-            {props.children}
-        }
-    }
-}
-
-/// The props for the [`ColorPickerSelect`] component.
-#[derive(Props, Clone, PartialEq)]
-pub struct ColorPickerSelectProps {
-    /// Additional attributes to extend the color picker select element
-    #[props(extends = GlobalAttributes)]
-    pub attributes: Vec<Attribute>,
-
-    /// The children of the color picker select element
-    pub children: Element,
-}
-
-#[component]
-pub fn ColorPickerSelect(props: ColorPickerSelectProps) -> Element {
-    let ctx = use_context::<ColorPickerContext>();
-
-    rsx! {
-        div {
-            class: "dx-color-picker-dialog",
-            ..props.attributes,
-            ColorArea {}
-            ColorSlider { title: "Hue" }
-            div {
-                class: "dx-color-picker-input",
-                ColorField { label: "Hex" }
-                ColorSwatch { color: ctx.color() }
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::apply_open_change;
-
-    #[test]
-    fn only_one_picker_open_at_a_time() {
-        // Opening claims the slot.
-        assert_eq!(apply_open_change(None, 7, true), Some(7));
-        // Opening ANOTHER picker takes the slot over (the first closes: its
-        // controlled `open` becomes false).
-        assert_eq!(apply_open_change(Some(7), 9, true), Some(9));
-        // Closing releases only when this picker holds the slot…
-        assert_eq!(apply_open_change(Some(7), 7, false), None);
-        // …a stale close from a picker that lost the slot changes nothing.
-        assert_eq!(apply_open_change(Some(9), 7, false), Some(9));
-    }
-}
diff --git a/crates/rustmotion-studio/src/components/color_picker/mod.rs b/crates/rustmotion-studio/src/components/color_picker/mod.rs
deleted file mode 100644
index 2590c013..00000000
--- a/crates/rustmotion-studio/src/components/color_picker/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-mod component;
-pub use component::*;
diff --git a/crates/rustmotion-studio/src/components/color_picker/style.css b/crates/rustmotion-studio/src/components/color_picker/style.css
deleted file mode 100644
index 85748ddc..00000000
--- a/crates/rustmotion-studio/src/components/color_picker/style.css
+++ /dev/null
@@ -1,267 +0,0 @@
-.dx-color-field-container {
-    display: flex;
-    flex: 1;
-    flex-direction: column;
-    gap: 4px;
-}
-
-.dx-color-field-description {
-    color: var(--secondary-color-5);
-    font-size: 14px;
-    line-height: 1.5;
-}
-
-.dx-color-swatch {
-    width: 2rem;
-    height: 2rem;
-    box-sizing: border-box;
-    border: 1px solid color-mix(in oklab, var(--primary-color) 10%, transparent);
-    border-radius: 0.25rem;
-    background-color: var(--swatch-color);
-    background-image:
-        linear-gradient(var(--swatch-color), var(--swatch-color)),
-        repeating-conic-gradient(#CCC 0% 25%, white 0% 50%);
-    forced-color-adjust: none;
-}
-
-.dx-color-slider-container {
-    display: grid;
-    width: 224px;
-    flex-direction: column;
-    align-items: center;
-    gap: 8px;
-    grid-template-columns: 1fr auto;
-}
-
-.dx-color-slider-title {
-    width: fit-content;
-    color: var(--secondary-color-4);
-    font-size: 0.875rem;
-    font-weight: 500;
-    line-height: 1.5rem;
-}
-
-.dx-color-slider-output {
-    color: var(--secondary-color-5);
-    font-size: 0.875rem;
-    font-weight: 500;
-    line-height: 1.5rem;
-}
-
-.dx-color-slider {
-    position: relative;
-    display: flex;
-    align-items: center;
-    grid-column: span 2 / span 2;
-    touch-action: none;
-}
-
-.dx-color-slider-track {
-    position: relative;
-    height: 24px;
-    box-sizing: border-box;
-    flex-grow: 1;
-    border-radius: 0.375rem;
-    background: linear-gradient(to right, rgb(255 0 0), rgb(255 255 0), rgb(0 255 0), rgb(0 255 255), rgb(0 0 255), rgb(255 0 255), rgb(255 0 0)), repeating-conic-gradient(rgb(204 204 204) 0%, rgb(204 204 204) 25%, white 0%, white 50%) 50% center / 16px 16px;
-}
-
-.dx-color-slider-thumb {
-    all: unset;
-    position: absolute;
-    top: 50%;
-    display: block;
-    width: 16px;
-    height: 16px;
-    border: 2px solid var(--secondary-color-2);
-    border-radius: 50%;
-    box-shadow: black 0 0 0 1px, black 0 0 0 1px inset;
-    cursor: pointer;
-    forced-color-adjust: none;
-    transform: translate(-50%, -50%) scale(1);
-    transition: transform 150ms ease-out, box-shadow 150ms ease-out, border-color 150ms;
-}
-
-.dx-color-slider-thumb:hover,
-.dx-color-slider-thumb:focus-visible {
-    transform: translate(-50%, -50%) scale(1.15);
-}
-
-.dx-color-slider-thumb[data-dragging="true"] {
-    box-shadow: black 0 0 0 1px, black 0 0 0 1px inset, rgb(0 0 0 / 30%) 0 2px 6px;
-    transform: translate(-50%, -50%) scale(1.25);
-}
-
-.dx-color-area-container {
-    position: relative;
-    display: flex;
-    width: 100%;
-    max-width: 224px;
-    min-height: 116px;
-    aspect-ratio: 1;
-    forced-color-adjust: none;
-    touch-action: none;
-}
-
-.dx-color-area-track {
-    box-sizing: border-box;
-    flex-grow: 1;
-    border-radius: 10px;
-    background: linear-gradient(to top, black, transparent), linear-gradient(to right, white, transparent), var(--area-color);
-}
-
-.dx-color-area-thumb {
-    all: unset;
-    position: absolute;
-    display: block;
-    width: 16px;
-    height: 16px;
-    border: 2px solid var(--secondary-color-2);
-    border-radius: 50%;
-    box-shadow: black 0 0 0 1px, black 0 0 0 1px inset;
-    cursor: pointer;
-    transform: translate(-50%, -50%) scale(1);
-    transition: transform 150ms ease-out, box-shadow 150ms ease-out, border-color 150ms;
-}
-
-.dx-color-area-thumb:hover,
-.dx-color-area-thumb:focus-visible,
-.dx-color-area-thumb:has(:focus-visible) {
-    transform: translate(-50%, -50%) scale(1.15);
-}
-
-.dx-color-area-thumb[data-dragging="true"] {
-    box-shadow: black 0 0 0 1px, black 0 0 0 1px inset, rgb(0 0 0 / 30%) 0 2px 6px;
-    transform: translate(-50%, -50%) scale(1.25);
-}
-
-.dx-color-area-input {
-    position: absolute;
-    overflow: hidden;
-    width: 100%;
-    height: 100%;
-    padding: 0;
-    border: 0;
-    margin: -1px;
-    opacity: 0.0001;
-    pointer-events: none;
-    white-space: nowrap;
-}
-
-.dx-color-picker {
-    position: relative;
-    display: inline-block;
-}
-
-.dx-color-picker-button {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    border: 0 solid;
-    border-radius: 0.125rem;
-    background-color: transparent;
-    color: var(--secondary-color-4);
-    cursor: default;
-    gap: 8px;
-    line-height: 1.5;
-    outline: 0 solid;
-    transition: box-shadow 150ms, background-color 150ms, color 150ms;
-}
-
-.dx-color-picker-button:focus-visible {
-    box-shadow: 0 0 0 3px
-        color-mix(in oklab, var(--focused-border-color) 50%, transparent);
-}
-
-/* UPSTREAM positioning (DioxusLabs/components color picker): CSS-anchored
-   absolute popover under the trigger. Single divergence for our right-docked
-   inspector: right-anchored (right:0) instead of upstream's left:0, so it
-   opens leftward. Values themed to --rm-*. */
-/* Overlay escape (no measurement): `position:fixed` with `top:auto` keeps
-   the box at its STATIC position — vertically level with its trigger row —
-   while escaping every `overflow` ancestor (the scrollable inspector panel
-   clipped the absolute version). Horizontally `right: 308px` (300px panel
-   width constant + 8px gap) lays it just left of the panel, OVER the canvas,
-   always. No ancestor has transform/filter/perspective, so no containing
-   block hijacks the fixed positioning. */
-.dx-color-picker-popover {
-    position: fixed;
-    z-index: 1000;
-    top: auto;
-    /* Right edge approaches the LEFT edge of the clicked swatch (not the
-       panel edge). Constant per host context via --picker-anchor-right:
-       panel 300 − swatch-left-offset + 8px gap. Fallback = standard rows. */
-    right: var(--picker-anchor-right, 210px);
-    left: auto;
-    display: block;
-    border-radius: 0.5rem;
-    margin-top: 4px;
-    padding: 12px;
-    background: var(--rm-surface);
-    box-shadow:
-        inset 0 0 0 1px var(--rm-border),
-        0 8px 24px rgba(0, 0, 0, 0.35);
-    /* Lift so the popover TOP aligns with its trigger row's top: the static
-       position puts it below the swatch → up by swatch height (2rem = 32px)
-       + margin-top (4px) = 36px. A transform on the positioned element
-       itself is fine (only ANCESTOR transforms hijack fixed). */
-    --picker-lift: -36px;
-    transform: translateY(var(--picker-lift));
-}
-
-.dx-color-picker-popover[data-state="open"] {
-    animation: dx-color-picker-popover-fade-in .15s ease-out;
-}
-
-.dx-color-picker-popover[data-state="closed"] {
-    animation: dx-color-picker-popover-fade-out .15s ease-out forwards;
-    pointer-events: none;
-}
-
-/* The fade keyframes COMPOSE with the lift (an animation's transform would
-   otherwise override the base one and make the box jump at animation end). */
-@keyframes dx-color-picker-popover-fade-in {
-    from {
-        opacity: 0;
-        transform: translateY(calc(var(--picker-lift) - 4px));
-    }
-
-    to {
-        opacity: 1;
-        transform: translateY(var(--picker-lift));
-    }
-}
-
-@keyframes dx-color-picker-popover-fade-out {
-    from {
-        opacity: 1;
-        transform: translateY(var(--picker-lift));
-    }
-
-    to {
-        opacity: 0;
-        transform: translateY(calc(var(--picker-lift) - 4px));
-    }
-}
-
-}
-
-.dx-color-picker-dialog {
-    display: flex;
-    box-sizing: border-box;
-    flex-direction: column;
-    padding: 8px;
-    gap: 8px;
-}
-
-.dx-color-picker-input {
-    display: flex;
-    flex-direction: row;
-    align-items: flex-end;
-    gap: 4px;
-}
-
-.dx-color-picker[data-disabled="true"],
-.dx-color-picker [data-disabled="true"] {
-    cursor: not-allowed;
-    opacity: 0.5;
-}
diff --git a/crates/rustmotion-studio/src/components/input/component.rs b/crates/rustmotion-studio/src/components/input/component.rs
deleted file mode 100644
index aa51736a..00000000
--- a/crates/rustmotion-studio/src/components/input/component.rs
+++ /dev/null
@@ -1,54 +0,0 @@
-use dioxus::prelude::*;
-#[component]
-pub fn Input(
-    oninput: Option<EventHandler<FormEvent>>,
-    onchange: Option<EventHandler<FormEvent>>,
-    oninvalid: Option<EventHandler<FormEvent>>,
-    onselect: Option<EventHandler<SelectionEvent>>,
-    onselectionchange: Option<EventHandler<SelectionEvent>>,
-    onfocus: Option<EventHandler<FocusEvent>>,
-    onblur: Option<EventHandler<FocusEvent>>,
-    onfocusin: Option<EventHandler<FocusEvent>>,
-    onfocusout: Option<EventHandler<FocusEvent>>,
-    onkeydown: Option<EventHandler<KeyboardEvent>>,
-    onkeypress: Option<EventHandler<KeyboardEvent>>,
-    onkeyup: Option<EventHandler<KeyboardEvent>>,
-    onwheel: Option<EventHandler<WheelEvent>>,
-    oncompositionstart: Option<EventHandler<CompositionEvent>>,
-    oncompositionupdate: Option<EventHandler<CompositionEvent>>,
-    oncompositionend: Option<EventHandler<CompositionEvent>>,
-    oncopy: Option<EventHandler<ClipboardEvent>>,
-    oncut: Option<EventHandler<ClipboardEvent>>,
-    onpaste: Option<EventHandler<ClipboardEvent>>,
-    #[props(extends=GlobalAttributes)]
-    #[props(extends=input)]
-    attributes: Vec<Attribute>,
-    children: Element,
-) -> Element {
-    rsx! {
-        input {
-            class: "dx-input",
-            oninput: move |e| _ = oninput.map(|callback| callback(e)),
-            onchange: move |e| _ = onchange.map(|callback| callback(e)),
-            oninvalid: move |e| _ = oninvalid.map(|callback| callback(e)),
-            onselect: move |e| _ = onselect.map(|callback| callback(e)),
-            onselectionchange: move |e| _ = onselectionchange.map(|callback| callback(e)),
-            onfocus: move |e| _ = onfocus.map(|callback| callback(e)),
-            onblur: move |e| _ = onblur.map(|callback| callback(e)),
-            onfocusin: move |e| _ = onfocusin.map(|callback| callback(e)),
-            onfocusout: move |e| _ = onfocusout.map(|callback| callback(e)),
-            onkeydown: move |e| _ = onkeydown.map(|callback| callback(e)),
-            onkeypress: move |e| _ = onkeypress.map(|callback| callback(e)),
-            onkeyup: move |e| _ = onkeyup.map(|callback| callback(e)),
-            onwheel: move |e| _ = onwheel.map(|callback| callback(e)),
-            oncompositionstart: move |e| _ = oncompositionstart.map(|callback| callback(e)),
-            oncompositionupdate: move |e| _ = oncompositionupdate.map(|callback| callback(e)),
-            oncompositionend: move |e| _ = oncompositionend.map(|callback| callback(e)),
-            oncopy: move |e| _ = oncopy.map(|callback| callback(e)),
-            oncut: move |e| _ = oncut.map(|callback| callback(e)),
-            onpaste: move |e| _ = onpaste.map(|callback| callback(e)),
-            ..attributes,
-            {children}
-        }
-    }
-}
diff --git a/crates/rustmotion-studio/src/components/input/mod.rs b/crates/rustmotion-studio/src/components/input/mod.rs
deleted file mode 100644
index 2590c013..00000000
--- a/crates/rustmotion-studio/src/components/input/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-mod component;
-pub use component::*;
diff --git a/crates/rustmotion-studio/src/components/input/style.css b/crates/rustmotion-studio/src/components/input/style.css
deleted file mode 100644
index ef060068..00000000
--- a/crates/rustmotion-studio/src/components/input/style.css
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Input Styles */
-.dx-input {
-  position: relative;
-  display: flex;
-  box-sizing: border-box;
-  flex-direction: row;
-  align-items: center;
-  justify-content: space-between;
-  width: 100%;
-  padding: 6px 10px;
-  border: 1px solid var(--rm-border-2);
-  border-radius: 6px;
-  background: var(--rm-bg);
-  color: var(--rm-text);
-  gap: 0.25rem;
-  font: inherit;
-  transition: border-color 100ms ease-out;
-}
-
-.dx-input::placeholder {
-  color: var(--rm-text-muted);
-}
-
-.dx-input:disabled {
-  color: var(--rm-text-muted);
-  cursor: not-allowed;
-}
-
-.dx-input:hover:not(:disabled),
-.dx-input:focus-visible {
-  border-color: var(--rm-accent);
-  outline: none;
-}
diff --git a/crates/rustmotion-studio/src/components/mod.rs b/crates/rustmotion-studio/src/components/mod.rs
deleted file mode 100644
index 90e2d688..00000000
--- a/crates/rustmotion-studio/src/components/mod.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// AUTOGENERATED Components module
-pub mod button;
-pub mod color_picker;
-pub mod input;
-pub mod popover;
-pub mod select;
-pub mod separator;
-pub mod sheet;
-pub mod sidebar;
-pub mod skeleton;
-pub mod slider;
-pub mod switch;
-pub mod textarea;
-pub mod tooltip;
diff --git a/crates/rustmotion-studio/src/components/popover/component.rs b/crates/rustmotion-studio/src/components/popover/component.rs
deleted file mode 100644
index a1a9efd0..00000000
--- a/crates/rustmotion-studio/src/components/popover/component.rs
+++ /dev/null
@@ -1,59 +0,0 @@
-use dioxus::prelude::*;
-use dioxus_primitives::popover::{
-    self, PopoverContentProps, PopoverRootProps, PopoverTriggerProps,
-};
-use dioxus_primitives::{dioxus_attributes::attributes, merge_attributes};
-
-#[css_module("/src/components/popover/style.css")]
-struct Styles;
-
-#[component]
-pub fn PopoverRoot(props: PopoverRootProps) -> Element {
-    let base = attributes!(div {
-        class: Styles::dx_popover
-    });
-    let merged = merge_attributes(vec![base, props.attributes]);
-
-    rsx! {
-        popover::PopoverRoot {
-            is_modal: props.is_modal,
-            open: props.open,
-            default_open: props.default_open,
-            on_open_change: props.on_open_change,
-            attributes: merged,
-            {props.children}
-        }
-    }
-}
-
-#[component]
-pub fn PopoverTrigger(props: PopoverTriggerProps) -> Element {
-    let base = attributes!(button {
-        class: Styles::dx_popover_trigger
-    });
-    let merged = merge_attributes(vec![base, props.attributes]);
-
-    rsx! {
-        popover::PopoverTrigger { attributes: merged, {props.children} }
-    }
-}
-
-#[component]
-pub fn PopoverContent(props: PopoverContentProps) -> Element {
-    let class = if let Some(class) = props.class {
-        format!("{} {}", Styles::dx_popover_content, class)
-    } else {
-        Styles::dx_popover_content.to_string()
-    };
-
-    rsx! {
-        popover::PopoverContent {
-            class,
-            id: props.id,
-            side: props.side,
-            align: props.align,
-            attributes: props.attributes,
-            {props.children}
-        }
-    }
-}
diff --git a/crates/rustmotion-studio/src/components/popover/mod.rs b/crates/rustmotion-studio/src/components/popover/mod.rs
deleted file mode 100644
index f189b1fa..00000000
--- a/crates/rustmotion-studio/src/components/popover/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-mod component;
diff --git a/crates/rustmotion-studio/src/components/popover/style.css b/crates/rustmotion-studio/src/components/popover/style.css
deleted file mode 100644
index 7eaf4feb..00000000
--- a/crates/rustmotion-studio/src/components/popover/style.css
+++ /dev/null
@@ -1,238 +0,0 @@
-.dx-popover {
-  position: relative;
-  display: inline-block;
-}
-
-.dx-popover-content {
-  position: fixed;
-  z-index: 1000;
-  display: flex;
-  min-width: 200px;
-  max-width: calc(100% - 2rem);
-  box-sizing: border-box;
-  flex-direction: column;
-  padding: .25rem;
-  border-radius: .5rem;
-  margin-top: .5rem;
-  background: var(--light, var(--primary-color))
-      var(--dark, var(--primary-color-5));
-  box-shadow: inset 0 0 0 1px var(--light, var(--primary-color-6)) var(--dark, var(--primary-color-7));
-  text-align: center;
-  transform: translate(-50%, -50%);
-  transform-origin: top;
-  will-change: transform, opacity;
-}
-
-.dx-popover-content[data-state="open"] {
-  animation: dx-popover-fade-in .2s ease-in-out;
-}
-
-.dx-popover-content[data-state="closed"] {
-  animation: dx-popover-fade-out .2s ease-in-out forwards;
-  pointer-events: none;
-}
-
-@keyframes dx-popover-fade-in {
-  from {
-    opacity: 0;
-  }
-
-  to {
-    opacity: 1;
-  }
-}
-
-@keyframes dx-popover-fade-out {
-  from {
-    opacity: 1;
-  }
-
-  to {
-    opacity: 0;
-  }
-}
-
-/* Positioning based on side */
-.dx-popover-content[data-side="top"] {
-  position: absolute;
-  bottom: 100%;
-  left: 50%;
-  margin-bottom: 8px;
-  transform: translateX(-50%);
-}
-
-.dx-popover-content[data-side="top"]::after {
-  top: calc(100% - 0.25rem);
-  left: 50%;
-  border-color: var(--secondary-color-4);
-  border-radius: 0 0 0.1rem;
-}
-
-.dx-popover-content[data-side="right"] {
-  position: absolute;
-  top: 50%;
-  left: 100%;
-  margin-left: 8px;
-  transform: translateY(-50%);
-}
-
-.dx-popover-content[data-side="right"]::after {
-  top: calc(50% - 0.25rem);
-  left: 0;
-  border-color: var(--secondary-color-4);
-  border-radius: 0 0 0 0.1rem;
-}
-
-.dx-popover-content[data-side="bottom"] {
-  position: absolute;
-  top: 100%;
-  left: 50%;
-  margin-top: 8px;
-  transform: translateX(-50%);
-}
-
-.dx-popover-content[data-side="bottom"]::after {
-  bottom: calc(100% - 0.25rem);
-  left: 50%;
-  border-color: var(--secondary-color-4);
-  border-radius: 0.1rem 0 0;
-}
-
-.dx-popover-content[data-side="left"] {
-  position: absolute;
-  top: 50%;
-  right: 100%;
-  margin-right: 8px;
-  transform: translateY(-50%);
-}
-
-.dx-popover-content[data-side="left"]::after {
-  top: calc(50% - 0.25rem);
-  right: -0.25rem;
-  border-color: var(--secondary-color-4);
-  border-radius: 0 0.1rem 0 0;
-}
-
-/* Alignment styles for top and bottom */
-.dx-popover-content[data-side="top"][data-align="start"],
-.dx-popover-content[data-side="bottom"][data-align="start"] {
-  left: 0;
-  transform: none;
-}
-
-.dx-popover-content[data-side="top"][data-align="end"],
-.dx-popover-content[data-side="bottom"][data-align="end"] {
-  right: 0;
-  left: auto;
-  transform: none;
-}
-
-/* Alignment styles for left and right */
-.dx-popover-content[data-side="left"][data-align="start"],
-.dx-popover-content[data-side="right"][data-align="start"] {
-  top: 0;
-  transform: none;
-}
-
-.dx-popover-content[data-side="left"][data-align="center"],
-.dx-popover-content[data-side="right"][data-align="center"] {
-  top: 50%;
-  transform: translateY(-50%);
-}
-
-.dx-popover-content[data-side="left"][data-align="end"],
-.dx-popover-content[data-side="right"][data-align="end"] {
-  top: auto;
-  bottom: 0;
-  transform: none;
-}
-
-.dx-popover-content-title {
-  margin: 0;
-  color: var(--secondary-color-4);
-  font-size: 1.25rem;
-  font-weight: 700;
-}
-
-.dx-popover-content-description {
-  margin: 0;
-  color: var(--secondary-color-5);
-  font-size: 1rem;
-}
-
-.dx-popover-content-actions {
-  display: flex;
-  flex-direction: column-reverse;
-  gap: 12px;
-}
-
-@media (width >= 40rem) {
-  .dx-popover-content-actions {
-    flex-direction: row;
-    justify-content: flex-end;
-  }
-
-  .dx-popover-content {
-    max-width: 32rem;
-    text-align: left;
-  }
-}
-
-.dx-popover-content-cancel {
-  padding: 8px 18px;
-  border: 1px solid var(--primary-color-6);
-  border-radius: 0.5rem;
-  background-color: var(--light, var(--primary-color))
-    var(--dark, var(--primary-color-3));
-  color: var(--secondary-color-4);
-  cursor: pointer;
-  font-size: 1rem;
-  transition: background-color 0.2s ease;
-}
-
-.dx-popover-content-cancel:hover {
-  background-color: var(--primary-color-4);
-}
-
-.dx-popover-content-cancel:focus-visible {
-  box-shadow: 0 0 0 2px var(--focused-border-color);
-}
-
-.dx-popover-content-action {
-  padding: 8px 18px;
-  border: 1px solid var(--primary-error-color);
-  border-radius: 0.5rem;
-  background-color: var(--primary-error-color);
-  color: var(--contrast-error-color);
-  cursor: pointer;
-  font-size: 1rem;
-  transition: background-color 0.2s ease;
-}
-
-.dx-popover-content-action:hover {
-  background-color: var(--secondary-error-color);
-}
-
-.dx-popover-content-action:focus-visible {
-  box-shadow: 0 0 0 2px var(--focused-border-color);
-}
-
-.dx-popover-trigger {
-  padding: 8px 18px;
-  border: 1px solid var(--primary-color-6);
-  border-radius: 0.5rem;
-  background-color: var(--light, var(--primary-color))
-    var(--dark, var(--primary-color-3));
-  color: var(--secondary-color-4);
-  cursor: pointer;
-  font-size: 1rem;
-  transition: background-color 0.2s ease;
-}
-
-.dx-popover-trigger:hover {
-  background-color: var(--primary-color-4);
-}
-
-.dx-popover-trigger:focus-visible {
-  box-shadow: 0 0 0 2px var(--focused-border-color);
-}
diff --git a/crates/rustmotion-studio/src/components/select/component.rs b/crates/rustmotion-studio/src/components/select/component.rs
deleted file mode 100644
index b6413a90..00000000
--- a/crates/rustmotion-studio/src/components/select/component.rs
+++ /dev/null
@@ -1,120 +0,0 @@
-use dioxus::prelude::*;
-use dioxus_icons::lucide::{Check, ChevronDown};
-use dioxus_primitives::select::{
-    self, SelectGroupLabelProps, SelectMultiProps, SelectOptionProps, SelectProps,
-};
-use dioxus_primitives::{dioxus_attributes::attributes, merge_attributes};
-
-#[component]
-pub fn Select<T: Clone + PartialEq + 'static>(props: SelectProps<T>) -> Element {
-    let base = attributes!(div { class: "dx-select" });
-    let merged = merge_attributes(vec![base, props.attributes]);
-
-    rsx! {
-        select::Select {
-            value: props.value,
-            default_value: props.default_value,
-            on_value_change: props.on_value_change,
-            disabled: props.disabled,
-            open: props.open,
-            default_open: props.default_open,
-            on_open_change: props.on_open_change,
-            name: props.name,
-            roving_loop: props.roving_loop,
-            typeahead_timeout: props.typeahead_timeout,
-            attributes: merged,
-            select::SelectTrigger {
-                class: "dx-select-trigger",
-                select::SelectValue {}
-                ChevronDown {
-                    class: "dx-select-expand-icon",
-                    size: "20px",
-                    stroke: "var(--rm-text-muted)",
-                }
-            }
-            select::SelectList {
-                class: "dx-select-list",
-                {props.children}
-            }
-        }
-    }
-}
-
-#[component]
-pub fn SelectMulti<T: Clone + PartialEq + 'static>(props: SelectMultiProps<T>) -> Element {
-    let base = attributes!(div { class: "dx-select" });
-    let merged = merge_attributes(vec![base, props.attributes]);
-
-    rsx! {
-        select::SelectMulti {
-            values: props.values,
-            default_values: props.default_values,
-            on_values_change: props.on_values_change,
-            disabled: props.disabled,
-            open: props.open,
-            default_open: props.default_open,
-            on_open_change: props.on_open_change,
-            name: props.name,
-            roving_loop: props.roving_loop,
-            typeahead_timeout: props.typeahead_timeout,
-            attributes: merged,
-            select::SelectTrigger {
-                class: "dx-select-trigger",
-                select::SelectValue {}
-                ChevronDown {
-                    class: "dx-select-expand-icon",
-                    size: "20px",
-                    stroke: "var(--rm-text-muted)",
-                }
-            }
-            select::SelectList {
-                class: "dx-select-list",
-                {props.children}
-            }
-        }
-    }
-}
-
-#[component]
-pub fn SelectGroupLabel(props: SelectGroupLabelProps) -> Element {
-    let base = attributes!(div {
-        class: "dx-select-group-label"
-    });
-    let merged = merge_attributes(vec![base, props.attributes]);
-
-    rsx! {
-        select::SelectGroupLabel {
-            id: props.id,
-            attributes: merged,
-            {props.children}
-        }
-    }
-}
-
-#[component]
-pub fn SelectOption<T: Clone + PartialEq + 'static>(props: SelectOptionProps<T>) -> Element {
-    let base = attributes!(div {
-        class: "dx-select-option"
-    });
-    let merged = merge_attributes(vec![base, props.attributes]);
-
-    rsx! {
-        select::SelectOption::<T> {
-            value: props.value,
-            text_value: props.text_value,
-            disabled: props.disabled,
-            id: props.id,
-            index: props.index,
-            aria_label: props.aria_label,
-            aria_roledescription: props.aria_roledescription,
-            attributes: merged,
-            {props.children}
-            select::SelectItemIndicator {
-                Check {
-                    size: "1rem",
-                    stroke: "var(--rm-accent)",
-                }
-            }
-        }
-    }
-}
diff --git a/crates/rustmotion-studio/src/components/select/mod.rs b/crates/rustmotion-studio/src/components/select/mod.rs
deleted file mode 100644
index 2590c013..00000000
--- a/crates/rustmotion-studio/src/components/select/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-mod component;
-pub use component::*;
diff --git a/crates/rustmotion-studio/src/components/select/style.css b/crates/rustmotion-studio/src/components/select/style.css
deleted file mode 100644
index c90f48f0..00000000
--- a/crates/rustmotion-studio/src/components/select/style.css
+++ /dev/null
@@ -1,131 +0,0 @@
-.dx-select {
-  position: relative;
-  width: 100%;
-}
-
-.dx-select-trigger {
-  display: flex;
-  box-sizing: border-box;
-  flex-direction: row;
-  align-items: center;
-  justify-content: space-between;
-  width: 100%;
-  padding: 6px 10px;
-  border: 1px solid var(--rm-border-2);
-  border-radius: 6px;
-  background: var(--rm-bg);
-  color: var(--rm-text);
-  cursor: pointer;
-  font-family: inherit;
-  font-size: inherit;
-  gap: 0.25rem;
-  outline: none;
-  transition: border-color 100ms ease-out, background-color 100ms ease-out;
-}
-
-.dx-select-trigger:hover:not([data-disabled="true"]),
-.dx-select-trigger:focus-visible {
-  border-color: var(--rm-accent);
-  background: var(--rm-surface-3);
-}
-
-.dx-select-trigger span[data-placeholder="true"] {
-  color: var(--rm-text-muted);
-}
-
-.dx-select[data-state="open"] .dx-select-trigger {
-  pointer-events: none;
-  border-color: var(--rm-accent);
-}
-
-.dx-select[data-disabled="true"] .dx-select-trigger {
-  color: var(--rm-text-muted);
-  cursor: not-allowed;
-  opacity: 0.5;
-}
-
-.dx-select-list {
-  position: absolute;
-  z-index: 1000;
-  top: 100%;
-  left: 0;
-  min-width: 100%;
-  box-sizing: border-box;
-  padding: 0.25rem;
-  border: 1px solid var(--rm-border);
-  border-radius: 6px;
-  margin-top: 0.25rem;
-  background: var(--rm-surface);
-  box-shadow: 0 8px 24px rgba(0, 0, 0, 0.35);
-  color: var(--rm-text);
-  opacity: 0;
-  pointer-events: none;
-  transform-origin: top;
-  will-change: transform, opacity;
-}
-
-.dx-select-list[data-state="open"] {
-  animation: dx-picker-in 150ms ease-out forwards;
-  pointer-events: auto;
-}
-
-.dx-select-list[data-state="closed"] {
-  animation: dx-picker-out 100ms ease-in forwards;
-  pointer-events: none;
-}
-
-@keyframes dx-picker-in {
-  from {
-    opacity: 0;
-    transform: scale(0.95) translateY(-2px);
-  }
-
-  to {
-    opacity: 1;
-    transform: scale(1) translateY(0);
-  }
-}
-
-@keyframes dx-picker-out {
-  from {
-    opacity: 1;
-    transform: scale(1) translateY(0);
-  }
-
-  to {
-    opacity: 0;
-    transform: scale(0.95) translateY(-2px);
-  }
-}
-
-.dx-select-option {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 6px 10px;
-  border-radius: 6px;
-  color: var(--rm-text);
-  cursor: pointer;
-  font-size: 0.875rem;
-  outline: none;
-  user-select: none;
-}
-
-.dx-select-option:hover:not([data-disabled="true"]),
-.dx-select-option:focus-visible {
-  background: var(--rm-surface-3);
-  color: var(--rm-text-strong);
-}
-
-.dx-select-option[data-disabled="true"] {
-  color: var(--rm-text-muted);
-  cursor: not-allowed;
-  opacity: 0.5;
-  pointer-events: none;
-}
-
-.dx-select-group-label {
-  padding: 4px 10px;
-  color: var(--rm-text-muted);
-  font-size: 0.75rem;
-}
diff --git a/crates/rustmotion-studio/src/components/separator/component.rs b/crates/rustmotion-studio/src/components/separator/component.rs
deleted file mode 100644
index 39444794..00000000
--- a/crates/rustmotion-studio/src/components/separator/component.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-use dioxus::prelude::*;
-use dioxus_primitives::separator::{self, SeparatorProps};
-use dioxus_primitives::{dioxus_attributes::attributes, merge_attributes};
-
-#[css_module("/src/components/separator/style.css")]
-struct Styles;
-
-#[component]
-pub fn Separator(props: SeparatorProps) -> Element {
-    let base = attributes!(div {
-        class: Styles::dx_separator,
-    });
-    let merged = merge_attributes(vec![base, props.attributes]);
-
-    rsx! {
-        separator::Separator {
-            horizontal: props.horizontal,
-            decorative: props.decorative,
-            attributes: merged,
-            {props.children}
-        }
-    }
-}
diff --git a/crates/rustmotion-studio/src/components/separator/mod.rs b/crates/rustmotion-studio/src/components/separator/mod.rs
deleted file mode 100644
index 2590c013..00000000
--- a/crates/rustmotion-studio/src/components/separator/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-mod component;
-pub use component::*;
diff --git a/crates/rustmotion-studio/src/components/separator/style.css b/crates/rustmotion-studio/src/components/separator/style.css
deleted file mode 100644
index 40b1bbee..00000000
--- a/crates/rustmotion-studio/src/components/separator/style.css
+++ /dev/null
@@ -1,13 +0,0 @@
-.dx-separator {
-  background-color: var(--light, var(--primary-color-6)) var(--dark, var(--primary-color-7));
-}
-
-.dx-separator[data-orientation="horizontal"] {
-  width: 100%;
-  height: 1px;
-}
-
-.dx-separator[data-orientation="vertical"] {
-  width: 1px;
-  height: 100%;
-}
diff --git a/crates/rustmotion-studio/src/components/sheet/component.rs b/crates/rustmotion-studio/src/components/sheet/component.rs
deleted file mode 100644
index 8c35e84d..00000000
--- a/crates/rustmotion-studio/src/components/sheet/component.rs
+++ /dev/null
@@ -1,147 +0,0 @@
-// UI kit scaffold — variants are consumed incrementally as the studio grows.
-#![allow(dead_code)]
-use dioxus::prelude::*;
-use dioxus_icons::lucide::X;
-use dioxus_primitives::dialog::{
-    self, DialogCtx, DialogDescriptionProps, DialogRootProps, DialogTitleProps,
-};
-use dioxus_primitives::dioxus_attributes::attributes;
-use dioxus_primitives::merge_attributes;
-
-#[css_module("/src/components/sheet/style.css")]
-struct Styles;
-
-#[derive(Debug, Clone, Copy, Default, PartialEq)]
-pub enum SheetSide {
-    Top,
-    #[default]
-    Right,
-    Bottom,
-    Left,
-}
-
-impl SheetSide {
-    pub fn as_str(&self) -> &'static str {
-        match self {
-            SheetSide::Top => "top",
-            SheetSide::Right => "right",
-            SheetSide::Bottom => "bottom",
-            SheetSide::Left => "left",
-        }
-    }
-}
-
-#[component]
-pub fn Sheet(props: DialogRootProps) -> Element {
-    let content_base = attributes!(div {
-        class: Styles::dx_sheet,
-        "data-slot": "sheet-content",
-        "data-side": SheetSide::Right.as_str(),
-    });
-    let content_attributes = merge_attributes(vec![content_base, props.attributes]);
-
-    rsx! {
-        dialog::DialogRoot {
-            class: Styles::dx_sheet_root,
-            "data-slot": "sheet-root",
-            id: props.id,
-            is_modal: props.is_modal,
-            open: props.open,
-            default_open: props.default_open,
-            on_open_change: props.on_open_change,
-            dialog::DialogContent {
-                class: None,
-                attributes: content_attributes,
-                {props.children}
-            }
-        }
-    }
-}
-
-#[component]
-pub fn SheetContentClose(
-    #[props(extends = GlobalAttributes)] attributes: Vec<Attribute>,
-) -> Element {
-    let base = attributes!(button {
-        class: Styles::dx_sheet_close,
-    });
-    let attributes = merge_attributes(vec![base, attributes]);
-
-    rsx! {
-        SheetClose { attributes,
-            X { size: "20px" }
-        }
-    }
-}
-
-#[component]
-pub fn SheetHeader(
-    #[props(extends = GlobalAttributes)] attributes: Vec<Attribute>,
-    children: Element,
-) -> Element {
-    rsx! {
-        div { class: Styles::dx_sheet_header, "data-slot": "sheet-header", ..attributes, {children} }
-    }
-}
-
-#[component]
-pub fn SheetFooter(
-    #[props(extends = GlobalAttributes)] attributes: Vec<Attribute>,
-    children: Element,
-) -> Element {
-    rsx! {
-        div { class: Styles::dx_sheet_footer, "data-slot": "sheet-footer", ..attributes, {children} }
-    }
-}
-
-#[component]
-pub fn SheetTitle(props: DialogTitleProps) -> Element {
-    rsx! {
-        dialog::DialogTitle {
-            id: props.id,
-            class: Styles::dx_sheet_title,
-            "data-slot": "sheet-title",
-            attributes: props.attributes,
-            {props.children}
-        }
-    }
-}
-
-#[component]
-pub fn SheetDescription(props: DialogDescriptionProps) -> Element {
-    rsx! {
-        dialog::DialogDescription {
-            id: props.id,
-            class: Styles::dx_sheet_description,
-            "data-slot": "sheet-description",
-            attributes: props.attributes,
-            {props.children}
-        }
-    }
-}
-
-#[component]
-pub fn SheetClose(
-    #[props(extends = GlobalAttributes)] attributes: Vec<Attribute>,
-    r#as: Option<Callback<Vec<Attribute>, Element>>,
-    children: Element,
-) -> Element {
-    let ctx: DialogCtx = use_context();
-
-    let base = attributes! {
-        button {
-            onclick: move |_| {
-                ctx.set_open(false);
-            }
-        }
-    };
-    let merged = merge_attributes(vec![base, attributes]);
-
-    if let Some(dynamic) = r#as {
-        dynamic.call(merged)
-    } else {
-        rsx! {
-            button { ..merged, {children} }
-        }
-    }
-}
diff --git a/crates/rustmotion-studio/src/components/sheet/mod.rs b/crates/rustmotion-studio/src/components/sheet/mod.rs
deleted file mode 100644
index 2590c013..00000000
--- a/crates/rustmotion-studio/src/components/sheet/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-mod component;
-pub use component::*;
diff --git a/crates/rustmotion-studio/src/components/sheet/style.css b/crates/rustmotion-studio/src/components/sheet/style.css
deleted file mode 100644
index 799c7923..00000000
--- a/crates/rustmotion-studio/src/components/sheet/style.css
+++ /dev/null
@@ -1,253 +0,0 @@
-/* Sheet Root */
-.dx-sheet-root {
-  position: fixed;
-  z-index: 1000;
-  background: rgb(0 0 0 / 50%);
-  inset: 0;
-  opacity: 0;
-  will-change: opacity;
-}
-
-.dx-sheet-root[data-state="closed"] {
-  animation: dx-sheet-root-out 150ms ease-in forwards;
-  pointer-events: none;
-}
-
-.dx-sheet-root[data-state="open"] {
-  animation: dx-sheet-root-in 200ms ease-out forwards;
-}
-
-@keyframes dx-sheet-root-in {
-  from {
-    opacity: 0;
-  }
-
-  to {
-    opacity: 1;
-  }
-}
-
-@keyframes dx-sheet-root-out {
-  from {
-    opacity: 1;
-  }
-
-  to {
-    opacity: 0;
-  }
-}
-
-.dx-sheet {
-  position: fixed;
-  z-index: 1001;
-  display: flex;
-  box-sizing: border-box;
-  flex-direction: column;
-  border: none;
-  background: var(--primary-color-2);
-  box-shadow: 0 4px 20px rgb(0 0 0 / 20%);
-  color: var(--secondary-color-4);
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
-  gap: 1rem;
-  will-change: transform;
-}
-
-.dx-sheet[data-side="right"],
-.dx-sheet[data-side="left"] {
-  top: 0;
-  bottom: 0;
-  width: 75%;
-  max-width: 24rem;
-}
-
-.dx-sheet[data-side="right"] {
-  right: 0;
-  border-left: 1px solid var(--primary-color-6);
-  transform: translateX(100%);
-}
-
-.dx-sheet[data-side="left"] {
-  left: 0;
-  border-right: 1px solid var(--primary-color-6);
-  transform: translateX(-100%);
-}
-
-.dx-sheet[data-side="top"],
-.dx-sheet[data-side="bottom"] {
-  right: 0;
-  left: 0;
-}
-
-.dx-sheet[data-side="top"] {
-  top: 0;
-  border-bottom: 1px solid var(--primary-color-6);
-  transform: translateY(-100%);
-}
-
-.dx-sheet[data-side="bottom"] {
-  bottom: 0;
-  border-top: 1px solid var(--primary-color-6);
-  transform: translateY(100%);
-}
-
-.dx-sheet-root[data-state="open"] .dx-sheet[data-side="right"] {
-  animation: dx-slide-in-right 200ms ease-out forwards;
-}
-
-.dx-sheet-root[data-state="open"] .dx-sheet[data-side="left"] {
-  animation: dx-slide-in-left 200ms ease-out forwards;
-}
-
-.dx-sheet-root[data-state="open"] .dx-sheet[data-side="top"] {
-  animation: dx-slide-in-top 200ms ease-out forwards;
-}
-
-.dx-sheet-root[data-state="open"] .dx-sheet[data-side="bottom"] {
-  animation: dx-slide-in-bottom 200ms ease-out forwards;
-}
-
-.dx-sheet-root[data-state="closed"] .dx-sheet[data-side="right"] {
-  animation: dx-slide-out-right 150ms ease-in forwards;
-}
-
-.dx-sheet-root[data-state="closed"] .dx-sheet[data-side="left"] {
-  animation: dx-slide-out-left 150ms ease-in forwards;
-}
-
-.dx-sheet-root[data-state="closed"] .dx-sheet[data-side="top"] {
-  animation: dx-slide-out-top 150ms ease-in forwards;
-}
-
-.dx-sheet-root[data-state="closed"] .dx-sheet[data-side="bottom"] {
-  animation: dx-slide-out-bottom 150ms ease-in forwards;
-}
-
-@keyframes dx-slide-in-right {
-  from {
-    transform: translateX(100%);
-  }
-
-  to {
-    transform: translateX(0);
-  }
-}
-
-@keyframes dx-slide-out-right {
-  from {
-    transform: translateX(0);
-  }
-
-  to {
-    transform: translateX(100%);
-  }
-}
-
-@keyframes dx-slide-in-left {
-  from {
-    transform: translateX(-100%);
-  }
-
-  to {
-    transform: translateX(0);
-  }
-}
-
-@keyframes dx-slide-out-left {
-  from {
-    transform: translateX(0);
-  }
-
-  to {
-    transform: translateX(-100%);
-  }
-}
-
-@keyframes dx-slide-in-top {
-  from {
-    transform: translateY(-100%);
-  }
-
-  to {
-    transform: translateY(0);
-  }
-}
-
-@keyframes dx-slide-out-top {
-  from {
-    transform: translateY(0);
-  }
-
-  to {
-    transform: translateY(-100%);
-  }
-}
-
-@keyframes dx-slide-in-bottom {
-  from {
-    transform: translateY(100%);
-  }
-
-  to {
-    transform: translateY(0);
-  }
-}
-
-@keyframes dx-slide-out-bottom {
-  from {
-    transform: translateY(0);
-  }
-
-  to {
-    transform: translateY(100%);
-  }
-}
-
-.dx-sheet-header {
-  display: flex;
-  flex-direction: column;
-  padding: 1rem;
-  gap: 0.375rem;
-}
-
-.dx-sheet-footer {
-  display: flex;
-  flex-direction: column;
-  padding: 1rem;
-  margin-top: auto;
-  gap: 0.5rem;
-}
-
-.dx-sheet-title {
-  margin: 0;
-  color: var(--secondary-color-4);
-  font-size: 1.125rem;
-  font-weight: 600;
-}
-
-.dx-sheet-description {
-  margin: 0;
-  color: var(--secondary-color-5);
-  font-size: 0.875rem;
-}
-
-.dx-sheet-close {
-  position: absolute;
-  top: 1rem;
-  right: 1rem;
-  display: flex;
-  width: 24px;
-  height: 24px;
-  align-items: center;
-  justify-content: center;
-  padding: 0;
-  border: none;
-  border-radius: 4px;
-  background: none;
-  color: var(--primary-color-7);
-  cursor: pointer;
-  transition: color 150ms ease, background-color 150ms ease;
-}
-
-.dx-sheet-close:hover {
-  color: var(--secondary-color-4);
-}
diff --git a/crates/rustmotion-studio/src/components/sidebar/component.rs b/crates/rustmotion-studio/src/components/sidebar/component.rs
deleted file mode 100644
index 55aa3c10..00000000
--- a/crates/rustmotion-studio/src/components/sidebar/component.rs
+++ /dev/null
@@ -1,839 +0,0 @@
-// UI kit scaffold — variants are consumed incrementally as the studio grows.
-#![allow(dead_code)]
-use crate::components::button::{Button, ButtonVariant};
-use crate::components::separator::Separator;
-use crate::components::sheet::{
-    Sheet, SheetContentClose, SheetDescription, SheetHeader, SheetSide, SheetTitle,
-};
-use crate::components::skeleton::Skeleton;
-use crate::components::tooltip::{Tooltip, TooltipContent, TooltipTrigger};
-use dioxus::core::use_drop;
-use dioxus::prelude::*;
-use dioxus_icons::lucide::PanelLeft;
-use dioxus_primitives::dioxus_attributes::attributes;
-use dioxus_primitives::merge_attributes;
-use dioxus_primitives::use_controlled;
-
-#[css_module("/src/components/sidebar/style.css")]
-struct Styles;
-
-// constants
-const SIDEBAR_WIDTH: &str = "16rem";
-const SIDEBAR_WIDTH_MOBILE: &str = "18rem";
-const SIDEBAR_WIDTH_ICON: &str = "3rem";
-const SIDEBAR_KEYBOARD_SHORTCUT: &str = "b";
-const MOBILE_BREAKPOINT: u32 = 768;
-
-#[derive(Debug, Clone, Copy, Default, PartialEq)]
-pub enum SidebarState {
-    #[default]
-    Expanded,
-    Collapsed,
-}
-
-impl SidebarState {
-    pub fn as_str(&self) -> &'static str {
-        match self {
-            SidebarState::Expanded => "expanded",
-            SidebarState::Collapsed => "collapsed",
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy, Default, PartialEq)]
-pub enum SidebarSide {
-    #[default]
-    Left,
-    Right,
-}
-
-impl SidebarSide {
-    pub fn as_str(&self) -> &'static str {
-        match self {
-            SidebarSide::Left => "left",
-            SidebarSide::Right => "right",
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy, Default, PartialEq)]
-pub enum SidebarVariant {
-    #[default]
-    Sidebar,
-    Floating,
-    Inset,
-}
-
-impl SidebarVariant {
-    pub fn as_str(&self) -> &'static str {
-        match self {
-            SidebarVariant::Sidebar => "sidebar",
-            SidebarVariant::Floating => "floating",
-            SidebarVariant::Inset => "inset",
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy, Default, PartialEq)]
-pub enum SidebarCollapsible {
-    #[default]
-    Offcanvas,
-    Icon,
-    None,
-}
-
-impl SidebarCollapsible {
-    pub fn as_str(&self) -> &'static str {
-        match self {
-            SidebarCollapsible::Offcanvas => "offcanvas",
-            SidebarCollapsible::Icon => "icon",
-            SidebarCollapsible::None => "none",
-        }
-    }
-}
-
-#[derive(Clone, Copy)]
-#[allow(dead_code)]
-pub struct SidebarCtx {
-    pub state: Memo<SidebarState>,
-    pub side: Signal<SidebarSide>,
-    pub is_mobile: Signal<bool>,
-    // From use_controlled:
-    open: Memo<bool>,
-    set_open: Callback<bool>,
-    // Mobile state:
-    open_mobile: Signal<bool>,
-}
-
-impl SidebarCtx {
-    /// Toggle the sidebar open/closed state
-    pub fn toggle(&self) {
-        if (self.is_mobile)() {
-            let current = (self.open_mobile)();
-            let mut open_mobile = self.open_mobile;
-            open_mobile.set(!current);
-        } else {
-            self.set_open.call(!self.open());
-        }
-    }
-
-    /// Set the mobile sidebar open state
-    pub fn set_open_mobile(&self, value: bool) {
-        let mut open_mobile = self.open_mobile;
-        open_mobile.set(value);
-    }
-
-    /// Get the current open state (desktop)
-    pub fn open(&self) -> bool {
-        self.open.cloned()
-    }
-}
-
-pub fn use_sidebar() -> SidebarCtx {
-    use_context::<SidebarCtx>()
-}
-
-pub fn use_is_mobile() -> Signal<bool> {
-    let mut is_mobile = use_signal(|| false);
-
-    use_effect(move || {
-        spawn(async move {
-            let js_code = format!(
-                r#"
-                function checkMobile() {{
-                    return window.innerWidth < {MOBILE_BREAKPOINT};
-                }}
-                function handleResize() {{
-                    dioxus.send(checkMobile());
-                }}
-                window.__sidebarResizeHandler = handleResize;
-                window.addEventListener('resize', window.__sidebarResizeHandler);
-                dioxus.send(checkMobile());
-                "#
-            );
-            let mut eval = document::eval(&js_code);
-
-            while let Ok(result) = eval.recv::<bool>().await {
-                is_mobile.set(result);
-            }
-        });
-    });
-
-    use_drop(|| {
-        _ = document::eval(
-            r#"
-            window.removeEventListener('resize', window.__sidebarResizeHandler);
-            delete window.__sidebarResizeHandler;
-            "#,
-        );
-    });
-
-    is_mobile
-}
-
-#[component]
-pub fn SidebarProvider(
-    #[props(default = true)] default_open: bool,
-    #[props(default)] open: ReadSignal<Option<bool>>,
-    #[props(default)] on_open_change: Callback<bool>,
-    #[props(extends = GlobalAttributes)] attributes: Vec<Attribute>,
-    children: Element,
-) -> Element {
-    let is_mobile = use_is_mobile();
-    let side = use_signal(|| SidebarSide::Left);
-    let open_mobile = use_signal(|| false);
-
-    let (open, set_open) = use_controlled(open, default_open, on_open_change);
-
-    let state = use_memo(move || {
-        if open() {
-            SidebarState::Expanded
-        } else {
-            SidebarState::Collapsed
-        }
-    });
-
-    let ctx = SidebarCtx {
-        state,
-        side,
-        is_mobile,
-        open,
-        set_open,
-        open_mobile,
-    };
-
-    use_context_provider(|| ctx);
-
-    use_effect(move || {
-        spawn(async move {
-            let js_code = format!(
-                r#"
-                function sidebarKeyHandler(event) {{
-                    if (event.key === '{SIDEBAR_KEYBOARD_SHORTCUT}' && (event.metaKey || event.ctrlKey)) {{
-                        event.preventDefault();
-                        dioxus.send(true);
-                    }}
-                }}
-                window.__sidebarKeyHandler = sidebarKeyHandler;
-                window.addEventListener('keydown', window.__sidebarKeyHandler);
-                "#
-            );
-            let mut eval = document::eval(&js_code);
-
-            loop {
-                if eval.recv::<bool>().await.is_ok() {
-                    ctx.toggle();
-                }
-            }
-        });
-    });
-
-    use_drop(|| {
-        _ = document::eval(
-            r#"
-            window.removeEventListener('keydown', window.__sidebarKeyHandler);
-            delete window.__sidebarKeyHandler;
-            "#,
-        );
-    });
-
-    let sidebar_style = format!(
-        r#"
-        --dx-sidebar-width: {SIDEBAR_WIDTH};
-        --dx-sidebar-width-mobile: {SIDEBAR_WIDTH_MOBILE};
-        --dx-sidebar-width-icon: {SIDEBAR_WIDTH_ICON}
-        "#
-    );
-
-    let base = attributes!(div {
-        class: Styles::dx_sidebar_wrapper,
-        "data-slot": "sidebar-wrapper",
-        style: sidebar_style,
-    });
-    let merged = merge_attributes(vec![base, attributes]);
-
-    rsx! {
-        div { ..merged, {children} }
-    }
-}
-
-#[component]
-pub fn Sidebar(
-    #[props(default)] side: SidebarSide,
-    #[props(default)] variant: SidebarVariant,
-    #[props(default)] collapsible: SidebarCollapsible,
-    #[props(extends = GlobalAttributes)] attributes: Vec<Attribute>,
-    children: Element,
-) -> Element {
-    let ctx = use_sidebar();
-    let mut ctx_side = ctx.side;
-    if *ctx_side.peek() != side {
-        ctx_side.set(side);
-    }
-
-    let is_mobile = ctx.is_mobile;
-    let state = ctx.state;
-    let open_mobile = ctx.open_mobile;
-
-    if collapsible == SidebarCollapsible::None {
-        let base = attributes!(div {
-            class: Styles::dx_sidebar_static,
-            "data-slot": "sidebar",
-        });
-        let merged = merge_attributes(vec![base, attributes]);
-
-        return rsx! {
-            div { ..merged, {children} }
-        };
-    }
-
-    if is_mobile() {
-        let sheet_side = match side {
-            SidebarSide::Left => SheetSide::Left,
-            SidebarSide::Right => SheetSide::Right,
-        };
-
-        return rsx! {
-            Sheet {
-                open: open_mobile(),
-                on_open_change: move |v| ctx.set_open_mobile(v),
-                "data-side": sheet_side.as_str(),
-                class: Styles::dx_sidebar_sheet.to_string(),
-                "data-sidebar": "sidebar",
-                "data-slot": "sidebar",
-                "data-mobile": "true",
-                SheetContentClose { class: Styles::dx_sidebar_sheet_close }
-                SheetHeader { class: Styles::dx_sr_only,
-                    SheetTitle { "Sidebar" }
-                    SheetDescription { "Displays the mobile sidebar." }
-                }
-                div { class: Styles::dx_sidebar_mobile_inner, {children} }
-            }
-        };
-    }
-
-    let collapsible_str = if state() == SidebarState::Collapsed {
-        collapsible.as_str()
-    } else {
-        ""
-    };
-
-    let container_base = attributes!(div {
-        class: Styles::dx_sidebar_container,
-        "data-slot": "sidebar-container",
-    });
-    let container_attrs = merge_attributes(vec![container_base, attributes]);
-
-    rsx! {
-        div {
-            class: Styles::dx_sidebar_desktop,
-            "data-state": state().as_str(),
-            "data-collapsible": collapsible_str,
-            "data-variant": variant.as_str(),
-            "data-side": side.as_str(),
-            "data-slot": "sidebar",
-            div { class: Styles::dx_sidebar_gap, "data-slot": "sidebar-gap" }
-            div {
-                ..container_attrs,
-                div {
-                    class: Styles::dx_sidebar_inner,
-                    "data-sidebar": "sidebar",
-                    "data-slot": "sidebar-inner",
-                    {children}
-                }
-            }
-        }
-    }
-}
-
-#[component]
-pub fn SidebarTrigger(
-    #[props(default)] onclick: Option<EventHandler<MouseEvent>>,
-    #[props(extends = GlobalAttributes)]
-    #[props(extends = button)]
-    attributes: Vec<Attribute>,
-) -> Element {
-    let ctx = use_sidebar();
-
-    let base = attributes!(button {
-        class: Styles::dx_sidebar_trigger,
-        "data-sidebar": "trigger",
-        "data-slot": "sidebar-trigger",
-    });
-    let merged = merge_attributes(vec![base, attributes]);
-
-    rsx! {
-        Button {
-            variant: ButtonVariant::Ghost,
-            onclick: move |e| {
-                if let Some(handler) = &onclick {
-                    handler.call(e);
-                }
-                ctx.toggle();
-            },
-            attributes: merged,
-            PanelLeft {
-                class: Styles::dx_sidebar_trigger_icon,
-                size: "1rem",
-            }
-            span { class: Styles::dx_sr_only, "Toggle Sidebar" }
-        }
-    }
-}
-
-#[component]
-pub fn SidebarRail(#[props(extends = GlobalAttributes)] attributes: Vec<Attribute>) -> Element {
-    let ctx = use_sidebar();
-
-    let base = attributes!(button {
-        class: Styles::dx_sidebar_rail,
-        "data-sidebar": "rail",
-        "data-slot": "sidebar-rail",
-    });
-    let merged = merge_attributes(vec![base, attributes]);
-
-    rsx! {
-        button {
-            aria_label: "Toggle Sidebar",
-            tabindex: -1,
-            onclick: move |_| ctx.toggle(),
-            title: "Toggle Sidebar",
-            ..merged,
-        }
-    }
-}
-
-#[component]
-pub fn SidebarInset(
-    #[props(extends = GlobalAttributes)] attributes: Vec<Attribute>,
-    children: Element,
-) -> Element {
-    let base = attributes!(main {
-        class: Styles::dx_sidebar_inset,
-        "data-slot": "sidebar-inset",
-    });
-    let merged = merge_attributes(vec![base, attributes]);
-
-    rsx! {
-        main { ..merged, {children} }
-    }
-}
-
-#[component]
-pub fn SidebarHeader(
-    #[props(extends = GlobalAttributes)] attributes: Vec<Attribute>,
-    children: Element,
-) -> Element {
-    let base = attributes!(div {
-        class: Styles::dx_sidebar_header,
-        "data-slot": "sidebar-header",
-        "data-sidebar": "header",
-    });
-    let merged = merge_attributes(vec![base, attributes]);
-
-    rsx! {
-        div { ..merged, {children} }
-    }
-}
-
-#[component]
-pub fn SidebarContent(
-    #[props(extends = GlobalAttributes)] attributes: Vec<Attribute>,
-    children: Element,
-) -> Element {
-    let base = attributes!(div {
-        class: Styles::dx_sidebar_content,
-        "data-slot": "sidebar-content",
-        "data-sidebar": "content",
-    });
-    let merged = merge_attributes(vec![base, attributes]);
-
-    rsx! {
-        div { ..merged, {children} }
-    }
-}
-
-#[component]
-pub fn SidebarFooter(
-    #[props(extends = GlobalAttributes)] attributes: Vec<Attribute>,
-    children: Element,
-) -> Element {
-    let base = attributes!(div {
-        class: Styles::dx_sidebar_footer,
-        "data-slot": "sidebar-footer",
-        "data-sidebar": "footer",
-    });
-    let merged = merge_attributes(vec![base, attributes]);
-
-    rsx! {
-        div { ..merged, {children} }
-    }
-}
-
-#[component]
-pub fn SidebarSeparator(
-    #[props(default = true)] horizontal: bool,
-    #[props(default = true)] decorative: bool,
-    #[props(extends = GlobalAttributes)] attributes: Vec<Attribute>,
-) -> Element {
-    let base = attributes!(div {
-        class: Styles::dx_sidebar_separator,
-        "data-slot": "sidebar-separator",
-        "data-sidebar": "separator",
-    });
-    let merged = merge_attributes(vec![base, attributes]);
-
-    rsx! {
-        Separator { horizontal, decorative, attributes: merged }
-    }
-}
-
-#[component]
-pub fn SidebarGroup(
-    #[props(extends = GlobalAttributes)] attributes: Vec<Attribute>,
-    children: Element,
-) -> Element {
-    let base = attributes!(div {
-        class: Styles::dx_sidebar_group,
-        "data-slot": "sidebar-group",
-        "data-sidebar": "group",
-    });
-    let merged = merge_attributes(vec![base, attributes]);
-
-    rsx! {
-        div { ..merged, {children} }
-    }
-}
-
-#[component]
-pub fn SidebarGroupLabel(
-    r#as: Option<Callback<Vec<Attribute>, Element>>,
-    #[props(extends = GlobalAttributes)] attributes: Vec<Attribute>,
-    children: Element,
-) -> Element {
-    let base = attributes!(div {
-        class: Styles::dx_sidebar_group_label,
-        "data-slot": "sidebar-group-label",
-        "data-sidebar": "group-label",
-    });
-    let merged = merge_attributes(vec![base, attributes]);
-
-    if let Some(dynamic) = r#as {
-        dynamic.call(merged)
-    } else {
-        rsx! {
-            div { ..merged,{children} }
-        }
-    }
-}
-
-#[component]
-pub fn SidebarGroupAction(
-    r#as: Option<Callback<Vec<Attribute>, Element>>,
-    #[props(extends = GlobalAttributes)] attributes: Vec<Attribute>,
-    children: Element,
-) -> Element {
-    let base = attributes!(button {
-        class: Styles::dx_sidebar_group_action,
-        "data-slot": "sidebar-group-action",
-        "data-sidebar": "group-action",
-    });
-    let merged = merge_attributes(vec![base, attributes]);
-
-    if let Some(dynamic) = r#as {
-        dynamic.call(merged)
-    } else {
-        rsx! {
-            button { ..merged,{children} }
-        }
-    }
-}
-
-#[component]
-pub fn SidebarGroupContent(
-    #[props(extends = GlobalAttributes)] attributes: Vec<Attribute>,
-    children: Element,
-) -> Element {
-    let base = attributes!(div {
-        class: Styles::dx_sidebar_group_content,
-        "data-slot": "sidebar-group-content",
-        "data-sidebar": "group-content",
-    });
-    let merged = merge_attributes(vec![base, attributes]);
-
-    rsx! {
-        div { ..merged, {children} }
-    }
-}
-
-#[component]
-pub fn SidebarMenu(
-    #[props(extends = GlobalAttributes)] attributes: Vec<Attribute>,
-    children: Element,
-) -> Element {
-    let base = attributes!(ul {
-        class: Styles::dx_sidebar_menu,
-        "data-slot": "sidebar-menu",
-        "data-sidebar": "menu",
-    });
-    let merged = merge_attributes(vec![base, attributes]);
-
-    rsx! {
-        ul { ..merged, {children} }
-    }
-}
-
-#[component]
-pub fn SidebarMenuItem(
-    #[props(extends = GlobalAttributes)] attributes: Vec<Attribute>,
-    children: Element,
-) -> Element {
-    let base = attributes!(li {
-        class: Styles::dx_sidebar_menu_item,
-        "data-slot": "sidebar-menu-item",
-        "data-sidebar": "menu-item",
-    });
-    let merged = merge_attributes(vec![base, attributes]);
-
-    rsx! {
-        li { ..merged, {children} }
-    }
-}
-
-#[derive(Debug, Clone, Copy, Default, PartialEq)]
-#[allow(dead_code)]
-pub enum SidebarMenuButtonVariant {
-    #[default]
-    Default,
-    Outline,
-}
-
-impl SidebarMenuButtonVariant {
-    pub fn as_str(&self) -> &'static str {
-        match self {
-            SidebarMenuButtonVariant::Default => "default",
-            SidebarMenuButtonVariant::Outline => "outline",
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy, Default, PartialEq)]
-#[allow(dead_code)]
-pub enum SidebarMenuButtonSize {
-    #[default]
-    Default,
-    Sm,
-    Lg,
-}
-
-impl SidebarMenuButtonSize {
-    pub fn as_str(&self) -> &'static str {
-        match self {
-            SidebarMenuButtonSize::Default => "default",
-            SidebarMenuButtonSize::Sm => "sm",
-            SidebarMenuButtonSize::Lg => "lg",
-        }
-    }
-}
-
-#[component]
-pub fn SidebarMenuButton(
-    #[props(default = false)] is_active: bool,
-    #[props(default)] variant: SidebarMenuButtonVariant,
-    #[props(default)] size: SidebarMenuButtonSize,
-    #[props(extends = GlobalAttributes)] attributes: Vec<Attribute>,
-    #[props(default)] tooltip: Option<Element>,
-    r#as: Option<Callback<Vec<Attribute>, Element>>,
-    children: Element,
-) -> Element {
-    let ctx = use_sidebar();
-    let is_mobile = ctx.is_mobile;
-    let state = ctx.state;
-
-    let base = attributes!(button {
-        class: Styles::dx_sidebar_menu_button,
-        "data-slot": "sidebar-menu-button",
-        "data-sidebar": "menu-button",
-        "data-size": size.as_str(),
-        "data-variant": variant.as_str(),
-        "data-active": if is_active { "true" } else { "false" },
-    });
-    let merged = merge_attributes(vec![base, attributes]);
-
-    let Some(tooltip_content) = tooltip else {
-        return if let Some(dynamic) = r#as {
-            dynamic.call(merged)
-        } else {
-            rsx! { button { ..merged, {children} } }
-        };
-    };
-
-    let hidden = state() != SidebarState::Collapsed || is_mobile();
-    let sidebar_side = ctx.side;
-
-    rsx! {
-        Tooltip {
-            class: Styles::dx_sidebar_tooltip,
-            disabled: hidden,
-            TooltipTrigger {
-                as: move |tooltip_attrs: Vec<Attribute>| {
-                    let final_attrs = merge_attributes(vec![tooltip_attrs, merged.clone()]);
-                    let children = children.clone();
-                    if let Some(dynamic) = &r#as {
-                        dynamic.call(final_attrs)
-                    } else {
-                        rsx! { button { ..final_attrs, {children} } }
-                    }
-                },
-            }
-            TooltipContent {
-                side: match sidebar_side() {
-                    SidebarSide::Left => dioxus_primitives::ContentSide::Right,
-                    SidebarSide::Right => dioxus_primitives::ContentSide::Left,
-                },
-                {tooltip_content}
-            }
-        }
-    }
-}
-
-#[component]
-pub fn SidebarMenuAction(
-    #[props(default = false)] show_on_hover: bool,
-    r#as: Option<Callback<Vec<Attribute>, Element>>,
-    #[props(extends = GlobalAttributes)] attributes: Vec<Attribute>,
-    children: Element,
-) -> Element {
-    let base = attributes!(button {
-        class: Styles::dx_sidebar_menu_action,
-        "data-slot": "sidebar-menu-action",
-        "data-sidebar": "menu-action",
-        "data-show-on-hover": if show_on_hover { "true" } else { "false" },
-    });
-    let merged = merge_attributes(vec![base, attributes]);
-
-    if let Some(dynamic) = r#as {
-        dynamic.call(merged)
-    } else {
-        rsx! {
-            button { ..merged,{children} }
-        }
-    }
-}
-
-#[component]
-pub fn SidebarMenuBadge(
-    #[props(extends = GlobalAttributes)] attributes: Vec<Attribute>,
-    children: Element,
-) -> Element {
-    let base = attributes!(div {
-        class: Styles::dx_sidebar_menu_badge,
-        "data-slot": "sidebar-menu-badge",
-        "data-sidebar": "menu-badge",
-    });
-    let merged = merge_attributes(vec![base, attributes]);
-
-    rsx! {
-        div { ..merged, {children} }
-    }
-}
-
-#[component]
-pub fn SidebarMenuSkeleton(
-    #[props(default = false)] show_icon: bool,
-    #[props(extends = GlobalAttributes)] attributes: Vec<Attribute>,
-) -> Element {
-    let base = attributes!(div {
-        class: Styles::dx_sidebar_menu_skeleton,
-        "data-slot": "sidebar-menu-skeleton",
-        "data-sidebar": "menu-skeleton",
-    });
-    let merged = merge_attributes(vec![base, attributes]);
-
-    rsx! {
-        div {
-            ..merged,
-            if show_icon {
-                Skeleton { class: Styles::dx_sidebar_menu_skeleton_icon }
-            }
-            Skeleton { class: Styles::dx_sidebar_menu_skeleton_text, width: "70%" }
-        }
-    }
-}
-
-#[component]
-pub fn SidebarMenuSub(
-    #[props(extends = GlobalAttributes)] attributes: Vec<Attribute>,
-    children: Element,
-) -> Element {
-    let base = attributes!(ul {
-        class: Styles::dx_sidebar_menu_sub,
-        "data-slot": "sidebar-menu-sub",
-        "data-sidebar": "menu-sub",
-    });
-    let merged = merge_attributes(vec![base, attributes]);
-
-    rsx! {
-        ul { ..merged, {children} }
-    }
-}
-
-#[component]
-pub fn SidebarMenuSubItem(
-    #[props(extends = GlobalAttributes)] attributes: Vec<Attribute>,
-    children: Element,
-) -> Element {
-    let base = attributes!(li {
-        class: Styles::dx_sidebar_menu_sub_item,
-        "data-slot": "sidebar-menu-sub-item",
-        "data-sidebar": "menu-sub-item",
-    });
-    let merged = merge_attributes(vec![base, attributes]);
-
-    rsx! {
-        li { ..merged, {children} }
-    }
-}
-
-#[derive(Debug, Clone, Copy, Default, PartialEq)]
-#[allow(dead_code)]
-pub enum SidebarMenuSubButtonSize {
-    Sm,
-    #[default]
-    Md,
-}
-
-impl SidebarMenuSubButtonSize {
-    pub fn as_str(&self) -> &'static str {
-        match self {
-            SidebarMenuSubButtonSize::Sm => "sm",
-            SidebarMenuSubButtonSize::Md => "md",
-        }
-    }
-}
-
-#[component]
-pub fn SidebarMenuSubButton(
-    #[props(default = false)] is_active: bool,
-    #[props(default)] size: SidebarMenuSubButtonSize,
-    r#as: Option<Callback<Vec<Attribute>, Element>>,
-    #[props(extends = GlobalAttributes)] attributes: Vec<Attribute>,
-    children: Element,
-) -> Element {
-    let base = attributes!(a {
-        class: Styles::dx_sidebar_menu_sub_button,
-        "data-slot": "sidebar-menu-sub-button",
-        "data-sidebar": "menu-sub-button",
-        "data-size": size.as_str(),
-        "data-active": if is_active { "true" } else { "false" },
-    });
-    let merged = merge_attributes(vec![base, attributes]);
-
-    if let Some(dynamic) = r#as {
-        dynamic.call(merged)
-    } else {
-        rsx! {
-            a { ..merged, {children} }
-        }
-    }
-}
diff --git a/crates/rustmotion-studio/src/components/sidebar/mod.rs b/crates/rustmotion-studio/src/components/sidebar/mod.rs
deleted file mode 100644
index f189b1fa..00000000
--- a/crates/rustmotion-studio/src/components/sidebar/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-mod component;
diff --git a/crates/rustmotion-studio/src/components/sidebar/style.css b/crates/rustmotion-studio/src/components/sidebar/style.css
deleted file mode 100644
index 1f867bd5..00000000
--- a/crates/rustmotion-studio/src/components/sidebar/style.css
+++ /dev/null
@@ -1,855 +0,0 @@
-/* TODO: abstract as Utilitiy class */
-.dx-sr-only {
-  position: absolute;
-  overflow: hidden;
-  width: 1px;
-  height: 1px;
-  padding: 0;
-  border: 0;
-  margin: -1px;
-  clip-path: inset(50%);
-  white-space: nowrap;
-}
-
-.dx-sidebar-wrapper {
-  --dx-sidebar-background: var(--primary-color-2);
-  --dx-sidebar-foreground: var(--secondary-color-4);
-  --dx-sidebar-border: var(--primary-color-6);
-  --dx-sidebar-accent: var(--primary-color-4);
-  --dx-sidebar-accent-foreground: var(--secondary-color-4);
-  --dx-sidebar-ring: var(--primary-color-7);
-
-  display: flex;
-  overflow: hidden;
-  width: 100%;
-  height: 100svh;
-  min-height: 100svh;
-}
-
-@media (width >=768px) {
-  .dx-sidebar-wrapper:has(.dx-sidebar-desktop[data-side="right"]) {
-    flex-direction: row-reverse;
-  }
-
-  .dx-sidebar-wrapper:has(.dx-sidebar-desktop[data-variant="inset"]) {
-    background: var(--dx-sidebar-background);
-  }
-}
-
-.dx-sidebar-desktop {
-  display: none;
-  color: var(--dx-sidebar-foreground);
-}
-
-@media (width >=768px) {
-  .dx-sidebar-desktop {
-    display: block;
-  }
-}
-
-.dx-sidebar-gap {
-  position: relative;
-  width: var(--dx-sidebar-width);
-  background: transparent;
-  transition: width 200ms ease-out;
-}
-
-[data-collapsible="icon"] .dx-sidebar-gap {
-  width: var(--dx-sidebar-width-icon);
-}
-
-[data-variant="floating"] .dx-sidebar-gap,
-[data-variant="inset"] .dx-sidebar-gap {
-  width: var(--dx-sidebar-width);
-}
-
-[data-variant="floating"][data-collapsible="icon"] .dx-sidebar-gap,
-[data-variant="inset"][data-collapsible="icon"] .dx-sidebar-gap {
-  width: calc(var(--dx-sidebar-width-icon) + 1rem);
-}
-
-[data-collapsible="offcanvas"] .dx-sidebar-gap {
-  width: 0;
-}
-
-.dx-sidebar-container {
-  position: fixed;
-  z-index: 10;
-  top: 0;
-  bottom: 0;
-  display: none;
-  width: var(--dx-sidebar-width);
-  height: 100svh;
-  box-sizing: border-box;
-  transition: left 200ms ease-out, right 200ms ease-out, width 200ms ease-out;
-}
-
-@media (width >=768px) {
-  .dx-sidebar-container {
-    display: flex;
-  }
-}
-
-[data-side="left"] .dx-sidebar-container {
-  left: 0;
-}
-
-[data-side="left"][data-collapsible="offcanvas"] .dx-sidebar-container {
-  left: calc(var(--dx-sidebar-width) * -1);
-}
-
-[data-side="right"] .dx-sidebar-container {
-  right: 0;
-}
-
-[data-side="right"][data-collapsible="offcanvas"] .dx-sidebar-container {
-  right: calc(var(--dx-sidebar-width) * -1);
-}
-
-[data-collapsible="icon"] .dx-sidebar-container {
-  overflow: visible;
-  width: var(--dx-sidebar-width-icon);
-}
-
-[data-collapsible="icon"] .dx-sidebar-inner {
-  overflow: visible;
-}
-
-[data-variant="sidebar"][data-side="left"] .dx-sidebar-container {
-  border-right: 1px solid var(--dx-sidebar-border);
-}
-
-[data-variant="sidebar"][data-side="right"] .dx-sidebar-container {
-  border-left: 1px solid var(--dx-sidebar-border);
-}
-
-[data-variant="floating"] .dx-sidebar-container,
-[data-variant="inset"] .dx-sidebar-container {
-  padding: 0.5rem;
-}
-
-[data-variant="floating"][data-collapsible="icon"] .dx-sidebar-container,
-[data-variant="inset"][data-collapsible="icon"] .dx-sidebar-container {
-  width: calc(var(--dx-sidebar-width-icon) + 1rem + 2px);
-}
-
-.dx-sidebar-inner {
-  display: flex;
-  width: 100%;
-  height: 100%;
-  box-sizing: border-box;
-  flex-direction: column;
-  background: var(--dx-sidebar-background);
-}
-
-[data-variant="floating"] .dx-sidebar-inner {
-  border: 1px solid var(--dx-sidebar-border);
-  border-radius: 0.5rem;
-  box-shadow: 0 1px 3px rgb(0 0 0 / 10%);
-}
-
-.dx-sidebar-static {
-  display: flex;
-  width: var(--dx-sidebar-width);
-  height: 100%;
-  flex-direction: column;
-  background: var(--dx-sidebar-background);
-  color: var(--dx-sidebar-foreground);
-}
-
-.dx-sidebar-sheet {
-  width: var(--dx-sidebar-width-mobile) !important;
-  padding: 0 !important;
-  background: var(--dx-sidebar-background);
-}
-
-.dx-sidebar-sheet-close {
-  display: none;
-}
-
-.dx-sidebar-mobile-inner {
-  display: flex;
-  width: 100%;
-  height: 100%;
-  flex-direction: column;
-}
-
-.dx-sidebar-trigger {
-  display: inline-flex;
-  width: 1.75rem;
-  height: 1.75rem;
-  align-items: center;
-  justify-content: center;
-  padding: 0 !important;
-  line-height: 0;
-}
-
-.dx-sidebar-trigger-icon {
-  width: 1rem;
-  height: 1rem;
-}
-
-.dx-sidebar-rail {
-  position: absolute;
-  z-index: 20;
-  top: 0;
-  bottom: 0;
-  display: none;
-  width: 1rem;
-  padding: 0;
-  border: none;
-  background: transparent;
-  cursor: ew-resize;
-  transform: translateX(-50%);
-  transition: all 200ms ease-out;
-}
-
-@media (width >=640px) {
-  .dx-sidebar-rail {
-    display: flex;
-  }
-}
-
-.dx-sidebar-rail::after {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 50%;
-  width: 2px;
-  content: "";
-}
-
-.dx-sidebar-rail:hover::after {
-  background: var(--dx-sidebar-border);
-}
-
-[data-side="left"] .dx-sidebar-rail {
-  right: -1rem;
-  cursor: w-resize;
-}
-
-[data-side="right"] .dx-sidebar-rail {
-  left: 0;
-  cursor: e-resize;
-}
-
-[data-side="left"][data-state="collapsed"] .dx-sidebar-rail {
-  cursor: e-resize;
-}
-
-[data-side="right"][data-state="collapsed"] .dx-sidebar-rail {
-  cursor: w-resize;
-}
-
-[data-collapsible="offcanvas"] .dx-sidebar-rail {
-  transform: translateX(0);
-}
-
-[data-collapsible="offcanvas"] .dx-sidebar-rail::after {
-  left: 100%;
-}
-
-[data-collapsible="offcanvas"] .dx-sidebar-rail:hover {
-  background: var(--dx-sidebar-background);
-}
-
-[data-side="left"][data-collapsible="offcanvas"] .dx-sidebar-rail {
-  right: -0.5rem;
-}
-
-[data-side="right"][data-collapsible="offcanvas"] .dx-sidebar-rail {
-  left: -0.5rem;
-}
-
-.dx-sidebar-inset {
-  position: relative;
-  display: flex;
-  width: 100%;
-  flex: 1 1 0%;
-  flex-direction: column;
-  background: var(--primary-color-1);
-}
-
-[data-variant="inset"]~.dx-sidebar-inset {
-  border-radius: 0.75rem;
-  margin: 0.5rem;
-  margin-left: 0;
-  box-shadow: 0 1px 3px rgb(0 0 0 / 10%);
-}
-
-[data-variant="inset"][data-state="collapsed"]~.dx-sidebar-inset {
-  margin-left: 0.5rem;
-}
-
-[data-variant="inset"][data-side="right"]~.dx-sidebar-inset {
-  margin-right: 0;
-  margin-left: 0.5rem;
-}
-
-[data-variant="inset"][data-side="right"][data-state="collapsed"]~.dx-sidebar-inset {
-  margin-right: 0.5rem;
-}
-
-.dx-sidebar-header {
-  display: flex;
-  flex-direction: column;
-  padding: 0.5rem;
-  gap: 0.5rem;
-}
-
-.dx-sidebar-content {
-  display: flex;
-  overflow: hidden auto;
-  min-height: 0;
-  flex: 1 1 0%;
-  flex-direction: column;
-  gap: 0.5rem;
-}
-
-[data-collapsible="icon"] .dx-sidebar-content {
-  overflow: visible;
-}
-
-.dx-sidebar-footer {
-  display: flex;
-  flex-direction: column;
-  padding: 0.5rem;
-  gap: 0.5rem;
-}
-
-.dx-sidebar-separator {
-  width: auto;
-  margin: 0 0.5rem;
-  background: var(--dx-sidebar-border);
-}
-
-.dx-sidebar-group {
-  position: relative;
-  display: flex;
-  min-width: 0;
-  flex-direction: column;
-  padding: 0.5rem;
-}
-
-.dx-sidebar-group-label {
-  display: flex;
-  height: 2rem;
-  align-items: center;
-  padding: 0 0.5rem;
-  border-radius: 0.375rem;
-  color: var(--dx-sidebar-foreground);
-  font-size: 0.75rem;
-  font-weight: 500;
-  opacity: 0.7;
-  outline: none;
-  transition: margin 200ms ease-out, opacity 200ms ease-out;
-}
-
-.dx-sidebar-group-label svg {
-  width: 1rem;
-  height: 1rem;
-  flex-shrink: 0;
-}
-
-[data-collapsible="icon"] .dx-sidebar-group-label {
-  margin-top: -2rem;
-  opacity: 0;
-}
-
-.dx-sidebar-group-action {
-  position: absolute;
-  top: 0.875rem;
-  right: 0.75rem;
-  display: flex;
-  width: 1.25rem;
-  align-items: center;
-  justify-content: center;
-  padding: 0;
-  border: none;
-  border-radius: 0.375rem;
-  aspect-ratio: 1;
-  background: transparent;
-  color: var(--dx-sidebar-foreground);
-  cursor: pointer;
-  outline: none;
-  transition: transform 150ms ease-out, opacity 200ms ease-out, visibility 0ms 0ms;
-}
-
-.dx-sidebar-group-action:hover {
-  background: var(--dx-sidebar-accent);
-  color: var(--dx-sidebar-accent-foreground);
-}
-
-.dx-sidebar-group-action svg {
-  width: 1rem;
-  height: 1rem;
-  flex-shrink: 0;
-}
-
-/* Increase hit area on mobile */
-.dx-sidebar-group-action::after {
-  position: absolute;
-  content: "";
-  inset: -0.5rem;
-}
-
-@media (width >=768px) {
-  .dx-sidebar-group-action::after {
-    display: none;
-  }
-}
-
-[data-collapsible="icon"] .dx-sidebar-group-action {
-  opacity: 0;
-  pointer-events: none;
-  transition: transform 150ms ease-out, opacity 200ms ease-out, visibility 0ms 200ms;
-  visibility: hidden;
-}
-
-.dx-sidebar-group-content {
-  width: 100%;
-  font-size: 0.875rem;
-}
-
-.dx-sidebar-menu {
-  display: flex;
-  width: 100%;
-  min-width: 0;
-  flex-direction: column;
-  padding: 0;
-  margin: 0;
-  gap: 0.25rem;
-  list-style: none;
-}
-
-.dx-sidebar-menu .dx-sidebar-dropdown-menu,
-.dx-sidebar-menu .dx-sidebar-tooltip {
-  display: block;
-  width: 100%;
-}
-
-.dx-sidebar-dropdown-menu-content .dx-sidebar-dropdown-separator[data-orientation="horizontal"] {
-  margin: 0.25rem 0;
-}
-
-.dx-sidebar-menu-item {
-  position: relative;
-}
-
-.dx-sidebar-menu-item > .dx-sidebar-dropdown-menu:has(.dx-sidebar-menu-action) {
-  position: static;
-}
-
-.dx-sidebar-header .dx-sidebar-menu-button.dx-sidebar-dropdown-menu-trigger:not(:focus-visible),
-.dx-sidebar-footer .dx-sidebar-menu-button.dx-sidebar-dropdown-menu-trigger:not(:focus-visible) {
-  box-shadow: none;
-}
-
-.dx-sidebar-sheet .dx-sidebar-header .dx-sidebar-dropdown-menu-content {
-  margin-top: 4px;
-  margin-bottom: 0;
-  inset: 100% auto auto 0;
-}
-
-.dx-sidebar-sheet .dx-sidebar-footer .dx-sidebar-dropdown-menu-content {
-  margin-top: 0;
-  margin-bottom: 4px;
-  inset: auto auto 100% 0;
-}
-
-.dx-sidebar-menu-button.dx-sidebar-collapsible-trigger:hover {
-  text-decoration: none;
-  text-decoration-line: none;
-}
-
-@media (width >= 768px) {
-  .dx-sidebar-desktop[data-side="left"] :is(.dx-sidebar-header, .dx-sidebar-menu-item:has(.dx-sidebar-menu-action)) .dx-sidebar-dropdown-menu-content {
-    top: 0;
-    left: 100%;
-    margin-top: 0;
-    margin-left: 0.5rem;
-  }
-
-  .dx-sidebar-desktop[data-side="left"] .dx-sidebar-footer .dx-sidebar-dropdown-menu-content {
-    top: auto;
-    bottom: 0;
-    left: 100%;
-    margin-bottom: 0;
-    margin-left: 0.5rem;
-  }
-
-  .dx-sidebar-desktop[data-side="right"] :is(.dx-sidebar-header, .dx-sidebar-menu-item:has(.dx-sidebar-menu-action)) .dx-sidebar-dropdown-menu-content {
-    top: 0;
-    right: 100%;
-    left: auto;
-    margin-top: 0;
-    margin-right: 0.5rem;
-  }
-
-  .dx-sidebar-desktop[data-side="right"] .dx-sidebar-footer .dx-sidebar-dropdown-menu-content {
-    margin-right: 0.5rem;
-    margin-bottom: 0;
-    inset: auto 100% 0 auto;
-  }
-}
-
-.dx-sidebar-menu-button[data-sidebar="menu-button"] {
-  display: flex;
-  overflow: hidden;
-  width: 100%;
-  box-sizing: border-box;
-  align-items: center;
-  padding: 0.5rem;
-  border: none;
-  border-radius: 0.375rem;
-  background: transparent;
-  color: var(--dx-sidebar-foreground);
-  cursor: pointer;
-  font-size: 0.875rem;
-  gap: 0.5rem;
-  outline: none;
-  text-align: left;
-  text-decoration: none;
-  transition: width 200ms ease-out, height 200ms ease-out, padding 200ms ease-out;
-}
-
-.dx-sidebar-menu-button[data-sidebar="menu-button"]:hover {
-  background: var(--dx-sidebar-accent);
-  color: var(--dx-sidebar-accent-foreground);
-}
-
-.dx-sidebar-menu-button[data-sidebar="menu-button"]:focus-visible {
-  box-shadow: 0 0 0 2px var(--dx-sidebar-ring);
-}
-
-.dx-sidebar-menu-button[data-sidebar="menu-button"]:active {
-  background: var(--dx-sidebar-accent);
-  color: var(--dx-sidebar-accent-foreground);
-}
-
-.dx-sidebar-menu-button[data-sidebar="menu-button"]:disabled,
-.dx-sidebar-menu-button[data-sidebar="menu-button"][aria-disabled="true"] {
-  opacity: 0.5;
-  pointer-events: none;
-}
-
-.dx-sidebar-menu-button[data-sidebar="menu-button"][data-active="true"] {
-  background: var(--dx-sidebar-accent);
-  color: var(--dx-sidebar-accent-foreground);
-  font-weight: 500;
-}
-
-.dx-sidebar-menu-button[data-sidebar="menu-button"] svg {
-  width: 1rem;
-  height: 1rem;
-  flex-shrink: 0;
-}
-
-.dx-sidebar-menu-button[data-sidebar="menu-button"]>span:last-child {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  transition: opacity 200ms ease-out;
-  white-space: nowrap;
-}
-
-.dx-sidebar-desktop[data-collapsible="icon"] .dx-sidebar-menu-button[data-sidebar="menu-button"]>span:last-child {
-  opacity: 0;
-}
-
-/* Size variants */
-.dx-sidebar-menu-button[data-sidebar="menu-button"][data-size="default"] {
-  height: 2rem;
-  font-size: 0.875rem;
-}
-
-.dx-sidebar-menu-button[data-sidebar="menu-button"][data-size="sm"] {
-  height: 1.75rem;
-  font-size: 0.75rem;
-}
-
-.dx-sidebar-menu-button[data-sidebar="menu-button"][data-size="lg"] {
-  height: 3rem;
-  font-size: 0.875rem;
-}
-
-.dx-sidebar-menu-button[data-sidebar="menu-button"][data-variant="outline"] {
-  background: var(--primary-color-1);
-  box-shadow: 0 0 0 1px var(--dx-sidebar-border);
-}
-
-.dx-sidebar-menu-button[data-sidebar="menu-button"][data-variant="outline"]:hover {
-  background: var(--dx-sidebar-accent);
-  box-shadow: 0 0 0 1px var(--dx-sidebar-accent);
-}
-
-.dx-sidebar-desktop[data-collapsible="icon"] .dx-sidebar-menu-button[data-sidebar="menu-button"] {
-  width: 2rem;
-  height: 2rem;
-  padding: 0.5rem;
-}
-
-.dx-sidebar-desktop[data-collapsible="icon"] .dx-sidebar-menu-button[data-sidebar="menu-button"][data-size="lg"] {
-  padding: 0;
-}
-
-.dx-sidebar-desktop[data-collapsible="icon"] .dx-sidebar-menu-button[data-sidebar="menu-button"]:has(> :first-child:is(svg, img)),
-.dx-sidebar-desktop[data-collapsible="icon"] .dx-sidebar-menu-button[data-sidebar="menu-button"]:has(> :first-child:has(svg, img)) {
-  justify-content: center;
-  gap: 0;
-}
-
-.dx-sidebar-desktop[data-collapsible="icon"] .dx-sidebar-menu-button[data-sidebar="menu-button"]:has(> :first-child:is(svg, img))> :not(:first-child),
-.dx-sidebar-desktop[data-collapsible="icon"] .dx-sidebar-menu-button[data-sidebar="menu-button"]:has(> :first-child:has(svg, img))> :not(:first-child) {
-  position: absolute;
-  overflow: hidden;
-  width: 1px;
-  height: 1px;
-  padding: 0;
-  border: 0;
-  margin: -1px;
-  clip-path: inset(50%);
-  white-space: nowrap;
-}
-
-.dx-sidebar-desktop[data-collapsible="icon"] .dx-sidebar-menu-button[data-sidebar="menu-button"] svg {
-  display: block;
-}
-
-.dx-sidebar-menu-item:has(.dx-sidebar-menu-action[data-sidebar="menu-action"]) .dx-sidebar-menu-button[data-sidebar="menu-button"] {
-  padding-right: 2rem;
-}
-
-.dx-sidebar-menu-action[data-sidebar="menu-action"] {
-  position: absolute;
-  top: 0.375rem;
-  right: 0.25rem;
-  display: flex;
-  width: 1.25rem;
-  align-items: center;
-  justify-content: center;
-  padding: 0;
-  border: none;
-  border-radius: 0.375rem;
-  aspect-ratio: 1;
-  background: transparent;
-  color: var(--dx-sidebar-foreground);
-  cursor: pointer;
-  outline: none;
-  transition: transform 150ms ease-out, opacity 200ms ease-out, visibility 0ms 0ms;
-}
-
-.dx-sidebar-menu-action[data-sidebar="menu-action"]:hover {
-  background: var(--dx-sidebar-accent);
-  color: var(--dx-sidebar-accent-foreground);
-}
-
-.dx-sidebar-menu-action[data-sidebar="menu-action"] svg {
-  width: 1rem;
-  height: 1rem;
-  flex-shrink: 0;
-}
-
-.dx-sidebar-menu-action[data-sidebar="menu-action"]::after {
-  position: absolute;
-  content: "";
-  inset: -0.5rem;
-}
-
-@media (width >=768px) {
-  .dx-sidebar-menu-action[data-sidebar="menu-action"]::after {
-    display: none;
-  }
-}
-
-.dx-sidebar-menu-button[data-sidebar="menu-button"][data-size="sm"]~.dx-sidebar-menu-action[data-sidebar="menu-action"] {
-  top: 0.25rem;
-}
-
-.dx-sidebar-menu-button[data-sidebar="menu-button"][data-size="default"]~.dx-sidebar-menu-action[data-sidebar="menu-action"] {
-  top: 0.375rem;
-}
-
-.dx-sidebar-menu-button[data-sidebar="menu-button"][data-size="lg"]~.dx-sidebar-menu-action[data-sidebar="menu-action"] {
-  top: 0.625rem;
-}
-
-[data-collapsible="icon"] .dx-sidebar-menu-action[data-sidebar="menu-action"] {
-  opacity: 0;
-  pointer-events: none;
-  transition: transform 150ms ease-out, opacity 200ms ease-out, visibility 0ms 200ms;
-  visibility: hidden;
-}
-
-.dx-sidebar-menu-action[data-sidebar="menu-action"][data-show-on-hover="true"] {
-  opacity: 0;
-}
-
-@media (width >=768px) {
-  .dx-sidebar-menu-item:hover .dx-sidebar-menu-action[data-sidebar="menu-action"][data-show-on-hover="true"],
-  .dx-sidebar-menu-item:focus-within .dx-sidebar-menu-action[data-sidebar="menu-action"][data-show-on-hover="true"],
-  .dx-sidebar-menu-action[data-sidebar="menu-action"][data-show-on-hover="true"][data-state="open"] {
-    opacity: 1;
-  }
-}
-
-.dx-sidebar-menu-button[data-sidebar="menu-button"][data-active="true"]~.dx-sidebar-menu-action[data-sidebar="menu-action"][data-show-on-hover="true"] {
-  color: var(--dx-sidebar-accent-foreground);
-}
-
-.dx-sidebar-menu-badge {
-  position: absolute;
-  top: 0.375rem;
-  right: 0.25rem;
-  display: flex;
-  min-width: 1.25rem;
-  height: 1.25rem;
-  align-items: center;
-  justify-content: center;
-  padding: 0 0.25rem;
-  border-radius: 0.375rem;
-  color: var(--dx-sidebar-foreground);
-  font-size: 0.75rem;
-  font-variant-numeric: tabular-nums;
-  font-weight: 500;
-  pointer-events: none;
-  transition: opacity 200ms ease-out;
-  user-select: none;
-}
-
-.dx-sidebar-menu-item:hover .dx-sidebar-menu-badge,
-.dx-sidebar-menu-item:has(.dx-sidebar-menu-button[data-active="true"]) .dx-sidebar-menu-badge {
-  color: var(--dx-sidebar-accent-foreground);
-}
-
-.dx-sidebar-menu-item:has(.dx-sidebar-menu-button[data-size="sm"]) .dx-sidebar-menu-badge {
-  top: 0.25rem;
-}
-
-.dx-sidebar-menu-item:has(.dx-sidebar-menu-button[data-size="lg"]) .dx-sidebar-menu-badge {
-  top: 0.625rem;
-}
-
-[data-collapsible="icon"] .dx-sidebar-menu-badge {
-  opacity: 0;
-  pointer-events: none;
-}
-
-.dx-sidebar-menu-skeleton {
-  display: flex;
-  height: 2rem;
-  align-items: center;
-  padding: 0 0.5rem;
-  border-radius: 0.375rem;
-  gap: 0.5rem;
-}
-
-.dx-sidebar-menu-skeleton-icon {
-  width: 1rem;
-  height: 1rem;
-  border-radius: 0.375rem;
-}
-
-.dx-sidebar-menu-skeleton-text {
-  height: 1rem;
-  flex: 1;
-}
-
-.dx-sidebar-menu-sub {
-  display: flex;
-  flex-direction: column;
-  padding: 0.125rem 0.625rem;
-  border-left: 1px solid var(--dx-sidebar-border);
-  margin: 0 0.875rem;
-  gap: 0.25rem;
-  list-style: none;
-  transform: translateX(1px);
-  transition: opacity 200ms ease-out, max-height 200ms ease-out, padding 200ms ease-out, margin 200ms ease-out, visibility 0ms 0ms;
-}
-
-[data-collapsible="icon"] .dx-sidebar-menu-sub {
-  overflow: hidden;
-  max-height: 0;
-  padding: 0;
-  margin: 0;
-  opacity: 0;
-  pointer-events: none;
-  transition: opacity 200ms ease-out, max-height 200ms ease-out, padding 200ms ease-out, margin 200ms ease-out, visibility 0ms 200ms;
-  visibility: hidden;
-}
-
-.dx-sidebar-menu-sub-item {
-  position: relative;
-}
-
-.dx-sidebar-menu-sub-button {
-  display: flex;
-  overflow: hidden;
-  width: 100%;
-  min-width: 0;
-  height: 1.75rem;
-  box-sizing: border-box;
-  align-items: center;
-  padding: 0 0.5rem;
-  border: none;
-  border-radius: 0.375rem;
-  background: transparent;
-  color: var(--dx-sidebar-foreground);
-  cursor: pointer;
-  font-size: 0.875rem;
-  gap: 0.5rem;
-  outline: none;
-  text-decoration: none;
-  transform: translateX(-1px);
-  transition: opacity 200ms ease-out;
-}
-
-.dx-sidebar-menu-sub-button:hover {
-  background: var(--dx-sidebar-accent);
-  color: var(--dx-sidebar-accent-foreground);
-}
-
-.dx-sidebar-menu-sub-button:focus-visible {
-  box-shadow: 0 0 0 2px var(--dx-sidebar-ring);
-}
-
-.dx-sidebar-menu-sub-button:active {
-  background: var(--dx-sidebar-accent);
-  color: var(--dx-sidebar-accent-foreground);
-}
-
-.dx-sidebar-menu-sub-button:disabled,
-.dx-sidebar-menu-sub-button[aria-disabled="true"] {
-  opacity: 0.5;
-  pointer-events: none;
-}
-
-.dx-sidebar-menu-sub-button[data-active="true"] {
-  background: var(--dx-sidebar-accent);
-  color: var(--dx-sidebar-accent-foreground);
-}
-
-.dx-sidebar-menu-sub-button svg {
-  width: 1rem;
-  height: 1rem;
-  flex-shrink: 0;
-  color: var(--dx-sidebar-accent-foreground);
-}
-
-.dx-sidebar-menu-sub-button>span:last-child {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.dx-sidebar-menu-sub-button[data-size="sm"] {
-  font-size: 0.75rem;
-}
-
-.dx-sidebar-menu-sub-button[data-size="md"] {
-  font-size: 0.875rem;
-}
-
-[data-collapsible="icon"] .dx-sidebar-menu-sub-button {
-  opacity: 0;
-  pointer-events: none;
-}
diff --git a/crates/rustmotion-studio/src/components/skeleton/component.rs b/crates/rustmotion-studio/src/components/skeleton/component.rs
deleted file mode 100644
index 1b7e8e4c..00000000
--- a/crates/rustmotion-studio/src/components/skeleton/component.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use dioxus::prelude::*;
-use dioxus_primitives::{dioxus_attributes::attributes, merge_attributes};
-
-#[css_module("/src/components/skeleton/style.css")]
-struct Styles;
-
-#[component]
-pub fn Skeleton(#[props(extends=GlobalAttributes)] attributes: Vec<Attribute>) -> Element {
-    let base = attributes!(div {
-        class: Styles::dx_skeleton,
-    });
-    let merged = merge_attributes(vec![base, attributes]);
-
-    rsx! {
-        div { ..merged }
-    }
-}
diff --git a/crates/rustmotion-studio/src/components/skeleton/mod.rs b/crates/rustmotion-studio/src/components/skeleton/mod.rs
deleted file mode 100644
index 2590c013..00000000
--- a/crates/rustmotion-studio/src/components/skeleton/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-mod component;
-pub use component::*;
diff --git a/crates/rustmotion-studio/src/components/skeleton/style.css b/crates/rustmotion-studio/src/components/skeleton/style.css
deleted file mode 100644
index 6230d4e8..00000000
--- a/crates/rustmotion-studio/src/components/skeleton/style.css
+++ /dev/null
@@ -1,16 +0,0 @@
-.dx-skeleton {
-  border-radius: 0.375rem;
-  animation: dx-skeleton-pulse 2s cubic-bezier(0.4, 0, 0.6, 1) infinite;
-  background-color: var(--primary-color-5);
-}
-
-@keyframes dx-skeleton-pulse {
-  0%,
-  100% {
-    opacity: 1;
-  }
-
-  61.8% {
-    opacity: 0.5;
-  }
-}
diff --git a/crates/rustmotion-studio/src/components/slider/component.rs b/crates/rustmotion-studio/src/components/slider/component.rs
deleted file mode 100644
index b48da513..00000000
--- a/crates/rustmotion-studio/src/components/slider/component.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use dioxus::prelude::*;
-use dioxus_primitives::slider::{self, RangeSliderProps, SliderProps};
-
-#[component]
-pub fn Slider(props: SliderProps) -> Element {
-    rsx! {
-        slider::Slider {
-            class: "dx-slider",
-            value: props.value,
-            default_value: props.default_value,
-            min: props.min,
-            max: props.max,
-            step: props.step,
-            disabled: props.disabled,
-            horizontal: props.horizontal,
-            inverted: props.inverted,
-            on_value_change: props.on_value_change,
-            label: props.label,
-            attributes: props.attributes,
-            slider::SliderTrack { class: "dx-slider-track",
-                slider::SliderRange { class: "dx-slider-range" }
-                slider::SliderThumb { class: "dx-slider-thumb" }
-            }
-        }
-    }
-}
-
-#[component]
-pub fn RangeSlider(props: RangeSliderProps) -> Element {
-    rsx! {
-        slider::RangeSlider {
-            class: "dx-slider",
-            value: props.value,
-            default_value: props.default_value,
-            min: props.min,
-            max: props.max,
-            step: props.step,
-            disabled: props.disabled,
-            horizontal: props.horizontal,
-            inverted: props.inverted,
-            on_value_change: props.on_value_change,
-            label: props.label,
-            attributes: props.attributes,
-            slider::SliderTrack { class: "dx-slider-track",
-                slider::SliderRange { class: "dx-slider-range" }
-                slider::SliderThumb { class: "dx-slider-thumb", index: 0usize }
-                slider::SliderThumb { class: "dx-slider-thumb", index: 1usize }
-            }
-        }
-    }
-}
diff --git a/crates/rustmotion-studio/src/components/slider/mod.rs b/crates/rustmotion-studio/src/components/slider/mod.rs
deleted file mode 100644
index 2590c013..00000000
--- a/crates/rustmotion-studio/src/components/slider/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-mod component;
-pub use component::*;
diff --git a/crates/rustmotion-studio/src/components/slider/style.css b/crates/rustmotion-studio/src/components/slider/style.css
deleted file mode 100644
index 796f241f..00000000
--- a/crates/rustmotion-studio/src/components/slider/style.css
+++ /dev/null
@@ -1,80 +0,0 @@
-.dx-slider {
-    position: relative;
-    display: flex;
-    min-width: 0;
-    width: 100%;
-    align-items: center;
-    padding: 0.5rem 0;
-    touch-action: none;
-}
-
-.dx-slider[data-orientation="vertical"] {
-    width: auto;
-    height: 200px;
-    flex-direction: column;
-}
-
-.dx-slider-track {
-    position: relative;
-    height: 0.5rem;
-    box-sizing: border-box;
-    flex-grow: 1;
-    border-radius: 9999px;
-    background: var(--primary-color-5);
-}
-
-.dx-slider[data-orientation="vertical"] .dx-slider-track {
-    width: 4px;
-    height: 100%;
-}
-
-.dx-slider-range {
-    position: absolute;
-    height: 100%;
-    border-radius: 9999px;
-    background-color: var(--secondary-color-2);
-}
-
-.dx-slider[data-orientation="vertical"] .dx-slider-range {
-    width: 100%;
-}
-
-.dx-slider-thumb {
-    all: unset;
-    position: absolute;
-    top: 50%;
-    display: block;
-    width: 16px;
-    height: 16px;
-    box-sizing: border-box;
-    border: 0;
-    border-radius: 50%;
-    background-color: var(--primary-color-1);
-    box-shadow: inset 0 0 0 1px var(--secondary-color-2);
-    cursor: pointer;
-    transform: translate3d(-50%, -50%, 0);
-    transition: box-shadow 150ms;
-    will-change: left, bottom, transform;
-}
-
-.dx-slider[data-orientation="vertical"] .dx-slider-thumb {
-    left: 50%;
-    transform: translate3d(-50%, 50%, 0);
-}
-
-.dx-slider-thumb:focus-visible[data-dragging="true"],
-.dx-slider-thumb:focus-visible,
-.dx-slider-thumb:hover {
-    box-shadow: inset 0 0 0 1px var(--secondary-color-2),
-        0 0 0 4px color-mix(in oklab, var(--primary-color-7) 50%, transparent);
-    transition: box-shadow 150ms;
-}
-
-.dx-slider[data-disabled="true"] {
-    cursor: not-allowed;
-    opacity: 0.5;
-}
-
-.dx-slider[data-disabled="true"] .dx-slider-thumb {
-    cursor: not-allowed;
-}
diff --git a/crates/rustmotion-studio/src/components/switch/component.rs b/crates/rustmotion-studio/src/components/switch/component.rs
deleted file mode 100644
index c06b2eb5..00000000
--- a/crates/rustmotion-studio/src/components/switch/component.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-use dioxus::prelude::*;
-use dioxus_primitives::switch::{self, SwitchProps};
-
-#[component]
-pub fn Switch(props: SwitchProps) -> Element {
-    rsx! {
-        switch::Switch {
-            class: "dx-switch",
-            checked: props.checked,
-            default_checked: props.default_checked,
-            disabled: props.disabled,
-            required: props.required,
-            name: props.name,
-            value: props.value,
-            on_checked_change: props.on_checked_change,
-            attributes: props.attributes,
-            switch::SwitchThumb { class: "dx-switch-thumb" }
-        }
-    }
-}
diff --git a/crates/rustmotion-studio/src/components/switch/mod.rs b/crates/rustmotion-studio/src/components/switch/mod.rs
deleted file mode 100644
index 2590c013..00000000
--- a/crates/rustmotion-studio/src/components/switch/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-mod component;
-pub use component::*;
diff --git a/crates/rustmotion-studio/src/components/switch/style.css b/crates/rustmotion-studio/src/components/switch/style.css
deleted file mode 100644
index 2d2a3e8a..00000000
--- a/crates/rustmotion-studio/src/components/switch/style.css
+++ /dev/null
@@ -1,48 +0,0 @@
-.dx-switch-example {
-  display: flex;
-  align-items: center;
-  padding: 20px;
-  gap: 15px;
-}
-
-.dx-switch {
-  all: unset;
-  position: relative;
-  width: 2rem;
-  height: 1.15rem;
-  border-radius: 9999px;
-  background-color: var(--primary-color-6);
-  cursor: pointer;
-  transition: background-color 150ms, box-shadow 150ms;
-}
-
-.dx-switch[data-state="checked"] {
-  background-color: var(--secondary-color-2);
-}
-
-.dx-switch:focus-visible {
-  box-shadow: 0 0 0 3px
-    color-mix(in oklab, var(--focused-border-color) 50%, transparent);
-}
-
-.dx-switch-thumb {
-  display: block;
-  width: calc(1.15rem - 2px);
-  height: calc(1.15rem - 2px);
-  border-radius: 9999px;
-  background-color: var(--rm-on-accent);
-  transform: translateX(1px);
-  transition: transform 150ms;
-  will-change: transform;
-}
-
-.dx-switch[data-state="checked"] .dx-switch-thumb {
-  background-color: var(--rm-on-accent);
-  transform: translateX(calc(2rem - 1px - (1.15rem - 2px)));
-}
-
-/* Only apply disabled styles when data-disabled is "true" */
-.dx-switch[data-disabled="true"] {
-  cursor: not-allowed;
-  opacity: 0.5;
-}
diff --git a/crates/rustmotion-studio/src/components/textarea/component.rs b/crates/rustmotion-studio/src/components/textarea/component.rs
deleted file mode 100644
index 9df47194..00000000
--- a/crates/rustmotion-studio/src/components/textarea/component.rs
+++ /dev/null
@@ -1,84 +0,0 @@
-// UI kit scaffold — variants are consumed incrementally as the studio grows.
-#![allow(dead_code)]
-use dioxus::prelude::*;
-
-#[css_module("/src/components/textarea/style.css")]
-struct Styles;
-
-#[derive(Copy, Clone, PartialEq, Default)]
-#[non_exhaustive]
-pub enum TextareaVariant {
-    #[default]
-    Default,
-    Fade,
-    Outline,
-    Ghost,
-}
-
-impl TextareaVariant {
-    pub fn class(&self) -> &'static str {
-        match self {
-            TextareaVariant::Default => "default",
-            TextareaVariant::Fade => "fade",
-            TextareaVariant::Outline => "outline",
-            TextareaVariant::Ghost => "ghost",
-        }
-    }
-}
-
-#[component]
-pub fn Textarea(
-    oninput: Option<EventHandler<FormEvent>>,
-    onchange: Option<EventHandler<FormEvent>>,
-    oninvalid: Option<EventHandler<FormEvent>>,
-    onselect: Option<EventHandler<SelectionEvent>>,
-    onselectionchange: Option<EventHandler<SelectionEvent>>,
-    onfocus: Option<EventHandler<FocusEvent>>,
-    onblur: Option<EventHandler<FocusEvent>>,
-    onfocusin: Option<EventHandler<FocusEvent>>,
-    onfocusout: Option<EventHandler<FocusEvent>>,
-    onkeydown: Option<EventHandler<KeyboardEvent>>,
-    onkeypress: Option<EventHandler<KeyboardEvent>>,
-    onkeyup: Option<EventHandler<KeyboardEvent>>,
-    oncompositionstart: Option<EventHandler<CompositionEvent>>,
-    oncompositionupdate: Option<EventHandler<CompositionEvent>>,
-    oncompositionend: Option<EventHandler<CompositionEvent>>,
-    oncopy: Option<EventHandler<ClipboardEvent>>,
-    oncut: Option<EventHandler<ClipboardEvent>>,
-    onpaste: Option<EventHandler<ClipboardEvent>>,
-    onmounted: Option<EventHandler<MountedEvent>>,
-    #[props(default)] variant: TextareaVariant,
-    #[props(extends=GlobalAttributes)]
-    #[props(extends=textarea)]
-    attributes: Vec<Attribute>,
-    children: Element,
-) -> Element {
-    rsx! {
-        textarea {
-            class: Styles::dx_textarea,
-            "data-slot": "textarea",
-            "data-style": variant.class(),
-            oninput: move |e| _ = oninput.map(|callback| callback(e)),
-            onchange: move |e| _ = onchange.map(|callback| callback(e)),
-            oninvalid: move |e| _ = oninvalid.map(|callback| callback(e)),
-            onselect: move |e| _ = onselect.map(|callback| callback(e)),
-            onselectionchange: move |e| _ = onselectionchange.map(|callback| callback(e)),
-            onfocus: move |e| _ = onfocus.map(|callback| callback(e)),
-            onblur: move |e| _ = onblur.map(|callback| callback(e)),
-            onfocusin: move |e| _ = onfocusin.map(|callback| callback(e)),
-            onfocusout: move |e| _ = onfocusout.map(|callback| callback(e)),
-            onkeydown: move |e| _ = onkeydown.map(|callback| callback(e)),
-            onkeypress: move |e| _ = onkeypress.map(|callback| callback(e)),
-            onkeyup: move |e| _ = onkeyup.map(|callback| callback(e)),
-            oncompositionstart: move |e| _ = oncompositionstart.map(|callback| callback(e)),
-            oncompositionupdate: move |e| _ = oncompositionupdate.map(|callback| callback(e)),
-            oncompositionend: move |e| _ = oncompositionend.map(|callback| callback(e)),
-            oncopy: move |e| _ = oncopy.map(|callback| callback(e)),
-            oncut: move |e| _ = oncut.map(|callback| callback(e)),
-            onpaste: move |e| _ = onpaste.map(|callback| callback(e)),
-            onmounted: move |e| _ = onmounted.map(|callback| callback(e)),
-            ..attributes,
-            {children}
-        }
-    }
-}
diff --git a/crates/rustmotion-studio/src/components/textarea/mod.rs b/crates/rustmotion-studio/src/components/textarea/mod.rs
deleted file mode 100644
index 2590c013..00000000
--- a/crates/rustmotion-studio/src/components/textarea/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-mod component;
-pub use component::*;
diff --git a/crates/rustmotion-studio/src/components/textarea/style.css b/crates/rustmotion-studio/src/components/textarea/style.css
deleted file mode 100644
index e2fb4a7c..00000000
--- a/crates/rustmotion-studio/src/components/textarea/style.css
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Base */
-.dx-textarea {
-  width: 100%;
-  min-height: 4rem;
-  box-sizing: border-box;
-  padding: 8px 12px;
-  border: none;
-  border-radius: 0.5rem;
-  margin: 0;
-  appearance: none;
-  background: none;
-  color: var(--secondary-color-4);
-  font-family: inherit;
-  line-height: 1.5;
-  outline: none;
-  resize: vertical;
-  transition: background-color 100ms ease-out, border-color 100ms ease-out, box-shadow 100ms ease-out;
-}
-
-.dx-textarea:disabled {
-  color: var(--secondary-color-5);
-  cursor: not-allowed;
-}
-
-.dx-textarea::placeholder {
-  color: var(--secondary-color-5);
-}
-
-/* Default Variant */
-.dx-textarea[data-style="default"] {
-  background: var(--light, var(--primary-color)) var(--dark, var(--primary-color-3));
-  box-shadow: inset 0 0 0 1px var(--light, var(--primary-color-6)) var(--dark, var(--primary-color-7));
-}
-
-.dx-textarea[data-style="default"]:hover:not(:disabled),
-.dx-textarea[data-style="default"]:focus {
-  background: var(--light, var(--primary-color-4)) var(--dark, var(--primary-color-5));
-  color: var(--secondary-color-1);
-}
-
-/* Fade Variant */
-.dx-textarea[data-style="fade"] {
-  background: var(--light, var(--primary-color)) var(--dark, var(--primary-color-3));
-}
-
-.dx-textarea[data-style="fade"]:hover:not(:disabled),
-.dx-textarea[data-style="fade"]:focus {
-  background: var(--light, var(--primary-color-4)) var(--dark, var(--primary-color-5));
-  color: var(--secondary-color-1);
-}
-
-/* Outline Variant */
-.dx-textarea[data-style="outline"] {
-  border: 1px solid var(--primary-color-6);
-  background-color: var(--light, var(--primary-color))
-    var(--dark, var(--primary-color-3));
-}
-
-.dx-textarea[data-style="outline"]:hover:not(:disabled, :focus) {
-  border-color: var(--primary-color-7);
-}
-
-.dx-textarea[data-style="outline"]:focus {
-  border-color: var(--focused-border-color);
-}
-
-.dx-textarea[data-style="outline"]:invalid,
-.dx-textarea[data-style="outline"][aria-invalid="true"] {
-  border-color: var(--primary-error-color);
-}
-
-/* Ghost Variant */
-.dx-textarea[data-style="ghost"] {
-  background-color: transparent;
-}
-
-.dx-textarea[data-style="ghost"]:hover:not(:disabled) {
-  background-color: var(--primary-color-5);
-  color: var(--secondary-color-1);
-}
-
-.dx-textarea[data-style="ghost"]:focus {
-  border-color: var(--focused-border-color);
-}
diff --git a/crates/rustmotion-studio/src/components/tooltip/component.rs b/crates/rustmotion-studio/src/components/tooltip/component.rs
deleted file mode 100644
index fd69dc7a..00000000
--- a/crates/rustmotion-studio/src/components/tooltip/component.rs
+++ /dev/null
@@ -1,61 +0,0 @@
-use dioxus::prelude::*;
-use dioxus_primitives::dioxus_attributes::attributes;
-use dioxus_primitives::merge_attributes;
-use dioxus_primitives::tooltip::{self, TooltipContentProps, TooltipProps, TooltipTriggerProps};
-
-#[css_module("/src/components/tooltip/style.css")]
-struct Styles;
-
-#[component]
-pub fn Tooltip(props: TooltipProps) -> Element {
-    let base = attributes!(div {
-        class: Styles::dx_tooltip,
-    });
-    let merged = merge_attributes(vec![base, props.attributes]);
-
-    rsx! {
-        tooltip::Tooltip {
-            disabled: props.disabled,
-            open: props.open,
-            default_open: props.default_open,
-            on_open_change: props.on_open_change,
-            attributes: merged,
-            {props.children}
-        }
-    }
-}
-
-#[component]
-pub fn TooltipTrigger(props: TooltipTriggerProps) -> Element {
-    let base = attributes!(button {
-        class: Styles::dx_tooltip_trigger,
-    });
-    let merged = merge_attributes(vec![base, props.attributes]);
-
-    rsx! {
-        tooltip::TooltipTrigger {
-            id: props.id,
-            as: props.r#as,
-            attributes: merged,
-            {props.children}
-        }
-    }
-}
-
-#[component]
-pub fn TooltipContent(props: TooltipContentProps) -> Element {
-    let base = attributes!(div {
-        class: Styles::dx_tooltip_content,
-    });
-    let merged = merge_attributes(vec![base, props.attributes]);
-
-    rsx! {
-        tooltip::TooltipContent {
-            id: props.id,
-            side: props.side,
-            align: props.align,
-            attributes: merged,
-            {props.children}
-        }
-    }
-}
diff --git a/crates/rustmotion-studio/src/components/tooltip/mod.rs b/crates/rustmotion-studio/src/components/tooltip/mod.rs
deleted file mode 100644
index 2590c013..00000000
--- a/crates/rustmotion-studio/src/components/tooltip/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-mod component;
-pub use component::*;
diff --git a/crates/rustmotion-studio/src/components/tooltip/style.css b/crates/rustmotion-studio/src/components/tooltip/style.css
deleted file mode 100644
index 857b87af..00000000
--- a/crates/rustmotion-studio/src/components/tooltip/style.css
+++ /dev/null
@@ -1,150 +0,0 @@
-/* Tooltip Styles */
-.dx-tooltip {
-  position: relative;
-  display: inline-block;
-}
-
-.dx-tooltip-trigger {
-  display: inline-block;
-}
-
-.dx-tooltip-content {
-  position: absolute;
-  z-index: 1000;
-  max-width: 250px;
-  padding: 8px 12px;
-  border-radius: 0.5rem;
-  animation: dx-tooltip-fade-in 0.2s ease-in-out;
-  background-color: var(--secondary-color-4);
-  color: var(--primary-color);
-  font-size: 14px;
-  line-height: 1.4;
-}
-
-.dx-tooltip-content::after {
-  position: absolute;
-  border-width: 0.25rem;
-  border-style: solid;
-  margin-left: -0.25rem;
-  content: " ";
-  rotate: 45deg;
-}
-
-/* Positioning based on side */
-.dx-tooltip-content[data-side="top"] {
-  position: absolute;
-  bottom: 100%;
-  left: 50%;
-  margin-bottom: 8px;
-  transform: translateX(-50%);
-}
-
-.dx-tooltip-content[data-side="top"]::after {
-  top: calc(100% - 0.25rem);
-  left: 50%;
-  border-color: var(--secondary-color-4);
-  border-radius: 0 0 0.1rem;
-}
-
-.dx-tooltip-content[data-side="right"] {
-  position: absolute;
-  top: 50%;
-  left: 100%;
-  margin-left: 8px;
-  transform: translateY(-50%);
-}
-
-.dx-tooltip-content[data-side="right"]::after {
-  top: calc(50% - 0.25rem);
-  left: 0;
-  border-color: var(--secondary-color-4);
-  border-radius: 0 0 0 0.1rem;
-}
-
-.dx-tooltip-content[data-side="bottom"] {
-  position: absolute;
-  top: 100%;
-  left: 50%;
-  margin-top: 8px;
-  transform: translateX(-50%);
-}
-
-.dx-tooltip-content[data-side="bottom"]::after {
-  bottom: calc(100% - 0.25rem);
-  left: 50%;
-  border-color: var(--secondary-color-4);
-  border-radius: 0.1rem 0 0;
-}
-
-.dx-tooltip-content[data-side="left"] {
-  position: absolute;
-  top: 50%;
-  right: 100%;
-  margin-right: 8px;
-  transform: translateY(-50%);
-}
-
-.dx-tooltip-content[data-side="left"]::after {
-  top: calc(50% - 0.25rem);
-  right: -0.25rem;
-  border-color: var(--secondary-color-4);
-  border-radius: 0 0.1rem 0 0;
-}
-
-/* Alignment styles for top and bottom */
-.dx-tooltip-content[data-side="top"][data-align="start"],
-.dx-tooltip-content[data-side="bottom"][data-align="start"] {
-  left: 0;
-  transform: none;
-}
-
-.dx-tooltip-content[data-side="top"][data-align="end"],
-.dx-tooltip-content[data-side="bottom"][data-align="end"] {
-  right: 0;
-  left: auto;
-  transform: none;
-}
-
-/* Alignment styles for left and right */
-.dx-tooltip-content[data-side="left"][data-align="start"],
-.dx-tooltip-content[data-side="right"][data-align="start"] {
-  top: 0;
-  transform: none;
-}
-
-.dx-tooltip-content[data-side="left"][data-align="center"],
-.dx-tooltip-content[data-side="right"][data-align="center"] {
-  top: 50%;
-  transform: translateY(-50%);
-}
-
-.dx-tooltip-content[data-side="left"][data-align="end"],
-.dx-tooltip-content[data-side="right"][data-align="end"] {
-  top: auto;
-  bottom: 0;
-  transform: none;
-}
-
-/* Animation */
-@keyframes dx-tooltip-fade-in {
-  from {
-    opacity: 0;
-  }
-
-  to {
-    opacity: 1;
-  }
-}
-
-/* State styles */
-.dx-tooltip[data-disabled="true"] .dx-tooltip-trigger {
-  cursor: default;
-}
-
-.dx-tooltip-content[data-state="closed"] {
-  display: none;
-}
-
-.dx-tooltip-content[data-state="open"] {
-  display: block;
-}
diff --git a/crates/rustmotion-studio/src/editor/annotations.rs b/crates/rustmotion-studio/src/editor/annotations.rs
index 129f7f83..cc7b4d94 100644
--- a/crates/rustmotion-studio/src/editor/annotations.rs
+++ b/crates/rustmotion-studio/src/editor/annotations.rs
@@ -1,185 +1,101 @@
-use dioxus::prelude::*;
-
-use crate::{
-    components::{
-        button::{Button, ButtonSize, ButtonVariant},
-        textarea::{Textarea, TextareaVariant},
-    },
-    scenario::{
-        append_annotation, append_sidecar_annotation, remove_annotation, remove_sidecar_annotation,
-        Shared,
-    },
+use gpui_component::button::{Button, ButtonVariants as _};
+use gpui_component::input::{Textarea, TextareaState};
+use gpui_component::{h_flex, v_flex, ActiveTheme, Disableable as _, Sizable as _, StyledExt as _};
+use gpui_kit::prelude::FluentBuilder as _;
+use gpui_kit::{
+    deferred, div, px, App, AppContext as _, Context, Entity, InteractiveElement, IntoElement,
+    ParentElement, Render, RenderOnce, SharedString, StatefulInteractiveElement, Styled, Window,
 };
 
-/// Write `content` to `path`, returning a user-facing error string on failure.
+use crate::app::state::EditorState;
+use crate::scenario::{
+    append_annotation, append_sidecar_annotation, history_slot, record_edit, remove_annotation,
+    remove_sidecar_annotation, Shared,
+};
+
+const TOPBAR_HEIGHT: gpui_kit::Pixels = px(40.);
+const PANEL_WIDTH: gpui_kit::Pixels = px(280.);
+
 fn write_file(path: &std::path::Path, content: &str) -> Result<(), String> {
     std::fs::write(path, content).map_err(|e| format!("write: {e}"))
 }
 
-/// The left-hand "Comments" panel: lists the scenario's annotations, with
-/// per-comment "go to frame" and "delete" actions.
-#[component]
-pub fn AnnotationsPanel(
-    current: Signal<u32>,
-    annotations: Vec<(String, String, u64, String)>,
-) -> Element {
-    let shared = use_context::<Shared>();
-    rsx! {
-        div { style: "position:fixed; top:40px; left:0; width:280px; height:calc(100vh - 40px); background:var(--rm-surface); border-right:1px solid var(--rm-border); padding:16px; box-sizing:border-box; overflow:auto; display:flex; flex-direction:column; gap:10px;",
-            div { style: "color:var(--rm-accent); font-weight:600;", "Comments" }
-            if annotations.is_empty() {
-                div { style: "color:var(--rm-text-muted);", "No comments yet." }
-            }
-            for (id, note, frame, kind) in annotations.iter().cloned() {
-                div {
-                    key: "{id}",
-                    style: "border:1px solid var(--rm-border-2); border-radius:6px; padding:8px; display:flex; flex-direction:column; gap:6px;",
-                    div { style: "color:var(--rm-text-muted); font-size:11px;", "{kind} · frame {frame}" }
-                    div { "{note}" }
-                    div { style: "display:flex; gap:8px;",
-                        Button {
-                            variant: ButtonVariant::Ghost,
-                            size: ButtonSize::Xs,
-                            onclick: move |_| current.set(frame as u32),
-                            "Go to frame"
-                        }
-                        Button {
-                            variant: ButtonVariant::Destructive,
-                            size: ButtonSize::Xs,
-                            onclick: {
-                                let shared = shared.clone();
-                                let id = id.clone();
-                                move |_| delete_annotation(&shared, &id)
-                            },
-                            "Delete"
-                        }
-                    }
-                }
-            }
-        }
-    }
+fn annotation_id() -> String {
+    let n = std::time::SystemTime::now()
+        .duration_since(std::time::UNIX_EPOCH)
+        .map(|d| d.as_nanos())
+        .unwrap_or(0);
+    format!("an_{n:x}")
 }
 
-/// The "leave a comment for the agent" capture box, isolated in a child so its
-/// textarea keeps focus during playback. Reads the playhead (`current`) only in
-/// the submit handler, so it isn't subscribed to it.
-#[component]
-pub fn AnnotationBox(pointer: String, kind: String, current: Signal<u32>) -> Element {
-    let shared = use_context::<Shared>();
-    let mut note = use_signal(String::new);
-
-    let submit = {
-        let shared = shared.clone();
-        move |_| {
-            let text = note();
-            if text.trim().is_empty() {
-                return;
+pub fn submit_annotation(
+    shared: &Shared,
+    frame: u32,
+    pointer: String,
+    kind: String,
+    text: String,
+) -> Result<(), String> {
+    let (path, raw, view, scene) = {
+        let m = shared.lock().unwrap_or_else(|e| e.into_inner());
+        let (view, scene) = match m.tasks.get(frame as usize) {
+            Some(rustmotion::encode::video::FrameTask::Normal {
+                view_idx,
+                scene_idx,
+                ..
+            }) => (*view_idx, *scene_idx),
+            _ => (0, 0),
+        };
+        (m.path.clone(), m.raw.clone(), view, scene)
+    };
+    let ann = serde_json::json!({
+        "id": annotation_id(), "note": text, "status": "open", "frame": frame,
+        "view": view, "scene": scene,
+        "target": { "pointer": pointer, "kind": kind }
+    });
+    let Some(path) = path else {
+        return Err("no scenario file open".to_string());
+    };
+
+    if rustmotion::loader::is_html_path(&path) {
+        let result = append_sidecar_annotation(&path, ann.clone());
+        let mut m = shared.lock().unwrap_or_else(|e| e.into_inner());
+        match result {
+            Ok(()) => {
+                m.write_error = None;
+                m.raw = append_annotation(std::mem::take(&mut m.raw), ann);
+                m.generation = m.generation.wrapping_add(1);
+                Ok(())
             }
-            let frame = current();
-            let (path, raw, view, scene) = {
-                let m = shared.lock().unwrap_or_else(|e| e.into_inner());
-                let (view, scene) = match m.tasks.get(frame as usize) {
-                    Some(rustmotion::encode::video::FrameTask::Normal {
-                        view_idx,
-                        scene_idx,
-                        ..
-                    }) => (*view_idx, *scene_idx),
-                    _ => (0, 0),
-                };
-                (m.path.clone(), m.raw.clone(), view, scene)
-            };
-            let ann = serde_json::json!({
-                "id": annotation_id(), "note": text, "status": "open", "frame": frame,
-                "view": view, "scene": scene,
-                "target": { "pointer": pointer, "kind": kind }
-            });
-            let Some(path) = path else {
-                return;
-            };
-            if rustmotion::loader::is_html_path(&path) {
-                // HTML sources: annotations live in the `<stem>.annotations.json`
-                // sidecar; the HTML file itself is never modified.
-                let result = append_sidecar_annotation(&path, ann.clone());
-                let mut m = shared.lock().unwrap_or_else(|e| e.into_inner());
-                match result {
-                    Ok(()) => {
-                        m.write_error = None;
-                        // The watcher doesn't observe the sidecar, so reflect
-                        // the change in the in-memory raw directly.
-                        m.raw = append_annotation(std::mem::take(&mut m.raw), ann);
-                        m.generation = m.generation.wrapping_add(1);
-                        note.set(String::new());
-                    }
-                    Err(e) => {
-                        m.write_error = Some(e);
-                        m.generation = m.generation.wrapping_add(1);
-                    }
-                }
-            } else {
-                let updated = append_annotation(raw, ann);
-                match serde_json::to_string_pretty(&updated) {
-                    Ok(t) => {
-                        // Pre-write state for the undo history (JSON annotation
-                        // writes rewrite the scenario file, so they must be in
-                        // the same linear history as inspector edits).
-                        let snapshot = std::fs::read_to_string(&path).ok();
-                        let write_result = write_file(&path, &t);
-                        if write_result.is_ok() {
-                            if let Some(s) = snapshot {
-                                crate::scenario::record_edit(
-                                    &crate::scenario::history_slot(),
-                                    &path,
-                                    s,
-                                );
-                            }
-                        }
-                        let mut m = shared.lock().unwrap_or_else(|e| e.into_inner());
-                        match write_result {
-                            Ok(()) => {
-                                m.write_error = None;
-                                note.set(String::new());
-                            }
-                            Err(e) => {
-                                m.write_error = Some(e);
-                                m.generation = m.generation.wrapping_add(1);
-                            }
-                        }
-                    }
-                    Err(e) => {
-                        let mut m = shared.lock().unwrap_or_else(|e| e.into_inner());
-                        m.write_error = Some(format!("json: {e}"));
-                        m.generation = m.generation.wrapping_add(1);
-                    }
-                }
+            Err(e) => {
+                m.write_error = Some(e.clone());
+                m.generation = m.generation.wrapping_add(1);
+                Err(e)
             }
         }
-    };
-
-    rsx! {
-        div { style: "border-top:1px solid var(--rm-border); padding-top:12px; padding:16px; display:flex; flex-direction:column; gap:8px;",
-            div { style: "color:var(--rm-text-muted);", "Leave a comment for the agent" },
-            Textarea {
-                variant: TextareaVariant::Outline,
-                placeholder: "Enter your description",
-                value: note,
-                rows: 5,
-                oninput: move |e: FormEvent| {
-                  note.set(e.value())
-                },
+    } else {
+        let updated = append_annotation(raw, ann);
+        let text = serde_json::to_string_pretty(&updated).map_err(|e| format!("json: {e}"))?;
+        let snapshot = std::fs::read_to_string(&path).ok();
+        let write_result = write_file(&path, &text);
+        let mut m = shared.lock().unwrap_or_else(|e| e.into_inner());
+        match write_result {
+            Ok(()) => {
+                if let Some(s) = snapshot {
+                    record_edit(&history_slot(), &path, s);
+                }
+                m.write_error = None;
+                Ok(())
             }
-            Button {
-              variant: ButtonVariant::Primary,
-              onclick: submit,
-              "Add comment"
+            Err(e) => {
+                m.write_error = Some(e.clone());
+                m.generation = m.generation.wrapping_add(1);
+                Err(e)
             }
         }
     }
 }
 
-/// Remove an annotation by id. JSON sources rewrite the scenario file (the
-/// watcher reloads); HTML sources rewrite the annotations sidecar (deleted
-/// when it becomes empty) and update the in-memory raw directly.
-fn delete_annotation(shared: &Shared, id: &str) {
+pub fn delete_annotation(shared: &Shared, id: &str) {
     let (path, raw) = {
         let m = shared.lock().unwrap_or_else(|e| e.into_inner());
         (m.path.clone(), m.raw.clone())
@@ -187,6 +103,7 @@ fn delete_annotation(shared: &Shared, id: &str) {
     let Some(path) = path else {
         return;
     };
+
     if rustmotion::loader::is_html_path(&path) {
         let result = remove_sidecar_annotation(&path, id);
         let mut m = shared.lock().unwrap_or_else(|e| e.into_inner());
@@ -203,8 +120,6 @@ fn delete_annotation(shared: &Shared, id: &str) {
         }
     } else {
         let updated = remove_annotation(raw, id);
-        // Pre-write state for the undo history (same linear history as
-        // inspector edits — this rewrites the scenario file).
         let snapshot = std::fs::read_to_string(&path).ok();
         let write_result = serde_json::to_string_pretty(&updated)
             .map_err(|e| format!("json: {e}"))
@@ -212,7 +127,7 @@ fn delete_annotation(shared: &Shared, id: &str) {
         match write_result {
             Ok(()) => {
                 if let Some(s) = snapshot {
-                    crate::scenario::record_edit(&crate::scenario::history_slot(), &path, s);
+                    record_edit(&history_slot(), &path, s);
                 }
             }
             Err(e) => {
@@ -224,11 +139,361 @@ fn delete_annotation(shared: &Shared, id: &str) {
     }
 }
 
-/// Unique-ish id for a new annotation.
-fn annotation_id() -> String {
-    let n = std::time::SystemTime::now()
-        .duration_since(std::time::UNIX_EPOCH)
-        .map(|d| d.as_nanos())
-        .unwrap_or(0);
-    format!("an_{n:x}")
+pub struct AnnotationsPanel {
+    shared: Shared,
+    editor: Entity<EditorState>,
+    annotations: Vec<(String, String, u64, String)>,
+}
+
+impl AnnotationsPanel {
+    pub fn new(
+        shared: Shared,
+        editor: Entity<EditorState>,
+        annotations: Vec<(String, String, u64, String)>,
+    ) -> Self {
+        Self {
+            shared,
+            editor,
+            annotations,
+        }
+    }
+}
+
+impl RenderOnce for AnnotationsPanel {
+    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
+        let AnnotationsPanel {
+            shared,
+            editor,
+            annotations,
+        } = self;
+        let is_empty = annotations.is_empty();
+
+        let cards = annotations.into_iter().map(|(id, note, frame, kind)| {
+            annotation_card(id, note, frame, kind, &shared, &editor, cx)
+        });
+
+        let panel = v_flex()
+            .id("annotations-panel")
+            .absolute()
+            .left_0()
+            .top(TOPBAR_HEIGHT)
+            .bottom_0()
+            .w(PANEL_WIDTH)
+            .bg(cx.theme().sidebar)
+            .border_r_1()
+            .border_color(cx.theme().border)
+            .p_4()
+            .gap_2p5()
+            .overflow_y_scroll()
+            .child(
+                div()
+                    .font_semibold()
+                    .text_color(cx.theme().accent)
+                    .child("Comments"),
+            )
+            .when(is_empty, |this| {
+                this.child(
+                    div()
+                        .text_color(cx.theme().muted_foreground)
+                        .child("No comments yet."),
+                )
+            })
+            .children(cards);
+
+        deferred(panel).with_priority(1)
+    }
+}
+
+fn annotation_card(
+    id: String,
+    note: String,
+    frame: u64,
+    kind: String,
+    shared: &Shared,
+    editor: &Entity<EditorState>,
+    cx: &App,
+) -> impl IntoElement {
+    let goto_editor = editor.clone();
+    let delete_shared = shared.clone();
+    let delete_editor = editor.clone();
+    let delete_id = id.clone();
+    let card_id: SharedString = format!("annotation-{id}").into();
+    let goto_id: SharedString = format!("annotation-goto-{id}").into();
+    let delete_button_id: SharedString = format!("annotation-delete-{id}").into();
+
+    v_flex()
+        .id(card_id)
+        .gap_1p5()
+        .p_2()
+        .rounded(cx.theme().radius)
+        .border_1()
+        .border_color(cx.theme().border)
+        .child(
+            div()
+                .text_xs()
+                .text_color(cx.theme().muted_foreground)
+                .child(format!("{kind} \u{b7} frame {frame}")),
+        )
+        .child(div().text_color(cx.theme().foreground).child(note))
+        .child(
+            h_flex()
+                .gap_2()
+                .child(
+                    Button::new(goto_id)
+                        .label("Go to frame")
+                        .ghost()
+                        .xsmall()
+                        .on_click(move |_, _, cx| {
+                            goto_editor.update(cx, |state, cx| {
+                                crate::editor::playback::seek_from_user(state, frame as u32);
+                                cx.notify();
+                            });
+                        }),
+                )
+                .child(
+                    Button::new(delete_button_id)
+                        .label("Delete")
+                        .danger()
+                        .xsmall()
+                        .on_click(move |_, _, cx| {
+                            delete_annotation(&delete_shared, &delete_id);
+                            delete_editor.update(cx, |_, cx| cx.notify());
+                        }),
+                ),
+        )
+}
+
+pub struct AnnotationCaptureBox {
+    shared: Shared,
+    editor: Entity<EditorState>,
+    textarea: Entity<TextareaState>,
+}
+
+impl AnnotationCaptureBox {
+    pub fn new(
+        shared: Shared,
+        editor: Entity<EditorState>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let textarea = cx.new(|cx| {
+            TextareaState::new(window, cx)
+                .placeholder("Leave a comment for the agent")
+                .auto_grow(3, 8)
+        });
+        Self {
+            shared,
+            editor,
+            textarea,
+        }
+    }
+
+    fn submit(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let text = self.textarea.read(cx).value().to_string();
+        if text.trim().is_empty() {
+            return;
+        }
+        let Some(target) = self.editor.read(cx).selected.clone() else {
+            return;
+        };
+        let frame = self.editor.read(cx).current;
+        let submitted = submit_annotation(&self.shared, frame, target.pointer, target.kind, text);
+        if submitted.is_ok() {
+            self.textarea
+                .update(cx, |state, cx| state.set_value("", window, cx));
+        }
+        self.editor.update(cx, |_, cx| cx.notify());
+        cx.notify();
+    }
+}
+
+impl Render for AnnotationCaptureBox {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let has_target = self.editor.read(cx).selected.is_some();
+        let textarea = self.textarea.clone();
+
+        v_flex()
+            .id("annotation-capture-box")
+            .gap_2()
+            .p_4()
+            .border_t_1()
+            .border_color(cx.theme().border)
+            .child(
+                div()
+                    .text_color(cx.theme().muted_foreground)
+                    .child("Leave a comment for the agent"),
+            )
+            .child(Textarea::new(&textarea).h(px(96.)))
+            .child(
+                Button::new("submit-annotation")
+                    .label("Add comment")
+                    .primary()
+                    .disabled(!has_target)
+                    .on_click(cx.listener(|this, _, window, cx| this.submit(window, cx))),
+            )
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::sync::{Arc, Mutex};
+
+    use crate::scenario::StudioModel;
+
+    const SCENARIO_JSON: &str = r##"{
+        "video": { "width": 10, "height": 10, "fps": 10 },
+        "scenes": [ { "duration": 1.0 } ]
+    }"##;
+
+    fn temp_path(tag: &str, ext: &str) -> std::path::PathBuf {
+        std::env::temp_dir().join(format!("rm_annotations_{tag}_{}.{ext}", std::process::id()))
+    }
+
+    fn shared_for_json_source(path: &std::path::Path) -> Shared {
+        let scenario =
+            rustmotion::loader::load_scenario_from_source(None, Some(SCENARIO_JSON)).unwrap();
+        Arc::new(Mutex::new(StudioModel::new(
+            scenario,
+            None,
+            Some(path.to_path_buf()),
+        )))
+    }
+
+    fn shared_with_detached_path(path: std::path::PathBuf, raw: serde_json::Value) -> Shared {
+        let scenario =
+            rustmotion::loader::load_scenario_from_source(None, Some(SCENARIO_JSON)).unwrap();
+        let shared = Arc::new(Mutex::new(StudioModel::new(scenario, None, None)));
+        {
+            let mut m = shared.lock().unwrap();
+            m.path = Some(path);
+            m.raw = raw;
+        }
+        shared
+    }
+
+    #[test]
+    fn submit_annotation_rewrites_the_json_file_and_records_history() {
+        let path = temp_path("submit_json", "json");
+        std::fs::write(&path, SCENARIO_JSON).unwrap();
+        let shared = shared_for_json_source(&path);
+
+        let result = submit_annotation(
+            &shared,
+            0,
+            "/scenes/0".to_string(),
+            "scene".to_string(),
+            "smaller".to_string(),
+        );
+        assert!(result.is_ok());
+
+        let text = std::fs::read_to_string(&path).unwrap();
+        let doc: serde_json::Value = serde_json::from_str(&text).unwrap();
+        let annotations = doc["annotations"].as_array().unwrap();
+        assert_eq!(annotations.len(), 1);
+        assert_eq!(annotations[0]["note"], "smaller");
+        assert_eq!(annotations[0]["view"], 0);
+        assert_eq!(annotations[0]["scene"], 0);
+
+        let _ = std::fs::remove_file(&path);
+    }
+
+    #[test]
+    fn submit_annotation_without_a_path_errors() {
+        let scenario =
+            rustmotion::loader::load_scenario_from_source(None, Some(SCENARIO_JSON)).unwrap();
+        let shared = Arc::new(Mutex::new(StudioModel::new(scenario, None, None)));
+
+        let result = submit_annotation(
+            &shared,
+            0,
+            "/scenes/0".to_string(),
+            "scene".to_string(),
+            "note".to_string(),
+        );
+        assert!(result.is_err());
+    }
+
+    #[test]
+    fn submit_annotation_writes_the_sidecar_and_updates_raw_for_html_sources() {
+        let path = temp_path("submit_html", "html");
+        let sidecar_path = path.with_extension("annotations.json");
+        let _ = std::fs::remove_file(&sidecar_path);
+        let raw = serde_json::json!({ "video": {}, "scenes": [] });
+        let shared = shared_with_detached_path(path.clone(), raw);
+
+        let result = submit_annotation(
+            &shared,
+            0,
+            "/scenes/0".to_string(),
+            "scene".to_string(),
+            "note".to_string(),
+        );
+        assert!(result.is_ok());
+
+        let sidecar_text = std::fs::read_to_string(&sidecar_path).unwrap();
+        let doc: serde_json::Value = serde_json::from_str(&sidecar_text).unwrap();
+        assert_eq!(doc["annotations"].as_array().unwrap().len(), 1);
+
+        let m = shared.lock().unwrap();
+        assert_eq!(m.raw["annotations"].as_array().unwrap().len(), 1);
+        drop(m);
+
+        let _ = std::fs::remove_file(&sidecar_path);
+    }
+
+    #[test]
+    fn delete_annotation_removes_it_from_the_json_file() {
+        let path = temp_path("delete_json", "json");
+        let with_annotation = serde_json::json!({
+            "video": { "width": 10, "height": 10, "fps": 10 },
+            "scenes": [ { "duration": 1.0 } ],
+            "annotations": [ { "id": "an_1", "note": "n", "status": "open", "frame": 0,
+                "target": { "pointer": "/scenes/0", "kind": "scene" } } ]
+        });
+        std::fs::write(
+            &path,
+            serde_json::to_string_pretty(&with_annotation).unwrap(),
+        )
+        .unwrap();
+        let shared = shared_for_json_source(&path);
+
+        delete_annotation(&shared, "an_1");
+
+        let text = std::fs::read_to_string(&path).unwrap();
+        let doc: serde_json::Value = serde_json::from_str(&text).unwrap();
+        assert!(doc["annotations"].as_array().unwrap().is_empty());
+
+        let _ = std::fs::remove_file(&path);
+    }
+
+    #[test]
+    fn delete_annotation_removes_the_sidecar_once_it_is_empty_and_updates_raw() {
+        let path = temp_path("delete_html", "html");
+        let sidecar_path = path.with_extension("annotations.json");
+        let ann = serde_json::json!({ "id": "an_1", "note": "n", "status": "open", "frame": 0,
+            "target": { "pointer": "/scenes/0", "kind": "scene" } });
+        std::fs::write(
+            &sidecar_path,
+            serde_json::to_string_pretty(&serde_json::json!({ "annotations": [ann.clone()] }))
+                .unwrap(),
+        )
+        .unwrap();
+        let raw = serde_json::json!({ "video": {}, "scenes": [], "annotations": [ann] });
+        let shared = shared_with_detached_path(path.clone(), raw);
+
+        delete_annotation(&shared, "an_1");
+
+        assert!(!sidecar_path.exists());
+        let m = shared.lock().unwrap();
+        assert!(m.raw["annotations"].as_array().unwrap().is_empty());
+    }
+
+    #[test]
+    fn annotation_id_produces_distinct_values() {
+        let a = annotation_id();
+        let b = annotation_id();
+        assert_ne!(a, b);
+        assert!(a.starts_with("an_"));
+    }
 }
diff --git a/crates/rustmotion-studio/src/editor/diff_panel.rs b/crates/rustmotion-studio/src/editor/diff_panel.rs
index 1824a5e2..043156f9 100644
--- a/crates/rustmotion-studio/src/editor/diff_panel.rs
+++ b/crates/rustmotion-studio/src/editor/diff_panel.rs
@@ -1,171 +1,354 @@
-//! The diff/review panel: lists baseline→current changes grouped by scene,
-//! and the A|B flip side selector state. Replaces the inspector panel slot
-//! while diff mode is active.
+use gpui_component::button::{Button, ButtonVariants as _};
+use gpui_component::{h_flex, v_flex, ActiveTheme, IconName, Sizable as _, StyledExt as _};
+use gpui_kit::prelude::FluentBuilder as _;
+use gpui_kit::{
+    div, px, App, Entity, Hsla, InteractiveElement, IntoElement, ParentElement, RenderOnce,
+    SharedString, StatefulInteractiveElement, Styled, Window,
+};
 
-use dioxus::prelude::*;
-
-use crate::components::button::{Button, ButtonSize, ButtonVariant};
+use crate::app::state::{EditorState, Selection};
 use crate::scenario::{ChangeKind, ElementChange, Shared};
 
-/// Which state the canvas renders in diff mode: A = baseline, B = current.
-/// `Eq + Hash` so it can key the frame-prefetch cache.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub enum DiffSide {
     A,
     B,
 }
 
-const GROUP_HEADER: &str = "color:var(--rm-text-muted); font-size:10px; font-weight:600; letter-spacing:0.06em; text-transform:uppercase; margin-top:6px;";
-
-/// Badge glyph + color per change kind.
-fn kind_badge(kind: &ChangeKind) -> (&'static str, &'static str) {
-    match kind {
-        ChangeKind::Added => ("+", "#22c55e"),
-        ChangeKind::Removed => ("−", "var(--rm-error)"),
-        ChangeKind::Modified => ("~", "var(--rm-accent)"),
-    }
-}
-
-/// Display form for a field-diff endpoint ("" = the field was absent).
-fn endpoint(s: &str) -> String {
-    if s.is_empty() {
-        "—".to_string()
-    } else {
-        s.to_string()
-    }
-}
-
-/// Map a change's pointer to the first frame of its scene (plus `start_at`
-/// offset when known) so clicking an entry scrubs to where the element lives.
-fn frame_for_change(shared: &Shared, change: &ElementChange) -> Option<u32> {
-    // "/scenes/N/…" → (0, N); "/composition/V/scenes/N/…" → (V, N).
-    let segs: Vec<&str> = change.pointer.split('/').collect();
-    let (view, scene) = match segs.as_slice() {
+pub fn frame_for_change(shared: &Shared, change: &ElementChange) -> Option<u32> {
+    let segments: Vec<&str> = change.pointer.split('/').collect();
+    let (view, scene) = match segments.as_slice() {
         ["", "scenes", n, ..] => (0usize, n.parse::<usize>().ok()?),
         ["", "composition", v, "scenes", n, ..] => {
             (v.parse::<usize>().ok()?, n.parse::<usize>().ok()?)
         }
         _ => return None,
     };
-    // Arc snapshot; the task scan runs without the model lock.
     let (fps, tasks) = {
         let m = shared.lock().unwrap_or_else(|e| e.into_inner());
         (m.scenario.video.fps.max(1), m.tasks.clone())
     };
-    let base = tasks.iter().position(|t| {
-        matches!(t, rustmotion::encode::video::FrameTask::Normal { view_idx, scene_idx, .. }
-            if *view_idx == view && *scene_idx == scene)
+    let scene_start = tasks.iter().position(|t| {
+        matches!(
+            t,
+            rustmotion::encode::video::FrameTask::Normal { view_idx, scene_idx, .. }
+                if *view_idx == view && *scene_idx == scene
+        )
     })?;
     let offset = (change.start_at.unwrap_or(0.0).max(0.0) * fps as f64) as usize;
-    let frame = (base + offset).min(tasks.len().saturating_sub(1));
+    let frame = (scene_start + offset).min(tasks.len().saturating_sub(1));
     Some(frame as u32)
 }
 
-/// The right-hand change list, grouped by scene. Clicking an entry selects the
-/// element (Added/Modified — removals no longer exist in the current tree) and
-/// scrubs to its first visible frame.
-#[component]
-pub fn DiffPanel(
+fn kind_badge(kind: &ChangeKind, cx: &App) -> (&'static str, Hsla) {
+    match kind {
+        ChangeKind::Added => ("+", cx.theme().success),
+        ChangeKind::Removed => ("\u{2212}", cx.theme().danger),
+        ChangeKind::Modified => ("~", cx.theme().accent),
+    }
+}
+
+fn endpoint(s: &str) -> SharedString {
+    if s.is_empty() {
+        "\u{2014}".into()
+    } else {
+        s.to_string().into()
+    }
+}
+
+pub struct DiffPanel {
+    shared: Shared,
+    editor: Entity<EditorState>,
     changes: Vec<ElementChange>,
-    selected: Signal<Option<(u32, String, String)>>,
-    current: Signal<u32>,
-    diff_active: Signal<bool>,
-) -> Element {
-    // Group labels in first-appearance order (entries arrive grouped by
-    // construction, but be robust to interleaving).
-    let mut groups: Vec<String> = Vec::new();
-    for c in &changes {
-        if !groups.contains(&c.group) {
-            groups.push(c.group.clone());
+}
+
+impl DiffPanel {
+    pub fn new(shared: Shared, editor: Entity<EditorState>, changes: Vec<ElementChange>) -> Self {
+        Self {
+            shared,
+            editor,
+            changes,
         }
     }
+}
 
-    rsx! {
-        div { style: "width:300px; flex:none; min-height:0; background:var(--rm-surface); border-left:1px solid var(--rm-border); box-sizing:border-box; display:flex; flex-direction:column; overflow:auto;",
-            div { style: "padding:14px; display:flex; justify-content:space-between; align-items:center;",
-                div {
-                    div { style: "color:var(--rm-accent); font-weight:600;", "Changes" }
-                    div { style: "color:var(--rm-text-muted); font-size:11px;",
-                        "{changes.len()} since baseline"
-                    }
-                }
-                Button {
-                    variant: ButtonVariant::Ghost,
-                    size: ButtonSize::IconXs,
-                    onclick: move |_| diff_active.set(false),
-                    "✕"
-                }
-            }
-            if changes.is_empty() {
-                div { style: "padding:0 14px; color:var(--rm-text-muted);", "No changes since baseline." }
-            }
-            for group in groups {
-                div { style: "display:flex; flex-direction:column; gap:6px; padding:8px 14px; border-top:1px solid var(--rm-border);",
-                    div { style: "{GROUP_HEADER}", "{group}" }
-                    for change in changes.iter().filter(|c| c.group == group).cloned() {
-                        ChangeEntry { change, selected, current }
-                    }
-                }
+impl RenderOnce for DiffPanel {
+    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
+        let DiffPanel {
+            shared,
+            editor,
+            changes,
+        } = self;
+
+        let mut groups: Vec<String> = Vec::new();
+        for change in &changes {
+            if !groups.contains(&change.group) {
+                groups.push(change.group.clone());
             }
         }
+
+        let close_editor = editor.clone();
+        let change_count = changes.len();
+
+        let header = h_flex()
+            .items_center()
+            .justify_between()
+            .p_3p5()
+            .child(
+                v_flex()
+                    .child(
+                        div()
+                            .font_semibold()
+                            .text_color(cx.theme().accent)
+                            .child("Changes"),
+                    )
+                    .child(
+                        div()
+                            .text_xs()
+                            .text_color(cx.theme().muted_foreground)
+                            .child(format!("{change_count} since baseline")),
+                    ),
+            )
+            .child(
+                Button::new("close-diff-panel")
+                    .icon(IconName::Close)
+                    .ghost()
+                    .xsmall()
+                    .on_click(move |_, _, cx| {
+                        close_editor.update(cx, |state, cx| {
+                            state.diff_active = false;
+                            cx.notify();
+                        });
+                    }),
+            );
+
+        let group_sections = groups.into_iter().map(|group| {
+            let entries = changes
+                .iter()
+                .filter(|change| change.group == group)
+                .cloned()
+                .map(|change| change_entry(change, shared.clone(), editor.clone(), cx));
+            v_flex()
+                .gap_1p5()
+                .px_3p5()
+                .py_2()
+                .border_t_1()
+                .border_color(cx.theme().border)
+                .child(
+                    div()
+                        .text_xs()
+                        .font_semibold()
+                        .text_color(cx.theme().muted_foreground)
+                        .child(group.to_uppercase()),
+                )
+                .children(entries)
+        });
+
+        v_flex()
+            .id("diff-panel")
+            .flex_none()
+            .w(px(300.))
+            .h_full()
+            .bg(cx.theme().sidebar)
+            .border_l_1()
+            .border_color(cx.theme().border)
+            .overflow_y_scroll()
+            .child(header)
+            .when(changes.is_empty(), |this| {
+                this.child(
+                    div()
+                        .px_3p5()
+                        .text_color(cx.theme().muted_foreground)
+                        .child("No changes since baseline."),
+                )
+            })
+            .children(group_sections)
     }
 }
 
-/// One change row: kind badge, label, and the field before→after list.
-#[component]
-fn ChangeEntry(
+fn change_entry(
     change: ElementChange,
-    mut selected: Signal<Option<(u32, String, String)>>,
-    current: Signal<u32>,
-) -> Element {
-    let shared = use_context::<Shared>();
-    let (glyph, color) = kind_badge(&change.kind);
-    let removable = change.kind != ChangeKind::Removed;
-
-    let onclick = {
-        let shared = shared.clone();
-        let change = change.clone();
-        move |_| {
-            if let Some(frame) = frame_for_change(&shared, &change) {
-                current.set(frame);
-            }
-            // Removed elements have no counterpart in the current tree; the
-            // pointer would resolve to nothing (or the wrong element).
-            if removable {
-                selected.set(Some((
-                    u32::MAX,
-                    change.pointer.clone(),
-                    change.element_type.clone(),
-                )));
-            }
-        }
-    };
+    shared: Shared,
+    editor: Entity<EditorState>,
+    cx: &App,
+) -> impl IntoElement {
+    let (glyph, tone) = kind_badge(&change.kind, cx);
+    let has_current_counterpart = change.kind != ChangeKind::Removed;
+    let element_type = change.element_type.clone();
+    let label = change.label.clone();
+    let fields = change.fields.clone();
+    let row_id: SharedString = format!("diff-entry-{}", change.pointer).into();
+    let click_target = change.clone();
 
-    rsx! {
-        div {
-            style: "border:1px solid var(--rm-border-2); border-radius:6px; padding:8px; display:flex; flex-direction:column; gap:5px; cursor:pointer;",
-            onclick,
-            div { style: "display:flex; align-items:center; gap:7px;",
-                span { style: "flex:none; width:16px; height:16px; border-radius:4px; display:flex; align-items:center; justify-content:center; font-weight:700; font-size:12px; color:{color}; border:1px solid {color};",
-                    "{glyph}"
-                }
-                span { style: "color:var(--rm-text-strong); overflow:hidden; text-overflow:ellipsis; white-space:nowrap;",
-                    "{change.label}"
-                }
-                span { style: "color:var(--rm-text-muted); font-size:11px; margin-left:auto;",
-                    "{change.element_type}"
-                }
+    v_flex()
+        .id(row_id)
+        .cursor_pointer()
+        .gap_1p5()
+        .p_2()
+        .rounded(cx.theme().radius)
+        .border_1()
+        .border_color(cx.theme().border)
+        .on_click(move |_, _, cx| {
+            if let Some(frame) = frame_for_change(&shared, &click_target) {
+                editor.update(cx, |state, cx| {
+                    crate::editor::playback::seek_from_user(state, frame);
+                    cx.notify();
+                });
             }
-            for f in change.fields.iter() {
-                div { style: "display:flex; gap:6px; font-size:11px; align-items:baseline;",
-                    span { style: "color:var(--rm-text-muted); flex:none;", "{f.field}" }
-                    span { style: "overflow:hidden; text-overflow:ellipsis; white-space:nowrap;",
-                        span { style: "color:var(--rm-error);", "{endpoint(&f.before)}" }
-                        span { style: "color:var(--rm-text-muted);", " → " }
-                        span { style: "color:#22c55e;", "{endpoint(&f.after)}" }
-                    }
-                }
+            if has_current_counterpart {
+                editor.update(cx, |state, cx| {
+                    state.selected = Some(Selection {
+                        node_id: u32::MAX,
+                        pointer: click_target.pointer.clone(),
+                        kind: click_target.element_type.clone(),
+                    });
+                    cx.notify();
+                });
             }
+        })
+        .child(
+            h_flex()
+                .items_center()
+                .gap_2()
+                .child(
+                    div()
+                        .flex_none()
+                        .w(px(16.))
+                        .h(px(16.))
+                        .rounded(px(4.))
+                        .border_1()
+                        .border_color(tone)
+                        .text_color(tone)
+                        .text_sm()
+                        .font_semibold()
+                        .flex()
+                        .items_center()
+                        .justify_center()
+                        .child(glyph),
+                )
+                .child(
+                    div()
+                        .flex_1()
+                        .truncate()
+                        .text_color(cx.theme().foreground)
+                        .child(label),
+                )
+                .child(
+                    div()
+                        .text_xs()
+                        .text_color(cx.theme().muted_foreground)
+                        .child(element_type),
+                ),
+        )
+        .children(fields.into_iter().map(|field| {
+            h_flex()
+                .gap_1p5()
+                .text_xs()
+                .items_baseline()
+                .child(
+                    div()
+                        .flex_none()
+                        .text_color(cx.theme().muted_foreground)
+                        .child(field.field),
+                )
+                .child(
+                    h_flex()
+                        .gap_1()
+                        .overflow_hidden()
+                        .child(
+                            div()
+                                .text_color(cx.theme().danger)
+                                .child(endpoint(&field.before)),
+                        )
+                        .child(
+                            div()
+                                .text_color(cx.theme().muted_foreground)
+                                .child("\u{2192}"),
+                        )
+                        .child(
+                            div()
+                                .text_color(cx.theme().success)
+                                .child(endpoint(&field.after)),
+                        ),
+                )
+        }))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::sync::{Arc, Mutex};
+
+    use crate::scenario::StudioModel;
+
+    const TWO_SCENES: &str = r##"{
+        "video": { "width": 10, "height": 10, "fps": 10 },
+        "scenes": [ { "duration": 1.0 }, { "duration": 2.0 } ]
+    }"##;
+
+    const TWO_VIEWS: &str = r##"{
+        "video": { "width": 10, "height": 10, "fps": 10 },
+        "composition": [
+            { "type": "slide", "scenes": [ { "duration": 1.0 } ] },
+            { "type": "slide", "scenes": [ { "duration": 1.0 } ] }
+        ]
+    }"##;
+
+    fn shared_for(json: &str) -> Shared {
+        let scenario = rustmotion::loader::load_scenario_from_source(None, Some(json)).unwrap();
+        Arc::new(Mutex::new(StudioModel::new(scenario, None, None)))
+    }
+
+    fn change_at(pointer: &str, start_at: Option<f64>) -> ElementChange {
+        ElementChange {
+            pointer: pointer.to_string(),
+            kind: ChangeKind::Modified,
+            element_type: "text".to_string(),
+            label: "label".to_string(),
+            group: "Scene".to_string(),
+            fields: Vec::new(),
+            start_at,
         }
     }
+
+    #[test]
+    fn frame_for_change_finds_the_scene_start() {
+        let shared = shared_for(TWO_SCENES);
+        let change = change_at("/scenes/1/children/0", None);
+        assert_eq!(frame_for_change(&shared, &change), Some(10));
+    }
+
+    #[test]
+    fn frame_for_change_applies_the_start_at_offset() {
+        let shared = shared_for(TWO_SCENES);
+        let change = change_at("/scenes/1/children/0", Some(0.5));
+        assert_eq!(frame_for_change(&shared, &change), Some(15));
+    }
+
+    #[test]
+    fn frame_for_change_clamps_to_the_last_frame() {
+        let shared = shared_for(TWO_SCENES);
+        let change = change_at("/scenes/1/children/0", Some(100.0));
+        assert_eq!(frame_for_change(&shared, &change), Some(29));
+    }
+
+    #[test]
+    fn frame_for_change_resolves_composition_pointers() {
+        let shared = shared_for(TWO_VIEWS);
+        let change = change_at("/composition/1/scenes/0/children/0", None);
+        assert_eq!(frame_for_change(&shared, &change), Some(10));
+    }
+
+    #[test]
+    fn frame_for_change_rejects_non_scene_pointers() {
+        let shared = shared_for(TWO_SCENES);
+        let change = change_at("/video", None);
+        assert_eq!(frame_for_change(&shared, &change), None);
+    }
+
+    #[test]
+    fn endpoint_shows_an_em_dash_for_an_absent_field() {
+        assert_eq!(endpoint(""), SharedString::from("\u{2014}"));
+        assert_eq!(endpoint("48"), SharedString::from("48"));
+    }
 }
diff --git a/crates/rustmotion-studio/src/editor/export.rs b/crates/rustmotion-studio/src/editor/export.rs
index 3a613a14..803a1958 100644
--- a/crates/rustmotion-studio/src/editor/export.rs
+++ b/crates/rustmotion-studio/src/editor/export.rs
@@ -1,17 +1,13 @@
-//! Background video export: encodes the current scenario to an MP4 next to the
-//! source file, reusing the exact CLI encode pipeline (ffmpeg when available,
-//! embedded openh264 otherwise). The encode runs on a plain `std::thread` with
-//! progress reported through a shared status slot the UI polls.
-
 use std::path::PathBuf;
 use std::sync::{Arc, Mutex};
 use std::time::Duration;
 
-use dioxus::prelude::*;
+use gpui_component::notification::Notification;
+use gpui_component::WindowExt as _;
+use gpui_kit::{div, Context, IntoElement, Render, Window};
 
 use crate::scenario::Shared;
 
-/// Lifecycle of one export, shared between the encode thread and the UI.
 #[derive(Debug, Clone, PartialEq)]
 pub enum ExportStatus {
     Idle,
@@ -30,42 +26,14 @@ impl ExportStatus {
     }
 }
 
-/// The cross-thread status slot. The encode thread writes; the UI polls.
 pub type SharedExport = Arc<Mutex<ExportStatus>>;
 
-/// The app-global status slot. Global (not per-component) so a running export
-/// survives a switch to the library and back: the remounted topbar re-attaches
-/// to the same slot, and `start_export`'s running-check keeps exports serial
-/// app-wide.
 pub fn export_slot() -> SharedExport {
     static SLOT: std::sync::OnceLock<SharedExport> = std::sync::OnceLock::new();
     SLOT.get_or_init(|| Arc::new(Mutex::new(ExportStatus::Idle)))
         .clone()
 }
 
-/// Poll the shared export status into a Dioxus signal (~150 ms), following the
-/// same polling pattern as `use_hot_reload`. Signal writes only fire on change
-/// so idle polling doesn't re-render the topbar.
-pub fn use_export_poll(status: SharedExport, mut sig: Signal<ExportStatus>) {
-    use_future(move || {
-        let status = status.clone();
-        async move {
-            loop {
-                tokio::time::sleep(Duration::from_millis(150)).await;
-                let s = status.lock().unwrap_or_else(|e| e.into_inner()).clone();
-                if s != sig() {
-                    sig.set(s);
-                }
-            }
-        }
-    });
-}
-
-/// Kick off a background export of the scenario currently loaded in `shared`.
-/// No-op if an export is already running. The scenario is re-loaded from its
-/// source on the worker thread (`ResolvedScenario` isn't `Clone`, and the
-/// watcher keeps the on-disk file authoritative), so the model lock is held
-/// only long enough to snapshot the path and raw JSON.
 pub fn start_export(shared: &Shared, status: &SharedExport) {
     {
         let mut st = status.lock().unwrap_or_else(|e| e.into_inner());
@@ -86,10 +54,6 @@ pub fn start_export(shared: &Shared, status: &SharedExport) {
 
     let status = status.clone();
     std::thread::spawn(move || {
-        // A Skia/encoder panic must not leave the status stuck on Running
-        // (and a poisoned status Mutex would break every later export), so
-        // the whole encode is fenced with catch_unwind — same rationale as
-        // the frame asset handler.
         let result = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
             run_export(path, raw, &status)
         }));
@@ -102,7 +66,6 @@ pub fn start_export(shared: &Shared, status: &SharedExport) {
     });
 }
 
-/// Load, render and encode; returns the output path or a user-facing reason.
 fn run_export(
     path: Option<PathBuf>,
     raw: serde_json::Value,
@@ -133,9 +96,6 @@ fn run_export(
         *status.lock().unwrap_or_else(|e| e.into_inner()) = status_for_progress(&p);
     };
 
-    // Same pipeline selection as the CLI: ffmpeg when available (10-bit
-    // H.264), embedded openh264 otherwise. Output is fixed to .mp4, so the
-    // codec is h264; the scenario's optional `crf` is honored.
     if ffmpeg_available() {
         rustmotion::encode::encode_with_ffmpeg(
             &scenario,
@@ -154,7 +114,6 @@ fn run_export(
     Ok(output)
 }
 
-/// Map an encoder progress event to the UI status.
 fn status_for_progress(p: &rustmotion::encode::EncodeProgress) -> ExportStatus {
     use rustmotion::encode::EncodeProgress;
     match p {
@@ -176,8 +135,6 @@ fn status_for_progress(p: &rustmotion::encode::EncodeProgress) -> ExportStatus {
     }
 }
 
-/// v1 output location: `<scenario dir>/<stem>.mp4`, or `./export.mp4` when the
-/// scenario has no path.
 fn output_path(source: &Option<PathBuf>) -> PathBuf {
     match source {
         Some(p) => p.with_extension("mp4"),
@@ -187,7 +144,6 @@ fn output_path(source: &Option<PathBuf>) -> PathBuf {
     }
 }
 
-/// Label for the export button, with a live percentage while running.
 pub fn export_label(status: &ExportStatus) -> String {
     match status {
         ExportStatus::Running { phase, done, total } if *total > 0 => {
@@ -199,7 +155,6 @@ pub fn export_label(status: &ExportStatus) -> String {
     }
 }
 
-/// Same detection as the CLI: probe `ffmpeg -version`.
 fn ffmpeg_available() -> bool {
     std::process::Command::new("ffmpeg")
         .arg("-version")
@@ -210,66 +165,87 @@ fn ffmpeg_available() -> bool {
         .unwrap_or(false)
 }
 
-/// Floating export-status toast, bottom-right of the canvas area (absolute in
-/// the canvas container — no measurement). Running → live progression;
-/// success → auto-dismissed after ~6 s; failure → persistent with a close
-/// button. Replaces the old topbar status spans, which overlapped the
-/// centered scenario title.
-#[component]
-pub fn ExportToast() -> Element {
-    let export = use_hook(export_slot);
-    let status = use_signal(|| ExportStatus::Idle);
-    use_export_poll(export.clone(), status);
-    let mut dismissed = use_signal(|| None::<ExportStatus>);
+const EXPORT_POLL_INTERVAL: Duration = Duration::from_millis(150);
 
-    // Auto-dismiss success ~6 s after it appears (a NEW export produces a
-    // different status value, so the toast reappears naturally).
-    use_effect(move || {
-        let s = status();
-        if matches!(s, ExportStatus::Done(_)) && dismissed.peek().as_ref() != Some(&s) {
-            spawn(async move {
-                tokio::time::sleep(Duration::from_secs(6)).await;
-                if *status.peek() == s {
-                    dismissed.set(Some(s));
-                }
-            });
-        }
-    });
+struct ExportNotificationKind;
+
+pub struct ExportWatcher {
+    status: SharedExport,
+    last: ExportStatus,
+}
 
-    let s = status();
-    if matches!(s, ExportStatus::Idle) || dismissed() == Some(s.clone()) {
-        return rsx! {};
+impl ExportWatcher {
+    pub fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let this = Self {
+            status: export_slot(),
+            last: ExportStatus::Idle,
+        };
+        this.start_polling(window, cx);
+        this
     }
 
-    rsx! {
-        div { style: "position:absolute; right:16px; bottom:16px; z-index:900; display:flex; align-items:center; gap:8px; max-width:60%; padding:8px 12px; font-size:12px; background:var(--rm-surface-2); border:1px solid var(--rm-border); border-radius:8px; box-shadow:0 6px 20px rgba(0,0,0,0.35);",
-            match &s {
-                ExportStatus::Running { .. } => rsx! {
-                    span { style: "color:var(--rm-text); white-space:nowrap;", "{export_label(&s)}" }
-                },
-                ExportStatus::Done(path) => rsx! {
-                    span {
-                        title: "{path.display()}",
-                        style: "color:var(--rm-text); overflow:hidden; text-overflow:ellipsis; white-space:nowrap;",
-                        "Exported: {path.display()}"
-                    }
-                },
-                ExportStatus::Failed(reason) => rsx! {
-                    span {
-                        title: "{reason}",
-                        style: "color:var(--rm-error); overflow:hidden; text-overflow:ellipsis; white-space:nowrap;",
-                        "Export failed: {reason}"
-                    }
-                    button {
-                        style: "background:none; border:none; color:var(--rm-text-muted); cursor:pointer; font-size:13px; padding:0 2px;",
-                        title: "Dismiss",
-                        onclick: move |_| dismissed.set(Some(s.clone())),
-                        "✕"
-                    }
-                },
-                ExportStatus::Idle => rsx! {},
+    fn start_polling(&self, window: &mut Window, cx: &mut Context<Self>) {
+        cx.spawn_in(window, async move |this, cx| loop {
+            cx.background_executor().timer(EXPORT_POLL_INTERVAL).await;
+            let alive = this
+                .update_in(cx, |this, window, cx| this.tick(window, cx))
+                .is_ok();
+            if !alive {
+                break;
             }
+        })
+        .detach();
+    }
+
+    fn tick(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let current = self
+            .status
+            .lock()
+            .unwrap_or_else(|e| e.into_inner())
+            .clone();
+        if current == self.last {
+            return;
         }
+        self.last = current.clone();
+
+        match current {
+            ExportStatus::Idle => {
+                window.remove_notification::<ExportNotificationKind>(cx);
+            }
+            ExportStatus::Running { .. } => {
+                window.push_notification(
+                    Notification::info(export_label(&current))
+                        .title("Exporting")
+                        .id::<ExportNotificationKind>()
+                        .autohide(false),
+                    cx,
+                );
+            }
+            ExportStatus::Done(ref path) => {
+                window.push_notification(
+                    Notification::success(format!("Saved to {}", path.display()))
+                        .title("Export complete")
+                        .id::<ExportNotificationKind>()
+                        .autohide(true),
+                    cx,
+                );
+            }
+            ExportStatus::Failed(ref message) => {
+                window.push_notification(
+                    Notification::error(message.clone())
+                        .title("Export failed")
+                        .id::<ExportNotificationKind>()
+                        .autohide(false),
+                    cx,
+                );
+            }
+        }
+    }
+}
+
+impl Render for ExportWatcher {
+    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+        div()
     }
 }
 
diff --git a/crates/rustmotion-studio/src/editor/frames.rs b/crates/rustmotion-studio/src/editor/frames.rs
index 32358518..2703e559 100644
--- a/crates/rustmotion-studio/src/editor/frames.rs
+++ b/crates/rustmotion-studio/src/editor/frames.rs
@@ -51,6 +51,41 @@ pub fn render_frame(
     jpeg
 }
 
+#[allow(clippy::result_unit_err)]
+pub fn render_frame_rgba_deep(
+    scenario: &ResolvedScenario,
+    tasks: &[rustmotion::encode::video::FrameTask],
+    frame: u32,
+    scale: f32,
+) -> Result<(u32, u32, Vec<u8>), ()> {
+    std::thread::scope(|scope| {
+        std::thread::Builder::new()
+            .stack_size(RENDER_STACK)
+            .spawn_scoped(scope, || render_frame_rgba(scenario, tasks, frame, scale))
+            .expect("spawn render thread")
+            .join()
+            .map_err(|_| ())
+    })
+}
+
+pub fn render_frame_rgba(
+    scenario: &ResolvedScenario,
+    tasks: &[rustmotion::encode::video::FrameTask],
+    frame: u32,
+    scale: f32,
+) -> (u32, u32, Vec<u8>) {
+    if tasks.is_empty() {
+        return (0, 0, Vec::new());
+    }
+    let idx = (frame as usize).min(tasks.len() - 1);
+    let task = &tasks[idx];
+    let rgba = rustmotion::encode::render_frame_task_scaled(&scenario.video, scenario, task, scale)
+        .expect("render frame");
+    let w = (scenario.video.width as f32 * scale) as u32;
+    let h = (scenario.video.height as f32 * scale) as u32;
+    (w, h, rgba)
+}
+
 struct BaselineCache {
     path: PathBuf,
     source_hash: u64,
@@ -112,6 +147,23 @@ pub struct HitPct {
     pub pointer: Option<String>,
 }
 
+#[allow(clippy::result_unit_err)]
+pub fn frame_hits_deep(
+    scenario: &ResolvedScenario,
+    tasks: &[rustmotion::encode::video::FrameTask],
+    frame: u32,
+    scene_prefix: &str,
+) -> Result<Vec<HitPct>, ()> {
+    std::thread::scope(|scope| {
+        std::thread::Builder::new()
+            .stack_size(RENDER_STACK)
+            .spawn_scoped(scope, || frame_hits(scenario, tasks, frame, scene_prefix))
+            .expect("spawn hit-map thread")
+            .join()
+            .map_err(|_| ())
+    })
+}
+
 pub fn frame_hits(
     scenario: &ResolvedScenario,
     tasks: &[rustmotion::encode::video::FrameTask],
@@ -167,6 +219,29 @@ pub fn scene_prefix(
 
 #[cfg(test)]
 mod tests {
+    #[test]
+    fn hit_map_survives_a_dispatch_sized_stack() {
+        let path = std::path::PathBuf::from("../../examples/mega-showcase.json");
+        if !path.exists() {
+            return;
+        }
+        let scenario = rustmotion::loader::load_input(&path).expect("load");
+        let tasks = rustmotion::encode::build_frame_tasks(&scenario);
+
+        let outcome = std::thread::Builder::new()
+            .stack_size(544 * 1024)
+            .spawn(move || frame_hits_deep(&scenario, &tasks, 0, "/scenes/0").map(|h| h.len()))
+            .expect("spawn")
+            .join();
+
+        assert!(
+            matches!(outcome, Ok(Ok(_))),
+            "frame_hits_deep must own its stack: gpui's background executor runs on \
+             libdispatch workers with 544 KiB, and untagged serde recursion through \
+             deserialize_children needs megabytes"
+        );
+    }
+
     use super::*;
 
     const SCENARIO: &str = r##"{ "video": { "width": 1280, "height": 720, "background": "#101418" }, "scenes": [ { "duration": 1.0 } ] }"##;
@@ -256,6 +331,41 @@ mod tests {
         );
     }
 
+    #[test]
+    fn renders_frame_to_raw_rgba_matching_dimensions() {
+        let scenario = rustmotion::loader::load_scenario_from_source(None, Some(SCENARIO)).unwrap();
+        let tasks = rustmotion::encode::build_frame_tasks(&scenario);
+        let (w, h, rgba) = render_frame_rgba(&scenario, &tasks, 0, 1.0);
+        assert_eq!((w, h), (1280, 720));
+        assert_eq!(rgba.len(), (w * h * 4) as usize);
+    }
+
+    #[test]
+    fn renders_frame_to_raw_rgba_at_reduced_scale() {
+        let scenario = rustmotion::loader::load_scenario_from_source(None, Some(SCENARIO)).unwrap();
+        let tasks = rustmotion::encode::build_frame_tasks(&scenario);
+        let (w, h, rgba) = render_frame_rgba(&scenario, &tasks, 0, 0.5);
+        assert_eq!((w, h), (640, 360));
+        assert_eq!(rgba.len(), (w * h * 4) as usize);
+    }
+
+    #[test]
+    fn render_frame_rgba_empty_tasks_yields_empty_buffer() {
+        let scenario = rustmotion::loader::load_scenario_from_source(None, Some(SCENARIO)).unwrap();
+        let (w, h, rgba) = render_frame_rgba(&scenario, &[], 0, 1.0);
+        assert_eq!((w, h), (0, 0));
+        assert!(rgba.is_empty());
+    }
+
+    #[test]
+    fn render_frame_rgba_deep_matches_render_frame_rgba() {
+        let scenario = rustmotion::loader::load_scenario_from_source(None, Some(SCENARIO)).unwrap();
+        let tasks = rustmotion::encode::build_frame_tasks(&scenario);
+        let (w, h, rgba) = render_frame_rgba_deep(&scenario, &tasks, 0, 1.0).unwrap();
+        assert_eq!((w, h), (1280, 720));
+        assert_eq!(rgba.len(), (w * h * 4) as usize);
+    }
+
     #[test]
     fn scene_prefix_handles_top_level_scenes() {
         let json =
diff --git a/crates/rustmotion-studio/src/editor/inspector.rs b/crates/rustmotion-studio/src/editor/inspector.rs
deleted file mode 100644
index af2b8e49..00000000
--- a/crates/rustmotion-studio/src/editor/inspector.rs
+++ /dev/null
@@ -1,2225 +0,0 @@
-use std::cell::RefCell;
-use std::rc::Rc;
-
-use dioxus::prelude::*;
-use dioxus_icons::lucide::{
-    Bold, Italic, TextAlignCenter, TextAlignEnd, TextAlignJustify, TextAlignStart, X,
-};
-use palette::{encoding, FromColor, Hsv, IntoColor, Srgb};
-
-use crate::components::button::{Button, ButtonSize, ButtonVariant};
-use crate::components::color_picker::ColorPicker;
-use crate::components::select::{Select, SelectOption};
-use crate::components::slider::Slider;
-use crate::components::switch::Switch;
-use crate::scenario::{apply_optimistic, scene_duration_for_pointer, Mutation, Shared};
-
-use super::view::RevSignal;
-
-use super::annotations::AnnotationBox;
-use super::properties::{
-    component_props, css_family, css_row_value, css_section_props, display_number,
-    effective_element, engine_placeholder, fill_to_value, is_multiline, next_entries_on_add,
-    palette_prefill, parse_fill, slider_range, visible_sections, FillMode, PropKind,
-};
-
-// ── Debounce context ─────────────────────────────────────────────────────────
-
-/// Holds the Dioxus [`dioxus_core::Task`] handle of the last scheduled write
-/// so the next keystroke can cancel it before it fires. Provided via Dioxus
-/// context by [`InspectorPanel`] and consumed by the `write_*` helpers.
-///
-/// Uses `Rc<RefCell<>>` because Dioxus's `Task` is `!Send`; all access is
-/// single-threaded (Dioxus desktop runs on one thread).
-#[derive(Clone)]
-pub struct WriteDebounce(Rc<RefCell<Option<dioxus_core::Task>>>);
-
-// ── Schema ───────────────────────────────────────────────────────────────
-
-/// How one property is edited. The variant decides the widget; the field's
-/// `name` is the CSS property it writes (except `StyleToggles`, which writes
-/// `font-weight`/`font-style` itself).
-#[derive(Clone, Copy, PartialEq)]
-enum Ctrl {
-    Text,
-    Number,
-    /// Slider + numeric input + unit chip (e.g. font-size → `26 PX`).
-    UnitSlider {
-        min: f64,
-        max: f64,
-        step: f64,
-        unit: &'static str,
-    },
-    /// Bare slider + value readout (opacity, flex-grow…).
-    Slider {
-        min: f64,
-        max: f64,
-        step: f64,
-    },
-    Select(&'static [&'static str]),
-    /// font-weight with labelled options ("Semibold · 600").
-    Weight,
-    /// text-align as a segmented icon group.
-    Align,
-    /// Bold / Italic toggles (reads + writes font-weight & font-style).
-    StyleToggles,
-    /// Swatch + hex input; `clearable` adds a "make transparent" button.
-    Color {
-        clearable: bool,
-    },
-    /// Two-state toggle (on_value, off_value).
-    Switch(&'static str, &'static str),
-}
-
-#[derive(Clone, Copy, PartialEq)]
-struct Field {
-    name: &'static str,
-    label: &'static str,
-    ctrl: Ctrl,
-}
-
-#[derive(Clone, Copy, PartialEq)]
-struct Section {
-    title: &'static str,
-    fields: &'static [Field],
-}
-
-const WEIGHTS: &[(&str, &str)] = &[
-    ("100", "Thin · 100"),
-    ("200", "Extra Light · 200"),
-    ("300", "Light · 300"),
-    ("400", "Regular · 400"),
-    ("500", "Medium · 500"),
-    ("600", "Semibold · 600"),
-    ("700", "Bold · 700"),
-    ("800", "Extra Bold · 800"),
-    ("900", "Black · 900"),
-];
-
-// ── Field lists ────────────────────────────────────────────────────────────
-
-const F_TYPO: &[Field] = &[
-    Field {
-        name: "font-size",
-        label: "Size",
-        ctrl: Ctrl::UnitSlider {
-            min: 8.0,
-            max: 200.0,
-            step: 1.0,
-            unit: "PX",
-        },
-    },
-    Field {
-        name: "font-weight",
-        label: "Weight",
-        ctrl: Ctrl::Weight,
-    },
-    Field {
-        name: "style",
-        label: "Style",
-        ctrl: Ctrl::StyleToggles,
-    },
-    Field {
-        name: "line-height",
-        label: "Line height",
-        ctrl: Ctrl::UnitSlider {
-            min: 0.8,
-            max: 3.0,
-            step: 0.1,
-            unit: "",
-        },
-    },
-    Field {
-        name: "letter-spacing",
-        label: "Tracking",
-        ctrl: Ctrl::UnitSlider {
-            min: -5.0,
-            max: 20.0,
-            step: 0.5,
-            unit: "PX",
-        },
-    },
-    Field {
-        name: "text-align",
-        label: "Align",
-        ctrl: Ctrl::Align,
-    },
-];
-
-const F_COLOR: &[Field] = &[
-    Field {
-        name: "color",
-        label: "Text",
-        ctrl: Ctrl::Color { clearable: false },
-    },
-    Field {
-        name: "background",
-        label: "Background",
-        ctrl: Ctrl::Color { clearable: true },
-    },
-];
-
-const F_LAYOUT: &[Field] = &[
-    Field {
-        name: "display",
-        label: "Display",
-        ctrl: Ctrl::Select(&["block", "flex", "grid", "inline-block", "none", "contents"]),
-    },
-    Field {
-        name: "position",
-        label: "Position",
-        ctrl: Ctrl::Select(&["static", "relative", "absolute"]),
-    },
-    Field {
-        name: "top",
-        label: "Top",
-        ctrl: Ctrl::Text,
-    },
-    Field {
-        name: "right",
-        label: "Right",
-        ctrl: Ctrl::Text,
-    },
-    Field {
-        name: "bottom",
-        label: "Bottom",
-        ctrl: Ctrl::Text,
-    },
-    Field {
-        name: "left",
-        label: "Left",
-        ctrl: Ctrl::Text,
-    },
-    Field {
-        name: "z-index",
-        label: "Z-index",
-        ctrl: Ctrl::Number,
-    },
-    Field {
-        name: "overflow",
-        label: "Overflow",
-        ctrl: Ctrl::Select(&["visible", "hidden", "auto", "scroll", "clip"]),
-    },
-    Field {
-        name: "visibility",
-        label: "Visible",
-        ctrl: Ctrl::Switch("hidden", "visible"),
-    },
-];
-
-const F_POSITION: &[Field] = &[
-    Field {
-        name: "position",
-        label: "Position",
-        ctrl: Ctrl::Select(&["static", "relative", "absolute"]),
-    },
-    Field {
-        name: "top",
-        label: "Top",
-        ctrl: Ctrl::Text,
-    },
-    Field {
-        name: "left",
-        label: "Left",
-        ctrl: Ctrl::Text,
-    },
-    Field {
-        name: "z-index",
-        label: "Z-index",
-        ctrl: Ctrl::Number,
-    },
-];
-
-const F_FLEX: &[Field] = &[
-    Field {
-        name: "flex-direction",
-        label: "Direction",
-        ctrl: Ctrl::Select(&["row", "row-reverse", "column", "column-reverse"]),
-    },
-    Field {
-        name: "flex-wrap",
-        label: "Wrap",
-        ctrl: Ctrl::Select(&["nowrap", "wrap", "wrap-reverse"]),
-    },
-    Field {
-        name: "justify-content",
-        label: "Justify",
-        ctrl: Ctrl::Select(&[
-            "flex-start",
-            "flex-end",
-            "center",
-            "space-between",
-            "space-around",
-            "space-evenly",
-            "start",
-            "end",
-        ]),
-    },
-    Field {
-        name: "align-items",
-        label: "Align",
-        ctrl: Ctrl::Select(&[
-            "stretch",
-            "flex-start",
-            "flex-end",
-            "center",
-            "baseline",
-            "start",
-            "end",
-        ]),
-    },
-    Field {
-        name: "align-content",
-        label: "Align content",
-        ctrl: Ctrl::Select(&[
-            "stretch",
-            "flex-start",
-            "flex-end",
-            "center",
-            "space-between",
-            "space-around",
-            "space-evenly",
-            "start",
-            "end",
-        ]),
-    },
-    Field {
-        name: "gap",
-        label: "Gap",
-        ctrl: Ctrl::Text,
-    },
-];
-
-const F_SPACING: &[Field] = &[
-    Field {
-        name: "padding",
-        label: "Padding",
-        ctrl: Ctrl::Text,
-    },
-    Field {
-        name: "margin",
-        label: "Margin",
-        ctrl: Ctrl::Text,
-    },
-];
-
-const F_MARGIN: &[Field] = &[Field {
-    name: "margin",
-    label: "Margin",
-    ctrl: Ctrl::Text,
-}];
-
-const F_SIZING: &[Field] = &[
-    Field {
-        name: "width",
-        label: "Width",
-        ctrl: Ctrl::Text,
-    },
-    Field {
-        name: "height",
-        label: "Height",
-        ctrl: Ctrl::Text,
-    },
-    Field {
-        name: "min-width",
-        label: "Min W",
-        ctrl: Ctrl::Text,
-    },
-    Field {
-        name: "min-height",
-        label: "Min H",
-        ctrl: Ctrl::Text,
-    },
-    Field {
-        name: "max-width",
-        label: "Max W",
-        ctrl: Ctrl::Text,
-    },
-    Field {
-        name: "max-height",
-        label: "Max H",
-        ctrl: Ctrl::Text,
-    },
-];
-
-const F_SIZING_WH: &[Field] = &[
-    Field {
-        name: "width",
-        label: "Width",
-        ctrl: Ctrl::Text,
-    },
-    Field {
-        name: "height",
-        label: "Height",
-        ctrl: Ctrl::Text,
-    },
-];
-
-const F_TEXT_SIZING: &[Field] = &[
-    Field {
-        name: "width",
-        label: "Width",
-        ctrl: Ctrl::Text,
-    },
-    Field {
-        name: "max-width",
-        label: "Max W",
-        ctrl: Ctrl::Text,
-    },
-];
-
-const F_APPEARANCE: &[Field] = &[
-    Field {
-        name: "background",
-        label: "Background",
-        ctrl: Ctrl::Color { clearable: true },
-    },
-    Field {
-        name: "border-radius",
-        label: "Radius",
-        ctrl: Ctrl::Text,
-    },
-    Field {
-        name: "opacity",
-        label: "Opacity",
-        ctrl: Ctrl::Slider {
-            min: 0.0,
-            max: 1.0,
-            step: 0.01,
-        },
-    },
-];
-
-const F_OPACITY: &[Field] = &[Field {
-    name: "opacity",
-    label: "Opacity",
-    ctrl: Ctrl::Slider {
-        min: 0.0,
-        max: 1.0,
-        step: 0.01,
-    },
-}];
-
-// ── Per-family sections (strict: only valid props per element type) ──────────
-
-#[derive(Clone, Copy, PartialEq)]
-enum Family {
-    Text,
-    Container,
-    Shape,
-    Other,
-}
-
-/// Map a component `kind` to a family that decides which sections render.
-/// `div` arrives here as `container`.
-fn family(kind: &str) -> Family {
-    match kind {
-        "text" | "caption" | "gradient_text" => Family::Text,
-        "container" | "card" | "flex" | "grid" | "positioned" => Family::Container,
-        "shape" | "image" | "icon" | "svg" | "video" | "gif" | "lottie" | "qrcode" | "mockup"
-        | "divider" | "line" | "arrow" | "connector" => Family::Shape,
-        _ => Family::Other,
-    }
-}
-
-/// Text-family elements edit their content first: the CONTENT section renders
-/// ABOVE Properties. Other families keep Properties on top (and have no
-/// content editor).
-fn content_before_properties(kind: &str) -> bool {
-    family(kind) == Family::Text
-}
-
-const TEXT_SECTIONS: &[Section] = &[
-    Section {
-        title: "Typography",
-        fields: F_TYPO,
-    },
-    Section {
-        title: "Color",
-        fields: F_COLOR,
-    },
-    Section {
-        title: "Sizing",
-        fields: F_TEXT_SIZING,
-    },
-    Section {
-        title: "Spacing",
-        fields: F_SPACING,
-    },
-    Section {
-        title: "Appearance",
-        fields: F_OPACITY,
-    },
-];
-
-const CONTAINER_SECTIONS: &[Section] = &[
-    Section {
-        title: "Layout",
-        fields: F_LAYOUT,
-    },
-    Section {
-        title: "Flex",
-        fields: F_FLEX,
-    },
-    Section {
-        title: "Spacing",
-        fields: F_SPACING,
-    },
-    Section {
-        title: "Sizing",
-        fields: F_SIZING,
-    },
-    Section {
-        title: "Appearance",
-        fields: F_APPEARANCE,
-    },
-];
-
-const SHAPE_SECTIONS: &[Section] = &[
-    Section {
-        title: "Layout",
-        fields: F_POSITION,
-    },
-    Section {
-        title: "Sizing",
-        fields: F_SIZING,
-    },
-    Section {
-        title: "Spacing",
-        fields: F_MARGIN,
-    },
-    Section {
-        title: "Appearance",
-        fields: F_APPEARANCE,
-    },
-];
-
-const FALLBACK_SECTIONS: &[Section] = &[
-    Section {
-        title: "Layout",
-        fields: F_POSITION,
-    },
-    Section {
-        title: "Sizing",
-        fields: F_SIZING_WH,
-    },
-    Section {
-        title: "Spacing",
-        fields: F_SPACING,
-    },
-    Section {
-        title: "Appearance",
-        fields: F_APPEARANCE,
-    },
-];
-
-fn sections(f: Family) -> &'static [Section] {
-    match f {
-        Family::Text => TEXT_SECTIONS,
-        Family::Container => CONTAINER_SECTIONS,
-        Family::Shape => SHAPE_SECTIONS,
-        Family::Other => FALLBACK_SECTIONS,
-    }
-}
-
-// ── Styling constants ────────────────────────────────────────────────────────
-
-const INPUT_STYLE: &str = "width:100%; box-sizing:border-box; padding:5px 7px; background:var(--rm-bg); color:var(--rm-text); border:1px solid var(--rm-border-2); border-radius:6px; font:inherit;";
-const NUM_STYLE: &str = "width:46px; flex:none; box-sizing:border-box; text-align:right; padding:5px 5px; background:var(--rm-bg); color:var(--rm-text); border:1px solid var(--rm-border-2); border-radius:6px; font:inherit;";
-const HEX_STYLE: &str = "flex:1; min-width:0; box-sizing:border-box; padding:5px 7px; background:var(--rm-bg); color:var(--rm-text); border:1px solid var(--rm-border-2); border-radius:6px; font:inherit;";
-const SECTION_HEADER: &str = "color:var(--rm-text-muted); font-size:10px; font-weight:600; letter-spacing:0.06em; text-transform:uppercase;";
-const TEXTAREA_STYLE: &str = "width:100%; box-sizing:border-box; min-height:58px; resize:vertical; padding:7px 9px; background:var(--rm-bg); color:var(--rm-text); border:1px solid var(--rm-border-2); border-radius:7px; font:inherit;";
-
-/// Stroke color for a segmented-button icon (`.rm-seg-btn`), keyed on active.
-/// The button chrome (bg/hover/active) is themed via `INSPECTOR_CSS` classes —
-/// inline styles can't override the WKWebView native button `appearance`.
-fn seg_icon(active: bool) -> &'static str {
-    if active {
-        "var(--rm-on-accent)"
-    } else {
-        "var(--rm-text-muted)"
-    }
-}
-
-// ── Value helpers ────────────────────────────────────────────────────────────
-
-/// Stringify a property's current value from the element's `style` object.
-fn prop_str(style: &serde_json::Value, name: &str) -> String {
-    match style.get(name) {
-        Some(serde_json::Value::String(s)) => s.clone(),
-        // Null = unset (effective documents serialize unset Options as null).
-        Some(serde_json::Value::Null) | None => String::new(),
-        Some(other) => other.to_string(),
-    }
-}
-
-/// Leading numeric part of a CSS value: `"26px"` → `26`, `"-0.5px"` → `-0.5`.
-fn parse_num(s: &str) -> Option<f64> {
-    let t: String = s
-        .trim()
-        .chars()
-        .take_while(|c| c.is_ascii_digit() || *c == '.' || *c == '-')
-        .collect();
-    t.parse::<f64>().ok()
-}
-
-fn fmt_num(v: f64, step: f64) -> String {
-    if step >= 1.0 {
-        format!("{}", v.round() as i64)
-    } else {
-        // Round to 2 decimals, then shortest display: 1.40 → "1.4", 405.0 → "405".
-        ((v * 100.0).round() / 100.0).to_string()
-    }
-}
-
-fn fmt_unit(v: f64, step: f64, unit: &str) -> String {
-    let n = fmt_num(v, step);
-    if unit.is_empty() {
-        n
-    } else {
-        format!("{n}{}", unit.to_ascii_lowercase())
-    }
-}
-
-fn num_display(value: &str, step: f64) -> String {
-    parse_num(value)
-        .map(|v| fmt_num(v, step))
-        .unwrap_or_else(|| value.to_string())
-}
-
-// ── Panel ────────────────────────────────────────────────────────────────────
-
-/// The right-hand inspector for the selected element: header, the schema-driven
-/// Properties section (component root fields), the content editor (text family
-/// only), the curated per-type style sections, the generic (schema-complete)
-/// CSS sections, and the "comment for the agent" box. Driven by
-/// frame-independent values, so it stays memoized and doesn't re-render on
-/// playback.
-#[component]
-pub fn InspectorPanel(
-    selected: Signal<Option<(u32, String, String)>>,
-    pointer: String,
-    kind: String,
-    current: Signal<u32>,
-    content: Option<String>,
-    style: serde_json::Value,
-    element: serde_json::Value,
-) -> Element {
-    // Provide the debounce handle so all child write helpers share one slot.
-    use_context_provider(|| WriteDebounce(Rc::new(RefCell::new(None))));
-    // One expanded color picker at a time across the whole panel.
-    let mut open_picker = use_signal(|| None::<u64>);
-    use_context_provider(|| crate::components::color_picker::OpenPicker(open_picker));
-    let fam = family(&kind);
-    rsx! {
-        div {
-            // --picker-anchor-right: popover right-edge offset so it hugs the
-            // swatch's left edge. Standard rows: 300 − (14 section padding +
-            // 76 label + 8 gap) + 8 gap = 210px. Object sub-rows override it.
-            style: "width:300px; flex:none; min-height:0; background:var(--rm-surface); border-left:1px solid var(--rm-border); box-sizing:border-box; display:flex; flex-direction:column; overflow:auto; --picker-anchor-right:210px;",
-            // The open picker popover is `position:fixed` at its trigger's
-            // static position: it doesn't follow the panel scroll, so close
-            // it when the panel scrolls (standard dropdown behavior).
-            onscroll: move |_| open_picker.set(None),
-            div {
-                style: "padding:14px; display:flex; justify-content:space-between; align-items:center;",
-                div {
-                    div { style: "color:var(--rm-accent); font-weight:600;", "Inspector" }
-                    if !kind.is_empty() {
-                        div { style: "color:var(--rm-text-muted); font-size:11px;", "{kind}" }
-                    }
-                }
-                Button {
-                    variant: ButtonVariant::Ghost,
-                    size: ButtonSize::IconXs,
-                    onclick: move |_| selected.set(None),
-                    "✕"
-                }
-            }
-            if content_before_properties(&kind) {
-                ContentEditor { pointer: pointer.clone(), content: content.clone().unwrap_or_default() }
-            }
-            RootPropsSection { pointer: pointer.clone(), kind: kind.clone(), element }
-            for section in sections(fam) {
-                SectionView {
-                    key: "{section.title}",
-                    section: *section,
-                    pointer: pointer.clone(),
-                    style: style.clone(),
-                    tag: kind.clone(),
-                }
-            }
-            GenericCssSections { pointer: pointer.clone(), kind: kind.clone(), style: style.clone() }
-            AnnotationBox { pointer, kind, current }
-        }
-    }
-}
-
-/// Names already handled by the curated controls for a family — the generic
-/// sections skip these so no property appears twice.
-fn curated_names(fam: Family) -> std::collections::BTreeSet<&'static str> {
-    let mut set = std::collections::BTreeSet::new();
-    for section in sections(fam) {
-        for field in section.fields {
-            set.insert(field.name);
-            if matches!(field.ctrl, Ctrl::StyleToggles) {
-                set.insert("font-weight");
-                set.insert("font-style");
-            }
-        }
-    }
-    set
-}
-
-/// Schema-driven "Properties" section: the component's editable root fields
-/// (counter `from`/`to`/`decimals`…, badge `label`…), typed writes. `content`
-/// is skipped for the text family (the Content editor owns it); start_at /
-/// end_at move to the dedicated Timing section below.
-///
-/// Controls read the EFFECTIVE element (typed round-trip fills serde
-/// defaults), so a gauge without `show_value` shows the switch ON like the
-/// engine renders it; fields absent from the raw get a dimmed "default"
-/// marker. Writes keep targeting the raw document.
-#[component]
-fn RootPropsSection(pointer: String, kind: String, element: serde_json::Value) -> Element {
-    let Some(props) = component_props(&kind) else {
-        return rsx! {};
-    };
-    let effective = effective_element(&element);
-    let skip_content = family(&kind) == Family::Text;
-    let has_timing = props
-        .iter()
-        .any(|p| p.name == "start_at" || p.name == "end_at");
-    let rows: Vec<_> = props
-        .iter()
-        .filter(|p| !(skip_content && p.name == "content"))
-        .filter(|p| p.name != "start_at" && p.name != "end_at")
-        .collect();
-    if rows.is_empty() && !has_timing {
-        return rsx! {};
-    }
-    rsx! {
-        if !rows.is_empty() {
-            CollapsibleSection { title: "Properties".to_string(), start_open: true,
-                for spec in rows {
-                    GenericRow {
-                        key: "{pointer}-root-{spec.name}",
-                        pointer: pointer.clone(),
-                        name: spec.name.clone(),
-                        prop_kind: spec.kind.clone(),
-                        value: prop_str(&effective, &spec.name),
-                        is_style: false,
-                        host_tag: kind.clone(),
-                        is_default: element.get(&spec.name).is_none()
-                            && effective.get(&spec.name).map(|v| !v.is_null()).unwrap_or(false),
-                    }
-                }
-            }
-        }
-        if has_timing {
-            TimingSection { pointer: pointer.clone(), effective: effective.clone() }
-        }
-    }
-}
-
-/// Dedicated visibility-window editor (start_at / end_at), bounded by the
-/// containing scene's duration.
-#[component]
-fn TimingSection(pointer: String, effective: serde_json::Value) -> Element {
-    let shared = use_context::<Shared>();
-    let max = {
-        let m = shared.lock().unwrap_or_else(|e| e.into_inner());
-        scene_duration_for_pointer(&m.raw, &pointer)
-    };
-    rsx! {
-        CollapsibleSection { title: "Timing".to_string(), start_open: true,
-            TimingRow {
-                pointer: pointer.clone(),
-                field: "start_at".to_string(),
-                label: "Visible from (s)".to_string(),
-                placeholder: "scene start".to_string(),
-                value: prop_str(&effective, "start_at"),
-                max,
-            }
-            TimingRow {
-                pointer: pointer.clone(),
-                field: "end_at".to_string(),
-                label: "Visible until (s)".to_string(),
-                placeholder: "end of scene".to_string(),
-                value: prop_str(&effective, "end_at"),
-                max,
-            }
-            div { style: "color:var(--rm-text-muted); font-size:10px;",
-                "Visibility window — the element keeps its layout slot outside it."
-            }
-        }
-    }
-}
-
-/// One Timing row: numeric input (step 0.1) writing the typed field; empty
-/// unsets it.
-#[component]
-fn TimingRow(
-    pointer: String,
-    field: String,
-    label: String,
-    placeholder: String,
-    value: String,
-    max: Option<f64>,
-) -> Element {
-    let shared = use_context::<Shared>();
-    // An empty max attribute is ignored by the browser (no constraint).
-    let max_attr = max.map(|m| m.to_string()).unwrap_or_default();
-    rsx! {
-        div { style: "display:flex; align-items:center; gap:8px; min-height:26px;",
-            span { style: "width:96px; flex:none; color:var(--rm-text-muted); font-size:11px;", "{label}" }
-            input {
-                r#type: "number",
-                style: "{INPUT_STYLE}",
-                step: "0.1",
-                min: "0",
-                max: "{max_attr}",
-                value: "{value}",
-                placeholder: "{placeholder}",
-                title: "Visibility window — the element keeps its layout slot outside it.",
-                oninput: {
-                    let shared = shared.clone();
-                    let p = pointer.clone();
-                    let f = field.clone();
-                    move |e: FormEvent| {
-                        if let Ok(v) = parse_root_value(&PropKind::Float, &e.value()) {
-                            write_root_field(&shared, &p, &f, v);
-                        }
-                    }
-                },
-            }
-        }
-    }
-}
-
-/// The schema-complete CSS sections for the component's family, minus every
-/// property the curated controls already expose. Collapsed by default.
-#[component]
-fn GenericCssSections(pointer: String, kind: String, style: serde_json::Value) -> Element {
-    let curated = curated_names(family(&kind));
-    let sections_for_family = visible_sections(css_family(&kind));
-    rsx! {
-        for section in sections_for_family {
-            {
-                let props: Vec<_> = css_section_props(section)
-                    .into_iter()
-                    .filter(|p| !curated.contains(p.name.as_str()))
-                    .collect();
-                rsx! {
-                    if !props.is_empty() {
-                        CollapsibleSection {
-                            key: "{pointer}-{section.label()}",
-                            title: section.label().to_string(),
-                            start_open: false,
-                            for spec in props {
-                                GenericRow {
-                                    key: "{pointer}-css-{spec.name}",
-                                    pointer: pointer.clone(),
-                                    name: spec.name.clone(),
-                                    prop_kind: spec.kind.clone(),
-                                    value: css_row_value(prop_str(&style, &spec.name), &kind, &spec.name).0,
-                                    is_style: true,
-                                    is_default: css_row_value(prop_str(&style, &spec.name), &kind, &spec.name).1,
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-/// A section with a clickable header that folds its rows.
-#[component]
-fn CollapsibleSection(title: String, start_open: bool, children: Element) -> Element {
-    let mut open = use_signal(|| start_open);
-    let chevron = if open() { "▾" } else { "▸" };
-    rsx! {
-        div { style: "display:flex; flex-direction:column; gap:8px; padding:12px 14px; border-top:1px solid var(--rm-border);",
-            div {
-                style: "{SECTION_HEADER} cursor:pointer; user-select:none;",
-                onclick: move |_| open.set(!open()),
-                "{chevron} {title}"
-            }
-            if open() {
-                {children}
-            }
-        }
-    }
-}
-
-/// Parse a generic control's text into the TYPED JSON value written to a root
-/// field. Empty → `Null` (remove). Numbers stay numbers (integral floats
-/// become JSON integers so `u8`-style fields deserialize), bools bools,
-/// Complex must be valid JSON.
-fn parse_root_value(kind: &PropKind, text: &str) -> Result<serde_json::Value, ()> {
-    let t = text.trim();
-    if t.is_empty() {
-        return Ok(serde_json::Value::Null);
-    }
-    Ok(match kind {
-        PropKind::Integer => {
-            // NEVER write a float into an integer field: `12.0` fails the
-            // typed parse ("invalid type: floating point") and would drop the
-            // element at render.
-            match t.parse::<i64>() {
-                Ok(i) => serde_json::Value::from(i),
-                Err(_) => {
-                    let f: f64 = t.parse().map_err(|_| ())?;
-                    if f.fract() == 0.0 && f.abs() < 9_007_199_254_740_992.0 {
-                        serde_json::Value::from(f as i64)
-                    } else {
-                        return Err(());
-                    }
-                }
-            }
-        }
-        PropKind::Float => {
-            let f: f64 = t.parse().map_err(|_| ())?;
-            // Integral floats are written as JSON integers (clean source; f64
-            // fields deserialize integers fine).
-            if f.fract() == 0.0 && f.abs() < 9_007_199_254_740_992.0 {
-                serde_json::Value::from(f as i64)
-            } else {
-                serde_json::Value::from(f)
-            }
-        }
-        PropKind::Bool => serde_json::Value::Bool(t == "true"),
-        PropKind::Complex => serde_json::from_str(t).map_err(|_| ())?,
-        _ => serde_json::Value::String(text.to_string()),
-    })
-}
-
-/// One generic (schema-driven) property row. `is_style` picks the write path:
-/// style properties write CSS strings (an emptied control REMOVES the
-/// declaration); root fields write typed JSON (empty removes the field /
-/// HTML attribute).
-#[component]
-fn GenericRow(
-    pointer: String,
-    name: String,
-    prop_kind: PropKind,
-    value: String,
-    is_style: bool,
-    #[props(default = false)] is_default: bool,
-    /// When set (object sub-rows), the parsed TYPED value is handed to this
-    /// callback instead of being written as a root field — the parent object
-    /// control folds it into the whole-object write.
-    #[props(default)]
-    custom_commit: Option<Callback<serde_json::Value>>,
-    /// Component tag of the host element (palette prefill lookup).
-    #[props(default)]
-    host_tag: String,
-) -> Element {
-    let shared = use_context::<Shared>();
-
-    // Single write route shared by every control variant.
-    let commit: Rc<dyn Fn(&str)> = {
-        let shared = shared.clone();
-        let p = pointer.clone();
-        let n = name.clone();
-        let k = prop_kind.clone();
-        Rc::new(move |text: &str| {
-            if let Some(cb) = &custom_commit {
-                if let Ok(v) = parse_root_value(&k, text) {
-                    cb.call(v);
-                }
-            } else if is_style {
-                if text.trim().is_empty() {
-                    write_style_removal(&shared, &p, &n);
-                } else {
-                    write_prop(&shared, &p, &n, text);
-                }
-            } else if let Ok(v) = parse_root_value(&k, text) {
-                write_root_field(&shared, &p, &n, v);
-            }
-        })
-    };
-
-    let control = match prop_kind.clone() {
-        PropKind::Bool => {
-            let commit = commit.clone();
-            rsx! {
-                Switch {
-                    default_checked: value == "true",
-                    on_checked_change: move |checked: bool| {
-                        commit(if checked { "true" } else { "false" })
-                    },
-                }
-            }
-        }
-        PropKind::Enum(variants) => {
-            let mut items = variants;
-            if !value.is_empty() && !items.iter().any(|o| o == &value) {
-                items.insert(0, value.clone());
-            }
-            let options = items.iter().enumerate().map(|(i, opt)| {
-                rsx! {
-                    SelectOption::<String> { key: "{opt}", index: i, value: opt.clone(), text_value: "{opt}", "{opt}" }
-                }
-            });
-            let commit = commit.clone();
-            rsx! {
-                Select::<String> {
-                    width: "100%",
-                    default_value: if value.is_empty() { None } else { Some(value.clone()) },
-                    on_value_change: move |v: Option<String>| {
-                        if let Some(v) = v {
-                            commit(&v);
-                        }
-                    },
-                    {options}
-                }
-            }
-        }
-        PropKind::Color => {
-            let mut color = use_signal(|| parse_hsv(&value));
-            let pick_commit = commit.clone();
-            let hex_commit = commit.clone();
-            rsx! {
-                div { style: "display:flex; flex-wrap:wrap; align-items:center; gap:6px; width:100%;",
-                    ColorPicker {
-                        color: color(),
-                        on_color_change: move |c: Hsv<encoding::Srgb, f64>| {
-                            color.set(c);
-                            pick_commit(&hsv_to_hex(c));
-                        },
-                    }
-                    input {
-                        r#type: "text",
-                        style: "{HEX_STYLE}",
-                        value: "{value}",
-                        oninput: move |e: FormEvent| {
-                            let v = e.value();
-                            if v.trim_start_matches('#').len() >= 6 {
-                                color.set(parse_hsv(&v));
-                            }
-                            hex_commit(&v);
-                        },
-                    }
-                }
-            }
-        }
-        PropKind::Float => {
-            if let Some((min, max, step)) = slider_range(&name) {
-                let mut num = use_signal(|| parse_num(&value).unwrap_or(min));
-                let mut txt = use_signal(|| num_display(&value, step));
-                let slide_commit = commit.clone();
-                let type_commit = commit.clone();
-                rsx! {
-                    div { style: "display:flex; align-items:center; gap:8px; width:100%;",
-                        div { style: "flex:1; min-width:0;",
-                            Slider {
-                                value: Some(num()),
-                                min,
-                                max,
-                                step,
-                                on_value_change: move |v: f64| {
-                                    num.set(v);
-                                    txt.set(fmt_num(v, step));
-                                    slide_commit(&fmt_num(v, step));
-                                },
-                            }
-                        }
-                        input {
-                            r#type: "text",
-                            style: "{NUM_STYLE}",
-                            value: "{txt}",
-                            oninput: move |e: FormEvent| {
-                                let raw = e.value();
-                                txt.set(raw.clone());
-                                if let Some(v) = parse_num(&raw) {
-                                    num.set(v);
-                                }
-                                type_commit(&raw);
-                            },
-                        }
-                    }
-                }
-            } else {
-                let commit = commit.clone();
-                rsx! {
-                    input {
-                        r#type: "number",
-                        step: "0.1",
-                        style: "{INPUT_STYLE}",
-                        value: "{display_number(&value)}",
-                        oninput: move |e: FormEvent| commit(&e.value()),
-                    }
-                }
-            }
-        }
-        PropKind::Integer => {
-            let commit = commit.clone();
-            rsx! {
-                input {
-                    r#type: "number",
-                    step: "1",
-                    style: "{INPUT_STYLE}",
-                    value: "{display_number(&value)}",
-                    oninput: move |e: FormEvent| commit(&e.value()),
-                }
-            }
-        }
-        PropKind::String if is_multiline(&name, &value) => {
-            // Long-form text (codeblock `code`, notification `message`, …).
-            let commit = commit.clone();
-            let font = if name == "code" {
-                "font-family:monospace; font-size:11px;"
-            } else {
-                "font:inherit;"
-            };
-            rsx! {
-                textarea {
-                    style: "width:100%; box-sizing:border-box; min-height:88px; resize:vertical; padding:7px 9px; background:var(--rm-bg); color:var(--rm-text); border:1px solid var(--rm-border-2); border-radius:7px; {font}",
-                    value: "{value}",
-                    oninput: move |e: FormEvent| commit(&e.value()),
-                }
-            }
-        }
-        PropKind::Unit | PropKind::String => {
-            let commit = commit.clone();
-            let placeholder = engine_placeholder(&name).unwrap_or_default();
-            rsx! {
-                input {
-                    r#type: "text",
-                    style: "{INPUT_STYLE}",
-                    value: "{value}",
-                    placeholder: "{placeholder}",
-                    oninput: move |e: FormEvent| commit(&e.value()),
-                }
-            }
-        }
-        PropKind::ColorList => {
-            rsx! {
-                ColorListControl {
-                    pointer: pointer.clone(),
-                    name: name.clone(),
-                    value: value.clone(),
-                    host_tag: host_tag.clone(),
-                }
-            }
-        }
-        PropKind::Fill => {
-            rsx! {
-                FillControl { pointer: pointer.clone(), name: name.clone(), value: value.clone() }
-            }
-        }
-        // Object/number-list editors are root-field only: style writes are
-        // string-based, so object-shaped style props keep the JSON area.
-        PropKind::Object(specs) if !is_style => {
-            rsx! {
-                ObjectControl {
-                    pointer: pointer.clone(),
-                    name: name.clone(),
-                    specs,
-                    value: value.clone(),
-                    custom_commit,
-                }
-            }
-        }
-        PropKind::NumberList if !is_style => {
-            rsx! {
-                NumberListControl { pointer: pointer.clone(), name: name.clone(), value: value.clone() }
-            }
-        }
-        PropKind::StringList if !is_style => {
-            rsx! {
-                StringListControl { pointer: pointer.clone(), name: name.clone(), value: value.clone() }
-            }
-        }
-        PropKind::Complex | PropKind::Object(_) | PropKind::NumberList | PropKind::StringList => {
-            let commit = commit.clone();
-            rsx! {
-                JsonArea {
-                    initial: value.clone(),
-                    on_commit: move |text: String| commit(&text),
-                }
-            }
-        }
-    };
-
-    rsx! {
-        div { style: "display:flex; align-items:center; gap:8px; min-height:26px;",
-            span {
-                style: "width:76px; flex:none; color:var(--rm-text-muted); font-size:11px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;",
-                title: if is_default { "{name} — engine default (not set in the source)" } else { "{name}" },
-                "{name}"
-                if is_default {
-                    // Discreet default marker; the row title explains it.
-                    span { style: "margin-left:4px; color:var(--rm-text-muted); opacity:0.6;", "•" }
-                }
-            }
-            div { style: "flex:1; min-width:0; display:flex; justify-content:flex-end;", {control} }
-        }
-    }
-}
-
-/// Folded JSON editor for Complex values: parse-checked on blur; invalid input
-/// shows an error border and never writes.
-#[component]
-fn JsonArea(initial: String, on_commit: EventHandler<String>) -> Element {
-    let mut txt = use_signal(|| initial.clone());
-    let mut bad = use_signal(|| false);
-    let border = if bad() {
-        "var(--rm-error)"
-    } else {
-        "var(--rm-border-2)"
-    };
-    rsx! {
-        textarea {
-            style: "width:100%; box-sizing:border-box; min-height:44px; resize:vertical; padding:6px 8px; background:var(--rm-bg); color:var(--rm-text); border:1px solid {border}; border-radius:6px; font-size:11px; font-family:monospace;",
-            value: "{txt}",
-            oninput: move |e: FormEvent| {
-                txt.set(e.value());
-                bad.set(false);
-            },
-            onblur: move |_| {
-                let t = txt();
-                let trimmed = t.trim().to_string();
-                if trimmed.is_empty() {
-                    bad.set(false);
-                    on_commit.call(String::new());
-                } else if serde_json::from_str::<serde_json::Value>(&trimmed).is_ok() {
-                    bad.set(false);
-                    on_commit.call(trimmed);
-                } else {
-                    bad.set(true);
-                }
-            },
-        }
-    }
-}
-
-/// Editable text content for text-bearing elements (writes the `content` field).
-#[component]
-fn ContentEditor(pointer: String, content: String) -> Element {
-    let shared = use_context::<Shared>();
-    rsx! {
-        div { style: "display:flex; flex-direction:column; gap:7px; padding:12px 14px; border-top:1px solid var(--rm-border);",
-            div { style: "{SECTION_HEADER}", "Content" }
-            textarea {
-                style: "{TEXTAREA_STYLE}",
-                value: "{content}",
-                oninput: {
-                    let shared = shared.clone();
-                    let p = pointer.clone();
-                    move |e: FormEvent| write_content(&shared, &p, &e.value())
-                },
-            }
-        }
-    }
-}
-
-/// One labelled, uppercase-headed section with its rows.
-#[component]
-fn SectionView(
-    section: Section,
-    pointer: String,
-    style: serde_json::Value,
-    tag: String,
-) -> Element {
-    rsx! {
-        div { style: "display:flex; flex-direction:column; gap:8px; padding:12px 14px; border-top:1px solid var(--rm-border);",
-            div { style: "{SECTION_HEADER}", "{section.title}" }
-            for field in section.fields {
-                FieldRow {
-                    key: "{pointer}-{field.name}",
-                    field: *field,
-                    pointer: pointer.clone(),
-                    style: style.clone(),
-                    tag: tag.clone(),
-                }
-            }
-        }
-    }
-}
-
-/// One property row: label on the left, the typed control on the right.
-#[component]
-fn FieldRow(field: Field, pointer: String, style: serde_json::Value, tag: String) -> Element {
-    let shared = use_context::<Shared>();
-    // Effective view: an unset property displays the ENGINE default (opacity
-    // slider at 1.0, Position preselecting "static", spacing at 0…) with the
-    // dimmed default marker; the raw value always wins. Emptying a control
-    // still removes the key (back to the default state).
-    let (value, is_default) = css_row_value(prop_str(&style, field.name), &tag, field.name);
-
-    let control = match field.ctrl {
-        Ctrl::Text | Ctrl::Number => {
-            let kind = if matches!(field.ctrl, Ctrl::Number) {
-                "number"
-            } else {
-                "text"
-            };
-            rsx! {
-                input {
-                    r#type: "{kind}",
-                    style: "{INPUT_STYLE}",
-                    value: "{value}",
-                    oninput: {
-                        let shared = shared.clone();
-                        let p = pointer.clone();
-                        move |e: FormEvent| write_prop(&shared, &p, field.name, &e.value())
-                    },
-                }
-            }
-        }
-        Ctrl::UnitSlider {
-            min,
-            max,
-            step,
-            unit,
-        } => {
-            // Shared live state so the slider and the number field track each other
-            // (the panel itself doesn't re-render on the file reload). `txt` holds the
-            // field's raw text so typing decimals isn't reformatted mid-keystroke.
-            let mut num = use_signal(|| parse_num(&value).unwrap_or(min));
-            let mut txt = use_signal(|| num_display(&value, step));
-            rsx! {
-                div { style: "display:flex; align-items:center; gap:8px; width:100%;",
-                    div { style: "flex:1; min-width:0;",
-                        Slider {
-                            value: Some(num()),
-                            min,
-                            max,
-                            step,
-                            on_value_change: {
-                                let shared = shared.clone();
-                                let p = pointer.clone();
-                                move |v: f64| {
-                                    num.set(v);
-                                    txt.set(fmt_num(v, step));
-                                    write_prop(&shared, &p, field.name, &fmt_unit(v, step, unit));
-                                }
-                            },
-                        }
-                    }
-                    input {
-                        r#type: "text",
-                        style: "{NUM_STYLE}",
-                        value: "{txt}",
-                        oninput: {
-                            let shared = shared.clone();
-                            let p = pointer.clone();
-                            move |e: FormEvent| {
-                                let raw = e.value();
-                                txt.set(raw.clone());
-                                match parse_num(&raw) {
-                                    Some(v) => {
-                                        num.set(v);
-                                        write_prop(&shared, &p, field.name, &fmt_unit(v, step, unit));
-                                    }
-                                    None => write_prop(&shared, &p, field.name, &raw),
-                                }
-                            }
-                        },
-                    }
-                    if !unit.is_empty() {
-                        span { style: "flex:none; color:var(--rm-text-muted); font-size:10px;", "{unit}" }
-                    }
-                }
-            }
-        }
-        Ctrl::Slider { min, max, step } => {
-            let mut num = use_signal(|| parse_num(&value).unwrap_or(min));
-            rsx! {
-                div { style: "display:flex; align-items:center; gap:8px; width:100%;",
-                    div { style: "flex:1; min-width:0;",
-                        Slider {
-                            value: Some(num()),
-                            min,
-                            max,
-                            step,
-                            on_value_change: {
-                                let shared = shared.clone();
-                                let p = pointer.clone();
-                                move |v: f64| {
-                                    num.set(v);
-                                    write_prop(&shared, &p, field.name, &fmt_num(v, step));
-                                }
-                            },
-                        }
-                    }
-                    span { style: "flex:none; width:32px; text-align:right; color:var(--rm-text-muted); font-size:11px;", "{fmt_num(num(), step)}" }
-                }
-            }
-        }
-        Ctrl::Select(opts) => {
-            let mut items: Vec<String> = opts.iter().map(|s| s.to_string()).collect();
-            if !value.is_empty() && !items.iter().any(|o| o == &value) {
-                items.insert(0, value.clone());
-            }
-            let options = items.iter().enumerate().map(|(i, opt)| {
-                rsx! {
-                    SelectOption::<String> { key: "{opt}", index: i, value: opt.clone(), text_value: "{opt}", "{opt}" }
-                }
-            });
-            rsx! {
-                Select::<String> {
-                    width: "100%",
-                    default_value: if value.is_empty() { None } else { Some(value.clone()) },
-                    on_value_change: {
-                        let shared = shared.clone();
-                        let p = pointer.clone();
-                        move |v: Option<String>| if let Some(v) = v { write_prop(&shared, &p, field.name, &v); }
-                    },
-                    {options}
-                }
-            }
-        }
-        Ctrl::Weight => {
-            let options = WEIGHTS.iter().enumerate().map(|(i, (val, label))| {
-                rsx! {
-                    SelectOption::<String> { key: "{val}", index: i, value: val.to_string(), text_value: "{label}", "{label}" }
-                }
-            });
-            rsx! {
-                Select::<String> {
-                    width: "100%",
-                    // Unset → show the engine's cascade default (Regular · 400)
-                    // instead of an empty "Select an option" placeholder.
-                    default_value: Some(if value.is_empty() { "400".to_string() } else { value.clone() }),
-                    on_value_change: {
-                        let shared = shared.clone();
-                        let p = pointer.clone();
-                        move |v: Option<String>| if let Some(v) = v { write_prop(&shared, &p, "font-weight", &v); }
-                    },
-                    {options}
-                }
-            }
-        }
-        Ctrl::Align => {
-            let vr = |v: &str| {
-                if value == v {
-                    ButtonVariant::Primary
-                } else {
-                    ButtonVariant::Ghost
-                }
-            };
-            rsx! {
-                div { class: "rm-seg",
-                    Button {
-                        variant: vr("left"), size: ButtonSize::IconSm, style: "flex:1;",
-                        onclick: { let s = shared.clone(); let p = pointer.clone(); move |_| write_prop(&s, &p, "text-align", "left") },
-                        TextAlignStart { size: "15px", stroke: seg_icon(value == "left") }
-                    }
-                    Button {
-                        variant: vr("center"), size: ButtonSize::IconSm, style: "flex:1;",
-                        onclick: { let s = shared.clone(); let p = pointer.clone(); move |_| write_prop(&s, &p, "text-align", "center") },
-                        TextAlignCenter { size: "15px", stroke: seg_icon(value == "center") }
-                    }
-                    Button {
-                        variant: vr("right"), size: ButtonSize::IconSm, style: "flex:1;",
-                        onclick: { let s = shared.clone(); let p = pointer.clone(); move |_| write_prop(&s, &p, "text-align", "right") },
-                        TextAlignEnd { size: "15px", stroke: seg_icon(value == "right") }
-                    }
-                    Button {
-                        variant: vr("justify"), size: ButtonSize::IconSm, style: "flex:1;",
-                        onclick: { let s = shared.clone(); let p = pointer.clone(); move |_| write_prop(&s, &p, "text-align", "justify") },
-                        TextAlignJustify { size: "15px", stroke: seg_icon(value == "justify") }
-                    }
-                }
-            }
-        }
-        Ctrl::StyleToggles => {
-            let weight = prop_str(&style, "font-weight");
-            let is_bold =
-                weight == "bold" || weight.parse::<i32>().map(|w| w >= 600).unwrap_or(false);
-            let fstyle = prop_str(&style, "font-style");
-            let is_italic = fstyle == "italic" || fstyle == "oblique";
-            rsx! {
-                div { class: "rm-seg",
-                    Button {
-                        variant: if is_bold { ButtonVariant::Primary } else { ButtonVariant::Ghost },
-                        size: ButtonSize::IconSm,
-                        style: "flex:1;",
-                        onclick: { let s = shared.clone(); let p = pointer.clone(); move |_| write_prop(&s, &p, "font-weight", if is_bold { "400" } else { "700" }) },
-                        Bold { size: "15px", stroke: seg_icon(is_bold) }
-                    }
-                    Button {
-                        variant: if is_italic { ButtonVariant::Primary } else { ButtonVariant::Ghost },
-                        size: ButtonSize::IconSm,
-                        style: "flex:1;",
-                        onclick: { let s = shared.clone(); let p = pointer.clone(); move |_| write_prop(&s, &p, "font-style", if is_italic { "normal" } else { "italic" }) },
-                        Italic { size: "15px", stroke: seg_icon(is_italic) }
-                    }
-                }
-            }
-        }
-        Ctrl::Color { clearable } => {
-            let mut color = use_signal(|| parse_hsv(&value));
-            rsx! {
-                div { style: "display:flex; flex-wrap:wrap; align-items:center; gap:6px; width:100%;",
-                    ColorPicker {
-                        color: color(),
-                        on_color_change: {
-                            let shared = shared.clone();
-                            let p = pointer.clone();
-                            move |c: Hsv<encoding::Srgb, f64>| {
-                                color.set(c);
-                                write_prop(&shared, &p, field.name, &hsv_to_hex(c));
-                            }
-                        },
-                    }
-                    input {
-                        r#type: "text",
-                        style: "{HEX_STYLE}",
-                        value: "{value}",
-                        oninput: {
-                            let shared = shared.clone();
-                            let p = pointer.clone();
-                            move |e: FormEvent| {
-                                let v = e.value();
-                                if v.trim_start_matches('#').len() >= 6 {
-                                    color.set(parse_hsv(&v));
-                                }
-                                write_prop(&shared, &p, field.name, &v);
-                            }
-                        },
-                    }
-                    if clearable {
-                        Button {
-                            variant: ButtonVariant::Outline,
-                            size: ButtonSize::IconSm,
-                            title: "Make transparent",
-                            onclick: {
-                                let shared = shared.clone();
-                                let p = pointer.clone();
-                                move |_| {
-                                    color.set(parse_hsv("#00000000"));
-                                    write_prop(&shared, &p, field.name, "#00000000");
-                                }
-                            },
-                            X { size: "13px", stroke: "var(--rm-text-muted)" }
-                        }
-                    }
-                }
-            }
-        }
-        Ctrl::Switch(on, off) => {
-            rsx! {
-                Switch {
-                    default_checked: value == on,
-                    on_checked_change: {
-                        let shared = shared.clone();
-                        let p = pointer.clone();
-                        move |checked: bool| write_prop(&shared, &p, field.name, if checked { on } else { off })
-                    },
-                }
-            }
-        }
-    };
-
-    rsx! {
-        div { style: "display:flex; align-items:center; gap:8px; min-height:26px;",
-            span {
-                style: "width:76px; flex:none; color:var(--rm-text-muted); font-size:11px;",
-                title: if is_default { "{field.label} — engine default (not set in the source)" } else { "{field.label}" },
-                "{field.label}"
-                if is_default {
-                    span { style: "margin-left:4px; color:var(--rm-text-muted); opacity:0.6;", "•" }
-                }
-            }
-            div { style: "flex:1; min-width:0; display:flex; justify-content:flex-end;", {control} }
-        }
-    }
-}
-
-// ── Object & number-list editors ─────────────────────────────────────────────
-
-/// Structured editor for object fields with known schema properties (stat
-/// `trend`, `stroke`, …): one indented sub-row per property through the same
-/// control factory. Sub-edits fold into the WHOLE object (typed) via the
-/// existing root-field write — optimistic + debounce for free. A pruned last
-/// key collapses to `Null` (field removed). Nested objects thread their
-/// writes through `custom_commit` (registry depth cap: 2).
-#[component]
-fn ObjectControl(
-    pointer: String,
-    name: String,
-    specs: Vec<crate::editor::properties::PropSpec>,
-    value: String,
-    #[props(default)] custom_commit: Option<Callback<serde_json::Value>>,
-) -> Element {
-    let shared = use_context::<Shared>();
-    // Local object state so successive sub-edits accumulate (the panel is
-    // memoized per selection and won't re-render between keystrokes).
-    let obj = use_signal(|| {
-        serde_json::from_str::<serde_json::Value>(&value).unwrap_or(serde_json::Value::Null)
-    });
-
-    let commit_whole = {
-        let shared = shared.clone();
-        let p = pointer.clone();
-        let n = name.clone();
-        move |whole: serde_json::Value| {
-            if let Some(cb) = &custom_commit {
-                cb.call(whole);
-            } else {
-                write_root_field(&shared, &p, &n, whole);
-            }
-        }
-    };
-
-    rsx! {
-        // Sub-rows are indented (10px padding + 2px border) and re-nest a
-        // 76px label + 8px gap: swatch sits at 98 + 12 + 84 = 194 from the
-        // panel's left → --picker-anchor-right: 300 − 194 + 8 = 114px.
-        div { style: "display:flex; flex-direction:column; gap:6px; width:100%; padding-left:10px; border-left:2px solid var(--rm-border-2); --picker-anchor-right:114px;",
-            for spec in specs {
-                GenericRow {
-                    key: "{pointer}-{name}-{spec.name}",
-                    pointer: pointer.clone(),
-                    name: spec.name.clone(),
-                    prop_kind: spec.kind.clone(),
-                    value: prop_str(&obj(), &spec.name),
-                    is_style: false,
-                    custom_commit: {
-                        let commit_whole = commit_whole.clone();
-                        let key = spec.name.clone();
-                        let mut obj = obj;
-                        Callback::new(move |sub: serde_json::Value| {
-                            let next = crate::editor::properties::mutate_object_field(
-                                &obj(),
-                                &key,
-                                sub,
-                            );
-                            obj.set(next.clone());
-                            commit_whole(next);
-                        })
-                    },
-                }
-            }
-        }
-    }
-}
-
-/// Generic per-entry list editor — the shared shell of ColorRows /
-/// NumberListControl / StringListControl (rule of three): one row per entry
-/// rendered by `render_item`, a remove button per row and an add button.
-/// The add decision is the pure `next_entries_on_add` (an empty list with a
-/// `prefill` gets seeded with it). Reordering: none.
-#[component]
-fn ListRows(
-    entries: Signal<Vec<String>>,
-    on_change: EventHandler<()>,
-    add_label: String,
-    add_value: String,
-    render_item: Callback<(usize, String), Element>,
-    #[props(default)] prefill: Option<&'static [&'static str]>,
-) -> Element {
-    rsx! {
-        div { style: "display:flex; flex-direction:column; gap:6px; width:100%;",
-            for (i, e) in entries().iter().cloned().enumerate() {
-                div { key: "{i}", style: "display:flex; flex-wrap:wrap; align-items:center; gap:6px;",
-                    {render_item.call((i, e))}
-                    Button {
-                        variant: ButtonVariant::Ghost,
-                        size: ButtonSize::IconSm,
-                        title: "Remove entry",
-                        onclick: {
-                            let mut entries = entries;
-                            move |_| {
-                                if entries.read().len() > i {
-                                    entries.write().remove(i);
-                                }
-                                on_change.call(());
-                            }
-                        },
-                        X { size: 13, stroke: "var(--rm-text-muted)" }
-                    }
-                }
-            }
-            Button {
-                variant: ButtonVariant::Outline,
-                size: ButtonSize::Xs,
-                onclick: {
-                    let mut entries = entries;
-                    let add_value = add_value.clone();
-                    move |_| {
-                        let next = next_entries_on_add(&entries.read(), &add_value, prefill);
-                        entries.set(next);
-                        on_change.call(());
-                    }
-                },
-                "{add_label}"
-            }
-        }
-    }
-}
-
-/// Per-entry editor for arrays of numbers (`sparkline_data`, dash patterns…):
-/// number input per entry via [`ListRows`]. Writes the whole array (typed)
-/// once every entry parses; an emptied list removes the field.
-#[component]
-fn NumberListControl(pointer: String, name: String, value: String) -> Element {
-    let shared = use_context::<Shared>();
-    let entries = use_signal(|| {
-        serde_json::from_str::<Vec<serde_json::Value>>(&value)
-            .map(|v| {
-                v.into_iter()
-                    .map(|n| display_number(&n.to_string()))
-                    .collect::<Vec<String>>()
-            })
-            .unwrap_or_default()
-    });
-
-    let write = {
-        let shared = shared.clone();
-        let p = pointer.clone();
-        let n = name.clone();
-        move |_| {
-            let parsed: Option<Vec<serde_json::Value>> = entries
-                .read()
-                .iter()
-                .map(|e| {
-                    parse_root_value(&PropKind::Float, e)
-                        .ok()
-                        .filter(|v| !v.is_null())
-                })
-                .collect();
-            if let Some(nums) = parsed {
-                let value = if nums.is_empty() {
-                    serde_json::Value::Null
-                } else {
-                    serde_json::Value::Array(nums)
-                };
-                write_root_field(&shared, &p, &n, value);
-            }
-        }
-    };
-
-    rsx! {
-        ListRows {
-            entries,
-            on_change: write.clone(),
-            add_label: "+ Add".to_string(),
-            add_value: "0".to_string(),
-            render_item: {
-                let write = write.clone();
-                Callback::new(move |(i, e): (usize, String)| {
-                    let mut entries = entries;
-                    let write = write.clone();
-                    rsx! {
-                        input {
-                            r#type: "number",
-                            step: "0.1",
-                            style: "{INPUT_STYLE}",
-                            value: "{e}",
-                            oninput: move |ev: FormEvent| {
-                                if let Some(slot) = entries.write().get_mut(i) {
-                                    *slot = ev.value();
-                                }
-                                write(());
-                            },
-                        }
-                    }
-                })
-            },
-        }
-    }
-}
-
-/// Per-entry editor for arrays of non-color strings (chart `axes` /
-/// `categories`…): text input per entry via [`ListRows`]. Writes the whole
-/// array; an emptied list removes the field.
-#[component]
-fn StringListControl(pointer: String, name: String, value: String) -> Element {
-    let shared = use_context::<Shared>();
-    let entries = use_signal(|| serde_json::from_str::<Vec<String>>(&value).unwrap_or_default());
-
-    let write = {
-        let shared = shared.clone();
-        let p = pointer.clone();
-        let n = name.clone();
-        move |_| {
-            let list: Vec<serde_json::Value> = entries
-                .read()
-                .iter()
-                .cloned()
-                .map(serde_json::Value::String)
-                .collect();
-            let value = if list.is_empty() {
-                serde_json::Value::Null
-            } else {
-                serde_json::Value::Array(list)
-            };
-            write_root_field(&shared, &p, &n, value);
-        }
-    };
-
-    rsx! {
-        ListRows {
-            entries,
-            on_change: write.clone(),
-            add_label: "+ Add".to_string(),
-            add_value: String::new(),
-            render_item: {
-                let write = write.clone();
-                Callback::new(move |(i, e): (usize, String)| {
-                    let mut entries = entries;
-                    let write = write.clone();
-                    rsx! {
-                        input {
-                            r#type: "text",
-                            style: "{INPUT_STYLE}",
-                            value: "{e}",
-                            oninput: move |ev: FormEvent| {
-                                if let Some(slot) = entries.write().get_mut(i) {
-                                    *slot = ev.value();
-                                }
-                                write(());
-                            },
-                        }
-                    }
-                })
-            },
-        }
-    }
-}
-
-// ── Color-list & fill editors ────────────────────────────────────────────────
-
-/// Editable list of color rows (swatch + hex per entry) on the generic
-/// [`ListRows`] shell. Operates on a shared signal so add/remove render
-/// immediately (the panel itself is memoized per selection). `on_add`
-/// overrides the add behavior (palette prefill). Reordering: none.
-#[component]
-fn ColorRows(
-    colors: Signal<Vec<String>>,
-    on_change: EventHandler<()>,
-    #[props(default)] prefill: Option<&'static [&'static str]>,
-) -> Element {
-    rsx! {
-        ListRows {
-            entries: colors,
-            on_change,
-            add_label: "+ Add color".to_string(),
-            add_value: "#ffffff".to_string(),
-            prefill,
-            render_item: Callback::new(move |(i, c): (usize, String)| {
-                let mut colors = colors;
-                rsx! {
-                    ColorPicker {
-                        color: parse_hsv(&c),
-                        on_color_change: move |hsv: Hsv<encoding::Srgb, f64>| {
-                            if let Some(slot) = colors.write().get_mut(i) {
-                                *slot = hsv_to_hex(hsv);
-                            }
-                            on_change.call(());
-                        },
-                    }
-                    input {
-                        r#type: "text",
-                        style: "{HEX_STYLE}",
-                        value: "{c}",
-                        oninput: move |e: FormEvent| {
-                            if let Some(slot) = colors.write().get_mut(i) {
-                                *slot = e.value();
-                            }
-                            on_change.call(());
-                        },
-                    }
-                }
-            }),
-        }
-    }
-}
-
-/// Control for [`PropKind::ColorList`] fields (gradient_text/chart `colors`):
-/// per-entry pickers writing the whole array (typed). For an EMPTY
-/// `chart.colors`, "+ Add color" prefills the engine's default palette so the
-/// user edits what the canvas renders (see `palette_prefill`).
-#[component]
-fn ColorListControl(
-    pointer: String,
-    name: String,
-    value: String,
-    #[props(default)] host_tag: String,
-) -> Element {
-    let shared = use_context::<Shared>();
-    let colors = use_signal(|| serde_json::from_str::<Vec<String>>(&value).unwrap_or_default());
-    let write = {
-        let shared = shared.clone();
-        let p = pointer.clone();
-        let n = name.clone();
-        move |_| {
-            let list: Vec<serde_json::Value> = colors
-                .read()
-                .iter()
-                .cloned()
-                .map(serde_json::Value::String)
-                .collect();
-            write_root_field(&shared, &p, &n, serde_json::Value::Array(list));
-        }
-    };
-
-    // Palette lookup is static per (tag, field); the pure add decision in
-    // ListRows gates on CURRENT emptiness at click time.
-    let prefill = palette_prefill(&host_tag, &name, true);
-    let is_empty = colors.read().is_empty();
-
-    rsx! {
-        if is_empty && prefill.is_some() {
-            div { style: "color:var(--rm-text-muted); font-size:10px; opacity:0.7;",
-                "engine palette — click + to edit"
-            }
-        }
-        ColorRows { colors, on_change: write.clone(), prefill }
-    }
-}
-
-/// Control for [`PropKind::Fill`] fields (shape `fill`): segmented
-/// Single | Linear | Radial, a single picker or a stop list + angle, writing
-/// the hex string or the gradient object.
-#[component]
-fn FillControl(pointer: String, name: String, value: String) -> Element {
-    let shared = use_context::<Shared>();
-    let parsed: serde_json::Value =
-        serde_json::from_str(&value).unwrap_or(serde_json::Value::String(value.clone()));
-    let (m0, c0, a0) = parse_fill(&parsed);
-    let mode = use_signal(|| m0);
-    let colors = use_signal(|| {
-        if c0.is_empty() {
-            vec!["#ffffff".to_string()]
-        } else {
-            c0
-        }
-    });
-    let angle = use_signal(|| a0);
-
-    let write = {
-        let shared = shared.clone();
-        let p = pointer.clone();
-        let n = name.clone();
-        Rc::new(move || {
-            write_root_field(
-                &shared,
-                &p,
-                &n,
-                fill_to_value(mode(), &colors.read(), angle()),
-            );
-        })
-    };
-
-    let seg = |m: FillMode, label: &'static str| {
-        let mut mode = mode;
-        let write = write.clone();
-        rsx! {
-            Button {
-                variant: if mode() == m { ButtonVariant::Primary } else { ButtonVariant::Ghost },
-                size: ButtonSize::Xs,
-                style: "flex:1;",
-                onclick: move |_| {
-                    mode.set(m);
-                    write();
-                },
-                "{label}"
-            }
-        }
-    };
-
-    rsx! {
-        div { style: "display:flex; flex-direction:column; gap:8px; width:100%;",
-            div { class: "rm-seg",
-                {seg(FillMode::Single, "Single")}
-                {seg(FillMode::Linear, "Linear")}
-                {seg(FillMode::Radial, "Radial")}
-            }
-            if mode() == FillMode::Single {
-                div { style: "display:flex; flex-wrap:wrap; align-items:center; gap:6px;",
-                    ColorPicker {
-                        color: parse_hsv(colors.read().first().map(String::as_str).unwrap_or("#ffffff")),
-                        on_color_change: {
-                            let mut colors = colors;
-                            let write = write.clone();
-                            move |hsv: Hsv<encoding::Srgb, f64>| {
-                                let hex = hsv_to_hex(hsv);
-                                if colors.read().is_empty() {
-                                    colors.write().push(hex);
-                                } else {
-                                    colors.write()[0] = hex;
-                                }
-                                write();
-                            }
-                        },
-                    }
-                    input {
-                        r#type: "text",
-                        style: "{HEX_STYLE}",
-                        value: "{colors.read().first().cloned().unwrap_or_default()}",
-                        oninput: {
-                            let mut colors = colors;
-                            let write = write.clone();
-                            move |e: FormEvent| {
-                                let v = e.value();
-                                if colors.read().is_empty() {
-                                    colors.write().push(v);
-                                } else {
-                                    colors.write()[0] = v;
-                                }
-                                write();
-                            }
-                        },
-                    }
-                }
-            } else {
-                ColorRows {
-                    colors,
-                    on_change: {
-                        let write = write.clone();
-                        move |_| write()
-                    },
-                }
-                if mode() == FillMode::Linear {
-                    div { style: "display:flex; align-items:center; gap:8px;",
-                        span { style: "color:var(--rm-text-muted); font-size:11px;", "Angle" }
-                        input {
-                            r#type: "number",
-                            style: "{NUM_STYLE}",
-                            value: "{angle}",
-                            oninput: {
-                                let mut angle = angle;
-                                let write = write.clone();
-                                move |e: FormEvent| {
-                                    if let Ok(v) = e.value().parse::<f64>() {
-                                        angle.set(v);
-                                        write();
-                                    }
-                                }
-                            },
-                        }
-                        span { style: "color:var(--rm-text-muted); font-size:10px;", "°" }
-                    }
-                }
-            }
-        }
-    }
-}
-
-// ── Color helpers ────────────────────────────────────────────────────────────
-
-fn parse_hsv(s: &str) -> Hsv<encoding::Srgb, f64> {
-    let hex = s.trim().trim_start_matches('#');
-    if hex.len() >= 6 {
-        if let (Ok(r), Ok(g), Ok(b)) = (
-            u8::from_str_radix(&hex[0..2], 16),
-            u8::from_str_radix(&hex[2..4], 16),
-            u8::from_str_radix(&hex[4..6], 16),
-        ) {
-            let srgb: Srgb<f64> = Srgb::new(r, g, b).into_format();
-            return srgb.into_color();
-        }
-    }
-    Hsv::new(0.0, 0.0, 0.0)
-}
-
-fn hsv_to_hex(c: Hsv<encoding::Srgb, f64>) -> String {
-    let srgb: Srgb<f64> = Srgb::from_color(c);
-    let b = srgb.into_format::<u8>();
-    format!("#{:02x}{:02x}{:02x}", b.red, b.green, b.blue)
-}
-
-// ── Persistence ──────────────────────────────────────────────────────────────
-
-/// Schedule a debounced disk write (~250 ms). Queues `mutation` onto the
-/// app-global pending list for `path` and (re)starts the timer, cancelling
-/// only the timer — not the queue — so a burst of edits inside the window
-/// accumulates every mutation instead of dropping all but the last.
-///
-/// When the timer fires it rebases the whole queue onto whatever is on disk
-/// at that moment, never a copy captured back when the edit happened, so a
-/// write from outside the process landing mid-window is preserved instead of
-/// being overwritten by a stale in-memory snapshot.
-///
-/// On success the model's `write_error` is cleared and the pre-write file
-/// state is pushed onto the undo history; on failure `write_error` is set to
-/// the error message and `generation` is bumped so the hot-reload loop picks
-/// it up and shows the topbar indicator. The pending window is surfaced as
-/// the "Saving…" indicator via the history slot. [`crate::scenario::undo`]
-/// and [`crate::scenario::redo`] drain the queue before touching the file, so
-/// an orphaned flush that still fires after a revert has nothing to replay.
-fn schedule_write(
-    debounce: &WriteDebounce,
-    shared: Shared,
-    path: std::path::PathBuf,
-    mutation: Mutation,
-) {
-    crate::scenario::queue_mutation(&crate::scenario::pending_write_slot(), &path, mutation);
-
-    {
-        let mut slot = debounce.0.borrow_mut();
-        if let Some(prev) = slot.take() {
-            prev.cancel();
-        }
-    }
-    crate::scenario::set_saving(&crate::scenario::history_slot(), true);
-
-    let debounce_slot = debounce.0.clone();
-    let task = spawn(async move {
-        tokio::time::sleep(std::time::Duration::from_millis(250)).await;
-        *debounce_slot.borrow_mut() = None;
-
-        let mutations =
-            crate::scenario::take_pending(&crate::scenario::pending_write_slot(), &path);
-        crate::scenario::set_saving(&crate::scenario::history_slot(), false);
-        if mutations.is_empty() {
-            return;
-        }
-
-        let is_html = rustmotion::loader::is_html_path(&path);
-        let read = std::fs::read_to_string(&path).map_err(|e| format!("read: {e}"));
-        let result: Result<bool, String> = match &read {
-            Ok(content) => match crate::scenario::resolve_flush(content, is_html, &mutations) {
-                Ok(Some(new_content)) => write_and_note(&path, &new_content).map(|()| true),
-                Ok(None) => Ok(false),
-                Err(e) => Err(e),
-            },
-            Err(e) => Err(e.clone()),
-        };
-        if let (Ok(true), Ok(snapshot)) = (&result, &read) {
-            crate::scenario::record_edit(&crate::scenario::history_slot(), &path, snapshot.clone());
-        }
-
-        let mut m = shared.lock().unwrap_or_else(|e| e.into_inner());
-        match result {
-            Ok(_) => m.write_error = None,
-            Err(e) => {
-                m.write_error = Some(e);
-                m.generation = m.generation.wrapping_add(1);
-            }
-        }
-    });
-
-    *debounce.0.borrow_mut() = Some(task);
-}
-
-/// Write scenario-file content and record it in the self-write ledger so the
-/// watcher skips the resulting event (the in-memory model is already ahead).
-fn write_and_note(path: &std::path::Path, content: &str) -> Result<(), String> {
-    std::fs::write(path, content).map_err(|e| format!("write: {e}"))?;
-    crate::scenario::note_self_write(&crate::scenario::self_write_slot(), path, content);
-    Ok(())
-}
-
-/// Apply an edit to the in-memory model immediately (canvas refreshes in ~one
-/// render) and nudge the hot-reload signal. Rebuild failures are transient
-/// (mid-typing) and silently keep the previous model — the disk write path
-/// has its own guards.
-fn optimistic(shared: &Shared, mutation: &Mutation) {
-    if apply_optimistic(shared, mutation).is_ok() {
-        if let Some(rev) = try_consume_context::<RevSignal>() {
-            let mut r = rev.0;
-            r.set(r() + 1);
-        }
-    }
-}
-
-/// Write a single style property back to the scenario file. Schedules a debounced
-/// write (~250 ms) so rapid slider drags and keystrokes coalesce into one flush.
-/// Empty values are ignored so clearing a field mid-edit doesn't collapse the
-/// element (generic controls route empties through [`write_style_removal`]
-/// instead). Write errors are stored in the model and surfaced in the topbar.
-fn write_prop(shared: &Shared, pointer: &str, prop: &str, value: &str) {
-    if value.trim().is_empty() {
-        return;
-    }
-    let mutation = Mutation::Style {
-        pointer: pointer.to_string(),
-        prop: prop.to_string(),
-        value: serde_json::Value::String(value.to_string()),
-    };
-    optimistic(shared, &mutation);
-    let path = {
-        let m = shared.lock().unwrap_or_else(|e| e.into_inner());
-        m.path.clone()
-    };
-    let Some(path) = path else {
-        return;
-    };
-    let debounce = consume_context::<WriteDebounce>();
-    schedule_write(&debounce, shared.clone(), path, mutation);
-}
-
-/// Typed write of a component root field (schema-driven Properties section).
-/// `Value::Null` removes the field (JSON) / the attribute (HTML). Debounced
-/// with the same guarantees as [`write_prop`].
-fn write_root_field(shared: &Shared, pointer: &str, field: &str, value: serde_json::Value) {
-    let mutation = Mutation::Field {
-        pointer: pointer.to_string(),
-        field: field.to_string(),
-        value,
-    };
-    optimistic(shared, &mutation);
-    let path = {
-        let m = shared.lock().unwrap_or_else(|e| e.into_inner());
-        m.path.clone()
-    };
-    let Some(path) = path else {
-        return;
-    };
-    let debounce = consume_context::<WriteDebounce>();
-    schedule_write(&debounce, shared.clone(), path, mutation);
-}
-
-/// Remove one style property (an emptied generic control unsets the key /
-/// declaration rather than writing an empty string). Debounced.
-fn write_style_removal(shared: &Shared, pointer: &str, prop: &str) {
-    let mutation = Mutation::Style {
-        pointer: pointer.to_string(),
-        prop: prop.to_string(),
-        value: serde_json::Value::Null,
-    };
-    optimistic(shared, &mutation);
-    let path = {
-        let m = shared.lock().unwrap_or_else(|e| e.into_inner());
-        m.path.clone()
-    };
-    let Some(path) = path else {
-        return;
-    };
-    let debounce = consume_context::<WriteDebounce>();
-    schedule_write(&debounce, shared.clone(), path, mutation);
-}
-
-/// Write the element's text `content` back to the scenario file. Unlike
-/// [`write_prop`], an empty value is allowed (clearing the text is valid).
-/// Schedules a debounced write (~250 ms); errors are surfaced in the topbar.
-fn write_content(shared: &Shared, pointer: &str, text: &str) {
-    let mutation = Mutation::Field {
-        pointer: pointer.to_string(),
-        field: "content".to_string(),
-        value: serde_json::Value::String(text.to_string()),
-    };
-    optimistic(shared, &mutation);
-    let path = {
-        let m = shared.lock().unwrap_or_else(|e| e.into_inner());
-        m.path.clone()
-    };
-    let Some(path) = path else {
-        return;
-    };
-    let debounce = consume_context::<WriteDebounce>();
-    schedule_write(&debounce, shared.clone(), path, mutation);
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn text_family_shows_content_before_properties() {
-        assert!(content_before_properties("text"));
-        assert!(content_before_properties("caption"));
-        // Non-text components keep the current order (no content editor).
-        assert!(!content_before_properties("gauge"));
-        assert!(!content_before_properties("card"));
-    }
-}
diff --git a/crates/rustmotion-studio/src/editor/inspector/controls.rs b/crates/rustmotion-studio/src/editor/inspector/controls.rs
new file mode 100644
index 00000000..71a887e9
--- /dev/null
+++ b/crates/rustmotion-studio/src/editor/inspector/controls.rs
@@ -0,0 +1,1187 @@
+use gpui_component::button::{Button, ButtonVariants as _};
+use gpui_component::color_picker::{ColorPicker, ColorPickerEvent, ColorPickerState};
+use gpui_component::input::{Input, InputEvent, InputState, Textarea, TextareaState};
+pub use gpui_component::select::SearchableVec;
+use gpui_component::select::{Select, SelectEvent, SelectState};
+use gpui_component::slider::{Slider, SliderEvent, SliderState};
+use gpui_component::switch::Switch;
+use gpui_component::{h_flex, v_flex, ActiveTheme, Sizable as _};
+use gpui_kit::prelude::FluentBuilder as _;
+use gpui_kit::{
+    div, px, AppContext as _, Context, Entity, Hsla, IntoElement, ParentElement, Rgba,
+    SharedString, Styled, Window,
+};
+
+use crate::editor::properties::{FillMode, PropKind, PropSpec};
+
+use super::sections::{fmt_num, fmt_unit, parse_num};
+use super::write::Target;
+use super::InspectorPanel;
+
+use std::sync::atomic::{AtomicU64, Ordering};
+
+pub fn apply_open_change(current: Option<u64>, id: u64, open: bool) -> Option<u64> {
+    if open {
+        Some(id)
+    } else if current == Some(id) {
+        None
+    } else {
+        current
+    }
+}
+
+pub fn next_picker_id() -> u64 {
+    static NEXT: AtomicU64 = AtomicU64::new(1);
+    NEXT.fetch_add(1, Ordering::Relaxed)
+}
+
+pub fn parse_hex(value: &str) -> Option<Hsla> {
+    let value = value.trim();
+    let value = value.strip_prefix('#').unwrap_or(value);
+    if value.is_empty() || !value.bytes().all(|b| b.is_ascii_hexdigit()) {
+        return None;
+    }
+    let (width, has_alpha) = match value.len() {
+        3 => (1, false),
+        4 => (1, true),
+        6 => (2, false),
+        8 => (2, true),
+        _ => return None,
+    };
+    let component = |index: usize| -> Option<f32> {
+        let start = index * width;
+        let raw = u8::from_str_radix(&value[start..start + width], 16).ok()?;
+        let raw = if width == 1 { raw * 0x11 } else { raw };
+        Some(raw as f32 / 255.0)
+    };
+    Some(
+        Rgba {
+            r: component(0)?,
+            g: component(1)?,
+            b: component(2)?,
+            a: if has_alpha { component(3)? } else { 1.0 },
+        }
+        .into(),
+    )
+}
+
+pub fn hex_string(color: Hsla) -> String {
+    let rgba = Rgba::from(color);
+    let channel = |v: f32| (v * 255.0).round().clamp(0.0, 255.0) as u32;
+    if rgba.a < 1.0 {
+        format!(
+            "#{:02x}{:02x}{:02x}{:02x}",
+            channel(rgba.r),
+            channel(rgba.g),
+            channel(rgba.b),
+            channel(rgba.a)
+        )
+    } else {
+        format!(
+            "#{:02x}{:02x}{:02x}",
+            channel(rgba.r),
+            channel(rgba.g),
+            channel(rgba.b)
+        )
+    }
+}
+
+#[allow(dead_code)]
+pub struct ColorWidget {
+    pub picker: Entity<ColorPickerState>,
+    pub hex: Entity<InputState>,
+    pub id: u64,
+}
+
+#[allow(dead_code)]
+pub enum ScalarWidget {
+    Switch {
+        checked: bool,
+        target: Target,
+    },
+    Select(Entity<SelectState<SearchableVec<SharedString>>>),
+    Color(ColorWidget),
+    SliderNum {
+        slider: Entity<SliderState>,
+        text: Entity<InputState>,
+        unit: &'static str,
+        step: f64,
+    },
+    Number(Entity<InputState>),
+    Multiline {
+        state: Entity<TextareaState>,
+        monospace: bool,
+    },
+    Text(Entity<InputState>),
+    Json(Entity<TextareaState>),
+}
+
+pub enum RowWidget {
+    Scalar(ScalarWidget),
+    ColorList(Vec<ColorWidget>),
+    Fill {
+        mode: FillMode,
+        colors: Vec<ColorWidget>,
+        angle: Entity<InputState>,
+    },
+    Object(Vec<(String, PropKind, ScalarWidget)>),
+    NumberList(Vec<Entity<InputState>>),
+    StringList(Vec<Entity<InputState>>),
+}
+
+pub struct Row {
+    pub key: String,
+    pub label: String,
+    pub is_default: bool,
+    pub widget: RowWidget,
+    pub prefill: Option<&'static [&'static str]>,
+}
+
+impl InspectorPanel {
+    pub(super) fn build_text(
+        &mut self,
+        value: &str,
+        placeholder: Option<&'static str>,
+        target: Target,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Entity<InputState> {
+        let state = cx.new(|cx| {
+            let mut s = InputState::new(window, cx);
+            if let Some(ph) = placeholder {
+                s = s.placeholder(ph);
+            }
+            s.set_value(value, window, cx);
+            s
+        });
+        let target_for_sub = target.clone();
+        self.subscriptions.push(cx.subscribe_in(
+            &state,
+            window,
+            move |this, input, event: &InputEvent, window, cx| {
+                if let InputEvent::Change = event {
+                    let text = input.read(cx).value().to_string();
+                    this.commit_text(&target_for_sub, &text, window, cx);
+                }
+            },
+        ));
+        state
+    }
+
+    pub(super) fn build_multiline(
+        &mut self,
+        value: &str,
+        target: Target,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Entity<TextareaState> {
+        let state = cx.new(|cx| {
+            let mut s = TextareaState::new(window, cx).auto_grow(3, 12);
+            s.set_value(value, window, cx);
+            s
+        });
+        let target_for_sub = target.clone();
+        self.subscriptions.push(cx.subscribe_in(
+            &state,
+            window,
+            move |this, input, event: &InputEvent, window, cx| {
+                if let InputEvent::Change = event {
+                    let text = input.read(cx).value().to_string();
+                    this.commit_text(&target_for_sub, &text, window, cx);
+                }
+            },
+        ));
+        state
+    }
+
+    pub(super) fn build_json(
+        &mut self,
+        value: &str,
+        target: Target,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Entity<TextareaState> {
+        let state = cx.new(|cx| {
+            let mut s = TextareaState::new(window, cx).auto_grow(2, 10);
+            s.set_value(value, window, cx);
+            s
+        });
+        let target_for_sub = target.clone();
+        self.subscriptions.push(cx.subscribe_in(
+            &state,
+            window,
+            move |this, input, event: &InputEvent, window, cx| {
+                if let InputEvent::Blur = event {
+                    let text = input.read(cx).value().to_string();
+                    let trimmed = text.trim();
+                    if trimmed.is_empty()
+                        || serde_json::from_str::<serde_json::Value>(trimmed).is_ok()
+                    {
+                        this.commit_text(&target_for_sub, trimmed, window, cx);
+                    }
+                }
+            },
+        ));
+        state
+    }
+
+    pub(super) fn build_slider(
+        &mut self,
+        value: &str,
+        min: f64,
+        max: f64,
+        step: f64,
+        unit: &'static str,
+        target: Target,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> (Entity<SliderState>, Entity<InputState>) {
+        let start = parse_num(value).unwrap_or(min).clamp(min, max);
+        let slider = cx.new(|_| {
+            SliderState::new()
+                .min(min as f32)
+                .max(max as f32)
+                .step(step as f32)
+                .default_value(start as f32)
+        });
+        let text = cx.new(|cx| {
+            let mut s = InputState::new(window, cx);
+            s.set_value(fmt_num(start, step), window, cx);
+            s
+        });
+
+        let slider_target = target.clone();
+        let slider_text = text.clone();
+        self.subscriptions.push(cx.subscribe_in(
+            &slider,
+            window,
+            move |this, slider, event: &SliderEvent, window, cx| {
+                let SliderEvent::Change(v) = event else {
+                    return;
+                };
+                let v = v.start() as f64;
+                slider_text.update(cx, |s, cx| {
+                    s.set_value(fmt_num(v, step), window, cx);
+                });
+                let _ = slider;
+                this.commit_text(&slider_target, &fmt_unit(v, step, unit), window, cx);
+            },
+        ));
+
+        let text_target = target;
+        let text_slider = slider.clone();
+        self.subscriptions.push(cx.subscribe_in(
+            &text,
+            window,
+            move |this, input, event: &InputEvent, window, cx| {
+                if let InputEvent::Change = event {
+                    let raw = input.read(cx).value().to_string();
+                    if let Some(v) = parse_num(&raw) {
+                        text_slider.update(cx, |s, cx| {
+                            s.set_value(v.clamp(min, max) as f32, window, cx);
+                        });
+                        this.commit_text(&text_target, &fmt_unit(v, step, unit), window, cx);
+                    } else {
+                        this.commit_text(&text_target, &raw, window, cx);
+                    }
+                }
+            },
+        ));
+
+        (slider, text)
+    }
+
+    fn new_color_widget(
+        &mut self,
+        value: &str,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> ColorWidget {
+        let id = next_picker_id();
+        let initial = parse_hex(value).unwrap_or(gpui_kit::hsla(0.0, 0.0, 0.0, 0.0));
+        let picker = cx.new(|cx| ColorPickerState::new(window, cx).default_value(initial));
+        let hex = cx.new(|cx| {
+            let mut s = InputState::new(window, cx);
+            s.set_value(value, window, cx);
+            s
+        });
+        self.color_pickers.push((id, picker.clone()));
+
+        self.subscriptions.push(cx.observe_in(
+            &picker,
+            window,
+            move |this, picker_handle, _window, cx| {
+                let open = picker_handle.read(cx).is_open();
+                let next = apply_open_change(this.open_picker, id, open);
+                if next != this.open_picker {
+                    this.open_picker = next;
+                    let others: Vec<_> = this
+                        .color_pickers
+                        .iter()
+                        .filter(|(pid, _)| *pid != id)
+                        .map(|(_, p)| p.clone())
+                        .collect();
+                    for other in others {
+                        other.update(cx, |s, cx| s.set_open(false, cx));
+                    }
+                    cx.notify();
+                }
+            },
+        ));
+
+        ColorWidget { picker, hex, id }
+    }
+
+    pub(super) fn build_color(
+        &mut self,
+        value: &str,
+        target: Target,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> ColorWidget {
+        let widget = self.new_color_widget(value, window, cx);
+
+        let picker_target = target.clone();
+        let picker_hex = widget.hex.clone();
+        self.subscriptions.push(cx.subscribe_in(
+            &widget.picker,
+            window,
+            move |this, _picker, event: &ColorPickerEvent, window, cx| {
+                let ColorPickerEvent::Change(Some(color)) = event else {
+                    return;
+                };
+                let text = hex_string(*color);
+                picker_hex.update(cx, |s, cx| s.set_value(text.clone(), window, cx));
+                this.commit_text(&picker_target, &text, window, cx);
+            },
+        ));
+
+        let hex_target = target;
+        let hex_picker = widget.picker.clone();
+        self.subscriptions.push(cx.subscribe_in(
+            &widget.hex,
+            window,
+            move |this, input, event: &InputEvent, window, cx| {
+                if let InputEvent::Change = event {
+                    let text = input.read(cx).value().to_string();
+                    if let Some(color) = parse_hex(&text) {
+                        hex_picker.update(cx, |s, cx| s.set_value(color, window, cx));
+                    }
+                    this.commit_text(&hex_target, &text, window, cx);
+                }
+            },
+        ));
+
+        widget
+    }
+
+    pub(super) fn build_color_list_entry(
+        &mut self,
+        value: &str,
+        field: String,
+        siblings: std::rc::Rc<std::cell::RefCell<Vec<Entity<InputState>>>>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> ColorWidget {
+        let widget = self.new_color_widget(value, window, cx);
+        siblings.borrow_mut().push(widget.hex.clone());
+
+        let commit_all = {
+            let field = field.clone();
+            let siblings = siblings.clone();
+            move |this: &mut Self, window: &mut Window, cx: &mut Context<Self>| {
+                let colors: Vec<serde_json::Value> = siblings
+                    .borrow()
+                    .iter()
+                    .map(|e| serde_json::Value::String(e.read(cx).value().to_string()))
+                    .collect();
+                let value = if colors.is_empty() {
+                    serde_json::Value::Null
+                } else {
+                    serde_json::Value::Array(colors)
+                };
+                this.write_root_field(&field, value, window, cx);
+            }
+        };
+
+        let picker_hex = widget.hex.clone();
+        let picker_commit = commit_all.clone();
+        self.subscriptions.push(cx.subscribe_in(
+            &widget.picker,
+            window,
+            move |this, _picker, event: &ColorPickerEvent, window, cx| {
+                let ColorPickerEvent::Change(Some(color)) = event else {
+                    return;
+                };
+                picker_hex.update(cx, |s, cx| s.set_value(hex_string(*color), window, cx));
+                picker_commit(this, window, cx);
+            },
+        ));
+
+        let hex_picker = widget.picker.clone();
+        self.subscriptions.push(cx.subscribe_in(
+            &widget.hex,
+            window,
+            move |this, input, event: &InputEvent, window, cx| {
+                if let InputEvent::Change = event {
+                    let text = input.read(cx).value().to_string();
+                    if let Some(color) = parse_hex(&text) {
+                        hex_picker.update(cx, |s, cx| s.set_value(color, window, cx));
+                    }
+                    commit_all(this, window, cx);
+                }
+            },
+        ));
+
+        widget
+    }
+
+    pub(super) fn build_select(
+        &mut self,
+        options: Vec<String>,
+        value: &str,
+        target: Target,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Entity<SelectState<SearchableVec<SharedString>>> {
+        let mut items: Vec<SharedString> = options.into_iter().map(SharedString::from).collect();
+        if !value.is_empty() && !items.iter().any(|o| o.as_ref() == value) {
+            items.insert(0, SharedString::from(value.to_string()));
+        }
+        let selected_index = items
+            .iter()
+            .position(|o| o.as_ref() == value)
+            .map(gpui_component::IndexPath::new);
+        let delegate = SearchableVec::new(items);
+        let state = cx.new(|cx| SelectState::new(delegate, selected_index, window, cx));
+
+        let select_target = target;
+        self.subscriptions.push(cx.subscribe_in(
+            &state,
+            window,
+            move |this, _select, event: &SelectEvent<SearchableVec<SharedString>>, window, cx| {
+                let SelectEvent::Confirm(Some(value)) = event else {
+                    return;
+                };
+                this.commit_text(&select_target, value.as_ref(), window, cx);
+            },
+        ));
+        state
+    }
+
+    pub(super) fn build_scalar(
+        &mut self,
+        kind: &PropKind,
+        value: &str,
+        target: Target,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> ScalarWidget {
+        match kind {
+            PropKind::Bool => ScalarWidget::Switch {
+                checked: value == "true",
+                target,
+            },
+            PropKind::Enum(variants) => {
+                ScalarWidget::Select(self.build_select(variants.clone(), value, target, window, cx))
+            }
+            PropKind::Color => ScalarWidget::Color(self.build_color(value, target, window, cx)),
+            PropKind::Float => {
+                if let Some((min, max, step)) =
+                    crate::editor::properties::slider_range(row_prop_name(&target))
+                {
+                    let (slider, text) =
+                        self.build_slider(value, min, max, step, "", target, window, cx);
+                    ScalarWidget::SliderNum {
+                        slider,
+                        text,
+                        unit: "",
+                        step,
+                    }
+                } else {
+                    ScalarWidget::Number(self.build_text(value, None, target, window, cx))
+                }
+            }
+            PropKind::Integer => {
+                ScalarWidget::Number(self.build_text(value, None, target, window, cx))
+            }
+            PropKind::String
+                if crate::editor::properties::is_multiline(row_prop_name(&target), value) =>
+            {
+                let monospace = row_prop_name(&target) == "code";
+                let state = self.build_multiline(value, target, window, cx);
+                ScalarWidget::Multiline { state, monospace }
+            }
+            PropKind::Unit | PropKind::String => {
+                let placeholder =
+                    crate::editor::properties::engine_placeholder(row_prop_name(&target));
+                ScalarWidget::Text(self.build_text(value, placeholder, target, window, cx))
+            }
+            _ => ScalarWidget::Json(self.build_json(value, target, window, cx)),
+        }
+    }
+}
+
+impl InspectorPanel {
+    pub(super) fn build_number_list(
+        &mut self,
+        name: &str,
+        values: &[f64],
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Vec<Entity<InputState>> {
+        let entities: Vec<Entity<InputState>> = values
+            .iter()
+            .map(|v| {
+                cx.new(|cx| {
+                    let mut s = InputState::new(window, cx);
+                    s.set_value(fmt_num(*v, 0.01), window, cx);
+                    s
+                })
+            })
+            .collect();
+        for entity in &entities {
+            let siblings = entities.clone();
+            let field = name.to_string();
+            self.subscriptions.push(cx.subscribe_in(
+                entity,
+                window,
+                move |this, _input, event: &InputEvent, window, cx| {
+                    if let InputEvent::Change = event {
+                        let nums: Option<Vec<serde_json::Value>> = siblings
+                            .iter()
+                            .map(|e| {
+                                let text = e.read(cx).value().to_string();
+                                super::write::parse_root_value(&PropKind::Float, &text)
+                                    .ok()
+                                    .filter(|v| !v.is_null())
+                            })
+                            .collect();
+                        if let Some(nums) = nums {
+                            let value = if nums.is_empty() {
+                                serde_json::Value::Null
+                            } else {
+                                serde_json::Value::Array(nums)
+                            };
+                            this.write_root_field(&field, value, window, cx);
+                        }
+                    }
+                },
+            ));
+        }
+        entities
+    }
+
+    pub(super) fn build_string_list(
+        &mut self,
+        name: &str,
+        values: &[String],
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Vec<Entity<InputState>> {
+        let entities: Vec<Entity<InputState>> = values
+            .iter()
+            .map(|v| {
+                cx.new(|cx| {
+                    let mut s = InputState::new(window, cx);
+                    s.set_value(v.clone(), window, cx);
+                    s
+                })
+            })
+            .collect();
+        for entity in &entities {
+            let siblings = entities.clone();
+            let field = name.to_string();
+            self.subscriptions.push(cx.subscribe_in(
+                entity,
+                window,
+                move |this, _input, event: &InputEvent, window, cx| {
+                    if let InputEvent::Change = event {
+                        let strings: Vec<serde_json::Value> = siblings
+                            .iter()
+                            .map(|e| serde_json::Value::String(e.read(cx).value().to_string()))
+                            .collect();
+                        let value = if strings.is_empty() {
+                            serde_json::Value::Null
+                        } else {
+                            serde_json::Value::Array(strings)
+                        };
+                        this.write_root_field(&field, value, window, cx);
+                    }
+                },
+            ));
+        }
+        entities
+    }
+
+    pub(super) fn build_color_list(
+        &mut self,
+        field: &str,
+        colors: &[String],
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Vec<ColorWidget> {
+        let siblings = std::rc::Rc::new(std::cell::RefCell::new(Vec::new()));
+        colors
+            .iter()
+            .map(|c| {
+                self.build_color_list_entry(c, field.to_string(), siblings.clone(), window, cx)
+            })
+            .collect()
+    }
+
+    pub(super) fn build_object_row(
+        &mut self,
+        root_name: &str,
+        specs: &[PropSpec],
+        object_value: &serde_json::Value,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Vec<(String, PropKind, ScalarWidget)> {
+        specs
+            .iter()
+            .map(|spec| {
+                let value = super::sections::prop_str(object_value, &spec.name);
+                let target =
+                    Target::Nested(root_name.to_string(), spec.name.clone(), spec.kind.clone());
+                let widget = self.build_scalar(&spec.kind, &value, target, window, cx);
+                (spec.name.clone(), spec.kind.clone(), widget)
+            })
+            .collect()
+    }
+
+    pub(super) fn build_fill_row(
+        &mut self,
+        field: &str,
+        mode: FillMode,
+        colors: &[String],
+        angle: f64,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> RowWidget {
+        let color_siblings = std::rc::Rc::new(std::cell::RefCell::new(Vec::new()));
+        let angle_state = cx.new(|cx| {
+            let mut s = InputState::new(window, cx);
+            s.set_value(fmt_num(angle, 1.0), window, cx);
+            s
+        });
+
+        let commit_fill = {
+            let field = field.to_string();
+            let color_siblings = color_siblings.clone();
+            let angle_state = angle_state.clone();
+            move |this: &mut Self, window: &mut Window, cx: &mut Context<Self>| {
+                let colors: Vec<String> = color_siblings
+                    .borrow()
+                    .iter()
+                    .map(|e: &Entity<InputState>| e.read(cx).value().to_string())
+                    .collect();
+                let angle_text = angle_state.read(cx).value().to_string();
+                let angle = parse_num(&angle_text).unwrap_or(0.0);
+                let value = crate::editor::properties::fill_to_value(mode, &colors, angle);
+                this.write_root_field(&field, value, window, cx);
+            }
+        };
+
+        let colors_widgets: Vec<ColorWidget> = colors
+            .iter()
+            .map(|c| {
+                let widget = self.new_color_widget(c, window, cx);
+                color_siblings.borrow_mut().push(widget.hex.clone());
+
+                let picker_hex = widget.hex.clone();
+                let picker_commit = commit_fill.clone();
+                self.subscriptions.push(cx.subscribe_in(
+                    &widget.picker,
+                    window,
+                    move |this, _picker, event: &ColorPickerEvent, window, cx| {
+                        let ColorPickerEvent::Change(Some(color)) = event else {
+                            return;
+                        };
+                        picker_hex.update(cx, |s, cx| s.set_value(hex_string(*color), window, cx));
+                        picker_commit(this, window, cx);
+                    },
+                ));
+                let hex_picker = widget.picker.clone();
+                let hex_commit = commit_fill.clone();
+                self.subscriptions.push(cx.subscribe_in(
+                    &widget.hex,
+                    window,
+                    move |this, input, event: &InputEvent, window, cx| {
+                        if let InputEvent::Change = event {
+                            let text = input.read(cx).value().to_string();
+                            if let Some(color) = parse_hex(&text) {
+                                hex_picker.update(cx, |s, cx| s.set_value(color, window, cx));
+                            }
+                            hex_commit(this, window, cx);
+                        }
+                    },
+                ));
+                widget
+            })
+            .collect();
+
+        let angle_commit = commit_fill;
+        self.subscriptions.push(cx.subscribe_in(
+            &angle_state,
+            window,
+            move |this, _input, event: &InputEvent, window, cx| {
+                if let InputEvent::Change = event {
+                    angle_commit(this, window, cx);
+                }
+            },
+        ));
+
+        RowWidget::Fill {
+            mode,
+            colors: colors_widgets,
+            angle: angle_state,
+        }
+    }
+
+    fn current_value(&self, field: &str) -> serde_json::Value {
+        let Some(pointer) = self.selection.as_ref().map(|s| s.pointer.clone()) else {
+            return serde_json::Value::Null;
+        };
+        let m = self.shared.lock().unwrap_or_else(|e| e.into_inner());
+        m.raw
+            .pointer(&pointer)
+            .and_then(|el| el.get(field))
+            .cloned()
+            .unwrap_or(serde_json::Value::Null)
+    }
+
+    fn current_array(&self, field: &str) -> Vec<serde_json::Value> {
+        self.current_value(field)
+            .as_array()
+            .cloned()
+            .unwrap_or_default()
+    }
+
+    pub(super) fn list_add(
+        &mut self,
+        field: &str,
+        add_value: serde_json::Value,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let mut current = self.current_array(field);
+        current.push(add_value);
+        self.write_root_field(field, serde_json::Value::Array(current), window, cx);
+        self.force_rebuild = true;
+        cx.notify();
+    }
+
+    pub(super) fn color_list_add(
+        &mut self,
+        field: &str,
+        prefill: Option<&'static [&'static str]>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let current: Vec<String> = self
+            .current_array(field)
+            .into_iter()
+            .filter_map(|v| v.as_str().map(str::to_string))
+            .collect();
+        let next = crate::editor::properties::next_entries_on_add(&current, "#ffffff", prefill);
+        let value: Vec<serde_json::Value> =
+            next.into_iter().map(serde_json::Value::String).collect();
+        self.write_root_field(field, serde_json::Value::Array(value), window, cx);
+        self.force_rebuild = true;
+        cx.notify();
+    }
+
+    pub(super) fn list_remove(
+        &mut self,
+        field: &str,
+        index: usize,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let mut current = self.current_array(field);
+        if index < current.len() {
+            current.remove(index);
+        }
+        let value = if current.is_empty() {
+            serde_json::Value::Null
+        } else {
+            serde_json::Value::Array(current)
+        };
+        self.write_root_field(field, value, window, cx);
+        self.force_rebuild = true;
+        cx.notify();
+    }
+
+    pub(super) fn fill_set_mode(
+        &mut self,
+        field: &str,
+        mode: FillMode,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let raw = self.current_value(field);
+        let (_, mut colors, angle) = crate::editor::properties::parse_fill(&raw);
+        if colors.is_empty() {
+            colors.push("#ffffff".to_string());
+        }
+        let value = crate::editor::properties::fill_to_value(mode, &colors, angle);
+        self.write_root_field(field, value, window, cx);
+        self.force_rebuild = true;
+        cx.notify();
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    pub(super) fn build_property_row(
+        &mut self,
+        spec: &PropSpec,
+        raw_value: &serde_json::Value,
+        display_value: String,
+        is_default: bool,
+        is_style: bool,
+        host_tag: &str,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Row {
+        let value_str = display_value;
+        let prefill = crate::editor::properties::palette_prefill(host_tag, &spec.name, true);
+        let widget = match &spec.kind {
+            PropKind::ColorList => {
+                let colors: Vec<String> = raw_value
+                    .get(&spec.name)
+                    .and_then(|v| v.as_array())
+                    .map(|a| {
+                        a.iter()
+                            .filter_map(|c| c.as_str().map(str::to_string))
+                            .collect()
+                    })
+                    .unwrap_or_default();
+                RowWidget::ColorList(self.build_color_list(&spec.name, &colors, window, cx))
+            }
+            PropKind::Fill if !is_style => {
+                let raw = raw_value
+                    .get(&spec.name)
+                    .cloned()
+                    .unwrap_or(serde_json::Value::Null);
+                let (mode, colors, angle) = crate::editor::properties::parse_fill(&raw);
+                let colors = if colors.is_empty() {
+                    vec!["#ffffff".to_string()]
+                } else {
+                    colors
+                };
+                self.build_fill_row(&spec.name, mode, &colors, angle, window, cx)
+            }
+            PropKind::Object(specs) if !is_style => {
+                let object_value = raw_value
+                    .get(&spec.name)
+                    .cloned()
+                    .unwrap_or(serde_json::Value::Null);
+                RowWidget::Object(self.build_object_row(
+                    &spec.name,
+                    specs,
+                    &object_value,
+                    window,
+                    cx,
+                ))
+            }
+            PropKind::NumberList if !is_style => {
+                let nums: Vec<f64> = raw_value
+                    .get(&spec.name)
+                    .and_then(|v| v.as_array())
+                    .map(|a| a.iter().filter_map(|n| n.as_f64()).collect())
+                    .unwrap_or_default();
+                RowWidget::NumberList(self.build_number_list(&spec.name, &nums, window, cx))
+            }
+            PropKind::StringList if !is_style => {
+                let strings: Vec<String> = raw_value
+                    .get(&spec.name)
+                    .and_then(|v| v.as_array())
+                    .map(|a| {
+                        a.iter()
+                            .filter_map(|s| s.as_str().map(str::to_string))
+                            .collect()
+                    })
+                    .unwrap_or_default();
+                RowWidget::StringList(self.build_string_list(&spec.name, &strings, window, cx))
+            }
+            kind => {
+                let target = if is_style {
+                    Target::Style(spec.name.clone())
+                } else {
+                    Target::Root(spec.name.clone(), kind.clone())
+                };
+                RowWidget::Scalar(self.build_scalar(kind, &value_str, target, window, cx))
+            }
+        };
+        Row {
+            key: spec.name.clone(),
+            label: spec.name.clone(),
+            is_default,
+            widget,
+            prefill,
+        }
+    }
+}
+
+fn row_prop_name(target: &Target) -> &str {
+    match target {
+        Target::Style(n) => n,
+        Target::Root(n, _) => n,
+        Target::Nested(_, n, _) => n,
+    }
+}
+
+pub(super) fn render_scalar(
+    widget: &ScalarWidget,
+    cx: &Context<InspectorPanel>,
+) -> gpui_kit::AnyElement {
+    match widget {
+        ScalarWidget::Switch { checked, target } => {
+            let id = SharedString::from(format!("switch-{}", row_prop_name(target)));
+            let target = target.clone();
+            Switch::new(id)
+                .checked(*checked)
+                .on_change(cx.listener(move |this, checked: &bool, window, cx| {
+                    this.commit_text(&target, if *checked { "true" } else { "false" }, window, cx);
+                }))
+                .into_any_element()
+        }
+        ScalarWidget::Select(state) => Select::new(state).w_full().into_any_element(),
+        ScalarWidget::Color(c) => render_color_widget(c),
+        ScalarWidget::SliderNum { slider, text, .. } => h_flex()
+            .gap_2()
+            .items_center()
+            .w_full()
+            .child(div().flex_1().child(Slider::new(slider)))
+            .child(div().flex_none().w(px(52.)).child(Input::new(text).small()))
+            .into_any_element(),
+        ScalarWidget::Number(state) => Input::new(state).small().into_any_element(),
+        ScalarWidget::Multiline { state, monospace } => {
+            let area = Textarea::new(state);
+            if *monospace {
+                area.font_family("monospace").into_any_element()
+            } else {
+                area.into_any_element()
+            }
+        }
+        ScalarWidget::Text(state) => Input::new(state).small().into_any_element(),
+        ScalarWidget::Json(state) => Textarea::new(state).into_any_element(),
+    }
+}
+
+fn render_color_widget(c: &ColorWidget) -> gpui_kit::AnyElement {
+    h_flex()
+        .gap_2()
+        .items_center()
+        .w_full()
+        .child(ColorPicker::new(&c.picker))
+        .child(div().flex_1().child(Input::new(&c.hex).small()))
+        .into_any_element()
+}
+
+fn remove_button(
+    id: SharedString,
+    field: String,
+    index: usize,
+    cx: &Context<InspectorPanel>,
+) -> impl IntoElement {
+    Button::new(id)
+        .icon(gpui_component::IconName::Delete)
+        .ghost()
+        .xsmall()
+        .on_click(cx.listener(move |this, _, window, cx| {
+            this.list_remove(&field, index, window, cx);
+        }))
+}
+
+pub(super) fn render_row_widget(
+    field: &str,
+    widget: &RowWidget,
+    prefill: Option<&'static [&'static str]>,
+    cx: &Context<InspectorPanel>,
+) -> gpui_kit::AnyElement {
+    match widget {
+        RowWidget::Scalar(scalar) => render_scalar(scalar, cx),
+        RowWidget::ColorList(colors) => {
+            let field_owned = field.to_string();
+            let add_field = field_owned.clone();
+            v_flex()
+                .gap_1p5()
+                .w_full()
+                .children(colors.iter().enumerate().map(|(i, c)| {
+                    h_flex()
+                        .gap_2()
+                        .items_center()
+                        .child(render_color_widget(c))
+                        .child(remove_button(
+                            format!("colorlist-remove-{field_owned}-{i}").into(),
+                            field_owned.clone(),
+                            i,
+                            cx,
+                        ))
+                }))
+                .child(
+                    Button::new(SharedString::from(format!("colorlist-add-{add_field}")))
+                        .label("+ Add color")
+                        .outline()
+                        .xsmall()
+                        .on_click(cx.listener(move |this, _, window, cx| {
+                            this.color_list_add(&add_field, prefill, window, cx);
+                        })),
+                )
+                .into_any_element()
+        }
+        RowWidget::NumberList(entries) | RowWidget::StringList(entries) => {
+            let is_number = matches!(widget, RowWidget::NumberList(_));
+            let field_owned = field.to_string();
+            let add_field = field_owned.clone();
+            v_flex()
+                .gap_1p5()
+                .w_full()
+                .children(entries.iter().enumerate().map(|(i, e)| {
+                    h_flex()
+                        .gap_2()
+                        .items_center()
+                        .child(div().flex_1().child(Input::new(e).small()))
+                        .child(remove_button(
+                            format!("list-remove-{field_owned}-{i}").into(),
+                            field_owned.clone(),
+                            i,
+                            cx,
+                        ))
+                }))
+                .child(
+                    Button::new(SharedString::from(format!("list-add-{add_field}")))
+                        .label("+ Add")
+                        .outline()
+                        .xsmall()
+                        .on_click(cx.listener(move |this, _, window, cx| {
+                            let value = if is_number {
+                                serde_json::Value::from(0)
+                            } else {
+                                serde_json::Value::String(String::new())
+                            };
+                            this.list_add(&add_field, value, window, cx);
+                        })),
+                )
+                .into_any_element()
+        }
+        RowWidget::Object(sub_rows) => v_flex()
+            .gap_1p5()
+            .w_full()
+            .pl_2()
+            .border_l_1()
+            .border_color(cx.theme().border)
+            .children(sub_rows.iter().map(|(name, _, widget)| {
+                h_flex()
+                    .items_center()
+                    .gap_2()
+                    .child(
+                        div()
+                            .flex_none()
+                            .w(px(76.))
+                            .text_xs()
+                            .text_color(cx.theme().muted_foreground)
+                            .child(name.clone()),
+                    )
+                    .child(div().flex_1().child(render_scalar(widget, cx)))
+            }))
+            .into_any_element(),
+        RowWidget::Fill {
+            mode,
+            colors,
+            angle,
+        } => {
+            let field_owned = field.to_string();
+            let mut column = v_flex().gap_2().w_full().child(
+                h_flex()
+                    .gap_1()
+                    .child(fill_seg_button(&field_owned, FillMode::Single, *mode, cx))
+                    .child(fill_seg_button(&field_owned, FillMode::Linear, *mode, cx))
+                    .child(fill_seg_button(&field_owned, FillMode::Radial, *mode, cx)),
+            );
+            if *mode == FillMode::Single {
+                if let Some(c) = colors.first() {
+                    column = column.child(render_color_widget(c));
+                }
+            } else {
+                column = column.child(
+                    v_flex()
+                        .gap_1p5()
+                        .children(colors.iter().map(render_color_widget)),
+                );
+                if *mode == FillMode::Linear {
+                    column = column.child(
+                        h_flex()
+                            .gap_2()
+                            .items_center()
+                            .child(
+                                div()
+                                    .text_xs()
+                                    .text_color(cx.theme().muted_foreground)
+                                    .child("Angle"),
+                            )
+                            .child(
+                                div()
+                                    .flex_none()
+                                    .w(px(52.))
+                                    .child(Input::new(angle).small()),
+                            ),
+                    );
+                }
+            }
+            column.into_any_element()
+        }
+    }
+}
+
+fn fill_seg_button(
+    field: &str,
+    mode: FillMode,
+    active_mode: FillMode,
+    cx: &Context<InspectorPanel>,
+) -> impl IntoElement {
+    let label = match mode {
+        FillMode::Single => "Single",
+        FillMode::Linear => "Linear",
+        FillMode::Radial => "Radial",
+    };
+    let field = field.to_string();
+    let active = mode == active_mode;
+    Button::new(SharedString::from(format!("fill-{field}-{label}")))
+        .label(label)
+        .when(active, |b| b.primary())
+        .when(!active, |b| b.ghost())
+        .xsmall()
+        .on_click(cx.listener(move |this, _, window, cx| {
+            this.fill_set_mode(&field, mode, window, cx);
+        }))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn only_one_picker_open_at_a_time() {
+        assert_eq!(apply_open_change(None, 7, true), Some(7));
+        assert_eq!(apply_open_change(Some(7), 9, true), Some(9));
+        assert_eq!(apply_open_change(Some(7), 7, false), None);
+        assert_eq!(apply_open_change(Some(9), 7, false), Some(9));
+    }
+
+    #[test]
+    fn hex_round_trips_through_parse_and_format() {
+        let c = parse_hex("#3B82F6").unwrap();
+        assert_eq!(hex_string(c), "#3b82f6");
+        assert_eq!(parse_hex("ffffff"), parse_hex("#fff"));
+        assert!(parse_hex("not-a-color").is_none());
+    }
+
+    #[test]
+    fn picker_ids_are_distinct() {
+        let a = next_picker_id();
+        let b = next_picker_id();
+        assert_ne!(a, b);
+    }
+}
diff --git a/crates/rustmotion-studio/src/editor/inspector/mod.rs b/crates/rustmotion-studio/src/editor/inspector/mod.rs
new file mode 100644
index 00000000..16cb6f48
--- /dev/null
+++ b/crates/rustmotion-studio/src/editor/inspector/mod.rs
@@ -0,0 +1,748 @@
+mod controls;
+mod sections;
+mod write;
+
+use std::collections::HashSet;
+
+use gpui_component::button::{Button, ButtonVariants as _};
+use gpui_component::input::{Input, InputEvent, InputState};
+use gpui_component::{h_flex, v_flex, ActiveTheme, Sizable as _, StyledExt as _};
+use gpui_kit::prelude::FluentBuilder as _;
+use gpui_kit::{
+    div, px, AppContext as _, Context, Entity, InteractiveElement, IntoElement, ParentElement,
+    Render, SharedString, StatefulInteractiveElement, Styled, Subscription, Task, Window,
+};
+
+use crate::app::state::EditorState;
+use crate::editor::annotations::AnnotationCaptureBox;
+use crate::editor::properties::{
+    component_props, css_family, css_row_value, css_section_props, effective_element,
+    visible_sections, CssSection, PropKind,
+};
+use crate::scenario::{read_field, read_style_object, scene_duration_for_pointer, Shared};
+
+use controls::{Row, ScalarWidget};
+use sections::{family, Ctrl, Family};
+use write::Target;
+
+#[allow(dead_code)]
+struct SelectionData {
+    pointer: String,
+    kind: String,
+    style: serde_json::Value,
+    element: serde_json::Value,
+    effective: serde_json::Value,
+    content: Option<String>,
+}
+
+enum CuratedRow {
+    Stateful {
+        field: sections::Field,
+        is_default: bool,
+        widget: ScalarWidget,
+    },
+    Stateless {
+        field: sections::Field,
+        is_default: bool,
+    },
+}
+
+pub struct InspectorPanel {
+    shared: Shared,
+    editor: Entity<EditorState>,
+    selection: Option<crate::app::state::Selection>,
+    controls_pointer: Option<String>,
+    force_rebuild: bool,
+    open_picker: Option<u64>,
+    color_pickers: Vec<(u64, Entity<gpui_component::color_picker::ColorPickerState>)>,
+    subscriptions: Vec<Subscription>,
+    pending_write: Option<Task<()>>,
+    data: Option<SelectionData>,
+    content_editor: Option<Entity<InputState>>,
+    root_rows: Vec<Row>,
+    timing: Option<(Entity<InputState>, Entity<InputState>)>,
+    curated: Vec<(&'static str, Vec<CuratedRow>)>,
+    css_sections: Vec<(CssSection, Vec<Row>)>,
+    open_sections: HashSet<String>,
+    annotation_box: Entity<AnnotationCaptureBox>,
+}
+
+impl InspectorPanel {
+    pub fn new(
+        shared: Shared,
+        editor: Entity<EditorState>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let annotation_box =
+            cx.new(|cx| AnnotationCaptureBox::new(shared.clone(), editor.clone(), window, cx));
+        Self {
+            shared,
+            editor,
+            selection: None,
+            controls_pointer: None,
+            force_rebuild: false,
+            open_picker: None,
+            color_pickers: Vec::new(),
+            subscriptions: Vec::new(),
+            pending_write: None,
+            data: None,
+            content_editor: None,
+            root_rows: Vec::new(),
+            timing: None,
+            curated: Vec::new(),
+            css_sections: Vec::new(),
+            open_sections: HashSet::new(),
+            annotation_box,
+        }
+    }
+
+    fn ensure_controls_for_selection(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let selected = self.editor.read(cx).selected.clone();
+        let pointer = selected.as_ref().map(|s| s.pointer.clone());
+        if !self.force_rebuild && pointer == self.controls_pointer {
+            return;
+        }
+        self.force_rebuild = false;
+        self.controls_pointer = pointer.clone();
+        self.selection = selected.clone();
+        self.subscriptions.clear();
+        self.color_pickers.clear();
+        self.open_picker = None;
+        self.content_editor = None;
+        self.root_rows.clear();
+        self.timing = None;
+        self.curated.clear();
+        self.css_sections.clear();
+        self.data = None;
+
+        let Some(selection) = selected else {
+            return;
+        };
+        let pointer = selection.pointer.clone();
+        let kind = selection.kind.clone();
+
+        let raw = {
+            let m = self.shared.lock().unwrap_or_else(|e| e.into_inner());
+            m.raw.clone()
+        };
+        let style = read_style_object(&raw, &pointer);
+        let content = read_field(&raw, &pointer, "content");
+        let element = raw
+            .pointer(&pointer)
+            .cloned()
+            .map(|mut v| {
+                if let Some(o) = v.as_object_mut() {
+                    o.remove("children");
+                }
+                v
+            })
+            .unwrap_or(serde_json::Value::Null);
+        let effective = effective_element(&element);
+
+        self.data = Some(SelectionData {
+            pointer: pointer.clone(),
+            kind: kind.clone(),
+            style: style.clone(),
+            element: element.clone(),
+            effective: effective.clone(),
+            content: content.clone(),
+        });
+
+        let fam = family(&kind);
+        let is_text_family = fam == Family::Text;
+
+        if is_text_family {
+            self.content_editor =
+                Some(self.build_content_editor(content.clone().unwrap_or_default(), window, cx));
+        }
+
+        if let Some(props) = component_props(&kind) {
+            let skip_content = is_text_family;
+            for spec in props.iter() {
+                if spec.name == "content" && skip_content {
+                    continue;
+                }
+                if spec.name == "start_at" || spec.name == "end_at" {
+                    continue;
+                }
+                let display_value = sections::prop_str(&effective, &spec.name);
+                let is_default = element.get(&spec.name).is_none()
+                    && effective
+                        .get(&spec.name)
+                        .map(|v| !v.is_null())
+                        .unwrap_or(false);
+                let row = self.build_property_row(
+                    spec,
+                    &effective,
+                    display_value,
+                    is_default,
+                    false,
+                    &kind,
+                    window,
+                    cx,
+                );
+                self.root_rows.push(row);
+            }
+            let has_timing = props
+                .iter()
+                .any(|p| p.name == "start_at" || p.name == "end_at");
+            if has_timing {
+                let max = scene_duration_for_pointer(&raw, &pointer);
+                let start = sections::prop_str(&effective, "start_at");
+                let end = sections::prop_str(&effective, "end_at");
+                let start_state = self.build_timing_input(start, "start_at", max, window, cx);
+                let end_state = self.build_timing_input(end, "end_at", max, window, cx);
+                self.timing = Some((start_state, end_state));
+            }
+        }
+
+        let curated_names = sections::curated_names(fam);
+        for section in sections::sections(fam) {
+            let mut rows = Vec::new();
+            for field in section.fields {
+                let (value, is_default) =
+                    css_row_value(sections::prop_str(&style, field.name), &kind, field.name);
+                let row = self.build_curated_row(field, &value, is_default, window, cx);
+                rows.push(row);
+            }
+            self.curated.push((section.title, rows));
+        }
+
+        let css_fam = css_family(&kind);
+        for section in visible_sections(css_fam) {
+            let props: Vec<_> = css_section_props(section)
+                .into_iter()
+                .filter(|p| !curated_names.contains(p.name.as_str()))
+                .cloned()
+                .collect();
+            if props.is_empty() {
+                continue;
+            }
+            let mut rows = Vec::new();
+            for spec in &props {
+                let (value, is_default) =
+                    css_row_value(sections::prop_str(&style, &spec.name), &kind, &spec.name);
+                let row = self
+                    .build_property_row(spec, &style, value, is_default, true, &kind, window, cx);
+                rows.push(row);
+            }
+            self.css_sections.push((section, rows));
+            self.open_sections.remove(section.label());
+        }
+    }
+
+    fn build_content_editor(
+        &mut self,
+        content: String,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Entity<InputState> {
+        let state = cx.new(|cx| {
+            let mut s = InputState::new(window, cx);
+            s.set_value(content, window, cx);
+            s
+        });
+        self.subscriptions.push(cx.subscribe_in(
+            &state,
+            window,
+            move |this, input, event: &InputEvent, window, cx| {
+                if let InputEvent::Change = event {
+                    let text = input.read(cx).value().to_string();
+                    this.write_content(&text, window, cx);
+                }
+            },
+        ));
+        state
+    }
+
+    fn build_timing_input(
+        &mut self,
+        value: String,
+        field: &'static str,
+        _max: Option<f64>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Entity<InputState> {
+        self.build_text(
+            &value,
+            Some("scene"),
+            Target::Root(field.to_string(), PropKind::Float),
+            window,
+            cx,
+        )
+    }
+
+    fn build_curated_row(
+        &mut self,
+        field: &sections::Field,
+        value: &str,
+        is_default: bool,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> CuratedRow {
+        match field.ctrl {
+            Ctrl::Text | Ctrl::Number => {
+                let target = Target::Style(field.name.to_string());
+                let widget = ScalarWidget::Text(self.build_text(value, None, target, window, cx));
+                CuratedRow::Stateful {
+                    field: *field,
+                    is_default,
+                    widget,
+                }
+            }
+            Ctrl::UnitSlider {
+                min,
+                max,
+                step,
+                unit,
+            } => {
+                let target = Target::Style(field.name.to_string());
+                let (slider, text) =
+                    self.build_slider(value, min, max, step, unit, target, window, cx);
+                CuratedRow::Stateful {
+                    field: *field,
+                    is_default,
+                    widget: ScalarWidget::SliderNum {
+                        slider,
+                        text,
+                        unit,
+                        step,
+                    },
+                }
+            }
+            Ctrl::Slider { min, max, step } => {
+                let target = Target::Style(field.name.to_string());
+                let (slider, text) =
+                    self.build_slider(value, min, max, step, "", target, window, cx);
+                CuratedRow::Stateful {
+                    field: *field,
+                    is_default,
+                    widget: ScalarWidget::SliderNum {
+                        slider,
+                        text,
+                        unit: "",
+                        step,
+                    },
+                }
+            }
+            Ctrl::Select(options) => {
+                let target = Target::Style(field.name.to_string());
+                let opts: Vec<String> = options.iter().map(|s| s.to_string()).collect();
+                let widget =
+                    ScalarWidget::Select(self.build_select(opts, value, target, window, cx));
+                CuratedRow::Stateful {
+                    field: *field,
+                    is_default,
+                    widget,
+                }
+            }
+            Ctrl::Weight => {
+                let target = Target::Style("font-weight".to_string());
+                let opts: Vec<String> = sections::WEIGHTS
+                    .iter()
+                    .map(|(v, _)| v.to_string())
+                    .collect();
+                let widget =
+                    ScalarWidget::Select(self.build_select(opts, value, target, window, cx));
+                CuratedRow::Stateful {
+                    field: *field,
+                    is_default,
+                    widget,
+                }
+            }
+            Ctrl::Color { .. } => {
+                let target = Target::Style(field.name.to_string());
+                let widget = ScalarWidget::Color(self.build_color(value, target, window, cx));
+                CuratedRow::Stateful {
+                    field: *field,
+                    is_default,
+                    widget,
+                }
+            }
+            Ctrl::Align | Ctrl::StyleToggles | Ctrl::Switch(_, _) => CuratedRow::Stateless {
+                field: *field,
+                is_default,
+            },
+        }
+    }
+
+    fn render_header(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
+        let kind = self
+            .data
+            .as_ref()
+            .map(|d| d.kind.clone())
+            .unwrap_or_default();
+        h_flex()
+            .items_center()
+            .justify_between()
+            .p_3p5()
+            .child(
+                v_flex()
+                    .child(
+                        div()
+                            .font_semibold()
+                            .text_color(cx.theme().accent)
+                            .child("Inspector"),
+                    )
+                    .when(!kind.is_empty(), |el| {
+                        el.child(
+                            div()
+                                .text_xs()
+                                .text_color(cx.theme().muted_foreground)
+                                .child(kind.clone()),
+                        )
+                    }),
+            )
+            .child(
+                Button::new("inspector-close")
+                    .icon(gpui_component::IconName::Close)
+                    .ghost()
+                    .xsmall()
+                    .on_click(cx.listener(|this, _, _window, cx| {
+                        this.editor.update(cx, |state, cx| {
+                            state.selected = None;
+                            cx.notify();
+                        });
+                        cx.notify();
+                    })),
+            )
+    }
+
+    fn render_content_editor(&self, cx: &Context<Self>) -> impl IntoElement {
+        let content = self.content_editor.clone();
+        v_flex()
+            .gap_1p5()
+            .p_3p5()
+            .border_t_1()
+            .border_color(cx.theme().border)
+            .child(section_header("Content", cx))
+            .children(content.map(|state| Input::new(&state)))
+    }
+
+    fn render_root_properties(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
+        let has_rows = !self.root_rows.is_empty();
+        let has_timing = self.timing.is_some();
+        v_flex()
+            .w_full()
+            .when(has_rows, |el| {
+                el.child(collapsible_section(
+                    "Properties",
+                    true,
+                    self.root_rows
+                        .iter()
+                        .map(|row| labeled_row(&row.label, row.is_default, render_row(row, cx)))
+                        .collect::<Vec<_>>(),
+                    cx,
+                ))
+            })
+            .when(has_timing, |el| {
+                let (start, end) = self.timing.clone().unwrap();
+                el.child(collapsible_section(
+                    "Timing",
+                    true,
+                    vec![
+                        labeled_row(
+                            "Visible from (s)",
+                            false,
+                            Input::new(&start).small().into_any_element(),
+                        ),
+                        labeled_row(
+                            "Visible until (s)",
+                            false,
+                            Input::new(&end).small().into_any_element(),
+                        ),
+                    ],
+                    cx,
+                ))
+            })
+    }
+
+    fn render_curated(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
+        let sections: Vec<(&'static str, Vec<gpui_kit::AnyElement>)> = self
+            .curated
+            .iter()
+            .map(|(title, rows)| {
+                let elements = rows
+                    .iter()
+                    .map(|row| render_curated_row(row, &self.shared, self.selection.as_ref(), cx))
+                    .collect();
+                (*title, elements)
+            })
+            .collect();
+        v_flex()
+            .w_full()
+            .children(sections.into_iter().map(|(title, rows)| {
+                v_flex()
+                    .w_full()
+                    .gap_1p5()
+                    .p_3p5()
+                    .border_t_1()
+                    .border_color(cx.theme().border)
+                    .child(section_header(title, cx))
+                    .children(rows)
+            }))
+    }
+
+    fn render_generic_css(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
+        let sections = std::mem::take(&mut self.css_sections);
+        let open_sections = self.open_sections.clone();
+        let built = sections
+            .iter()
+            .map(|(section, rows)| {
+                let label = section.label();
+                let open = open_sections.contains(label);
+                let elements: Vec<_> = rows
+                    .iter()
+                    .map(|row| labeled_row(&row.label, row.is_default, render_row(row, cx)))
+                    .collect();
+                (label, open, elements)
+            })
+            .collect::<Vec<_>>();
+        self.css_sections = sections;
+        v_flex().w_full().children(
+            built
+                .into_iter()
+                .map(|(label, open, rows)| collapsible_section(label, open, rows, cx)),
+        )
+    }
+}
+
+fn section_header(title: &str, cx: &Context<InspectorPanel>) -> impl IntoElement {
+    div()
+        .text_xs()
+        .font_semibold()
+        .text_color(cx.theme().muted_foreground)
+        .child(title.to_string().to_uppercase())
+}
+
+fn labeled_row(label: &str, is_default: bool, control: gpui_kit::AnyElement) -> impl IntoElement {
+    h_flex()
+        .items_center()
+        .gap_2()
+        .w_full()
+        .child(
+            div()
+                .flex_none()
+                .w(px(76.))
+                .text_xs()
+                .text_color(gpui_kit::hsla(0.0, 0.0, 0.6, 1.0))
+                .child(format!(
+                    "{label}{}",
+                    if is_default { " \u{b7}" } else { "" }
+                )),
+        )
+        .child(div().flex_1().child(control))
+}
+
+fn render_row(row: &Row, cx: &Context<InspectorPanel>) -> gpui_kit::AnyElement {
+    controls::render_row_widget(&row.key, &row.widget, row.prefill, cx)
+}
+
+fn collapsible_section(
+    title: &str,
+    open: bool,
+    rows: Vec<impl IntoElement>,
+    cx: &mut Context<InspectorPanel>,
+) -> impl IntoElement {
+    let title_owned = title.to_string();
+    let chevron = if open { "\u{25be}" } else { "\u{25b8}" };
+    v_flex()
+        .w_full()
+        .gap_1p5()
+        .p_3p5()
+        .border_t_1()
+        .border_color(cx.theme().border)
+        .child(
+            div()
+                .id(SharedString::from(format!("section-toggle-{title_owned}")))
+                .cursor_pointer()
+                .text_xs()
+                .font_semibold()
+                .text_color(cx.theme().muted_foreground)
+                .child(format!("{chevron} {}", title_owned.to_uppercase()))
+                .on_click(cx.listener(move |this, _, _window, cx| {
+                    if !this.open_sections.remove(&title_owned) {
+                        this.open_sections.insert(title_owned.clone());
+                    }
+                    cx.notify();
+                })),
+        )
+        .when(open, |el| el.children(rows))
+}
+
+fn render_curated_row(
+    row: &CuratedRow,
+    shared: &Shared,
+    selection: Option<&crate::app::state::Selection>,
+    cx: &mut Context<InspectorPanel>,
+) -> gpui_kit::AnyElement {
+    match row {
+        CuratedRow::Stateful {
+            field,
+            is_default,
+            widget,
+        } => labeled_row(
+            field.label,
+            *is_default,
+            controls::render_scalar(widget, cx),
+        )
+        .into_any_element(),
+        CuratedRow::Stateless { field, is_default } => {
+            let style = selection
+                .map(|s| {
+                    let m = shared.lock().unwrap_or_else(|e| e.into_inner());
+                    read_style_object(&m.raw, &s.pointer)
+                })
+                .unwrap_or(serde_json::Value::Null);
+            let control = render_stateless_curated(field, &style, cx);
+            labeled_row(field.label, *is_default, control).into_any_element()
+        }
+    }
+}
+
+fn render_stateless_curated(
+    field: &sections::Field,
+    style: &serde_json::Value,
+    cx: &mut Context<InspectorPanel>,
+) -> gpui_kit::AnyElement {
+    match field.ctrl {
+        Ctrl::Align => {
+            let value = sections::prop_str(style, field.name);
+            let options: [(&str, &str); 4] = [
+                ("left", "Left"),
+                ("center", "Center"),
+                ("right", "Right"),
+                ("justify", "Justify"),
+            ];
+            h_flex()
+                .gap_1()
+                .children(options.into_iter().map(|(v, label)| {
+                    let active = value == v;
+                    let value_owned = v.to_string();
+                    Button::new(SharedString::from(format!("align-{v}")))
+                        .label(label)
+                        .when(active, |b| b.primary())
+                        .when(!active, |b| b.ghost())
+                        .xsmall()
+                        .on_click(cx.listener(move |this, _, window, cx| {
+                            this.commit_text(
+                                &Target::Style("text-align".to_string()),
+                                &value_owned,
+                                window,
+                                cx,
+                            );
+                        }))
+                }))
+                .into_any_element()
+        }
+        Ctrl::StyleToggles => {
+            let weight = sections::prop_str(style, "font-weight");
+            let is_bold =
+                weight == "bold" || weight.parse::<i32>().map(|w| w >= 600).unwrap_or(false);
+            let fstyle = sections::prop_str(style, "font-style");
+            let is_italic = fstyle == "italic" || fstyle == "oblique";
+            h_flex()
+                .gap_1()
+                .child(
+                    Button::new("style-toggle-bold")
+                        .label("B")
+                        .when(is_bold, |b| b.primary())
+                        .when(!is_bold, |b| b.ghost())
+                        .xsmall()
+                        .on_click(cx.listener(move |this, _, window, cx| {
+                            let next = if is_bold { "400" } else { "700" };
+                            this.commit_text(
+                                &Target::Style("font-weight".to_string()),
+                                next,
+                                window,
+                                cx,
+                            );
+                        })),
+                )
+                .child(
+                    Button::new("style-toggle-italic")
+                        .label("I")
+                        .when(is_italic, |b| b.primary())
+                        .when(!is_italic, |b| b.ghost())
+                        .xsmall()
+                        .on_click(cx.listener(move |this, _, window, cx| {
+                            let next = if is_italic { "normal" } else { "italic" };
+                            this.commit_text(
+                                &Target::Style("font-style".to_string()),
+                                next,
+                                window,
+                                cx,
+                            );
+                        })),
+                )
+                .into_any_element()
+        }
+        Ctrl::Switch(on, off) => {
+            let value = sections::prop_str(style, field.name);
+            let checked = value == on;
+            let id = SharedString::from(format!("switch-{}", field.name));
+            let target = Target::Style(field.name.to_string());
+            let (on, off) = (on, off);
+            gpui_component::switch::Switch::new(id)
+                .checked(checked)
+                .on_change(cx.listener(move |this, checked: &bool, window, cx| {
+                    this.commit_text(&target, if *checked { on } else { off }, window, cx);
+                }))
+                .into_any_element()
+        }
+        _ => div().into_any_element(),
+    }
+}
+
+impl Render for InspectorPanel {
+    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        self.ensure_controls_for_selection(window, cx);
+        let has_selection = self.selection.is_some();
+        let kind = self
+            .data
+            .as_ref()
+            .map(|d| d.kind.clone())
+            .unwrap_or_default();
+        let content_first = has_selection && sections::content_before_properties(&kind);
+
+        let header = self.render_header(cx).into_any_element();
+        let properties = self.render_root_properties(cx).into_any_element();
+        let curated = self.render_curated(cx).into_any_element();
+        let generic = self.render_generic_css(cx).into_any_element();
+        let annotation_box = self.annotation_box.clone();
+
+        let mut body = v_flex()
+            .id("inspector-panel")
+            .flex_none()
+            .w(px(300.))
+            .h_full()
+            .bg(cx.theme().sidebar)
+            .border_l_1()
+            .border_color(cx.theme().border)
+            .overflow_y_scroll()
+            .on_scroll_wheel(cx.listener(|this, _, _window, cx| {
+                if this.open_picker.is_some() {
+                    this.open_picker = None;
+                    for (_, picker) in this.color_pickers.clone() {
+                        picker.update(cx, |s, cx| s.set_open(false, cx));
+                    }
+                    cx.notify();
+                }
+            }))
+            .child(header);
+
+        if has_selection {
+            if content_first {
+                body = body.child(self.render_content_editor(cx).into_any_element());
+            }
+            body = body.child(properties).child(curated).child(generic);
+            if !content_first {
+                body = body.child(self.render_content_editor(cx).into_any_element());
+            }
+            body = body.child(annotation_box);
+        }
+
+        body
+    }
+}
diff --git a/crates/rustmotion-studio/src/editor/inspector/sections.rs b/crates/rustmotion-studio/src/editor/inspector/sections.rs
new file mode 100644
index 00000000..4e65b0f8
--- /dev/null
+++ b/crates/rustmotion-studio/src/editor/inspector/sections.rs
@@ -0,0 +1,609 @@
+#[derive(Clone, Copy, PartialEq)]
+pub enum Ctrl {
+    Text,
+    Number,
+    UnitSlider {
+        min: f64,
+        max: f64,
+        step: f64,
+        unit: &'static str,
+    },
+    Slider {
+        min: f64,
+        max: f64,
+        step: f64,
+    },
+    Select(&'static [&'static str]),
+    Weight,
+    Align,
+    StyleToggles,
+    Color {
+        clearable: bool,
+    },
+    Switch(&'static str, &'static str),
+}
+
+#[derive(Clone, Copy, PartialEq)]
+pub struct Field {
+    pub name: &'static str,
+    pub label: &'static str,
+    pub ctrl: Ctrl,
+}
+
+#[derive(Clone, Copy, PartialEq)]
+pub struct Section {
+    pub title: &'static str,
+    pub fields: &'static [Field],
+}
+
+pub const WEIGHTS: &[(&str, &str)] = &[
+    ("100", "Thin \u{b7} 100"),
+    ("200", "Extra Light \u{b7} 200"),
+    ("300", "Light \u{b7} 300"),
+    ("400", "Regular \u{b7} 400"),
+    ("500", "Medium \u{b7} 500"),
+    ("600", "Semibold \u{b7} 600"),
+    ("700", "Bold \u{b7} 700"),
+    ("800", "Extra Bold \u{b7} 800"),
+    ("900", "Black \u{b7} 900"),
+];
+
+const F_TYPO: &[Field] = &[
+    Field {
+        name: "font-size",
+        label: "Size",
+        ctrl: Ctrl::UnitSlider {
+            min: 8.0,
+            max: 200.0,
+            step: 1.0,
+            unit: "PX",
+        },
+    },
+    Field {
+        name: "font-weight",
+        label: "Weight",
+        ctrl: Ctrl::Weight,
+    },
+    Field {
+        name: "style",
+        label: "Style",
+        ctrl: Ctrl::StyleToggles,
+    },
+    Field {
+        name: "line-height",
+        label: "Line height",
+        ctrl: Ctrl::UnitSlider {
+            min: 0.8,
+            max: 3.0,
+            step: 0.1,
+            unit: "",
+        },
+    },
+    Field {
+        name: "letter-spacing",
+        label: "Tracking",
+        ctrl: Ctrl::UnitSlider {
+            min: -5.0,
+            max: 20.0,
+            step: 0.5,
+            unit: "PX",
+        },
+    },
+    Field {
+        name: "text-align",
+        label: "Align",
+        ctrl: Ctrl::Align,
+    },
+];
+
+const F_COLOR: &[Field] = &[
+    Field {
+        name: "color",
+        label: "Text",
+        ctrl: Ctrl::Color { clearable: false },
+    },
+    Field {
+        name: "background",
+        label: "Background",
+        ctrl: Ctrl::Color { clearable: true },
+    },
+];
+
+const F_LAYOUT: &[Field] = &[
+    Field {
+        name: "display",
+        label: "Display",
+        ctrl: Ctrl::Select(&["block", "flex", "grid", "inline-block", "none", "contents"]),
+    },
+    Field {
+        name: "position",
+        label: "Position",
+        ctrl: Ctrl::Select(&["static", "relative", "absolute"]),
+    },
+    Field {
+        name: "top",
+        label: "Top",
+        ctrl: Ctrl::Text,
+    },
+    Field {
+        name: "right",
+        label: "Right",
+        ctrl: Ctrl::Text,
+    },
+    Field {
+        name: "bottom",
+        label: "Bottom",
+        ctrl: Ctrl::Text,
+    },
+    Field {
+        name: "left",
+        label: "Left",
+        ctrl: Ctrl::Text,
+    },
+    Field {
+        name: "z-index",
+        label: "Z-index",
+        ctrl: Ctrl::Number,
+    },
+    Field {
+        name: "overflow",
+        label: "Overflow",
+        ctrl: Ctrl::Select(&["visible", "hidden", "auto", "scroll", "clip"]),
+    },
+    Field {
+        name: "visibility",
+        label: "Visible",
+        ctrl: Ctrl::Switch("hidden", "visible"),
+    },
+];
+
+const F_POSITION: &[Field] = &[
+    Field {
+        name: "position",
+        label: "Position",
+        ctrl: Ctrl::Select(&["static", "relative", "absolute"]),
+    },
+    Field {
+        name: "top",
+        label: "Top",
+        ctrl: Ctrl::Text,
+    },
+    Field {
+        name: "left",
+        label: "Left",
+        ctrl: Ctrl::Text,
+    },
+    Field {
+        name: "z-index",
+        label: "Z-index",
+        ctrl: Ctrl::Number,
+    },
+];
+
+const F_FLEX: &[Field] = &[
+    Field {
+        name: "flex-direction",
+        label: "Direction",
+        ctrl: Ctrl::Select(&["row", "row-reverse", "column", "column-reverse"]),
+    },
+    Field {
+        name: "flex-wrap",
+        label: "Wrap",
+        ctrl: Ctrl::Select(&["nowrap", "wrap", "wrap-reverse"]),
+    },
+    Field {
+        name: "justify-content",
+        label: "Justify",
+        ctrl: Ctrl::Select(&[
+            "flex-start",
+            "flex-end",
+            "center",
+            "space-between",
+            "space-around",
+            "space-evenly",
+            "start",
+            "end",
+        ]),
+    },
+    Field {
+        name: "align-items",
+        label: "Align",
+        ctrl: Ctrl::Select(&[
+            "stretch",
+            "flex-start",
+            "flex-end",
+            "center",
+            "baseline",
+            "start",
+            "end",
+        ]),
+    },
+    Field {
+        name: "align-content",
+        label: "Align content",
+        ctrl: Ctrl::Select(&[
+            "stretch",
+            "flex-start",
+            "flex-end",
+            "center",
+            "space-between",
+            "space-around",
+            "space-evenly",
+            "start",
+            "end",
+        ]),
+    },
+    Field {
+        name: "gap",
+        label: "Gap",
+        ctrl: Ctrl::Text,
+    },
+];
+
+const F_SPACING: &[Field] = &[
+    Field {
+        name: "padding",
+        label: "Padding",
+        ctrl: Ctrl::Text,
+    },
+    Field {
+        name: "margin",
+        label: "Margin",
+        ctrl: Ctrl::Text,
+    },
+];
+
+const F_MARGIN: &[Field] = &[Field {
+    name: "margin",
+    label: "Margin",
+    ctrl: Ctrl::Text,
+}];
+
+const F_SIZING: &[Field] = &[
+    Field {
+        name: "width",
+        label: "Width",
+        ctrl: Ctrl::Text,
+    },
+    Field {
+        name: "height",
+        label: "Height",
+        ctrl: Ctrl::Text,
+    },
+    Field {
+        name: "min-width",
+        label: "Min W",
+        ctrl: Ctrl::Text,
+    },
+    Field {
+        name: "min-height",
+        label: "Min H",
+        ctrl: Ctrl::Text,
+    },
+    Field {
+        name: "max-width",
+        label: "Max W",
+        ctrl: Ctrl::Text,
+    },
+    Field {
+        name: "max-height",
+        label: "Max H",
+        ctrl: Ctrl::Text,
+    },
+];
+
+const F_SIZING_WH: &[Field] = &[
+    Field {
+        name: "width",
+        label: "Width",
+        ctrl: Ctrl::Text,
+    },
+    Field {
+        name: "height",
+        label: "Height",
+        ctrl: Ctrl::Text,
+    },
+];
+
+const F_TEXT_SIZING: &[Field] = &[
+    Field {
+        name: "width",
+        label: "Width",
+        ctrl: Ctrl::Text,
+    },
+    Field {
+        name: "max-width",
+        label: "Max W",
+        ctrl: Ctrl::Text,
+    },
+];
+
+const F_APPEARANCE: &[Field] = &[
+    Field {
+        name: "background",
+        label: "Background",
+        ctrl: Ctrl::Color { clearable: true },
+    },
+    Field {
+        name: "border-radius",
+        label: "Radius",
+        ctrl: Ctrl::Text,
+    },
+    Field {
+        name: "opacity",
+        label: "Opacity",
+        ctrl: Ctrl::Slider {
+            min: 0.0,
+            max: 1.0,
+            step: 0.01,
+        },
+    },
+];
+
+const F_OPACITY: &[Field] = &[Field {
+    name: "opacity",
+    label: "Opacity",
+    ctrl: Ctrl::Slider {
+        min: 0.0,
+        max: 1.0,
+        step: 0.01,
+    },
+}];
+
+#[derive(Clone, Copy, PartialEq)]
+pub enum Family {
+    Text,
+    Container,
+    Shape,
+    Other,
+}
+
+pub fn family(kind: &str) -> Family {
+    match kind {
+        "text" | "caption" | "gradient_text" => Family::Text,
+        "container" | "card" | "flex" | "grid" | "positioned" => Family::Container,
+        "shape" | "image" | "icon" | "svg" | "video" | "gif" | "lottie" | "qrcode" | "mockup"
+        | "divider" | "line" | "arrow" | "connector" => Family::Shape,
+        _ => Family::Other,
+    }
+}
+
+pub fn content_before_properties(kind: &str) -> bool {
+    family(kind) == Family::Text
+}
+
+const TEXT_SECTIONS: &[Section] = &[
+    Section {
+        title: "Typography",
+        fields: F_TYPO,
+    },
+    Section {
+        title: "Color",
+        fields: F_COLOR,
+    },
+    Section {
+        title: "Sizing",
+        fields: F_TEXT_SIZING,
+    },
+    Section {
+        title: "Spacing",
+        fields: F_SPACING,
+    },
+    Section {
+        title: "Appearance",
+        fields: F_OPACITY,
+    },
+];
+
+const CONTAINER_SECTIONS: &[Section] = &[
+    Section {
+        title: "Layout",
+        fields: F_LAYOUT,
+    },
+    Section {
+        title: "Flex",
+        fields: F_FLEX,
+    },
+    Section {
+        title: "Spacing",
+        fields: F_SPACING,
+    },
+    Section {
+        title: "Sizing",
+        fields: F_SIZING,
+    },
+    Section {
+        title: "Appearance",
+        fields: F_APPEARANCE,
+    },
+];
+
+const SHAPE_SECTIONS: &[Section] = &[
+    Section {
+        title: "Layout",
+        fields: F_POSITION,
+    },
+    Section {
+        title: "Sizing",
+        fields: F_SIZING,
+    },
+    Section {
+        title: "Spacing",
+        fields: F_MARGIN,
+    },
+    Section {
+        title: "Appearance",
+        fields: F_APPEARANCE,
+    },
+];
+
+const FALLBACK_SECTIONS: &[Section] = &[
+    Section {
+        title: "Layout",
+        fields: F_POSITION,
+    },
+    Section {
+        title: "Sizing",
+        fields: F_SIZING_WH,
+    },
+    Section {
+        title: "Spacing",
+        fields: F_SPACING,
+    },
+    Section {
+        title: "Appearance",
+        fields: F_APPEARANCE,
+    },
+];
+
+pub fn sections(f: Family) -> &'static [Section] {
+    match f {
+        Family::Text => TEXT_SECTIONS,
+        Family::Container => CONTAINER_SECTIONS,
+        Family::Shape => SHAPE_SECTIONS,
+        Family::Other => FALLBACK_SECTIONS,
+    }
+}
+
+pub fn curated_names(fam: Family) -> std::collections::BTreeSet<&'static str> {
+    let mut set = std::collections::BTreeSet::new();
+    for section in sections(fam) {
+        for field in section.fields {
+            set.insert(field.name);
+            if matches!(field.ctrl, Ctrl::StyleToggles) {
+                set.insert("font-weight");
+                set.insert("font-style");
+            }
+        }
+    }
+    set
+}
+
+pub fn prop_str(style: &serde_json::Value, name: &str) -> String {
+    match style.get(name) {
+        Some(serde_json::Value::String(s)) => s.clone(),
+        Some(serde_json::Value::Null) | None => String::new(),
+        Some(other) => other.to_string(),
+    }
+}
+
+pub fn parse_num(s: &str) -> Option<f64> {
+    let t: String = s
+        .trim()
+        .chars()
+        .take_while(|c| c.is_ascii_digit() || *c == '.' || *c == '-')
+        .collect();
+    t.parse::<f64>().ok()
+}
+
+pub fn fmt_num(v: f64, step: f64) -> String {
+    if step >= 1.0 {
+        format!("{}", v.round() as i64)
+    } else {
+        ((v * 100.0).round() / 100.0).to_string()
+    }
+}
+
+pub fn fmt_unit(v: f64, step: f64, unit: &str) -> String {
+    let n = fmt_num(v, step);
+    if unit.is_empty() {
+        n
+    } else {
+        format!("{n}{}", unit.to_ascii_lowercase())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn text_family_shows_content_before_properties() {
+        assert!(content_before_properties("text"));
+        assert!(content_before_properties("caption"));
+        assert!(!content_before_properties("gauge"));
+        assert!(!content_before_properties("card"));
+    }
+
+    #[test]
+    fn curated_field_entries_match_the_original_transcription() {
+        let total: usize = [
+            Family::Text,
+            Family::Container,
+            Family::Shape,
+            Family::Other,
+        ]
+        .iter()
+        .map(|f| sections(*f).iter().map(|s| s.fields.len()).sum::<usize>())
+        .sum();
+        assert_eq!(
+            total, 64,
+            "sum of every Field row across the four family section lists"
+        );
+        let distinct_lists = [
+            F_TYPO.len(),
+            F_COLOR.len(),
+            F_LAYOUT.len(),
+            F_POSITION.len(),
+            F_FLEX.len(),
+            F_SPACING.len(),
+            F_MARGIN.len(),
+            F_SIZING.len(),
+            F_SIZING_WH.len(),
+            F_TEXT_SIZING.len(),
+            F_APPEARANCE.len(),
+            F_OPACITY.len(),
+        ]
+        .iter()
+        .sum::<usize>();
+        assert_eq!(
+            distinct_lists, 44,
+            "sum of every distinct Field literal declared once (F_* constants)"
+        );
+    }
+
+    #[test]
+    fn curated_names_cover_style_toggles_as_two_css_props() {
+        let names = curated_names(Family::Text);
+        assert!(names.contains("font-weight"));
+        assert!(names.contains("font-style"));
+        assert!(names.contains("font-size"));
+        assert!(names.contains("text-align"));
+    }
+
+    #[test]
+    fn container_curated_names_do_not_leak_text_fields() {
+        let names = curated_names(Family::Container);
+        assert!(!names.contains("text-align"));
+        assert!(names.contains("display"));
+        assert!(names.contains("flex-direction"));
+    }
+
+    #[test]
+    fn parse_num_reads_the_leading_numeric_run() {
+        assert_eq!(parse_num("26px"), Some(26.0));
+        assert_eq!(parse_num("-0.5px"), Some(-0.5));
+        assert_eq!(parse_num("auto"), None);
+    }
+
+    #[test]
+    fn fmt_num_rounds_by_step_granularity() {
+        assert_eq!(fmt_num(26.4, 1.0), "26");
+        assert_eq!(fmt_num(1.006, 0.01), "1.01");
+        assert_eq!(fmt_num(0.5, 0.01), "0.5");
+    }
+
+    #[test]
+    fn fmt_unit_lowercases_the_unit_suffix() {
+        assert_eq!(fmt_unit(26.0, 1.0, "PX"), "26px");
+        assert_eq!(fmt_unit(1.5, 0.1, ""), "1.5");
+    }
+
+    #[test]
+    fn prop_str_treats_null_and_missing_as_unset() {
+        let style = serde_json::json!({"opacity": serde_json::Value::Null, "color": "#fff"});
+        assert_eq!(prop_str(&style, "opacity"), "");
+        assert_eq!(prop_str(&style, "color"), "#fff");
+        assert_eq!(prop_str(&style, "missing"), "");
+    }
+}
diff --git a/crates/rustmotion-studio/src/editor/inspector/write.rs b/crates/rustmotion-studio/src/editor/inspector/write.rs
new file mode 100644
index 00000000..17a51189
--- /dev/null
+++ b/crates/rustmotion-studio/src/editor/inspector/write.rs
@@ -0,0 +1,294 @@
+use std::time::Duration;
+
+use gpui_kit::{Context, Window};
+
+use crate::editor::properties::PropKind;
+use crate::scenario::{
+    apply_optimistic, history_slot, note_self_write, pending_write_slot, queue_mutation,
+    resolve_flush, self_write_slot, set_saving, take_pending, Mutation,
+};
+
+use super::InspectorPanel;
+
+#[derive(Clone)]
+pub enum Target {
+    Style(String),
+    Root(String, PropKind),
+    Nested(String, String, PropKind),
+}
+
+pub fn parse_root_value(kind: &PropKind, text: &str) -> Result<serde_json::Value, ()> {
+    let t = text.trim();
+    if t.is_empty() {
+        return Ok(serde_json::Value::Null);
+    }
+    Ok(match kind {
+        PropKind::Integer => match t.parse::<i64>() {
+            Ok(i) => serde_json::Value::from(i),
+            Err(_) => {
+                let f: f64 = t.parse().map_err(|_| ())?;
+                if f.fract() == 0.0 && f.abs() < 9_007_199_254_740_992.0 {
+                    serde_json::Value::from(f as i64)
+                } else {
+                    return Err(());
+                }
+            }
+        },
+        PropKind::Float => {
+            let f: f64 = t.parse().map_err(|_| ())?;
+            if f.fract() == 0.0 && f.abs() < 9_007_199_254_740_992.0 {
+                serde_json::Value::from(f as i64)
+            } else {
+                serde_json::Value::from(f)
+            }
+        }
+        PropKind::Bool => serde_json::Value::Bool(t == "true"),
+        PropKind::Complex => serde_json::from_str(t).map_err(|_| ())?,
+        _ => serde_json::Value::String(text.to_string()),
+    })
+}
+
+pub fn mutate_nested(
+    root_value: &serde_json::Value,
+    key: &str,
+    leaf: serde_json::Value,
+) -> serde_json::Value {
+    crate::editor::properties::mutate_object_field(root_value, key, leaf)
+}
+
+impl InspectorPanel {
+    pub(super) fn commit_text(
+        &mut self,
+        target: &Target,
+        text: &str,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        match target {
+            Target::Style(name) => {
+                if text.trim().is_empty() {
+                    self.write_style_removal(name, window, cx);
+                } else {
+                    self.write_prop(name, text, window, cx);
+                }
+            }
+            Target::Root(name, kind) => {
+                if let Ok(v) = parse_root_value(kind, text) {
+                    self.write_root_field(name, v, window, cx);
+                }
+            }
+            Target::Nested(root, key, kind) => {
+                if let Ok(v) = parse_root_value(kind, text) {
+                    self.write_nested_field(root, key, v, window, cx);
+                }
+            }
+        }
+    }
+
+    pub(super) fn write_prop(
+        &mut self,
+        prop: &str,
+        value: &str,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        if value.trim().is_empty() {
+            return;
+        }
+        let Some(pointer) = self.selection.as_ref().map(|s| s.pointer.clone()) else {
+            return;
+        };
+        let mutation = Mutation::Style {
+            pointer,
+            prop: prop.to_string(),
+            value: serde_json::Value::String(value.to_string()),
+        };
+        self.optimistic(&mutation, cx);
+        self.schedule_write(mutation, window, cx);
+    }
+
+    pub(super) fn write_style_removal(
+        &mut self,
+        prop: &str,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(pointer) = self.selection.as_ref().map(|s| s.pointer.clone()) else {
+            return;
+        };
+        let mutation = Mutation::Style {
+            pointer,
+            prop: prop.to_string(),
+            value: serde_json::Value::Null,
+        };
+        self.optimistic(&mutation, cx);
+        self.schedule_write(mutation, window, cx);
+    }
+
+    pub(super) fn write_root_field(
+        &mut self,
+        field: &str,
+        value: serde_json::Value,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(pointer) = self.selection.as_ref().map(|s| s.pointer.clone()) else {
+            return;
+        };
+        let mutation = Mutation::Field {
+            pointer,
+            field: field.to_string(),
+            value,
+        };
+        self.optimistic(&mutation, cx);
+        self.schedule_write(mutation, window, cx);
+    }
+
+    pub(super) fn write_content(
+        &mut self,
+        text: &str,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.write_root_field(
+            "content",
+            serde_json::Value::String(text.to_string()),
+            window,
+            cx,
+        );
+    }
+
+    pub(super) fn write_nested_field(
+        &mut self,
+        root: &str,
+        key: &str,
+        leaf: serde_json::Value,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(pointer) = self.selection.as_ref().map(|s| s.pointer.clone()) else {
+            return;
+        };
+        let current_root = {
+            let m = self.shared.lock().unwrap_or_else(|e| e.into_inner());
+            m.raw
+                .pointer(&pointer)
+                .and_then(|el| el.get(root))
+                .cloned()
+                .unwrap_or(serde_json::Value::Null)
+        };
+        let next = mutate_nested(&current_root, key, leaf);
+        self.write_root_field(root, next, window, cx);
+    }
+
+    fn optimistic(&mut self, mutation: &Mutation, cx: &mut Context<Self>) {
+        if apply_optimistic(&self.shared, mutation).is_ok() {
+            self.editor.update(cx, |state, cx| {
+                state.rev = state.rev.wrapping_add(1);
+                cx.notify();
+            });
+        }
+    }
+
+    fn schedule_write(&mut self, mutation: Mutation, _window: &mut Window, cx: &mut Context<Self>) {
+        let path = {
+            let m = self.shared.lock().unwrap_or_else(|e| e.into_inner());
+            m.path.clone()
+        };
+        let Some(path) = path else {
+            return;
+        };
+        queue_mutation(&pending_write_slot(), &path, mutation);
+        set_saving(&history_slot(), true);
+
+        let shared = self.shared.clone();
+        self.pending_write = Some(cx.spawn(async move |this, cx| {
+            cx.background_executor()
+                .timer(Duration::from_millis(250))
+                .await;
+
+            let mutations = take_pending(&pending_write_slot(), &path);
+            set_saving(&history_slot(), false);
+            if mutations.is_empty() {
+                return;
+            }
+
+            let is_html = rustmotion::loader::is_html_path(&path);
+            let read = std::fs::read_to_string(&path).map_err(|e| format!("read: {e}"));
+            let result: Result<bool, String> = match &read {
+                Ok(content) => match resolve_flush(content, is_html, &mutations) {
+                    Ok(Some(new_content)) => write_and_note(&path, &new_content).map(|()| true),
+                    Ok(None) => Ok(false),
+                    Err(e) => Err(e),
+                },
+                Err(e) => Err(e.clone()),
+            };
+            if let (Ok(true), Ok(snapshot)) = (&result, &read) {
+                crate::scenario::record_edit(&history_slot(), &path, snapshot.clone());
+            }
+
+            let mut m = shared.lock().unwrap_or_else(|e| e.into_inner());
+            match result {
+                Ok(_) => m.write_error = None,
+                Err(e) => {
+                    m.write_error = Some(e);
+                    m.generation = m.generation.wrapping_add(1);
+                }
+            }
+            drop(m);
+            let _ = this.update(cx, |_, cx| cx.notify());
+        }));
+    }
+}
+
+fn write_and_note(path: &std::path::Path, content: &str) -> Result<(), String> {
+    std::fs::write(path, content).map_err(|e| format!("write: {e}"))?;
+    note_self_write(&self_write_slot(), path, content);
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn parse_root_value_never_writes_a_float_into_an_integer_field() {
+        assert_eq!(
+            parse_root_value(&PropKind::Integer, "12"),
+            Ok(serde_json::Value::from(12))
+        );
+        assert_eq!(
+            parse_root_value(&PropKind::Integer, "12.0"),
+            Ok(serde_json::Value::from(12))
+        );
+        assert!(parse_root_value(&PropKind::Integer, "12.5").is_err());
+    }
+
+    #[test]
+    fn parse_root_value_empty_text_removes_the_field() {
+        assert_eq!(
+            parse_root_value(&PropKind::String, ""),
+            Ok(serde_json::Value::Null)
+        );
+        assert_eq!(
+            parse_root_value(&PropKind::Integer, "   "),
+            Ok(serde_json::Value::Null)
+        );
+    }
+
+    #[test]
+    fn parse_root_value_complex_requires_valid_json() {
+        assert!(parse_root_value(&PropKind::Complex, "{not json").is_err());
+        assert_eq!(
+            parse_root_value(&PropKind::Complex, "{\"a\":1}"),
+            Ok(serde_json::json!({"a": 1}))
+        );
+    }
+
+    #[test]
+    fn mutate_nested_removes_on_null() {
+        let root = serde_json::json!({"direction": "up", "value": "1"});
+        let next = mutate_nested(&root, "direction", serde_json::Value::Null);
+        assert_eq!(next, serde_json::json!({"value": "1"}));
+    }
+}
diff --git a/crates/rustmotion-studio/src/editor/mod.rs b/crates/rustmotion-studio/src/editor/mod.rs
index eb432a88..0d233fd6 100644
--- a/crates/rustmotion-studio/src/editor/mod.rs
+++ b/crates/rustmotion-studio/src/editor/mod.rs
@@ -1,16 +1,13 @@
-//! The scenario editor: playback, the clickable element overlay, the property
-//! inspector, and the comments/annotations panel.
-
-mod annotations;
+pub mod annotations;
 pub mod audio;
-mod diff_panel;
+pub mod diff_panel;
 mod export;
 pub mod frames;
-mod inspector;
-mod playback;
+pub mod inspector;
+pub mod overlay;
+pub mod playback;
 mod prefetch;
 mod properties;
-mod topbar;
-mod view;
-
-pub use view::StudioApp;
+pub mod surface;
+pub mod topbar;
+pub mod view;
diff --git a/crates/rustmotion-studio/src/editor/overlay.rs b/crates/rustmotion-studio/src/editor/overlay.rs
new file mode 100644
index 00000000..2854506c
--- /dev/null
+++ b/crates/rustmotion-studio/src/editor/overlay.rs
@@ -0,0 +1,130 @@
+use gpui_component::ActiveTheme;
+use gpui_kit::prelude::FluentBuilder as _;
+use gpui_kit::{
+    div, relative, AnyElement, App, Context, Hsla, InteractiveElement, IntoElement, ParentElement,
+    SharedString, StatefulInteractiveElement, Styled,
+};
+
+use crate::app::state::Selection;
+use crate::scenario::ChangeKind;
+
+use super::frames::HitPct;
+use super::view::EditorView;
+
+pub fn mark_for<'a>(
+    pointer: Option<&str>,
+    diff_marks: &'a [(String, ChangeKind)],
+) -> Option<&'a ChangeKind> {
+    let pointer = pointer?;
+    diff_marks
+        .iter()
+        .find(|(p, _)| p == pointer)
+        .map(|(_, kind)| kind)
+}
+
+fn box_style(
+    is_selected: bool,
+    is_hovered: bool,
+    diff_mark: Option<&ChangeKind>,
+    cx: &App,
+) -> (Hsla, Hsla) {
+    if let Some(mark) = diff_mark {
+        let color = match mark {
+            ChangeKind::Added => cx.theme().success,
+            ChangeKind::Modified => cx.theme().accent,
+            ChangeKind::Removed => cx.theme().danger,
+        };
+        return (color, gpui_kit::transparent_black());
+    }
+    if is_selected {
+        return (cx.theme().accent, gpui_kit::transparent_black());
+    }
+    if is_hovered {
+        return (cx.theme().accent, cx.theme().accent.opacity(0.12));
+    }
+    (gpui_kit::transparent_black(), gpui_kit::transparent_black())
+}
+
+impl EditorView {
+    pub(super) fn render_hit_overlay(
+        &mut self,
+        hits: &[HitPct],
+        selected: Option<&Selection>,
+        diff_marks: &[(String, ChangeKind)],
+        cx: &mut Context<Self>,
+    ) -> AnyElement {
+        let hovered = self.hovered_hit;
+        let selected_node = selected.map(|s| s.node_id);
+        let selected_pointer = selected.map(|s| s.pointer.as_str());
+
+        div()
+            .absolute()
+            .inset_0()
+            .children(hits.iter().map(|hit| {
+                let node_id = hit.node_id;
+                let pointer = hit.pointer.clone();
+                let kind = hit.kind.clone();
+                let is_selected = selected_node == Some(node_id)
+                    || (hit.pointer.is_some() && hit.pointer.as_deref() == selected_pointer);
+                let is_hovered = hovered == Some(node_id);
+                let diff_mark = mark_for(hit.pointer.as_deref(), diff_marks);
+                let (border_color, bg_color) = box_style(is_selected, is_hovered, diff_mark, cx);
+                let has_border = is_selected || is_hovered || diff_mark.is_some();
+
+                div()
+                    .id(SharedString::from(format!("hit-{node_id}")))
+                    .absolute()
+                    .left(relative(hit.x / 100.0))
+                    .top(relative(hit.y / 100.0))
+                    .w(relative(hit.w / 100.0))
+                    .h(relative(hit.h / 100.0))
+                    .cursor_pointer()
+                    .when(has_border, |el| el.border_1().border_color(border_color))
+                    .bg(bg_color)
+                    .on_hover(cx.listener(move |this, entered: &bool, _window, cx| {
+                        if *entered {
+                            if this.hovered_hit != Some(node_id) {
+                                this.hovered_hit = Some(node_id);
+                                cx.notify();
+                            }
+                        } else if this.hovered_hit == Some(node_id) {
+                            this.hovered_hit = None;
+                            cx.notify();
+                        }
+                    }))
+                    .on_click(cx.listener(move |this, _event, _window, cx| {
+                        cx.stop_propagation();
+                        if let Some(ptr) = pointer.clone() {
+                            this.editor.update(cx, |state, cx| {
+                                state.selected = Some(Selection {
+                                    node_id,
+                                    pointer: ptr,
+                                    kind: kind.clone(),
+                                });
+                                cx.notify();
+                            });
+                        }
+                    }))
+            }))
+            .into_any_element()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn mark_for_finds_the_matching_pointer() {
+        let marks = vec![
+            ("/scenes/0/children/0".to_string(), ChangeKind::Added),
+            ("/scenes/0/children/1".to_string(), ChangeKind::Modified),
+        ];
+        assert_eq!(
+            mark_for(Some("/scenes/0/children/1"), &marks),
+            Some(&ChangeKind::Modified)
+        );
+        assert_eq!(mark_for(Some("/scenes/0/children/9"), &marks), None);
+        assert_eq!(mark_for(None, &marks), None);
+    }
+}
diff --git a/crates/rustmotion-studio/src/editor/playback.rs b/crates/rustmotion-studio/src/editor/playback.rs
index ed54ccbd..e4648fb9 100644
--- a/crates/rustmotion-studio/src/editor/playback.rs
+++ b/crates/rustmotion-studio/src/editor/playback.rs
@@ -1,282 +1,591 @@
 use std::time::Duration;
 
-use dioxus::prelude::*;
-use dioxus_icons::lucide::{Pause, Play, Volume2, VolumeX};
+use gpui_component::button::{Button, ButtonVariants as _};
+use gpui_component::slider::{Slider, SliderState, SliderValue};
+use gpui_component::{h_flex, ActiveTheme, IconName, Sizable as _};
+use gpui_kit::prelude::FluentBuilder as _;
+use gpui_kit::{
+    div, px, App, AppContext as _, Context, Entity, InteractiveElement, IntoElement, Modifiers,
+    ParentElement, RenderOnce, SharedString, Styled, Window,
+};
 
-use crate::components::button::{Button, ButtonSize, ButtonVariant};
-use crate::components::select::{Select, SelectOption};
+use crate::app::state::EditorState;
 use crate::scenario::Shared;
 
+use super::diff_panel::DiffSide;
 use super::prefetch::{set_preview_scale_pct, PREVIEW_SCALE_CHOICES};
 
-/// What a playback keyboard shortcut does (see [`playback_action`]).
+gpui_kit::actions!(
+    editor_playback,
+    [
+        TogglePlay,
+        StepBackward,
+        StepBackwardBig,
+        StepForward,
+        StepForwardBig,
+        SeekToStart,
+        SeekToEnd,
+    ]
+);
+
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum PlaybackAction {
     TogglePlay,
-    /// Step the playhead by N frames (pausing first).
     Step(i64),
     SeekStart,
     SeekEnd,
 }
 
-/// Map a key press to a playback action: Space → toggle, arrows → ±1 frame
-/// (±10 with Shift), Home/End → first/last frame. `None` for anything else or
-/// when command modifiers are held (those belong to other shortcuts).
-pub fn playback_action(key: &Key, mods: Modifiers) -> Option<PlaybackAction> {
-    if mods.meta() || mods.ctrl() || mods.alt() {
+pub fn playback_action(key: &str, mods: Modifiers) -> Option<PlaybackAction> {
+    if mods.control || mods.platform || mods.alt {
         return None;
     }
-    let step = if mods.shift() { 10 } else { 1 };
+    let step = if mods.shift { 10 } else { 1 };
     match key {
-        Key::Character(c) if c == " " && !mods.shift() => Some(PlaybackAction::TogglePlay),
-        Key::ArrowLeft => Some(PlaybackAction::Step(-step)),
-        Key::ArrowRight => Some(PlaybackAction::Step(step)),
-        Key::Home => Some(PlaybackAction::SeekStart),
-        Key::End => Some(PlaybackAction::SeekEnd),
+        "space" if !mods.shift => Some(PlaybackAction::TogglePlay),
+        "left" => Some(PlaybackAction::Step(-step)),
+        "right" => Some(PlaybackAction::Step(step)),
+        "home" => Some(PlaybackAction::SeekStart),
+        "end" => Some(PlaybackAction::SeekEnd),
         _ => None,
     }
 }
 
-/// Advance the playhead while `playing` is true, and keep the sound with it.
-///
-/// When the scenario has audio the playhead follows the *audio* clock rather
-/// than its own timer: a timer ticking at 1/fps drifts against the sound card
-/// over a long scenario, and by the end the picture no longer matches what you
-/// hear. With no track (or no output device) it falls back to the timer.
-pub fn use_playback_clock(shared: Shared, mut current: Signal<u32>, playing: Signal<bool>) {
-    use_future(move || {
-        let shared = shared.clone();
-        async move {
-            // Whether the sound for this playback run has been started. Reset on
-            // pause and on loop, so a mix that finishes preparing mid-playback
-            // still gets picked up.
-            let mut audio_armed = false;
-            loop {
-                let fps = shared
-                    .lock()
-                    .unwrap_or_else(|e| e.into_inner())
-                    .scenario
-                    .video
-                    .fps
-                    .max(1);
-                tokio::time::sleep(Duration::from_secs_f64(1.0 / fps as f64)).await;
-                if !playing() {
-                    if audio_armed {
-                        super::audio::stop();
-                        audio_armed = false;
-                    }
-                    continue;
-                }
-                let total = shared
-                    .lock()
-                    .unwrap_or_else(|e| e.into_inner())
-                    .total_frames
-                    .max(1);
-                if super::audio::has_audio() && !audio_armed {
-                    super::audio::play_from_frame(current(), fps);
-                    audio_armed = true;
-                }
-                let from = current();
-                let next = match super::audio::position_frame(fps) {
-                    Some(f) if f < total => f,
-                    _ => (from + 1) % total,
-                };
-                // Wrapping past the last frame restarts the track with the picture.
-                if next < from {
-                    audio_armed = false;
-                }
-                current.set(next);
-            }
+pub fn apply_playback_action(
+    action: PlaybackAction,
+    shared: &Shared,
+    editor: &Entity<EditorState>,
+    cx: &mut App,
+) {
+    let total_frames = || {
+        shared
+            .lock()
+            .unwrap_or_else(|e| e.into_inner())
+            .total_frames
+    };
+    match action {
+        PlaybackAction::TogglePlay => {
+            editor.update(cx, |state, cx| {
+                state.playing = !state.playing;
+                cx.notify();
+            });
+        }
+        PlaybackAction::Step(delta) => {
+            let max = total_frames().saturating_sub(1);
+            editor.update(cx, |state, cx| {
+                state.playing = false;
+                let next = (state.current as i64 + delta).clamp(0, max as i64) as u32;
+                state.current = next;
+                cx.notify();
+            });
+        }
+        PlaybackAction::SeekStart => {
+            editor.update(cx, |state, cx| {
+                state.current = 0;
+                cx.notify();
+            });
         }
-    });
+        PlaybackAction::SeekEnd => {
+            let max = total_frames().saturating_sub(1);
+            editor.update(cx, |state, cx| {
+                state.current = max;
+                cx.notify();
+            });
+        }
+    }
 }
 
-/// Bump `rev` whenever the watcher swaps in a reloaded model, so the `<img>`
-/// refetches the (now changed) current frame — and re-mix the preview audio
-/// when the audio itself changed. Every optimistic edit (a slider drag is
-/// ~4/s) bumps `generation`, but re-mixing decodes and resamples every track
-/// from scratch, so gating on [`audio::audio_fingerprint`](super::audio::audio_fingerprint)
-/// rather than on `generation` keeps a font-size or color edit from spawning
-/// a fresh mixer thread it has no use for.
-pub fn use_hot_reload(shared: Shared, mut rev: Signal<u64>) {
-    use_future(move || {
-        let shared = shared.clone();
-        async move {
-            let mut last_gen: Option<u64> = None;
-            let mut last_audio_fp: Option<u64> = None;
-            loop {
-                let (g, scenario, total) = {
-                    let m = shared.lock().unwrap_or_else(|e| e.into_inner());
-                    (m.generation, m.scenario.clone(), m.total_frames)
-                };
-                if last_gen != Some(g) {
-                    if last_gen.is_some() {
-                        rev.set(rev() + 1);
-                    }
-                    last_gen = Some(g);
-                    let fps = scenario.video.fps.max(1);
-                    let total_duration = total as f64 / fps as f64;
-                    let fp = super::audio::audio_fingerprint(&scenario.audio, total_duration);
-                    if last_audio_fp != Some(fp) {
-                        last_audio_fp = Some(fp);
-                        super::audio::prepare(scenario, total_duration);
-                    }
-                }
-                tokio::time::sleep(Duration::from_millis(250)).await;
-            }
-        }
-    });
+pub fn seek_from_user(state: &mut EditorState, frame: u32) -> bool {
+    let moved = state.current != frame || state.playing;
+    state.current = frame;
+    state.playing = false;
+    moved
+}
+
+pub struct PlayheadStep {
+    pub next: u32,
+    pub rearm_audio: bool,
 }
 
-/// The bottom transport bar: play/pause, step, scrub, and a frame counter.
-/// In diff mode an A|B segmented control flips the canvas between the baseline
-/// (A) and the current state (B) at the same frame — the classic motion-review
-/// gesture.
-#[component]
-pub fn PlaybackBar(
-    current: Signal<u32>,
-    playing: Signal<bool>,
+pub fn advance_playhead(
+    current: u32,
+    last_written: Option<u32>,
+    audio_position: Option<u32>,
     total: u32,
-    fps: u32,
-    mut muted: Signal<bool>,
-    diff_active: Signal<bool>,
-    mut diff_side: Signal<super::diff_panel::DiffSide>,
-    mut preview_scale: Signal<u16>,
-) -> Element {
-    use super::diff_panel::DiffSide;
-
-    let max = total.saturating_sub(1);
-    let cur = current().min(max);
-    let is_playing = playing();
-    let is_muted = muted();
-    let side = diff_side();
-
-    rsx! {
-        div {
-            style: "display:flex; align-items:center; gap:12px; padding:12px 20px; border-top:1px solid var(--rm-border); background:var(--rm-surface-2);",
-            // Focused transport controls behave natively (arrows on the range
-            // slider step the frame, Space re-activates the focused button —
-            // both ARE playback actions); stopping propagation prevents the
-            // root shortcut handler from double-applying them.
-            onkeydown: move |evt: KeyboardEvent| evt.stop_propagation(),
-            Button {
-                variant: ButtonVariant::Secondary,
-                size: ButtonSize::IconSm,
-                title: if is_playing { "Pause (Space)" } else { "Play (Space)" },
-                onclick: move |_| playing.set(!playing()),
-                if is_playing {
-                    Pause { size: 15 }
-                } else {
-                    Play { size: 15 }
-                }
-            }
-            Button {
-                variant: ButtonVariant::Secondary,
-                size: ButtonSize::IconSm,
-                title: if is_muted { "Unmute" } else { "Mute" },
-                onclick: move |_| {
-                    let next = !muted();
-                    muted.set(next);
-                    super::audio::set_muted(next);
-                },
-                if is_muted {
-                    VolumeX { size: 15 }
-                } else {
-                    Volume2 { size: 15 }
-                }
+) -> PlayheadStep {
+    let total = total.max(1);
+    let seeked_without_us = last_written.is_some_and(|written| written != current);
+    if seeked_without_us {
+        return PlayheadStep {
+            next: current.min(total - 1),
+            rearm_audio: true,
+        };
+    }
+    match audio_position {
+        Some(pos) if pos < total => PlayheadStep {
+            next: pos,
+            rearm_audio: false,
+        },
+        _ => {
+            let next = (current + 1) % total;
+            PlayheadStep {
+                next,
+                rearm_audio: next < current,
             }
-            if diff_active() {
-                div { class: "rm-seg", style: "width:auto; flex:none;",
-                    Button {
-                        variant: if side == DiffSide::A { ButtonVariant::Primary } else { ButtonVariant::Ghost },
-                        size: ButtonSize::Sm,
-                        title: "Baseline",
-                        onclick: move |_| diff_side.set(DiffSide::A),
-                        "A"
-                    }
-                    Button {
-                        variant: if side == DiffSide::B { ButtonVariant::Primary } else { ButtonVariant::Ghost },
-                        size: ButtonSize::Sm,
-                        title: "Current",
-                        onclick: move |_| diff_side.set(DiffSide::B),
-                        "B"
-                    }
+        }
+    }
+}
+
+pub fn spawn_playback_clock<V: 'static>(
+    shared: Shared,
+    editor: Entity<EditorState>,
+    cx: &mut Context<V>,
+) {
+    cx.spawn(async move |_this, cx| {
+        let mut audio_armed = false;
+        let mut last_written: Option<u32> = None;
+        loop {
+            let fps = {
+                let m = shared.lock().unwrap_or_else(|e| e.into_inner());
+                m.scenario.video.fps.max(1)
+            };
+            cx.background_executor()
+                .timer(Duration::from_secs_f64(1.0 / fps as f64))
+                .await;
+            let playing = editor.read_with(cx, |state, _| state.playing);
+            if !playing {
+                if audio_armed {
+                    super::audio::stop();
+                    audio_armed = false;
                 }
+                last_written = None;
+                continue;
             }
-            Button {
-                variant: ButtonVariant::Ghost,
-                size: ButtonSize::IconSm,
-                onclick: move |_| current.set(cur.saturating_sub(1)),
-                "‹"
+            let total = {
+                let m = shared.lock().unwrap_or_else(|e| e.into_inner());
+                m.total_frames.max(1)
+            };
+            let current = editor.read_with(cx, |state, _| state.current);
+            let step = advance_playhead(
+                current,
+                last_written,
+                super::audio::position_frame(fps),
+                total,
+            );
+            if step.rearm_audio {
+                audio_armed = false;
             }
-            Button {
-                variant: ButtonVariant::Ghost,
-                size: ButtonSize::IconSm,
-                onclick: move |_| current.set((cur + 1).min(max)),
-                "›"
+            if super::audio::has_audio() && !audio_armed {
+                super::audio::play_from_frame(step.next, fps);
+                audio_armed = true;
             }
-            input {
-                r#type: "range",
-                min: "0",
-                max: "{max}",
-                value: "{cur}",
-                style: "flex:1;",
-                oninput: move |e| {
-                    if let Ok(v) = e.value().parse::<u32>() {
-                        current.set(v);
-                        if playing() {
-                            super::audio::play_from_frame(v, fps);
-                        }
-                    }
-                },
-            }
-            // Preview quality: render scale of the preview frames only (the
-            // export always renders at 100%). Lower = smoother playback on
-            // heavy scenarios (glass, camera, parallax).
-            div {
-                title: "Preview quality (export is always 100%)",
-                style: "width:96px; flex:none;",
-                Select::<u16> {
-                    default_value: Some(preview_scale()),
-                    on_value_change: move |v: Option<u16>| {
-                        if let Some(pct) = v {
-                            // Atomic first: the render threads and the asset
-                            // handler must see the new scale before the signal
-                            // change triggers the <img> refetch.
-                            set_preview_scale_pct(pct);
-                            preview_scale.set(pct);
-                        }
-                    },
-                    for (i, pct) in PREVIEW_SCALE_CHOICES.iter().enumerate() {
-                        SelectOption::<u16> {
-                            key: "{pct}",
-                            index: i,
-                            value: *pct,
-                            text_value: "{pct}%",
-                            "{pct}%"
-                        }
-                    }
+            last_written = Some(step.next);
+            editor.update(cx, |state, cx| {
+                state.current = step.next;
+                cx.notify();
+            });
+        }
+    })
+    .detach();
+}
+
+pub fn spawn_hot_reload<V: 'static>(
+    shared: Shared,
+    editor: Entity<EditorState>,
+    cx: &mut Context<V>,
+) {
+    cx.spawn(async move |_this, cx| {
+        let mut last_gen: Option<u64> = None;
+        let mut last_audio_fp: Option<u64> = None;
+        loop {
+            let (g, scenario, total) = {
+                let m = shared.lock().unwrap_or_else(|e| e.into_inner());
+                (m.generation, m.scenario.clone(), m.total_frames)
+            };
+            if last_gen != Some(g) {
+                if last_gen.is_some() {
+                    editor.update(cx, |state, cx| {
+                        state.rev = state.rev.wrapping_add(1);
+                        cx.notify();
+                    });
+                }
+                last_gen = Some(g);
+                let fps = scenario.video.fps.max(1);
+                let total_duration = total as f64 / fps as f64;
+                let fp = super::audio::audio_fingerprint(&scenario.audio, total_duration);
+                if last_audio_fp != Some(fp) {
+                    last_audio_fp = Some(fp);
+                    super::audio::prepare(scenario, total_duration);
                 }
             }
-            div { style: "min-width:120px; text-align:right; color:var(--rm-text-muted);",
-                "{cur} / {max}"
-            }
+            cx.background_executor()
+                .timer(Duration::from_millis(250))
+                .await;
+        }
+    })
+    .detach();
+}
+
+pub fn frame_to_fraction(frame: u32, total_frames: u32) -> f32 {
+    let max = total_frames.saturating_sub(1);
+    if max == 0 {
+        return 0.0;
+    }
+    (frame.min(max) as f32 / max as f32).clamp(0.0, 1.0)
+}
+
+pub fn fraction_to_frame(fraction: f32, total_frames: u32) -> u32 {
+    let max = total_frames.saturating_sub(1);
+    (fraction.clamp(0.0, 1.0) * max as f32).round() as u32
+}
+
+pub fn new_scrubber(cx: &mut App) -> Entity<SliderState> {
+    cx.new(|_| SliderState::new().min(0.).max(1.).step(0.0001))
+}
+
+pub struct TransportBar {
+    shared: Shared,
+    editor: Entity<EditorState>,
+    scrubber: Entity<SliderState>,
+}
+
+impl TransportBar {
+    pub fn new(shared: Shared, editor: Entity<EditorState>, scrubber: Entity<SliderState>) -> Self {
+        Self {
+            shared,
+            editor,
+            scrubber,
         }
     }
 }
 
+impl RenderOnce for TransportBar {
+    fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
+        let TransportBar {
+            shared,
+            editor,
+            scrubber,
+        } = self;
+        let state = editor.read(cx);
+        let total = shared
+            .lock()
+            .unwrap_or_else(|e| e.into_inner())
+            .total_frames;
+        let max = total.saturating_sub(1);
+        let cur = state.current.min(max);
+        let is_playing = state.playing;
+        let is_muted = state.muted;
+        let diff_active = state.diff_active;
+        let diff_side = state.diff_side;
+        let preview_scale = state.preview_scale;
+
+        scrubber.update(cx, |slider, cx| {
+            slider.set_value(
+                SliderValue::Single(frame_to_fraction(cur, total)),
+                window,
+                cx,
+            );
+        });
+
+        let play_editor = editor.clone();
+        let mute_editor = editor.clone();
+        let side_a_editor = editor.clone();
+        let side_b_editor = editor.clone();
+        let step_back_editor = editor.clone();
+        let step_fwd_editor = editor.clone();
+
+        h_flex()
+            .id("transport-bar")
+            .items_center()
+            .gap_3()
+            .px_5()
+            .py_3()
+            .border_t_1()
+            .border_color(cx.theme().border)
+            .child(
+                Button::new("transport-play")
+                    .icon(if is_playing {
+                        IconName::Pause
+                    } else {
+                        IconName::Play
+                    })
+                    .tooltip(if is_playing {
+                        "Pause (Space)"
+                    } else {
+                        "Play (Space)"
+                    })
+                    .ghost()
+                    .small()
+                    .on_click(move |_, _, cx| {
+                        play_editor.update(cx, |state, cx| {
+                            state.playing = !state.playing;
+                            cx.notify();
+                        });
+                    }),
+            )
+            .child(
+                Button::new("transport-mute")
+                    .label(if is_muted { "Unmute" } else { "Mute" })
+                    .tooltip(if is_muted { "Unmute" } else { "Mute" })
+                    .ghost()
+                    .small()
+                    .on_click(move |_, _, cx| {
+                        mute_editor.update(cx, |state, cx| {
+                            state.muted = !state.muted;
+                            super::audio::set_muted(state.muted);
+                            cx.notify();
+                        });
+                    }),
+            )
+            .when(diff_active, |el| {
+                el.child(
+                    h_flex()
+                        .gap_1()
+                        .child(
+                            Button::new("transport-side-a")
+                                .label("A")
+                                .tooltip("Baseline")
+                                .when(diff_side == DiffSide::A, |b| b.primary())
+                                .when(diff_side != DiffSide::A, |b| b.ghost())
+                                .small()
+                                .on_click(move |_, _, cx| {
+                                    side_a_editor.update(cx, |state, cx| {
+                                        state.diff_side = DiffSide::A;
+                                        cx.notify();
+                                    });
+                                }),
+                        )
+                        .child(
+                            Button::new("transport-side-b")
+                                .label("B")
+                                .tooltip("Current")
+                                .when(diff_side == DiffSide::B, |b| b.primary())
+                                .when(diff_side != DiffSide::B, |b| b.ghost())
+                                .small()
+                                .on_click(move |_, _, cx| {
+                                    side_b_editor.update(cx, |state, cx| {
+                                        state.diff_side = DiffSide::B;
+                                        cx.notify();
+                                    });
+                                }),
+                        ),
+                )
+            })
+            .child(
+                Button::new("transport-step-back")
+                    .icon(IconName::ChevronLeft)
+                    .ghost()
+                    .small()
+                    .on_click(move |_, _, cx| {
+                        step_back_editor.update(cx, |state, cx| {
+                            state.current = state.current.saturating_sub(1);
+                            cx.notify();
+                        });
+                    }),
+            )
+            .child(
+                Button::new("transport-step-forward")
+                    .icon(IconName::ChevronRight)
+                    .ghost()
+                    .small()
+                    .on_click(move |_, _, cx| {
+                        step_fwd_editor.update(cx, |state, cx| {
+                            state.current = (state.current + 1).min(max);
+                            cx.notify();
+                        });
+                    }),
+            )
+            .child(div().flex_1().child(Slider::new(&scrubber)))
+            .child(preview_scale_selector(editor.clone(), preview_scale))
+            .child(
+                div()
+                    .min_w(px(96.))
+                    .text_right()
+                    .text_color(cx.theme().muted_foreground)
+                    .child(format!("{cur} / {max}")),
+            )
+    }
+}
+
+fn preview_scale_selector(editor: Entity<EditorState>, current_pct: u16) -> impl IntoElement {
+    h_flex()
+        .id("preview-scale")
+        .gap_1()
+        .children(PREVIEW_SCALE_CHOICES.iter().map(|&pct| {
+            let active = pct == current_pct;
+            let editor = editor.clone();
+            Button::new(SharedString::from(format!("preview-scale-{pct}")))
+                .label(format!("{pct}%"))
+                .tooltip("Preview quality (export is always 100%)")
+                .when(active, |b| b.primary())
+                .when(!active, |b| b.ghost())
+                .xsmall()
+                .on_click(move |_, _, cx| {
+                    set_preview_scale_pct(pct);
+                    editor.update(cx, |state, cx| {
+                        state.preview_scale = pct;
+                        cx.notify();
+                    });
+                })
+        }))
+}
+
 #[cfg(test)]
 mod tests {
+    fn playing_at(frame: u32) -> EditorState {
+        EditorState {
+            current: frame,
+            playing: true,
+            muted: false,
+            rev: 0,
+            selected: None,
+            show_annotations: false,
+            show_hits: true,
+            diff_active: false,
+            diff_side: crate::editor::diff_panel::DiffSide::B,
+            preview_scale: 50,
+            frame: None,
+        }
+    }
+
+    #[test]
+    fn scrubbing_stops_playback_so_restarting_stays_explicit() {
+        let mut state = playing_at(120);
+        seek_from_user(&mut state, 900);
+        assert_eq!(state.current, 900);
+        assert!(
+            !state.playing,
+            "the playhead must stay where it was dropped until the user presses play"
+        );
+    }
+
+    #[test]
+    fn dropping_the_cursor_on_the_current_frame_still_stops_playback() {
+        let mut state = playing_at(120);
+        let moved = seek_from_user(&mut state, 120);
+        assert!(!state.playing);
+        assert!(
+            moved,
+            "the frame did not change but the transport did, so the view must repaint"
+        );
+    }
+
+    #[test]
+    fn seeking_while_already_paused_reports_no_change_when_the_frame_matches() {
+        let mut state = playing_at(120);
+        state.playing = false;
+        assert!(!seek_from_user(&mut state, 120));
+    }
+
+    #[test]
+    fn a_scrub_during_playback_is_honoured_not_overwritten() {
+        let step = advance_playhead(900, Some(120), Some(121), 4340);
+        assert_eq!(
+            step.next, 900,
+            "the audio clock still reports 121; adopting it would snap the playhead back"
+        );
+        assert!(
+            step.rearm_audio,
+            "the sound must be moved to where the user dropped the playhead"
+        );
+    }
+
+    #[test]
+    fn a_backward_scrub_during_playback_is_honoured_too() {
+        let step = advance_playhead(30, Some(900), Some(901), 4340);
+        assert_eq!(step.next, 30);
+        assert!(step.rearm_audio);
+    }
+
+    #[test]
+    fn undisturbed_playback_follows_the_audio_clock() {
+        let step = advance_playhead(120, Some(120), Some(121), 4340);
+        assert_eq!(
+            step.next, 121,
+            "a timer drifts against the sound card; the audio position is the reference"
+        );
+        assert!(!step.rearm_audio);
+    }
+
+    #[test]
+    fn undisturbed_playback_without_audio_advances_by_one() {
+        let step = advance_playhead(120, Some(120), None, 4340);
+        assert_eq!(step.next, 121);
+        assert!(!step.rearm_audio);
+    }
+
+    #[test]
+    fn the_first_tick_of_a_session_adopts_the_audio_clock() {
+        let step = advance_playhead(0, None, Some(3), 4340);
+        assert_eq!(
+            step.next, 3,
+            "no previous write means nothing was overridden"
+        );
+        assert!(!step.rearm_audio);
+    }
+
+    #[test]
+    fn wrapping_past_the_end_rearms_the_sound_at_the_start() {
+        let step = advance_playhead(99, Some(99), None, 100);
+        assert_eq!(step.next, 0);
+        assert!(
+            step.rearm_audio,
+            "the track has to restart, not keep running past the end"
+        );
+    }
+
+    #[test]
+    fn a_seek_beyond_the_last_frame_is_clamped() {
+        let step = advance_playhead(9_999, Some(10), Some(11), 100);
+        assert_eq!(step.next, 99);
+    }
+
+    #[test]
+    fn scrubber_fraction_spans_the_whole_timeline() {
+        assert_eq!(frame_to_fraction(0, 4340), 0.0);
+        assert_eq!(frame_to_fraction(4339, 4340), 1.0);
+        let midpoint = frame_to_fraction(2169, 4340);
+        assert!((midpoint - 0.5).abs() < 0.001, "got {midpoint}");
+    }
+
+    #[test]
+    fn scrubber_fraction_round_trips_to_the_same_frame() {
+        for frame in [0u32, 1, 23, 2169, 4339] {
+            let back = fraction_to_frame(frame_to_fraction(frame, 4340), 4340);
+            assert_eq!(back, frame, "frame {frame} did not survive the round trip");
+        }
+    }
+
+    #[test]
+    fn scrubber_fraction_is_zero_when_the_scenario_has_one_frame() {
+        assert_eq!(frame_to_fraction(0, 1), 0.0);
+        assert_eq!(frame_to_fraction(5, 1), 0.0);
+        assert_eq!(fraction_to_frame(1.0, 1), 0);
+    }
+
+    #[test]
+    fn scrubber_fraction_clamps_out_of_range_input() {
+        assert_eq!(fraction_to_frame(-0.5, 100), 0);
+        assert_eq!(fraction_to_frame(1.5, 100), 99);
+        assert_eq!(frame_to_fraction(999, 100), 1.0);
+    }
+
     use super::*;
 
-    fn ch(s: &str) -> Key {
-        Key::Character(s.to_string())
+    fn mods(shift: bool, control: bool, alt: bool, platform: bool) -> Modifiers {
+        Modifiers {
+            shift,
+            control,
+            alt,
+            platform,
+            function: false,
+        }
     }
 
     #[test]
     fn space_toggles_play() {
         assert_eq!(
-            playback_action(&ch(" "), Modifiers::empty()),
+            playback_action("space", Modifiers::none()),
             Some(PlaybackAction::TogglePlay)
         );
     }
@@ -284,19 +593,19 @@ mod tests {
     #[test]
     fn arrows_step_one_or_ten() {
         assert_eq!(
-            playback_action(&Key::ArrowLeft, Modifiers::empty()),
+            playback_action("left", Modifiers::none()),
             Some(PlaybackAction::Step(-1))
         );
         assert_eq!(
-            playback_action(&Key::ArrowRight, Modifiers::empty()),
+            playback_action("right", Modifiers::none()),
             Some(PlaybackAction::Step(1))
         );
         assert_eq!(
-            playback_action(&Key::ArrowRight, Modifiers::SHIFT),
+            playback_action("right", mods(true, false, false, false)),
             Some(PlaybackAction::Step(10))
         );
         assert_eq!(
-            playback_action(&Key::ArrowLeft, Modifiers::SHIFT),
+            playback_action("left", mods(true, false, false, false)),
             Some(PlaybackAction::Step(-10))
         );
     }
@@ -304,21 +613,30 @@ mod tests {
     #[test]
     fn home_end_seek() {
         assert_eq!(
-            playback_action(&Key::Home, Modifiers::empty()),
+            playback_action("home", Modifiers::none()),
             Some(PlaybackAction::SeekStart)
         );
         assert_eq!(
-            playback_action(&Key::End, Modifiers::empty()),
+            playback_action("end", Modifiers::none()),
             Some(PlaybackAction::SeekEnd)
         );
     }
 
     #[test]
     fn unhandled_or_modified_keys_are_none() {
-        assert_eq!(playback_action(&ch("z"), Modifiers::empty()), None);
-        assert_eq!(playback_action(&ch(" "), Modifiers::META), None);
-        assert_eq!(playback_action(&ch(" "), Modifiers::SHIFT), None);
-        assert_eq!(playback_action(&Key::ArrowRight, Modifiers::CONTROL), None);
-        assert_eq!(playback_action(&Key::Enter, Modifiers::empty()), None);
+        assert_eq!(playback_action("z", Modifiers::none()), None);
+        assert_eq!(
+            playback_action("space", mods(false, false, false, true)),
+            None
+        );
+        assert_eq!(
+            playback_action("space", mods(true, false, false, false)),
+            None
+        );
+        assert_eq!(
+            playback_action("right", mods(false, true, false, false)),
+            None
+        );
+        assert_eq!(playback_action("enter", Modifiers::none()), None);
     }
 }
diff --git a/crates/rustmotion-studio/src/editor/prefetch.rs b/crates/rustmotion-studio/src/editor/prefetch.rs
index 4d68d6b0..b7d8217b 100644
--- a/crates/rustmotion-studio/src/editor/prefetch.rs
+++ b/crates/rustmotion-studio/src/editor/prefetch.rs
@@ -1,41 +1,22 @@
-//! Frame prefetch: an app-global JPEG cache plus a background thread that
-//! renders the frames around the playhead ahead of time, so the asset handler
-//! can answer from memory during playback.
-//!
-//! The prefetcher never touches the model lock: the UI publishes Arc
-//! snapshots of the scenario/tasks (see [`use_prefetch_publisher`]) and the
-//! thread renders from those. The handler and the prefetcher share the cache
-//! mutex; a frame can at worst be rendered twice when the `<img>` requests it
-//! while the prefetcher is mid-render (accepted — no cross-coordination).
-
 use std::collections::{HashMap, HashSet};
 use std::path::PathBuf;
 use std::sync::atomic::{AtomicU16, Ordering};
 use std::sync::{Arc, Mutex, OnceLock};
 use std::time::Duration;
 
-use dioxus::prelude::*;
-
 use rustmotion::encode::video::FrameTask;
 use rustmotion::schema::ResolvedScenario;
 
-use crate::scenario::{baseline_slot, get_baseline, Shared};
+use crate::scenario::{baseline_slot, get_baseline};
 
 use super::diff_panel::DiffSide;
 use super::frames::{baseline_arcs, render_frame};
 
-/// Cache bound (~120 JPEG frames).
 pub const CACHE_CAP: usize = 120;
-/// Frames prefetched ahead of the playhead.
 pub const WINDOW_AHEAD: u32 = 30;
-/// Frames kept behind the playhead while paused (scrub-back comfort).
 pub const WINDOW_BEHIND: u32 = 5;
 
-/// Preview render scale in percent. Applies to every preview render (prefetch
-/// workers and the on-demand asset handler); the export path always renders at
-/// full resolution. Atomic so non-UI threads read it without a Dioxus runtime.
 pub const DEFAULT_PREVIEW_SCALE_PCT: u16 = 50;
-/// The scales offered by the transport-bar quality selector.
 pub const PREVIEW_SCALE_CHOICES: [u16; 4] = [100, 75, 50, 25];
 
 static PREVIEW_SCALE_PCT: AtomicU16 = AtomicU16::new(DEFAULT_PREVIEW_SCALE_PCT);
@@ -48,14 +29,10 @@ pub fn set_preview_scale_pct(pct: u16) {
     PREVIEW_SCALE_PCT.store(pct.clamp(10, 100), Ordering::Relaxed);
 }
 
-/// Percent → render scale factor for [`render_frame`].
 pub fn scale_factor(pct: u16) -> f32 {
     pct as f32 / 100.0
 }
 
-/// Cache key: which model state (`generation` = model generation for side B,
-/// baseline source hash for side A), which side, which frame, at which
-/// preview scale (a frame rendered at 50% must never be served for 100%).
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct FrameKey {
     pub generation: u64,
@@ -64,11 +41,6 @@ pub struct FrameKey {
     pub scale_pct: u16,
 }
 
-// ── Pure logic ───────────────────────────────────────────────────────────────
-
-/// The frames to prefetch, nearest-first from `current`. Playing → forward
-/// only `[current, current+AHEAD]`; paused → also `WINDOW_BEHIND` back.
-/// Clamped to `[0, total)`; forward wins distance ties.
 pub fn prefetch_window(current: u32, playing: bool, total: u32) -> Vec<u32> {
     if total == 0 {
         return Vec::new();
@@ -78,7 +50,6 @@ pub fn prefetch_window(current: u32, playing: bool, total: u32) -> Vec<u32> {
     let lo = current.saturating_sub(behind);
     let hi = current.saturating_add(WINDOW_AHEAD).min(total - 1);
 
-    // Nearest-first from `current`, forward before backward on equal distance.
     let mut out = Vec::with_capacity((hi - lo + 1) as usize);
     out.push(current);
     for d in 1..=(WINDOW_AHEAD.max(behind)) {
@@ -93,11 +64,6 @@ pub fn prefetch_window(current: u32, playing: bool, total: u32) -> Vec<u32> {
     out
 }
 
-/// Which keys to drop: every entry at a different preview scale than
-/// `scale_pct`, every stale-generation entry for a side whose expected
-/// generation is known (`None` = unknowable, keep), then — if the map would
-/// still exceed `cap` — the entries farthest from the playhead (`head`) until
-/// it fits.
 pub fn select_evictions(
     keys: &[FrameKey],
     gen_b: Option<u64>,
@@ -118,17 +84,12 @@ pub fn select_evictions(
 
     let mut fresh: Vec<FrameKey> = keys.iter().filter(|k| !is_stale(k)).copied().collect();
     if fresh.len() > cap {
-        // Farthest from the playhead go first.
         fresh.sort_by_key(|k| std::cmp::Reverse(k.frame.abs_diff(head)));
         evict.extend(fresh.drain(..fresh.len() - cap));
     }
     evict
 }
 
-// ── Cache ────────────────────────────────────────────────────────────────────
-
-/// Bounded JPEG frame cache. All mutation goes through [`FrameCache::insert`],
-/// which applies the eviction policy.
 #[derive(Default)]
 pub struct FrameCache {
     map: HashMap<FrameKey, Arc<Vec<u8>>>,
@@ -143,16 +104,12 @@ impl FrameCache {
         self.map.contains_key(key)
     }
 
-    /// Entry count — test-only introspection for the bound assertions.
     #[cfg(test)]
     #[allow(clippy::len_without_is_empty)]
     pub fn len(&self) -> usize {
         self.map.len()
     }
 
-    /// Insert a frame then enforce the eviction policy around the playhead.
-    /// `scale_pct` is the expected preview scale: entries at any other scale
-    /// are purged (a scale change instantly frees the whole stale set).
     pub fn insert(
         &mut self,
         key: FrameKey,
@@ -172,26 +129,18 @@ impl FrameCache {
 
 pub type SharedFrameCache = Arc<Mutex<FrameCache>>;
 
-/// The app-global frame cache.
 pub fn frame_cache() -> SharedFrameCache {
     static SLOT: OnceLock<SharedFrameCache> = OnceLock::new();
     SLOT.get_or_init(|| Arc::new(Mutex::new(FrameCache::default())))
         .clone()
 }
 
-// ── Claim set ────────────────────────────────────────────────────────────────
-
-/// In-flight render claims shared by the prefetch workers: a worker renders a
-/// frame only after winning its claim, so N workers spread over the window
-/// instead of rendering the same nearest frame N times.
 #[derive(Default)]
 pub struct ClaimSet {
     set: HashSet<FrameKey>,
 }
 
 impl ClaimSet {
-    /// `true` when the caller now owns the claim; `false` when another worker
-    /// already holds it.
     pub fn try_claim(&mut self, key: FrameKey) -> bool {
         self.set.insert(key)
     }
@@ -206,16 +155,8 @@ fn claims() -> &'static Mutex<ClaimSet> {
     SLOT.get_or_init(|| Mutex::new(ClaimSet::default()))
 }
 
-// ── Failure ledger ───────────────────────────────────────────────────────────
-
-/// Attempts a frame gets before workers and the handler stop re-rendering it.
-/// One retry absorbs transient panics; beyond that a panicking frame must not
-/// become an infinite render-panic loop that pegs the workers (the preview
-/// shows the neighboring frame instead).
 pub const MAX_RENDER_ATTEMPTS: u8 = 2;
 
-/// Panicked render attempts per key. Keys carry the generation, so a model
-/// edit naturally retires old entries; the size cap is a runaway backstop.
 #[derive(Default)]
 pub struct FailLedger {
     map: HashMap<FrameKey, u8>,
@@ -239,18 +180,10 @@ pub(crate) fn fail_ledger() -> &'static Mutex<FailLedger> {
     SLOT.get_or_init(|| Mutex::new(FailLedger::default()))
 }
 
-/// Prefetch worker count for a machine with `cores` logical cores: leave two
-/// for the UI/webview and the asset handler, keep at least two workers so a
-/// slow frame never serializes the window, and cap at six (JPEG frames past
-/// that saturate the cache mutex instead of helping).
 pub fn worker_count(cores: usize) -> usize {
     cores.saturating_sub(2).clamp(2, 6)
 }
 
-// ── Prefetcher ───────────────────────────────────────────────────────────────
-
-/// What the UI wants prefetched, published every time the playhead/side/model
-/// moves. Holds Arc snapshots so the thread renders without the model lock.
 #[derive(Clone)]
 pub struct PrefetchTarget {
     pub current: u32,
@@ -259,7 +192,6 @@ pub struct PrefetchTarget {
     pub side: DiffSide,
     pub scenario: Option<Arc<ResolvedScenario>>,
     pub tasks: Option<Arc<Vec<FrameTask>>>,
-    /// Scenario path, for the baseline lookup when side A is active.
     pub path: Option<PathBuf>,
 }
 
@@ -283,15 +215,14 @@ fn prefetch_slot() -> Arc<Mutex<PrefetchTarget>> {
         .clone()
 }
 
-/// (current, playing, generation, side, scale) — the tuple whose change aborts
-/// an in-flight prefetch pass so the window re-targets immediately.
+pub fn publish_target(target: PrefetchTarget) {
+    *prefetch_slot().lock().unwrap_or_else(|e| e.into_inner()) = target;
+}
+
 fn target_fingerprint(t: &PrefetchTarget, scale_pct: u16) -> (u32, bool, u64, DiffSide, u16) {
     (t.current, t.playing, t.generation, t.side, scale_pct)
 }
 
-/// Spawn the prefetch worker pool (idempotent). Workers share the window
-/// through the claim set: each renders the nearest unclaimed missing frame,
-/// so throughput scales with cores instead of serializing on one thread.
 pub fn ensure_prefetcher() {
     static STARTED: OnceLock<()> = OnceLock::new();
     STARTED.get_or_init(|| {
@@ -299,9 +230,6 @@ pub fn ensure_prefetcher() {
             .map(|n| n.get())
             .unwrap_or(4);
         for _ in 0..worker_count(cores) {
-            // Explicit stack: these workers render, and the 2 MiB default is
-            // not enough for a deeply nested scenario in a debug build. Sized
-            // once here rather than per frame — see `frames::RENDER_STACK`.
             let _ = std::thread::Builder::new()
                 .stack_size(crate::editor::frames::RENDER_STACK)
                 .spawn(prefetch_loop);
@@ -317,7 +245,6 @@ fn prefetch_loop() {
             .unwrap_or_else(|e| e.into_inner())
             .clone();
 
-        // Resolve what to render for the ACTIVE side only.
         let (gen, scenario, tasks) = match target.side {
             DiffSide::B => match (&target.scenario, &target.tasks) {
                 (Some(s), Some(t)) => (target.generation, s.clone(), t.clone()),
@@ -341,8 +268,6 @@ fn prefetch_loop() {
         let window = prefetch_window(target.current, target.playing, total);
         let scale = preview_scale_pct();
         let fingerprint = target_fingerprint(&target, scale);
-        // Expected generations for eviction: the model generation is always
-        // known; the baseline hash only while side A is active.
         let (gen_b, gen_a) = match target.side {
             DiffSide::B => (Some(gen), None),
             DiffSide::A => (Some(target.generation), Some(gen)),
@@ -362,8 +287,6 @@ fn prefetch_loop() {
             {
                 continue;
             }
-            // A frame that keeps panicking gets MAX_RENDER_ATTEMPTS, then is
-            // left alone — never an infinite render-panic loop.
             if fail_ledger()
                 .lock()
                 .unwrap_or_else(|e| e.into_inner())
@@ -371,7 +294,6 @@ fn prefetch_loop() {
             {
                 continue;
             }
-            // Another worker already rendering this frame → take the next one.
             if !claims()
                 .lock()
                 .unwrap_or_else(|e| e.into_inner())
@@ -379,15 +301,11 @@ fn prefetch_loop() {
             {
                 continue;
             }
-            // Double-check after winning the claim: the asset handler may have
-            // rendered and inserted this frame while we raced for it.
             let already = frame_cache()
                 .lock()
                 .unwrap_or_else(|e| e.into_inner())
                 .contains(&key);
             if !already {
-                // Panic fence: a Skia panic must skip the frame, not kill the
-                // worker for the whole session.
                 let rendered = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
                     render_frame(&scenario, &tasks, frame, scale_factor(scale))
                 }));
@@ -407,9 +325,6 @@ fn prefetch_loop() {
                 .unwrap_or_else(|e| e.into_inner())
                 .release(&key);
 
-            // Abort the pass as soon as the UI retargets (seek, play/pause,
-            // reload, side flip, scale change) so the new window starts
-            // immediately.
             let now = prefetch_slot()
                 .lock()
                 .unwrap_or_else(|e| e.into_inner())
@@ -421,48 +336,6 @@ fn prefetch_loop() {
     }
 }
 
-/// Publish the prefetch target from the UI (and start the thread on first
-/// use). Re-runs whenever the playhead, play state, diff side, or the model
-/// (via `rev`) changes; takes only a brief model lock to clone the Arcs.
-pub fn use_prefetch_publisher(
-    shared: Shared,
-    current: Signal<u32>,
-    playing: Signal<bool>,
-    rev: Signal<u64>,
-    diff_active: Signal<bool>,
-    diff_side: Signal<DiffSide>,
-) {
-    ensure_prefetcher();
-    use_effect(move || {
-        let cur = current();
-        let play = playing();
-        let _ = rev(); // re-publish fresh Arcs after every hot reload
-        let side = if diff_active() {
-            diff_side()
-        } else {
-            DiffSide::B
-        };
-        let (scenario, tasks, generation, path) = {
-            let m = shared.lock().unwrap_or_else(|e| e.into_inner());
-            (
-                Some(m.scenario.clone()),
-                Some(m.tasks.clone()),
-                m.generation,
-                m.path.clone(),
-            )
-        };
-        *prefetch_slot().lock().unwrap_or_else(|e| e.into_inner()) = PrefetchTarget {
-            current: cur,
-            playing: play,
-            generation,
-            side,
-            scenario,
-            tasks,
-            path,
-        };
-    });
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -476,8 +349,6 @@ mod tests {
         }
     }
 
-    // ── Window ──────────────────────────────────────────────────────────
-
     #[test]
     fn window_playing_is_forward_only_ascending() {
         let w = prefetch_window(10, true, 1000);
@@ -494,7 +365,6 @@ mod tests {
     fn window_paused_is_nearest_first_with_backtrack() {
         let w = prefetch_window(10, false, 1000);
         assert_eq!(w.len(), (WINDOW_AHEAD + WINDOW_BEHIND + 1) as usize);
-        // Nearest-first, forward wins ties: 10, 11, 9, 12, 8, …
         assert_eq!(&w[0..5], &[10, 11, 9, 12, 8]);
         assert!(w.contains(&5) && w.contains(&40));
         assert!(!w.contains(&4) && !w.contains(&41));
@@ -516,7 +386,6 @@ mod tests {
     fn window_clamps_at_end() {
         let w = prefetch_window(99, true, 100);
         assert_eq!(w, vec![99]);
-        // Current beyond total clamps into range instead of exceeding it.
         let w = prefetch_window(500, true, 100);
         assert!(w.iter().all(|&f| f < 100));
     }
@@ -527,14 +396,12 @@ mod tests {
         assert!(prefetch_window(10, false, 0).is_empty());
     }
 
-    // ── Eviction ────────────────────────────────────────────────────────
-
     #[test]
     fn evictions_drop_stale_generations_first() {
         let keys = vec![
-            key(1, DiffSide::B, 0), // stale (gen_b = 2)
+            key(1, DiffSide::B, 0),
             key(2, DiffSide::B, 5),
-            key(7, DiffSide::A, 5), // stale (gen_a = 9)
+            key(7, DiffSide::A, 5),
             key(9, DiffSide::A, 6),
         ];
         let out = select_evictions(&keys, Some(2), Some(9), 5, 100, 100);
@@ -552,7 +419,6 @@ mod tests {
 
     #[test]
     fn evictions_then_farthest_from_head() {
-        // 6 fresh entries, cap 4 → evict the 2 farthest from head=10.
         let keys: Vec<FrameKey> = [10u32, 11, 9, 30, 50, 12]
             .iter()
             .map(|&f| key(1, DiffSide::B, f))
@@ -565,10 +431,9 @@ mod tests {
 
     #[test]
     fn evictions_stale_then_distance_combined() {
-        let mut keys: Vec<FrameKey> = (0..5).map(|f| key(1, DiffSide::B, f)).collect(); // stale
-        keys.extend((0..6).map(|f| key(2, DiffSide::B, f * 10))); // fresh: 0,10,20,30,40,50
+        let mut keys: Vec<FrameKey> = (0..5).map(|f| key(1, DiffSide::B, f)).collect();
+        keys.extend((0..6).map(|f| key(2, DiffSide::B, f * 10)));
         let out = select_evictions(&keys, Some(2), None, 0, 4, 100);
-        // All 5 stale go, plus the 2 farthest fresh (50, 40) to reach cap 4.
         assert_eq!(out.len(), 7);
         assert!(out.contains(&key(2, DiffSide::B, 50)));
         assert!(out.contains(&key(2, DiffSide::B, 40)));
@@ -589,8 +454,6 @@ mod tests {
         assert_eq!(out, vec![old], "same frame at the old scale is stale");
     }
 
-    // ── Cache integration (fake frames, no threads) ─────────────────────
-
     #[test]
     fn cache_roundtrip_and_side_separation() {
         let mut c = FrameCache::default();
@@ -627,7 +490,6 @@ mod tests {
         for f in 0..10 {
             c.insert(key(1, DiffSide::B, f), vec![0], Some(1), None, 0, 100);
         }
-        // First insert of the new generation purges every old-gen entry.
         c.insert(key(2, DiffSide::B, 0), vec![0], Some(2), None, 0, 100);
         assert_eq!(c.len(), 1);
         assert!(c.contains(&key(2, DiffSide::B, 0)));
@@ -639,7 +501,6 @@ mod tests {
         for f in 0..10 {
             c.insert(key(1, DiffSide::B, f), vec![0], Some(1), None, 0, 100);
         }
-        // First insert after a scale switch purges every 100% entry.
         let half = FrameKey {
             scale_pct: 50,
             ..key(1, DiffSide::B, 0)
@@ -649,8 +510,6 @@ mod tests {
         assert!(c.contains(&half));
     }
 
-    // ── Claims / workers ────────────────────────────────────────────────
-
     #[test]
     fn claim_is_exclusive_until_released() {
         let mut claims = ClaimSet::default();
@@ -674,10 +533,6 @@ mod tests {
         assert!(claims.try_claim(other_scale), "other scale");
     }
 
-    /// TEMP diagnostic (not CI): full-pipeline soak — real worker pool, a
-    /// simulated 30fps playhead publishing targets, a simulated asset handler
-    /// serving frames, and the canvas hit-map pass. Prints RSS + serve stats.
-    /// `cargo test -p rustmotion-studio --release soak_full -- --ignored --nocapture`
     #[test]
     #[ignore]
     fn soak_full_pipeline_rss() {
@@ -708,7 +563,6 @@ mod tests {
         static SERVED: AtomicU32 = AtomicU32::new(0);
         static MISSES: AtomicU32 = AtomicU32::new(0);
 
-        // Simulated playback + asset handler + canvas hit pass, 30fps for 60s.
         let s2 = scenario.clone();
         let t2 = tasks.clone();
         let sim = std::thread::spawn(move || {
@@ -753,7 +607,6 @@ mod tests {
                     }
                 }
                 SERVED.fetch_add(1, Ordering::Relaxed);
-                // The canvas hit-map layout pass runs on every tick in the app.
                 let _ = frame_hits(&s2, &t2, current, "/scenes/0");
             }
         });
@@ -798,6 +651,30 @@ mod tests {
         assert_eq!(worker_count(12), 6, "cap at six");
     }
 
+    #[test]
+    fn publish_target_overwrites_the_slot() {
+        let target = PrefetchTarget {
+            current: 42,
+            playing: true,
+            generation: 7,
+            side: DiffSide::A,
+            scenario: None,
+            tasks: None,
+            path: Some(PathBuf::from("/tmp/published.json")),
+        };
+        publish_target(target);
+        let published = prefetch_slot()
+            .lock()
+            .unwrap_or_else(|e| e.into_inner())
+            .clone();
+        assert_eq!(published.current, 42);
+        assert!(published.playing);
+        assert_eq!(published.generation, 7);
+        assert_eq!(published.side, DiffSide::A);
+        assert_eq!(published.path, Some(PathBuf::from("/tmp/published.json")));
+        publish_target(PrefetchTarget::default());
+    }
+
     #[test]
     fn scale_setter_clamps_and_factor_converts() {
         set_preview_scale_pct(50);
diff --git a/crates/rustmotion-studio/src/editor/surface.rs b/crates/rustmotion-studio/src/editor/surface.rs
new file mode 100644
index 00000000..8892c894
--- /dev/null
+++ b/crates/rustmotion-studio/src/editor/surface.rs
@@ -0,0 +1,215 @@
+use std::sync::Arc;
+
+use image::{Frame, ImageBuffer, Rgba};
+use smallvec::smallvec;
+
+use gpui_kit::{
+    div, img, AnyElement, App, ImageSource, IntoElement, ObjectFit, ParentElement, RenderImage,
+    Styled, StyledImage, Window,
+};
+
+use rustmotion::encode::video::FrameTask;
+use rustmotion::schema::ResolvedScenario;
+
+use crate::app::state::EditorState;
+use crate::scenario::Shared;
+
+use super::diff_panel::DiffSide;
+use super::frames::render_frame_rgba_deep;
+use super::prefetch::{ensure_prefetcher, frame_cache, publish_target, FrameKey, PrefetchTarget};
+
+pub fn frame_from_rgba(width: u32, height: u32, mut rgba: Vec<u8>) -> Arc<RenderImage> {
+    let (pixels, _) = rgba.as_chunks_mut::<4>();
+    for pixel in pixels {
+        pixel.swap(0, 2);
+        pixel[3] = 255;
+    }
+    let buffer: ImageBuffer<Rgba<u8>, Vec<u8>> =
+        ImageBuffer::from_raw(width, height, rgba).expect("rgba byte length matches dimensions");
+    Arc::new(RenderImage::new(smallvec![Frame::new(buffer)]))
+}
+
+#[allow(clippy::result_unit_err)]
+pub fn render_current_frame(
+    scenario: &ResolvedScenario,
+    tasks: &[FrameTask],
+    frame: u32,
+    scale: f32,
+) -> Result<Arc<RenderImage>, ()> {
+    let (width, height, rgba) = render_frame_rgba_deep(scenario, tasks, frame, scale)?;
+    if width == 0 || height == 0 {
+        return Err(());
+    }
+    Ok(frame_from_rgba(width, height, rgba))
+}
+
+pub fn swap_frame(
+    editor: &mut EditorState,
+    image: Arc<RenderImage>,
+    window: &mut Window,
+    cx: &mut App,
+) {
+    if let Some(old) = editor.frame.replace(image) {
+        cx.drop_image(old, Some(window));
+    }
+}
+
+pub fn request_next_frame_if_playing(playing: bool, window: &Window) {
+    if playing {
+        window.request_animation_frame();
+    }
+}
+
+pub fn frame_surface(frame: Option<Arc<RenderImage>>) -> AnyElement {
+    match frame {
+        Some(image) => img(ImageSource::Render(image))
+            .size_full()
+            .object_fit(ObjectFit::Contain)
+            .into_any_element(),
+        None => div()
+            .size_full()
+            .flex()
+            .items_center()
+            .justify_center()
+            .child(gpui_component::spinner::Spinner::new())
+            .into_any_element(),
+    }
+}
+
+pub fn frame_from_jpeg(bytes: &[u8]) -> Option<Arc<RenderImage>> {
+    let decoded = image::load_from_memory_with_format(bytes, image::ImageFormat::Jpeg).ok()?;
+    let rgba = decoded.to_rgba8();
+    let (width, height) = rgba.dimensions();
+    Some(frame_from_rgba(width, height, rgba.into_raw()))
+}
+
+pub fn prefetched_frame(key: &FrameKey) -> Option<Arc<RenderImage>> {
+    let bytes = frame_cache()
+        .lock()
+        .unwrap_or_else(|e| e.into_inner())
+        .get(key)?;
+    frame_from_jpeg(&bytes)
+}
+
+fn prefetch_target_for(shared: &Shared, editor: &EditorState) -> PrefetchTarget {
+    let side = if editor.diff_active {
+        editor.diff_side
+    } else {
+        DiffSide::B
+    };
+    let (scenario, tasks, generation, path) = {
+        let model = shared.lock().unwrap_or_else(|e| e.into_inner());
+        (
+            Some(model.scenario.clone()),
+            Some(model.tasks.clone()),
+            model.generation,
+            model.path.clone(),
+        )
+    };
+    PrefetchTarget {
+        current: editor.current,
+        playing: editor.playing,
+        generation,
+        side,
+        scenario,
+        tasks,
+        path,
+    }
+}
+
+pub fn publish_prefetch_target(shared: &Shared, editor: &EditorState) {
+    ensure_prefetcher();
+    publish_target(prefetch_target_for(shared, editor));
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    const SCENARIO: &str = r##"{ "video": { "width": 8, "height": 4, "background": "#101418" }, "scenes": [ { "duration": 1.0 } ] }"##;
+
+    #[test]
+    fn frame_from_rgba_swaps_red_and_blue_and_forces_opaque() {
+        let rgba = vec![10u8, 20, 30, 0, 200, 210, 220, 128];
+        let image = frame_from_rgba(2, 1, rgba);
+        let bytes = image.as_bytes(0).expect("first frame present");
+        assert_eq!(bytes, &[30, 20, 10, 255, 220, 210, 200, 255]);
+    }
+
+    #[test]
+    fn frame_from_rgba_reports_the_given_dimensions() {
+        let rgba = vec![0u8; (4 * 3 * 4) as usize];
+        let image = frame_from_rgba(4, 3, rgba);
+        let size = image.size(0);
+        assert_eq!((size.width.0, size.height.0), (4, 3));
+    }
+
+    #[test]
+    fn render_current_frame_matches_the_scenario_dimensions() {
+        let scenario = rustmotion::loader::load_scenario_from_source(None, Some(SCENARIO)).unwrap();
+        let tasks = rustmotion::encode::build_frame_tasks(&scenario);
+        let image = render_current_frame(&scenario, &tasks, 0, 1.0).unwrap();
+        let size = image.size(0);
+        assert_eq!((size.width.0, size.height.0), (8, 4));
+    }
+
+    #[test]
+    fn render_current_frame_rejects_an_empty_task_list() {
+        let scenario = rustmotion::loader::load_scenario_from_source(None, Some(SCENARIO)).unwrap();
+        assert!(render_current_frame(&scenario, &[], 0, 1.0).is_err());
+    }
+
+    fn editor_state(
+        current: u32,
+        playing: bool,
+        diff_active: bool,
+        diff_side: DiffSide,
+    ) -> EditorState {
+        EditorState {
+            current,
+            playing,
+            muted: false,
+            rev: 0,
+            selected: None,
+            show_annotations: false,
+            show_hits: true,
+            diff_active,
+            diff_side,
+            preview_scale: 100,
+            frame: None,
+        }
+    }
+
+    fn shared_model() -> Shared {
+        use crate::scenario::StudioModel;
+        use std::sync::{Arc as StdArc, Mutex};
+        let scenario = rustmotion::loader::load_scenario_from_source(None, Some(SCENARIO)).unwrap();
+        StdArc::new(Mutex::new(StudioModel::new(scenario, None, None)))
+    }
+
+    #[test]
+    fn prefetch_target_carries_editor_state_and_model_snapshot() {
+        let shared = shared_model();
+        let target = prefetch_target_for(&shared, &editor_state(3, true, true, DiffSide::A));
+
+        assert_eq!(target.current, 3);
+        assert!(target.playing);
+        assert_eq!(target.side, DiffSide::A);
+        assert!(
+            target.scenario.is_some() && target.tasks.is_some(),
+            "workers render from these snapshots and must never take the model lock"
+        );
+    }
+
+    #[test]
+    fn prefetch_target_forces_side_b_when_diff_is_off() {
+        let shared = shared_model();
+        let target = prefetch_target_for(&shared, &editor_state(0, false, false, DiffSide::A));
+
+        assert_eq!(
+            target.side,
+            DiffSide::B,
+            "a stale diff_side must not survive leaving diff mode"
+        );
+    }
+}
diff --git a/crates/rustmotion-studio/src/editor/topbar.rs b/crates/rustmotion-studio/src/editor/topbar.rs
index 1fe8853a..4c731d8e 100644
--- a/crates/rustmotion-studio/src/editor/topbar.rs
+++ b/crates/rustmotion-studio/src/editor/topbar.rs
@@ -1,292 +1,67 @@
-use std::time::Duration;
-
-use dioxus::prelude::*;
-use dioxus_icons::lucide::{
-    Camera, ChevronLeft, Download, Eye, GitCompareArrows, MessageSquare, Monitor, Moon, Play,
-    Redo2, Sun, Undo2,
+use gpui_component::button::{Button, ButtonVariants as _};
+use gpui_component::{
+    h_flex, ActiveTheme, Disableable as _, IconName, Sizable as _, StyledExt as _,
 };
-
-use crate::components::button::{Button, ButtonSize, ButtonVariant};
-use crate::scenario::{
-    baseline_slot, diff_scenarios, get_baseline, history_slot, redo, set_baseline, undo, Shared,
-    SharedHistory, Theme, View,
+use gpui_kit::prelude::FluentBuilder as _;
+use gpui_kit::{
+    div, px, App, Entity, InteractiveElement, IntoElement, ParentElement, RenderOnce, Styled,
+    Window,
 };
 
-use super::diff_panel::DiffSide;
-use super::export::{export_label, export_slot, start_export, use_export_poll, ExportStatus};
+use crate::app::state::{EditorState, StudioState};
+use crate::scenario::{baseline_slot, history_slot, redo, set_baseline, undo, Shared, View};
 
-/// Snapshot of the history slot for the topbar UI (polled, set-on-change).
-#[derive(Clone, PartialEq, Default)]
-struct HistoryUi {
-    can_undo: bool,
-    can_redo: bool,
-    saving: bool,
-}
+use super::export::{export_label, ExportStatus};
 
-/// Poll the history slot into a signal (~150 ms), same pattern as the export
-/// poll. Undo/redo availability only counts when the slot belongs to the
-/// currently open file.
-fn use_history_poll(shared: Shared, slot: SharedHistory, mut sig: Signal<HistoryUi>) {
-    use_future(move || {
-        let shared = shared.clone();
-        let slot = slot.clone();
-        async move {
-            loop {
-                tokio::time::sleep(Duration::from_millis(150)).await;
-                let path = {
-                    let m = shared.lock().unwrap_or_else(|e| e.into_inner());
-                    m.path.clone()
-                };
-                let ui = {
-                    let st = slot.lock().unwrap_or_else(|e| e.into_inner());
-                    let matches = path.is_some() && st.path == path;
-                    HistoryUi {
-                        can_undo: matches && st.history.can_undo(),
-                        can_redo: matches && st.history.can_redo(),
-                        saving: st.saving,
-                    }
-                };
-                if ui != sig() {
-                    sig.set(ui);
-                }
-            }
-        }
-    });
-}
-
-/// Poll whether the current scenario differs from its baseline (~300 ms) —
-/// drives the Diff toggle's enabled state.
-fn use_diff_poll(shared: Shared, mut sig: Signal<bool>) {
-    use_future(move || {
-        let shared = shared.clone();
-        async move {
-            loop {
-                tokio::time::sleep(Duration::from_millis(300)).await;
-                let (path, raw) = {
-                    let m = shared.lock().unwrap_or_else(|e| e.into_inner());
-                    (m.path.clone(), m.raw.clone())
-                };
-                let changed = path
-                    .and_then(|p| get_baseline(&baseline_slot(), &p))
-                    .map(|b| !diff_scenarios(&b.raw, &raw).is_empty())
-                    .unwrap_or(false);
-                if changed != sig() {
-                    sig.set(changed);
-                }
-            }
-        }
-    });
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
+pub struct HistoryUi {
+    pub can_undo: bool,
+    pub can_redo: bool,
+    pub saving: bool,
 }
 
-/// The editor's top bar (open-slide style): a back-to-library control on the
-/// left, the centered document title, and the action cluster on the right
-/// (theme swap, Set baseline, Diff toggle, Inspect overlay toggle, Comments
-/// panel toggle, Export, and Present). `write_error` is `Some` when the last
-/// inspector write failed; shown as a discrete warning indicator using the
-/// `--rm-error` token. The export state (slot + polling) lives here too — the
-/// topbar is its only consumer.
-#[component]
-pub fn TopBar(
-    view: Signal<View>,
+pub struct TopBar {
+    shared: Shared,
+    studio: Entity<StudioState>,
+    editor: Entity<EditorState>,
     title: String,
-    playing: Signal<bool>,
-    current: Signal<u32>,
-    show_annotations: Signal<bool>,
-    show_hits: Signal<bool>,
+    history_ui: HistoryUi,
+    diff_available: bool,
     comment_count: usize,
     write_error: Option<String>,
     audio_error: Option<String>,
-    diff_active: Signal<bool>,
-    diff_side: Signal<DiffSide>,
-) -> Element {
-    let shared = use_context::<Shared>();
-    let mut theme = use_context::<Signal<Theme>>();
-    let inspecting = show_hits();
-    let commenting = show_annotations();
-    let current_theme = theme();
-
-    // Export state: the cross-thread slot the encode thread writes, and the
-    // polled signal that drives the button label / status text.
-    let export = use_hook(export_slot);
-    let mut export_status = use_signal(|| ExportStatus::Idle);
-    use_export_poll(export.clone(), export_status);
-    let status = export_status();
-    let exporting = status.is_running();
-
-    // Undo/redo + pending-write ("Saving…") state, polled from the history slot.
-    let history = use_hook(history_slot);
-    let history_ui = use_signal(HistoryUi::default);
-    use_history_poll(shared.clone(), history.clone(), history_ui);
-    let hist = history_ui();
-
-    // Diff availability (scenario differs from baseline).
-    let diff_available = use_signal(|| false);
-    use_diff_poll(shared.clone(), diff_available);
-    let diffing = diff_active();
-    let can_diff = diff_available();
-
-    rsx! {
-        div {
-            style: "position:relative; display:flex; align-items:center; justify-content:space-between; height:40px; padding:0 12px; border-bottom:1px solid var(--rm-border); background:var(--rm-surface-2); flex:none;",
-            // A focused topbar button owns its keys (Space activates IT, not
-            // play/pause) — same isolation pattern as the inspector panel.
-            onkeydown: move |evt: KeyboardEvent| evt.stop_propagation(),
-            div { style: "display:flex; align-items:center; gap:8px; z-index:1;",
-                Button {
-                    variant: ButtonVariant::Outline,
-                    size: ButtonSize::Sm,
-                    onclick: move |_| view.set(View::Library),
-                    ChevronLeft { size: 16 }
-                    "Library"
-                }
-            }
-
-            // ── Center: document title (absolutely centered) ─────────
-            div { style: "position:absolute; left:50%; top:50%; transform:translate(-50%,-50%); color:var(--rm-text-strong); font-weight:500; max-width:40%; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;",
-                "{title}"
-            }
+    export_status: ExportStatus,
+}
 
-            // ── Right: indicators + actions ──────────────────────────
-            div { style: "display:flex; align-items:center; gap:6px; z-index:1;",
-                if hist.saving {
-                    span { style: "color:var(--rm-text-muted); font-size:11px; white-space:nowrap;",
-                        "Saving…"
-                    }
-                }
-                if let Some(ref msg) = write_error {
-                    span {
-                        title: "{msg}",
-                        style: "color:var(--rm-error); font-size:11px; white-space:nowrap; max-width:200px; overflow:hidden; text-overflow:ellipsis;",
-                        "Changes not saved: {msg}"
-                    }
-                }
-                if let Some(ref msg) = audio_error {
-                    span {
-                        title: "{msg}",
-                        style: "color:var(--rm-error); font-size:11px; white-space:nowrap; max-width:220px; overflow:hidden; text-overflow:ellipsis;",
-                        "Audio not analysed: {msg}"
-                    }
-                }
-                Button {
-                    variant: ButtonVariant::Ghost,
-                    size: ButtonSize::IconSm,
-                    title: "Undo (Cmd+Z)",
-                    disabled: !hist.can_undo,
-                    onclick: {
-                        let shared = shared.clone();
-                        let history = history.clone();
-                        move |_| undo(&shared, &history)
-                    },
-                    Undo2 { size: 15, stroke: if hist.can_undo { "var(--rm-text)" } else { "var(--rm-text-muted)" } }
-                }
-                Button {
-                    variant: ButtonVariant::Ghost,
-                    size: ButtonSize::IconSm,
-                    title: "Redo (Shift+Cmd+Z)",
-                    disabled: !hist.can_redo,
-                    onclick: {
-                        let shared = shared.clone();
-                        let history = history.clone();
-                        move |_| redo(&shared, &history)
-                    },
-                    Redo2 { size: 15, stroke: if hist.can_redo { "var(--rm-text)" } else { "var(--rm-text-muted)" } }
-                }
-                Button {
-                    variant: ButtonVariant::Outline,
-                    size: ButtonSize::IconSm,
-                    title: "Theme: {current_theme.label()}",
-                    onclick: move |_| theme.set(theme().next()),
-                    match current_theme {
-                        Theme::Dark => rsx! { Moon { size: 15 } },
-                        Theme::Light => rsx! { Sun { size: 15 } },
-                        Theme::System => rsx! { Monitor { size: 15 } },
-                    }
-                }
-                Button {
-                    variant: ButtonVariant::Outline,
-                    size: ButtonSize::IconSm,
-                    title: "Set baseline (snapshot the current state for diff review)",
-                    onclick: {
-                        let shared = shared.clone();
-                        move |_| set_baseline_now(&shared)
-                    },
-                    Camera { size: 15 }
-                }
-                Button {
-                    variant: if diffing { ButtonVariant::Secondary } else { ButtonVariant::Outline },
-                    size: ButtonSize::Sm,
-                    // Stays enabled while active so it can always be switched off.
-                    disabled: !can_diff && !diffing,
-                    title: if can_diff || diffing { "Compare against the baseline" } else { "No changes since baseline" },
-                    onclick: move |_| {
-                        let next = !diff_active();
-                        diff_active.set(next);
-                        if next {
-                            diff_side.set(DiffSide::B);
-                        }
-                    },
-                    GitCompareArrows { size: 15 }
-                    "Diff"
-                }
-                Button {
-                    variant: if inspecting { ButtonVariant::Secondary } else { ButtonVariant::Outline },
-                    size: ButtonSize::Sm,
-                    onclick: move |_| show_hits.set(!show_hits()),
-                    Eye { size: 15 }
-                    "Inspect"
-                }
-                Button {
-                    variant: if commenting { ButtonVariant::Secondary } else { ButtonVariant::Outline },
-                    size: ButtonSize::Sm,
-                    onclick: move |_| show_annotations.set(!show_annotations()),
-                    MessageSquare { size: 15 }
-                    "Comments"
-                    if comment_count > 0 {
-                        span { style: "background:var(--rm-border-2); color:var(--rm-text); border-radius:999px; padding:0 6px; font-size:11px; line-height:18px;",
-                            "{comment_count}"
-                        }
-                    }
-                }
-                Button {
-                    variant: ButtonVariant::Secondary,
-                    size: ButtonSize::Sm,
-                    disabled: exporting,
-                    onclick: {
-                        let shared = shared.clone();
-                        let export = export.clone();
-                        move |_| {
-                            if !exporting {
-                                start_export(&shared, &export);
-                                // Instant feedback; the poll refines it within 150 ms.
-                                export_status.set(ExportStatus::Running {
-                                    phase: "Rendering",
-                                    done: 0,
-                                    total: 0,
-                                });
-                            }
-                        }
-                    },
-                    Download { size: 14 }
-                    "{export_label(&status)}"
-                }
-                Button {
-                    variant: ButtonVariant::Primary,
-                    size: ButtonSize::Sm,
-                    onclick: move |_| {
-                        current.set(0);
-                        playing.set(true);
-                    },
-                    Play { size: 14 }
-                    "Present"
-                }
-            }
+impl TopBar {
+    #[allow(clippy::too_many_arguments)]
+    pub fn new(
+        shared: Shared,
+        studio: Entity<StudioState>,
+        editor: Entity<EditorState>,
+        title: String,
+        history_ui: HistoryUi,
+        diff_available: bool,
+        comment_count: usize,
+        write_error: Option<String>,
+        audio_error: Option<String>,
+        export_status: ExportStatus,
+    ) -> Self {
+        Self {
+            shared,
+            studio,
+            editor,
+            title,
+            history_ui,
+            diff_available,
+            comment_count,
+            write_error,
+            audio_error,
+            export_status,
         }
     }
 }
 
-/// Re-snapshot the baseline from the current state: source text re-read from
-/// disk, raw taken from the live model (so it matches what future models will
-/// hold). Read failures surface through `write_error`.
 fn set_baseline_now(shared: &Shared) {
     let (path, raw) = {
         let m = shared.lock().unwrap_or_else(|e| e.into_inner());
@@ -304,3 +79,253 @@ fn set_baseline_now(shared: &Shared) {
         }
     }
 }
+
+impl RenderOnce for TopBar {
+    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
+        let TopBar {
+            shared,
+            studio,
+            editor,
+            title,
+            history_ui,
+            diff_available,
+            comment_count,
+            write_error,
+            audio_error,
+            export_status,
+        } = self;
+
+        let theme_pref = studio.read(cx).theme_pref;
+        let diff_active = editor.read(cx).diff_active;
+        let show_hits = editor.read(cx).show_hits;
+        let show_annotations = editor.read(cx).show_annotations;
+        let exporting = export_status.is_running();
+
+        let library_studio = studio.clone();
+        let undo_shared = shared.clone();
+        let redo_shared = shared.clone();
+        let baseline_shared = shared.clone();
+        let diff_editor = editor.clone();
+        let inspect_editor = editor.clone();
+        let comments_editor = editor.clone();
+        let export_shared = shared.clone();
+        let present_editor = editor.clone();
+
+        h_flex()
+            .id("topbar")
+            .relative()
+            .flex_none()
+            .h(px(40.))
+            .w_full()
+            .items_center()
+            .justify_between()
+            .px_3()
+            .border_b_1()
+            .border_color(cx.theme().border)
+            .bg(cx.theme().secondary)
+            .child(
+                h_flex().items_center().gap_2().child(
+                    Button::new("topbar-library")
+                        .icon(IconName::ChevronLeft)
+                        .label("Library")
+                        .ghost()
+                        .small()
+                        .on_click(move |_, _, cx| {
+                            library_studio.update(cx, |state, cx| {
+                                state.view = View::Library;
+                                cx.notify();
+                            });
+                        }),
+                ),
+            )
+            .child(
+                div()
+                    .absolute()
+                    .inset_0()
+                    .flex()
+                    .items_center()
+                    .justify_center()
+                    .child(
+                        div()
+                            .font_semibold()
+                            .text_color(cx.theme().foreground)
+                            .child(title),
+                    ),
+            )
+            .child(
+                h_flex()
+                    .items_center()
+                    .gap_2()
+                    .when(history_ui.saving, |el| {
+                        el.child(
+                            div()
+                                .text_xs()
+                                .text_color(cx.theme().muted_foreground)
+                                .child("Saving…"),
+                        )
+                    })
+                    .when_some(write_error, |el, msg| {
+                        el.child(
+                            div()
+                                .text_xs()
+                                .max_w(px(200.))
+                                .truncate()
+                                .text_color(cx.theme().danger)
+                                .child(format!("Changes not saved: {msg}")),
+                        )
+                    })
+                    .when_some(audio_error, |el, msg| {
+                        el.child(
+                            div()
+                                .text_xs()
+                                .max_w(px(220.))
+                                .truncate()
+                                .text_color(cx.theme().danger)
+                                .child(format!("Audio not analysed: {msg}")),
+                        )
+                    })
+                    .child(
+                        Button::new("topbar-undo")
+                            .icon(IconName::Undo2)
+                            .tooltip("Undo (Cmd+Z)")
+                            .ghost()
+                            .xsmall()
+                            .disabled(!history_ui.can_undo)
+                            .on_click(move |_, _, _cx| {
+                                undo(&undo_shared, &history_slot());
+                            }),
+                    )
+                    .child(
+                        Button::new("topbar-redo")
+                            .icon(IconName::Redo2)
+                            .tooltip("Redo (Shift+Cmd+Z)")
+                            .ghost()
+                            .xsmall()
+                            .disabled(!history_ui.can_redo)
+                            .on_click(move |_, _, _cx| {
+                                redo(&redo_shared, &history_slot());
+                            }),
+                    )
+                    .child(
+                        Button::new("topbar-theme")
+                            .when_some(theme_pref_icon(theme_pref), |b, icon| b.icon(icon))
+                            .label(theme_pref.label())
+                            .tooltip(format!("Theme: {}", theme_pref.label()))
+                            .ghost()
+                            .xsmall()
+                            .on_click(move |_, window, cx| {
+                                let next = studio.read(cx).theme_pref.next();
+                                crate::theme::set(&studio, next, window, cx);
+                            }),
+                    )
+                    .child(
+                        Button::new("topbar-baseline")
+                            .icon(IconName::Frame)
+                            .label("Baseline")
+                            .tooltip("Set baseline (snapshot the current state for diff review)")
+                            .ghost()
+                            .xsmall()
+                            .on_click(move |_, _, _cx| {
+                                set_baseline_now(&baseline_shared);
+                            }),
+                    )
+                    .child(
+                        Button::new("topbar-diff")
+                            .label("Diff")
+                            .tooltip(if diff_available || diff_active {
+                                "Compare against the baseline"
+                            } else {
+                                "No changes since baseline"
+                            })
+                            .when(diff_active, |b| b.primary())
+                            .when(!diff_active, |b| b.secondary())
+                            .small()
+                            .disabled(!diff_available && !diff_active)
+                            .on_click(move |_, _, cx| {
+                                diff_editor.update(cx, |state, cx| {
+                                    let next = !state.diff_active;
+                                    state.diff_active = next;
+                                    if next {
+                                        state.diff_side = super::diff_panel::DiffSide::B;
+                                    }
+                                    cx.notify();
+                                });
+                            }),
+                    )
+                    .child(
+                        Button::new("topbar-inspect")
+                            .icon(if show_hits {
+                                IconName::Eye
+                            } else {
+                                IconName::EyeOff
+                            })
+                            .label("Inspect")
+                            .when(show_hits, |b| b.primary())
+                            .when(!show_hits, |b| b.secondary())
+                            .small()
+                            .on_click(move |_, _, cx| {
+                                inspect_editor.update(cx, |state, cx| {
+                                    state.show_hits = !state.show_hits;
+                                    cx.notify();
+                                });
+                            }),
+                    )
+                    .child(
+                        Button::new("topbar-comments")
+                            .icon(IconName::Inbox)
+                            .label(if comment_count > 0 {
+                                format!("Comments ({comment_count})")
+                            } else {
+                                "Comments".to_string()
+                            })
+                            .when(show_annotations, |b| b.primary())
+                            .when(!show_annotations, |b| b.secondary())
+                            .small()
+                            .on_click(move |_, _, cx| {
+                                comments_editor.update(cx, |state, cx| {
+                                    state.show_annotations = !state.show_annotations;
+                                    cx.notify();
+                                });
+                            }),
+                    )
+                    .child(
+                        Button::new("topbar-export")
+                            .label(export_label(&export_status))
+                            .secondary()
+                            .small()
+                            .disabled(exporting)
+                            .on_click(move |_, _, _cx| {
+                                if !exporting {
+                                    super::export::start_export(
+                                        &export_shared,
+                                        &super::export::export_slot(),
+                                    );
+                                }
+                            }),
+                    )
+                    .child(
+                        Button::new("topbar-present")
+                            .icon(IconName::Play)
+                            .label("Present")
+                            .primary()
+                            .small()
+                            .on_click(move |_, _, cx| {
+                                present_editor.update(cx, |state, cx| {
+                                    state.current = 0;
+                                    state.playing = true;
+                                    cx.notify();
+                                });
+                            }),
+                    ),
+            )
+    }
+}
+
+fn theme_pref_icon(pref: crate::app::state::ThemePref) -> Option<IconName> {
+    use crate::app::state::ThemePref;
+    match pref {
+        ThemePref::Dark => Some(IconName::Moon),
+        ThemePref::Light => Some(IconName::Sun),
+        ThemePref::System => None,
+    }
+}
diff --git a/crates/rustmotion-studio/src/editor/view.rs b/crates/rustmotion-studio/src/editor/view.rs
index 75025a27..12d9ddfb 100644
--- a/crates/rustmotion-studio/src/editor/view.rs
+++ b/crates/rustmotion-studio/src/editor/view.rs
@@ -1,579 +1,602 @@
-use dioxus::desktop::{
-    use_asset_handler, wry::http::Response, AssetRequest, RequestAsyncResponder,
+use gpui_component::slider::SliderState;
+use gpui_component::{v_flex, ActiveTheme};
+use gpui_kit::{
+    div, AnyElement, AppContext as _, Context, Entity, FocusHandle, InteractiveElement,
+    IntoElement, KeyBinding, Modifiers, ParentElement, Render, RenderOnce,
+    StatefulInteractiveElement, Styled, Subscription, Window,
 };
-use dioxus::prelude::*;
 
+use crate::app::state::{EditorState, StudioState};
 use crate::scenario::{
-    baseline_slot, diff_scenarios, get_baseline, history_slot, list_annotations, read_field,
-    read_style_object, redo, undo, ChangeKind, ElementChange, Shared, View,
+    baseline_slot, diff_scenarios, get_baseline, history_slot, list_annotations, redo, undo,
+    ChangeKind, Shared,
 };
 
 use super::annotations::AnnotationsPanel;
 use super::diff_panel::{DiffPanel, DiffSide};
-use super::export::ExportToast;
-use super::frames::{baseline_arcs, frame_hits, render_frame_deep, scene_prefix, HitPct};
+use super::export::{export_slot, ExportStatus, ExportWatcher};
+use super::frames::{baseline_arcs, frame_hits_deep, scene_prefix};
 use super::inspector::InspectorPanel;
-use super::playback::{
-    playback_action, use_hot_reload, use_playback_clock, PlaybackAction, PlaybackBar,
+use super::playback::{self, apply_playback_action, playback_action, TransportBar};
+use super::prefetch::{scale_factor, FrameKey};
+use super::surface::{
+    frame_surface, prefetched_frame, publish_prefetch_target, render_current_frame,
+    request_next_frame_if_playing, swap_frame,
 };
-use super::prefetch::{
-    fail_ledger, frame_cache, preview_scale_pct, scale_factor, use_prefetch_publisher, FrameKey,
-};
-use super::topbar::TopBar;
-
-/// The hot-reload revision signal, exposed via context so the optimistic edit
-/// path can nudge the canvas immediately instead of waiting for the 250 ms
-/// generation poll.
-#[derive(Clone, Copy)]
-pub struct RevSignal(pub Signal<u64>);
-
-/// Overlay element boxes: invisible by default. Only the single hovered element
-/// (`.hov`) gets a dashed outline, and the selected element (`.sel`) a solid
-/// blue box. "Hovered" is tracked explicitly (one node at a time) rather than
-/// via CSS `:hover`, which would light every overlapping box under the cursor.
-/// In diff mode, changed elements keep a persistent outline: `.diff-add`
-/// (green) for added, `.diff-mod` (accent) for modified.
-const HIT_CSS: &str = "\
-.rm-hit { position:absolute; box-sizing:border-box; cursor:pointer; border:1px dashed transparent; background:transparent; transition:border-color 80ms, background 80ms; }\
-.rm-hit.hov { border-color:var(--rm-overlay-border); background:var(--rm-overlay-hover); }\
-.rm-hit.sel { border:1px dashed var(--rm-overlay-border); background:transparent; }\
-.rm-hit.diff-add { border:1px solid #22c55e; }\
-.rm-hit.diff-mod { border:1px solid var(--rm-accent); }";
-
-/// The editor view. Reads the shared studio model from context, registers an
-/// asset handler that renders frames to JPEG on demand, and assembles the
-/// topbar, canvas (with the clickable element overlay), transport bar, the
-/// inspector, and the comments panel.
-#[component]
-pub fn StudioApp(view: Signal<View>) -> Element {
-    let shared = use_context::<Shared>();
-
-    let current = use_signal(|| 0u32);
-    let playing = use_signal(|| false);
-    let muted = use_signal(|| false);
-    let rev = use_signal(|| 0u64);
-    // Selection stores (node_id, pointer, kind) so the inspector stays open via
-    // the stored pointer even if the element collapses out of the hit-map.
-    let selected = use_signal(|| None::<(u32, String, String)>);
-    let show_annotations = use_signal(|| false);
-    // Whether the clickable element overlay is shown (the "Inspect" toggle).
-    let show_hits = use_signal(|| true);
-    // Diff/review mode: toggle + which state the canvas shows (A = baseline).
-    let diff_active = use_signal(|| false);
-    let diff_side = use_signal(|| DiffSide::B);
-    // Preview render scale (percent). The atomic is the source of truth for
-    // the render threads; this signal mirrors it for the UI (selector value,
-    // <img> URL cache-bust).
-    let preview_scale = use_signal(preview_scale_pct);
-
-    // Asset handler: GET /frame/{idx} -> JPEG of that frame. `?side=a` renders
-    // the BASELINE scenario instead (diff mode flip). Cache-first: a prefetched
-    // frame is served straight from memory (no model lock, no render). On miss,
-    // the Arcs are cloned under a brief lock and the render runs OUTSIDE any
-    // lock (catch_unwind keeps a Skia panic from poisoning anything), then the
-    // frame is inserted so the next request hits. The prefetcher may race this
-    // path and render the same frame once more — accepted, the cache dedupes.
-    let handler_shared = shared.clone();
-    use_asset_handler(
-        "frame",
-        move |request: AssetRequest, responder: RequestAsyncResponder| {
-            let uri = request.uri().to_string();
-            let idx: u32 = uri
-                .rsplit('/')
-                .next()
-                .and_then(|s| s.split('?').next())
-                .and_then(|s| s.parse().ok())
-                .unwrap_or(0);
-            let side_a = uri.contains("side=a");
-
-            let result: Result<Vec<u8>, ()> = if side_a {
-                let path = {
-                    let m = handler_shared.lock().unwrap_or_else(|e| e.into_inner());
-                    m.path.clone()
-                };
-                match path
-                    .and_then(|p| get_baseline(&baseline_slot(), &p).map(|b| (p, b)))
-                    .ok_or(())
-                    .and_then(|(p, b)| baseline_arcs(&p, &b.source).map_err(|_| ()))
-                {
-                    Ok((hash, scenario, tasks)) => {
-                        let key = FrameKey {
-                            generation: hash,
-                            side: DiffSide::A,
-                            frame: idx,
-                            scale_pct: preview_scale_pct(),
-                        };
-                        serve_or_render(key, idx, &scenario, &tasks, None)
+use super::topbar::{HistoryUi, TopBar};
+
+gpui_kit::actions!(editor_shell, [Undo, Redo]);
+
+#[must_use = "the returned frame still owns a GPU texture and must reach cx.drop_image"]
+fn reset_for_new_document(
+    state: &mut EditorState,
+) -> Option<std::sync::Arc<gpui_kit::RenderImage>> {
+    state.current = 0;
+    state.playing = false;
+    state.selected = None;
+    state.diff_active = false;
+    state.diff_side = DiffSide::B;
+    state.frame.take()
+}
+
+type RenderKey = (u32, u64, DiffSide, u16);
+type HitsKey = (u32, u64, DiffSide);
+
+pub struct EditorView {
+    shared: Shared,
+    studio: Entity<StudioState>,
+    pub(super) editor: Entity<EditorState>,
+    inspector: Entity<InspectorPanel>,
+    export_watcher: Entity<ExportWatcher>,
+    scrubber: Entity<SliderState>,
+    focus_handle: FocusHandle,
+    history_ui: HistoryUi,
+    diff_available: bool,
+    export_status: ExportStatus,
+    pub(super) hovered_hit: Option<u32>,
+    hits_cache: Vec<super::frames::HitPct>,
+    hits_key: Option<HitsKey>,
+    rendering_frame: bool,
+    last_frame_key: Option<RenderKey>,
+    open_document: Option<std::path::PathBuf>,
+    _subscriptions: Vec<Subscription>,
+}
+
+impl EditorView {
+    pub fn new(state: Entity<StudioState>, window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let shared = state.read(cx).shared.clone();
+        let editor = cx.new(|_| EditorState {
+            current: 0,
+            playing: false,
+            muted: false,
+            rev: 0,
+            selected: None,
+            show_annotations: false,
+            show_hits: true,
+            diff_active: false,
+            diff_side: DiffSide::B,
+            preview_scale: super::prefetch::preview_scale_pct(),
+            frame: None,
+        });
+
+        let inspector =
+            cx.new(|cx| InspectorPanel::new(shared.clone(), editor.clone(), window, cx));
+        let export_watcher = cx.new(|cx| ExportWatcher::new(window, cx));
+        let scrubber = playback::new_scrubber(cx);
+
+        cx.bind_keys([
+            KeyBinding::new("space", playback::TogglePlay, Some("Editor")),
+            KeyBinding::new("left", playback::StepBackward, Some("Editor")),
+            KeyBinding::new("shift-left", playback::StepBackwardBig, Some("Editor")),
+            KeyBinding::new("right", playback::StepForward, Some("Editor")),
+            KeyBinding::new("shift-right", playback::StepForwardBig, Some("Editor")),
+            KeyBinding::new("home", playback::SeekToStart, Some("Editor")),
+            KeyBinding::new("end", playback::SeekToEnd, Some("Editor")),
+            KeyBinding::new("cmd-z", Undo, Some("Editor")),
+            KeyBinding::new("shift-cmd-z", Redo, Some("Editor")),
+        ]);
+
+        playback::spawn_playback_clock(shared.clone(), editor.clone(), cx);
+        playback::spawn_hot_reload(shared.clone(), editor.clone(), cx);
+
+        let mut subscriptions = Vec::new();
+        subscriptions.push(cx.observe_in(&editor, window, |this, _editor, window, cx| {
+            let snapshot = this.editor.read(cx);
+            publish_prefetch_target(&this.shared, snapshot);
+            this.sync_frame(window, cx);
+            cx.notify();
+        }));
+        subscriptions.push(cx.subscribe(&scrubber, |this, _scrubber, event, cx| {
+            if let gpui_component::slider::SliderEvent::Change(
+                gpui_component::slider::SliderValue::Single(v),
+            ) = event
+            {
+                let total = this
+                    .shared
+                    .lock()
+                    .unwrap_or_else(|e| e.into_inner())
+                    .total_frames;
+                let frame = playback::fraction_to_frame(*v, total);
+                this.editor.update(cx, |state, cx| {
+                    if playback::seek_from_user(state, frame) {
+                        cx.notify();
                     }
-                    Err(()) => Err(()),
-                }
-            } else {
-                let (scenario, tasks, generation) = {
-                    let m = handler_shared.lock().unwrap_or_else(|e| e.into_inner());
-                    (m.scenario.clone(), m.tasks.clone(), m.generation)
-                };
-                let key = FrameKey {
-                    generation,
-                    side: DiffSide::B,
-                    frame: idx,
-                    scale_pct: preview_scale_pct(),
-                };
-                serve_or_render(key, idx, &scenario, &tasks, Some(generation))
+                });
+            }
+        }));
+
+        let focus_handle = cx.focus_handle();
+        window.focus(&focus_handle, cx);
+
+        let mut view = Self {
+            shared: shared.clone(),
+            studio: state,
+            editor: editor.clone(),
+            inspector,
+            export_watcher,
+            scrubber,
+            focus_handle,
+            history_ui: HistoryUi::default(),
+            diff_available: false,
+            export_status: ExportStatus::Idle,
+            hovered_hit: None,
+            hits_cache: Vec::new(),
+            hits_key: None,
+            rendering_frame: false,
+            last_frame_key: None,
+            open_document: None,
+            _subscriptions: subscriptions,
+        };
+        view.spawn_topbar_polls(cx);
+        {
+            let snapshot = editor.read(cx);
+            publish_prefetch_target(&shared, snapshot);
+        }
+        view.sync_frame(window, cx);
+        view
+    }
+
+    fn spawn_topbar_polls(&self, cx: &mut Context<Self>) {
+        let shared = self.shared.clone();
+        cx.spawn(async move |this, cx| loop {
+            cx.background_executor()
+                .timer(std::time::Duration::from_millis(150))
+                .await;
+            let (path, raw) = {
+                let m = shared.lock().unwrap_or_else(|e| e.into_inner());
+                (m.path.clone(), m.raw.clone())
             };
-            match result {
-                Ok(jpeg) => {
-                    responder.respond(
-                        Response::builder()
-                            .header("Content-Type", "image/jpeg")
-                            .header("Cache-Control", "no-cache, no-store, must-revalidate")
-                            .header("Pragma", "no-cache")
-                            .header("Expires", "0")
-                            .body(jpeg)
-                            .unwrap(),
-                    );
+            let history_ui = {
+                let slot = history_slot();
+                let st = slot.lock().unwrap_or_else(|e| e.into_inner());
+                let matches = path.is_some() && st.path == path;
+                HistoryUi {
+                    can_undo: matches && st.history.can_undo(),
+                    can_redo: matches && st.history.can_redo(),
+                    saving: st.saving,
                 }
-                Err(()) => {
-                    responder.respond(
-                        Response::builder()
-                            .status(500)
-                            .header("Content-Type", "text/plain")
-                            .body(b"render error".to_vec())
-                            .unwrap(),
-                    );
-                }
-            }
-        },
-    );
-
-    use_playback_clock(shared.clone(), current, playing);
-    use_hot_reload(shared.clone(), rev);
-    use_context_provider(|| RevSignal(rev));
-    // Publish the playhead/side/model snapshot for the background prefetcher.
-    use_prefetch_publisher(
-        shared.clone(),
-        current,
-        playing,
-        rev,
-        diff_active,
-        diff_side,
-    );
-
-    let (total, fps, err, write_err, audio_err, title, annotations) = {
-        let m = shared.lock().unwrap_or_else(|e| e.into_inner());
-        let title = m
-            .path
-            .as_ref()
-            .and_then(|p| p.file_stem())
-            .and_then(|s| s.to_str())
-            .unwrap_or("Untitled")
-            .to_string();
-        (
-            m.total_frames,
-            m.scenario.video.fps.max(1),
-            m.error.clone(),
-            m.write_error.clone(),
-            m.audio_error.clone(),
-            title,
-            list_annotations(&m.raw),
-        )
-    };
-    let comment_count = annotations.len();
-
-    // Inspector data for the selected element, computed ONCE per selection (not
-    // on every model reload). Editing a property reloads the model and refreshes
-    // the preview, but this memo doesn't recompute (selection is unchanged), so
-    // the inspector's controls aren't re-rendered and keep their own state — no
-    // focus/popover disruption. Driven by the stored pointer, so it stays open
-    // even if the element collapses out of the current frame's hit-map.
-    let inspector_shared = shared.clone();
-    let inspector = use_memo(move || {
-        selected().map(|(_, pointer, kind)| {
-            let m = inspector_shared.lock().unwrap_or_else(|e| e.into_inner());
-            let style = read_style_object(&m.raw, &pointer);
-            let content = read_field(&m.raw, &pointer, "content");
-            // Element root object (children stripped) for the schema-driven
-            // Properties section.
-            let element = m
-                .raw
-                .pointer(&pointer)
-                .cloned()
-                .map(|mut v| {
-                    if let Some(o) = v.as_object_mut() {
-                        o.remove("children");
+            };
+            let diff_available = path
+                .clone()
+                .and_then(|p| get_baseline(&baseline_slot(), &p))
+                .map(|b| !diff_scenarios(&b.raw, &raw).is_empty())
+                .unwrap_or(false);
+            let export_status = export_slot()
+                .lock()
+                .unwrap_or_else(|e| e.into_inner())
+                .clone();
+            let alive = this
+                .update(cx, |this, cx| {
+                    if this.history_ui != history_ui
+                        || this.diff_available != diff_available
+                        || this.export_status != export_status
+                    {
+                        this.history_ui = history_ui;
+                        this.diff_available = diff_available;
+                        this.export_status = export_status;
+                        cx.notify();
                     }
-                    v
                 })
-                .unwrap_or(serde_json::Value::Null);
-            (pointer, style, kind, content, element)
+                .is_ok();
+            if !alive {
+                break;
+            }
         })
-    });
-
-    // Baseline→current diff, recomputed on hot reload (rev) while diff mode is
-    // active. Reading it below also subscribes this component, so the panel and
-    // highlights refresh when an agent edit lands on disk.
-    let diff_shared = shared.clone();
-    let diff_data = use_memo(move || {
-        if !diff_active() {
-            return None;
-        }
-        let _ = rev(); // recompute on every reload
-        let m = diff_shared.lock().unwrap_or_else(|e| e.into_inner());
-        let path = m.path.clone()?;
-        let baseline = get_baseline(&baseline_slot(), &path)?;
-        Some(diff_scenarios(&baseline.raw, &m.raw))
-    });
-
-    if let Some(e) = err {
-        return rsx! {
-            div { style: "padding:24px; color:var(--rm-error); background:var(--rm-bg); min-height:100vh; font:13px sans-serif;",
-                "Error: {e}"
+        .detach();
+    }
+
+    fn refresh_hits(&mut self, cx: &mut Context<Self>) {
+        let should = self.editor.read(cx).should_compute_hits();
+        if !should {
+            if !self.hits_cache.is_empty() {
+                self.hits_cache.clear();
             }
+            self.hits_key = None;
+            return;
+        }
+        let (current, rev, side) = {
+            let e = self.editor.read(cx);
+            let side = if e.diff_active {
+                e.diff_side
+            } else {
+                DiffSide::B
+            };
+            (e.current, e.rev, side)
         };
-    }
+        let key: HitsKey = (current, rev, side);
+        if self.hits_key == Some(key) {
+            return;
+        }
+        self.hits_key = Some(key);
 
-    // Persistent outlines for changed elements (B side only: the hit overlay
-    // is computed from the CURRENT model, so it can't mark baseline layouts).
-    let changes: Option<Vec<ElementChange>> = diff_data();
-    let diff_marks: Vec<(String, ChangeKind)> = if diff_side() == DiffSide::B {
-        changes
-            .as_deref()
-            .unwrap_or(&[])
-            .iter()
-            .filter(|c| c.kind != ChangeKind::Removed)
-            .map(|c| (c.pointer.clone(), c.kind.clone()))
-            .collect()
-    } else {
-        Vec::new()
-    };
-
-    // Panel slot: the diff panel takes over the inspector's slot while diff
-    // mode is active; otherwise the inspector shows for the selected element.
-    let panel = inspector();
-    let diff_on = diff_active();
-    let panel_w = if diff_on || panel.is_some() {
-        "300px"
-    } else {
-        "0px"
-    };
-
-    // Undo/redo keyboard shortcuts: the root div is focusable (and focused on
-    // mount) so Cmd+Z / Shift+Cmd+Z (Ctrl on non-mac) reach it — key events in
-    // the subtree bubble up to it. The inspector slot stops keydown propagation
-    // so text fields keep their native editing undo.
-    let history = use_hook(history_slot);
-    let on_shortcut = {
-        let shared = shared.clone();
-        let history = history.clone();
-        let mut playing = playing;
-        let mut current = current;
-        move |evt: KeyboardEvent| {
-            let mods = evt.modifiers();
-            let key = evt.key();
-            // Undo / redo (Cmd/Ctrl+Z, Shift for redo).
-            if (mods.meta() || mods.ctrl())
-                && matches!(key, Key::Character(ref c) if c.eq_ignore_ascii_case("z"))
-            {
-                evt.prevent_default();
-                if mods.shift() {
-                    redo(&shared, &history);
-                } else {
-                    undo(&shared, &history);
+        if side == DiffSide::A {
+            self.hits_cache.clear();
+            return;
+        }
+
+        let (scenario, tasks, raw) = {
+            let m = self.shared.lock().unwrap_or_else(|e| e.into_inner());
+            (m.scenario.clone(), m.tasks.clone(), m.raw.clone())
+        };
+        let cur = current.min((tasks.len() as u32).saturating_sub(1));
+
+        cx.spawn(async move |this, cx| {
+            let hits = cx
+                .background_spawn(async move {
+                    let prefix = scene_prefix(&raw, &tasks, cur);
+                    frame_hits_deep(&scenario, &tasks, cur, &prefix).unwrap_or_default()
+                })
+                .await;
+            let _ = this.update(cx, |this, cx| {
+                if this.hits_key == Some(key) {
+                    this.hits_cache = hits;
+                    cx.notify();
                 }
-                return;
+            });
+        })
+        .detach();
+    }
+
+    fn sync_document(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let path = {
+            let m = self.shared.lock().unwrap_or_else(|e| e.into_inner());
+            m.path.clone()
+        };
+        if self.open_document == path {
+            return;
+        }
+        self.open_document = path;
+
+        self.hits_cache.clear();
+        self.hits_key = None;
+        self.hovered_hit = None;
+        self.last_frame_key = None;
+
+        self.editor.update(cx, |state, cx| {
+            if let Some(stale) = reset_for_new_document(state) {
+                cx.drop_image(stale, Some(window));
+            }
+            cx.notify();
+        });
+    }
+
+    fn sync_frame(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let (current, rev, side, scale_pct) = {
+            let e = self.editor.read(cx);
+            let side = if e.diff_active {
+                e.diff_side
+            } else {
+                DiffSide::B
+            };
+            (e.current, e.rev, side, e.preview_scale)
+        };
+        let key: RenderKey = (current, rev, side, scale_pct);
+        if self.rendering_frame || self.last_frame_key == Some(key) {
+            return;
+        }
+
+        let (scenario, tasks, generation) = match side {
+            DiffSide::B => {
+                let m = self.shared.lock().unwrap_or_else(|e| e.into_inner());
+                (m.scenario.clone(), m.tasks.clone(), m.generation)
             }
-            // Transport: Space toggles, arrows step (Shift = ×10), Home/End
-            // seek. prevent_default keeps Space from scrolling/activating and
-            // arrows from scrolling the page.
-            if let Some(action) = playback_action(&key, mods) {
-                evt.prevent_default();
-                let max = {
-                    let m = shared.lock().unwrap_or_else(|e| e.into_inner());
-                    m.total_frames.saturating_sub(1)
+            DiffSide::A => {
+                let path = {
+                    let m = self.shared.lock().unwrap_or_else(|e| e.into_inner());
+                    m.path.clone()
                 };
-                match action {
-                    PlaybackAction::TogglePlay => playing.set(!playing()),
-                    PlaybackAction::Step(d) => {
-                        playing.set(false);
-                        let next = (current() as i64 + d).clamp(0, max as i64) as u32;
-                        current.set(next);
-                    }
-                    PlaybackAction::SeekStart => current.set(0),
-                    PlaybackAction::SeekEnd => current.set(max),
-                }
+                let Some(path) = path else {
+                    return;
+                };
+                let Some(baseline) = get_baseline(&baseline_slot(), &path) else {
+                    return;
+                };
+                let Ok((hash, scenario, tasks)) = baseline_arcs(&path, &baseline.source) else {
+                    return;
+                };
+                (scenario, tasks, hash)
             }
+        };
+
+        let cache_key = FrameKey {
+            generation,
+            side,
+            frame: current,
+            scale_pct,
+        };
+        if let Some(image) = prefetched_frame(&cache_key) {
+            self.last_frame_key = Some(key);
+            self.editor.update(cx, |state, cx| {
+                swap_frame(state, image, window, cx);
+                cx.notify();
+            });
+            return;
         }
-    };
-
-    rsx! {
-        div {
-            style: "margin:0; background:var(--rm-bg); height:100vh; overflow:hidden; color:var(--rm-text); font:13px -apple-system,sans-serif; display:flex; flex-direction:column; outline:none;",
-            tabindex: "0",
-            onmounted: move |evt| {
-                spawn(async move {
-                    let _ = evt.set_focus(true).await;
-                });
-            },
-            onkeydown: on_shortcut,
-            TopBar {
-                view,
-                title,
-                playing,
-                current,
-                show_annotations,
-                show_hits,
-                comment_count,
-                write_error: write_err,
-                audio_error: audio_err,
-                diff_active,
-                diff_side,
-            }
-            div { style: "flex:1; display:flex; flex-direction:row; flex-wrap:nowrap; align-items:stretch; min-height:0; overflow:hidden;",
-                div { style: "flex:1; min-width:0; display:flex; flex-direction:column; min-height:0;",
-                    Canvas { current, rev, show_hits, playing, selected, diff_active, diff_side, diff_marks, preview_scale }
-                    PlaybackBar { current, playing, total, fps, muted, diff_active, diff_side, preview_scale }
-                }
-                div {
-                    style: "flex:none; display:flex; overflow:hidden; transition:width 220ms ease; width:{panel_w};",
-                    // Keep Cmd+Z inside inspector inputs/textareas native
-                    // (text-field undo), not intercepted by the editor.
-                    onkeydown: move |evt: KeyboardEvent| evt.stop_propagation(),
-                    if diff_on {
-                        DiffPanel {
-                            changes: changes.unwrap_or_default(),
-                            selected,
-                            current,
-                            diff_active,
-                        }
-                    } else if let Some((pointer, style, kind, content, element)) = panel {
-                        InspectorPanel { selected, pointer, kind, current, content, style, element }
-                    }
+
+        self.last_frame_key = Some(key);
+        self.rendering_frame = true;
+        let editor_entity = self.editor.clone();
+        let scale = scale_factor(scale_pct);
+        cx.spawn_in(window, async move |this, cx| {
+            let image = cx
+                .background_spawn(
+                    async move { render_current_frame(&scenario, &tasks, current, scale) },
+                )
+                .await;
+            let _ = this.update_in(cx, |this, window, cx| {
+                this.rendering_frame = false;
+                if let Ok(image) = image {
+                    editor_entity.update(cx, |state, cx| {
+                        swap_frame(state, image, window, cx);
+                        cx.notify();
+                    });
                 }
-            }
-            if show_annotations() {
-                AnnotationsPanel { current, annotations: annotations.clone() }
-            }
+                cx.notify();
+                window.refresh();
+            });
+        })
+        .detach();
+    }
+
+    fn dispatch_playback(&mut self, key: &str, mods: Modifiers, cx: &mut Context<Self>) {
+        if let Some(action) = playback_action(key, mods) {
+            apply_playback_action(action, &self.shared, &self.editor, cx);
         }
     }
 }
 
-/// Cache-first frame fetch for the asset handler: serve the prefetched JPEG
-/// when present, otherwise render outside any lock (panic-fenced) and insert
-/// into the cache for the next request. `gen_b` is `Some(model generation)`
-/// when serving side B (drives stale-generation eviction); side A passes the
-/// baseline hash inside `key.generation` and `None` here.
-///
-/// `render_frame_deep` already isolates a render panic inside its own scoped
-/// thread and reports it as `Err`; the `catch_unwind` here only guards the
-/// (rarer) case of the OS failing to spawn that thread.
-fn serve_or_render(
-    key: FrameKey,
-    idx: u32,
-    scenario: &rustmotion::schema::ResolvedScenario,
-    tasks: &[rustmotion::encode::video::FrameTask],
-    gen_b: Option<u64>,
-) -> Result<Vec<u8>, ()> {
-    if let Some(bytes) = frame_cache()
-        .lock()
-        .unwrap_or_else(|e| e.into_inner())
-        .get(&key)
-    {
-        return Ok((*bytes).clone());
-    }
-    // A frame whose render keeps panicking is not retried on every <img>
-    // request — fail fast so the webview shows the previous frame instead of
-    // hammering a panic loop.
-    if fail_ledger()
-        .lock()
-        .unwrap_or_else(|e| e.into_inner())
-        .exhausted(&key)
-    {
-        return Err(());
-    }
-    let outer = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
-        render_frame_deep(scenario, tasks, idx, scale_factor(key.scale_pct))
-    }));
-    let rendered = match outer {
-        Ok(Ok(bytes)) => bytes,
-        _ => {
-            fail_ledger()
+impl Render for EditorView {
+    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let error = {
+            self.shared
                 .lock()
                 .unwrap_or_else(|e| e.into_inner())
-                .record_failure(key);
-            return Err(());
+                .error
+                .clone()
+        };
+        if let Some(err) = error {
+            return div()
+                .p_6()
+                .size_full()
+                .bg(cx.theme().background)
+                .text_color(cx.theme().danger)
+                .child(format!("Error: {err}"))
+                .into_any_element();
         }
-    };
-    let (gen_b, gen_a) = match key.side {
-        DiffSide::B => (gen_b, None),
-        DiffSide::A => (None, Some(key.generation)),
-    };
-    frame_cache()
-        .lock()
-        .unwrap_or_else(|e| e.into_inner())
-        .insert(key, rendered.clone(), gen_b, gen_a, idx, key.scale_pct);
-    Ok(rendered)
-}
 
-/// The preview canvas: the rendered frame plus the clickable element overlay.
-/// It owns the reads of `current`/`rev`/`show_hits`, so a playback tick or a
-/// model reload (e.g. after an inspector edit) re-renders ONLY this subtree —
-/// never the editor chrome or the inspector, which keep their own state.
-/// In diff mode with side A, the image renders the baseline scenario (the
-/// overlay is hidden: its boxes come from the current model's layout).
-/// Whether the clickable-element hit-map should be (re)computed this render.
-///
-/// Computing it runs a FULL paint pass (backdrop-filters and all) on a
-/// full-resolution raster surface on the MAIN thread — ~150ms per frame on a
-/// glass-heavy scene. During playback the playhead moves at fps and nothing is
-/// hoverable, so recomputing per frame just pins the main thread at 100% and
-/// freezes the UI. The hit-map only matters at rest (hover/click the inspector),
-/// so skip it while playing; it returns the instant playback pauses.
-pub fn should_compute_hits(show_hits: bool, side_a: bool, playing: bool) -> bool {
-    show_hits && !side_a && !playing
-}
+        self.sync_document(window, cx);
+        request_next_frame_if_playing(self.editor.read(cx).playing, window);
+        self.refresh_hits(cx);
 
-#[component]
-fn Canvas(
-    current: Signal<u32>,
-    rev: Signal<u64>,
-    show_hits: Signal<bool>,
-    playing: Signal<bool>,
-    mut selected: Signal<Option<(u32, String, String)>>,
-    diff_active: Signal<bool>,
-    diff_side: Signal<DiffSide>,
-    diff_marks: Vec<(String, ChangeKind)>,
-    preview_scale: Signal<u16>,
-) -> Element {
-    let shared = use_context::<Shared>();
-    // Arc snapshots under a brief lock; the hit-map layout render below runs
-    // WITHOUT the model lock.
-    let (scenario, tasks) = {
-        let m = shared.lock().unwrap_or_else(|e| e.into_inner());
-        (m.scenario.clone(), m.tasks.clone())
-    };
-    let (vw, vh) = (scenario.video.width, scenario.video.height);
-    let max = (tasks.len() as u32).saturating_sub(1);
-    let cur = current().min(max);
-    let r = rev();
-    // In the URL purely as a cache-buster: a scale change re-requests the
-    // frame (the handler reads the scale itself from the atomic).
-    let s = preview_scale();
-    let side_a = diff_active() && diff_side() == DiffSide::A;
-    let side_suffix = if side_a { "&side=a" } else { "" };
-
-    let hits = if should_compute_hits(show_hits(), side_a, playing()) {
-        let prefix = {
-            let m = shared.lock().unwrap_or_else(|e| e.into_inner());
-            scene_prefix(&m.raw, &tasks, cur)
+        let (title, write_error, audio_error, raw, vw, vh) = {
+            let m = self.shared.lock().unwrap_or_else(|e| e.into_inner());
+            let title = m
+                .path
+                .as_ref()
+                .and_then(|p| p.file_stem())
+                .and_then(|s| s.to_str())
+                .unwrap_or("Untitled")
+                .to_string();
+            (
+                title,
+                m.write_error.clone(),
+                m.audio_error.clone(),
+                m.raw.clone(),
+                m.scenario.video.width,
+                m.scenario.video.height,
+            )
         };
-        frame_hits(&scenario, &tasks, cur, &prefix)
-    } else {
-        Vec::new()
-    };
-
-    rsx! {
-        div {
-            // position:relative anchors the export toast (bottom-right).
-            style: "position:relative; flex:1; min-width:0; min-height:0; display:flex; align-items:center; justify-content:center; padding:16px; overflow:hidden;",
-            // Clicking the empty canvas (not an element) clears the selection.
-            onclick: move |_| selected.set(None),
-            // Wrapper carries the video's aspect ratio and is capped at 100% of the
-            // (definite) canvas in both axes, so it scales to fit without the circular
-            // `max-width:100%` collapse an inline-block shrink-wrap would cause when the
-            // canvas narrows (e.g. the inspector opens). The image fills it 1:1, so the
-            // overlay stays exactly aligned.
-            div { style: "position:relative; aspect-ratio:{vw} / {vh}; max-width:100%; max-height:100%; min-width:0; box-shadow:0 8px 40px rgba(0,0,0,0.5); line-height:0;",
-                img {
-                    src: "/frame/{cur}?v={r}&s={s}{side_suffix}",
-                    style: "display:block; width:100%; height:100%;",
-                }
-                Overlay { hits, selected, diff_marks }
-            }
-            ExportToast {}
-        }
-    }
-}
+        let annotations = list_annotations(&raw);
+        let comment_count = annotations.len();
 
-/// The clickable element overlay over the frame. Tracks a single hovered node so
-/// only the element directly under the cursor is outlined (the innermost box,
-/// since it paints on top and captures the pointer). Owns its `hovered` signal
-/// so moving the cursor re-renders just the overlay, not the whole editor.
-/// `diff_marks` adds persistent outlines to changed elements (matched by
-/// pointer) while diff mode shows the current state.
-#[component]
-fn Overlay(
-    hits: Vec<HitPct>,
-    selected: Signal<Option<(u32, String, String)>>,
-    diff_marks: Vec<(String, ChangeKind)>,
-) -> Element {
-    let mut hovered = use_signal(|| None::<u32>);
-    // Selection matches by node id (canvas clicks) or pointer (diff panel
-    // clicks store u32::MAX as the id).
-    let (selected_node, selected_ptr) = match selected() {
-        Some((id, ptr, _)) => (Some(id), Some(ptr)),
-        None => (None, None),
-    };
-    let hov = hovered();
-
-    let mark_class = |hit: &HitPct| -> &'static str {
-        let Some(ptr) = hit.pointer.as_deref() else {
-            return "";
+        let (diff_active, diff_side, show_annotations, selected) = {
+            let e = self.editor.read(cx);
+            (
+                e.diff_active,
+                e.diff_side,
+                e.show_annotations,
+                e.selected.clone(),
+            )
         };
-        match diff_marks.iter().find(|(p, _)| p == ptr) {
-            Some((_, ChangeKind::Added)) => " diff-add",
-            Some((_, ChangeKind::Modified)) => " diff-mod",
-            _ => "",
-        }
-    };
-
-    rsx! {
-        div { style: "position:absolute; inset:0;",
-            style { "{HIT_CSS}" }
-            for hit in hits.iter() {
-                div {
-                    key: "{hit.node_id}",
-                    class: {
-                        let is_sel = selected_node == Some(hit.node_id)
-                            || (hit.pointer.is_some() && hit.pointer.as_deref() == selected_ptr.as_deref());
-                        let base = if is_sel {
-                            "rm-hit sel"
-                        } else if hov == Some(hit.node_id) {
-                            "rm-hit hov"
-                        } else {
-                            "rm-hit"
-                        };
-                        format!("{base}{}", mark_class(hit))
-                    },
-                    style: format!(
-                        "left:{}%; top:{}%; width:{}%; height:{}%;",
-                        hit.x, hit.y, hit.w, hit.h,
-                    ),
-                    onmouseenter: {
-                        let id = hit.node_id;
-                        move |_| hovered.set(Some(id))
-                    },
-                    onmouseleave: {
-                        let id = hit.node_id;
-                        move |_| {
-                            if hovered() == Some(id) {
-                                hovered.set(None);
-                            }
-                        }
-                    },
-                    onclick: {
-                        let id = hit.node_id;
-                        let ptr = hit.pointer.clone();
-                        let kind = hit.kind.clone();
-                        move |evt: MouseEvent| {
-                            // Don't let the click bubble to the canvas (which deselects).
-                            evt.stop_propagation();
-                            if let Some(ptr) = ptr.clone() {
-                                selected.set(Some((id, ptr, kind.clone())));
-                            }
-                        }
-                    },
-                }
-            }
-        }
+
+        let changes = if diff_active {
+            let path = {
+                self.shared
+                    .lock()
+                    .unwrap_or_else(|e| e.into_inner())
+                    .path
+                    .clone()
+            };
+            path.and_then(|p| get_baseline(&baseline_slot(), &p))
+                .map(|b| diff_scenarios(&b.raw, &raw))
+                .unwrap_or_default()
+        } else {
+            Vec::new()
+        };
+        let diff_marks: Vec<(String, ChangeKind)> = if diff_active && diff_side == DiffSide::B {
+            changes
+                .iter()
+                .filter(|c| c.kind != ChangeKind::Removed)
+                .map(|c| (c.pointer.clone(), c.kind.clone()))
+                .collect()
+        } else {
+            Vec::new()
+        };
+
+        let frame = self.editor.read(cx).frame.clone();
+        let hits = self.hits_cache.clone();
+        let overlay = self.render_hit_overlay(&hits, selected.as_ref(), &diff_marks, cx);
+
+        let panel: Option<AnyElement> = if diff_active {
+            Some(
+                DiffPanel::new(self.shared.clone(), self.editor.clone(), changes)
+                    .render(window, cx)
+                    .into_any_element(),
+            )
+        } else if selected.is_some() {
+            Some(self.inspector.clone().into_any_element())
+        } else {
+            None
+        };
+
+        let canvas = div()
+            .id("canvas")
+            .relative()
+            .flex_1()
+            .min_w_0()
+            .min_h_0()
+            .flex()
+            .items_center()
+            .justify_center()
+            .p_4()
+            .overflow_hidden()
+            .on_click(cx.listener(|this, _event, _window, cx| {
+                this.editor.update(cx, |state, cx| {
+                    if state.selected.is_some() {
+                        state.selected = None;
+                        cx.notify();
+                    }
+                });
+            }))
+            .child(
+                div()
+                    .relative()
+                    .h_full()
+                    .aspect_ratio(vw.max(1) as f32 / vh.max(1) as f32)
+                    .max_w_full()
+                    .max_h_full()
+                    .child(frame_surface(frame))
+                    .child(overlay),
+            );
+
+        let transport = TransportBar::new(
+            self.shared.clone(),
+            self.editor.clone(),
+            self.scrubber.clone(),
+        )
+        .render(window, cx)
+        .into_any_element();
+
+        let topbar = TopBar::new(
+            self.shared.clone(),
+            self.studio.clone(),
+            self.editor.clone(),
+            title,
+            self.history_ui,
+            self.diff_available,
+            comment_count,
+            write_error,
+            audio_error,
+            self.export_status.clone(),
+        )
+        .render(window, cx)
+        .into_any_element();
+
+        let annotations_panel = show_annotations.then(|| {
+            AnnotationsPanel::new(self.shared.clone(), self.editor.clone(), annotations)
+                .render(window, cx)
+                .into_any_element()
+        });
+
+        div()
+            .id("editor-shell")
+            .key_context("Editor")
+            .track_focus(&self.focus_handle)
+            .relative()
+            .size_full()
+            .flex()
+            .flex_col()
+            .bg(cx.theme().background)
+            .text_color(cx.theme().foreground)
+            .on_action(cx.listener(|this, _: &playback::TogglePlay, _window, cx| {
+                this.dispatch_playback("space", Modifiers::none(), cx);
+            }))
+            .on_action(
+                cx.listener(|this, _: &playback::StepBackward, _window, cx| {
+                    this.dispatch_playback("left", Modifiers::none(), cx);
+                }),
+            )
+            .on_action(
+                cx.listener(|this, _: &playback::StepBackwardBig, _window, cx| {
+                    this.dispatch_playback(
+                        "left",
+                        Modifiers {
+                            shift: true,
+                            ..Modifiers::none()
+                        },
+                        cx,
+                    );
+                }),
+            )
+            .on_action(cx.listener(|this, _: &playback::StepForward, _window, cx| {
+                this.dispatch_playback("right", Modifiers::none(), cx);
+            }))
+            .on_action(
+                cx.listener(|this, _: &playback::StepForwardBig, _window, cx| {
+                    this.dispatch_playback(
+                        "right",
+                        Modifiers {
+                            shift: true,
+                            ..Modifiers::none()
+                        },
+                        cx,
+                    );
+                }),
+            )
+            .on_action(cx.listener(|this, _: &playback::SeekToStart, _window, cx| {
+                this.dispatch_playback("home", Modifiers::none(), cx);
+            }))
+            .on_action(cx.listener(|this, _: &playback::SeekToEnd, _window, cx| {
+                this.dispatch_playback("end", Modifiers::none(), cx);
+            }))
+            .on_action(cx.listener(|this, _: &Undo, _window, cx| {
+                undo(&this.shared, &history_slot());
+                cx.notify();
+            }))
+            .on_action(cx.listener(|this, _: &Redo, _window, cx| {
+                redo(&this.shared, &history_slot());
+                cx.notify();
+            }))
+            .child(topbar)
+            .child(
+                div()
+                    .flex_1()
+                    .flex()
+                    .flex_row()
+                    .min_h_0()
+                    .child(
+                        v_flex()
+                            .flex_1()
+                            .min_w_0()
+                            .min_h_0()
+                            .child(canvas)
+                            .child(transport),
+                    )
+                    .children(panel),
+            )
+            .children(annotations_panel)
+            .child(self.export_watcher.clone())
+            .into_any_element()
     }
 }
 
@@ -581,23 +604,68 @@ fn Overlay(
 mod tests {
     use super::*;
 
+    fn editor_state_mid_session() -> EditorState {
+        EditorState {
+            current: 412,
+            playing: true,
+            muted: false,
+            rev: 9,
+            selected: Some(crate::app::state::Selection {
+                node_id: 7,
+                pointer: "/scenes/2/children/3".into(),
+                kind: "text".into(),
+            }),
+            show_annotations: true,
+            show_hits: true,
+            diff_active: true,
+            diff_side: DiffSide::A,
+            preview_scale: 50,
+            frame: None,
+        }
+    }
+
     #[test]
-    fn hits_skipped_during_playback() {
-        // The whole point: playing never computes the (expensive) hit-map.
-        assert!(!should_compute_hits(true, false, true));
+    fn opening_another_document_drops_the_selection_pointing_into_the_old_one() {
+        let mut state = editor_state_mid_session();
+        let _ = reset_for_new_document(&mut state);
+        assert!(
+            state.selected.is_none(),
+            "a pointer like /scenes/2/children/3 resolves in the new document too, \
+             and would silently edit a different element"
+        );
     }
 
     #[test]
-    fn hits_computed_at_rest_when_enabled() {
-        assert!(should_compute_hits(true, false, false));
+    fn opening_another_document_rewinds_the_playhead_and_stops_playback() {
+        let mut state = editor_state_mid_session();
+        let _ = reset_for_new_document(&mut state);
+        assert_eq!(
+            state.current, 0,
+            "frame 412 may not exist in the new document"
+        );
+        assert!(!state.playing);
     }
 
     #[test]
-    fn hits_never_computed_when_disabled_or_baseline() {
-        assert!(!should_compute_hits(false, false, false), "Inspect off");
+    fn opening_another_document_leaves_diff_mode() {
+        let mut state = editor_state_mid_session();
+        let _ = reset_for_new_document(&mut state);
         assert!(
-            !should_compute_hits(true, true, false),
-            "baseline (A) has no current-model hit-map"
+            !state.diff_active,
+            "the baseline belonged to the old document"
+        );
+        assert_eq!(state.diff_side, DiffSide::B);
+    }
+
+    #[test]
+    fn opening_another_document_keeps_the_session_preferences() {
+        let mut state = editor_state_mid_session();
+        let _ = reset_for_new_document(&mut state);
+        assert_eq!(
+            state.preview_scale, 50,
+            "preview quality is a session choice, not a document one"
         );
+        assert!(state.show_hits);
+        assert!(state.show_annotations);
     }
 }
diff --git a/crates/rustmotion-studio/src/lib.rs b/crates/rustmotion-studio/src/lib.rs
index 82f295de..957b8785 100644
--- a/crates/rustmotion-studio/src/lib.rs
+++ b/crates/rustmotion-studio/src/lib.rs
@@ -1,8 +1,8 @@
 mod app;
-mod components;
 pub mod editor;
 mod library;
 pub mod scenario;
+mod theme;
 
 pub use app::{run_preview, run_preview_with_error};
 
@@ -15,15 +15,20 @@ use rustmotion::loader::load_scenario;
 #[derive(Parser)]
 #[command(name = "rustmotion-studio", about = "Rustmotion live preview studio")]
 pub struct Cli {
-    /// Path to a JSON scenario to open directly in the editor (optional).
-    #[arg(short, long)]
+    #[arg(
+        short,
+        long,
+        help = "Path to a JSON scenario to open directly in the editor (optional)."
+    )]
     file: Option<PathBuf>,
-    /// Workspace directory to scan for scenarios (default: current directory).
-    #[arg(short, long)]
+    #[arg(
+        short,
+        long,
+        help = "Workspace directory to scan for scenarios (default: current directory)."
+    )]
     dir: Option<PathBuf>,
 }
 
-/// Returns the clap Command for shell completion generation.
 pub fn command() -> clap::Command {
     Cli::command()
 }
diff --git a/crates/rustmotion-studio/src/library/data.rs b/crates/rustmotion-studio/src/library/data.rs
index 2a2b9735..0525078b 100644
--- a/crates/rustmotion-studio/src/library/data.rs
+++ b/crates/rustmotion-studio/src/library/data.rs
@@ -108,15 +108,6 @@ impl LibraryState {
     }
 }
 
-pub fn render_thumbnail(path: &Path) -> Option<Vec<u8>> {
-    let scenario = rustmotion::loader::load_input(&path.to_path_buf()).ok()?;
-    let tasks = rustmotion::encode::build_frame_tasks(&scenario);
-    if tasks.is_empty() {
-        return None;
-    }
-    crate::editor::frames::render_frame_deep(&scenario, &tasks, 0, 0.25).ok()
-}
-
 pub fn is_scenario_json(v: &serde_json::Value) -> bool {
     v.get("video").map(|x| x.is_object()).unwrap_or(false)
         && (v.get("scenes").map(|x| x.is_array()).unwrap_or(false)
diff --git a/crates/rustmotion-studio/src/library/mod.rs b/crates/rustmotion-studio/src/library/mod.rs
index 031914e2..7197fc2f 100644
--- a/crates/rustmotion-studio/src/library/mod.rs
+++ b/crates/rustmotion-studio/src/library/mod.rs
@@ -1,8 +1,5 @@
-//! The library home page: workspace scanning, recents, thumbnail cache, and the
-//! card-grid UI that fronts the editor.
-
 mod data;
 mod view;
 
-pub use data::{render_thumbnail, LibraryState, ScenarioEntry, SharedLibrary, WatchMsg};
+pub use data::{LibraryState, ScenarioEntry, SharedLibrary, WatchMsg};
 pub use view::Library;
diff --git a/crates/rustmotion-studio/src/library/view.rs b/crates/rustmotion-studio/src/library/view.rs
index 9d71c015..44617c6e 100644
--- a/crates/rustmotion-studio/src/library/view.rs
+++ b/crates/rustmotion-studio/src/library/view.rs
@@ -1,13 +1,28 @@
-use std::path::PathBuf;
+use std::collections::{HashMap, HashSet};
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
 
-use dioxus::prelude::*;
-use dioxus_icons::lucide::{Folder, Import, Plus, Search};
+use gpui_component::button::{Button, ButtonVariants as _};
+use gpui_component::input::{Input, InputEvent, InputState};
+use gpui_component::sidebar::{Sidebar, SidebarMenu, SidebarMenuItem};
+use gpui_component::{h_flex, v_flex, ActiveTheme, IconName, Side, Sizable as _, StyledExt as _};
+use gpui_kit::{
+    div, px, App, AppContext as _, Context, Entity, InteractiveElement, IntoElement, ParentElement,
+    Pixels, Render, RenderImage, StatefulInteractiveElement, Styled, Subscription, Window,
+};
 
-use crate::components::button::{Button, ButtonSize, ButtonVariant};
+use crate::app::state::StudioState;
+use crate::editor::frames::render_frame_rgba_deep;
+use crate::editor::surface::{frame_from_rgba, frame_surface};
 use crate::library::{ScenarioEntry, SharedLibrary};
-use crate::scenario::{empty_scenario, Shared, StudioModel, View};
+use crate::scenario::{empty_scenario, StudioModel, View};
 
-const NEW_SCENARIO: &str = r##"{
+const SIDEBAR_WIDTH: Pixels = px(280.);
+const CARD_MIN_WIDTH: Pixels = px(240.);
+const CARD_GAP: Pixels = px(16.);
+const CONTENT_PADDING_X: Pixels = px(24.);
+
+const NEW_SCENARIO_TEMPLATE: &str = r##"{
   "video": { "width": 1920, "height": 1080, "background": "#0f172a" },
   "scenes": [
     { "duration": 3.0, "children": [
@@ -17,180 +32,473 @@ const NEW_SCENARIO: &str = r##"{
 }
 "##;
 
-/// The library home page: a sidebar of folder groups + recents, and a grid of
-/// scenario cards (frame-0 thumbnails). Clicking a card opens it in the editor.
-#[component]
-pub fn Library(view: Signal<View>) -> Element {
-    let library = use_context::<SharedLibrary>();
-    let shared = use_context::<Shared>();
-
-    let mut selected = use_signal(|| 0usize);
-    let mut query = use_signal(String::new);
-
-    // Build sections: a "Recent" pseudo-group first, then the workspace groups.
-    let sections: Vec<(String, Vec<ScenarioEntry>)> = {
-        let lib = library.lock().unwrap_or_else(|e| e.into_inner());
-        let mut s = Vec::new();
-        if !lib.recents.is_empty() {
-            s.push(("Recent".to_string(), lib.recents.clone()));
-        }
-        for g in &lib.groups {
-            s.push((g.name.clone(), g.entries.clone()));
-        }
-        if s.is_empty() {
-            s.push(("Default".to_string(), Vec::new()));
-        }
-        s
-    };
-    let sel = selected().min(sections.len().saturating_sub(1));
-    let (section_name, entries) = sections[sel].clone();
-
-    let q = query().to_lowercase();
-    let visible: Vec<_> = entries
-        .into_iter()
-        .filter(|e| q.is_empty() || e.name.to_lowercase().contains(&q))
-        .collect();
-
-    rsx! {
-        div { style: "display:flex; height:100vh; overflow:hidden;",
-            // ── Sidebar ──────────────────────────────────────────────
-            div { style: "width:280px; flex:none; background:var(--rm-surface); border-right:1px solid var(--rm-border); display:flex; flex-direction:column; padding:14px;",
-                div { style: "display:flex; align-items:center; justify-content:space-between; margin-bottom:16px;",
-                    div { style: "font-weight:700; color:var(--rm-text-strong);", "Rustmotion" }
-                    Button {
-                        variant: ButtonVariant::Secondary,
-                        size: ButtonSize::Sm,
-                        onclick: {
-                            let shared = shared.clone();
-                            let library = library.clone();
-                            move |_| new_scenario(&shared, &library, view)
-                        },
-                        Plus { size: 14 }
-                        "New"
-                    }
-                }
-                Button {
-                    variant: ButtonVariant::Outline,
-                    size: ButtonSize::Sm,
-                    style: "width:100%; justify-content:flex-start; margin-bottom:12px;",
-                    onclick: {
-                        let shared = shared.clone();
-                        let library = library.clone();
-                        move |_| import_scenario(shared.clone(), library.clone(), view)
-                    },
-                    Import { size: 14 }
-                    "Import file…"
-                }
-                div { style: "color:var(--rm-text-muted); font-size:11px; text-transform:uppercase; letter-spacing:0.5px; margin:8px 0;", "Folders" }
-                div { style: "overflow:auto; display:flex; flex-direction:column; gap:2px;",
-                    for (i, (name, group_entries)) in sections.iter().enumerate() {
-                        Button {
-                            key: "{name}-{i}",
-                            variant: if i == sel { ButtonVariant::Secondary } else { ButtonVariant::Ghost },
-                            size: ButtonSize::Sm,
-                            style: "width:100%; justify-content:flex-start; text-align:left;",
-                            onclick: move |_| selected.set(i),
-                            Folder { size: 16 }
-                            div { style: "flex:1;", "{name}" }
-                            div { style: "color:var(--rm-text-muted); font-size:11px;", "{group_entries.len()}" }
-                        }
-                    }
-                }
-            }
-            // ── Main area ────────────────────────────────────────────
-            div { style: "flex:1; display:flex; flex-direction:column; overflow:hidden;",
-                div { style: "display:flex; align-items:center; justify-content:space-between; padding:20px 28px; gap:16px;",
-                    div { style: "font-size:24px; font-weight:700; color:var(--rm-text-strong);", "{section_name}" }
-                    div { style: "display:flex; align-items:center; gap:6px; background:var(--rm-surface); border:1px solid var(--rm-border-2); border-radius:8px; padding:6px 10px; min-width:240px;",
-                        Search { size: 15 }
-                        input {
-                            style: "flex:1; background:none; border:none; outline:none; color:var(--rm-text); font:inherit;",
-                            placeholder: "Search",
-                            value: "{query}",
-                            oninput: move |e| query.set(e.value()),
-                        }
-                    }
-                }
-                div { style: "flex:1; overflow:auto; padding:0 28px 28px;",
-                    if visible.is_empty() {
-                        div { style: "color:var(--rm-text-muted); padding:24px;", "No scenarios here." }
-                    }
-                    div { style: "display:grid; grid-template-columns:repeat(auto-fill, minmax(240px, 1fr)); gap:18px;",
-                        for entry in visible.iter().cloned() {
-                            div {
-                                key: "{entry.path.display()}",
-                                style: "cursor:pointer; display:flex; flex-direction:column; gap:8px;",
-                                onclick: {
-                                    let shared = shared.clone();
-                                    let library = library.clone();
-                                    let path = entry.path.clone();
-                                    move |_| open_scenario(&shared, &library, view, path.clone())
-                                },
-                                div { style: "aspect-ratio:16/9; background:var(--rm-surface-2); border:1px solid var(--rm-border); border-radius:10px; overflow:hidden; display:flex; align-items:center; justify-content:center;",
-                                    img {
-                                        src: "/thumb/{entry.flat_index}",
-                                        style: "width:100%; height:100%; object-fit:cover; display:block;",
-                                    }
-                                }
-                                div { style: "color:var(--rm-text); font-size:13px;", "{entry.name}" }
-                            }
-                        }
-                    }
-                }
-            }
-        }
+struct Section {
+    name: String,
+    entries: Vec<ScenarioEntry>,
+}
+
+fn workspace_sections(library: &SharedLibrary) -> Vec<Section> {
+    let lib = library.lock().unwrap_or_else(|e| e.into_inner());
+    let mut sections = Vec::new();
+    if !lib.recents.is_empty() {
+        sections.push(Section {
+            name: "Recent".to_string(),
+            entries: lib.recents.clone(),
+        });
+    }
+    for group in &lib.groups {
+        sections.push(Section {
+            name: group.name.clone(),
+            entries: group.entries.clone(),
+        });
+    }
+    sections
+}
+
+fn thumbnail_rgba(path: &Path) -> Option<Arc<RenderImage>> {
+    let scenario = rustmotion::loader::load_input(&path.to_path_buf()).ok()?;
+    let tasks = rustmotion::encode::build_frame_tasks(&scenario);
+    if tasks.is_empty() {
+        return None;
+    }
+    let (width, height, rgba) = render_frame_rgba_deep(&scenario, &tasks, 0, 0.25).ok()?;
+    if width == 0 || height == 0 {
+        return None;
+    }
+    Some(frame_from_rgba(width, height, rgba))
+}
+
+fn grid_columns(content_width: f32, card_width: f32, gap: f32) -> u16 {
+    if content_width <= 0.0 || card_width <= 0.0 {
+        return 1;
+    }
+    let columns = ((content_width + gap) / (card_width + gap)).floor();
+    if columns < 1.0 {
+        1
+    } else {
+        columns as u16
     }
 }
 
-/// Load a scenario into the shared model and switch to the editor.
-fn open_scenario(shared: &Shared, library: &SharedLibrary, mut view: Signal<View>, path: PathBuf) {
+fn open_scenario(state: &Entity<StudioState>, path: PathBuf, cx: &mut App) {
+    let (shared, library) = {
+        let studio = state.read(cx);
+        (studio.shared.clone(), studio.library.clone())
+    };
     let (scenario, error) = match rustmotion::loader::load_input(&path) {
-        Ok(s) => (s, None),
+        Ok(scenario) => (scenario, None),
         Err(e) => (empty_scenario(), Some(e.to_string())),
     };
     {
-        let mut m = shared.lock().unwrap_or_else(|e| e.into_inner());
-        let g = m.generation.wrapping_add(1);
-        *m = StudioModel::new(scenario, error, Some(path.clone()));
-        m.generation = g;
+        let mut model = shared.lock().unwrap_or_else(|e| e.into_inner());
+        let generation = model.generation.wrapping_add(1);
+        *model = StudioModel::new(scenario, error, Some(path.clone()));
+        model.generation = generation;
     }
     {
         let mut lib = library.lock().unwrap_or_else(|e| e.into_inner());
         lib.note_opened(&path);
         lib.retarget_watch(&path);
     }
-    view.set(View::Editor);
+    crate::app::spawn_scenario_warmup(shared.clone());
+    state.update(cx, |studio, cx| {
+        studio.view = View::Editor;
+        cx.notify();
+    });
 }
 
-/// Create a fresh scenario file in the workspace and open it.
-fn new_scenario(shared: &Shared, library: &SharedLibrary, view: Signal<View>) {
-    let workspace = {
-        library
-            .lock()
-            .unwrap_or_else(|e| e.into_inner())
-            .workspace
-            .clone()
-    };
+fn deduped_untitled_path(workspace: &Path) -> PathBuf {
     let mut path = workspace.join("untitled.json");
     let mut n = 1;
     while path.exists() {
         path = workspace.join(format!("untitled-{n}.json"));
         n += 1;
     }
-    if std::fs::write(&path, NEW_SCENARIO).is_ok() {
-        open_scenario(shared, library, view, path);
+    path
+}
+
+fn new_scenario(state: &Entity<StudioState>, cx: &mut App) {
+    let workspace = {
+        let studio = state.read(cx);
+        let library = studio.library.lock().unwrap_or_else(|e| e.into_inner());
+        library.workspace.clone()
+    };
+    let path = deduped_untitled_path(&workspace);
+    if std::fs::write(&path, NEW_SCENARIO_TEMPLATE).is_ok() {
+        open_scenario(state, path, cx);
     }
 }
 
-/// Open a native file picker (off the UI thread) and open the chosen scenario.
-fn import_scenario(shared: Shared, library: SharedLibrary, view: Signal<View>) {
-    spawn(async move {
-        if let Some(handle) = rfd::AsyncFileDialog::new()
+fn import_scenario(state: Entity<StudioState>, cx: &mut App) {
+    cx.spawn(async move |cx| {
+        let picked = rfd::AsyncFileDialog::new()
             .add_filter("scenario", &["json", "html", "htm"])
             .pick_file()
-            .await
-        {
-            open_scenario(&shared, &library, view, handle.path().to_path_buf());
+            .await;
+        if let Some(handle) = picked {
+            let path = handle.path().to_path_buf();
+            cx.update(|cx| open_scenario(&state, path, cx));
         }
-    });
+    })
+    .detach();
+}
+
+fn card(
+    entry: &ScenarioEntry,
+    thumbnail: Option<Arc<RenderImage>>,
+    state: &Entity<StudioState>,
+    cx: &App,
+) -> impl IntoElement {
+    let card_id = format!("library-card-{}", entry.path.display());
+    let click_state = state.clone();
+    let click_path = entry.path.clone();
+
+    v_flex()
+        .id(card_id)
+        .w_full()
+        .gap_2()
+        .cursor_pointer()
+        .on_click(move |_, _, cx| open_scenario(&click_state, click_path.clone(), cx))
+        .child(
+            div()
+                .w_full()
+                .aspect_ratio(16.0 / 9.0)
+                .overflow_hidden()
+                .rounded(cx.theme().radius)
+                .border_1()
+                .border_color(cx.theme().border)
+                .bg(cx.theme().muted)
+                .child(frame_surface(thumbnail)),
+        )
+        .child(
+            div()
+                .text_sm()
+                .text_color(cx.theme().foreground)
+                .truncate()
+                .child(entry.name.clone()),
+        )
+}
+
+pub struct Library {
+    state: Entity<StudioState>,
+    search: Entity<InputState>,
+    selected: usize,
+    query: String,
+    thumbnails: HashMap<PathBuf, Arc<RenderImage>>,
+    _subscriptions: Vec<Subscription>,
+}
+
+impl Library {
+    pub fn new(state: Entity<StudioState>, window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let search = cx.new(|cx| InputState::new(window, cx).placeholder("Search"));
+        let query_subscription =
+            cx.subscribe_in(&search, window, |this, input, event: &InputEvent, _, cx| {
+                if let InputEvent::Change = event {
+                    this.query = input.read(cx).value().to_string();
+                    cx.notify();
+                }
+            });
+        Self {
+            state,
+            search,
+            selected: 0,
+            query: String::new(),
+            thumbnails: HashMap::new(),
+            _subscriptions: vec![query_subscription],
+        }
+    }
+
+    fn sync_thumbnails(
+        &mut self,
+        visible: &[ScenarioEntry],
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let keep: HashSet<&PathBuf> = visible.iter().map(|entry| &entry.path).collect();
+        let stale: Vec<PathBuf> = self
+            .thumbnails
+            .keys()
+            .filter(|path| !keep.contains(path))
+            .cloned()
+            .collect();
+        for path in stale {
+            if let Some(image) = self.thumbnails.remove(&path) {
+                cx.drop_image(image, Some(window));
+            }
+        }
+        for entry in visible {
+            if !self.thumbnails.contains_key(&entry.path) {
+                if let Some(image) = thumbnail_rgba(&entry.path) {
+                    self.thumbnails.insert(entry.path.clone(), image);
+                }
+            }
+        }
+    }
+}
+
+impl Render for Library {
+    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let library = self.state.read(cx).library.clone();
+        let sections = workspace_sections(&library);
+
+        if sections.is_empty() {
+            self.selected = 0;
+        } else if self.selected >= sections.len() {
+            self.selected = sections.len() - 1;
+        }
+
+        let query = self.query.to_lowercase();
+        let active_entries: Vec<ScenarioEntry> = sections
+            .get(self.selected)
+            .map(|section| {
+                section
+                    .entries
+                    .iter()
+                    .filter(|entry| query.is_empty() || entry.name.to_lowercase().contains(&query))
+                    .cloned()
+                    .collect()
+            })
+            .unwrap_or_default();
+
+        self.sync_thumbnails(&active_entries, window, cx);
+
+        let section_name = sections
+            .get(self.selected)
+            .map(|section| section.name.clone())
+            .unwrap_or_default();
+
+        let mut menu = SidebarMenu::new();
+        for (index, section) in sections.iter().enumerate() {
+            let count = section.entries.len();
+            let is_active = index == self.selected;
+            menu = menu.child(
+                SidebarMenuItem::new(section.name.clone())
+                    .icon(IconName::Folder)
+                    .active(is_active)
+                    .suffix(move |_, cx| {
+                        div()
+                            .text_xs()
+                            .text_color(cx.theme().muted_foreground)
+                            .child(count.to_string())
+                    })
+                    .on_click(cx.listener(move |this, _, _, cx| {
+                        this.selected = index;
+                        cx.notify();
+                    })),
+            );
+        }
+
+        let header = v_flex()
+            .gap_3()
+            .w_full()
+            .child(
+                h_flex()
+                    .items_center()
+                    .justify_between()
+                    .child(
+                        div()
+                            .text_lg()
+                            .font_semibold()
+                            .text_color(cx.theme().sidebar_foreground)
+                            .child("Rustmotion"),
+                    )
+                    .child(
+                        Button::new("library-new")
+                            .icon(IconName::Plus)
+                            .label("New")
+                            .primary()
+                            .small()
+                            .on_click({
+                                let state = self.state.clone();
+                                move |_, _, cx| new_scenario(&state, cx)
+                            }),
+                    ),
+            )
+            .child(
+                Button::new("library-import")
+                    .icon(IconName::FolderOpen)
+                    .label("Import file…")
+                    .secondary()
+                    .small()
+                    .w_full()
+                    .on_click({
+                        let state = self.state.clone();
+                        move |_, _, cx| import_scenario(state.clone(), cx)
+                    }),
+            );
+
+        let sidebar = Sidebar::new("library-sidebar")
+            .side(Side::Left)
+            .w(SIDEBAR_WIDTH)
+            .collapsible(false)
+            .collapsed(false)
+            .header(header)
+            .child(menu);
+
+        let content_width = (window.viewport_size().width.as_f32()
+            - SIDEBAR_WIDTH.as_f32()
+            - CONTENT_PADDING_X.as_f32() * 2.0)
+            .max(0.0);
+        let columns = grid_columns(content_width, CARD_MIN_WIDTH.as_f32(), CARD_GAP.as_f32());
+
+        let state = self.state.clone();
+        let grid_body = if active_entries.is_empty() {
+            div()
+                .text_color(cx.theme().muted_foreground)
+                .child("No scenarios here.")
+        } else {
+            let cx_ref: &App = cx;
+            let cards = active_entries.iter().map(|entry| {
+                let thumbnail = self.thumbnails.get(&entry.path).cloned();
+                card(entry, thumbnail, &state, cx_ref)
+            });
+            div()
+                .grid()
+                .grid_cols(columns)
+                .gap(CARD_GAP)
+                .children(cards)
+        };
+
+        h_flex()
+            .id("library")
+            .size_full()
+            .bg(cx.theme().background)
+            .child(sidebar)
+            .child(
+                v_flex()
+                    .flex_1()
+                    .h_full()
+                    .overflow_hidden()
+                    .child(
+                        h_flex()
+                            .items_center()
+                            .justify_between()
+                            .gap_4()
+                            .px(CONTENT_PADDING_X)
+                            .py_5()
+                            .child(
+                                div()
+                                    .text_xl()
+                                    .font_semibold()
+                                    .text_color(cx.theme().foreground)
+                                    .child(section_name),
+                            )
+                            .child(
+                                Input::new(&self.search)
+                                    .prefix(IconName::Search)
+                                    .w(px(260.)),
+                            ),
+                    )
+                    .child(
+                        div()
+                            .id("library-grid")
+                            .flex_1()
+                            .overflow_y_scroll()
+                            .px(CONTENT_PADDING_X)
+                            .pb(CONTENT_PADDING_X)
+                            .child(grid_body),
+                    ),
+            )
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::sync::Mutex;
+
+    use crate::library::LibraryState;
+
+    fn examples_dir() -> PathBuf {
+        Path::new(env!("CARGO_MANIFEST_DIR")).join("../../examples")
+    }
+
+    #[test]
+    fn new_scenario_template_is_a_valid_scenario() {
+        let result =
+            rustmotion::loader::load_scenario_from_source(None, Some(NEW_SCENARIO_TEMPLATE));
+        assert!(result.is_ok());
+    }
+
+    #[test]
+    fn workspace_sections_puts_recent_first_when_present() {
+        let mut state = LibraryState::new(examples_dir(), false);
+        state.recents = vec![ScenarioEntry {
+            path: PathBuf::from("/tmp/rm_library_view_recent_demo.json"),
+            name: "recent-demo".to_string(),
+            flat_index: 0,
+        }];
+        let library: SharedLibrary = Arc::new(Mutex::new(state));
+
+        let sections = workspace_sections(&library);
+
+        assert_eq!(sections.first().map(|s| s.name.as_str()), Some("Recent"));
+        assert!(sections.iter().any(|s| s.name == "Default"));
+    }
+
+    #[test]
+    fn workspace_sections_omits_recent_when_empty() {
+        let mut state = LibraryState::new(examples_dir(), false);
+        state.recents.clear();
+        let library: SharedLibrary = Arc::new(Mutex::new(state));
+
+        let sections = workspace_sections(&library);
+
+        assert!(sections.iter().all(|s| s.name != "Recent"));
+    }
+
+    #[test]
+    fn grid_columns_fits_as_many_240px_cards_as_the_width_allows() {
+        assert_eq!(grid_columns(240.0, 240.0, 16.0), 1);
+        assert_eq!(grid_columns(496.0, 240.0, 16.0), 2);
+        assert_eq!(grid_columns(0.0, 240.0, 16.0), 1);
+    }
+
+    #[test]
+    fn deduped_untitled_path_skips_existing_files() {
+        let dir = std::env::temp_dir().join(format!("rm_library_view_{}", std::process::id()));
+        std::fs::create_dir_all(&dir).unwrap();
+        std::fs::write(dir.join("untitled.json"), "{}").unwrap();
+        std::fs::write(dir.join("untitled-1.json"), "{}").unwrap();
+
+        let path = deduped_untitled_path(&dir);
+        assert_eq!(path, dir.join("untitled-2.json"));
+
+        let _ = std::fs::remove_dir_all(&dir);
+    }
+
+    #[test]
+    fn thumbnail_rgba_renders_a_quarter_scale_frame() {
+        let dir = std::env::temp_dir().join(format!("rm_library_thumb_{}", std::process::id()));
+        std::fs::create_dir_all(&dir).unwrap();
+        let path = dir.join("scenario.json");
+        std::fs::write(
+            &path,
+            r##"{ "video": { "width": 400, "height": 200, "background": "#101418" }, "scenes": [ { "duration": 1.0 } ] }"##,
+        )
+        .unwrap();
+
+        let image = thumbnail_rgba(&path).expect("a thumbnail for a valid scenario");
+        let size = image.size(0);
+        assert_eq!((size.width.0, size.height.0), (100, 50));
+
+        let _ = std::fs::remove_dir_all(&dir);
+    }
+
+    #[test]
+    fn thumbnail_rgba_rejects_a_scenario_with_no_frames() {
+        let dir =
+            std::env::temp_dir().join(format!("rm_library_thumb_empty_{}", std::process::id()));
+        std::fs::create_dir_all(&dir).unwrap();
+        let path = dir.join("scenario.json");
+        std::fs::write(
+            &path,
+            r##"{ "video": { "width": 400, "height": 200 }, "scenes": [] }"##,
+        )
+        .unwrap();
+
+        assert!(thumbnail_rgba(&path).is_none());
+
+        let _ = std::fs::remove_dir_all(&dir);
+    }
 }
diff --git a/crates/rustmotion-studio/src/scenario/mod.rs b/crates/rustmotion-studio/src/scenario/mod.rs
index 82ef7d59..75512a2d 100644
--- a/crates/rustmotion-studio/src/scenario/mod.rs
+++ b/crates/rustmotion-studio/src/scenario/mod.rs
@@ -25,36 +25,3 @@ pub enum View {
     Library,
     Editor,
 }
-
-#[derive(Clone, Copy, PartialEq)]
-pub enum Theme {
-    Dark,
-    Light,
-    System,
-}
-
-impl Theme {
-    pub fn class(self) -> &'static str {
-        match self {
-            Theme::Dark => "rm-dark",
-            Theme::Light => "rm-light",
-            Theme::System => "rm-system",
-        }
-    }
-
-    pub fn next(self) -> Theme {
-        match self {
-            Theme::Dark => Theme::Light,
-            Theme::Light => Theme::System,
-            Theme::System => Theme::Dark,
-        }
-    }
-
-    pub fn label(self) -> &'static str {
-        match self {
-            Theme::Dark => "Dark",
-            Theme::Light => "Light",
-            Theme::System => "System",
-        }
-    }
-}
diff --git a/crates/rustmotion-studio/src/scenario/model.rs b/crates/rustmotion-studio/src/scenario/model.rs
index 99abd902..1102a64e 100644
--- a/crates/rustmotion-studio/src/scenario/model.rs
+++ b/crates/rustmotion-studio/src/scenario/model.rs
@@ -43,21 +43,14 @@ impl StudioModel {
             .unwrap_or(serde_json::Value::Null);
         let tasks = rustmotion::encode::build_frame_tasks(&scenario);
         let total_frames = tasks.len() as u32;
-        let failures = rustmotion::encode::audio_analysis::analyze_scenario_audio(&scenario);
-        let audio_error = (!failures.is_empty()).then(|| {
-            failures
-                .iter()
-                .map(|f| f.to_string())
-                .collect::<Vec<_>>()
-                .join(" · ")
-        });
+
         Self {
             scenario: Arc::new(scenario),
             tasks: Arc::new(tasks),
             total_frames,
             error,
             write_error: None,
-            audio_error,
+            audio_error: None,
             generation: 0,
             path,
             raw,
@@ -90,3 +83,34 @@ pub fn empty_scenario() -> ResolvedScenario {
         included_paths: vec![],
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn opening_a_scenario_does_not_decode_its_audio_on_the_calling_thread() {
+        let dir = std::env::temp_dir().join(format!("rm-audio-{}", std::process::id()));
+        std::fs::create_dir_all(&dir).unwrap();
+        let path = dir.join("with-audio.json");
+        std::fs::write(
+            &path,
+            r##"{ "video": { "width": 64, "height": 36, "background": "#000000" },
+                  "audio": [ { "src": "does-not-exist.wav" } ],
+                  "scenes": [ { "duration": 1.0 } ] }"##,
+        )
+        .unwrap();
+
+        let scenario = rustmotion::loader::load_input(&path).expect("load");
+        let model = StudioModel::new(scenario, None, Some(path.clone()));
+
+        assert!(
+            model.audio_error.is_none(),
+            "a missing track would have reported a failure had the analysis run inline; \
+             it belongs on the warmup thread, because decoding a 25 MB wav froze the \
+             library for two seconds before the editor could show its spinner"
+        );
+
+        let _ = std::fs::remove_dir_all(&dir);
+    }
+}
diff --git a/crates/rustmotion-studio/src/theme/mod.rs b/crates/rustmotion-studio/src/theme/mod.rs
new file mode 100644
index 00000000..3f04c619
--- /dev/null
+++ b/crates/rustmotion-studio/src/theme/mod.rs
@@ -0,0 +1,33 @@
+pub mod persist;
+
+use gpui_component::{Theme, ThemeMode};
+use gpui_kit::{App, Entity, Window};
+
+use crate::app::state::{StudioState, ThemePref};
+
+pub fn apply(pref: ThemePref, window: Option<&mut Window>, cx: &mut App) {
+    match pref {
+        ThemePref::System => Theme::sync_system_appearance(window, cx),
+        ThemePref::Light => Theme::change(ThemeMode::Light, window, cx),
+        ThemePref::Dark => Theme::change(ThemeMode::Dark, window, cx),
+    }
+}
+
+pub fn set(state: &Entity<StudioState>, pref: ThemePref, window: &mut Window, cx: &mut App) {
+    state.update(cx, |state, cx| {
+        state.theme_pref = pref;
+        cx.notify();
+    });
+    persist::save_theme_pref(pref);
+    apply(pref, Some(window), cx);
+}
+
+pub fn watch_system_appearance(state: Entity<StudioState>, window: &mut Window) {
+    window
+        .observe_window_appearance(move |window, cx| {
+            if state.read(cx).theme_pref == ThemePref::System {
+                Theme::sync_system_appearance(Some(window), cx);
+            }
+        })
+        .detach();
+}
diff --git a/crates/rustmotion-studio/src/theme/persist.rs b/crates/rustmotion-studio/src/theme/persist.rs
new file mode 100644
index 00000000..c79284f5
--- /dev/null
+++ b/crates/rustmotion-studio/src/theme/persist.rs
@@ -0,0 +1,65 @@
+use std::path::PathBuf;
+
+use crate::app::state::ThemePref;
+
+fn theme_pref_path() -> Option<PathBuf> {
+    dirs::config_dir().map(|d| d.join("rustmotion").join("theme.json"))
+}
+
+fn label_for(pref: ThemePref) -> &'static str {
+    match pref {
+        ThemePref::Light => "light",
+        ThemePref::Dark => "dark",
+        ThemePref::System => "system",
+    }
+}
+
+fn parse_label(label: &str) -> ThemePref {
+    match label {
+        "light" => ThemePref::Light,
+        "dark" => ThemePref::Dark,
+        _ => ThemePref::default(),
+    }
+}
+
+pub fn load_theme_pref() -> ThemePref {
+    let path = match theme_pref_path() {
+        Some(p) => p,
+        None => return ThemePref::default(),
+    };
+    let raw = match std::fs::read_to_string(&path) {
+        Ok(s) => s,
+        Err(_) => return ThemePref::default(),
+    };
+    let label: String = serde_json::from_str(&raw).unwrap_or_default();
+    parse_label(&label)
+}
+
+pub fn save_theme_pref(pref: ThemePref) {
+    if let Some(path) = theme_pref_path() {
+        if let Some(parent) = path.parent() {
+            let _ = std::fs::create_dir_all(parent);
+        }
+        if let Ok(s) = serde_json::to_string(label_for(pref)) {
+            let _ = std::fs::write(&path, s);
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn every_preference_roundtrips_through_its_label() {
+        for pref in [ThemePref::Light, ThemePref::Dark, ThemePref::System] {
+            assert_eq!(parse_label(label_for(pref)), pref);
+        }
+    }
+
+    #[test]
+    fn unknown_or_corrupt_label_falls_back_to_the_default() {
+        assert_eq!(parse_label("nonsense"), ThemePref::default());
+        assert_eq!(parse_label(""), ThemePref::default());
+    }
+}